From patchwork Thu Oct 12 23:01:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10003173 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 413FB602BF for ; Thu, 12 Oct 2017 23:03:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 323F92883B for ; Thu, 12 Oct 2017 23:03:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 260AD28870; Thu, 12 Oct 2017 23:03:45 +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 935C02883B for ; Thu, 12 Oct 2017 23:03:44 +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=PM8WlBpNRQ1U2ucL9B0j+PKike4a3ZT9BGbozRmx5+I=; b=Wj3 mxBTsxu+ryDikH0mOTLyGKSxLyVtZCDMAXlNtEj+dBrbuHvZnfuUkLtWYqiQ0q866fgGgSxusrxKp 0bbvuMhyK4396OgdDlEUxAm30MF7L1QDCs5FMREhiqpG7eBxfXiSgZG4QgOA8H+TELBmiSSTlQJci psPMQpsUI6SZZH7zhdag85f411G0s4six7mBVhH01sDvplL4TwlAhutYDEfu2UUsAjFqfEqGqM6Vz 4Usn+TCuxPmyVFXiOV24biU2+ZHHqqRMVacW6+mYMBUeKEbjP3JNHfNnsmrD0D8ZhJHoz0Phrc+28 kcSSxDhM95RUzKBe3gNRrh3LElO6bXA==; 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 1e2mVz-0000Ng-Um; Thu, 12 Oct 2017 23:03:43 +0000 Received: from mail-pf0-x22c.google.com ([2607:f8b0:400e:c00::22c]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1e2mUg-0006sC-Fa for linux-arm-kernel@lists.infradead.org; Thu, 12 Oct 2017 23:03:13 +0000 Received: by mail-pf0-x22c.google.com with SMTP id 17so7028970pfn.12 for ; Thu, 12 Oct 2017 16:02:02 -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=5Z+l44j0dQpQdPpM0Cd3FKwebJYA7Vqt1ibtyQkp3Mo=; b=fVc95Sn8wGK9RZ2YvoH/5GudlyjLlnVDA3dR81CsIBBd27kRi3WhCxvD7ZFRM/sgvo nzst1Pvc8MGONJ2SsRAroE0uwq3BLJyn2KC6rR99VcjmwPibeCJrO1A5ewjP6l1ck0U4 qVOemQF56U4jpsUXT3gr2XHAtN7yjTArvgO+dLBp1mwFDfg7KzvxuIUthEaudNPHwGB8 tQZZFLNmQzJC2W2NHxr9eMnUSZyHoN4xwyrsSDpf9ALa7AJRGU76tlFeDKjRcYJxZKOT +lJyMe7gTv0W8lkZBPizBA1oPfAxoPIm6RxQljj4uKBlTeY5uSTwZOFXXKl9KxVsxbpo 8w3A== 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=5Z+l44j0dQpQdPpM0Cd3FKwebJYA7Vqt1ibtyQkp3Mo=; b=A5qiTYVy4ynfTeYKacmAUDhdb8sO8zgLSoVUJsAJxoeyBGkPI/1yYwWvpt7n8NPp5B DT888pSic2Zm4RjKCZXo0fPn4GsoVwBA0DASyRspnPSFVUoRc1sv8drSJSa4yDg0m7mg 45r4hIsedC3X71C4Dxn3RSvSIkGVBmajX8rP+EANFLWgbUSLc5xw5uTDCtYUIM0zKjBM km36jshxvzV3M2Z+Q6pTy3R3FAXIUA0H5cXKjUnkwFPldM2eXnvkspFxeMvKBd1PhZv1 NrJGeLIinkgRVYiheqcfih/iRlJ+BJFWUmktQ4SRrnp5U4lU44NwIerPmOqV8TZOH8jf RH3Q== X-Gm-Message-State: AMCzsaUkbIB+GW8eXc7mwAvBs36aI9//zYcxX5newl6dEgz8vpAjLxW0 ralEiG1QL+bj6jH9pyFCFvTjLg== X-Google-Smtp-Source: AOwi7QD3jWksTpK/VA4qIL7ugaNegPu9lXvah/WcVoR1gH98cgQXMptAwixBQIOaseLVHQXUwhb9Pg== X-Received: by 10.99.107.73 with SMTP id g70mr1348516pgc.279.1507849321550; Thu, 12 Oct 2017 16:02:01 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id k20sm5335103pfg.141.2017.10.12.16.02.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 16:02:01 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v2 10/10] arm+arm64: vdso: Add support for CLOCK_BOOTTIME Date: Thu, 12 Oct 2017 16:01:45 -0700 Message-Id: <20171012230154.87782-1-salyzyn@android.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171012_160222_920362_03858032 X-CRM114-Status: GOOD ( 15.74 ) 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 , Catalin Marinas , Will Deacon , Russell King , Mark Salyzyn , james.morse@arm.com, linux-arm-kernel@lists.infradead.org, Dmitry Safonov , John Stultz , Andy Lutomirski , Mark Salyzyn 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_BOOTTIME as it is popular for measuring relative time on systems expected to suspend() or hibernate(). Signed-off-by: Mark Salyzyn v2: rebased and changed from 3/3 to 10/10, fortified commit message. --- arch/arm/include/asm/vdso_datapage.h | 1 + arch/arm/kernel/vdso.c | 1 + arch/arm/vdso/vgettimeofday.c | 56 ++++++++++++++++++++++++++++++++++ arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/vdso.c | 1 + 5 files changed, 60 insertions(+) diff --git a/arch/arm/include/asm/vdso_datapage.h b/arch/arm/include/asm/vdso_datapage.h index d57c296f7f52..d2c8e0807f06 100644 --- a/arch/arm/include/asm/vdso_datapage.h +++ b/arch/arm/include/asm/vdso_datapage.h @@ -47,6 +47,7 @@ struct vdso_data { u32 tz_minuteswest; /* timezone info for gettimeofday(2) */ u32 tz_dsttime; + u64 btm_nsec; /* monotonic to boot time */ u32 cs_raw_mult; /* Raw clocksource multipler */ u32 raw_time_sec; /* Raw time */ u32 raw_time_nsec; diff --git a/arch/arm/kernel/vdso.c b/arch/arm/kernel/vdso.c index 287424541f3a..9370ab4b2734 100644 --- a/arch/arm/kernel/vdso.c +++ b/arch/arm/kernel/vdso.c @@ -347,6 +347,7 @@ void update_vsyscall(struct timekeeper *tk) /* tkr_mono.shift == tkr_raw.shift */ vdso_data->cs_shift = tk->tkr_mono.shift; vdso_data->cs_mask = tk->tkr_mono.mask; + vdso_data->btm_nsec = ktime_to_ns(tk->offs_boot); } vdso_write_end(vdso_data); diff --git a/arch/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index 841e7fd74a1b..6b5b24f6d78d 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -248,6 +248,51 @@ static __always_inline notrace int do_monotonic_raw(const struct vdso_data *vd, return 0; } +static __always_inline notrace int do_boottime(const struct vdso_data *vd, + struct timespec *ts) +{ + u32 seq, mult, shift; + u64 nsec, cycle_last, wtm_nsec; +#ifdef ARCH_CLOCK_FIXED_MASK + static const u64 mask = ARCH_CLOCK_FIXED_MASK; +#else + u64 mask; +#endif + + typeof(ts->tv_sec) sec; + + do { + seq = vdso_read_begin(vd); + + if (vd->use_syscall) + return -1; + + cycle_last = vd->cs_cycle_last; + + 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; + + sec += vd->wtm_clock_sec; + wtm_nsec = vd->wtm_clock_nsec + vd->btm_nsec; + + } while (unlikely(vdso_read_retry(vd, seq))); + + nsec += get_clock_shifted_nsec(cycle_last, mult, mask); + nsec >>= shift; + nsec += wtm_nsec; + + 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) @@ -266,6 +311,12 @@ static notrace int do_monotonic_raw(const struct vdso_data *vd, return -1; } +static notrace int do_boottime(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) @@ -291,6 +342,10 @@ notrace int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) if (do_monotonic_raw(vd, ts)) goto fallback; break; + case CLOCK_BOOTTIME: + if (do_boottime(vd, ts)) + goto fallback; + break; default: goto fallback; } @@ -327,6 +382,7 @@ int __vdso_clock_getres(clockid_t clock_id, struct timespec *res) typeof(res->tv_nsec) nsec; if (clock_id == CLOCK_REALTIME || + clock_id == CLOCK_BOOTTIME || clock_id == CLOCK_MONOTONIC || clock_id == CLOCK_MONOTONIC_RAW) nsec = MONOTONIC_RES_NSEC; diff --git a/arch/arm64/include/asm/vdso_datapage.h b/arch/arm64/include/asm/vdso_datapage.h index c9e30226cdbc..1e115b0f373d 100644 --- a/arch/arm64/include/asm/vdso_datapage.h +++ b/arch/arm64/include/asm/vdso_datapage.h @@ -30,6 +30,7 @@ struct vdso_data { __u64 xtime_coarse_nsec; __u64 wtm_clock_sec; /* Wall to monotonic time */ __u64 wtm_clock_nsec; + __u64 btm_nsec; /* monotonic to boot time */ __u32 tb_seq_count; /* Timebase sequence counter */ /* cs_* members must be adjacent and in this order (ldp accesses) */ __u32 cs_mono_mult; /* NTP-adjusted clocksource multiplier */ diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 59f150c25889..0710edd8bedc 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -243,6 +243,7 @@ void update_vsyscall(struct timekeeper *tk) 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->btm_nsec = ktime_to_ns(tk->offs_boot); } smp_wmb();