From patchwork Fri Oct 19 04:02:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 986509 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-96525-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=davemloft.net Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="cpIOY3o8"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42bsgq2spYz9sDJ for ; Fri, 19 Oct 2018 15:02:31 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:message-id:to:subject:from:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=yBe f0EaL/e7DJi3KZSlNt3tRm7oZbv/phVkBybJyJCHeTGY1BEnFzsr5JVhSSGQGOVl vhXbyCL8vOT0AdEnrOcCCtyX/Yw6vni5kZaXoUtwvgQHBgHQ5l0EbtSBY7dUl6Dk 3eUtfRmfhRk5hOzj4FK+sktBg1dEHZm+KmgIKiXE= 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:date:message-id:to:subject:from:mime-version :content-type:content-transfer-encoding; s=default; bh=ZNsxYUuZs NGObP6XkwMwJ75AGBo=; b=cpIOY3o8knQ2lisqaV+TJDkDaw+iAOjPX0UysUsX3 MIorlaoSbLIQ1mKzHr1RKsJjdSqZJucq1fTbxXLFfbtaTauKO28ivktTps0lEgt1 oBa9y8gBrVPtB0eB85ARdUiDTTGHP/H9fjj0x3LxcjTthFmoq5fDzNu6q/6gLn2P OI= Received: (qmail 9749 invoked by alias); 19 Oct 2018 04:02:25 -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 9733 invoked by uid 89); 19 Oct 2018 04:02:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT autolearn=ham version=3.3.2 spammy= X-HELO: shards.monkeyblade.net Date: Thu, 18 Oct 2018 21:02:20 -0700 (PDT) Message-Id: <20181018.210220.1193062002214096481.davem@davemloft.net> To: libc-alpha@sourceware.org Subject: [PATCH] Add VDSO support to sparc. From: David Miller Mime-Version: 1.0 Committed to master. * sysdeps/unix/sysv/linux/sparc/init-first.c: New file. * sysdeps/unix/sysv/linux/sparc/libc-vdso.h: New file. * sysdeps/unix/sysv/linux/sparc/Makefile: Add dl-vdso to sysdep_routines in subdir elf. * sysdeps/unix/sysv/linux/sparc/Versions: Add GLIBC_PRIVATE version for __vdso_clock_gettime. * sysdeps/unix/sysv/linux/sparc/sysdep.h (INTERNAL_VSYSCALL_CALL): Define. (HAVE_CLOCK_GETTIME_VSYSCALL): Define. (HAVE_GETTIMEOFDAY_VSYSCALL): Define. --- ChangeLog | 11 ++++++ sysdeps/unix/sysv/linux/sparc/Makefile | 4 ++ sysdeps/unix/sysv/linux/sparc/Versions | 4 ++ sysdeps/unix/sysv/linux/sparc/init-first.c | 46 ++++++++++++++++++++++ sysdeps/unix/sysv/linux/sparc/libc-vdso.h | 33 ++++++++++++++++ sysdeps/unix/sysv/linux/sparc/sysdep.h | 11 ++++++ 6 files changed, 109 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/sparc/init-first.c create mode 100644 sysdeps/unix/sysv/linux/sparc/libc-vdso.h diff --git a/ChangeLog b/ChangeLog index 94e239f043..4f0448c708 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2018-10-18 David S. Miller + * sysdeps/unix/sysv/linux/sparc/init-first.c: New file. + * sysdeps/unix/sysv/linux/sparc/libc-vdso.h: New file. + * sysdeps/unix/sysv/linux/sparc/Makefile: Add dl-vdso to + sysdep_routines in subdir elf. + * sysdeps/unix/sysv/linux/sparc/Versions: Add GLIBC_PRIVATE + version for __vdso_clock_gettime. + * sysdeps/unix/sysv/linux/sparc/sysdep.h (INTERNAL_VSYSCALL_CALL): + Define. + (HAVE_CLOCK_GETTIME_VSYSCALL): Define. + (HAVE_GETTIMEOFDAY_VSYSCALL): Define. + * sysdeps/sparc/fpu/libm-test-ulps: Regenerated. 2018-10-17 H.J. Lu diff --git a/sysdeps/unix/sysv/linux/sparc/Makefile b/sysdeps/unix/sysv/linux/sparc/Makefile index b0d182a439..fb3ee5b8a1 100644 --- a/sysdeps/unix/sysv/linux/sparc/Makefile +++ b/sysdeps/unix/sysv/linux/sparc/Makefile @@ -7,6 +7,10 @@ librt-routines += rt-sysdep librt-shared-only-routines += rt-sysdep endif +ifeq ($(subdir),elf) +sysdep_routines += dl-vdso +endif + ifeq ($(subdir),sysvipc) sysdep_routines += getshmlba endif diff --git a/sysdeps/unix/sysv/linux/sparc/Versions b/sysdeps/unix/sysv/linux/sparc/Versions index 4dc1cd720b..f056addee6 100644 --- a/sysdeps/unix/sysv/linux/sparc/Versions +++ b/sysdeps/unix/sysv/linux/sparc/Versions @@ -29,6 +29,10 @@ libc { __getshmlba; } + GLIBC_PRIVATE { + # nptl/pthread_cond_timedwait.c uses INTERNAL_VSYSCALL(clock_gettime). + __vdso_clock_gettime; + } } libpthread { diff --git a/sysdeps/unix/sysv/linux/sparc/init-first.c b/sysdeps/unix/sysv/linux/sparc/init-first.c new file mode 100644 index 0000000000..7700cdfe1f --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/init-first.c @@ -0,0 +1,46 @@ +/* SPARC VDSO initialization + Copyright (C) 2018 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 + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifdef SHARED +# include +# include + +long int (*VDSO_SYMBOL (gettimeofday)) (struct timeval *, void *) + attribute_hidden; +long int (*VDSO_SYMBOL (clock_gettime)) (clockid_t, struct timespec *) + attribute_hidden; + +static inline void +_libc_vdso_platform_setup (void) +{ + PREPARE_VERSION_KNOWN (linux_version, LINUX_2_6); + + void *p = _dl_vdso_vsym ("__vdso_gettimeofday", &linux_version); + PTR_MANGLE (p); + VDSO_SYMBOL (gettimeofday) = p; + + p = _dl_vdso_vsym ("__vdso_clock_gettime", &linux_version); + PTR_MANGLE (p); + VDSO_SYMBOL (clock_gettime) = p; +} + +# define VDSO_SETUP _libc_vdso_platform_setup +#endif + +#include diff --git a/sysdeps/unix/sysv/linux/sparc/libc-vdso.h b/sysdeps/unix/sysv/linux/sparc/libc-vdso.h new file mode 100644 index 0000000000..b3938ab151 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/libc-vdso.h @@ -0,0 +1,33 @@ +/* VDSO function pointer declarations. + Copyright (C) 2018 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library. If not, see + . */ + +#ifndef _LIBC_VDSO_H +#define _LIBC_VDSO_H + +#ifdef SHARED + +# include + +extern long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) + attribute_hidden; +extern long int (*VDSO_SYMBOL(clock_gettime)) (clockid_t, struct timespec *); + +#endif + +#endif /* _LIBC_VDSO_H */ diff --git a/sysdeps/unix/sysv/linux/sparc/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sysdep.h index fd06a4349e..5fb7828a05 100644 --- a/sysdeps/unix/sysv/linux/sparc/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sysdep.h @@ -34,6 +34,17 @@ #else /* __ASSEMBLER__ */ +#define INTERNAL_VSYSCALL_CALL(funcptr, err, nr, args...) \ + ({ \ + long _ret = funcptr (args); \ + err = ((unsigned long) (_ret) >= (unsigned long) -4095L); \ + _ret; \ + }) + +/* List of system calls which are supported as vsyscalls. */ +# define HAVE_CLOCK_GETTIME_VSYSCALL 1 +# define HAVE_GETTIMEOFDAY_VSYSCALL 1 + #undef INLINE_SYSCALL #define INLINE_SYSCALL(name, nr, args...) \ ({ INTERNAL_SYSCALL_DECL(err); \