linux-kernel - linux-next: manual merge of the rcu tree with the mm 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20241220133738.1beae531@canb.auug.org.au>
Date: Fri, 20 Dec 2024 13:37:38 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: "Paul E. McKenney" <paulmck@...nel.org>, Frederic Weisbecker
 <frederic@...nel.org>, Neeraj Upadhyay <neeraj.upadhyay@...nel.org>, Boqun
 Feng <boqun.feng@...il.com>, Uladzislau Rezki <urezki@...il.com>, Andrew
 Morton <akpm@...ux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, "Peter Zijlstra (Intel)"
 <peterz@...radead.org>, Sebastian Andrzej Siewior <bigeasy@...utronix.de>
Subject: linux-next: manual merge of the rcu tree with the mm tree

Hi all,

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

  kernel/rcu/tree.c

between commit:

  bf8f464ee259 ("kasan: make kasan_record_aux_stack_noalloc() the default behaviour")

from the mm tree and commit:

  049dfe96baf9 ("rcu: Report callbacks enqueued on offline CPU blind spot")

from the rcu 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 kernel/rcu/tree.c
index 3885aae5f9cb,24f1cb292a92..000000000000
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@@ -3083,9 -3083,12 +3083,12 @@@ __call_rcu_common(struct rcu_head *head
  	}
  	head->func = func;
  	head->next = NULL;
 -	kasan_record_aux_stack_noalloc(head);
 +	kasan_record_aux_stack(head);
+ 
  	local_irq_save(flags);
  	rdp = this_cpu_ptr(&rcu_data);
+ 	RCU_LOCKDEP_WARN(!rcu_rdp_cpu_online(rdp), "Callback enqueued on offline CPU!");
+ 
  	lazy = lazy_in && !rcu_async_should_hurry();

  	/* Add the callback to our list. */

Content of type "application/pgp-signature" skipped