From patchwork Mon Jun 18 15:05:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10472077 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 ECF75601D7 for ; Mon, 18 Jun 2018 15:25:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB5F3286A4 for ; Mon, 18 Jun 2018 15:25:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CEA5A28A04; Mon, 18 Jun 2018 15:25:18 +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 2F6A528A4A for ; Mon, 18 Jun 2018 15:25:18 +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=36qlPTMKnxfX3O2xAQmXM7ZOAUO7Sl2x6tidd4is6S4=; b=jzKCX+ny8m02hyFl9oYFqwXaRo Rv8BITvCDgfIcrGl3i5KAr0Y6y8Ih2S8n3GD6Znctso34M5Kq7BS2zhjyPRCzNBWCOq5dkZBnNpzA b55Kd17fFrZVF0qm2vD2pBPxsdqES3cUEr1QP8OM/QWnh5fv0TCqGDFCJrXw3+/+EreZiYk+oQzqN 8fdTz+XWSRMnVYb1076DstaeXJbore+NS5UCEM4sJw4IIpFPlHDBZe8hcw2rGAJBu7MvzbPzhLmjS vPfSXTeZPEoDL9466+aMW2LFG2OmycZ9uuQ2TVl8Rp6QauSPlMF8rFfvAJj9fSoEaBTQdMPrGyyEf KMEIoGPg==; 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 1fUw1h-0004vG-3u; Mon, 18 Jun 2018 15:25:05 +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 1fUvvt-0000OV-VD for linux-arm-kernel@bombadil.infradead.org; Mon, 18 Jun 2018 15:19:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding: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=PsEKIth0yuD0OAInqjn4dCvytZqYsNPOy0i7kE2wFdY=; b=qjy9SkIOHdFOrfxL+TPqjvP1L q87tn9kkTj8Yc4zmYJvvB4jlNgY6v14zsrFzO8yR3f5fgnVFVE0tKYIQc6xBt4uY8cY44/q8fGf+o 6V8tnpPSnGG5wG8tfANM0CK6pZy53ZfY3LTLEe7X8Li67q7h5+gHNoPguAWmfFks7SBp5hRkPGKnj QqTNpFfI/Pq3NhuAoss+8FCRORqcW1kaZTr3C95Vogak3bBtPeP8O5cAFBtyYB3csLpw4nDgrhta6 Hi+kQTS1AS9IFHB13C3pZN6pFwfkuf3TK1Iz7ENZqOALBRhZ7fomM4EjL8Rxapezr/Q/Xspoymdpq RuX2SmvgA==; Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]) by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUvkw-0000EB-JM for linux-arm-kernel@lists.infradead.org; Mon, 18 Jun 2018 15:07:47 +0000 Received: by mail-pf0-x243.google.com with SMTP id a11-v6so8312818pff.8 for ; Mon, 18 Jun 2018 08:07:36 -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=PsEKIth0yuD0OAInqjn4dCvytZqYsNPOy0i7kE2wFdY=; b=SW2qgV9gUxmDo8BceOqZTHEWjBg/suiS5a7jTJo/EWYcUC0OXUYjrZPfen1kCnkc26 dp9GczJ8UAZ3dmOI9uq32bjuFwAPY9cNLr00O83I6cPq3/yOlQ9izrm637Wahvj2WVsM 3L+7F/+Peqi58miC4BzumJdEtvKrL9dkDGmBMrN3VHTtEcymtGISCZVL6Bqrq1fekZ8e iZAm3quaThXyLy52QnoZ0N7U3hl89LXM8S71mEpIJEqJjz62RlVjX0YLHZ9eS3MbnDR7 zrFX6jjALPmGjp3ImIvw+HCF/QavxrAyVyYilK0WhkUZNzVLSL5PLnmEyDxaEHxaszah gvjw== 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=PsEKIth0yuD0OAInqjn4dCvytZqYsNPOy0i7kE2wFdY=; b=LNPgu+LN2HW8BSern+u8esvHc9YW8UPBf4N4fFb+9nmsL7zSG2j24Ok9MJk5WeICPD xQ+qZOqSu4Z6DXiuNpDHO7qIrrtk8wtMnyYWWLDnhUFCMH0Oseze2gWEMyCPQBgULqL9 IQUp2HbzV7eFlzldjuRafTyKoW4/+mP24KrB4Q1cyGVZ9R0oY+qiu6GQK36TA2QggqkF WfbPSnEIsJiEboSafE6i3nI5bJuJc5XSa1fv2amptZV3pgLrIiC00R0MuSOLGka2Ffuz /hEuOv6j4A5ToaNpkTWKeFvEftL+DFUSs8fgiy8ligRQ+qkVls3uCLqMXg6zDC3dOj3g n1BA== X-Gm-Message-State: APt69E3YwtPgFsbx2fp8Vlv3LykFkmoF+1xOxXyeQRc48pZVc/HhHJQd AAvfj3GoA3szBLlcmgycyIP/sA== X-Google-Smtp-Source: ADUXVKKvauPfsprBPn4pSqSYshRoQzPtEbYkDnktZUfqGDCjWOLOa1VDiuG6muFFlokKncMOwrqYAw== X-Received: by 2002:a63:ba56:: with SMTP id l22-v6mr11398232pgu.161.1529334454265; Mon, 18 Jun 2018 08:07:34 -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.07.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 08:07:33 -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, 18 Jun 2018 08:05:54 -0700 Message-Id: <20180618150613.10322-9-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_110746_652132_C1284FE0 X-CRM114-Status: GOOD ( 17.30 ) 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 , James Morse , Andrew Pinski , Dmitry Safonov , Andy Gross , John Stultz , Thomas Gleixner , Mark Salyzyn , Ingo Molnar , linux-arm-kernel@lists.infradead.org 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 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 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 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;