From patchwork Tue Oct 31 18:30:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10035143 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 DA56E602B9 for ; Tue, 31 Oct 2017 18:32:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D01E5281E1 for ; Tue, 31 Oct 2017 18:32:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4D58285CD; Tue, 31 Oct 2017 18:32: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=-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 25C2E281E1 for ; Tue, 31 Oct 2017 18:32: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: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=JUV86LKJfhs+WYJzc6BdSejsdhroUeb8hwAv2oi7DTc=; b=DTm Brw4jZC9sG4C5n3hhCU16TjxJDGjRMpBq6t7iPNwG4a5iFSNBCEB6+9amZqzGfuYRfHFCKEjF+31R F3hqPMr2N5d3SC+XYnX8nny8KadLLJ3KioT1QjyUqUcCYwaUtvD4SnrDhaNzQBntBJjIrXVNytWzG /zL+ighbng4fZKcTvEBZ+RV4U4/GIFW/tQDFzngMxmkqKz/KK/iyiaBSdaAyPQPTggamQXPBBq1jR pDdN2LmKkc8RdBr9SKnJej/IrbhSjSljT2kmHAD+WpPSNjHRfwrfG3Dp3x4k/0eSbHA6pAGkaDNGH vdPPusARvsQViKQ2uCPwe5UwuqOHNmQ==; 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 1e9bKk-0006PI-NX; Tue, 31 Oct 2017 18:32:18 +0000 Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e9bJs-0005gU-VD for linux-arm-kernel@lists.infradead.org; Tue, 31 Oct 2017 18:31:39 +0000 Received: by mail-io0-x241.google.com with SMTP id i38so880840iod.2 for ; Tue, 31 Oct 2017 11:31:05 -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=G3sW4s6DQr2t6jHbau1w0yGq42Vb+nfcZWM96XyCAuU=; b=UCLLd2aEDnRKgCGPc4Z/47Yy1N2dbd9t/hwj7sSWqH5RPbY4T3TpmpV9a3Zmfl5d+q gDQjTE+fopbLH98OFm1pS/clDf2h1QenETpXgj2qdTpcCn0v8DxjfpmcH2bGt1WpuVib +K2LFzHSk0O/xI8IwLkCrnwShTF44mYdM1OKfkOMEz/MsvYQeODeUKre1f6bJ0aJwPNp JXA+kSPMnK8OYFaSHGkisL7niQmSsw6q/zcq9YodEofrZOyz1yii+yFkPN+O6s1vUfUL tcNKvTVFBqcj8clSdxcXJ5ZN4/TTztvcTgStOhFrcRvrGdWyWTcsaZm8vx1/76Dmim+C 4xpQ== 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=G3sW4s6DQr2t6jHbau1w0yGq42Vb+nfcZWM96XyCAuU=; b=bdZKj+T7JZVjKP9EdORur5UDWnH6RHRty4W0NOgOGm03TOXhuIZfvUH5LodfEeNidr 0fpDUhJQ1tJQoarfqbXGkbWDhFzqbl34X/bvnq23hKNjzzoBza875ily9fYC04xo6QGl a6LLFrfBCWWx2bM6YxDJKtr7dGjHD82UIY57eWNuq4E+14ieECV3jJC5uq3gnVClC1kd 78ayq0wqgHv7u0p8ZlyOBK3AfnKcpHoEnYINEXB6Hk3SeWHQPbr9zFZjcZ3tVvuV9asb +uaCppXA5O9gYqDmNQVbg8E7r92F/LuQTIOfqMoonlY7qTqo+ARHkcAzowa+MLwMCNhi Vl7A== X-Gm-Message-State: AMCzsaUyH1PdNsv9WR9N/3tJS6AIn/mSHmJM3vmuAcVsuVMs9ea7SeM8 od0IWM9RRw3qzn48t2hYlTFgiw== X-Google-Smtp-Source: ABhQp+RRb0/wIwbYIYgGFwgDs3jEygCzppb6ZnFZ0cqkQuVHBqS9n+PrH1EJX6qbQUawbE0AfXKDyw== X-Received: by 10.36.124.197 with SMTP id a188mr4205682itd.53.1509474665128; Tue, 31 Oct 2017 11:31:05 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id t3sm903108ioa.3.2017.10.31.11.31.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 31 Oct 2017 11:31:04 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v4 02/12] arm: vdso: add include file defining __get_datapage() Date: Tue, 31 Oct 2017 11:30:54 -0700 Message-Id: <20171031183100.80887-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_113125_967221_8F25A4E2 X-CRM114-Status: GOOD ( 22.79 ) 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. Define the prototype for __get_datapage() in local datapage.h header. Rename all vdata variable that point to the datapage shortened to vd to relect a consistent and concise style. Make sure that all references to the datapage in vdso operations are readonly (const). Make sure datapage is first parameter to all subroutines to also be consistent. 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 v2: - split first CL into 2 of 7 pieces v4: - update commit message to reflect overall reasoning --- arch/arm/vdso/datapage.h | 25 +++++++++++ arch/arm/vdso/vgettimeofday.c | 99 +++++++++++++++++++++---------------------- 2 files changed, 73 insertions(+), 51 deletions(-) create mode 100644 arch/arm/vdso/datapage.h diff --git a/arch/arm/vdso/datapage.h b/arch/arm/vdso/datapage.h new file mode 100644 index 000000000000..e3088bdfb946 --- /dev/null +++ b/arch/arm/vdso/datapage.h @@ -0,0 +1,25 @@ +/* + * Userspace implementations of __get_datapage + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __VDSO_DATAPAGE_H +#define __VDSO_DATAPAGE_H + +#include +#include + +extern const struct vdso_data *__get_datapage(void); + +#endif /* __VDSO_DATAPAGE_H */ diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index 8cf13af1323c..2474c17dc356 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -30,20 +30,19 @@ #include #include #include -#include #ifndef CONFIG_AEABI #error This code depends on AEABI system call conventions #endif -extern struct vdso_data *__get_datapage(void); +#include "datapage.h" -static notrace u32 vdso_read_begin(const struct vdso_data *vdata) +static notrace u32 vdso_read_begin(const struct vdso_data *vd) { u32 seq; do { - seq = READ_ONCE(vdata->tb_seq_count); + seq = READ_ONCE(vd->tb_seq_count); if ((seq & 1) == 0) break; @@ -55,12 +54,12 @@ static notrace u32 vdso_read_begin(const struct vdso_data *vdata) return seq; } -static notrace int vdso_read_retry(const struct vdso_data *vdata, u32 start) +static notrace int vdso_read_retry(const struct vdso_data *vd, u32 start) { u32 seq; smp_rmb(); /* Pairs with first smp_wmb in update_vsyscall */ - seq = READ_ONCE(vdata->tb_seq_count); + seq = READ_ONCE(vd->tb_seq_count); return seq != start; } @@ -81,38 +80,38 @@ static notrace long clock_gettime_fallback(clockid_t _clkid, return ret; } -static notrace int do_realtime_coarse(struct timespec *ts, - struct vdso_data *vdata) +static notrace int do_realtime_coarse(const struct vdso_data *vd, + struct timespec *ts) { u32 seq; do { - seq = vdso_read_begin(vdata); + seq = vdso_read_begin(vd); - ts->tv_sec = vdata->xtime_coarse_sec; - ts->tv_nsec = vdata->xtime_coarse_nsec; + ts->tv_sec = vd->xtime_coarse_sec; + ts->tv_nsec = vd->xtime_coarse_nsec; - } while (vdso_read_retry(vdata, seq)); + } while (vdso_read_retry(vd, seq)); return 0; } -static notrace int do_monotonic_coarse(struct timespec *ts, - struct vdso_data *vdata) +static notrace int do_monotonic_coarse(const struct vdso_data *vd, + struct timespec *ts) { struct timespec tomono; u32 seq; do { - seq = vdso_read_begin(vdata); + seq = vdso_read_begin(vd); - ts->tv_sec = vdata->xtime_coarse_sec; - ts->tv_nsec = vdata->xtime_coarse_nsec; + ts->tv_sec = vd->xtime_coarse_sec; + ts->tv_nsec = vd->xtime_coarse_nsec; - tomono.tv_sec = vdata->wtm_clock_sec; - tomono.tv_nsec = vdata->wtm_clock_nsec; + tomono.tv_sec = vd->wtm_clock_sec; + tomono.tv_nsec = vd->wtm_clock_nsec; - } while (vdso_read_retry(vdata, seq)); + } while (vdso_read_retry(vd, seq)); ts->tv_sec += tomono.tv_sec; timespec_add_ns(ts, tomono.tv_nsec); @@ -122,7 +121,7 @@ static notrace int do_monotonic_coarse(struct timespec *ts, #ifdef CONFIG_ARM_ARCH_TIMER -static notrace u64 get_ns(struct vdso_data *vdata) +static notrace u64 get_ns(const struct vdso_data *vd) { u64 cycle_delta; u64 cycle_now; @@ -130,29 +129,29 @@ static notrace u64 get_ns(struct vdso_data *vdata) cycle_now = arch_counter_get_cntvct(); - cycle_delta = (cycle_now - vdata->cs_cycle_last) & vdata->cs_mask; + cycle_delta = (cycle_now - vd->cs_cycle_last) & vd->cs_mask; - nsec = (cycle_delta * vdata->cs_mono_mult) + vdata->xtime_clock_snsec; - nsec >>= vdata->cs_shift; + nsec = (cycle_delta * vd->cs_mono_mult) + vd->xtime_clock_snsec; + nsec >>= vd->cs_shift; return nsec; } -static notrace int do_realtime(struct timespec *ts, struct vdso_data *vdata) +static notrace int do_realtime(const struct vdso_data *vd, struct timespec *ts) { u64 nsecs; u32 seq; do { - seq = vdso_read_begin(vdata); + seq = vdso_read_begin(vd); - if (vdata->use_syscall) + if (vd->use_syscall) return -1; - ts->tv_sec = vdata->xtime_clock_sec; - nsecs = get_ns(vdata); + ts->tv_sec = vd->xtime_clock_sec; + nsecs = get_ns(vd); - } while (vdso_read_retry(vdata, seq)); + } while (vdso_read_retry(vd, seq)); ts->tv_nsec = 0; timespec_add_ns(ts, nsecs); @@ -160,25 +159,25 @@ static notrace int do_realtime(struct timespec *ts, struct vdso_data *vdata) return 0; } -static notrace int do_monotonic(struct timespec *ts, struct vdso_data *vdata) +static notrace int do_monotonic(const struct vdso_data *vd, struct timespec *ts) { struct timespec tomono; u64 nsecs; u32 seq; do { - seq = vdso_read_begin(vdata); + seq = vdso_read_begin(vd); - if (vdata->use_syscall) + if (vd->use_syscall) return -1; - ts->tv_sec = vdata->xtime_clock_sec; - nsecs = get_ns(vdata); + ts->tv_sec = vd->xtime_clock_sec; + nsecs = get_ns(vd); - tomono.tv_sec = vdata->wtm_clock_sec; - tomono.tv_nsec = vdata->wtm_clock_nsec; + tomono.tv_sec = vd->wtm_clock_sec; + tomono.tv_nsec = vd->wtm_clock_nsec; - } while (vdso_read_retry(vdata, seq)); + } while (vdso_read_retry(vd, seq)); ts->tv_sec += tomono.tv_sec; ts->tv_nsec = 0; @@ -189,12 +188,12 @@ static notrace int do_monotonic(struct timespec *ts, struct vdso_data *vdata) #else /* CONFIG_ARM_ARCH_TIMER */ -static notrace int do_realtime(struct timespec *ts, struct vdso_data *vdata) +static notrace int do_realtime(const struct vdso_data *vd, struct timespec *ts) { return -1; } -static notrace int do_monotonic(struct timespec *ts, struct vdso_data *vdata) +static notrace int do_monotonic(const struct vdso_data *vd, struct timespec *ts) { return -1; } @@ -203,23 +202,22 @@ static notrace int do_monotonic(struct timespec *ts, struct vdso_data *vdata) notrace int __vdso_clock_gettime(clockid_t clkid, struct timespec *ts) { - struct vdso_data *vdata; int ret = -1; - vdata = __get_datapage(); + const struct vdso_data *vd = __get_datapage(); switch (clkid) { case CLOCK_REALTIME_COARSE: - ret = do_realtime_coarse(ts, vdata); + ret = do_realtime_coarse(vd, ts); break; case CLOCK_MONOTONIC_COARSE: - ret = do_monotonic_coarse(ts, vdata); + ret = do_monotonic_coarse(vd, ts); break; case CLOCK_REALTIME: - ret = do_realtime(ts, vdata); + ret = do_realtime(vd, ts); break; case CLOCK_MONOTONIC: - ret = do_monotonic(ts, vdata); + ret = do_monotonic(vd, ts); break; default: break; @@ -251,12 +249,11 @@ static notrace long gettimeofday_fallback(struct timeval *_tv, notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) { struct timespec ts; - struct vdso_data *vdata; int ret; - vdata = __get_datapage(); + const struct vdso_data *vd = __get_datapage(); - ret = do_realtime(&ts, vdata); + ret = do_realtime(vd, &ts); if (ret) return gettimeofday_fallback(tv, tz); @@ -265,8 +262,8 @@ notrace int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) tv->tv_usec = ts.tv_nsec / 1000; } if (tz) { - tz->tz_minuteswest = vdata->tz_minuteswest; - tz->tz_dsttime = vdata->tz_dsttime; + tz->tz_minuteswest = vd->tz_minuteswest; + tz->tz_dsttime = vd->tz_dsttime; } return ret;