From patchwork Mon Oct 1 17:58:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10622531 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 10DF115A6 for ; Mon, 1 Oct 2018 18:12:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1AFF26BE9 for ; Mon, 1 Oct 2018 18:12:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E31F525D9E; Mon, 1 Oct 2018 18:12:28 +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,RCVD_IN_DNSWL_NONE autolearn=ham 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 40E9C25D9E for ; Mon, 1 Oct 2018 18:12:28 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=xwrKOWl9nyauDOiRmH+VbA9ARch5ASkgQk1oRzKVzNk=; b=NvX8Uu+xuaFUZO +xXFAgeI/l7c7/fa/lF6IfzBY2KQN1lj3eCPhnAguWFARyr2bgZTwbxSvm5P1MT6oA8G4zsl6Og+e l5ApfTy5g4q9hpd0GMAS7Rzk4YMtJ4jsU3lRpLpFz2fZobfqW8cuCZtGLBh2Llh/fULGvsMqztF8X mgD9s3q7rRM1/hxnY+XXB2cnkPqxV+bp3tjw0JaK9BrZP3DejP/JzWBhhdDjIxkH7B8KNJNFKRpFH /goi6lP7iMBxnGF/jLbfqDmIuT9aXOuOMnwkTM9LQwXytcEX4KAXjSXqtdBf787nvIzM2i6RHwX77 v/9UdpzSOchHM1f+MyZQ==; 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 1g72gC-0005VM-7o; Mon, 01 Oct 2018 18:12:24 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72XP-0007wf-2n for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2018 18:04:36 +0000 Received: by mail-pf1-x442.google.com with SMTP id b7-v6so9802382pfo.3 for ; Mon, 01 Oct 2018 11:03:08 -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 :mime-version:content-transfer-encoding; bh=sAg4sPW371XoUS8BgWwdN7mYJ3LZ3I5Z3B6wtVLhU0I=; b=PPzPkDoc3wQh3ufJMNTfIXs8cVit+nBkS+IzKbwnkmDl+OhvrA1FMBmJHh9cGfJ5Ff f1p4D9505pRZr6PMSy3mZ2BJxCyvVO1Uu2mbyE4t/MP+w/WidvXCkwIechtXmqDZfD7N hx0amM6kso1wakct4Gh+aNZ0I+nOt5Omg49IgHp+3EjXP8Vbvy624UNTYzAuliFtzEcT YAlWxdQROUaUuJ5QPWhwOXvxKBxaf7Hw5Ll3EvOhuhaWCdeV3vhGyxXY9jMS8VIyD5Iw smb3C9jsqlAB7vlKURwUPfEuu6OQovxuMLJw6owQ156tzsnbZuGJmZZseJ28B1BVkXgM Z8Iw== 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:mime-version:content-transfer-encoding; bh=sAg4sPW371XoUS8BgWwdN7mYJ3LZ3I5Z3B6wtVLhU0I=; b=K626+mXv/f2dq5U561FpMEj8ZMA19rV/b+DzjDYD1wjR+NGN8exjknNecAeNB6cJpk odJnCex98GjKGKyicJ5jk/mhLc7gaODjQSiRtzNL9CnYuA+4tqCfiX8mbl9b0ME4mXL5 X54LwoCF1gvqiid2PMIeoeYgPBPUPxEfqPqNBqDfPLMd/f1R5S/NsCip2O6E2U3nLJmj +JbSpX+rB/MTrQUmwB/m0kFk/bTaA+Hpb1lwGJTSAla2IrlD3QPXzsz3bY6/d6BzxGjV ctEE2WfsLxcqtAQfW9gO3/vUxnuu7mUPy/jg4WhU8SqPwTbom7A+Hh0wKqQJfwSMoY1f RLpg== X-Gm-Message-State: ABuFfogbeO6mZLDnL/Laz0A379ywrQ89gwGvfDizoeGFladIMCOqBWzd ugmd2ZV0yIdTz9f6Z68ZuatEVg== X-Google-Smtp-Source: ACcGV63JwjWf+GPvZlI1Nsu3bgtpnVvJZbDB/roylukpcO5GsYOf7ELGp8CumUl0p82NxIz3iOfkVg== X-Received: by 2002:a62:f909:: with SMTP id o9-v6mr12724905pfh.160.1538416988212; Mon, 01 Oct 2018 11:03:08 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([2620:0:1000:1612:b4fb:6752:f21f:3502]) by smtp.gmail.com with ESMTPSA id d186-v6sm24469261pfg.173.2018.10.01.11.03.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 11:03:07 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: RESEND [PATCH] lib: vdso: add support for time Date: Mon, 1 Oct 2018 10:58:33 -0700 Message-Id: <20181001175845.168430-14-salyzyn@android.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog In-Reply-To: <20181001175845.168430-1-salyzyn@android.com> References: <20181001175845.168430-1-salyzyn@android.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181001_110319_156907_9E4B2455 X-CRM114-Status: GOOD ( 17.62 ) 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 , android-kernel@android.com, Jeremy Linton , Mark Salyzyn , James Morse , Andrew Pinski 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 Tested-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 Cc: android-kernel@android.com --- 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; +}