devel

devel@uclibc-ng.org

1160 discussions

Re: diable misc tests
by Pavel Kozlov 15 Nov '23

15 Nov '23

Hi Ramin, > the variable i is overwritten with 0 after the getrlimit() call > my guess is that rlim needs a 8 byte alignment on sparc Thanks for sharing this problem. > i'm using the current uclibc-ng master ( only a few commits are not merged ) Please point to the exact commit you are on. If you are somewhere between: 95e38b37 ("add support for systems without legacy setrlimit/getrlimit syscalls") and 8c2f6218 (setrlimit/getrlimit: fix prlimit64 syscall use for 32-bit CPUs) then I have a simple explanation for this problem, and it is already fixed by the 8c2f6218 and the following commits. Please check the 8c2f6218 commit description. Regards, - Pavel From: Ramin Moussavi <lordrasmus(a)gmail.com> Sent: Tuesday, November 14, 2023 11:47 PM To: Waldemar Brodkorb <mail(a)waldemar-brodkorb.de> Cc: devel(a)uclibc-ng.org <devel(a)uclibc-ng.org> Subject: [uclibc-ng-devel] Re: diable misc tests i'm using the current uclibc-ng master ( only a few commits are not merged ) i wanted to report that issue later when know what is going wrong for now i just disabled the misc tests on sparc what i discovered is that when running the test suite on qemu sparc the test tst-rlimit.c runs into an endless loop here is what is happening on my build int main(void) { int rnum = -1; struct rlimit rlim; int i, ret; /* Find a resource with hard limit set to infinity */ for (i = 0; i < nresources; ++i) { ret = getrlimit(resources[i], &rlim); if ((!ret) && (rlim.rlim_max == RLIM_INFINITY)) { rnum = resources[i]; break; } } the variable i is overwritten with 0 after the getrlimit() call my guess is that rlim needs a 8 byte alignment on sparc when i set the alignment for rlim to 8 bytes via gcc attributes the tests runs fine for now i don't know if its a gcc , qemu or kernel issue Am Di., 14. Nov. 2023 um 14:27 Uhr schrieb Waldemar Brodkorb <wbx(a)uclibc-ng.org>: Hi, works for me. You need to use uclibc-ng master for the new rlimit tests. I pushed them to github now. best regards Waldemar Ramin Moussavi wrote, > > _______________________________________________ > devel mailing list -- devel(a)uclibc-ng.org > To unsubscribe send an email to devel-leave(a)uclibc-ng.org

1 0

diable misc tests
by Ramin Moussavi 14 Nov '23

14 Nov '23

2 2

[PATCH] misc: add tests for getrlimit/setrlimit/prlimit
by Pavel Kozlov 10 Nov '23

10 Nov '23

From: Pavel Kozlov <pavel.kozlov(a)synopsys.com> Add tst-rlimit test to check setrlimit/getrlimit/prlimit and setrlimit64/getrlimit64/prlimit64 functions. Add tst-rlimit64 to check the 64-bit offset variant. Signed-off-by: Pavel Kozlov <pavel.kozlov(a)synopsys.com> --- test/misc/Makefile.in | 1 + test/misc/tst-rlimit.c | 157 +++++++++++++++++++++++++++++++++++++++ test/misc/tst-rlimit64.c | 1 + 3 files changed, 159 insertions(+) create mode 100644 test/misc/tst-rlimit.c create mode 100644 test/misc/tst-rlimit64.c diff --git a/test/misc/Makefile.in b/test/misc/Makefile.in index a97b124e4a35..96c1fd976f0e 100644 --- a/test/misc/Makefile.in +++ b/test/misc/Makefile.in @@ -8,6 +8,7 @@ TESTS_DISABLED += tst-inotify endif CFLAGS_dirent64 := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +CFLAGS_tst-rlimit64 := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 DODIFF_dirent := 1 DODIFF_dirent64 := 1 diff --git a/test/misc/tst-rlimit.c b/test/misc/tst-rlimit.c new file mode 100644 index 000000000000..84aa465869da --- /dev/null +++ b/test/misc/tst-rlimit.c @@ -0,0 +1,157 @@ +/* + * setrlimit/getrlimit/prlimit and setrlimit64/getrlimit64/prlimit64 functions + * test for uClibc. + * + * The prlimit64 function is not called directly in this test, because it is a + * new function for uclibc and can cause build problems with uclibc-ng <= 1.0.44. + * With _FILE_OFFSET_BITS == 64 the prlimit call is redirected to the prlimit64 + * call. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <sys/resource.h> + +#define __ASSERT(x, f, l) \ + if (!(x)) { \ + fprintf(stderr, "%s: LINE %d: ASSERT: " #x "\n", f, l); \ + exit(1); \ + } + +#define ASSERT(x) __ASSERT(x, __FILE__, __LINE__) + +static int resources[] = { + RLIMIT_CORE, + RLIMIT_CPU, + RLIMIT_DATA, + RLIMIT_FSIZE, + RLIMIT_NOFILE, + RLIMIT_STACK, + RLIMIT_AS +}; + +#define nresources (sizeof (resources) / sizeof (resources[0])) +#define TEST_VAL 0x11223344 + + +static void test_getrlimit(int rnum, rlim_t exp_cur, rlim_t exp_max) +{ + struct rlimit r; + + ASSERT(getrlimit(rnum, &r) == 0); + ASSERT(r.rlim_cur == exp_cur); + ASSERT(r.rlim_max == exp_max); +} + +static void test_setrlimit(int rnum, rlim_t new_cur, rlim_t new_max) +{ + struct rlimit r = {.rlim_cur = new_cur, .rlim_max = new_max}; + + ASSERT(setrlimit(rnum, &r) == 0); +} + +static void test_prlimit_get(int rnum, rlim_t exp_cur, rlim_t exp_max) +{ + struct rlimit r; + + ASSERT(prlimit(0, rnum, NULL, &r) == 0); + ASSERT(r.rlim_cur == exp_cur); + ASSERT(r.rlim_max == exp_max); +} + +static void test_prlimit_set(int rnum, rlim_t new_cur, rlim_t new_max) +{ + struct rlimit r = {.rlim_cur = new_cur, .rlim_max = new_max}; + ASSERT(prlimit(0, rnum, &r, NULL) == 0); +} + +#if defined(__USE_LARGEFILE64) +static void test_getrlimit64(int rnum, rlim64_t exp_cur, rlim64_t exp_max) +{ + struct rlimit64 r; + + ASSERT(getrlimit64(rnum, &r) == 0); + ASSERT(r.rlim_cur == exp_cur); + ASSERT(r.rlim_max == exp_max); +} + +static void test_setrlimit64(int rnum, rlim64_t new_cur, rlim64_t new_max) +{ + struct rlimit64 r = {.rlim_cur = new_cur, .rlim_max = new_max}; + + ASSERT(setrlimit64(rnum, &r) == 0); +} +#endif + +int main(void) +{ + int rnum = -1; + struct rlimit rlim; + int i, ret; + + /* Find a resource with hard limit set to infinity */ + for (i = 0; i < nresources; ++i) { + ret = getrlimit(resources[i], &rlim); + if ((!ret) && (rlim.rlim_max == RLIM_INFINITY)) { + rnum = resources[i]; + break; + } + } + + /* Can't continue, return unsupported */ + if (rnum == -1) + return 23; + + /* Test cases */ + test_setrlimit(rnum, TEST_VAL, RLIM_INFINITY); + test_getrlimit(rnum, TEST_VAL, RLIM_INFINITY); + test_setrlimit(rnum, RLIM_INFINITY, RLIM_INFINITY); + test_getrlimit(rnum, RLIM_INFINITY, RLIM_INFINITY); + test_prlimit_get(rnum, RLIM_INFINITY, RLIM_INFINITY); + test_prlimit_set(rnum, TEST_VAL, RLIM_INFINITY); + test_prlimit_get(rnum, TEST_VAL, RLIM_INFINITY); + test_getrlimit(rnum, TEST_VAL, RLIM_INFINITY); + test_prlimit_set(rnum, RLIM_INFINITY, RLIM_INFINITY); + test_getrlimit(rnum, RLIM_INFINITY, RLIM_INFINITY); + test_prlimit_get(rnum, RLIM_INFINITY, RLIM_INFINITY); + +#if defined(__USE_LARGEFILE64) + /* Check setrlim64 and getrlim64 in 32-bit offset LFS environment */ + test_setrlimit64(rnum, TEST_VAL, RLIM64_INFINITY); + test_getrlimit(rnum, TEST_VAL, RLIM_INFINITY); + test_getrlimit64(rnum, TEST_VAL, RLIM64_INFINITY); + test_setrlimit64(rnum, RLIM64_INFINITY, RLIM64_INFINITY); + test_prlimit_get(rnum, RLIM_INFINITY, RLIM_INFINITY); + test_getrlimit64(rnum, RLIM64_INFINITY, RLIM64_INFINITY); + + test_setrlimit(rnum, TEST_VAL, RLIM_INFINITY); + test_getrlimit64(rnum, TEST_VAL, RLIM64_INFINITY); + test_prlimit_set(rnum, RLIM_INFINITY, RLIM_INFINITY); + test_getrlimit64(rnum, RLIM64_INFINITY, RLIM64_INFINITY); +#endif + + +#if defined(__USE_LARGEFILE64) && _FILE_OFFSET_BITS == 64 + /* Check setrlim64/getrlim64/prlimit64 in 64-bit offset environment */ + test_setrlimit64(rnum, TEST_VAL, RLIM64_INFINITY); + test_getrlimit64(rnum, TEST_VAL, RLIM64_INFINITY); + test_getrlimit(rnum, TEST_VAL, RLIM_INFINITY); + test_setrlimit64(rnum, RLIM64_INFINITY, RLIM64_INFINITY); + test_prlimit_get(rnum, RLIM64_INFINITY, RLIM64_INFINITY); + test_getrlimit(rnum, RLIM_INFINITY, RLIM_INFINITY); + test_prlimit_set(rnum, TEST_VAL, RLIM64_INFINITY); + test_prlimit_get(rnum, TEST_VAL, RLIM64_INFINITY); + test_prlimit_set(rnum, RLIM64_INFINITY, RLIM64_INFINITY); + test_getrlimit64(rnum, RLIM64_INFINITY, RLIM64_INFINITY); + test_getrlimit(rnum, RLIM_INFINITY, RLIM_INFINITY); + + test_setrlimit(rnum, TEST_VAL, RLIM_INFINITY); + test_getrlimit64(rnum, TEST_VAL, RLIM64_INFINITY); + test_prlimit_set(rnum, RLIM_INFINITY, RLIM_INFINITY); + test_getrlimit64(rnum, RLIM64_INFINITY, RLIM64_INFINITY); +#endif + + return 0; +} diff --git a/test/misc/tst-rlimit64.c b/test/misc/tst-rlimit64.c new file mode 100644 index 000000000000..490c6c59022c --- /dev/null +++ b/test/misc/tst-rlimit64.c @@ -0,0 +1 @@ +#include "tst-rlimit.c" -- 2.25.1

2 3

[PATCH v2] libpthread/nptl: make default stack size configurable
by Ben Wolsieffer 10 Nov '23

10 Nov '23

Threads currently have 2-4 MiB stacks by default (depending on the platform). This is fine on MMU platforms, where this stack space is not actually allocated until it is used, but tends to waste a large amount of memory on no-MMU platforms. This patch adds a PTHREADS_STACK_DEFAULT_SIZE Kconfig option that allows the user to override the default stack size at build time. This allows the user to select a reasonable default stack size for the software that runs on their system, and avoids the need to patch every package to add calls to pthread_attr_setstacksize(). An alternative to this patch would be to change the hardcoded default stack size on no-MMU platforms, but it is difficult to choose an appropriate value because the minimum required stack depends on the software in use. This would also be a breaking change. Signed-off-by: Ben Wolsieffer <ben.wolsieffer(a)hefring.com> --- Changes in v2: * Entirely move default stack size configuration to Kconfig extra/Configs/Config.in | 9 +++++++++ libpthread/nptl/init.c | 14 +++++++------- libpthread/nptl/sysdeps/aarch64/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/alpha/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/arc/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/arm/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/csky/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/i386/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/kvx/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/m68k/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/metag/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/microblaze/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/mips/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/nds32/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/nios2/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/or1k/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/powerpc/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/riscv64/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/sh/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/sparc/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/x86_64/pthreaddef.h | 3 --- libpthread/nptl/sysdeps/xtensa/pthreaddef.h | 3 --- 22 files changed, 16 insertions(+), 67 deletions(-) diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 6bbb6f572..c2834f5ec 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -628,6 +628,15 @@ config PTHREADS_DEBUG_SUPPORT If you are doing development and want to debug applications using uClibc's pthread library, answer Y. Otherwise, answer N. +config PTHREADS_STACK_DEFAULT_SIZE + int "Default thread stack size" + default 4194304 if TARGET_alpha # 4 MiB + default 4194304 if TARGET_powerpc # 4 MiB + default 2097152 # 2 MiB + help + Set the default thread stack size. This option is useful on MMU-less + systems where the stack size is fixed and the default stack size may + be excessively large and waste memory. config UCLIBC_HAS_SYSLOG bool "Syslog support" diff --git a/libpthread/nptl/init.c b/libpthread/nptl/init.c index 5d25ded7d..ddc552f2e 100644 --- a/libpthread/nptl/init.c +++ b/libpthread/nptl/init.c @@ -278,17 +278,17 @@ __pthread_initialize_minimal_internal (void) struct rlimit limit; if (getrlimit (RLIMIT_STACK, &limit) != 0 || limit.rlim_cur == RLIM_INFINITY) - /* The system limit is not usable. Use an architecture-specific - default. */ - limit.rlim_cur = ARCH_STACK_DEFAULT_SIZE; - else if (limit.rlim_cur < PTHREAD_STACK_MIN) + /* The system limit is not usable. Use a user-specified or + architecture-specific default. */ + limit.rlim_cur = __PTHREADS_STACK_DEFAULT_SIZE__; + if (limit.rlim_cur < PTHREAD_STACK_MIN) /* The system limit is unusably small. Use the minimal size acceptable. */ limit.rlim_cur = PTHREAD_STACK_MIN; - /* Do not exceed architecture specific default */ - if (limit.rlim_cur > ARCH_STACK_DEFAULT_SIZE) - limit.rlim_cur = ARCH_STACK_DEFAULT_SIZE; + /* Do not exceed the user-specified or architecture-specific default */ + if (limit.rlim_cur > __PTHREADS_STACK_DEFAULT_SIZE__) + limit.rlim_cur = __PTHREADS_STACK_DEFAULT_SIZE__; /* Make sure it meets the minimum size that allocate_stack (allocatestack.c) will demand, which depends on the page size. */ diff --git a/libpthread/nptl/sysdeps/aarch64/pthreaddef.h b/libpthread/nptl/sysdeps/aarch64/pthreaddef.h index d9495f9cb..7172f406b 100644 --- a/libpthread/nptl/sysdeps/aarch64/pthreaddef.h +++ b/libpthread/nptl/sysdeps/aarch64/pthreaddef.h @@ -14,9 +14,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/alpha/pthreaddef.h b/libpthread/nptl/sysdeps/alpha/pthreaddef.h index 72a311c33..6b99f3b4f 100644 --- a/libpthread/nptl/sysdeps/alpha/pthreaddef.h +++ b/libpthread/nptl/sysdeps/alpha/pthreaddef.h @@ -15,9 +15,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (4 * 1024 * 1024) - /* Required stack pointer alignment at beginning. The ABI requires 16. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/arc/pthreaddef.h b/libpthread/nptl/sysdeps/arc/pthreaddef.h index bf4f0f29a..0fb28dc48 100644 --- a/libpthread/nptl/sysdeps/arc/pthreaddef.h +++ b/libpthread/nptl/sysdeps/arc/pthreaddef.h @@ -17,9 +17,6 @@ #include <sysdep.h> -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 8 diff --git a/libpthread/nptl/sysdeps/arm/pthreaddef.h b/libpthread/nptl/sysdeps/arm/pthreaddef.h index a05ac879d..f790a6dca 100644 --- a/libpthread/nptl/sysdeps/arm/pthreaddef.h +++ b/libpthread/nptl/sysdeps/arm/pthreaddef.h @@ -15,9 +15,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. SSE requires 16 bytes. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/csky/pthreaddef.h b/libpthread/nptl/sysdeps/csky/pthreaddef.h index 992fced01..4aa97ee27 100644 --- a/libpthread/nptl/sysdeps/csky/pthreaddef.h +++ b/libpthread/nptl/sysdeps/csky/pthreaddef.h @@ -5,9 +5,6 @@ * in this tarball. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. SSE requires 16 bytes. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/i386/pthreaddef.h b/libpthread/nptl/sysdeps/i386/pthreaddef.h index a0659039d..2fd27113c 100644 --- a/libpthread/nptl/sysdeps/i386/pthreaddef.h +++ b/libpthread/nptl/sysdeps/i386/pthreaddef.h @@ -16,9 +16,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. SSE requires 16 bytes. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/kvx/pthreaddef.h b/libpthread/nptl/sysdeps/kvx/pthreaddef.h index 6e1485998..03945bc5f 100644 --- a/libpthread/nptl/sysdeps/kvx/pthreaddef.h +++ b/libpthread/nptl/sysdeps/kvx/pthreaddef.h @@ -6,9 +6,6 @@ * Copyright (C) 2019 Kalray Inc. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 32 diff --git a/libpthread/nptl/sysdeps/m68k/pthreaddef.h b/libpthread/nptl/sysdeps/m68k/pthreaddef.h index 1651b3d5f..04d565191 100644 --- a/libpthread/nptl/sysdeps/m68k/pthreaddef.h +++ b/libpthread/nptl/sysdeps/m68k/pthreaddef.h @@ -15,9 +15,6 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/metag/pthreaddef.h b/libpthread/nptl/sysdeps/metag/pthreaddef.h index bf4f0f29a..0fb28dc48 100644 --- a/libpthread/nptl/sysdeps/metag/pthreaddef.h +++ b/libpthread/nptl/sysdeps/metag/pthreaddef.h @@ -17,9 +17,6 @@ #include <sysdep.h> -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 8 diff --git a/libpthread/nptl/sysdeps/microblaze/pthreaddef.h b/libpthread/nptl/sysdeps/microblaze/pthreaddef.h index 47e87dd71..a01b59fab 100644 --- a/libpthread/nptl/sysdeps/microblaze/pthreaddef.h +++ b/libpthread/nptl/sysdeps/microblaze/pthreaddef.h @@ -19,9 +19,6 @@ #include <stdlib.h> #include <string.h> -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/mips/pthreaddef.h b/libpthread/nptl/sysdeps/mips/pthreaddef.h index 692988205..adedd7715 100644 --- a/libpthread/nptl/sysdeps/mips/pthreaddef.h +++ b/libpthread/nptl/sysdeps/mips/pthreaddef.h @@ -15,9 +15,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/nds32/pthreaddef.h b/libpthread/nptl/sysdeps/nds32/pthreaddef.h index c9d3f7781..0dca16c34 100644 --- a/libpthread/nptl/sysdeps/nds32/pthreaddef.h +++ b/libpthread/nptl/sysdeps/nds32/pthreaddef.h @@ -14,9 +14,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. SSE requires 16 bytes. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/nios2/pthreaddef.h b/libpthread/nptl/sysdeps/nios2/pthreaddef.h index 4268252dd..5be435237 100644 --- a/libpthread/nptl/sysdeps/nios2/pthreaddef.h +++ b/libpthread/nptl/sysdeps/nios2/pthreaddef.h @@ -16,9 +16,6 @@ License along with the GNU C Library. If not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 4 diff --git a/libpthread/nptl/sysdeps/or1k/pthreaddef.h b/libpthread/nptl/sysdeps/or1k/pthreaddef.h index e8da3d965..394962172 100644 --- a/libpthread/nptl/sysdeps/or1k/pthreaddef.h +++ b/libpthread/nptl/sysdeps/or1k/pthreaddef.h @@ -16,9 +16,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/powerpc/pthreaddef.h b/libpthread/nptl/sysdeps/powerpc/pthreaddef.h index 36bf76404..a46c094b6 100644 --- a/libpthread/nptl/sysdeps/powerpc/pthreaddef.h +++ b/libpthread/nptl/sysdeps/powerpc/pthreaddef.h @@ -15,9 +15,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (4 * 1024 * 1024) - /* Required stack pointer alignment at beginning. The ABI requires 16 bytes (for both 32-bit and 64-bit PowerPC). */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/riscv64/pthreaddef.h b/libpthread/nptl/sysdeps/riscv64/pthreaddef.h index fbd40a74f..5a929bc77 100644 --- a/libpthread/nptl/sysdeps/riscv64/pthreaddef.h +++ b/libpthread/nptl/sysdeps/riscv64/pthreaddef.h @@ -14,9 +14,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/sh/pthreaddef.h b/libpthread/nptl/sysdeps/sh/pthreaddef.h index fc3ae6029..918aaf54f 100644 --- a/libpthread/nptl/sysdeps/sh/pthreaddef.h +++ b/libpthread/nptl/sysdeps/sh/pthreaddef.h @@ -17,9 +17,6 @@ #include <sysdep.h> -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 8 diff --git a/libpthread/nptl/sysdeps/sparc/pthreaddef.h b/libpthread/nptl/sysdeps/sparc/pthreaddef.h index 435fedcf3..65f6655a4 100644 --- a/libpthread/nptl/sysdeps/sparc/pthreaddef.h +++ b/libpthread/nptl/sysdeps/sparc/pthreaddef.h @@ -15,9 +15,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/x86_64/pthreaddef.h b/libpthread/nptl/sysdeps/x86_64/pthreaddef.h index 2b2285285..98ab8cfb1 100644 --- a/libpthread/nptl/sysdeps/x86_64/pthreaddef.h +++ b/libpthread/nptl/sysdeps/x86_64/pthreaddef.h @@ -16,9 +16,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. SSE requires 16 bytes. */ #define STACK_ALIGN 16 diff --git a/libpthread/nptl/sysdeps/xtensa/pthreaddef.h b/libpthread/nptl/sysdeps/xtensa/pthreaddef.h index 34c1851c3..13d8fef4c 100644 --- a/libpthread/nptl/sysdeps/xtensa/pthreaddef.h +++ b/libpthread/nptl/sysdeps/xtensa/pthreaddef.h @@ -15,9 +15,6 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see <http://www.gnu.org/licenses/>. */ -/* Default stack size. */ -#define ARCH_STACK_DEFAULT_SIZE (2 * 1024 * 1024) - /* Required stack pointer alignment at beginning. */ #define STACK_ALIGN 16 -- 2.42.0

2 3

[PATCH] fnmatch: fix possible access beyond of parameter string
by Marcus Haehnel 09 Nov '23

09 Nov '23

In certain cases, fnmatch() could access the next byte beyond the end of he passed pattern. A triggering pattern to match is the following invocation: fnmatch("[A-Z[.", "F", 0) The normal A-Z group match gets us to fnmatch_loop.c:421 and then to fnmatch_loop:599. The F in the filaname matches this expression and we end up in fnmatch_loop:867 which handles skipping the rest of a bracked expression that already matched. Here we enter the case where the next chars to parse are a collating symbol starting with "[." (fnmatch_loop:918). Currently the p pointer is then advanced by one, moving it beyond the "." and to the \0 byte of the pattern string (fnmatch_loop:920). Inside the while loop the pointer is then incremented again and immediately dereferenced, reaching beyond the end of the pattern string. The increment before the while loop must be removed, because only inside the while loop (after the other increment) a check for the end of the string is performend. This is sufficient and the check of the end of the collating symbol is only performed if p[1] is at most the terminating \0 byte. Signed-Off-By: Frank Mehnert <frank.mehnert(a)kernkonzept.com> --- libc/misc/fnmatch/fnmatch_loop.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libc/misc/fnmatch/fnmatch_loop.c b/libc/misc/fnmatch/fnmatch_loop.c index 32ee079a3..025510de6 100644 --- a/libc/misc/fnmatch/fnmatch_loop.c +++ b/libc/misc/fnmatch/fnmatch_loop.c @@ -917,7 +917,6 @@ FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end, } else if (c == L('[') && *p == L('.')) { - ++p; while (1) { c = *++p; -- 2.42.0

1 0

[PATCH] arc: remove read ahead in asm strcmp code for ARCHS
by Pavel Kozlov 09 Nov '23

09 Nov '23

From: Pavel Kozlov <pavel.kozlov(a)synopsys.com> Remove read ahead in the per-word compare loop as it can cause a segmentation fault in certain circumstances (when a string crosses a page boundary). For baremetal this relaxed approach is suitable but in Linux with MMU we should be more restrictive. Signed-off-by: Pavel Kozlov <pavel.kozlov(a)synopsys.com> --- libc/string/arc/strcmp.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libc/string/arc/strcmp.S b/libc/string/arc/strcmp.S index 3f64ac421acc..48d2d7ec1d83 100644 --- a/libc/string/arc/strcmp.S +++ b/libc/string/arc/strcmp.S @@ -103,23 +103,21 @@ ENTRY(strcmp) brne r2, 0, @.Lcharloop ;;; s1 and s2 are word aligned - ld.ab r2, [r0, 4] mov_s r12, 0x01010101 ror r11, r12 .align 4 .LwordLoop: + ld.ab r2, [r0, 4] + sub r4, r2, r12 ld.ab r3, [r1, 4] ;; Detect NULL char in str1 - sub r4, r2, r12 - ld.ab r5, [r0, 4] bic r4, r4, r2 and r4, r4, r11 brne.d.nt r4, 0, .LfoundNULL ;; Check if the read locations are the same cmp r2, r3 - beq.d .LwordLoop - mov.eq r2, r5 + beq .LwordLoop ;; A match is found, spot it out #ifdef __LITTLE_ENDIAN__ -- 2.25.1

1 0

[PATCH] arc: add acq/rel variants for atomic cmpxchg/xchg
by Pavel Kozlov 09 Nov '23

09 Nov '23

From: Pavel Kozlov <pavel.kozlov(a)synopsys.com> Add acquire/release variants for atomic functions cmpxchg/xchg and provide a memory barrier after/before exchange. For cmpxchg use compiler builtins. For xchg functions add memory barrier explicitly. These barriers are required to keep memory consistency of ARCv3 CPU cores in SMP. For ARC700 barriers are not required and the compiler doesn't provide _atomic_compare_exchange*, use current asm insertion without acquire/release variants for ARC700. Signed-off-by: Pavel Kozlov <pavel.kozlov(a)synopsys.com> --- libc/sysdeps/linux/arc/bits/atomic.h | 76 +++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 2 deletions(-) diff --git a/libc/sysdeps/linux/arc/bits/atomic.h b/libc/sysdeps/linux/arc/bits/atomic.h index 587860964744..610b3c7c7f7d 100644 --- a/libc/sysdeps/linux/arc/bits/atomic.h +++ b/libc/sysdeps/linux/arc/bits/atomic.h @@ -26,8 +26,10 @@ void __arc_link_error (void); #ifdef __A7__ #define atomic_full_barrier() __asm__ __volatile__("": : :"memory") +#define ARC_BARRIER_INSTR "" #else #define atomic_full_barrier() __asm__ __volatile__("dmb 3": : :"memory") +#define ARC_BARRIER_INSTR "dmb 3" #endif /* Atomic compare and exchange. */ @@ -38,11 +40,12 @@ void __arc_link_error (void); #define __arch_compare_and_exchange_val_16_acq(mem, newval, oldval) \ ({ __arc_link_error (); oldval; }) -#define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ +#define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \ ({ __arc_link_error (); oldval; }) #ifdef __CONFIG_ARC_HAS_ATOMICS__ +#ifdef __A7__ #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ ({ \ __typeof(oldval) prev; \ @@ -60,8 +63,55 @@ void __arc_link_error (void); \ prev; \ }) +#else /* !__A7__ */ +#define USE_ATOMIC_COMPILER_BUILTINS 1 -#else +#define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval) \ + ({ \ + __typeof(*mem) __oldval = (oldval); \ + __atomic_compare_exchange_n(mem, (void *) &__oldval, newval, 0, \ + __ATOMIC_ACQUIRE, __ATOMIC_RELAXED); \ + __oldval; \ + }) + +#define __arch_compare_and_exchange_val_8_rel(mem, newval, oldval) \ + ({ __arc_link_error (); oldval; }) + +#define __arch_compare_and_exchange_val_16_rel(mem, newval, oldval) \ + ({ __arc_link_error (); oldval; }) + +#define __arch_compare_and_exchange_val_64_rel(mem, newval, oldval) \ + ({ __arc_link_error (); oldval; }) + +#define __arch_compare_and_exchange_val_32_rel(mem, newval, oldval) \ + ({ \ + __typeof(*mem) __oldval = (oldval); \ + __atomic_compare_exchange_n(mem, (void *) &__oldval, newval, 0, \ + __ATOMIC_RELEASE, __ATOMIC_RELAXED); \ + __oldval; \ + }) + +/* Compare and exchange with "acquire" semantics, ie barrier after */ +#define atomic_compare_and_exchange_val_acq(mem, new, old) \ + __atomic_val_bysize(__arch_compare_and_exchange_val, acq, \ + mem, new, old) + +/* Compare and exchange with "release" semantics, ie barrier before */ +#define atomic_compare_and_exchange_val_rel(mem, new, old) \ + __atomic_val_bysize(__arch_compare_and_exchange_val, rel, \ + mem, new, old) + +/* Explicitly define here to use release semantics*/ +#define atomic_compare_and_exchange_bool_rel(mem, newval, oldval) \ + ({ \ + __typeof (oldval) __atg3_old = (oldval); \ + atomic_compare_and_exchange_val_rel (mem, newval, __atg3_old) \ + != __atg3_old; \ + }) + +#endif /* __A7__ */ + +#else /* !__CONFIG_ARC_HAS_ATOMICS__ */ #ifndef __NR_arc_usr_cmpxchg #error "__NR_arc_usr_cmpxchg missing: Please upgrade to kernel 4.9+ headers" @@ -101,6 +151,21 @@ void __arc_link_error (void); __typeof__(*(mem)) val = newval; \ \ __asm__ __volatile__( \ + "ex %0, [%1]\n" \ + ARC_BARRIER_INSTR \ + : "+r" (val) \ + : "r" (mem) \ + : "memory" ); \ + \ + val; \ + }) + +#define __arch_exchange_32_rel(mem, newval) \ + ({ \ + __typeof__(*(mem)) val = newval; \ + \ + __asm__ __volatile__( \ + ARC_BARRIER_INSTR"\n" \ "ex %0, [%1]" \ : "+r" (val) \ : "r" (mem) \ @@ -115,3 +180,10 @@ void __arc_link_error (void); abort(); \ __arch_exchange_32_acq(mem, newval); \ }) + +#define atomic_exchange_rel(mem, newval) \ + ({ \ + if (sizeof(*(mem)) != 4) \ + abort(); \ + __arch_exchange_32_rel(mem, newval); \ + }) -- 2.25.1

1 0

[PATCH] setjmp.h: Fix C++ build and avoid duplicate throw declaration
by Marcus Haehnel 07 Nov '23

07 Nov '23

From: Marcus Hähnel <marcus.haehnel(a)kernkonzept.com> Commit 21cbb6fe ("unistd.h: put getppid under XOPEN2K8") introduced a new __THROWNL specification for non-leaf throws. It also made use of these in the setjmp.h header. The functions that use this specification (longjmp and siglongjmp) have their extern __libc__* equivalent definition prototype specified using __typeof__ for the internal function signatures. For C++ this copies the throw() specifier, since this is part of the type for C++. The attribute in C is not. This commit explicitly types out the signature for the two functions to be compatible between the C++ and C worlds. An alternative would be to keep the __typeof__ declaration and use the copy attribute. Then the __THROWNL part could be thrown out since the C attribute would be copied and the C++ exception specifier would be part of the signature from __type__. However, since the copy attribute is not supported for all compilers supported by uclibc-ng this is not viable at this time. --- include/setjmp.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/setjmp.h b/include/setjmp.h index 27cac9500..41337aa9f 100644 --- a/include/setjmp.h +++ b/include/setjmp.h @@ -108,8 +108,10 @@ __END_DECLS #ifdef _LIBC extern void __longjmp(__jmp_buf __env, int __val) __THROWNL attribute_noreturn; libc_hidden_proto(__longjmp) -extern __typeof(longjmp) __libc_longjmp __THROWNL attribute_noreturn; -extern __typeof(siglongjmp) __libc_siglongjmp __THROWNL attribute_noreturn; +extern void __libc_longjmp(struct __jmp_buf_tag __env[1], int __val) + __THROWNL attribute_noreturn; +extern void __libc_siglongjmp(sigjmp_buf __env, int __val) + __THROWNL attribute_noreturn; extern void _longjmp_unwind(jmp_buf __env, int __val); libc_hidden_proto(_longjmp_unwind) extern int __sigjmp_save(sigjmp_buf __env, int __savemask) attribute_hidden; -- 2.42.0

2 1

[PATCH] arm: elf-fdpic.h: avoid void pointer subtraction
by Ben Wolsieffer 07 Nov '23

07 Nov '23

elf-fdpic.h is included by link.h. When a C++ program includes <link.h>, we get the following build failure: <...>/usr/include/bits/elf-fdpic.h: In function ‘void* __reloc_pointer(void*, const elf32_fdpic_loadmap*)’: <...>/usr/include/bits/elf-fdpic.h:94:54: error: invalid use of ‘void’ 94 | unsigned long offset = p - (void*)map->segs[c].p_vaddr; | ^~~~~~~ void pointer addition and subtraction is not allowed in C++ as it has undetermined size, however in C with language extension it is possible because sizeof void is treated as one byte. This patch was previously applied to Blackfin, FR-V and C6x, but not ARM. Signed-off-by: Ben Wolsieffer <ben.wolsieffer(a)hefring.com> --- libc/sysdeps/linux/arm/bits/elf-fdpic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/sysdeps/linux/arm/bits/elf-fdpic.h b/libc/sysdeps/linux/arm/bits/elf-fdpic.h index 3d6db54af..f2ef9aeca 100644 --- a/libc/sysdeps/linux/arm/bits/elf-fdpic.h +++ b/libc/sysdeps/linux/arm/bits/elf-fdpic.h @@ -91,7 +91,7 @@ __reloc_pointer (void *p, /* This should be computed as part of the pointer comparison above, but we want to use the carry in the comparison, so we can't convert it to an integer type beforehand. */ - unsigned long offset = p - (void*)map->segs[c].p_vaddr; + unsigned long offset = (char*)p - (char*)map->segs[c].p_vaddr; /* We only check for one-past-the-end for the last segment, assumed to be the data segment, because other cases are ambiguous in the absence of padding between segments, and -- 2.42.0

2 1

[PATCH] prlimit: add name redirection and fix incorrect parameters to syscall
by Pavel Kozlov 07 Nov '23

07 Nov '23

From: Pavel Kozlov <pavel.kozlov(a)synopsys.com> The tst-rlimit/tst-rlimit64 tests pointed to several issueses in prlimit() function for 32-bit CPUs. This patch adds name redirection to prlimit64 in prlimit declaration to provide correct support for 64-bit offset (_FILE_OFFSET_BITS=64) on 32-bit CPUs and fixes improper field assignment and incorrect syscall paramerets in the prlimit() function. Fixes: 8c2f6218 ("setrlimit/getrlimit: fix prlimit64 syscall use for 32-bit CPUs") Signed-off-by: Pavel Kozlov <pavel.kozlov(a)synopsys.com> --- include/sys/resource.h | 18 +++++++++++++++--- libc/sysdeps/linux/common/prlimit.c | 9 ++++++--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/include/sys/resource.h b/include/sys/resource.h index e9fac2c656bf..a5c69d84e308 100644 --- a/include/sys/resource.h +++ b/include/sys/resource.h @@ -103,13 +103,25 @@ libc_hidden_proto(setpriority) #ifdef __USE_GNU /* Modify and return resource limits of a process atomically. */ +# ifndef __USE_FILE_OFFSET64 extern int prlimit (__pid_t __pid, enum __rlimit_resource __resource, - const struct rlimit *__new_limit, - struct rlimit *__old_limit) __THROW; - + const struct rlimit *__new_limit, + struct rlimit *__old_limit) __THROW; +# else +# ifdef __REDIRECT_NTH +extern int __REDIRECT_NTH (prlimit, (__pid_t __pid, + enum __rlimit_resource __resource, + const struct rlimit *__new_limit, + struct rlimit *__old_limit), prlimit64); +# else +# define prlimit prlimit64 +# endif +# endif +# ifdef __USE_LARGEFILE64 extern int prlimit64 (__pid_t __pid, enum __rlimit_resource __resource, const struct rlimit64 *__new_limit, struct rlimit64 *__old_limit) __THROW; +# endif #endif __END_DECLS diff --git a/libc/sysdeps/linux/common/prlimit.c b/libc/sysdeps/linux/common/prlimit.c index f59ade3a379c..81c0f46193ff 100644 --- a/libc/sysdeps/linux/common/prlimit.c +++ b/libc/sysdeps/linux/common/prlimit.c @@ -25,7 +25,9 @@ prlimit (__pid_t pid, enum __rlimit_resource resource, const struct rlimit *new_rlimit, struct rlimit *old_rlimit) { struct rlimit64 new_rlimit64; + struct rlimit64 *new_rlimit64_ptr = NULL; struct rlimit64 old_rlimit64; + struct rlimit64 *old_rlimit64_ptr = (old_rlimit != NULL ? &old_rlimit64 : NULL); int res; if (new_rlimit != NULL) { @@ -37,10 +39,11 @@ prlimit (__pid_t pid, enum __rlimit_resource resource, new_rlimit64.rlim_max = RLIM64_INFINITY; else new_rlimit64.rlim_max = new_rlimit->rlim_max; + new_rlimit64_ptr = &new_rlimit64; } - res = INLINE_SYSCALL (prlimit64, 4, pid, resource, &new_rlimit64, - &old_rlimit64); + res = INLINE_SYSCALL (prlimit64, 4, pid, resource, new_rlimit64_ptr, + old_rlimit64_ptr); if (res == 0 && old_rlimit != NULL) { /* If the syscall succeeds but the values do not fit into a @@ -64,7 +67,7 @@ prlimit (__pid_t pid, enum __rlimit_resource resource, __set_errno(EOVERFLOW); return -1; } - old_rlimit->rlim_cur = RLIM_INFINITY; + old_rlimit->rlim_max = RLIM_INFINITY; } } -- 2.25.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

devel