malloc: Use __get_nprocs on arena_get2. (RHEL-17157)

Resolves: RHEL-17157

glibc-rhel-17157.patch

@@ -0,0 +1,95 @@
+commit 472894d2cfee5751b44c0aaa71ed87df81c8e62e
+Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
+Date:   Wed Oct 11 13:43:56 2023 -0300
+
+    malloc: Use __get_nprocs on arena_get2 (BZ 30945)
+    
+    This restore the 2.33 semantic for arena_get2.  It was changed by
+    11a02b035b46 to avoid arena_get2 call malloc (back when __get_nproc
+    was refactored to use an scratch_buffer - 903bc7dcc2acafc).  The
+    __get_nproc was refactored over then and now it also avoid to call
+    malloc.
+    
+    The 11a02b035b46 did not take in consideration any performance
+    implication, which should have been discussed properly.  The
+    __get_nprocs_sched is still used as a fallback mechanism if procfs
+    and sysfs is not acessible.
+    
+    Checked on x86_64-linux-gnu.
+    Reviewed-by: DJ Delorie <dj@redhat.com>
+
+diff --git a/include/sys/sysinfo.h b/include/sys/sysinfo.h
+index c490561581..65742b1036 100644
+--- a/include/sys/sysinfo.h
++++ b/include/sys/sysinfo.h
+@@ -14,10 +14,6 @@ libc_hidden_proto (__get_nprocs_conf)
+ extern int __get_nprocs (void);
+ libc_hidden_proto (__get_nprocs)
+ 
+-/* Return the number of available processors which the process can
+-   be scheduled.  */
+-extern int __get_nprocs_sched (void) attribute_hidden;
+-
+ /* Return number of physical pages of memory in the system.  */
+ extern long int __get_phys_pages (void);
+ libc_hidden_proto (__get_phys_pages)
+diff --git a/malloc/arena.c b/malloc/arena.c
+index d1e214ac2e..a1a75e5a2b 100644
+--- a/malloc/arena.c
++++ b/malloc/arena.c
+@@ -824,7 +824,7 @@ arena_get2 (size_t size, mstate avoid_arena)
+             narenas_limit = mp_.arena_max;
+           else if (narenas > mp_.arena_test)
+             {
+-              int n = __get_nprocs_sched ();
++              int n = __get_nprocs ();
+ 
+               if (n >= 1)
+                 narenas_limit = NARENAS_FROM_NCORES (n);
+diff --git a/misc/getsysstats.c b/misc/getsysstats.c
+index 5f36adc0e8..23cc112074 100644
+--- a/misc/getsysstats.c
++++ b/misc/getsysstats.c
+@@ -44,12 +44,6 @@ weak_alias (__get_nprocs, get_nprocs)
+ link_warning (get_nprocs, "warning: get_nprocs will always return 1")
+ 
+ 
+-int
+-__get_nprocs_sched (void)
+-{
+-  return 1;
+-}
+-
+ long int
+ __get_phys_pages (void)
+ {
+diff --git a/sysdeps/mach/getsysstats.c b/sysdeps/mach/getsysstats.c
+index 5184e5eee1..d3834f3b69 100644
+--- a/sysdeps/mach/getsysstats.c
++++ b/sysdeps/mach/getsysstats.c
+@@ -62,12 +62,6 @@ __get_nprocs (void)
+ libc_hidden_def (__get_nprocs)
+ weak_alias (__get_nprocs, get_nprocs)
+ 
+-int
+-__get_nprocs_sched (void)
+-{
+-  return __get_nprocs ();
+-}
+-
+ /* Return the number of physical pages on the system. */
+ long int
+ __get_phys_pages (void)
+diff --git a/sysdeps/unix/sysv/linux/getsysstats.c b/sysdeps/unix/sysv/linux/getsysstats.c
+index b0b6c154ac..1ea7f1f01f 100644
+--- a/sysdeps/unix/sysv/linux/getsysstats.c
++++ b/sysdeps/unix/sysv/linux/getsysstats.c
+@@ -29,7 +29,7 @@
+ #include <sys/sysinfo.h>
+ #include <sysdep.h>
+ 
+-int
++static int
+ __get_nprocs_sched (void)
+ {
+   enum

glibc.spec

@@ -155,7 +155,7 @@ end \
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 92%{?dist}
+Release: 93%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -785,7 +785,7 @@ Patch548: glibc-RHEL-15343-1.patch
 Patch549: glibc-RHEL-15343-2.patch
 Patch550: glibc-RHEL-15343-3.patch
 Patch551: glibc-RHEL-15343-4.patch
-
+Patch552: glibc-rhel-17157.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -2944,6 +2944,9 @@ update_gconv_modules_cache ()
 %endif
 
 %changelog
+* Wed Dec  6 2023 Patsy Griffin <patsy@redhat.com> - 2.34-93
+- malloc: Use __get_nprocs on arena_get2. (RHEL-17157)
+
 * Fri Dec  1 2023 Patsy Griffin <patsy@redhat.com> - 2.34-92
 - Improve test coverage for wcsdup, strdup and strndup. (RHEL-15343)