From patchwork Mon Oct 1 17:58:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10622661 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 4C2D415E8 for ; Mon, 1 Oct 2018 19:28:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 37E922847A for ; Mon, 1 Oct 2018 19:28:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BCE6284AA; Mon, 1 Oct 2018 19:28:42 +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 905FB2847A for ; Mon, 1 Oct 2018 19:28:41 +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=YUI7tmpVNfwlHx9A8JMQCtSNQP4DmXDmx22shQxXtk0=; b=YhTShsQ8RUnsBn Ci14eRAAJ/dva/nDOHxzFTp7lbqPliKiDhZuwMC8aeTTDFQiI4VqPGGPVC8cvvJSysoVHcuzRLXGM vFViyqV6viuL2kwzRRNx+gVLMJZVrcQYWhZR0Ro/FGKfGl4cJ3FlomKbbVLvpqNw/FwAxuKdxCk2C R+dkW93dgnFroQ5wV3t5cflUQ0SEnzKyvl5mKNB7VebVjAc3mUadmKo/B87Spxw0hH5f9TcO+/YMW 4n1HSkr9WLkkmGTxgPWfQ1NAoJkLjSTuUZKIIU+DeMU9ajYPCG+ylVCkxvDMCzBgARRqSX5alpmFf 5ixTeZYnPAQ7+8y3FAJg==; 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 1g73rv-000653-0q; Mon, 01 Oct 2018 19:28:35 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g73po-0005Fa-Ad for linux-arm-kernel@bombadil.infradead.org; Mon, 01 Oct 2018 19:26:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=7vaA2MA8EQ1d2Vcn1d4fxUkppIy3o0RYXj7Io3jPUYw=; b=KuX5+G5prbxwsWsMsryrpdUzSW YKoNKHH/bbJGhwbtuPjS27aRnn9WE+7qBfBudx7kWQfjjDMPML2zYa6VVbGX59u4P9h2qrrigngh1 HtaIVrcQ/Z51kDlTMfMglJR92/rHlv6TRy4vbqgaA3Wlck5ejj9GzvhLco8u1zfrUXzC7Hz6EEpi4 wfoj2ENFSANly3ZXZT/qgGzZ465iQZBLDwk8c+T66P42sv1HhK+1DTdVD75yHWvmM7Y+J+IMN+pZx Axzatw2sxhzHJhQ5SdAMmhdW6n5Zids8LMQMCB0pMykMR8I2yLijQgqg0CUVw6ccOrfJh5zAkwPOs jinEM8xQ==; Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72Vj-0008Cx-JM for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2018 18:01:36 +0000 Received: by mail-pg1-x544.google.com with SMTP id i4-v6so9392454pgq.9 for ; Mon, 01 Oct 2018 11:01:25 -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=7vaA2MA8EQ1d2Vcn1d4fxUkppIy3o0RYXj7Io3jPUYw=; b=JAPp+6tPtdnSk7VyFz78LpsVxKwjQs9mSL/bf7A1eDSRYG9otVaO8+16CaBlLtVAmk jD2XB1DmYUtPLZUQXkYaM3yxpYNsPEWCsrcJyrgR7xCNvQvh6wn5deCjABE/AHxf6RT1 7T/r71+oSqsR2ras5m0zdH13SQdnNoFpzofZDw3CZeSlxZn20EUMYNQ404oOJ6EU8/UY OQlD7ymz2/7aJMwyE8S/KYRF+MQdmhH+JQLCiCQMYeP0xc5/zuu/pj8lhi2CGOy6QOtz r7IAJLe/wLelhr9jjZAGzn6/dSu57EGoHDbUkZDMVeBRFSu4eNcWm3xnkv1Gotmqpp+F hG4w== 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=7vaA2MA8EQ1d2Vcn1d4fxUkppIy3o0RYXj7Io3jPUYw=; b=DmeRUXr68BlCIPeTKn1EgR3ozkt8Q/CwB3ngGhGMzN/psd1mAGwRqfhujjBmc2VMW9 kdccp1mZmQlOpvbzzza/oAjbspINixuG+35zrzcvmPBtWL/a7JWJIv6Yf42mjLTczglC FJaTT6q0TbbUmfI1b4lzbfnEhaNm2PVacVOnSNgBzNrtXwjkZG57tdulhLTKvSGnnI6C ES+T7b/1xDw+62I0ayRHBJp0tIMje3SRhC+FCkM2TBcacb0fKNvNT/JSbkpm2Gq4KDVB j5jvuhIXxvMiLeLTOCIyQofyRApFeTyEO8N/h17yESWYT2P3llQ6RZ9V82NJqtYY93CD tA2Q== X-Gm-Message-State: ABuFfojs7RWCKzBzSbi3fUGO8xzQxN4CcvY97HWxLGdexfAkClOEj4+3 as5fMd4ZmVcjgBugUzbLv3u1jA== X-Google-Smtp-Source: ACcGV62Cdp4S5Y3bitpAoz3QJF/L1dkkKhsuoLOPnerR7TjAuPG9pOLzPpDiLFOd9/MTPba57sJSUA== X-Received: by 2002:a17:902:b598:: with SMTP id a24-v6mr5870438pls.40.1538416883414; Mon, 01 Oct 2018 11:01:23 -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.01.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 11:01:22 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: RESEND [PATCH v5 08/12] arm: vdso: Add ARCH_CLOCK_FIXED_MASK Date: Mon, 1 Oct 2018 10:58:28 -0700 Message-Id: <20181001175845.168430-9-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_140135_687795_934C3240 X-CRM114-Status: GOOD ( 16.88 ) 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 , Laura Abbott , Kees Cook , Ard Biesheuvel , "Paul E. McKenney" , Catalin Marinas , Kevin Brodsky , Will Deacon , Russell King , Jeremy Linton , Andy Lutomirski , android-kernel@android.com, James Morse , Andrew Pinski , Dmitry Safonov , Andy Gross , John Stultz , Thomas Gleixner , Mark Salyzyn , Ingo Molnar , linux-arm-kernel@lists.infradead.org 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 Take an effort to recode the arm64 vdso code from assembler to C previously submitted by Andrew Pinski , rework it for use in both arm and arm64, overlapping any optimizations for each architecture. But instead of landing it in arm64, land the result into lib/vdso and unify both implementations to simplify future maintenance. Add ARCH_CLOCK_FIXED_MASK as an efficiency since arm64 has no purpose for cs_mask vdso_data variable. 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 v4: - New in series, split off from earlier. v5: - rebase --- arch/arm/vdso/vgettimeofday.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index a354586f8a65..3005479efbe8 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -128,7 +128,11 @@ static notrace int do_realtime(const struct vdso_data *vd, struct timespec *ts) { u32 seq, mult, shift; u64 nsec, cycle_last; +#ifdef ARCH_CLOCK_FIXED_MASK + static const u64 mask = ARCH_CLOCK_FIXED_MASK; +#else u64 mask; +#endif vdso_xtime_clock_sec_t sec; do { @@ -141,7 +145,9 @@ static notrace int do_realtime(const struct vdso_data *vd, struct timespec *ts) mult = vd->cs_mono_mult; shift = vd->cs_shift; +#ifndef ARCH_CLOCK_FIXED_MASK mask = vd->cs_mask; +#endif sec = vd->xtime_clock_sec; nsec = vd->xtime_clock_snsec; @@ -161,7 +167,11 @@ static notrace int do_monotonic(const struct vdso_data *vd, struct timespec *ts) { u32 seq, mult, shift; u64 nsec, cycle_last; +#ifdef ARCH_CLOCK_FIXED_MASK + static const u64 mask = ARCH_CLOCK_FIXED_MASK; +#else u64 mask; +#endif vdso_wtm_clock_nsec_t wtm_nsec; __kernel_time_t sec; @@ -175,7 +185,9 @@ static notrace int do_monotonic(const struct vdso_data *vd, struct timespec *ts) mult = vd->cs_mono_mult; shift = vd->cs_shift; +#ifndef ARCH_CLOCK_FIXED_MASK mask = vd->cs_mask; +#endif sec = vd->xtime_clock_sec; nsec = vd->xtime_clock_snsec; @@ -200,7 +212,11 @@ static notrace int do_monotonic_raw(const struct vdso_data *vd, { u32 seq, mult, shift; u64 nsec, cycle_last; +#ifdef ARCH_CLOCK_FIXED_MASK + static const u64 mask = ARCH_CLOCK_FIXED_MASK; +#else u64 mask; +#endif vdso_raw_time_sec_t sec; do { @@ -213,7 +229,9 @@ static notrace int do_monotonic_raw(const struct vdso_data *vd, mult = vd->cs_raw_mult; shift = vd->cs_shift; +#ifndef ARCH_CLOCK_FIXED_MASK mask = vd->cs_mask; +#endif sec = vd->raw_time_sec; nsec = vd->raw_time_nsec;