[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20220527103014.517818624f9f6d4f0ba0b523@linux-foundation.org>
Date: Fri, 27 May 2022 10:30:14 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-mm@...ck.org, linux-kernel@...r.kernel.org,
mm-commits@...r.kernel.org
Subject: [GIT PULL] additional MM updates for 5.19-rc1
Pretty much the final flush here. Mel's "Drain remote per-cpu
directly" series might be stabilized later in the merge window.
There's a merge conflict in init/Kconfig. We resolved that by removing
the VM_EVENT_COUNTERS..MMAP_ALLOW_UNINITIALIZED entries.
And another in lib/Kconfig.debug. Similarly resolved by removing the
DEBUG_SLAB..SLUB_STATS entries.
I'll shortly be resurrecting Liam's maple-tree patchset for additional
stabilization and a view to merge that up for 5.20. And shortly after
that I'll bring in Yu Zhau's multigen LRU work to get that some
linux-next testing and hopefully reviewer provocation.
The following changes since commit f403f22f8ccb12860b2b62fec3173c6ccd45938b:
mm: kfence: use PAGE_ALIGNED helper (2022-05-25 10:47:49 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm tags/mm-stable-2022-05-27
for you to fetch changes up to fa020a2b87d24016723fff4a4237deb612478a32:
mm/shmem.c: suppress shift warning (2022-05-27 09:33:47 -0700)
----------------------------------------------------------------
Two followon 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@...e.com>
Some swap fixes and cleanups from Miaohe Lin.
Several individual minor fixups.
----------------------------------------------------------------
Andrew Morton (1):
mm/shmem.c: suppress shift warning
Kefeng Wang (1):
mm: kasan: fix input of vmalloc_to_page()
Miaohe Lin (14):
mm/z3fold: fix sheduling while atomic
mm/z3fold: fix possible null pointer dereferencing
mm/z3fold: remove buggy use of stale list for allocation
mm/z3fold: throw warning on failure of trylock_page in z3fold_alloc
revert "mm/z3fold.c: allow __GFP_HIGHMEM in z3fold_alloc"
mm/z3fold: put z3fold page back into unbuddied list when reclaim or migration fails
mm/z3fold: always clear PAGE_CLAIMED under z3fold page lock
mm/z3fold: fix z3fold_reclaim_page races with z3fold_free
mm/z3fold: fix z3fold_page_migrate races with z3fold_map
mm/swapfile: unuse_pte can map random data if swap read fails
mm/swapfile: fix lost swap bits in unuse_pte()
mm/madvise: free hwpoison and swapin error entry in madvise_free_pte_range
mm/shmem: fix infinite loop when swap in shmem error at swapoff time
mm: filter out swapin error entry in shmem mapping
Michal Koutný (5):
selftests: memcg: fix compilation
selftests: memcg: expect no low events in unprotected sibling
selftests: memcg: adjust expected reclaim values of protected cgroups
selftests: memcg: remove protection from top level memcg
selftests: memcg: factor out common parts of memory.{low,min} tests
Minchan Kim (1):
mm: fix is_pinnable_page against a cma page
Vlastimil Babka (1):
mm: Kconfig: reorganize misplaced mm options
Zi Yan (2):
mm: page-isolation: skip isolated pageblock in start_isolate_page_range()
mm: split free page with properly free memory accounting and without race
MAINTAINERS | 1 +
include/linux/mm.h | 9 +-
include/linux/swap.h | 7 +-
include/linux/swapops.h | 10 +
init/Kconfig | 53 -----
lib/Kconfig.debug | 34 ---
mm/Kconfig | 56 +++++
mm/Kconfig.debug | 31 +++
mm/internal.h | 4 +-
mm/kasan/report.c | 2 +-
mm/madvise.c | 18 +-
mm/memory.c | 5 +-
mm/page_alloc.c | 32 ++-
mm/page_isolation.c | 36 +++-
mm/shmem.c | 41 +++-
mm/swap_state.c | 3 +
mm/swapfile.c | 21 +-
mm/z3fold.c | 97 ++++-----
tools/testing/selftests/cgroup/memcg_protection.m | 89 ++++++++
tools/testing/selftests/cgroup/test_memcontrol.c | 247 ++++++----------------
20 files changed, 434 insertions(+), 362 deletions(-)
create mode 100644 tools/testing/selftests/cgroup/memcg_protection.m
Powered by blists - more mailing lists