glibc-32: 2.36 -> 2.38
This commit is contained in:
parent
3500144e23
commit
2f86552fe8
@ -1,8 +1,10 @@
|
||||
untrusted comment: verify with /etc/ports/core.pub
|
||||
RWRJc1FUaeVeqsMEoo0F4bHIZTNEfriWjb0GGBNye5tiEXgbOcoPRHdR+kLilS2razeqKiYHJrIVUT2RqSfRiV9jBY796at6Dg0=
|
||||
SHA256 (Pkgfile) = 664baf3fd909c8572776b23cc40a0db0d5a2a572e195ca854ccde9563e9b5bf0
|
||||
RWRJc1FUaeVeqq/ubkTCVHHKQ9hc4aS3fxJkE2nGpYD+FMfOKzrFmpFBe87JNMfcjfcwd/cwqugqwclDZGscm9u3ructqrHa7gE=
|
||||
SHA256 (Pkgfile) = 8dbb6c740413601b466be99898e482c1ae312c3bda236f1a3ef862389633bbe4
|
||||
SHA256 (.footprint) = f676700a19f936a1af944e81a516dbf182723d6ac244eadabd3fd19e9a01daa5
|
||||
SHA256 (glibc-2.36.tar.xz) = 1c959fea240906226062cb4b1e7ebce71a9f0e3c0836c09e7e3423d434fcfe75
|
||||
SHA256 (linux-5.15.55.tar.xz) = 1ef6bd508b6c3af3bef2d5b337e4477254dba284c79e329aa38f9763ae3bfdcc
|
||||
SHA256 (glibc-2.36-6.patch) = 571cc9d6ba0b1e81a00fae152347a29c2879a4970dad7d30a841690908788a01
|
||||
SHA256 (glibc-2.38.tar.xz) = fb82998998b2b29965467bc1b69d152e9c307d2cf301c9eafb4555b770ef3fd2
|
||||
SHA256 (linux-6.1.46.tar.xz) = f5f67bcfccd47f8d9db2d5ba24e33af7778f40a777577d1fba424f4a1712a296
|
||||
SHA256 (glibc-2.38-fhs-1.patch) = 643552db030e2f2d7ffde4f558e0f5f83d3fabf34a2e0e56ebdb49750ac27b0d
|
||||
SHA256 (glibc-2.38-memalign_fix-1.patch) = 3e4b4b15485c9767501151ccf1b33cf5ee912298fda899cd809277ece27e859c
|
||||
SHA256 (glibc-2.38-1.patch) = 9216845f1c369107cac2d33fa3e8b0f85939850330ed81220b19ed1adb49d6fa
|
||||
SHA256 (lib32.conf) = 2f174d2bcefe1c29327690514f34d6970fffdd54398320ca23a11b5f1e3c9b2d
|
||||
|
@ -3,57 +3,62 @@
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
|
||||
name=glibc-32
|
||||
version=2.36
|
||||
release=7
|
||||
_kernel_version=5.15.55
|
||||
version=2.38
|
||||
release=1
|
||||
_kernel_version=6.1.46
|
||||
|
||||
source=(https://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz
|
||||
https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_kernel_version.tar.xz
|
||||
glibc-$version-6.patch lib32.conf)
|
||||
https://www.kernel.org/pub/linux/kernel/v6.x/linux-$_kernel_version.tar.xz
|
||||
glibc-2.38-fhs-1.patch
|
||||
glibc-2.38-memalign_fix-1.patch
|
||||
glibc-$version-1.patch lib32.conf)
|
||||
|
||||
build() {
|
||||
# install kernel headers
|
||||
make -C $SRC/linux-$_kernel_version mrproper
|
||||
make -C $SRC/linux-$_kernel_version INSTALL_HDR_PATH=$PKG/usr headers_install
|
||||
chown root:root $PKG/usr
|
||||
# install kernel headers
|
||||
make -C $SRC/linux-$_kernel_version mrproper
|
||||
make -C $SRC/linux-$_kernel_version INSTALL_HDR_PATH=$PKG/usr headers_install
|
||||
chown root:root $PKG/usr
|
||||
|
||||
patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-$version-6.patch
|
||||
patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-$version-1.patch
|
||||
patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-2.38-fhs-1.patch
|
||||
patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-2.38-memalign_fix-1.patch
|
||||
|
||||
mkdir $SRC/build
|
||||
cd $SRC/build
|
||||
mkdir $SRC/build
|
||||
cd $SRC/build
|
||||
|
||||
export libc_cv_slibdir=/lib32
|
||||
export CC="${CC:-gcc} -m32 -mstackrealign"
|
||||
export CFLAGS="$CFLAGS -Wno-error=parentheses"
|
||||
export libc_cv_slibdir=/lib32
|
||||
export CC="${CC:-gcc} -m32 -mstackrealign"
|
||||
export CFLAGS="$CFLAGS -Wno-error=parentheses"
|
||||
|
||||
../glibc-${version:0:4}/configure --prefix=/usr \
|
||||
--libdir=/usr/lib32 \
|
||||
--libexecdir=/usr/lib32 \
|
||||
--with-headers=$PKG/usr/include \
|
||||
--enable-kernel=4.9 \
|
||||
--enable-add-ons \
|
||||
--enable-stack-protector=strong \
|
||||
--enable-static-pie \
|
||||
--enable-bind-now \
|
||||
--enable-multi-arch \
|
||||
--disable-profile \
|
||||
--disable-werror \
|
||||
--without-gd \
|
||||
--enable-multi-arch \
|
||||
i686-pc-linux-gnu
|
||||
../glibc-${version:0:4}/configure --prefix=/usr \
|
||||
--libdir=/usr/lib32 \
|
||||
--libexecdir=/usr/lib32 \
|
||||
--with-headers=$PKG/usr/include \
|
||||
--enable-kernel=5.10 \
|
||||
--enable-add-ons \
|
||||
--enable-stack-protector=strong \
|
||||
--enable-static-pie \
|
||||
--enable-bind-now \
|
||||
--enable-crypt \
|
||||
--enable-multi-arch \
|
||||
--disable-profile \
|
||||
--disable-werror \
|
||||
--without-gd \
|
||||
--enable-multi-arch \
|
||||
i686-pc-linux-gnu
|
||||
|
||||
make
|
||||
#make check
|
||||
make install_root=$PKG install
|
||||
make
|
||||
#make check
|
||||
make install_root=$PKG install
|
||||
|
||||
rm -r $PKG/usr/{bin,sbin,share} $PKG/{etc,sbin} $PKG/var
|
||||
rm -r $PKG/usr/{bin,sbin,share} $PKG/{etc,sbin} $PKG/var
|
||||
|
||||
mv $PKG/usr/include/gnu/stubs-32.h $SRC
|
||||
rm -r $PKG/usr/include
|
||||
install -D $SRC/stubs-32.h $PKG/usr/include/gnu/stubs-32.h
|
||||
mv $PKG/usr/include/gnu/stubs-32.h $SRC
|
||||
rm -r $PKG/usr/include
|
||||
install -D $SRC/stubs-32.h $PKG/usr/include/gnu/stubs-32.h
|
||||
|
||||
install -D $SRC/lib32.conf $PKG/etc/ld.so.conf.d/lib32.conf
|
||||
install -D $SRC/lib32.conf $PKG/etc/ld.so.conf.d/lib32.conf
|
||||
|
||||
install -d $PKG/lib
|
||||
ln -s /lib32/ld-linux.so.2 $PKG/lib/ld-linux.so.2
|
||||
install -d $PKG/lib
|
||||
ln -s /lib32/ld-linux.so.2 $PKG/lib/ld-linux.so.2
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
562
glibc-32/glibc-2.38-1.patch
Normal file
562
glibc-32/glibc-2.38-1.patch
Normal file
@ -0,0 +1,562 @@
|
||||
diff --git a/include/ifaddrs.h b/include/ifaddrs.h
|
||||
index 416118f1b3..19a3afb19f 100644
|
||||
--- a/include/ifaddrs.h
|
||||
+++ b/include/ifaddrs.h
|
||||
@@ -34,9 +34,5 @@ extern void __check_native (uint32_t a1_index, int *a1_native,
|
||||
uint32_t a2_index, int *a2_native)
|
||||
attribute_hidden;
|
||||
|
||||
-#if IS_IN (nscd)
|
||||
-extern uint32_t __bump_nl_timestamp (void) attribute_hidden;
|
||||
-#endif
|
||||
-
|
||||
# endif /* !_ISOMAC */
|
||||
#endif /* ifaddrs.h */
|
||||
diff --git a/inet/check_pf.c b/inet/check_pf.c
|
||||
index 5310c99121..6d1475920f 100644
|
||||
--- a/inet/check_pf.c
|
||||
+++ b/inet/check_pf.c
|
||||
@@ -60,12 +60,3 @@ __free_in6ai (struct in6addrinfo *in6ai)
|
||||
{
|
||||
/* Nothing to do. */
|
||||
}
|
||||
-
|
||||
-
|
||||
-#if IS_IN (nscd)
|
||||
-uint32_t
|
||||
-__bump_nl_timestamp (void)
|
||||
-{
|
||||
- return 0;
|
||||
-}
|
||||
-#endif
|
||||
diff --git a/nscd/Makefile b/nscd/Makefile
|
||||
index 2a0489f4cf..16b6460ee9 100644
|
||||
--- a/nscd/Makefile
|
||||
+++ b/nscd/Makefile
|
||||
@@ -35,7 +35,7 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
|
||||
getgrnam_r getgrgid_r hstcache gethstbyad_r gethstbynm3_r \
|
||||
getsrvbynm_r getsrvbypt_r servicescache \
|
||||
dbg_log nscd_conf nscd_stat cache mem nscd_setup_thread \
|
||||
- xmalloc xstrdup aicache initgrcache gai res_hconf \
|
||||
+ xmalloc xstrdup aicache initgrcache res_hconf \
|
||||
netgroupcache cachedumper
|
||||
|
||||
ifeq ($(build-nscd)$(have-thread-library),yesyes)
|
||||
diff --git a/nscd/connections.c b/nscd/connections.c
|
||||
index a405a44a9b..15693e5090 100644
|
||||
--- a/nscd/connections.c
|
||||
+++ b/nscd/connections.c
|
||||
@@ -256,6 +256,17 @@ int inotify_fd = -1;
|
||||
#ifdef HAVE_NETLINK
|
||||
/* Descriptor for netlink status updates. */
|
||||
static int nl_status_fd = -1;
|
||||
+
|
||||
+static uint32_t
|
||||
+__bump_nl_timestamp (void)
|
||||
+{
|
||||
+ static uint32_t nl_timestamp;
|
||||
+
|
||||
+ if (atomic_fetch_add_relaxed (&nl_timestamp, 1) + 1 == 0)
|
||||
+ atomic_fetch_add_relaxed (&nl_timestamp, 1);
|
||||
+
|
||||
+ return nl_timestamp;
|
||||
+}
|
||||
#endif
|
||||
|
||||
/* Number of times clients had to wait. */
|
||||
diff --git a/nscd/gai.c b/nscd/gai.c
|
||||
deleted file mode 100644
|
||||
index e29f3fe583..0000000000
|
||||
--- a/nscd/gai.c
|
||||
+++ /dev/null
|
||||
@@ -1,50 +0,0 @@
|
||||
-/* Copyright (C) 2004-2023 Free Software Foundation, Inc.
|
||||
- This file is part of the GNU C Library.
|
||||
-
|
||||
- This program is free software; you can redistribute it and/or modify
|
||||
- it under the terms of the GNU General Public License as published
|
||||
- by the Free Software Foundation; version 2 of the License, or
|
||||
- (at your option) any later version.
|
||||
-
|
||||
- This program is distributed in the hope that it will be useful,
|
||||
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
- GNU General Public License for more details.
|
||||
-
|
||||
- You should have received a copy of the GNU General Public License
|
||||
- along with this program; if not, see <https://www.gnu.org/licenses/>. */
|
||||
-
|
||||
-#include <alloca.h>
|
||||
-#include <sys/stat.h>
|
||||
-
|
||||
-/* This file uses the getaddrinfo code but it compiles it without NSCD
|
||||
- support. We just need a few symbol renames. */
|
||||
-#define __ioctl ioctl
|
||||
-#define __getsockname getsockname
|
||||
-#define __socket socket
|
||||
-#define __recvmsg recvmsg
|
||||
-#define __bind bind
|
||||
-#define __sendto sendto
|
||||
-#define __strchrnul strchrnul
|
||||
-#define __getline getline
|
||||
-#define __qsort_r qsort_r
|
||||
-/* nscd uses 1MB or 2MB thread stacks. */
|
||||
-#define __libc_use_alloca(size) (size <= __MAX_ALLOCA_CUTOFF)
|
||||
-#define __getifaddrs getifaddrs
|
||||
-#define __freeifaddrs freeifaddrs
|
||||
-#undef __fstat64
|
||||
-#define __fstat64 fstat64
|
||||
-#undef __stat64
|
||||
-#define __stat64 stat64
|
||||
-
|
||||
-/* We are nscd, so we don't want to be talking to ourselves. */
|
||||
-#undef USE_NSCD
|
||||
-
|
||||
-#include <getaddrinfo.c>
|
||||
-
|
||||
-/* Support code. */
|
||||
-#include <check_pf.c>
|
||||
-#include <check_native.c>
|
||||
-
|
||||
-/* Some variables normally defined in libc. */
|
||||
-nss_action_list __nss_hosts_database attribute_hidden;
|
||||
diff --git a/stdlib/tst-realpath.c b/stdlib/tst-realpath.c
|
||||
index f325c95a44..3694ecd8af 100644
|
||||
--- a/stdlib/tst-realpath.c
|
||||
+++ b/stdlib/tst-realpath.c
|
||||
@@ -24,6 +24,7 @@
|
||||
License along with the GNU C Library; if not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
+#include <limits.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <malloc.h>
|
||||
@@ -50,7 +51,11 @@ void dealloc (void *p)
|
||||
|
||||
char* alloc (void)
|
||||
{
|
||||
- return (char *)malloc (8);
|
||||
+#ifdef PATH_MAX
|
||||
+ return (char *)malloc (PATH_MAX);
|
||||
+#else
|
||||
+ return (char *)malloc (4096);
|
||||
+#endif
|
||||
}
|
||||
|
||||
static int
|
||||
diff --git a/sysdeps/i386/i686/memcpy.S b/sysdeps/i386/i686/memcpy.S
|
||||
index 9b48ec0ea1..b86af4aac9 100644
|
||||
--- a/sysdeps/i386/i686/memcpy.S
|
||||
+++ b/sysdeps/i386/i686/memcpy.S
|
||||
@@ -27,7 +27,7 @@
|
||||
#define LEN SRC+4
|
||||
|
||||
.text
|
||||
-#if defined PIC && IS_IN (libc)
|
||||
+#if defined SHARED && IS_IN (libc)
|
||||
ENTRY_CHK (__memcpy_chk)
|
||||
movl 12(%esp), %eax
|
||||
cmpl %eax, 16(%esp)
|
||||
diff --git a/sysdeps/i386/i686/mempcpy.S b/sysdeps/i386/i686/mempcpy.S
|
||||
index 26f8501e7d..14d9dd681a 100644
|
||||
--- a/sysdeps/i386/i686/mempcpy.S
|
||||
+++ b/sysdeps/i386/i686/mempcpy.S
|
||||
@@ -27,7 +27,7 @@
|
||||
#define LEN SRC+4
|
||||
|
||||
.text
|
||||
-#if defined PIC && IS_IN (libc)
|
||||
+#if defined SHARED && IS_IN (libc)
|
||||
ENTRY_CHK (__mempcpy_chk)
|
||||
movl 12(%esp), %eax
|
||||
cmpl %eax, 16(%esp)
|
||||
diff --git a/sysdeps/i386/i686/multiarch/memcpy_chk.c b/sysdeps/i386/i686/multiarch/memcpy_chk.c
|
||||
index ec945dc91f..c3a8aeaf18 100644
|
||||
--- a/sysdeps/i386/i686/multiarch/memcpy_chk.c
|
||||
+++ b/sysdeps/i386/i686/multiarch/memcpy_chk.c
|
||||
@@ -32,4 +32,6 @@ libc_ifunc_redirected (__redirect_memcpy_chk, __memcpy_chk,
|
||||
__hidden_ver1 (__memcpy_chk, __GI___memcpy_chk, __redirect_memcpy_chk)
|
||||
__attribute__ ((visibility ("hidden"))) __attribute_copy__ (__memcpy_chk);
|
||||
# endif
|
||||
+#else
|
||||
+# include <debug/memcpy_chk.c>
|
||||
#endif
|
||||
diff --git a/sysdeps/i386/i686/multiarch/memmove_chk.c b/sysdeps/i386/i686/multiarch/memmove_chk.c
|
||||
index 55c7601d5d..070dde083a 100644
|
||||
--- a/sysdeps/i386/i686/multiarch/memmove_chk.c
|
||||
+++ b/sysdeps/i386/i686/multiarch/memmove_chk.c
|
||||
@@ -32,4 +32,6 @@ libc_ifunc_redirected (__redirect_memmove_chk, __memmove_chk,
|
||||
__hidden_ver1 (__memmove_chk, __GI___memmove_chk, __redirect_memmove_chk)
|
||||
__attribute__ ((visibility ("hidden"))) __attribute_copy__ (__memmove_chk);
|
||||
# endif
|
||||
+#else
|
||||
+# include <debug/memmove_chk.c>
|
||||
#endif
|
||||
diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.c b/sysdeps/i386/i686/multiarch/mempcpy_chk.c
|
||||
index 83569cf9d9..14360f1828 100644
|
||||
--- a/sysdeps/i386/i686/multiarch/mempcpy_chk.c
|
||||
+++ b/sysdeps/i386/i686/multiarch/mempcpy_chk.c
|
||||
@@ -32,4 +32,6 @@ libc_ifunc_redirected (__redirect_mempcpy_chk, __mempcpy_chk,
|
||||
__hidden_ver1 (__mempcpy_chk, __GI___mempcpy_chk, __redirect_mempcpy_chk)
|
||||
__attribute__ ((visibility ("hidden"))) __attribute_copy__ (__mempcpy_chk);
|
||||
# endif
|
||||
+#else
|
||||
+# include <debug/mempcpy_chk.c>
|
||||
#endif
|
||||
diff --git a/sysdeps/i386/i686/multiarch/memset_chk.c b/sysdeps/i386/i686/multiarch/memset_chk.c
|
||||
index 1a7503858d..8179ef7c0b 100644
|
||||
--- a/sysdeps/i386/i686/multiarch/memset_chk.c
|
||||
+++ b/sysdeps/i386/i686/multiarch/memset_chk.c
|
||||
@@ -32,4 +32,6 @@ libc_ifunc_redirected (__redirect_memset_chk, __memset_chk,
|
||||
__hidden_ver1 (__memset_chk, __GI___memset_chk, __redirect_memset_chk)
|
||||
__attribute__ ((visibility ("hidden"))) __attribute_copy__ (__memset_chk);
|
||||
# endif
|
||||
+#else
|
||||
+# include <debug/memset_chk.c>
|
||||
#endif
|
||||
diff --git a/sysdeps/unix/sysv/linux/check_pf.c b/sysdeps/unix/sysv/linux/check_pf.c
|
||||
index 2b0b8b6368..3aa6a00348 100644
|
||||
--- a/sysdeps/unix/sysv/linux/check_pf.c
|
||||
+++ b/sysdeps/unix/sysv/linux/check_pf.c
|
||||
@@ -66,25 +66,10 @@ static struct cached_data *cache;
|
||||
__libc_lock_define_initialized (static, lock);
|
||||
|
||||
|
||||
-#if IS_IN (nscd)
|
||||
-static uint32_t nl_timestamp;
|
||||
-
|
||||
-uint32_t
|
||||
-__bump_nl_timestamp (void)
|
||||
-{
|
||||
- if (atomic_fetch_add_relaxed (&nl_timestamp, 1) + 1 == 0)
|
||||
- atomic_fetch_add_relaxed (&nl_timestamp, 1);
|
||||
-
|
||||
- return nl_timestamp;
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
static inline uint32_t
|
||||
get_nl_timestamp (void)
|
||||
{
|
||||
-#if IS_IN (nscd)
|
||||
- return nl_timestamp;
|
||||
-#elif defined USE_NSCD
|
||||
+#if defined USE_NSCD
|
||||
return __nscd_get_nl_timestamp ();
|
||||
#else
|
||||
return 0;
|
||||
diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h
|
||||
index cd4d0351ae..5ddb35c9d9 100644
|
||||
--- a/sysdeps/x86/dl-cacheinfo.h
|
||||
+++ b/sysdeps/x86/dl-cacheinfo.h
|
||||
@@ -315,40 +315,206 @@ handle_amd (int name)
|
||||
{
|
||||
unsigned int eax;
|
||||
unsigned int ebx;
|
||||
- unsigned int ecx;
|
||||
+ unsigned int ecx = 0;
|
||||
unsigned int edx;
|
||||
- unsigned int count = 0x1;
|
||||
+ unsigned int max_cpuid = 0;
|
||||
+ unsigned int fn = 0;
|
||||
|
||||
/* No level 4 cache (yet). */
|
||||
if (name > _SC_LEVEL3_CACHE_LINESIZE)
|
||||
return 0;
|
||||
|
||||
- if (name >= _SC_LEVEL3_CACHE_SIZE)
|
||||
- count = 0x3;
|
||||
- else if (name >= _SC_LEVEL2_CACHE_SIZE)
|
||||
- count = 0x2;
|
||||
- else if (name >= _SC_LEVEL1_DCACHE_SIZE)
|
||||
- count = 0x0;
|
||||
+ __cpuid (0x80000000, max_cpuid, ebx, ecx, edx);
|
||||
+
|
||||
+ if (max_cpuid >= 0x8000001D)
|
||||
+ /* Use __cpuid__ '0x8000_001D' to compute cache details. */
|
||||
+ {
|
||||
+ unsigned int count = 0x1;
|
||||
+
|
||||
+ if (name >= _SC_LEVEL3_CACHE_SIZE)
|
||||
+ count = 0x3;
|
||||
+ else if (name >= _SC_LEVEL2_CACHE_SIZE)
|
||||
+ count = 0x2;
|
||||
+ else if (name >= _SC_LEVEL1_DCACHE_SIZE)
|
||||
+ count = 0x0;
|
||||
+
|
||||
+ __cpuid_count (0x8000001D, count, eax, ebx, ecx, edx);
|
||||
+
|
||||
+ if (ecx != 0)
|
||||
+ {
|
||||
+ switch (name)
|
||||
+ {
|
||||
+ case _SC_LEVEL1_ICACHE_ASSOC:
|
||||
+ case _SC_LEVEL1_DCACHE_ASSOC:
|
||||
+ case _SC_LEVEL2_CACHE_ASSOC:
|
||||
+ case _SC_LEVEL3_CACHE_ASSOC:
|
||||
+ return ((ebx >> 22) & 0x3ff) + 1;
|
||||
+ case _SC_LEVEL1_ICACHE_LINESIZE:
|
||||
+ case _SC_LEVEL1_DCACHE_LINESIZE:
|
||||
+ case _SC_LEVEL2_CACHE_LINESIZE:
|
||||
+ case _SC_LEVEL3_CACHE_LINESIZE:
|
||||
+ return (ebx & 0xfff) + 1;
|
||||
+ case _SC_LEVEL1_ICACHE_SIZE:
|
||||
+ case _SC_LEVEL1_DCACHE_SIZE:
|
||||
+ case _SC_LEVEL2_CACHE_SIZE:
|
||||
+ case _SC_LEVEL3_CACHE_SIZE:
|
||||
+ return (((ebx >> 22) & 0x3ff) + 1) * ((ebx & 0xfff) + 1) * (ecx + 1);
|
||||
+ default:
|
||||
+ __builtin_unreachable ();
|
||||
+ }
|
||||
+ return -1;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* Legacy cache computation for CPUs prior to Bulldozer family.
|
||||
+ This is also a fail-safe mechanism for some hypervisors that
|
||||
+ accidentally configure __cpuid__ '0x8000_001D' to Zero. */
|
||||
+
|
||||
+ fn = 0x80000005 + (name >= _SC_LEVEL2_CACHE_SIZE);
|
||||
+
|
||||
+ if (max_cpuid < fn)
|
||||
+ return 0;
|
||||
+
|
||||
+ __cpuid (fn, eax, ebx, ecx, edx);
|
||||
|
||||
- __cpuid_count (0x8000001D, count, eax, ebx, ecx, edx);
|
||||
+ if (name < _SC_LEVEL1_DCACHE_SIZE)
|
||||
+ {
|
||||
+ name += _SC_LEVEL1_DCACHE_SIZE - _SC_LEVEL1_ICACHE_SIZE;
|
||||
+ ecx = edx;
|
||||
+ }
|
||||
|
||||
switch (name)
|
||||
{
|
||||
- case _SC_LEVEL1_ICACHE_ASSOC:
|
||||
- case _SC_LEVEL1_DCACHE_ASSOC:
|
||||
- case _SC_LEVEL2_CACHE_ASSOC:
|
||||
+ case _SC_LEVEL1_DCACHE_SIZE:
|
||||
+ return (ecx >> 14) & 0x3fc00;
|
||||
+
|
||||
+ case _SC_LEVEL1_DCACHE_ASSOC:
|
||||
+ ecx >>= 16;
|
||||
+ if ((ecx & 0xff) == 0xff)
|
||||
+ {
|
||||
+ /* Fully associative. */
|
||||
+ return (ecx << 2) & 0x3fc00;
|
||||
+ }
|
||||
+ return ecx & 0xff;
|
||||
+
|
||||
+ case _SC_LEVEL1_DCACHE_LINESIZE:
|
||||
+ return ecx & 0xff;
|
||||
+
|
||||
+ case _SC_LEVEL2_CACHE_SIZE:
|
||||
+ return (ecx & 0xf000) == 0 ? 0 : (ecx >> 6) & 0x3fffc00;
|
||||
+
|
||||
+ case _SC_LEVEL2_CACHE_ASSOC:
|
||||
+ switch ((ecx >> 12) & 0xf)
|
||||
+ {
|
||||
+ case 0:
|
||||
+ case 1:
|
||||
+ case 2:
|
||||
+ case 4:
|
||||
+ return (ecx >> 12) & 0xf;
|
||||
+ case 6:
|
||||
+ return 8;
|
||||
+ case 8:
|
||||
+ return 16;
|
||||
+ case 10:
|
||||
+ return 32;
|
||||
+ case 11:
|
||||
+ return 48;
|
||||
+ case 12:
|
||||
+ return 64;
|
||||
+ case 13:
|
||||
+ return 96;
|
||||
+ case 14:
|
||||
+ return 128;
|
||||
+ case 15:
|
||||
+ return ((ecx >> 6) & 0x3fffc00) / (ecx & 0xff);
|
||||
+ default:
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
+ case _SC_LEVEL2_CACHE_LINESIZE:
|
||||
+ return (ecx & 0xf000) == 0 ? 0 : ecx & 0xff;
|
||||
+
|
||||
+ case _SC_LEVEL3_CACHE_SIZE:
|
||||
+ {
|
||||
+ long int total_l3_cache = 0, l3_cache_per_thread = 0;
|
||||
+ unsigned int threads = 0;
|
||||
+ const struct cpu_features *cpu_features;
|
||||
+
|
||||
+ if ((edx & 0xf000) == 0)
|
||||
+ return 0;
|
||||
+
|
||||
+ total_l3_cache = (edx & 0x3ffc0000) << 1;
|
||||
+ cpu_features = __get_cpu_features ();
|
||||
+
|
||||
+ /* Figure out the number of logical threads that share L3. */
|
||||
+ if (max_cpuid >= 0x80000008)
|
||||
+ {
|
||||
+ /* Get width of APIC ID. */
|
||||
+ __cpuid (0x80000008, eax, ebx, ecx, edx);
|
||||
+ threads = (ecx & 0xff) + 1;
|
||||
+ }
|
||||
+
|
||||
+ if (threads == 0)
|
||||
+ {
|
||||
+ /* If APIC ID width is not available, use logical
|
||||
+ processor count. */
|
||||
+ __cpuid (0x00000001, eax, ebx, ecx, edx);
|
||||
+ if ((edx & (1 << 28)) != 0)
|
||||
+ threads = (ebx >> 16) & 0xff;
|
||||
+ }
|
||||
+
|
||||
+ /* Cap usage of highest cache level to the number of
|
||||
+ supported threads. */
|
||||
+ if (threads > 0)
|
||||
+ l3_cache_per_thread = total_l3_cache/threads;
|
||||
+
|
||||
+ /* Get shared cache per ccx for Zen architectures. */
|
||||
+ if (cpu_features->basic.family >= 0x17)
|
||||
+ {
|
||||
+ long int l3_cache_per_ccx = 0;
|
||||
+ /* Get number of threads share the L3 cache in CCX. */
|
||||
+ __cpuid_count (0x8000001D, 0x3, eax, ebx, ecx, edx);
|
||||
+ unsigned int threads_per_ccx = ((eax >> 14) & 0xfff) + 1;
|
||||
+ l3_cache_per_ccx = l3_cache_per_thread * threads_per_ccx;
|
||||
+ return l3_cache_per_ccx;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ return l3_cache_per_thread;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
case _SC_LEVEL3_CACHE_ASSOC:
|
||||
- return ecx ? ((ebx >> 22) & 0x3ff) + 1 : 0;
|
||||
- case _SC_LEVEL1_ICACHE_LINESIZE:
|
||||
- case _SC_LEVEL1_DCACHE_LINESIZE:
|
||||
- case _SC_LEVEL2_CACHE_LINESIZE:
|
||||
+ switch ((edx >> 12) & 0xf)
|
||||
+ {
|
||||
+ case 0:
|
||||
+ case 1:
|
||||
+ case 2:
|
||||
+ case 4:
|
||||
+ return (edx >> 12) & 0xf;
|
||||
+ case 6:
|
||||
+ return 8;
|
||||
+ case 8:
|
||||
+ return 16;
|
||||
+ case 10:
|
||||
+ return 32;
|
||||
+ case 11:
|
||||
+ return 48;
|
||||
+ case 12:
|
||||
+ return 64;
|
||||
+ case 13:
|
||||
+ return 96;
|
||||
+ case 14:
|
||||
+ return 128;
|
||||
+ case 15:
|
||||
+ return ((edx & 0x3ffc0000) << 1) / (edx & 0xff);
|
||||
+ default:
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
case _SC_LEVEL3_CACHE_LINESIZE:
|
||||
- return ecx ? (ebx & 0xfff) + 1 : 0;
|
||||
- case _SC_LEVEL1_ICACHE_SIZE:
|
||||
- case _SC_LEVEL1_DCACHE_SIZE:
|
||||
- case _SC_LEVEL2_CACHE_SIZE:
|
||||
- case _SC_LEVEL3_CACHE_SIZE:
|
||||
- return ecx ? (((ebx >> 22) & 0x3ff) + 1) * ((ebx & 0xfff) + 1) * (ecx + 1): 0;
|
||||
+ return (edx & 0xf000) == 0 ? 0 : edx & 0xff;
|
||||
+
|
||||
default:
|
||||
__builtin_unreachable ();
|
||||
}
|
||||
@@ -604,11 +770,10 @@ get_common_cache_info (long int *shared_ptr, long int * shared_per_thread_ptr, u
|
||||
level. */
|
||||
threads = ((cpu_features->features[CPUID_INDEX_1].cpuid.ebx >> 16)
|
||||
& 0xff);
|
||||
-
|
||||
- /* Get per-thread size of highest level cache. */
|
||||
- if (shared_per_thread > 0 && threads > 0)
|
||||
- shared_per_thread /= threads;
|
||||
}
|
||||
+ /* Get per-thread size of highest level cache. */
|
||||
+ if (shared_per_thread > 0 && threads > 0)
|
||||
+ shared_per_thread /= threads;
|
||||
}
|
||||
|
||||
/* Account for non-inclusive L2 and L3 caches. */
|
||||
@@ -703,7 +868,6 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
|
||||
data = handle_amd (_SC_LEVEL1_DCACHE_SIZE);
|
||||
core = handle_amd (_SC_LEVEL2_CACHE_SIZE);
|
||||
shared = handle_amd (_SC_LEVEL3_CACHE_SIZE);
|
||||
- shared_per_thread = shared;
|
||||
|
||||
level1_icache_size = handle_amd (_SC_LEVEL1_ICACHE_SIZE);
|
||||
level1_icache_linesize = handle_amd (_SC_LEVEL1_ICACHE_LINESIZE);
|
||||
@@ -716,13 +880,20 @@ dl_init_cacheinfo (struct cpu_features *cpu_features)
|
||||
level3_cache_size = shared;
|
||||
level3_cache_assoc = handle_amd (_SC_LEVEL3_CACHE_ASSOC);
|
||||
level3_cache_linesize = handle_amd (_SC_LEVEL3_CACHE_LINESIZE);
|
||||
+ level4_cache_size = handle_amd (_SC_LEVEL4_CACHE_SIZE);
|
||||
|
||||
if (shared <= 0)
|
||||
- /* No shared L3 cache. All we have is the L2 cache. */
|
||||
- shared = core;
|
||||
+ {
|
||||
+ /* No shared L3 cache. All we have is the L2 cache. */
|
||||
+ shared = core;
|
||||
+ }
|
||||
+ else if (cpu_features->basic.family < 0x17)
|
||||
+ {
|
||||
+ /* Account for exclusive L2 and L3 caches. */
|
||||
+ shared += core;
|
||||
+ }
|
||||
|
||||
- if (shared_per_thread <= 0)
|
||||
- shared_per_thread = shared;
|
||||
+ shared_per_thread = shared;
|
||||
}
|
||||
|
||||
cpu_features->level1_icache_size = level1_icache_size;
|
||||
diff --git a/sysdeps/x86_64/memcpy.S b/sysdeps/x86_64/memcpy.S
|
||||
index d98500a78a..4922cba657 100644
|
||||
--- a/sysdeps/x86_64/memcpy.S
|
||||
+++ b/sysdeps/x86_64/memcpy.S
|
||||
@@ -1 +1 @@
|
||||
-/* Implemented in memcpy.S. */
|
||||
+/* Implemented in memmove.S. */
|
||||
diff --git a/sysdeps/x86_64/memmove.S b/sysdeps/x86_64/memmove.S
|
||||
index f0b84e3b52..c3c08165e1 100644
|
||||
--- a/sysdeps/x86_64/memmove.S
|
||||
+++ b/sysdeps/x86_64/memmove.S
|
||||
@@ -46,6 +46,9 @@ weak_alias (__mempcpy, mempcpy)
|
||||
|
||||
#ifndef USE_MULTIARCH
|
||||
libc_hidden_builtin_def (memmove)
|
||||
+libc_hidden_builtin_def (__memmove_chk)
|
||||
+libc_hidden_builtin_def (__memcpy_chk)
|
||||
+libc_hidden_builtin_def (__mempcpy_chk)
|
||||
# if defined SHARED && IS_IN (libc)
|
||||
strong_alias (memmove, __memcpy)
|
||||
libc_hidden_ver (memmove, memcpy)
|
||||
diff --git a/sysdeps/x86_64/memset.S b/sysdeps/x86_64/memset.S
|
||||
index 7c99df36db..c6df24e8de 100644
|
||||
--- a/sysdeps/x86_64/memset.S
|
||||
+++ b/sysdeps/x86_64/memset.S
|
||||
@@ -32,6 +32,7 @@
|
||||
#include "isa-default-impl.h"
|
||||
|
||||
libc_hidden_builtin_def (memset)
|
||||
+libc_hidden_builtin_def (__memset_chk)
|
||||
|
||||
#if IS_IN (libc)
|
||||
libc_hidden_def (__wmemset)
|
72
glibc-32/glibc-2.38-fhs-1.patch
Normal file
72
glibc-32/glibc-2.38-fhs-1.patch
Normal file
@ -0,0 +1,72 @@
|
||||
Submitted By: Armin K. <krejzi at email dot com>
|
||||
Date: 2013-02-11
|
||||
Initial Package Version: 2.17
|
||||
Upstream Status: Not Applicable
|
||||
Origin: Self
|
||||
Description: This patch removes references to /var/db directory which is not part
|
||||
of FHS and replaces them with more suitable directories in /var
|
||||
hierarchy - /var/cache/nscd for nscd and /var/lib/nss_db for nss_db.
|
||||
|
||||
--- a/Makeconfig 2012-12-25 04:02:13.000000000 +0100
|
||||
+++ b/Makeconfig 2013-02-11 01:32:32.500667439 +0100
|
||||
@@ -250,7 +250,7 @@
|
||||
|
||||
# Directory for the database files and Makefile for nss_db.
|
||||
ifndef vardbdir
|
||||
-vardbdir = $(localstatedir)/db
|
||||
+vardbdir = $(localstatedir)/lib/nss_db
|
||||
endif
|
||||
inst_vardbdir = $(install_root)$(vardbdir)
|
||||
|
||||
--- a/nscd/nscd.h 2012-12-25 04:02:13.000000000 +0100
|
||||
+++ b/nscd/nscd.h 2013-02-11 01:32:32.500667439 +0100
|
||||
@@ -112,11 +112,11 @@
|
||||
|
||||
|
||||
/* Paths of the file for the persistent storage. */
|
||||
-#define _PATH_NSCD_PASSWD_DB "/var/db/nscd/passwd"
|
||||
-#define _PATH_NSCD_GROUP_DB "/var/db/nscd/group"
|
||||
-#define _PATH_NSCD_HOSTS_DB "/var/db/nscd/hosts"
|
||||
-#define _PATH_NSCD_SERVICES_DB "/var/db/nscd/services"
|
||||
-#define _PATH_NSCD_NETGROUP_DB "/var/db/nscd/netgroup"
|
||||
+#define _PATH_NSCD_PASSWD_DB "/var/cache/nscd/passwd"
|
||||
+#define _PATH_NSCD_GROUP_DB "/var/cache/nscd/group"
|
||||
+#define _PATH_NSCD_HOSTS_DB "/var/cache/nscd/hosts"
|
||||
+#define _PATH_NSCD_SERVICES_DB "/var/cache/nscd/services"
|
||||
+#define _PATH_NSCD_NETGROUP_DB "/var/cache/nscd/netgroup"
|
||||
|
||||
/* Path used when not using persistent storage. */
|
||||
#define _PATH_NSCD_XYZ_DB_TMP "/var/run/nscd/dbXXXXXX"
|
||||
--- a/nss/db-Makefile 2012-12-25 04:02:13.000000000 +0100
|
||||
+++ b/nss/db-Makefile 2013-02-11 01:32:32.500667439 +0100
|
||||
@@ -22,7 +22,7 @@
|
||||
/etc/rpc /etc/services /etc/shadow /etc/gshadow \
|
||||
/etc/netgroup)
|
||||
|
||||
-VAR_DB = /var/db
|
||||
+VAR_DB = /var/lib/nss_db
|
||||
|
||||
AWK = awk
|
||||
MAKEDB = makedb --quiet
|
||||
--- a/sysdeps/generic/paths.h 2012-12-25 04:02:13.000000000 +0100
|
||||
+++ b/sysdeps/generic/paths.h 2013-02-11 01:32:32.500667439 +0100
|
||||
@@ -68,7 +68,7 @@
|
||||
/* Provide trailing slash, since mostly used for building pathnames. */
|
||||
#define _PATH_DEV "/dev/"
|
||||
#define _PATH_TMP "/tmp/"
|
||||
-#define _PATH_VARDB "/var/db/"
|
||||
+#define _PATH_VARDB "/var/lib/nss_db/"
|
||||
#define _PATH_VARRUN "/var/run/"
|
||||
#define _PATH_VARTMP "/var/tmp/"
|
||||
|
||||
--- a/sysdeps/unix/sysv/linux/paths.h 2012-12-25 04:02:13.000000000 +0100
|
||||
+++ b/sysdeps/unix/sysv/linux/paths.h 2013-02-11 01:32:32.504000831 +0100
|
||||
@@ -68,7 +68,7 @@
|
||||
/* Provide trailing slash, since mostly used for building pathnames. */
|
||||
#define _PATH_DEV "/dev/"
|
||||
#define _PATH_TMP "/tmp/"
|
||||
-#define _PATH_VARDB "/var/db/"
|
||||
+#define _PATH_VARDB "/var/lib/nss_db/"
|
||||
#define _PATH_VARRUN "/var/run/"
|
||||
#define _PATH_VARTMP "/var/tmp/"
|
||||
|
585
glibc-32/glibc-2.38-memalign_fix-1.patch
Normal file
585
glibc-32/glibc-2.38-memalign_fix-1.patch
Normal file
@ -0,0 +1,585 @@
|
||||
Submitted By: Xi Ruoyao <xry111 at xry111.site>
|
||||
Date: 2023-08-13
|
||||
Initial Package Version: 2.38
|
||||
Upstream Status: Under review
|
||||
Origin: Upstream & Self
|
||||
- 1/3: https://sourceware.org/git/?p=glibc.git;a=patch;h=542b11058525
|
||||
- 2/3: https://sourceware.org/pipermail/libc-alpha/2023-August/150857.html
|
||||
- 3/3: Trivial unused code removal
|
||||
Description: Fixes a regression causing posix_memalign()
|
||||
very slow in certain conditions to avoid
|
||||
breaking ffmpeg-based applications.
|
||||
|
||||
From fc01478d06658ace8d57e5328c1e717275acfe84 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Fri, 11 Aug 2023 11:18:17 +0200
|
||||
Subject: [PATCH 1/3] malloc: Enable merging of remainders in memalign (bug
|
||||
30723)
|
||||
|
||||
Previously, calling _int_free from _int_memalign could put remainders
|
||||
into the tcache or into fastbins, where they are invisible to the
|
||||
low-level allocator. This results in missed merge opportunities
|
||||
because once these freed chunks become available to the low-level
|
||||
allocator, further memalign allocations (even of the same size are)
|
||||
likely obstructing merges.
|
||||
|
||||
Furthermore, during forwards merging in _int_memalign, do not
|
||||
completely give up when the remainder is too small to serve as a
|
||||
chunk on its own. We can still give it back if it can be merged
|
||||
with the following unused chunk. This makes it more likely that
|
||||
memalign calls in a loop achieve a compact memory layout,
|
||||
independently of initial heap layout.
|
||||
|
||||
Drop some useless (unsigned long) casts along the way, and tweak
|
||||
the style to more closely match GNU on changed lines.
|
||||
|
||||
Reviewed-by: DJ Delorie <dj@redhat.com>
|
||||
(cherry picked from commit 542b1105852568c3ebc712225ae78b8c8ba31a78)
|
||||
---
|
||||
malloc/malloc.c | 197 +++++++++++++++++++++++++++++-------------------
|
||||
1 file changed, 121 insertions(+), 76 deletions(-)
|
||||
|
||||
diff --git a/malloc/malloc.c b/malloc/malloc.c
|
||||
index e2f1a615a4..948f9759af 100644
|
||||
--- a/malloc/malloc.c
|
||||
+++ b/malloc/malloc.c
|
||||
@@ -1086,6 +1086,11 @@ typedef struct malloc_chunk* mchunkptr;
|
||||
|
||||
static void* _int_malloc(mstate, size_t);
|
||||
static void _int_free(mstate, mchunkptr, int);
|
||||
+static void _int_free_merge_chunk (mstate, mchunkptr, INTERNAL_SIZE_T);
|
||||
+static INTERNAL_SIZE_T _int_free_create_chunk (mstate,
|
||||
+ mchunkptr, INTERNAL_SIZE_T,
|
||||
+ mchunkptr, INTERNAL_SIZE_T);
|
||||
+static void _int_free_maybe_consolidate (mstate, INTERNAL_SIZE_T);
|
||||
static void* _int_realloc(mstate, mchunkptr, INTERNAL_SIZE_T,
|
||||
INTERNAL_SIZE_T);
|
||||
static void* _int_memalign(mstate, size_t, size_t);
|
||||
@@ -4637,31 +4642,52 @@ _int_free (mstate av, mchunkptr p, int have_lock)
|
||||
if (!have_lock)
|
||||
__libc_lock_lock (av->mutex);
|
||||
|
||||
- nextchunk = chunk_at_offset(p, size);
|
||||
-
|
||||
- /* Lightweight tests: check whether the block is already the
|
||||
- top block. */
|
||||
- if (__glibc_unlikely (p == av->top))
|
||||
- malloc_printerr ("double free or corruption (top)");
|
||||
- /* Or whether the next chunk is beyond the boundaries of the arena. */
|
||||
- if (__builtin_expect (contiguous (av)
|
||||
- && (char *) nextchunk
|
||||
- >= ((char *) av->top + chunksize(av->top)), 0))
|
||||
- malloc_printerr ("double free or corruption (out)");
|
||||
- /* Or whether the block is actually not marked used. */
|
||||
- if (__glibc_unlikely (!prev_inuse(nextchunk)))
|
||||
- malloc_printerr ("double free or corruption (!prev)");
|
||||
-
|
||||
- nextsize = chunksize(nextchunk);
|
||||
- if (__builtin_expect (chunksize_nomask (nextchunk) <= CHUNK_HDR_SZ, 0)
|
||||
- || __builtin_expect (nextsize >= av->system_mem, 0))
|
||||
- malloc_printerr ("free(): invalid next size (normal)");
|
||||
+ _int_free_merge_chunk (av, p, size);
|
||||
|
||||
- free_perturb (chunk2mem(p), size - CHUNK_HDR_SZ);
|
||||
+ if (!have_lock)
|
||||
+ __libc_lock_unlock (av->mutex);
|
||||
+ }
|
||||
+ /*
|
||||
+ If the chunk was allocated via mmap, release via munmap().
|
||||
+ */
|
||||
+
|
||||
+ else {
|
||||
+ munmap_chunk (p);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+/* Try to merge chunk P of SIZE bytes with its neighbors. Put the
|
||||
+ resulting chunk on the appropriate bin list. P must not be on a
|
||||
+ bin list yet, and it can be in use. */
|
||||
+static void
|
||||
+_int_free_merge_chunk (mstate av, mchunkptr p, INTERNAL_SIZE_T size)
|
||||
+{
|
||||
+ mchunkptr nextchunk = chunk_at_offset(p, size);
|
||||
+
|
||||
+ /* Lightweight tests: check whether the block is already the
|
||||
+ top block. */
|
||||
+ if (__glibc_unlikely (p == av->top))
|
||||
+ malloc_printerr ("double free or corruption (top)");
|
||||
+ /* Or whether the next chunk is beyond the boundaries of the arena. */
|
||||
+ if (__builtin_expect (contiguous (av)
|
||||
+ && (char *) nextchunk
|
||||
+ >= ((char *) av->top + chunksize(av->top)), 0))
|
||||
+ malloc_printerr ("double free or corruption (out)");
|
||||
+ /* Or whether the block is actually not marked used. */
|
||||
+ if (__glibc_unlikely (!prev_inuse(nextchunk)))
|
||||
+ malloc_printerr ("double free or corruption (!prev)");
|
||||
+
|
||||
+ INTERNAL_SIZE_T nextsize = chunksize(nextchunk);
|
||||
+ if (__builtin_expect (chunksize_nomask (nextchunk) <= CHUNK_HDR_SZ, 0)
|
||||
+ || __builtin_expect (nextsize >= av->system_mem, 0))
|
||||
+ malloc_printerr ("free(): invalid next size (normal)");
|
||||
+
|
||||
+ free_perturb (chunk2mem(p), size - CHUNK_HDR_SZ);
|
||||
|
||||
- /* consolidate backward */
|
||||
- if (!prev_inuse(p)) {
|
||||
- prevsize = prev_size (p);
|
||||
+ /* Consolidate backward. */
|
||||
+ if (!prev_inuse(p))
|
||||
+ {
|
||||
+ INTERNAL_SIZE_T prevsize = prev_size (p);
|
||||
size += prevsize;
|
||||
p = chunk_at_offset(p, -((long) prevsize));
|
||||
if (__glibc_unlikely (chunksize(p) != prevsize))
|
||||
@@ -4669,9 +4695,25 @@ _int_free (mstate av, mchunkptr p, int have_lock)
|
||||
unlink_chunk (av, p);
|
||||
}
|
||||
|
||||
- if (nextchunk != av->top) {
|
||||
+ /* Write the chunk header, maybe after merging with the following chunk. */
|
||||
+ size = _int_free_create_chunk (av, p, size, nextchunk, nextsize);
|
||||
+ _int_free_maybe_consolidate (av, size);
|
||||
+}
|
||||
+
|
||||
+/* Create a chunk at P of SIZE bytes, with SIZE potentially increased
|
||||
+ to cover the immediately following chunk NEXTCHUNK of NEXTSIZE
|
||||
+ bytes (if NEXTCHUNK is unused). The chunk at P is not actually
|
||||
+ read and does not have to be initialized. After creation, it is
|
||||
+ placed on the appropriate bin list. The function returns the size
|
||||
+ of the new chunk. */
|
||||
+static INTERNAL_SIZE_T
|
||||
+_int_free_create_chunk (mstate av, mchunkptr p, INTERNAL_SIZE_T size,
|
||||
+ mchunkptr nextchunk, INTERNAL_SIZE_T nextsize)
|
||||
+{
|
||||
+ if (nextchunk != av->top)
|
||||
+ {
|
||||
/* get and clear inuse bit */
|
||||
- nextinuse = inuse_bit_at_offset(nextchunk, nextsize);
|
||||
+ bool nextinuse = inuse_bit_at_offset (nextchunk, nextsize);
|
||||
|
||||
/* consolidate forward */
|
||||
if (!nextinuse) {
|
||||
@@ -4686,8 +4728,8 @@ _int_free (mstate av, mchunkptr p, int have_lock)
|
||||
been given one chance to be used in malloc.
|
||||
*/
|
||||
|
||||
- bck = unsorted_chunks(av);
|
||||
- fwd = bck->fd;
|
||||
+ mchunkptr bck = unsorted_chunks (av);
|
||||
+ mchunkptr fwd = bck->fd;
|
||||
if (__glibc_unlikely (fwd->bk != bck))
|
||||
malloc_printerr ("free(): corrupted unsorted chunks");
|
||||
p->fd = fwd;
|
||||
@@ -4706,61 +4748,52 @@ _int_free (mstate av, mchunkptr p, int have_lock)
|
||||
check_free_chunk(av, p);
|
||||
}
|
||||
|
||||
- /*
|
||||
- If the chunk borders the current high end of memory,
|
||||
- consolidate into top
|
||||
- */
|
||||
-
|
||||
- else {
|
||||
+ else
|
||||
+ {
|
||||
+ /* If the chunk borders the current high end of memory,
|
||||
+ consolidate into top. */
|
||||
size += nextsize;
|
||||
set_head(p, size | PREV_INUSE);
|
||||
av->top = p;
|
||||
check_chunk(av, p);
|
||||
}
|
||||
|
||||
- /*
|
||||
- If freeing a large space, consolidate possibly-surrounding
|
||||
- chunks. Then, if the total unused topmost memory exceeds trim
|
||||
- threshold, ask malloc_trim to reduce top.
|
||||
-
|
||||
- Unless max_fast is 0, we don't know if there are fastbins
|
||||
- bordering top, so we cannot tell for sure whether threshold
|
||||
- has been reached unless fastbins are consolidated. But we
|
||||
- don't want to consolidate on each free. As a compromise,
|
||||
- consolidation is performed if FASTBIN_CONSOLIDATION_THRESHOLD
|
||||
- is reached.
|
||||
- */
|
||||
+ return size;
|
||||
+}
|
||||
|
||||
- if ((unsigned long)(size) >= FASTBIN_CONSOLIDATION_THRESHOLD) {
|
||||
+/* If freeing a large space, consolidate possibly-surrounding
|
||||
+ chunks. Then, if the total unused topmost memory exceeds trim
|
||||
+ threshold, ask malloc_trim to reduce top. */
|
||||
+static void
|
||||
+_int_free_maybe_consolidate (mstate av, INTERNAL_SIZE_T size)
|
||||
+{
|
||||
+ /* Unless max_fast is 0, we don't know if there are fastbins
|
||||
+ bordering top, so we cannot tell for sure whether threshold has
|
||||
+ been reached unless fastbins are consolidated. But we don't want
|
||||
+ to consolidate on each free. As a compromise, consolidation is
|
||||
+ performed if FASTBIN_CONSOLIDATION_THRESHOLD is reached. */
|
||||
+ if (size >= FASTBIN_CONSOLIDATION_THRESHOLD)
|
||||
+ {
|
||||
if (atomic_load_relaxed (&av->have_fastchunks))
|
||||
malloc_consolidate(av);
|
||||
|
||||
- if (av == &main_arena) {
|
||||
+ if (av == &main_arena)
|
||||
+ {
|
||||
#ifndef MORECORE_CANNOT_TRIM
|
||||
- if ((unsigned long)(chunksize(av->top)) >=
|
||||
- (unsigned long)(mp_.trim_threshold))
|
||||
- systrim(mp_.top_pad, av);
|
||||
+ if (chunksize (av->top) >= mp_.trim_threshold)
|
||||
+ systrim (mp_.top_pad, av);
|
||||
#endif
|
||||
- } else {
|
||||
- /* Always try heap_trim(), even if the top chunk is not
|
||||
- large, because the corresponding heap might go away. */
|
||||
- heap_info *heap = heap_for_ptr(top(av));
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ /* Always try heap_trim, even if the top chunk is not large,
|
||||
+ because the corresponding heap might go away. */
|
||||
+ heap_info *heap = heap_for_ptr (top (av));
|
||||
|
||||
- assert(heap->ar_ptr == av);
|
||||
- heap_trim(heap, mp_.top_pad);
|
||||
- }
|
||||
+ assert (heap->ar_ptr == av);
|
||||
+ heap_trim (heap, mp_.top_pad);
|
||||
+ }
|
||||
}
|
||||
-
|
||||
- if (!have_lock)
|
||||
- __libc_lock_unlock (av->mutex);
|
||||
- }
|
||||
- /*
|
||||
- If the chunk was allocated via mmap, release via munmap().
|
||||
- */
|
||||
-
|
||||
- else {
|
||||
- munmap_chunk (p);
|
||||
- }
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -5221,7 +5254,7 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
|
||||
(av != &main_arena ? NON_MAIN_ARENA : 0));
|
||||
set_inuse_bit_at_offset (newp, newsize);
|
||||
set_head_size (p, leadsize | (av != &main_arena ? NON_MAIN_ARENA : 0));
|
||||
- _int_free (av, p, 1);
|
||||
+ _int_free_merge_chunk (av, p, leadsize);
|
||||
p = newp;
|
||||
|
||||
assert (newsize >= nb &&
|
||||
@@ -5232,15 +5265,27 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
|
||||
if (!chunk_is_mmapped (p))
|
||||
{
|
||||
size = chunksize (p);
|
||||
- if ((unsigned long) (size) > (unsigned long) (nb + MINSIZE))
|
||||
+ mchunkptr nextchunk = chunk_at_offset(p, size);
|
||||
+ INTERNAL_SIZE_T nextsize = chunksize(nextchunk);
|
||||
+ if (size > nb)
|
||||
{
|
||||
remainder_size = size - nb;
|
||||
- remainder = chunk_at_offset (p, nb);
|
||||
- set_head (remainder, remainder_size | PREV_INUSE |
|
||||
- (av != &main_arena ? NON_MAIN_ARENA : 0));
|
||||
- set_head_size (p, nb);
|
||||
- _int_free (av, remainder, 1);
|
||||
- }
|
||||
+ if (remainder_size >= MINSIZE
|
||||
+ || nextchunk == av->top
|
||||
+ || !inuse_bit_at_offset (nextchunk, nextsize))
|
||||
+ {
|
||||
+ /* We can only give back the tail if it is larger than
|
||||
+ MINSIZE, or if the following chunk is unused (top
|
||||
+ chunk or unused in-heap chunk). Otherwise we would
|
||||
+ create a chunk that is smaller than MINSIZE. */
|
||||
+ remainder = chunk_at_offset (p, nb);
|
||||
+ set_head_size (p, nb);
|
||||
+ remainder_size = _int_free_create_chunk (av, remainder,
|
||||
+ remainder_size,
|
||||
+ nextchunk, nextsize);
|
||||
+ _int_free_maybe_consolidate (av, remainder_size);
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
check_inuse_chunk (av, p);
|
||||
--
|
||||
2.41.0
|
||||
|
||||
From b37e836b7cc2dba672e1de1cc7e076ba1c712614 Mon Sep 17 00:00:00 2001
|
||||
From: Florian Weimer <fweimer@redhat.com>
|
||||
Date: Fri, 11 Aug 2023 17:48:13 +0200
|
||||
Subject: [PATCH 2/3] malloc: Remove bin scanning from memalign (bug 30723)
|
||||
|
||||
On the test workload (mpv --cache=yes with VP9 video decoding), the
|
||||
bin scanning has a very poor success rate (less than 2%). The tcache
|
||||
scanning has about 50% success rate, so keep that.
|
||||
|
||||
Update comments in malloc/tst-memalign-2 to indicate the purpose
|
||||
of the tests. Even with the scanning removed, the additional
|
||||
merging opportunities since commit 542b1105852568c3ebc712225ae78b
|
||||
("malloc: Enable merging of remainders in memalign (bug 30723)")
|
||||
are sufficient to pass the existing large bins test.
|
||||
|
||||
Link: https://sourceware.org/pipermail/libc-alpha/2023-August/150857.html
|
||||
---
|
||||
malloc/malloc.c | 127 ++--------------------------------------
|
||||
malloc/tst-memalign-2.c | 7 ++-
|
||||
2 files changed, 10 insertions(+), 124 deletions(-)
|
||||
|
||||
diff --git a/malloc/malloc.c b/malloc/malloc.c
|
||||
index 948f9759af..9c2cab7a59 100644
|
||||
--- a/malloc/malloc.c
|
||||
+++ b/malloc/malloc.c
|
||||
@@ -5082,7 +5082,6 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
|
||||
mchunkptr remainder; /* spare room at end to split off */
|
||||
unsigned long remainder_size; /* its size */
|
||||
INTERNAL_SIZE_T size;
|
||||
- mchunkptr victim;
|
||||
|
||||
nb = checked_request2size (bytes);
|
||||
if (nb == 0)
|
||||
@@ -5101,129 +5100,13 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
|
||||
we don't find anything in those bins, the common malloc code will
|
||||
scan starting at 2x. */
|
||||
|
||||
- /* This will be set if we found a candidate chunk. */
|
||||
- victim = NULL;
|
||||
+ /* Call malloc with worst case padding to hit alignment. */
|
||||
+ m = (char *) (_int_malloc (av, nb + alignment + MINSIZE));
|
||||
|
||||
- /* Fast bins are singly-linked, hard to remove a chunk from the middle
|
||||
- and unlikely to meet our alignment requirements. We have not done
|
||||
- any experimentation with searching for aligned fastbins. */
|
||||
+ if (m == 0)
|
||||
+ return 0; /* propagate failure */
|
||||
|
||||
- if (av != NULL)
|
||||
- {
|
||||
- int first_bin_index;
|
||||
- int first_largebin_index;
|
||||
- int last_bin_index;
|
||||
-
|
||||
- if (in_smallbin_range (nb))
|
||||
- first_bin_index = smallbin_index (nb);
|
||||
- else
|
||||
- first_bin_index = largebin_index (nb);
|
||||
-
|
||||
- if (in_smallbin_range (nb * 2))
|
||||
- last_bin_index = smallbin_index (nb * 2);
|
||||
- else
|
||||
- last_bin_index = largebin_index (nb * 2);
|
||||
-
|
||||
- first_largebin_index = largebin_index (MIN_LARGE_SIZE);
|
||||
-
|
||||
- int victim_index; /* its bin index */
|
||||
-
|
||||
- for (victim_index = first_bin_index;
|
||||
- victim_index < last_bin_index;
|
||||
- victim_index ++)
|
||||
- {
|
||||
- victim = NULL;
|
||||
-
|
||||
- if (victim_index < first_largebin_index)
|
||||
- {
|
||||
- /* Check small bins. Small bin chunks are doubly-linked despite
|
||||
- being the same size. */
|
||||
-
|
||||
- mchunkptr fwd; /* misc temp for linking */
|
||||
- mchunkptr bck; /* misc temp for linking */
|
||||
-
|
||||
- bck = bin_at (av, victim_index);
|
||||
- fwd = bck->fd;
|
||||
- while (fwd != bck)
|
||||
- {
|
||||
- if (chunk_ok_for_memalign (fwd, alignment, nb) > 0)
|
||||
- {
|
||||
- victim = fwd;
|
||||
-
|
||||
- /* Unlink it */
|
||||
- victim->fd->bk = victim->bk;
|
||||
- victim->bk->fd = victim->fd;
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- fwd = fwd->fd;
|
||||
- }
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- /* Check large bins. */
|
||||
- mchunkptr fwd; /* misc temp for linking */
|
||||
- mchunkptr bck; /* misc temp for linking */
|
||||
- mchunkptr best = NULL;
|
||||
- size_t best_size = 0;
|
||||
-
|
||||
- bck = bin_at (av, victim_index);
|
||||
- fwd = bck->fd;
|
||||
-
|
||||
- while (fwd != bck)
|
||||
- {
|
||||
- int extra;
|
||||
-
|
||||
- if (chunksize (fwd) < nb)
|
||||
- break;
|
||||
- extra = chunk_ok_for_memalign (fwd, alignment, nb);
|
||||
- if (extra > 0
|
||||
- && (extra <= best_size || best == NULL))
|
||||
- {
|
||||
- best = fwd;
|
||||
- best_size = extra;
|
||||
- }
|
||||
-
|
||||
- fwd = fwd->fd;
|
||||
- }
|
||||
- victim = best;
|
||||
-
|
||||
- if (victim != NULL)
|
||||
- {
|
||||
- unlink_chunk (av, victim);
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (victim != NULL)
|
||||
- break;
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- /* Strategy: find a spot within that chunk that meets the alignment
|
||||
- request, and then possibly free the leading and trailing space.
|
||||
- This strategy is incredibly costly and can lead to external
|
||||
- fragmentation if header and footer chunks are unused. */
|
||||
-
|
||||
- if (victim != NULL)
|
||||
- {
|
||||
- p = victim;
|
||||
- m = chunk2mem (p);
|
||||
- set_inuse (p);
|
||||
- if (av != &main_arena)
|
||||
- set_non_main_arena (p);
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- /* Call malloc with worst case padding to hit alignment. */
|
||||
-
|
||||
- m = (char *) (_int_malloc (av, nb + alignment + MINSIZE));
|
||||
-
|
||||
- if (m == 0)
|
||||
- return 0; /* propagate failure */
|
||||
-
|
||||
- p = mem2chunk (m);
|
||||
- }
|
||||
+ p = mem2chunk (m);
|
||||
|
||||
if ((((unsigned long) (m)) % alignment) != 0) /* misaligned */
|
||||
{
|
||||
diff --git a/malloc/tst-memalign-2.c b/malloc/tst-memalign-2.c
|
||||
index f229283dbf..ecd6fa249e 100644
|
||||
--- a/malloc/tst-memalign-2.c
|
||||
+++ b/malloc/tst-memalign-2.c
|
||||
@@ -86,7 +86,8 @@ do_test (void)
|
||||
TEST_VERIFY (tcache_allocs[i].ptr1 == tcache_allocs[i].ptr2);
|
||||
}
|
||||
|
||||
- /* Test for non-head tcache hits. */
|
||||
+ /* Test for non-head tcache hits. This exercises the memalign
|
||||
+ scanning code to find matching allocations. */
|
||||
for (i = 0; i < array_length (ptr); ++ i)
|
||||
{
|
||||
if (i == 4)
|
||||
@@ -113,7 +114,9 @@ do_test (void)
|
||||
free (p);
|
||||
TEST_VERIFY (count > 0);
|
||||
|
||||
- /* Large bins test. */
|
||||
+ /* Large bins test. This verifies that the over-allocated parts
|
||||
+ that memalign releases for future allocations can be reused by
|
||||
+ memalign itself at least in some cases. */
|
||||
|
||||
for (i = 0; i < LN; ++ i)
|
||||
{
|
||||
--
|
||||
2.41.0
|
||||
|
||||
From 26973f7b09c33e67f6bcbc79371796c8dd334528 Mon Sep 17 00:00:00 2001
|
||||
From: Xi Ruoyao <xry111@xry111.site>
|
||||
Date: Mon, 14 Aug 2023 11:05:18 +0800
|
||||
Subject: [PATCH 3/3] malloc: Remove unused functions and variables
|
||||
|
||||
Remove unused chunk_ok_for_memalign function and unused local variables
|
||||
in _int_free.
|
||||
|
||||
Signed-off-by: Xi Ruoyao <xry111@xry111.site>
|
||||
---
|
||||
malloc/malloc.c | 42 ------------------------------------------
|
||||
1 file changed, 42 deletions(-)
|
||||
|
||||
diff --git a/malloc/malloc.c b/malloc/malloc.c
|
||||
index 9c2cab7a59..d0bbbf3710 100644
|
||||
--- a/malloc/malloc.c
|
||||
+++ b/malloc/malloc.c
|
||||
@@ -4488,12 +4488,6 @@ _int_free (mstate av, mchunkptr p, int have_lock)
|
||||
{
|
||||
INTERNAL_SIZE_T size; /* its size */
|
||||
mfastbinptr *fb; /* associated fastbin */
|
||||
- mchunkptr nextchunk; /* next contiguous chunk */
|
||||
- INTERNAL_SIZE_T nextsize; /* its size */
|
||||
- int nextinuse; /* true if nextchunk is used */
|
||||
- INTERNAL_SIZE_T prevsize; /* size of previous contiguous chunk */
|
||||
- mchunkptr bck; /* misc temp for linking */
|
||||
- mchunkptr fwd; /* misc temp for linking */
|
||||
|
||||
size = chunksize (p);
|
||||
|
||||
@@ -5032,42 +5026,6 @@ _int_realloc (mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize,
|
||||
------------------------------ memalign ------------------------------
|
||||
*/
|
||||
|
||||
-/* Returns 0 if the chunk is not and does not contain the requested
|
||||
- aligned sub-chunk, else returns the amount of "waste" from
|
||||
- trimming. NB is the *chunk* byte size, not the user byte
|
||||
- size. */
|
||||
-static size_t
|
||||
-chunk_ok_for_memalign (mchunkptr p, size_t alignment, size_t nb)
|
||||
-{
|
||||
- void *m = chunk2mem (p);
|
||||
- INTERNAL_SIZE_T size = chunksize (p);
|
||||
- void *aligned_m = m;
|
||||
-
|
||||
- if (__glibc_unlikely (misaligned_chunk (p)))
|
||||
- malloc_printerr ("_int_memalign(): unaligned chunk detected");
|
||||
-
|
||||
- aligned_m = PTR_ALIGN_UP (m, alignment);
|
||||
-
|
||||
- INTERNAL_SIZE_T front_extra = (intptr_t) aligned_m - (intptr_t) m;
|
||||
-
|
||||
- /* We can't trim off the front as it's too small. */
|
||||
- if (front_extra > 0 && front_extra < MINSIZE)
|
||||
- return 0;
|
||||
-
|
||||
- /* If it's a perfect fit, it's an exception to the return value rule
|
||||
- (we would return zero waste, which looks like "not usable"), so
|
||||
- handle it here by returning a small non-zero value instead. */
|
||||
- if (size == nb && front_extra == 0)
|
||||
- return 1;
|
||||
-
|
||||
- /* If the block we need fits in the chunk, calculate total waste. */
|
||||
- if (size > nb + front_extra)
|
||||
- return size - nb;
|
||||
-
|
||||
- /* Can't use this chunk. */
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
/* BYTES is user requested bytes, not requested chunksize bytes. */
|
||||
static void *
|
||||
_int_memalign (mstate av, size_t alignment, size_t bytes)
|
||||
--
|
||||
2.41.0
|
||||
|
Loading…
Reference in New Issue
Block a user