Skip to contentSkip to conversation

cpumask-limit-visibility-of-force_nr_cpus.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 2 participants 3 messages Nov 15, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: cpumask: limit visibility of FORCE_NR_CPUS
has been removed from the -mm tree. Its filename was
cpumask-limit-visibility-of-force_nr_cpus.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Yury Norov <[email protected]>
Subject: cpumask: limit visibility of FORCE_NR_CPUS
Date: Wed, 19 Oct 2022 15:59:39 -0700

In current form, FORCE_NR_CPUS is visible to all users building their kernels, even not experts. It is also set in allmodconfig or allyesconfig, which is not a correct behavior.

The 'choice' and unused config UNFORCE_NR_CPUS are used to ensure that auto-generated configs that try to enable as much options as possible, like allmodconfig, don't enable FORCE_NR_CPUS.

Cc Alexey Klimov <[email protected]>
Cc Andy Shevchenko <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Eric Biggers <[email protected]>
Cc Paul E. McKenney <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Rasmus Villemoes <[email protected]>
Cc Sander Vanheule <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Valentin Schneider <[email protected]>
Cc Vlastimil Babka <[email protected]>

---

 lib/Kconfig |   31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)
lib/Kconfig renamed from lib/Kconfig~cpumask-limit-visibility-of-force_nr_cpus +24 -7
@@ -528,14 +528,31 @@ config CPUMASK_OFFSTACK
 	  them on the stack.  This is a bit more expensive, but avoids
 	  stack overflow.
 
+choice
+	prompt "Number of CPUs detection method"
+	default UNFORCE_NR_CPUS
+	depends on SMP && EXPERT
+	help
+	  Select between boot-time and compile-time detection of number
+	  of CPUs. If it's possible to provide exact number of CPUs at
+	  compile-time, kernel code may be optimized better.
+	  For general-purpose kernel, choose "boot time" option.
+
+config UNFORCE_NR_CPUS
+	bool "Set number of CPUs at boot time"
+	help
+	  Choose it if you build general-purpose kernel and want to rely
+	  on kernel to detect actual number of CPUs.
+
 config FORCE_NR_CPUS
-       bool "NR_CPUS is set to an actual number of CPUs"
-       depends on SMP
-       help
-         Say Yes if you have NR_CPUS set to an actual number of possible
-         CPUs in your system, not to a default value. This forces the core
-         code to rely on compile-time value and optimize kernel routines
-         better.
+	bool "Set number of CPUs at compile time"
+	help
+	  Choose it if NR_CPUS corresponds to an actual number of
+	  possible CPUs in your system. This forces the core code
+	  to rely on compile-time value and optimize kernel routines
+	  better.
+
+endchoice
 
 config CPU_RMAP
 	bool

_

Patches currently in -mm which might be from [email protected] are

#1 lore raw
Quoted 8 lines · Andrew Morton

The quilt patch titled
Subject: cpumask: limit visibility of FORCE_NR_CPUS
has been removed from the -mm tree. Its filename was
cpumask-limit-visibility-of-force_nr_cpus.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Andrew,

I need to send v3 for this. Can you please exclude this?

Thanks,
Yury

Quoted 81 lines

------------------------------------------------------
From: Yury Norov <[email protected]>
Subject: cpumask: limit visibility of FORCE_NR_CPUS
Date: Wed, 19 Oct 2022 15:59:39 -0700

In current form, FORCE_NR_CPUS is visible to all users building their kernels, even not experts. It is also set in allmodconfig or allyesconfig, which is not a correct behavior.

The 'choice' and unused config UNFORCE_NR_CPUS are used to ensure that auto-generated configs that try to enable as much options as possible, like allmodconfig, don't enable FORCE_NR_CPUS.

Cc Alexey Klimov <[email protected]>
Cc Andy Shevchenko <[email protected]>
Cc Dmitry Vyukov <[email protected]>
Cc Eric Biggers <[email protected]>
Cc Paul E. McKenney <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Rasmus Villemoes <[email protected]>
Cc Sander Vanheule <[email protected]>
Cc Stephen Rothwell <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Valentin Schneider <[email protected]>
Cc Vlastimil Babka <[email protected]>

---

 lib/Kconfig |   31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)
lib/Kconfig renamed from lib/Kconfig~cpumask-limit-visibility-of-force_nr_cpus +24 -7
@@ -528,14 +528,31 @@ config CPUMASK_OFFSTACK
 	  them on the stack.  This is a bit more expensive, but avoids
 	  stack overflow.
 
+choice
+	prompt "Number of CPUs detection method"
+	default UNFORCE_NR_CPUS
+	depends on SMP && EXPERT
+	help
+	  Select between boot-time and compile-time detection of number
+	  of CPUs. If it's possible to provide exact number of CPUs at
+	  compile-time, kernel code may be optimized better.
+	  For general-purpose kernel, choose "boot time" option.
+
+config UNFORCE_NR_CPUS
+	bool "Set number of CPUs at boot time"
+	help
+	  Choose it if you build general-purpose kernel and want to rely
+	  on kernel to detect actual number of CPUs.
+
 config FORCE_NR_CPUS
-       bool "NR_CPUS is set to an actual number of CPUs"
-       depends on SMP
-       help
-         Say Yes if you have NR_CPUS set to an actual number of possible
-         CPUs in your system, not to a default value. This forces the core
-         code to rely on compile-time value and optimize kernel routines
-         better.
+	bool "Set number of CPUs at compile time"
+	help
+	  Choose it if NR_CPUS corresponds to an actual number of
+	  possible CPUs in your system. This forces the core code
+	  to rely on compile-time value and optimize kernel routines
+	  better.
+
+endchoice
 
 config CPU_RMAP
 	bool

_

Patches currently in -mm which might be from [email protected] are

#2 lore raw
Quoted 7 lines · On Tue, 15 Nov 2022 15:13:26 -0800 Yury Norov <[email protected]> wrote:
Quoted 6 lines · Andrew Morton

The quilt patch titled
Subject: cpumask: limit visibility of FORCE_NR_CPUS
has been removed from the -mm tree. Its filename was
cpumask-limit-visibility-of-force_nr_cpus.patch

Quoted 6 lines
Quoted 2 lines

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Andrew,

I need to send v3 for this.

argh, it's been a month.

Quoted 1 line

Can you please exclude this?

I'll take a look when you send v3.