linux-kernel - linux-next: manual merge of the mm-unstable tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250529111223.3987a514@canb.auug.org.au>
Date: Thu, 29 May 2025 11:12:23 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: JP Kobryn <inwardvessel@...il.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Shakeel Butt <shakeel.butt@...ux.dev>, Tejun
 Heo <tj@...nel.org>
Subject: linux-next: manual merge of the mm-unstable tree with Linus' tree

Hi all,

Today's linux-next merge of the mm-unstable tree got a conflict in:

  mm/memcontrol.c

between commit:

  a97915559f5c ("cgroup: change rstat function signatures from cgroup-based to css-based")

from Linus' tree and commit:

  202cf1817f29 ("memcg: make memcg_rstat_updated nmi safe")

from the mm-unstable tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc mm/memcontrol.c
index b90aa3075950,a268690cd07b..000000000000
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -571,7 -571,9 +571,9 @@@ static inline void memcg_rstat_updated(
  	if (!val)
  		return;
  
- 	css_rstat_updated(&memcg->css, cpu);
+ 	/* TODO: add to cgroup update tree once it is nmi-safe. */
+ 	if (!in_nmi())
 -		cgroup_rstat_updated(memcg->css.cgroup, cpu);
++		css_rstat_updated(&memcg->css, cpu);
  	statc_pcpu = memcg->vmstats_percpu;
  	for (; statc_pcpu; statc_pcpu = statc->parent_pcpu) {
  		statc = this_cpu_ptr(statc_pcpu);

Content of type "application/pgp-signature" skipped