Fix affinity mask handling in nproc for large CPU counts
Kudos to Florian Weimer for fixing this issue in Fedora! Resolves: RHEL-68961
This commit is contained in:
Lukáš Zaoral
parent
2855173a9a
commit
068a1ad058
55
coreutils-nproc-affinity-1.patch
Normal file
55
coreutils-nproc-affinity-1.patch
Normal file
@ -0,0 +1,55 @@
|
||||
commit 45c2456a56337ebcafe0dd9faa2bd995ccbc3357
|
||||
Author: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Mon Nov 11 14:05:53 2024 +0100
|
||||
|
||||
nproc: Use affinity mask even on systems with more than 1024 CPUs.
|
||||
|
||||
* lib/nproc.c (num_processors_via_affinity_mask): Retry
|
||||
with larger affinity masks if CPU_ALLOC_SIZE is available.
|
||||
|
||||
diff --git a/lib/nproc.c b/lib/nproc.c
|
||||
index 92a07e8289..48bc3d06fa 100644
|
||||
--- a/lib/nproc.c
|
||||
+++ b/lib/nproc.c
|
||||
@@ -20,6 +20,7 @@
|
||||
#include <config.h>
|
||||
#include "nproc.h"
|
||||
|
||||
+#include <errno.h>
|
||||
#include <limits.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
@@ -124,6 +125,33 @@ num_processors_via_affinity_mask (void)
|
||||
return count;
|
||||
}
|
||||
}
|
||||
+#elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC \
|
||||
+ && defined CPU_ALLOC_SIZE /* glibc >= 2.6 */
|
||||
+ {
|
||||
+ unsigned int alloc_count = 1024;
|
||||
+ while (1)
|
||||
+ {
|
||||
+ cpu_set_t *set = CPU_ALLOC (alloc_count);
|
||||
+ if (set == NULL)
|
||||
+ return 0;
|
||||
+ unsigned int size = CPU_ALLOC_SIZE (alloc_count);
|
||||
+ if (sched_getaffinity (0, size, set) == 0)
|
||||
+ {
|
||||
+ unsigned int count = CPU_COUNT_S (size, set);
|
||||
+ CPU_FREE (set);
|
||||
+ return count;
|
||||
+ }
|
||||
+ if (errno != EINVAL)
|
||||
+ {
|
||||
+ CPU_FREE (set);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ CPU_FREE (set);
|
||||
+ alloc_count *= 2;
|
||||
+ if (alloc_count == 0)
|
||||
+ return 0;
|
||||
+ }
|
||||
+ }
|
||||
#elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC /* glibc >= 2.3.4 */
|
||||
{
|
||||
cpu_set_t set;
|
||||
64
coreutils-nproc-affinity-2.patch
Normal file
64
coreutils-nproc-affinity-2.patch
Normal file
@ -0,0 +1,64 @@
|
||||
commit ee0bc695303775da5026091a65e8ec2b764f4a26
|
||||
Author: Bruno Haible <bruno@clisp.org>
|
||||
Date: Mon Nov 11 15:40:52 2024 +0100
|
||||
|
||||
nproc: Use affinity mask even in out-of-memory situations.
|
||||
|
||||
* lib/nproc.c (num_processors_via_affinity_mask): Use a stack-allocated
|
||||
cpu_set_t as fallback. Add comments.
|
||||
|
||||
diff --git a/lib/nproc.c b/lib/nproc.c
|
||||
index 48bc3d06fa..0b5898d88f 100644
|
||||
--- a/lib/nproc.c
|
||||
+++ b/lib/nproc.c
|
||||
@@ -125,15 +125,25 @@ num_processors_via_affinity_mask (void)
|
||||
return count;
|
||||
}
|
||||
}
|
||||
-#elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC \
|
||||
- && defined CPU_ALLOC_SIZE /* glibc >= 2.6 */
|
||||
+#elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC /* glibc >= 2.3.4 */
|
||||
+ /* There are two ways to use the sched_getaffinity() function:
|
||||
+ - With a statically-sized cpu_set_t.
|
||||
+ - With a dynamically-sized cpu_set_t.
|
||||
+ Documentation:
|
||||
+ <https://www.kernel.org/doc/man-pages/online/pages/man2/sched_getaffinity.2.html>
|
||||
+ <https://www.kernel.org/doc/man-pages/online/pages/man3/CPU_SET.3.html>
|
||||
+ The second way has the advantage that it works on systems with more than
|
||||
+ 1024 CPUs. The first way has the advantage that it works also when memory
|
||||
+ is tight. */
|
||||
+# if defined CPU_ALLOC_SIZE /* glibc >= 2.6 */
|
||||
{
|
||||
unsigned int alloc_count = 1024;
|
||||
- while (1)
|
||||
+ for (;;)
|
||||
{
|
||||
cpu_set_t *set = CPU_ALLOC (alloc_count);
|
||||
if (set == NULL)
|
||||
- return 0;
|
||||
+ /* Out of memory. */
|
||||
+ break;
|
||||
unsigned int size = CPU_ALLOC_SIZE (alloc_count);
|
||||
if (sched_getaffinity (0, size, set) == 0)
|
||||
{
|
||||
@@ -143,16 +153,19 @@ num_processors_via_affinity_mask (void)
|
||||
}
|
||||
if (errno != EINVAL)
|
||||
{
|
||||
+ /* Some other error. */
|
||||
CPU_FREE (set);
|
||||
return 0;
|
||||
}
|
||||
CPU_FREE (set);
|
||||
+ /* Retry with some larger cpu_set_t. */
|
||||
alloc_count *= 2;
|
||||
if (alloc_count == 0)
|
||||
+ /* Integer overflow. Avoid an endless loop. */
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
-#elif HAVE_SCHED_GETAFFINITY_LIKE_GLIBC /* glibc >= 2.3.4 */
|
||||
+# endif
|
||||
{
|
||||
cpu_set_t set;
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: A set of basic GNU tools commonly used in shell scripts
|
||||
Name: coreutils
|
||||
Version: 9.5
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
# some used parts of gnulib are under various variants of LGPL
|
||||
License: GPL-3.0-or-later AND GFDL-1.3-no-invariants-or-later AND LGPL-2.1-or-later AND LGPL-3.0-or-later
|
||||
Url: https://www.gnu.org/software/coreutils/
|
||||
@ -36,6 +36,11 @@ Patch104: coreutils-df-direct.patch
|
||||
# upstream commit: https://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=2606f5a0437e092078167afbcd1dabb1b00ecb88
|
||||
Patch105: coreutils-9.5-ls-k-info-fix.patch
|
||||
|
||||
# Fix affinity mask handling in nproc for large CPU counts
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2325167
|
||||
Patch106: coreutils-nproc-affinity-1.patch
|
||||
Patch107: coreutils-nproc-affinity-2.patch
|
||||
|
||||
# (sb) lin18nux/lsb compliance - multibyte functionality patch
|
||||
Patch800: coreutils-i18n.patch
|
||||
|
||||
@ -268,6 +273,9 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
%license COPYING
|
||||
|
||||
%changelog
|
||||
* Tue Nov 26 2024 Lukáš Zaoral <lzaoral@redhat.com> - 9.5-6
|
||||
- Fix affinity mask handling in nproc for large CPU counts (RHEL-68961)
|
||||
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 9.5-5
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
Loading…
Reference in New Issue
Block a user