Skip to contentSkip to conversation

mm-highmem-fix-config_debug_kmap_local_force_map.patch removed from -mm tree

merged [email protected] 1 participant 1 message Mar 28, 2021 Stable branch

lore
Share & tools
lore

[email protected]

author tree notice Applied
#0 lore raw

The patch titled
Subject: mm/highmem: fix CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP
has been removed from the -mm tree. Its filename was
mm-highmem-fix-config_debug_kmap_local_force_map.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Ira Weiny <[email protected]>
Subject: 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 CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP was set.[1] This was due to CONFIG_DEBUG_HIGHMEM check being used.

Change the configuration check to be correct.

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

Fixes 0e91a0c6984c ("mm/highmem: Provide CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP")
Cc Thomas Gleixner <[email protected]>
Cc Oliver Sang <[email protected]>
Cc Chaitanya Kulkarni <[email protected]>
Cc David Sterba <[email protected]>

---

 mm/highmem.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/highmem.c renamed from mm/highmem.c~mm-highmem-fix-config_debug_kmap_local_force_map +2 -2
@@ -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;
 		}

_

Patches currently in -mm which might be from [email protected] are

iov_iter-lift-memzero_page-to-highmemh.patch btrfs-use-memzero_page-instead-of-open-coded-kmap-pattern.patch mm-highmem-remove-deprecated-kmap_atomic.patch