From patchwork Thu Oct 25 14:35:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 10655907 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 055BB1751 for ; Thu, 25 Oct 2018 14:35:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9A762BC39 for ; Thu, 25 Oct 2018 14:35:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE1D92BC49; Thu, 25 Oct 2018 14:35:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D1F432BC39 for ; Thu, 25 Oct 2018 14:35:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D5C7F6E292; Thu, 25 Oct 2018 14:35:41 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 498CE6E1F8 for ; Thu, 25 Oct 2018 14:35:39 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id z21-v6so8698923edb.11 for ; Thu, 25 Oct 2018 07:35:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=jtxXYQX+jbcFxJLi8/+bnyKLcre/71/QSLgkKlqPwrU=; b=g6s8RJ9ib8xx4afWO89PB8TArgz5Xi3eCkCL3q1dFfrg8vT6cxdtSv+4/Oy0X6/jTW FL25cOBbQR27qUbaVdHhdTTn+pJl+/9DzOVbgpUUqrK8MnnGsivBynYGb8706LSpR6gt +W8ieXKuqbZX+ISlopHCumWCElVNu2HOMjncYKOLm+/xOJuXyKY9oy3uwN4HkaYOVlV0 ZPvUK9XRe4xtmXjmRQlcc/eRTt0xebQDqSGZrQdQIUgauKanRxFxv8NZU14Jv2UJv/rc elPqZt88hfYclAV8Ke5kqRHk0nh9kyR1pfQpp5YJXvvg6c44iiNwH5GaoeC9dvjJAcmv l0ww== X-Gm-Message-State: AGRZ1gKbnoLWMX/H3l/hvKymcyrGkv5pOmv5tcUfOEOCVDj0dzNdUFi7 gmLRtybiCV+5/llRG+7AgbtJBo3dSZo= X-Google-Smtp-Source: AJdET5cwN0QnxzOkBVyQ7VBTYTQ8wbuddlE819Uc8LcqMqMazAuTH4a1Isel4MN7SmCUaKspXc7vAg== X-Received: by 2002:a50:940b:: with SMTP id p11-v6mr1709656eda.67.1540478137901; Thu, 25 Oct 2018 07:35:37 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:569e:0:3106:d637:d723:e855]) by smtp.gmail.com with ESMTPSA id k51-v6sm124353edb.85.2018.10.25.07.35.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Oct 2018 07:35:36 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 25 Oct 2018 16:35:24 +0200 Message-Id: <20181025143527.8575-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181025143527.8575-1-daniel.vetter@ffwll.ch> References: <20181025143527.8575-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 3/6] lockdep: Remove GFP_NOLOCKDEP annotation X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Intel Graphics Development Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This was originally added in 7e7844226f10 ("lockdep: allow to disable reclaim lockup detection") but a git log -G "GFP_NOLOCKDEP" indicates it was never used. Cc: Andrew Morton Cc: Vlastimil Babka Cc: Michal Hocko Cc: Mel Gorman Cc: Daniel Vetter Cc: "Levin, Alexander (Sasha Levin)" Cc: Mike Rapoport Cc: Huaisheng Ye Cc: Pavel Tatashin Cc: Aaron Lu Cc: Oscar Salvador Cc: Joonsoo Kim Cc: linux-mm@kvack.org Cc: Dave Chinner Cc: Peter Zijlstra Signed-off-by: Daniel Vetter --- include/linux/gfp.h | 10 +--------- mm/page_alloc.c | 3 --- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 24bcc5eec6b4..7709106d87fd 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -39,11 +39,6 @@ struct vm_area_struct; #define ___GFP_ACCOUNT 0x100000u #define ___GFP_DIRECT_RECLAIM 0x200000u #define ___GFP_KSWAPD_RECLAIM 0x400000u -#ifdef CONFIG_LOCKDEP -#define ___GFP_NOLOCKDEP 0x800000u -#else -#define ___GFP_NOLOCKDEP 0 -#endif /* If the above are modified, __GFP_BITS_SHIFT may need updating */ /* @@ -213,11 +208,8 @@ struct vm_area_struct; #define __GFP_COMP ((__force gfp_t)___GFP_COMP) #define __GFP_ZERO ((__force gfp_t)___GFP_ZERO) -/* Disable lockdep for GFP context tracking */ -#define __GFP_NOLOCKDEP ((__force gfp_t)___GFP_NOLOCKDEP) - /* Room for N __GFP_FOO bits */ -#define __GFP_BITS_SHIFT (23 + IS_ENABLED(CONFIG_LOCKDEP)) +#define __GFP_BITS_SHIFT 23 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) /** diff --git a/mm/page_alloc.c b/mm/page_alloc.c index e2ef1c17942f..b238ab7c1c0d 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -3717,9 +3717,6 @@ static bool __need_fs_reclaim(gfp_t gfp_mask) if (!(gfp_mask & __GFP_FS)) return false; - if (gfp_mask & __GFP_NOLOCKDEP) - return false; - return true; }