The patch titled Subject: mm/highmem: Fix CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP has been added to the -mm tree. Its filename is mm-highmem-fix-config_debug_kmap_local_force_map.patch
This patch should soon appear at https://ozlabs.org/~akpm/mmots/broken-out/mm-highmem-fix-config_debug_kmap_l... and later at https://ozlabs.org/~akpm/mmotm/broken-out/mm-highmem-fix-config_debug_kmap_l...
Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated there every 3-4 working days
------------------------------------------------------ From: ira.weiny@intel.com 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/
Link: https://lkml.kernel.org/r/20210318230657.1497881-1-ira.weiny@intel.com Fixes: 0e91a0c6984c ("mm/highmem: Provide CONFIG_DEBUG_KMAP_LOCAL_FORCE_MAP") Signed-off-by: Ira Weiny ira.weiny@intel.com Reported-by: kernel test robot oliver.sang@intel.com Reviewed-by: Thomas 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: Andrew Morton akpm@linux-foundation.org ---
mm/highmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/mm/highmem.c~mm-highmem-fix-config_debug_kmap_local_force_map +++ a/mm/highmem.c @@ -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 ira.weiny@intel.com are
mm-highmem-fix-config_debug_kmap_local_force_map.patch 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