aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Liebler <stli@linux.vnet.ibm.com>2016-05-09 11:05:45 +0200
committerStefan Liebler <stli@linux.vnet.ibm.com>2016-05-09 11:05:45 +0200
commitb91a333ecb223a4bb104ff5a64c9ee5a194789a3 (patch)
treec69a7cbebf77b7c3736d6a30106f5c29a25aa871
parenta9558b49b3336aba143b68279af90d69e2d92479 (diff)
downloadglibc-b91a333ecb223a4bb104ff5a64c9ee5a194789a3.tar
glibc-b91a333ecb223a4bb104ff5a64c9ee5a194789a3.tar.gz
glibc-b91a333ecb223a4bb104ff5a64c9ee5a194789a3.tar.bz2
glibc-b91a333ecb223a4bb104ff5a64c9ee5a194789a3.zip
S390: Add support for vdso getcpu symbol.
This patch adds support for symbol __kernel_getcpu in vDSO, which is available with kernel 4.5. Now sched_getcpu is using this symbol if available in mapped vDSO by defining macro HAVE_GETCPU_VSYSCALL. If not available at runtime, the former syscall is used.
-rw-r--r--ChangeLog11
-rw-r--r--sysdeps/unix/sysv/linux/s390/init-first.c6
-rw-r--r--sysdeps/unix/sysv/linux/s390/libc-vdso.h2
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h1
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h1
5 files changed, 21 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4677e87194..1f5261a315 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-05-09 Stefan Liebler <stli@linux.vnet.ibm.com>
+
+ * sysdeps/unix/sysv/linux/s390/init-first.c:
+ Add VDSO_SYMBOL(getcpu).
+ (_libc_vdso_platform_setup): Initialize VDSO_SYMBOL(getcpu).
+ * sysdeps/unix/sysv/linux/s390/libc-vdso.h:
+ Add VDSO_SYMBOL(getcpu).
+ * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h:
+ New define HAVE_GETCPU_VSYSCALL.
+ * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h: Likewise.
+
2016-05-08 H.J. Lu <hongjiu.lu@intel.com>
* sysdeps/i386/cacheinfo.c: Include <sysdeps/x86/cacheinfo.c>
diff --git a/sysdeps/unix/sysv/linux/s390/init-first.c b/sysdeps/unix/sysv/linux/s390/init-first.c
index d3a20fda30..7498cbe007 100644
--- a/sysdeps/unix/sysv/linux/s390/init-first.c
+++ b/sysdeps/unix/sysv/linux/s390/init-first.c
@@ -29,6 +29,8 @@ long int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *)
long int (*VDSO_SYMBOL(clock_getres)) (clockid_t, struct timespec *)
__attribute__ ((nocommon));
+long int (*VDSO_SYMBOL(getcpu)) (unsigned *, unsigned *, void *)
+ attribute_hidden;
static inline void
_libc_vdso_platform_setup (void)
@@ -46,6 +48,10 @@ _libc_vdso_platform_setup (void)
p = _dl_vdso_vsym ("__kernel_clock_getres", &linux2629);
PTR_MANGLE (p);
VDSO_SYMBOL (clock_getres) = p;
+
+ p = _dl_vdso_vsym ("__kernel_getcpu", &linux2629);
+ PTR_MANGLE (p);
+ VDSO_SYMBOL (getcpu) = p;
}
# define VDSO_SETUP _libc_vdso_platform_setup
diff --git a/sysdeps/unix/sysv/linux/s390/libc-vdso.h b/sysdeps/unix/sysv/linux/s390/libc-vdso.h
index d2a83161bb..512b3ba307 100644
--- a/sysdeps/unix/sysv/linux/s390/libc-vdso.h
+++ b/sysdeps/unix/sysv/linux/s390/libc-vdso.h
@@ -31,6 +31,8 @@ extern long int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *);
extern long int (*VDSO_SYMBOL(clock_getres)) (clockid_t, struct timespec *);
+extern long int (*VDSO_SYMBOL(getcpu)) (unsigned *, unsigned *, void *)
+ attribute_hidden;
#endif
#endif /* _LIBC_VDSO_H */
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
index 3540416e0e..651e1ee40c 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
@@ -283,6 +283,7 @@
#define HAVE_CLOCK_GETRES_VSYSCALL 1
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
#define HAVE_GETTIMEOFDAY_VSYSCALL 1
+#define HAVE_GETCPU_VSYSCALL 1
/* This version is for internal uses when there is no desire
to set errno */
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
index 6f390ff626..702b0b6a44 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
@@ -289,6 +289,7 @@
#define HAVE_CLOCK_GETRES_VSYSCALL 1
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
#define HAVE_GETTIMEOFDAY_VSYSCALL 1
+#define HAVE_GETCPU_VSYSCALL 1
/* This version is for internal uses when there is no desire
to set errno */