Commit 487cfade authored by Ira Weiny's avatar Ira Weiny Committed by Linus Torvalds
Browse files

mm/highmem: fix CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP 

The kernel test robot found that __kmap_local_sched_out() was not
correctly skipping the guard pages when DEBUG_KMAP_LOCAL_FORCE_MAP was
set.[1] This was due to DEBUG_HIGHMEM check being used.

Change the configuration check to be correct.

[1] https://lore.kernel.org/lkml/20210304083825.GB17830@xsang-OptiPlex-9020/

Link: https://lkml.kernel.org/r/20210318230657.1497881-1-ira.weiny@intel.com


Fixes: 0e91a0c6 ("mm/highmem: Provide CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP")
Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Reported-by: default avatarkernel test robot <oliver.sang@intel.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Oliver Sang <oliver.sang@intel.com>
Cc: Chaitanya Kulkarni <Chaitanya.Kulkarni@wdc.com>
Cc: David Sterba <dsterba@suse.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a024b7c2

mm/highmem.c

+2 −2
Original line number Diff line number Diff line
@@ -618,7 +618,7 @@ void __kmap_local_sched_out(void) 
		int idx;



		/* With debug all even slots are unmapped and act as guard */

		if (IS_ENABLED(CONFIG_DEBUG_HIGHMEM) && !(i & 0x01)) {

		if (IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL) && !(i & 0x01)) {

			WARN_ON_ONCE(!pte_none(pteval));

			continue;

		}
@@ -654,7 +654,7 @@ void __kmap_local_sched_in(void) 
		int idx;



		/* With debug all even slots are unmapped and act as guard */

		if (IS_ENABLED(CONFIG_DEBUG_HIGHMEM) && !(i & 0x01)) {

		if (IS_ENABLED(CONFIG_DEBUG_KMAP_LOCAL) && !(i & 0x01)) {

			WARN_ON_ONCE(!pte_none(pteval));

			continue;

		}