From patchwork Mon Nov 6 21:02:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10044543 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 AD5EA6032D for ; Mon, 6 Nov 2017 21:49:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9ED8928705 for ; Mon, 6 Nov 2017 21:49:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 934F829FD8; Mon, 6 Nov 2017 21:49: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=-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 28C2128705 for ; Mon, 6 Nov 2017 21:49:17 +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=ovcKANxaRk07Ds3mFDDoru3pnE6QisG7JCEP7f96Xb0=; b=piE zk6p7utzPGTAjmrdVNisyfCPc2I5rA6yz3Ov+HF4KBMl/PMby4CLgq3R13+A67fuADbDRK6bMyLmE vR72VwWnlPw26sAMohOw1kkLunioVbiliUlOqRIZcUx7jjXBhfzEru2/5YTaS3gVFlOyjF0I1fEVj peOxCbADy4mCSePMDOrO/mJePhrwX59x0X9UohhjXpJ+zzxmiIvT3Hf1/nOZqHGDfBZkhAwIjGjgX 1rNmk7AROZIQbf1WlaUifOXdp7z8pyPFkHMhekZlnXtxd/XlJZkDJs21nLU57siQdTLmXBilqEtlW tgVBNrJc7WpSRZU//84Uv400Si+xQqg==; 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 1eBpGf-0007aN-4w; Mon, 06 Nov 2017 21:49:17 +0000 Received: from merlin.infradead.org ([2001:8b0:10b:1231::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eBpGd-0007ZM-Nw for linux-arm-kernel@bombadil.infradead.org; Mon, 06 Nov 2017 21:49:15 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.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=Uyv4zINnY19kLYtwq5zRGXnB8ahtGyttQAyR1HfZk5E=; b=nukBMQ2QWN3DLAK+K1NqazNNQ 9gGrp3v/r5MnKZ0Ko55RMe9wOQkG1Mpld4t8Q7WmKw0GjJ46XU/sA8w9AJHBFa+KC7Ve3orJ39uPT CSKOKkO4CWiTV/MTW56Fq9rNsT/z7CNfiUT3mwRGvi2YEhGhS4ooQ3HOMsvgXGFzxbpYv6GJ3tLIg FE0ABejdhjqYWWFMP7h+hepi0nQrq9HQzd2d8+Vd0MoYhm7ieyzKWleHFPePr0vnDrnj8QqNu6iDf pyZxgKjBWEe/j4R8aFrSINNgmBHpO0+3bsXWub7AKhTd+LSs/5rqYgk9Cd5/3vnGfik34UpXnYuXa 1fBR9MuPQ==; Received: from mail-it0-x243.google.com ([2607:f8b0:4001:c0b::243]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eBoY9-0004OO-Bk for linux-arm-kernel@lists.infradead.org; Mon, 06 Nov 2017 21:03:18 +0000 Received: by mail-it0-x243.google.com with SMTP id n195so4808172itg.1 for ; Mon, 06 Nov 2017 13:02:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=android.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Uyv4zINnY19kLYtwq5zRGXnB8ahtGyttQAyR1HfZk5E=; b=oKzx7/M4Cmi6VQDbUYtF4rpGsWO6nVYxy+S6ZAjQVAb6+eE7EwoROBrGkIhKSfJAfo vNmaYwoPFxq9CaYrxirX72h/xSKWm+p5s1RunJ5B2HhOYgK/7yGMhC3h2XGLsfGHg9tw //fMSGriGPDigtFgXO7hP2eAPgOffefjtSwVsokDwQ4yQCgSlIFjLEywaomEj0oLaShd IKNf8MkaD6HwSo/lY/XfSfkt5ENw/YjKsBlJWFdP42m7o9nNkFHIx0vj8Aey8bIN5b5+ AFLpFpTqXjI64m6961I3lxgaOvhRZOSS1T49ndOAiYnekFZQk5MINKT9m2hOBw08Fhcx l9Cg== 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=Uyv4zINnY19kLYtwq5zRGXnB8ahtGyttQAyR1HfZk5E=; b=JwpQRdAFW+6l7nuJi3EJN0UU/ioGqQNEf0vWZwRFwtjesuZVx5xgKpjprtUWJQOwTD aDvyCnlF3CgyZZs9YjwiIcQ7NA6sSLwYsJC2q0vpdaBmLmh065/ZUtfqZDCz1UHDgn31 KokQ+vsiTciGI4nEsYL7fHeeagLHUyROpua83PDUeYzKdUOSPOzztqv075GF/QpMUaMl KixZHEzhfsp5Y0mwlHSAfIZNawkCUgQww2wQ+60RvhF9hjl2wGJfMfWXSjB4GBqXC81p /zPaXwuA8KVLhOyXEh0asr4kuiwniG8QLPf32Nas8+0v0QI4PgbuGNlHcLzQ03cLeiVe h5fw== X-Gm-Message-State: AJaThX630qdoe0wxmCrOVxB2RaBRx0+/UZtBkqNBLm7KEHEPEamDlWbu 7ahikB07/NUUsqhb8BCl75fTaA== X-Google-Smtp-Source: ABhQp+SVWUM+ODezWu4Jy5BEwSDG48xYWq0e8iVqmjNZ99Fzn2B/MzuLgwQYygJne8UWbnQqUUO/mA== X-Received: by 10.36.57.70 with SMTP id l67mr11053812ita.28.1510002175082; Mon, 06 Nov 2017 13:02:55 -0800 (PST) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id 77sm6174489ioh.5.2017.11.06.13.02.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 06 Nov 2017 13:02:54 -0800 (PST) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v5 08/12] arm: vdso: Add ARCH_CLOCK_FIXED_MASK Date: Mon, 6 Nov 2017 13:02:47 -0800 Message-Id: <20171106210250.95116-1-salyzyn@android.com> X-Mailer: git-send-email 2.15.0.403.gc27cc4dac6-goog 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. 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;