From patchwork Mon Oct 1 17:58:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10622563 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 7540017E0 for ; Mon, 1 Oct 2018 18:22:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 684ED2843C for ; Mon, 1 Oct 2018 18:22:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5AF9328446; Mon, 1 Oct 2018 18:22: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=-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 6923F2843C for ; Mon, 1 Oct 2018 18:22: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: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=6zT0qsd7pzzhoq1tFNWdnIV7WjTnoz5MC5Ck8SuiJ5k=; b=a172q90a22wYf6 KoMhrkY6EBT/q3WsI61xr8Uk+/miJ13rDzo3/tfZhzu/INKdW+Q8TnVKoKSy5LmXxp8JTaLX4kPi0 MKHj4V7lGTu82TMdWb7u4QGaWV/OV33a4ohj1NuavMXQsrQY0dskflMXe3dv+HGw+CA9fIb2IIiaK ES7B9Fbypy0ey67ZqO/C7UcRZbjy/ESnRD0zTKR4vSbfn0lQ4GHmjCwYguNQ3sxrz6kiP43YPP8Xn wj244YFQ95sDh5wcAx1Ocbhu/57rQyzGqTjLYKoQsJ/ZETcH/1eI8OiZHcVij8ncDtNVpdfZ44Vnq Ko0R9ClYkjL9IRVMHHOA==; 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 1g72q0-0003FL-0c; Mon, 01 Oct 2018 18:22:32 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72ju-0007c3-Ee for linux-arm-kernel@bombadil.infradead.org; Mon, 01 Oct 2018 18:16:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.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=ZW+J2uHfbW8E5yTGNvzEAl3iCk9YwcdDxuB33ic4RTc=; b=ZSYn8iGqdjsJAooTp9xn/K11XC +DUdLFdXArTMPvYQGDZ7WCf/SHrdtoH0vHYd2iFnlUkz6E8pI7p2rSXn6b+WWNpkwl9xn9ixYwF6t bCyPrywJ4QKVSmrT4qEAFk9096BYOZcFQdQnNorl8YsyaVkELigHP1HQdYP9oGA3EXjPx2rTT/UJI hxzoLHDr1pGneMb1ye7vOp62x3PX90nroaYnaiW/ipNrb1VpFm2CrkkwsqOrweANgR58q7jzEucFA RVlgNg3Poam5rE1enVFMvhJFjOPrkrQq89GH0wnTJyydIEIcuFqv39nfn2/MGSZwFYmI3mApd/KMa uT7mrVXw==; Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1g72VI-0005s8-RU for linux-arm-kernel@lists.infradead.org; Mon, 01 Oct 2018 18:01:11 +0000 Received: by mail-pg1-x541.google.com with SMTP id f18-v6so6497906pgv.3 for ; Mon, 01 Oct 2018 11:00:58 -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=ZW+J2uHfbW8E5yTGNvzEAl3iCk9YwcdDxuB33ic4RTc=; b=SdCFEUYC8wRoAM79NCTbeVEpCs40i9LiCX1h9R535SDDF/JElvTZT7iCdFXf2it6kB MYEPbnDvEA2McO71e4BAe6baoSXhoANCP3PZ8/Brsf29+qIGLrYUuYx2voHKaABSNOSY i+U/z8eLxUVmdfXTFhBwn2e277tX9YmnLatSAkI/gnXk5rCtyzJu9O0QrovZd0hKVudZ V3Ce7aFI8Ija52AsBOPPQIFa7s9+6zpdrsXDXGecZvwgxBxd9qL5ccnJmT/kbQzYmK3f TajjjXKeTIIuPeoOQzOGlAu+LD3wQB9o8HoA4BgIw/kywZ7ppe8zYLdjNBBy+ef9dx6h 5EUA== 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=ZW+J2uHfbW8E5yTGNvzEAl3iCk9YwcdDxuB33ic4RTc=; b=LC5hPPCfgCiCE7+O9P6CLW7gjU4QR5xKUvIFAU6k/CGklD7TMGBeNXOY1L16RnHdpo ouBRz+HPDYWXmsTe1drA3EcLAwtLyp3RIRet7lBdf8JwAlKiaZRZvOiM+SoYXmzwzrVe lCZSLWY7loMZboIMt0gHYZ8ptECNjHgdmpQwVWfBpRnh98FyQAcIEp8OdDuLMMXeYLbc Z78LkuVvZ9kalBh+rEZa42536tnntGh60GWkLSSK5MEMcSFqJbXpshZ4D++Ahp5HZjXA nh1Fdnv0kQBcOgbTbcObZk59yb4YaRciSzKsvzYXozbfq758W6xLo9/JyoQHVi9gsm8G LtAA== X-Gm-Message-State: ABuFfohdq3hj2i0PqZkQf1FVsrmNWW0KYCVOY+hrwzxfUDe4zv4+T9Rh fv52t+WQ/Fx35mnExB3mxwu4Lg== X-Google-Smtp-Source: ACcGV63d0TRbtG7P9JepMO8nsyO35brgz1kk+2AkK579gNH7YYo73vednHof02g/EdFJ/Oz5ykkcAA== X-Received: by 2002:a62:db46:: with SMTP id f67-v6mr12493954pfg.1.1538416856617; Mon, 01 Oct 2018 11:00:56 -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.00.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Oct 2018 11:00:56 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: RESEND [PATCH v6 05/12] arm: vdso: Add support for CLOCK_MONOTONIC_RAW Date: Mon, 1 Oct 2018 10:58:25 -0700 Message-Id: <20181001175845.168430-6-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_190108_929676_C18046A3 X-CRM114-Status: GOOD ( 25.97 ) 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 , Catalin Marinas , Will Deacon , Mark Salyzyn , Ingo Molnar , Russell King , Andy Gross , Laura Abbott , Kees Cook , Kevin Brodsky , Jinbum Park , John Stultz , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, "Paul E. McKenney" , Ard Biesheuvel , Dmitry Safonov , android-kernel@android.com, Jeremy Linton , Andy Lutomirski , James Morse , Andrew Pinski 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 a case for CLOCK_MONOTONIC_RAW to match up with support that is available in arm64's vdso. 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 v2: - split first CL into 6 of 7 pieces v4: - Move out ARCH_CLOCK_FIXED_MASK to later adjustment. - update commit message to reflect overall reasoning. - replace typeof() with type vdso_raw_time_sec_t. v5: - replace erroneous tk->raw_time.shift with tk->tkr_raw.shift v6: - fixup raw_time_sec and raw_time_nsec in vdso.c --- arch/arm/include/asm/vdso_datapage.h | 11 +++++++ arch/arm/kernel/vdso.c | 3 ++ arch/arm/vdso/vgettimeofday.c | 44 ++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/arch/arm/include/asm/vdso_datapage.h b/arch/arm/include/asm/vdso_datapage.h index 8dd7303db4ec..1c6e6a5d5d9d 100644 --- a/arch/arm/include/asm/vdso_datapage.h +++ b/arch/arm/include/asm/vdso_datapage.h @@ -34,6 +34,11 @@ typedef u32 vdso_wtm_clock_nsec_t; typedef u32 vdso_xtime_clock_sec_t; #endif +#ifndef _VDSO_RAW_TIME_SEC_T +#define _VDSO_RAW_TIME_SEC_T +typedef u32 vdso_raw_time_sec_t; +#endif + /* Try to be cache-friendly on systems that don't implement the * generic timer: fit the unconditionally updated fields in the first * 32 bytes. @@ -58,6 +63,12 @@ struct vdso_data { u64 xtime_clock_snsec; /* CLOCK_REALTIME sub-ns base */ u32 tz_minuteswest; /* timezone info for gettimeofday(2) */ u32 tz_dsttime; + + /* Raw clocksource multipler */ + u32 cs_raw_mult; + /* Raw time */ + vdso_raw_time_sec_t raw_time_sec; + u32 raw_time_nsec; }; union vdso_data_store { diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index c2c57f6b8c60..9c13a32fa5f0 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -337,9 +337,12 @@ void update_vsyscall(struct timekeeper *tk) if (!vdso_data->use_syscall) { vdso_data->cs_cycle_last = tk->tkr_mono.cycle_last; + vdso_data->raw_time_sec = tk->raw_sec; + vdso_data->raw_time_nsec = tk->tkr_raw.xtime_nsec; vdso_data->xtime_clock_sec = tk->xtime_sec; vdso_data->xtime_clock_snsec = tk->tkr_mono.xtime_nsec; vdso_data->cs_mono_mult = tk->tkr_mono.mult; + vdso_data->cs_raw_mult = tk->tkr_raw.mult; /* tkr_mono.shift == tkr_raw.shift */ vdso_data->cs_shift = tk->tkr_mono.shift; vdso_data->cs_mask = tk->tkr_mono.mask; diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index 59893fca03b3..a2c4db83edc4 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -194,6 +194,40 @@ static notrace int do_monotonic(const struct vdso_data *vd, struct timespec *ts) return 0; } +static notrace int do_monotonic_raw(const struct vdso_data *vd, + struct timespec *ts) +{ + u32 seq, mult, shift; + u64 nsec, cycle_last; + u64 mask; + vdso_raw_time_sec_t sec; + + do { + seq = vdso_read_begin(vd); + + if (vd->use_syscall) + return -1; + + cycle_last = vd->cs_cycle_last; + + mult = vd->cs_raw_mult; + shift = vd->cs_shift; + mask = vd->cs_mask; + + sec = vd->raw_time_sec; + nsec = vd->raw_time_nsec; + + } while (unlikely(vdso_read_retry(vd, seq))); + + nsec += get_clock_shifted_nsec(cycle_last, mult, mask); + nsec >>= shift; + /* open coding timespec_add_ns to save a ts->tv_nsec = 0 */ + ts->tv_sec = sec + __iter_div_u64_rem(nsec, NSEC_PER_SEC, &nsec); + ts->tv_nsec = nsec; + + return 0; +} + #else /* CONFIG_ARM_ARCH_TIMER */ static notrace int do_realtime(const struct vdso_data *vd, struct timespec *ts) @@ -206,6 +240,12 @@ static notrace int do_monotonic(const struct vdso_data *vd, struct timespec *ts) return -1; } +static notrace int do_monotonic_raw(const struct vdso_data *vd, + struct timespec *ts) +{ + return -1; +} + #endif /* CONFIG_ARM_ARCH_TIMER */ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) @@ -227,6 +267,10 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) if (do_monotonic(vd, ts)) goto fallback; break; + case CLOCK_MONOTONIC_RAW: + if (do_monotonic_raw(vd, ts)) + goto fallback; + break; default: goto fallback; }