From: Randy Dunlap <rdunlap@infradead.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: X86 ML <x86@kernel.org>, LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH v2] x86: simplify NR_CPUS config
Date: Fri, 9 Feb 2018 16:51:03 -0800 [thread overview]
Message-ID: <0b833246-ed4b-e451-c426-c4464725be92@infradead.org> (raw)
In-Reply-To: <CA+55aFymknkNH2mP1vX5ZLEqQwA3BgxQhZF-SUbbJMwTDL6hAA@mail.gmail.com>
From: Randy Dunlap <rdunlap@infradead.org>
Clean up and simplify the X86 NR_CPUS Kconfig symbol/option by
introducing RANGE_BEGIN_CPUS, RANGE_END_CPUS, and DEF_CONFIG_CPUS.
Then combine some default values when their conditionals can be
reduced.
Also move the X86_BIGSMP kconfig option inside an "if X86_32"/"endif"
config block and drop its explicit "depends on X86_32".
Combine the max. 8192 cases of RANGE_END_CPUS (X86_64 only).
Split RANGE_END_CPUS and DEF_CONFIG_CPUS into separate cases for
X86_32 and X86_64.
Suggested-by: Linus Torvalds <torvalds@linuxfoundation.org>
Link: lkml.kernel.org/r/CA+55aFzOd3j6ZUSkEwTdk85qtt1JywOtm3ZAb-qAvt8_hJ6D4A@mail.gmail.com
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: x86@kernel.org
---
arch/x86/Kconfig | 57 +++++++++++++++++++++++++++++++++------------
1 file changed, 42 insertions(+), 15 deletions(-)
v2: more simplification as suggested by Linus; also separate the
X86_32 and X86_64 configs.
--- linux-next-20180209.orig/arch/x86/Kconfig
+++ linux-next-20180209/arch/x86/Kconfig
@@ -423,12 +423,6 @@ config X86_MPPARSE
For old smp systems that do not have proper acpi support. Newer systems
(esp with 64bit cpus) with acpi support, MADT and DSDT will override it
-config X86_BIGSMP
- bool "Support for big SMP systems with more than 8 CPUs"
- depends on X86_32 && SMP
- ---help---
- This option is needed for the systems that have more than 8 CPUs
-
config GOLDFISH
def_bool y
depends on X86_GOLDFISH
@@ -460,6 +454,12 @@ config INTEL_RDT
Say N if unsure.
if X86_32
+config X86_BIGSMP
+ bool "Support for big SMP systems with more than 8 CPUs"
+ depends on SMP
+ ---help---
+ This option is needed for the systems that have more than 8 CPUs
+
config X86_EXTENDED_PLATFORM
bool "Support for extended (non-PC) x86 platforms"
default y
@@ -949,17 +949,44 @@ config MAXSMP
Enable maximum number of CPUS and NUMA Nodes for this architecture.
If unsure, say N.
+config RANGE_END_CPUS
+ int
+ depends on X86_32
+ default 8 if SMP && !X86_BIGSMP
+ default 64 if SMP && X86_BIGSMP
+ default 1 if !SMP
+
+config RANGE_END_CPUS
+ int
+ depends on X86_64
+ default 512 if SMP && !MAXSMP && !CPUMASK_OFFSTACK
+ default 8192 if SMP && (MAXSMP || CPUMASK_OFFSTACK)
+ default 1 if !SMP
+
+config RANGE_BEGIN_CPUS
+ int
+ default 1 if !SMP
+ default RANGE_END_CPUS if MAXSMP
+ default 2
+
+config DEF_CONFIG_CPUS
+ int
+ depends on X86_32
+ default 1 if !SMP
+ default 32 if X86_BIGSMP
+ default 8 if SMP
+
+config DEF_CONFIG_CPUS
+ int
+ depends on X86_64
+ default 1 if !SMP
+ default 8192 if MAXSMP
+ default 64 if SMP
+
config NR_CPUS
int "Maximum number of CPUs" if SMP && !MAXSMP
- range 2 8 if SMP && X86_32 && !X86_BIGSMP
- range 2 64 if SMP && X86_32 && X86_BIGSMP
- range 2 512 if SMP && !MAXSMP && !CPUMASK_OFFSTACK && X86_64
- range 2 8192 if SMP && !MAXSMP && CPUMASK_OFFSTACK && X86_64
- default "1" if !SMP
- default "8192" if MAXSMP
- default "32" if SMP && X86_BIGSMP
- default "8" if SMP && X86_32
- default "64" if SMP
+ range RANGE_BEGIN_CPUS RANGE_END_CPUS
+ default DEF_CONFIG_CPUS
---help---
This allows you to specify the maximum number of CPUs which this
kernel will support. If CPUMASK_OFFSTACK is enabled, the maximum
next prev parent reply other threads:[~2018-02-10 0:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-09 22:01 [PATCH] x86: try to " Randy Dunlap
2018-02-09 22:39 ` Linus Torvalds
2018-02-10 0:51 ` Randy Dunlap [this message]
2018-02-10 11:36 ` [PATCH] x86/Kconfig: Further simplify the " Ingo Molnar
2018-02-10 11:38 ` Ingo Molnar
2018-02-10 17:37 ` Randy Dunlap
2018-02-10 22:19 ` Linus Torvalds
2018-02-11 1:11 ` Randy Dunlap
2018-02-11 10:47 ` Ingo Molnar
2018-02-11 10:50 ` Ingo Molnar
2018-02-11 12:12 ` [tip:x86/urgent] " tip-bot for Ingo Molnar
2018-02-11 12:11 ` [tip:x86/urgent] x86/Kconfig: Simplify " tip-bot for Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0b833246-ed4b-e451-c426-c4464725be92@infradead.org \
--to=rdunlap@infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®