diff options
author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-10-18 09:41:56 -0200 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-11-17 15:54:22 -0200 |
commit | 045c13d18554ae626dfc62f392afb33856c6321d (patch) | |
tree | 64964d765a91d1364bbef9838374d67ba4179d39 /sysdeps/unix/sysv/linux/getrlimit64.c | |
parent | c440d5d58ddef2975d0630bcb0e757d7e697496e (diff) | |
download | glibc-045c13d18554ae626dfc62f392afb33856c6321d.tar.gz glibc-045c13d18554ae626dfc62f392afb33856c6321d.tar.xz glibc-045c13d18554ae626dfc62f392afb33856c6321d.zip |
Consolidate Linux setrlimit and getrlimit implementation
This patch consolidates all Linux setrlimit and getrlimit on the default sysdeps/unix/sysv/linux/{set,get}rlimit{64}.c. It contains two exceptions: 1. mips32 and mips64n32 which requires a versioned symbol for GLIBC 2.19 and higher due a broken RLIM64_INFINITY constant. 2. sparc32 does not define a compat symbol for getrlimit64 for old 2GB limit. I am not sure if it is required, but a RLIM_INFINITY fix [1] change its definition without adding a compat symbol. This patch does not aim to address this possible issue, it follow current symbol export. The default implementation uses prlimit64 for 64 bit rlim_t ({set,get}rlimit64) and if it fails with ENOSYS it fall back to {get,set}rlimit syscall. This code path is only used on kernel older than 2.6.36 (basically now only x86) and I avoid to user __ASSUME_PRLIMTI64 to simplify the implementation. Once x86 moves to be on par with other architectures regarding minimum kernel supported we can get rid of using old syscalls and default path. A new type size define is added, __RLIM_T_MATCHES_RLIM64_T, where is set as default for 64 bits ports. This allows the default implementation to avoid {get,set}rlimit building and alias {get,set}rlimit64 to {get,set}rlimit. Checked on x86_64, i386, armhf, aarch64, and powerpc64le. I also did a sanity build plus check-abi on all other supported architectures. [1] Commit 9c96ff23858b0759e12ad69e3c4599931c90bee8 Adhemerval Zanella <adhemerval.zanella@linaro.org> Yury Norov <ynorov@caviumnetworks.com> * bits/typesizes.h (__RLIM_T_MATCHES_RLIM64_T): define. * sysdeps/unix/sysv/linux/alpha/bits/typesizes.h (__RLIM_T_MATCHES_RLIM64_T): Likewise. * sysdeps/unix/sysv/linux/generic/bits/typesizes.h (__RLIM_T_MATCHES_RLIM64_T): Likewise. * sysdeps/unix/sysv/linux/s390/bits/typesizes.h [__s390x__] (__RLIM_T_MATCHES_RLIM64_T): Likewise. * sysdeps/unix/sysv/linux/sparc/bits/typesizes.h [__arch64__ || __sparcv9] (__RLIM_T_MATCHES_RLIM64_T): Likewise. * sysdeps/unix/sysv/linux/x86/bits/typesizes.h [__86_64__] (__RLIM_T_MATCHES_RLIM64_T): Likewise. * sysdeps/unix/sysv/linux/arm/Makefile [$(subdir) = resource] (sysdep_routines): Remove oldgetrlimit64. * sysdeps/unix/sysv/linux/i386/Makefile [$(subdir) = resource] (sysdep_routines): Likewise. * sysdeps/unix/sysv/linux/m68k/Makefile [$(subdir) = resource] (sysdep_routines): Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile [$(subdir) = resource] (sysdep_routines): Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/Makefile [$(subdir) = resource] (sysdep_routines): Likewise. * sysdeps/unix/sysv/linux/arm/getrlimit64.c: Remove file. * sysdeps/unix/sysv/linux/arm/oldgetrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/hppa/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/i386/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/i386/oldgetrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/m68k/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/m68k/oldgetrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/powerpc/oldgetrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/oldgetrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/sh/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/setrlimit64.c: Likewise. * sysdeps/sysv/linux/generic/wordsize-32/syscalls.list: Remove setrlimit and getrlimit. * sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/i386/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/getrlimit.c: New file. * sysdeps/unix/sysv/linux/sparc/getrlimit64.c: Likewise. * sysdeps/unix/sysv/linux/setrlimit.c: Likewise. * sysdeps/unix/sysv/linux/getrlimit64.c (__getrlimit64): Handle __RLIM_T_MATCHES_RLIM64_T and add alias if defined. (__old_getrlimit64): Add compatibility symbol. * sysdeps/unix/sysv/linux/setrlimit64.c (__setrlimit): Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/getrlimit64.c')
-rw-r--r-- | sysdeps/unix/sysv/linux/getrlimit64.c | 86 |
1 files changed, 74 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/getrlimit64.c b/sysdeps/unix/sysv/linux/getrlimit64.c index d055a7f839..cb3d0080d8 100644 --- a/sysdeps/unix/sysv/linux/getrlimit64.c +++ b/sysdeps/unix/sysv/linux/getrlimit64.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2010-2016 Free Software Foundation, Inc. +/* Linux getrlimit64 implementation (64 bits rlim_t). + Copyright (C) 2010-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,29 +17,46 @@ <http://www.gnu.org/licenses/>. */ #include <errno.h> -#include <sys/resource.h> #include <sys/types.h> -#include <sysdep.h> -#include <kernel-features.h> +#include <shlib-compat.h> + +/* Add this redirection so the strong_alias for __RLIM_T_MATCHES_RLIM64_T + linking getlimit64 to {__}getrlimit does not throw a type error. */ +#undef getrlimit +#undef __getrlimit +#define getrlimit getrlimit_redirect +#define __getrlimit __getrlimit_redirect +#include <sys/resource.h> +#undef getrlimit +#undef __getrlimit /* Put the soft and hard limits for RESOURCE in *RLIMITS. Returns 0 if successful, -1 if not (and sets errno). */ int __getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) { -#ifdef __ASSUME_PRLIMIT64 - return INLINE_SYSCALL (prlimit64, 4, 0, resource, NULL, rlimits); -#else -# ifdef __NR_prlimit64 - int res = INLINE_SYSCALL (prlimit64, 4, 0, resource, NULL, rlimits); +#ifdef __NR_prlimit64 + int res = INLINE_SYSCALL_CALL (prlimit64, 0, resource, NULL, rlimits); if (res == 0 || errno != ENOSYS) return res; +#endif + +/* The fallback code only makes sense if the platform supports either + __NR_ugetrlimit and/or __NR_getrlimit. */ +#if defined (__NR_ugetrlimit) || defined (__NR_getrlimit) +# ifndef __NR_ugetrlimit +# define __NR_ugetrlimit __NR_getrlimit # endif +# if __RLIM_T_MATCHES_RLIM64_T +# define rlimits32 (*rlimits) +# else struct rlimit rlimits32; +# endif - if (__getrlimit (resource, &rlimits32) < 0) + if (INLINE_SYSCALL_CALL (ugetrlimit, resource, &rlimits32) < 0) return -1; +# if !__RLIM_T_MATCHES_RLIM64_T if (rlimits32.rlim_cur == RLIM_INFINITY) rlimits->rlim_cur = RLIM64_INFINITY; else @@ -47,12 +65,56 @@ __getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) rlimits->rlim_max = RLIM64_INFINITY; else rlimits->rlim_max = rlimits32.rlim_max; +# endif /* !__RLIM_T_MATCHES_RLIM64_T */ +#endif /* defined (__NR_ugetrlimit) || defined (__NR_getrlimit) */ return 0; -#endif } libc_hidden_def (__getrlimit64) -#ifndef getrlimit64 + +#if __RLIM_T_MATCHES_RLIM64_T +/* If both rlim_t and rlimt64_t are essentially the same type we can use + alias both interfaces. */ +strong_alias (__getrlimit64, __GI_getrlimit) +strong_alias (__getrlimit64, __GI___getrlimit) +strong_alias (__getrlimit64, __getrlimit) +weak_alias (__getrlimit64, getrlimit) +/* And there is no need for compat symbols. */ +# undef SHLIB_COMPAT +# define SHLIB_COMPAT(a, b, c) 0 +#endif + +#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_2) +/* Back compatible 2GiB limited rlimit. */ +extern int __new_getrlimit (enum __rlimit_resource, struct rlimit *); + +int +attribute_compat_text_section +__old_getrlimit64 (enum __rlimit_resource resource, struct rlimit64 *rlimits) +{ +# if __RLIM_T_MATCHES_RLIM64_T +# define rlimits32 (*rlimits) +# else + struct rlimit rlimits32; +# endif + + if (__new_getrlimit (resource, &rlimits32) < 0) + return -1; + + if (rlimits32.rlim_cur == RLIM_INFINITY) + rlimits->rlim_cur = RLIM64_INFINITY >> 1; + else + rlimits->rlim_cur = rlimits32.rlim_cur; + if (rlimits32.rlim_max == RLIM_INFINITY) + rlimits->rlim_max = RLIM64_INFINITY >> 1; + else + rlimits->rlim_max = rlimits32.rlim_max; + + return 0; +} +versioned_symbol (libc, __getrlimit64, getrlimit64, GLIBC_2_2); +compat_symbol (libc, __old_getrlimit64, getrlimit64, GLIBC_2_1); +#else weak_alias (__getrlimit64, getrlimit64) libc_hidden_weak (getrlimit64) #endif |