On 8/16/19 6:58 AM, Josh Boyer wrote:
On Thu, Aug 15, 2019 at 3:57 PM Laura Abbott
<labbott(a)redhat.com> wrote:
>
> We've been carrying a patch to make CPUMASK_OFFSTACK selectable
> without debugging for a long time now. The comment said this was
> going to be replaced with something else but that never seemed
> to happen. We're carrying it to have a higher number of CPUs but
> at this point I don't think it's worth it since the upper bound is
> now 512. This should be enough for most Fedora use cases so just
> drop the patch.
I likely agree, but copying Prarit because this was something he and I
poked at forever ago.
Given that RHEL no longer bothers with this I hope he would be
okay with it :)
josh
> Signed-off-by: Laura Abbott <labbott(a)redhat.com>
> ---
> .../fedora/generic/x86/x86_64/CONFIG_NR_CPUS | 2 +-
> kernel.spec | 2 --
> ...-CPUMASK_OFFSTACK-usable-without-deb.patch | 34 -------------------
> 3 files changed, 1 insertion(+), 37 deletions(-)
> delete mode 100644 lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
>
> diff --git a/configs/fedora/generic/x86/x86_64/CONFIG_NR_CPUS
b/configs/fedora/generic/x86/x86_64/CONFIG_NR_CPUS
> index 27d187f4d..9ce2b2de6 100644
> --- a/configs/fedora/generic/x86/x86_64/CONFIG_NR_CPUS
> +++ b/configs/fedora/generic/x86/x86_64/CONFIG_NR_CPUS
> @@ -1 +1 @@
> -CONFIG_NR_CPUS=1024
> +CONFIG_NR_CPUS=512
> diff --git a/kernel.spec b/kernel.spec
> index a662ee004..4253ff035 100644
> --- a/kernel.spec
> +++ b/kernel.spec
> @@ -495,8 +495,6 @@ Source5000: patch-5.%{base_sublevel}-git%{gitrev}.xz
> # Standalone patches
> # 100 - Generic long running patches
>
> -Patch110: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
> -
> Patch111: input-kill-stupid-messages.patch
>
> Patch112: die-floppy-die.patch
> diff --git a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
b/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
> deleted file mode 100644
> index 5e6d6611e..000000000
> --- a/lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
> +++ /dev/null
> @@ -1,34 +0,0 @@
> -From: Josh Boyer <jwboyer(a)fedoraproject.org>
> -Date: Mon, 11 Nov 2013 08:39:16 -0500
> -Subject: [PATCH] lib/cpumask: Make CPUMASK_OFFSTACK usable without debug
> - dependency
> -
> -When CPUMASK_OFFSTACK was added in 2008, it was dependent upon
> -DEBUG_PER_CPU_MAPS being enabled, or an architecture could select it.
> -The debug dependency adds additional overhead that isn't required for
> -operation of the feature, and we need CPUMASK_OFFSTACK to increase the
> -NR_CPUS value beyond 512 on x86. We drop the current dependency and make
> -sure SMP is set.
> -
> -Bugzilla: N/A
> -Upstream-status: Nak'd, supposedly replacement coming to auto-select
> -
> -Signed-off-by: Josh Boyer <jwboyer(a)fedoraproject.org>
> ----
> - lib/Kconfig | 3 ++-
> - 1 file changed, 2 insertions(+), 1 deletion(-)
> -
> -diff --git a/lib/Kconfig b/lib/Kconfig
> -index 3a2ef67db6c7..4af1e7e5a611 100644
> ---- a/lib/Kconfig
> -+++ b/lib/Kconfig
> -@@ -396,7 +396,8 @@ config CHECK_SIGNATURE
> - bool
> -
> - config CPUMASK_OFFSTACK
> -- bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
> -+ bool "Force CPU masks off stack"
> -+ depends on SMP
> - help
> - Use dynamic allocation for cpumask_var_t, instead of putting
> - them on the stack. This is a bit more expensive, but avoids
> --
> 2.21.0
>