Commit 95e73fb1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2024-02-22-15-02' of... 

Merge tag 'mm-hotfixes-stable-2024-02-22-15-02' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "A batch of MM (and one non-MM) hotfixes.

  Ten are cc:stable and the remainder address post-6.7 issues or aren't
  considered appropriate for backporting"

* tag 'mm-hotfixes-stable-2024-02-22-15-02' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  kasan: guard release_free_meta() shadow access with kasan_arch_is_ready()
  mm/damon/lru_sort: fix quota status loss due to online tunings
  mm/damon/reclaim: fix quota stauts loss due to online tunings
  MAINTAINERS: mailmap: update Shakeel's email address
  mm/damon/sysfs-schemes: handle schemes sysfs dir removal before commit_schemes_quota_goals
  mm: memcontrol: clarify swapaccount=0 deprecation warning
  mm/memblock: add MEMBLOCK_RSRV_NOINIT into flagname[] array
  mm/zswap: invalidate duplicate entry when !zswap_enabled
  lib/Kconfig.debug: TEST_IOV_ITER depends on MMU
  mm/swap: fix race when skipping swapcache
  mm/swap_state: update zswap LRU's protection range with the folio locked
  selftests/mm: uffd-unit-test check if huge page size is 0
  mm/damon/core: check apply interval in damon_do_apply_schemes()
  mm: zswap: fix missing folio cleanup in writeback race path
parents e7768e65 2597c994

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -553,6 +553,7 @@ Senthilkumar N L <quic_snlakshm@quicinc.com> <snlakshm@codeaurora.org> 
Serge Hallyn <sergeh@kernel.org> <serge.hallyn@canonical.com>

Serge Hallyn <sergeh@kernel.org> <serue@us.ibm.com>

Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>

Shakeel Butt <shakeel.butt@linux.dev> <shakeelb@google.com>

Shannon Nelson <shannon.nelson@amd.com> <snelson@pensando.io>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@intel.com>

Shannon Nelson <shannon.nelson@amd.com> <shannon.nelson@oracle.com>

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -5378,7 +5378,7 @@ CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG) 
M:	Johannes Weiner <hannes@cmpxchg.org>

M:	Michal Hocko <mhocko@kernel.org>

M:	Roman Gushchin <roman.gushchin@linux.dev>

M:	Shakeel Butt <shakeelb@google.com>

M:	Shakeel Butt <shakeel.butt@linux.dev>

R:	Muchun Song <muchun.song@linux.dev>

L:	cgroups@vger.kernel.org

L:	linux-mm@kvack.org

include/linux/swap.h

+5 −0
Original line number Diff line number Diff line
@@ -549,6 +549,11 @@ static inline int swap_duplicate(swp_entry_t swp) 
	return 0;

}



static inline int swapcache_prepare(swp_entry_t swp)

{

	return 0;

}



static inline void swap_free(swp_entry_t swp)

{

}

lib/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -2235,6 +2235,7 @@ config TEST_DIV64 
config TEST_IOV_ITER

	tristate "Test iov_iter operation" if !KUNIT_ALL_TESTS

	depends on KUNIT

	depends on MMU

	default KUNIT_ALL_TESTS

	help

	  Enable this to turn on testing of the operation of the I/O iterator

mm/damon/core.c

+11 −4
Original line number Diff line number Diff line
@@ -1026,6 +1026,9 @@ static void damon_do_apply_schemes(struct damon_ctx *c, 
	damon_for_each_scheme(s, c) {

		struct damos_quota *quota = &s->quota;



		if (c->passed_sample_intervals != s->next_apply_sis)

			continue;



		if (!s->wmarks.activated)

			continue;
@@ -1176,10 +1179,6 @@ static void kdamond_apply_schemes(struct damon_ctx *c) 
		if (c->passed_sample_intervals != s->next_apply_sis)

			continue;



		s->next_apply_sis +=

			(s->apply_interval_us ? s->apply_interval_us :

			 c->attrs.aggr_interval) / sample_interval;



		if (!s->wmarks.activated)

			continue;
@@ -1195,6 +1194,14 @@ static void kdamond_apply_schemes(struct damon_ctx *c) 
		damon_for_each_region_safe(r, next_r, t)

			damon_do_apply_schemes(c, t, r);

	}



	damon_for_each_scheme(s, c) {

		if (c->passed_sample_intervals != s->next_apply_sis)

			continue;

		s->next_apply_sis +=

			(s->apply_interval_us ? s->apply_interval_us :

			 c->attrs.aggr_interval) / sample_interval;

	}

}



/*