rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 81073 from home:a_jaeger:branches:openSUSE:Factory

Browse Source 
Prefer real syscalls instead of vsyscalls on x86-64 outside libc.so.

OBS-URL: https://build.opensuse.org/request/show/81073
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=103
This commit is contained in:
Andreas Jaeger 2011-09-06 09:34:37 +00:00 committed by Git OBS Bridge
parent 804db197ba
commit 0c4a2d6240
2 changed files with 131 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
glibc-2.15-vsyscall.patch
View File

@ -583,3 +583,128 @@ index 0000000..5169489
+fini: b
+fini: c
+fini: d
commit ef60624956e93df1da329a48570776ed963b1916
Author: Ulrich Drepper <drepper@gmail.com>
Date: Tue Sep 6 00:12:18 2011 -0400
Prefer real syscalls instead of vsyscalls on x86-64 outside libc.so
2011-09-06 Ulrich Drepper <drepper@gmail.com>
* sysdeps/unix/sysv/linux/kernel-features.h: Add entry for getcpu
syscall on x86-64.
* sysdeps/unix/sysv/linux/x86_64/gettimeofday.c [!SHARED]: Use real
syscall.
* sysdeps/unix/sysv/linux/x86_64/time.c: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S [!SHARED]: Use real
syscall if possible.
diff --git a/sysdeps/unix/sysv/linux/kernel-features.h b/sysdeps/unix/sysv/linux/kernel-features.h
index d91f581..58f833e 100644
--- a/sysdeps/unix/sysv/linux/kernel-features.h
+++ b/sysdeps/unix/sysv/linux/kernel-features.h
@@ -546,3 +546,8 @@
#if __LINUX_KERNEL_VERSION >= 0x020627
# define __ASSUME_SENDMMSG 1
#endif
+
+/* getcpu is a syscall for x86-64 since 3.1. */
+#if defined __x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100
+# define __ASSUME_GETCPU_SYSCALL 1
+#endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
index 1a773d6..56171bc 100644
--- a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
+++ b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
@@ -37,11 +37,12 @@ gettimeofday_ifunc (void)
__asm (".type __gettimeofday, %gnu_indirect_function");
#else
# include <sys/time.h>
+# include <sysdep.h>
int
__gettimeofday (struct timeval *tv, struct timezone *tz)
{
- return ((int (*) (struct timeval *, struct timezone *)) VSYSCALL_ADDR_vgettimeofday) (tv, tz);
+ return INLINE_SYSCALL (gettimeofday, 2, tv, tz);
}
#endif
diff --git a/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S b/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
index 8ec7d3f..246c955 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
+++ b/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S
@@ -20,6 +20,7 @@
#include <tls.h>
#define _ERRNO_H 1
#include <bits/errno.h>
+#include <kernel-features.h>
/* For the calculation see asm/vsyscall.h. */
#define VSYSCALL_ADDR_vgetcpu 0xffffffffff600800
@@ -38,10 +39,26 @@ ENTRY (sched_getcpu)
#ifdef SHARED
movq __vdso_getcpu(%rip), %rax
PTR_DEMANGLE (%rax)
+ callq *%rax
#else
+# ifdef __NR_getcpu
+ movl $__NR_getcpu, %eax
+ syscall
+# ifndef __ASSUME_GETCPU_SYSCALL
+ cmpq $-ENOSYS, %rax
+ jne 1f
+# endif
+# endif
+# ifndef __ASSUME_GETCPU_SYSCALL
movq $VSYSCALL_ADDR_vgetcpu, %rax
-#endif
callq *%rax
+1:
+# else
+# ifndef __NR_getcpu
+# error "cannot happen"
+# endif
+# endif
+#endif
cmpq $-4095, %rax
jae SYSCALL_ERROR_LABEL
diff --git a/sysdeps/unix/sysv/linux/x86_64/time.c b/sysdeps/unix/sysv/linux/x86_64/time.c
index 698d561..c1c1a75 100644
--- a/sysdeps/unix/sysv/linux/x86_64/time.c
+++ b/sysdeps/unix/sysv/linux/x86_64/time.c
@@ -36,11 +36,13 @@ time_ifunc (void)
__asm (".type time, %gnu_indirect_function");
#else
# include <time.h>
+# include <sysdep.h>
time_t
time (time_t *t)
{
- return ((time_t (*) (time_t *)) VSYSCALL_ADDR_vtime) (t);
+ INTERNAL_SYSCALL_DECL (err);
+ return INTERNAL_SYSCALL (time, err, 1, t);
}
#endif
2011-09-06 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/x86_64/gettimeofday.c: Include <errno.h>
to fix build.
Index: glibc-2.14/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
===================================================================
--- glibc-2.14.orig/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
+++ glibc-2.14/sysdeps/unix/sysv/linux/x86_64/gettimeofday.c
@@ -36,6 +36,7 @@ gettimeofday_ifunc (void)
}
__asm (".type __gettimeofday, %gnu_indirect_function");
#else
+# include <errno.h>
# include <sys/time.h>
# include <sysdep.h>

6
glibc.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Sep 6 09:53:24 CEST 2011 - aj@suse.de
- Prefer real syscalls instead of vsyscalls on x86-64 outside
libc.so
-------------------------------------------------------------------
Mon Sep 5 10:06:23 UTC 2011 - aj@suse.de