From patchwork Fri Oct 27 22:25:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10030743 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 07BE26032C for ; Fri, 27 Oct 2017 22:29:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D7E9D22376 for ; Fri, 27 Oct 2017 22:29:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8FCE251F9; Fri, 27 Oct 2017 22:29:29 +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 3909722376 for ; Fri, 27 Oct 2017 22:29:29 +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=zLuUGhhYYFMlBXJ6z9CCNCNc9KRmofkBmlSprBxKMe8=; b=uho uxDLSKTHI8SuLkL905fE6c17XQbtrjARbzZcmfPYXYoVWrrzkJiNFkRUmpToBxN5KKtf4tgQ7CNDN x6WHRprxUtjZyzSNpWaeOwSt2cgxl0lwYTu22A6FHcsg/6+Trp0TnBbDL1OPXf8AclJU0ix0QczNH 0jUAw+r+xIlDxkTZEwyJ1weZ3ZVzTpV6/QOuXfFBWd5qDLuGIFWrxKwXYZ5sIadQPAh/85TD8jTcW RDesLWYIxNTB32Dj7q7Xa1Sud2wIPFNqpuAWWiurNL34W8g/mzWXE9M4674TG71OE0ZtMBheEtkcd eYSiXucScHFX2BNngzXlJkK6GafoHXg==; 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 1e8D84-0004el-IB; Fri, 27 Oct 2017 22:29:28 +0000 Received: from mail-io0-x242.google.com ([2607:f8b0:4001:c06::242]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e8D59-0002xE-5k for linux-arm-kernel@lists.infradead.org; Fri, 27 Oct 2017 22:26:40 +0000 Received: by mail-io0-x242.google.com with SMTP id m16so15749199iod.1 for ; Fri, 27 Oct 2017 15:26:07 -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=GkQom5ryv916rpo1pvQPuXi0Hzt2pstWwk6I90ghbe4=; b=wBLrHONroWj9YWUIgilyk1VR0F/YheFpASoTXGnLxiXv6LF8hZNlAY6V6uIfLH5yOL 8Js/Gjg6AW2QhcKaMi/e5KyesaVjqzVZJk0W8Kb7UuI+9/A4e5tZjQ0zmtK1gPNW4n3h GiisO2MhJIFaP9vhsCXrg8CDVXWgOw++xmNTydNa6jnV/EqeH4bjFhiY4uwmE1qcqiXU ZTZ+IG1R3cZ8AFYFMe/oLvy3c1q6+YlL++5KUUXZA+CELUMky4e5J/9DwL7cFR9vuEOL tvEL2g0Vay9PSveXRIkIx7hU7dxwYg7k1smiLReoHHGVJH3FVJxzGHG483fO0tXKnQ0r 1Veg== 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=GkQom5ryv916rpo1pvQPuXi0Hzt2pstWwk6I90ghbe4=; b=TVMcH29QKE6uFoSfBP2dqysqr7LFMrjyK1GtT9QmfkEAxYz7uT8m/lZ+dSkFRuJ7fR IkFweuNQEy19EvRcznsz4fk+GpGnLNXGDcfFSiHKXbNk+uH815MVOYGS5mnWiH5283ZM m4BDsC23GjPq200wuLIkef8gzRqowMW1mjs3d+4D94BJxvDUx+J9021tEItKfXdCHSxQ 350ss6lH6E1NjlmPaYhfrDAncCdXbaB8amq0WIrMkra9EQ6y6wbLjOkVYwagIk/jTbQJ /o2d+1fYfJtGIBCryK1hpCZpb7JBCjPSIp1LgSeXXktzYhsmpiNE3/SPoQ/6pyvGZA5t Mydg== X-Gm-Message-State: AMCzsaXQmAaFTi7dZVq/Olw/utmwpqIEuWhdtJpBSctOVnvdxoz/g47e kwpOQImfjmTLwKXci7we74urvg== X-Google-Smtp-Source: ABhQp+SAzK5KeaqwgHJXAb2dW3WmkoelnQ6L06neg5iJPrzcHadR7iKjC8XK8/8jf/i2i1XYffpoYQ== X-Received: by 10.36.76.79 with SMTP id a76mr2639873itb.84.1509143166420; Fri, 27 Oct 2017 15:26:06 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id y197sm1352807itc.39.2017.10.27.15.26.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Oct 2017 15:26:05 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v3 06/12] arm: vdso: Add support for CLOCK_MONOTONIC_RAW Date: Fri, 27 Oct 2017 15:25:52 -0700 Message-Id: <20171027222558.57352-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-20171027_152627_491127_C3692071 X-CRM114-Status: GOOD ( 16.52 ) 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 , Mark Salyzyn , James Morse , Andrew Pinski , Dmitry Safonov , Andy Gross , John Stultz , 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 Add a case for CLOCK_MONOTONIC_RAW to match up with support that is available in arm64's vdso. 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: linux-kernel@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org v2: - split first CL into 6 of 7 pieces v3: - rebase (unchanged) --- arch/arm/include/asm/vdso_datapage.h | 4 +++ arch/arm/kernel/vdso.c | 5 ++++ arch/arm/vdso/vgettimeofday.c | 51 ++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/arch/arm/include/asm/vdso_datapage.h b/arch/arm/include/asm/vdso_datapage.h index fa3e1856244d..d57c296f7f52 100644 --- a/arch/arm/include/asm/vdso_datapage.h +++ b/arch/arm/include/asm/vdso_datapage.h @@ -46,6 +46,10 @@ struct vdso_data { u64 xtime_clock_snsec; /* CLOCK_REALTIME sub-ns base */ u32 tz_minuteswest; /* timezone info for gettimeofday(2) */ u32 tz_dsttime; + + u32 cs_raw_mult; /* Raw clocksource multipler */ + u32 raw_time_sec; /* Raw time */ + u32 raw_time_nsec; }; union vdso_data_store { diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index aed84b659cc5..7377638a3b00 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -335,9 +335,14 @@ 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_time.tv_sec; + vdso_data->raw_time_nsec = (tk->raw_time.tv_nsec << + tk->raw_time.shift) + + 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 7fcc8cfcb7df..b374c143d53e 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -206,6 +206,47 @@ static __always_inline notrace int do_monotonic(const struct vdso_data *vd, return 0; } +static __always_inline notrace int do_monotonic_raw(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 + + typeof(((struct vdso_data *)vd)->raw_time_sec) 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; +#ifndef ARCH_CLOCK_FIXED_MASK + mask = vd->cs_mask; +#endif + + 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) @@ -218,6 +259,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) @@ -239,6 +286,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; }