From patchwork Tue Dec 17 21:47:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 181920 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp6350602ile; Tue, 17 Dec 2019 13:49:12 -0800 (PST) X-Google-Smtp-Source: APXvYqyH8JT2lGfaRRDLr788fdhy2/AEAXN4i+r1XTV4SpyhIGRpU95lezxAf/BwYGFfEVsZVuEe X-Received: by 2002:aca:cc55:: with SMTP id c82mr2738625oig.165.1576619351916; Tue, 17 Dec 2019 13:49:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576619351; cv=none; d=google.com; s=arc-20160816; b=HxocDeTA8Ysew6AzT3RXaJUHARQy4A1x9zJBPOIVzwQ0FcDsiwJa6L02aQ5GfRhbzG 2ojqMzCPm0ADoAIkWlYsPCzwPJ0Jod7HcS1ASEJLfWMIWtQPpPwZGm6oua7qtqPMkl7d bm1/pHllZ1C0b5cI9i14SlZaKFCLmCfYTmTETw3n0DzJZ7ZpvDW6qJigPrGaLxZgpKNo URVVpV01IDICLeJileuYhfddXeXhWxeQrneWPm8yaUgnrDq4qgF7vmlpM//7SXR+Uw6L WYRH/RrypWDpIqv89d5tVsexhOAb3pBaBT0wbMnZXjzSeyuXKUqK0crLPp/i4jJ5SlEu i6zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=G4cYkFKhxwVplPzptCNgNJa4DtGCBHMWymTqwwKkT1I=; b=oKVaNElGAawUbuJ3x8tesl/VCESfBoxeOfJDnwuetnuU3lMH0wEJ7dTu7J2G9aQNSK bJlU5ZvhuZFDme9eAVG9JqZhDAhdZkPX/ld3MQSQOvIQWUvc8xHWkU5zav2n2+4d+D+7 +DBmSlZ3qzGKpVPQWunBCeFd1hQLD9AtS+74TUx01b6oZgfSl69jaCG57KRghpGxET6G E9DVQhecVjV+qBHXgy8AFmMz7yHLgU5m5pJtQcFO7Qu0I9FsUFLLAT4UbFjSq+H1jeVA XDlsU6aoy4MP6dEPmnsguprZ7BbqsUVDhyIgMXHSCP2ZvkMkO2ilG4Prsg0ImX1NJfzs +HQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=w5eSWsEK; dkim=pass header.i=@linaro.org header.s=google header.b=rK2KL+mf; spf=pass (google.com: domain of libc-alpha-return-108171-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108171-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id l128si1505545oih.108.2019.12.17.13.49.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Dec 2019 13:49:11 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-return-108171-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=w5eSWsEK; dkim=pass header.i=@linaro.org header.s=google header.b=rK2KL+mf; spf=pass (google.com: domain of libc-alpha-return-108171-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-108171-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=xmwOjV78CRAcusHXTu59dVQIBvilTLD HyfqVFQ/d9oV73/SHpXte5DRSyLq01m6Lg0cYQcgGGne61ePhjQMu8bkSAJ8pVYl JDkOrnET3zsqYF3FqAQ/ub49g0T2s9KAHgWya9TBvumhDkEiKt3fK1hoj2sWFrvz uy6BmjrQ8yxs= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:in-reply-to :references; s=default; bh=uPS9CWENy+B8aFwoL7rYo5dRZvs=; b=w5eSW sEKN0JoGYe78eZVjnGcb8Iy8xcvKuP23diJM5h5YcDU9fvWyfKEpq9g9fTZKIjXp nUEN4Eka4WSyp+BndhiTRWVzG01dmfCGlnjGTeg3Ze8I39cYkhNvLbla4p+pU1YR C4IoWF80HaZGIF02Eko+n9/YiP7qaK+51Qn0iI= Received: (qmail 111158 invoked by alias); 17 Dec 2019 21:47:52 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 111108 invoked by uid 89); 17 Dec 2019 21:47:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-pj1-f66.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=G4cYkFKhxwVplPzptCNgNJa4DtGCBHMWymTqwwKkT1I=; b=rK2KL+mf8rn0rx0bse79Auhrea9GbtSg4L/jbTurocgiNXPOM0fTYSqMqUcozuHhNb yDd5SF3CS0Vo1KWWbx3gnlSL+xf9IQAp93IGNje40FppSDkuLFsTskOPjLndPEsSimSX DTnjieIYZJZEUWJhwAdd0FXDRmeMMGXHUBWbrDAW6GxgdJ58WsTt282tGIbxZjyO2aQw d7AxnyWREcNe4eVa+12ELtiod5CvfFFY9+pm1zwqQKP854KbD3euZTvYRJtJ+sU2xSo0 FMIuP2CQ+vY/9sLBnv4Fqf948o5bUAe040zk6SfvS+bK/XoxlJt1Q51pRTXSLpXRVVvV jnkQ== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH v2 10/16] linux: Add support for clock_gettime64 vDSO Date: Tue, 17 Dec 2019 18:47:22 -0300 Message-Id: <20191217214728.2886-10-adhemerval.zanella@linaro.org> In-Reply-To: <20191217214728.2886-1-adhemerval.zanella@linaro.org> References: <20191217214728.2886-1-adhemerval.zanella@linaro.org> Changes from previous version: - Rename HAVE_CLOCK_GETTIME_VSYSCALL to HAVE_CLOCK_GETTIME64_VSYSCALL on 64 bit time_t architectures. -- No architecture currently defines the vDSO symbol. On archictures with 64-bit time_t the HAVE_CLOCK_GETTIME_VSYSCALL is renamed to HAVE_CLOCK_GETTIME64_VSYSCALL, it simplifies clock_gettime code. --- sysdeps/unix/sysv/linux/aarch64/sysdep.h | 2 +- sysdeps/unix/sysv/linux/clock_gettime.c | 19 +++++++++++-------- sysdeps/unix/sysv/linux/dl-vdso-setup.c | 4 ++++ sysdeps/unix/sysv/linux/dl-vdso-setup.h | 3 +++ sysdeps/unix/sysv/linux/powerpc/sysdep.h | 4 ++++ sysdeps/unix/sysv/linux/riscv/sysdep.h | 2 +- sysdeps/unix/sysv/linux/s390/sysdep.h | 4 ++++ sysdeps/unix/sysv/linux/sparc/sysdep.h | 6 +++++- sysdeps/unix/sysv/linux/x86_64/sysdep.h | 2 +- 9 files changed, 34 insertions(+), 12 deletions(-) -- 2.17.1 diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index 53b515aab6..26aa2f9779 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -161,7 +161,7 @@ /* List of system calls which are supported as vsyscalls. */ # define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres" -# define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime" +# define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime" # define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday" /* Previously AArch64 used the generic version without the libc_hidden_def diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c index e895812704..9be1f779e3 100644 --- a/sysdeps/unix/sysv/linux/clock_gettime.c +++ b/sysdeps/unix/sysv/linux/clock_gettime.c @@ -30,21 +30,24 @@ int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp) { #ifdef __ASSUME_TIME64_SYSCALLS - /* 64 bit ABIs or Newer 32-bit ABIs that only support 64-bit time_t. */ -# ifdef __NR_clock_gettime64 - return INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp); + /* 64 bit ABIs or newer 32-bit ABIs that only support 64-bit time_t. */ +# ifndef __NR_clock_gettime64 +# define __NR_clock_gettime64 __NR_clock_gettime +# endif +# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL + return INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp); # else -# ifdef HAVE_CLOCK_GETTIME_VSYSCALL - return INLINE_VSYSCALL (clock_gettime, 2, clock_id, tp); -# else - return INLINE_SYSCALL_CALL (clock_gettime, clock_id, tp); -# endif + return INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp); # endif #else int r; /* Old 32-bit ABI with possible 64-bit time_t support. */ # ifdef __NR_clock_gettime64 +# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL + r = INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp); +# else r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp); +# endif if (r == 0 || errno != ENOSYS) return r; # endif diff --git a/sysdeps/unix/sysv/linux/dl-vdso-setup.c b/sysdeps/unix/sysv/linux/dl-vdso-setup.c index 1069879f1a..b0b692f78c 100644 --- a/sysdeps/unix/sysv/linux/dl-vdso-setup.c +++ b/sysdeps/unix/sysv/linux/dl-vdso-setup.c @@ -45,6 +45,10 @@ PROCINFO_CLASS int (*_dl_vdso_clock_gettime) (clockid_t, struct timespec *) RELRO; #endif +# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL +PROCINFO_CLASS int (*_dl_vdso_clock_gettime64) (clockid_t, + struct __timespec64 *) RELRO; +#endif # ifdef HAVE_GETTIMEOFDAY_VSYSCALL PROCINFO_CLASS int (*_dl_vdso_gettimeofday) (struct timeval *, void *) RELRO; #endif diff --git a/sysdeps/unix/sysv/linux/dl-vdso-setup.h b/sysdeps/unix/sysv/linux/dl-vdso-setup.h index f4e76202fc..8a89e100c8 100644 --- a/sysdeps/unix/sysv/linux/dl-vdso-setup.h +++ b/sysdeps/unix/sysv/linux/dl-vdso-setup.h @@ -26,6 +26,9 @@ setup_vdso_pointers (void) #ifdef HAVE_CLOCK_GETTIME_VSYSCALL GLRO(dl_vdso_clock_gettime) = dl_vdso_vsym (HAVE_CLOCK_GETTIME_VSYSCALL); #endif +#ifdef HAVE_CLOCK_GETTIME64_VSYSCALL + GLRO(dl_vdso_clock_gettime64) = dl_vdso_vsym (HAVE_CLOCK_GETTIME64_VSYSCALL); +#endif #ifdef HAVE_GETTIMEOFDAY_VSYSCALL GLRO(dl_vdso_gettimeofday) = dl_vdso_vsym (HAVE_GETTIMEOFDAY_VSYSCALL); #endif diff --git a/sysdeps/unix/sysv/linux/powerpc/sysdep.h b/sysdeps/unix/sysv/linux/powerpc/sysdep.h index a29f286ad7..c42659a9c4 100644 --- a/sysdeps/unix/sysv/linux/powerpc/sysdep.h +++ b/sysdeps/unix/sysv/linux/powerpc/sysdep.h @@ -21,7 +21,11 @@ /* List of system calls which are supported as vsyscalls. */ #define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres" +#if defined(__PPC64__) || defined(__powerpc64__) +#define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime" +#else #define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime" +#endif #define HAVE_GETCPU_VSYSCALL "__kernel_getcpu" #define HAVE_TIME_VSYSCALL "__kernel_time" #define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday" diff --git a/sysdeps/unix/sysv/linux/riscv/sysdep.h b/sysdeps/unix/sysv/linux/riscv/sysdep.h index bfbcf60feb..7f43595cb0 100644 --- a/sysdeps/unix/sysv/linux/riscv/sysdep.h +++ b/sysdeps/unix/sysv/linux/riscv/sysdep.h @@ -126,7 +126,7 @@ /* List of system calls which are supported as vsyscalls. */ # define HAVE_CLOCK_GETRES_VSYSCALL "__vdso_clock_getres" -# define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime" +# define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime" # define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday" # define HAVE_GETCPU_VSYSCALL "__vdso_getcpu" diff --git a/sysdeps/unix/sysv/linux/s390/sysdep.h b/sysdeps/unix/sysv/linux/s390/sysdep.h index 97d78e246c..030bd59ad0 100644 --- a/sysdeps/unix/sysv/linux/s390/sysdep.h +++ b/sysdeps/unix/sysv/linux/s390/sysdep.h @@ -21,6 +21,10 @@ /* List of system calls which are supported as vsyscalls. */ #define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres" +#ifdef __s390x__ +#define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime" +#else #define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime" +#endif #define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday" #define HAVE_GETCPU_VSYSCALL "__kernel_getcpu" diff --git a/sysdeps/unix/sysv/linux/sparc/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sysdep.h index f38144c912..739f361384 100644 --- a/sysdeps/unix/sysv/linux/sparc/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sysdep.h @@ -45,7 +45,11 @@ # define VDSO_HASH 61765110 /* List of system calls which are supported as vsyscalls. */ -# define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime" +# ifdef __arch64__ +# define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime" +# else +# define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime" +# endif # define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday" #undef INLINE_SYSCALL diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h index 965fd4b851..57a64dce31 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h @@ -374,7 +374,7 @@ # define VDSO_HASH 61765110 /* List of system calls which are supported as vsyscalls. */ -# define HAVE_CLOCK_GETTIME_VSYSCALL "__vdso_clock_gettime" +# define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime" # define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday" # define HAVE_TIME_VSYSCALL "__vdso_time" # define HAVE_GETCPU_VSYSCALL "__vdso_getcpu"