From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 27 May 2022 18:40:49 +0000 (-0700)
Subject: Merge tag 'mm-stable-2022-05-27' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6.17~7419
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8291eaafed36f575f23951f3ce18407f480e9ecf;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'mm-stable-2022-05-27' of git://git./linux/kernel/git/akpm/mm

Pull more MM updates from Andrew Morton:

 - Two follow-on fixes for the post-5.19 series "Use pageblock_order for
   cma and alloc_contig_range alignment", from Zi Yan.

 - A series of z3fold cleanups and fixes from Miaohe Lin.

 - Some memcg selftests work from Michal Koutný <mkoutny@suse.com>

 - Some swap fixes and cleanups from Miaohe Lin

 - Several individual minor fixups

* tag 'mm-stable-2022-05-27' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (25 commits)
  mm/shmem.c: suppress shift warning
  mm: Kconfig: reorganize misplaced mm options
  mm: kasan: fix input of vmalloc_to_page()
  mm: fix is_pinnable_page against a cma page
  mm: filter out swapin error entry in shmem mapping
  mm/shmem: fix infinite loop when swap in shmem error at swapoff time
  mm/madvise: free hwpoison and swapin error entry in madvise_free_pte_range
  mm/swapfile: fix lost swap bits in unuse_pte()
  mm/swapfile: unuse_pte can map random data if swap read fails
  selftests: memcg: factor out common parts of memory.{low,min} tests
  selftests: memcg: remove protection from top level memcg
  selftests: memcg: adjust expected reclaim values of protected cgroups
  selftests: memcg: expect no low events in unprotected sibling
  selftests: memcg: fix compilation
  mm/z3fold: fix z3fold_page_migrate races with z3fold_map
  mm/z3fold: fix z3fold_reclaim_page races with z3fold_free
  mm/z3fold: always clear PAGE_CLAIMED under z3fold page lock
  mm/z3fold: put z3fold page back into unbuddied list when reclaim or migration fails
  revert "mm/z3fold.c: allow __GFP_HIGHMEM in z3fold_alloc"
  mm/z3fold: throw warning on failure of trylock_page in z3fold_alloc
  ...
---

8291eaafed36f575f23951f3ce18407f480e9ecf
diff --cc mm/Kconfig.debug
index 5bd5bb0,197eb28..ce8dded
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@@ -45,6 -45,37 +45,39 @@@ config DEBUG_PAGEALLOC_ENABLE_DEFAUL
  	  Enable debug page memory allocations by default? This value
  	  can be overridden by debug_pagealloc=off|on.
  
+ config DEBUG_SLAB
+ 	bool "Debug slab memory allocations"
+ 	depends on DEBUG_KERNEL && SLAB
+ 	help
+ 	  Say Y here to have the kernel do limited verification on memory
+ 	  allocation as well as poisoning memory on free to catch use of freed
+ 	  memory. This can make kmalloc/kfree-intensive workloads much slower.
+ 
+ config SLUB_DEBUG
+ 	default y
+ 	bool "Enable SLUB debugging support" if EXPERT
+ 	depends on SLUB && SYSFS
++	select STACKDEPOT if STACKTRACE_SUPPORT
+ 	help
+ 	  SLUB has extensive debug support features. Disabling these can
+ 	  result in significant savings in code size. This also disables
+ 	  SLUB sysfs support. /sys/slab will not exist and there will be
+ 	  no support for cache validation etc.
+ 
+ config SLUB_DEBUG_ON
+ 	bool "SLUB debugging on by default"
+ 	depends on SLUB && SLUB_DEBUG
++	select STACKDEPOT_ALWAYS_INIT if STACKTRACE_SUPPORT
+ 	default n
+ 	help
+ 	  Boot with debugging on by default. SLUB boots by default with
+ 	  the runtime debug capabilities switched off. Enabling this is
+ 	  equivalent to specifying the "slub_debug" parameter on boot.
+ 	  There is no support for more fine grained debug control like
+ 	  possible with slub_debug=xxx. SLUB debugging may be switched
+ 	  off in a kernel built with CONFIG_SLUB_DEBUG_ON by specifying
+ 	  "slub_debug=-".
+ 
  config PAGE_OWNER
  	bool "Track page owner"
  	depends on DEBUG_KERNEL && STACKTRACE_SUPPORT