diff --git a/glibc.spec b/glibc.spec index a008c66e3a1d304a9cce0be2d0ffcefef54a3acb..8c9b5c097d43ac69dfb2ea9182efe7d5a9d6b01d 100644 --- a/glibc.spec +++ b/glibc.spec @@ -86,7 +86,7 @@ end} Summary: The GNU libc libraries Name: glibc Version: 2.38 -Release: 32%{?dist} +Release: 33%{?dist} License: LGPLv2+ and LGPLv2+ with exceptions and GPLv2+ and GPLv2+ with exceptions and BSD and Inner-Net and ISC and Public Domain and GFDL URL: http://www.gnu.org/software/glibc/ @@ -186,6 +186,7 @@ Patch3060: 0027-x86-Use-Avoid_Non_Temporal_Memset-to-control-non-tem.patch Patch3061: 0028-x86-Add-Avoid_STOSB-tunable-to-allow-NT-memset-witho.patch Patch3062: 0029-x86-Enable-non-temporal-memset-for-Hygon-processors.patch Patch3063: 0030-x86-Only-align-destination-to-1x-VEC_SIZE-in-memset-.patch +Patch3064: malloc-Use-__get_nprocs-on-arena_get2-BZ-30945.patch Patch5000: 5000-one-china-principle.patch @@ -1036,6 +1037,10 @@ update_gconv_modules_cache () %endif %changelog +* Thu Jun 26 2025 Xin Cheng - 2.38-33 +- [Type] bugfix +- [DESC] Fixes a regression caused by wrong cores counting in malloc/free + * Tue Jun 10 2025 licunlong - 2.38-32 - [Type] bugfix - [DESC] Fixes a regression causing posix_memalign() very slow diff --git a/malloc-Use-__get_nprocs-on-arena_get2-BZ-30945.patch b/malloc-Use-__get_nprocs-on-arena_get2-BZ-30945.patch new file mode 100644 index 0000000000000000000000000000000000000000..85814ac5876dcc5171b5b0e8e562aa8202757229 --- /dev/null +++ b/malloc-Use-__get_nprocs-on-arena_get2-BZ-30945.patch @@ -0,0 +1,106 @@ +From 506e47da1d66b33e24440a495eeef85daf7f2a78 Mon Sep 17 00:00:00 2001 +From: Adhemerval Zanella +Date: Wed, 11 Oct 2023 13:43:56 -0300 +Subject: [PATCH] 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 + +(cherry picked from commit 472894d2cfee5751b44c0aaa71ed87df81c8e62e) +--- + include/sys/sysinfo.h | 4 ---- + malloc/arena.c | 2 +- + misc/getsysstats.c | 6 ------ + sysdeps/mach/getsysstats.c | 6 ------ + sysdeps/unix/sysv/linux/getsysstats.c | 2 +- + 5 files changed, 2 insertions(+), 18 deletions(-) + +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 6f03955ff2..82b09adb47 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -820,7 +820,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 + #include + +-int ++static int + __get_nprocs_sched (void) + { + enum +-- +2.33.0 +