From patchwork Tue Oct 31 18:32:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10035179 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 C4F5D60327 for ; Tue, 31 Oct 2017 18:47:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4E33286DA for ; Tue, 31 Oct 2017 18:47:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6725289CF; Tue, 31 Oct 2017 18:47:43 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 560E0286DA for ; Tue, 31 Oct 2017 18:47:42 +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: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:In-Reply-To: References:List-Owner; bh=7A5u9v+qYAi7Ij0Xx9b7KBljrgVyWVc8wqgNJaBjUKo=; b=gtE /icJeMn1qK8KWAtiB6z4hAh4bYyK9j+3UJyqxXYuhmZ7eUtIqi0z4mTK5VDt79mj3Vl2k7cS4k6NH 6EXqqC3ZGmmXHXwvUuyzG46Vez6aVwrV4peegokbY5Bd1clRVdQtPOmnwEho4ujLAFL/PjghunosN GJJlyHuqzJMrHpU0Ou/hFjcc4+b9wh4VxMUyRHVNoXrPIWJs0m/XXjyfEyW+Wvwig6W43U/DG1bAn 5tY/0c9tgsU5IYhVX7ZedzS9+y0JmAnEkuM8qJE8BCHdhlQZuAS5585vd3vwV7kt1ZCMZk8rSEkSu dWTHtHPRJJuE7mM78FGfGkbesPt6MsQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1e9bZd-0000P9-Ks; Tue, 31 Oct 2017 18:47:41 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e9bZb-0008Ku-Or for linux-arm-kernel@bombadil.infradead.org; Tue, 31 Oct 2017 18:47:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=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:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=R/CSEr0mzgZmfp09aCwG13Pwz92CPygE8rXCry+mDBQ=; b=lMktpxOB7bVoMIfNUyTM0Nfs0 j1gSGuaJDkukQLqshhVYfrNHO8qyNJAdSINIZK9rj0y/1N4wRIoySH+DE7bsyiYx5723AhCMYXknX 9m8UmjO3tjwT4w9bYp8Thv76xii0hNDWe6aVw/He9XOxuv8GvimayUH1HxR10DybHDvZq1SdVye+P +nzq5hcmOs/5IGZlA4A2fQVlLb3Azqk3gRMaOjstAEF4beV9mH/AsDwvZ04OcNnMOCM7cqfWaT5EA fxvROEg1pZBTJ3wzK27T6JYeVjO2hrtnNe/AD+MT8gBJCPGAen9f7ibaJYnOoblwYHV9BMwXvzzwB jgEGDycmg==; Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e9bL8-0007Xe-8Z for linux-arm-kernel@lists.infradead.org; Tue, 31 Oct 2017 18:32:44 +0000 Received: by mail-io0-x241.google.com with SMTP id p186so816548ioe.12 for ; Tue, 31 Oct 2017 11:32:22 -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; bh=R/CSEr0mzgZmfp09aCwG13Pwz92CPygE8rXCry+mDBQ=; b=pMTLEMmnlOsqGdXEvlcJuQ4an1dihY3f40QRGOVu8yY36Csf90TwronYLxOhIGinBi iwkJj304fQ18RYXsIS7OHcv6lHLWJlK4Mo5MrgzzlfVbZ2t0cYTrjY0LfhPyt/v2yQaE 5yDFKSqkuL1XMdCIIC08apySzjzs6jK4xzx5+j7gJEtaPXM9FByh3F4nJ2kgGQrDVF4Q FNyqhHdyd5MFK79abA2AMyyDvKfyKpD2eTcUgDqIRNoHNfESDVa3ZdE7hiFLIRNiwMbG fiiCEmOnId0cbhSTC7bKABjQYxZ6v9VjPYg2tGkPv4vGV0yeJr26QkMQeIb75CDnsick 9Qlw== 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; bh=R/CSEr0mzgZmfp09aCwG13Pwz92CPygE8rXCry+mDBQ=; b=niFUeHM9IzwBS/TTcNFAXvJvDXPKxAan31PYpLGlbEkGn/RS/s/bMtVx7sJaUGQb4B NOko6K0cCZ2OrfusQM9oGEfs9VusyTcwLCtq/BPxQBv4qApHKSxXlsIoE5RzovDE2uH7 vocE5FNzDeuJyUFmJqp3k7pplZfdZqzgmKrnpUxnEivAw51Z2dycj+t4M9+2hQvdSk// MybeTs0xXhNIigVvb53nKYwMq9YInLQsSiigUirej9TD3MpJhu1C/pHBnJo3h4fh2lEj LQLz/PxEtR5leKs4ao58aZCYQY+1lo0Zkw6XNXxEEEtVbZ+898qFGyp1uizQJaCy1PM9 YXWw== X-Gm-Message-State: AMCzsaWnqNTel/xHiJnApdlsFpU7NCiIwEYjcHVXJ1ats36DU+iUBDR6 tnulESKlp8mAYRyJCVQrUFYlfw== X-Google-Smtp-Source: ABhQp+SLhOsUCStzV/+ocvw7f/jaGzKGluT2bo+zEHkfWTgOieLO/kwolWfDPR2RoiTIC5t59IwCrg== X-Received: by 10.36.179.80 with SMTP id z16mr4443203iti.66.1509474740646; Tue, 31 Oct 2017 11:32:20 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id q191sm4795807itb.1.2017.10.31.11.32.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Oct 2017 11:32:20 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v4 08/12] arm: vdso: Add ARCH_CLOCK_FIXED_MASK Date: Tue, 31 Oct 2017 11:32:13 -0700 Message-Id: <20171031183216.81259-1-salyzyn@android.com> X-Mailer: git-send-email 2.15.0.rc2.357.g7e34df9404-goog X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171031_183242_419603_AB77EB19 X-CRM114-Status: GOOD ( 13.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 , Laura Abbott , Kees Cook , Ard Biesheuvel , Catalin Marinas , Kevin Brodsky , Will Deacon , Russell King , Andy Lutomirski , James Morse , Andrew Pinski , Dmitry Safonov , Andy Gross , John Stultz , Thomas Gleixner , Mark Salyzyn , 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 v4: - New in series, split off from earlier. --- 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 1152308067e1..bbacf4d0d6a2 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -123,7 +123,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 { @@ -136,7 +140,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; @@ -156,7 +162,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; @@ -170,7 +180,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; @@ -195,7 +207,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 { @@ -208,7 +224,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;