Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: Intel Graphics Development <intel-gfx@lists.freedesktop.org>
Subject: [PATCH 03/12] lockdep: Remove GFP_NOLOCKDEP annotation
Date: Fri,  2 Nov 2018 10:15:22 +0100	[thread overview]
Message-ID: <20181102091531.7775-3-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20181102091531.7775-1-daniel.vetter@ffwll.ch>

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 <akpm@linux-foundation.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
Cc: Mike Rapoport <rppt@linux.vnet.ibm.com>
Cc: Huaisheng Ye <yehs1@lenovo.com>
Cc: Pavel Tatashin <pasha.tatashin@oracle.com>
Cc: Aaron Lu <aaron.lu@intel.com>
Cc: Oscar Salvador <osalvador@suse.de>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: linux-mm@kvack.org
Cc: Dave Chinner <david@fromorbit.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shakeel Butt <shakeelb@google.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---
 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;
 }
 
-- 
2.19.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2018-11-02  9:15 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-02  9:15 [PATCH 01/12] locking/lockdep: restore cross-release checks Daniel Vetter
2018-11-02  9:15 ` [PATCH 02/12] kthread: finer-grained lockdep/cross-release completion Daniel Vetter
2018-11-02  9:15 ` Daniel Vetter [this message]
2018-11-02  9:15 ` [PATCH 04/12] kernel/lockdep: Make cross-release a config option Daniel Vetter
2018-11-02  9:15 ` [PATCH 05/12] mm: Check if mmu notifier callbacks are allowed to fail Daniel Vetter
2018-11-02  9:15 ` [PATCH 06/12] mm, notifier: Catch sleeping/blocking for !blockable Daniel Vetter
2018-11-02  9:15 ` [PATCH 07/12] mm, notifier: Add a lockdep map for invalidate_range_start Daniel Vetter
2018-11-02  9:15 ` [PATCH 08/12] dma-fence: cross-release annotations Daniel Vetter
2018-11-02  9:15 ` [PATCH 09/12] reservation: Annotate dma_fence waits Daniel Vetter
2018-11-02  9:15 ` [PATCH 10/12] drm/i915: " Daniel Vetter
2018-11-06 13:55   ` [PATCH] " Daniel Vetter
2018-11-06 16:48     ` kbuild test robot
2018-11-06 16:48     ` kbuild test robot
2018-11-02  9:15 ` [PATCH 11/12] drm/i915: annotate intel_atomic_commit_fence_wait Daniel Vetter
2018-11-02  9:15 ` [PATCH 12/12] HAX FOR CI: Enable cross-release Daniel Vetter
2018-11-02  9:43 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [01/12] locking/lockdep: restore cross-release checks Patchwork
2018-11-02  9:49 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-11-02 10:04 ` ✗ Fi.CI.BAT: failure " Patchwork
2018-11-06 14:14 ` ✗ Fi.CI.BAT: failure for series starting with [01/12] locking/lockdep: restore cross-release checks (rev2) Patchwork
2018-11-06 15:05 ` [PATCH] locking/lockdep: restore cross-release checks Daniel Vetter
2018-11-06 15:50 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with locking/lockdep: restore cross-release checks (rev3) Patchwork
2018-11-06 15:56 ` ✗ Fi.CI.SPARSE: " Patchwork
2018-11-07  9:14 ` ✗ Fi.CI.BAT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20181102091531.7775-3-daniel.vetter@ffwll.ch \
    --to=daniel.vetter@ffwll.ch \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox