linux-kernel - linux-next: manual merge of the tip tree with the workqueues 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: <20240226135357.29ebadf0@canb.auug.org.au>
Date: Mon, 26 Feb 2024 13:53:57 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
 "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
 Tejun Heo <tj@...nel.org>
Cc: Anna-Maria Behnsen <anna-maria@...utronix.de>, Leonardo Bras
 <leobras@...hat.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the tip tree with the workqueues tree

Hi all,

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

  kernel/workqueue.c

between commit:

  aae17ebb53cd ("workqueue: Avoid using isolated cpus' timers on queue_delayed_work")

from the workqueues tree and commit:

  c0e8c5b59949 ("workqueue: Use global variant for add_timer()")

from the tip 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/workqueue.c
index 65a27be81452,78eaea2e5d72..000000000000
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@@ -2545,18 -1958,10 +2545,18 @@@ static void __queue_delayed_work(int cp
  	dwork->cpu = cpu;
  	timer->expires = jiffies + delay;

 -	if (unlikely(cpu != WORK_CPU_UNBOUND))
 +	if (housekeeping_enabled(HK_TYPE_TIMER)) {
 +		/* If the current cpu is a housekeeping cpu, use it. */
 +		cpu = smp_processor_id();
 +		if (!housekeeping_test_cpu(cpu, HK_TYPE_TIMER))
 +			cpu = housekeeping_any_cpu(HK_TYPE_TIMER);
  		add_timer_on(timer, cpu);
 -	else
 -		add_timer_global(timer);
 +	} else {
 +		if (likely(cpu == WORK_CPU_UNBOUND))
- 			add_timer(timer);
++			add_timer_global(timer);
 +		else
 +			add_timer_on(timer, cpu);
 +	}
  }

  /**

Content of type "application/pgp-signature" skipped