From patchwork Mon Jun 18 15:05:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10471953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B5AC96032A for ; Mon, 18 Jun 2018 15:11:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A54D828A5A for ; Mon, 18 Jun 2018 15:11:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9A14528B67; Mon, 18 Jun 2018 15:11:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2552128A5A for ; Mon, 18 Jun 2018 15:11:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=bE+C+0OkPS39hAKWGombcpgJwbzgwETQ9Oax+rSVC5k=; b=hqHi3c1RGv25ElUV7ugsmNLJbB n9pJBxlEgm7wvA7JiX1GWwUhEcIMaTLtcfZ3T8mSFXi3E6J7Y/dETutE18MJk1uomBRA8KIhdL/su kvWKzTzzKElcu0nyfyqThl8R43Zp+ePi5WtVihZeYZQmzowP5dM7fZltlddzqWP1UmI+pMQQJDuQ1 ih3B0/uC41QaTxtnQNVKkGYe7cFHMiQV1Z9zns+abFaP+U+jPSRH0RCm/fC4HwPGytytoq2z3cKa+ R/D2Iq/vcDF4iIjWtpznbxiOirB1L94OxwruEcIhzDJUFrvtFCIBLMoSpiwuymfhUfJ/3gW9w5dlW UV4UNrDA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUvoK-0003Cp-S6; Mon, 18 Jun 2018 15:11:16 +0000 Received: from mail-pl0-x241.google.com ([2607:f8b0:400e:c01::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUvmD-0000rr-Gn for linux-arm-kernel@lists.infradead.org; Mon, 18 Jun 2018 15:09:22 +0000 Received: by mail-pl0-x241.google.com with SMTP id k1-v6so9213947plt.2 for ; Mon, 18 Jun 2018 08:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JuvxweFTcRzmxkzWcSbXPEqCe+2P0+NqBKtnGp9jj+k=; b=ejh2by3C3GoZQfZUQBH8SjS9wHcIQ0brv8ziSas15/DMUO9ahLj6G139MMTFsTNukM amo70KnSKvNCR40rG8V04Znbuuxy5tWMkbvZP5k1JW4yDubFPv7N7HK9oe62L3Wr3B5Y kYgvd0SxszOhRhPkF3VMJRE/JSlTvSA/LxJYH+sfSZFrKxyO0+RpvkXHz4Lcyj4rF4IW NNZZ9zUzHD6E9Z78uPFUF/oe+18mBEkgd7V+dJw42HkaQR1onLsF82X168PX9tSd22HV wlaNsg+WaM/CIti1KZNjkFkZ5H67/WDppgI6BCQURLqpexOk+QnuT8cqECrO7dwOvXk4 57Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JuvxweFTcRzmxkzWcSbXPEqCe+2P0+NqBKtnGp9jj+k=; b=XDhM2viDrZ/O5b2yUeHuzefUGVOzBmeO9y5fE+Pfp0HKGj4b76DOTWJ8WOnhoNCrmA jMMKy6vW9KhIiD6zWSJHylqVs8HbcdtdBUVL114MDg+ADAvxTc+T1pPr3luWFKdUe/qU aFt7XM6M/CA9ntjWHNpfccmj1NPcL635YJ/eW5vh0G75OSVfGLUJQc5EkqFCY3yh/cLb nc0RY5YICdLYf7VTrQYMDB9d4ehnZAMOz3Fi3StFCj06r27r9Mok3bk9o5mrgh1bYanU amAj4ADZFzmEGR0vJzpDcFKfz1x/wUagmp5jV8WvUI/DcV2SsDgiw8tTIOeWds8gVz+u w+4g== X-Gm-Message-State: APt69E2csZfxbqiH6FdOchMewJMrUNsyYcV+gL5QL18hA1OlCaU4BTi5 1HrMkLLg8PfOFr0Gwk8DfPVkSg== X-Google-Smtp-Source: ADUXVKJ53ifwjLYnJ5qcqXYb5JETAwCfDTJpGkr0I33/QwM3QjmHoXT8AkDvoR/2iVh6rTuVKl22EQ== X-Received: by 2002:a17:902:ba8a:: with SMTP id k10-v6mr14493245pls.338.1529334534977; Mon, 18 Jun 2018 08:08:54 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([2620:0:1000:1611:6077:8eec:bc7e:d0f4]) by smtp.gmail.com with ESMTPSA id i7-v6sm54830660pfa.34.2018.06.18.08.08.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 08:08:54 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: RESEND [PATCH] lib: vdso: add support for time Date: Mon, 18 Jun 2018 08:05:59 -0700 Message-Id: <20180618150613.10322-14-salyzyn@android.com> X-Mailer: git-send-email 2.18.0.rc1.244.gcf134e6275-goog In-Reply-To: <20180618150613.10322-1-salyzyn@android.com> References: <20180618150613.10322-1-salyzyn@android.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180618_080905_588132_0CB21999 X-CRM114-Status: GOOD ( 17.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Catalin Marinas , Will Deacon , Andy Lutomirski , Ingo Molnar , Russell King , Andy Gross , Laura Abbott , Mark Salyzyn , Kees Cook , Kevin Brodsky , Jinbum Park , John Stultz , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Paul E. McKenney" , Ard Biesheuvel , Dmitry Safonov , Jeremy Linton , Mark Salyzyn , James Morse , Andrew Pinski MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mark Salyzyn Add time() vdso support to match up with existing support in the x86's vdso. Currently benefitting arm and arm64 which uses the common vgettimeofday.c implementation. On arm provides about a ~14 fold improvement in speed over the straight syscall, and about a ~5 fold improvement in speed over an alternate library implementation that relies on the vdso call to gettimeofday to fulfill the request. We can provide __vdso_time even if we can not provide a speed enhanced __vdso_gettimeofday. (arm, virtual counters). Signed-off-by: Mark Salyzyn Cc: James Morse Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Cc: Andy Lutomirski Cc: Dmitry Safonov Cc: John Stultz Cc: Mark Rutland Cc: Laura Abbott Cc: Kees Cook Cc: Ard Biesheuvel Cc: Andy Gross Cc: Kevin Brodsky Cc: Andrew Pinski Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: Jeremy Linton --- arch/arm/kernel/vdso.c | 1 + arch/arm/vdso/vdso.lds.S | 1 + arch/arm64/kernel/vdso/compiler.h | 1 + arch/arm64/kernel/vdso/vdso.lds.S | 1 + lib/vdso/vgettimeofday.c | 10 ++++++++++ 5 files changed, 14 insertions(+) diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index 51d8dcbd9952..6721854c5ae6 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -192,6 +192,7 @@ static void __init patch_vdso(void *ehdr) vdso_nullpatch_one(&einfo, "__vdso_gettimeofday"); vdso_nullpatch_one(&einfo, "__vdso_clock_gettime"); vdso_nullpatch_one(&einfo, "__vdso_clock_getres"); + /* do not zero out __vdso_time, no cntvct_ok dependency */ } } diff --git a/arch/arm/vdso/vdso.lds.S b/arch/arm/vdso/vdso.lds.S index 1d81e8c3acf6..1eb577091d1f 100644 --- a/arch/arm/vdso/vdso.lds.S +++ b/arch/arm/vdso/vdso.lds.S @@ -83,6 +83,7 @@ VERSION __vdso_clock_gettime; __vdso_gettimeofday; __vdso_clock_getres; + __vdso_time; local: *; }; } diff --git a/arch/arm64/kernel/vdso/compiler.h b/arch/arm64/kernel/vdso/compiler.h index 921a7191b497..fb27545640f2 100644 --- a/arch/arm64/kernel/vdso/compiler.h +++ b/arch/arm64/kernel/vdso/compiler.h @@ -65,5 +65,6 @@ static __always_inline notrace u64 arch_vdso_read_counter(void) #define __vdso_clock_gettime __kernel_clock_gettime #define __vdso_gettimeofday __kernel_gettimeofday #define __vdso_clock_getres __kernel_clock_getres +#define __vdso_time __kernel_time #endif /* __VDSO_COMPILER_H */ diff --git a/arch/arm64/kernel/vdso/vdso.lds.S b/arch/arm64/kernel/vdso/vdso.lds.S index beca249bc2f3..9de0ffc369c5 100644 --- a/arch/arm64/kernel/vdso/vdso.lds.S +++ b/arch/arm64/kernel/vdso/vdso.lds.S @@ -88,6 +88,7 @@ VERSION __kernel_gettimeofday; __kernel_clock_gettime; __kernel_clock_getres; + __kernel_time; local: *; }; } diff --git a/lib/vdso/vgettimeofday.c b/lib/vdso/vgettimeofday.c index 54e519c99c4b..dfced9608cd3 100644 --- a/lib/vdso/vgettimeofday.c +++ b/lib/vdso/vgettimeofday.c @@ -386,3 +386,13 @@ int __vdso_clock_getres(clockid_t clock, struct timespec *res) return 0; } + +notrace time_t __vdso_time(time_t *t) +{ + const struct vdso_data *vd = __get_datapage(); + time_t result = READ_ONCE(vd->xtime_coarse_sec); + + if (t) + *t = result; + return result; +}