From patchwork Fri Oct 27 22:27:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Salyzyn X-Patchwork-Id: 10030745 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 33A0E6032C for ; Fri, 27 Oct 2017 22:30:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 10ED128FE4 for ; Fri, 27 Oct 2017 22:30:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04A7128FEA; Fri, 27 Oct 2017 22:30:00 +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 89C6D28FE4 for ; Fri, 27 Oct 2017 22:29:59 +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=TK+tZBXLjDwb4ezhYZ3Ri5FENkzui5QqAOrM26lUrUU=; b=Fyf P0HbRJ8kMgXRvxvtBe5jr+Um9JZsCC4RzimSwL3o1J8sYr+5SRBROtGArF0AEEw05pw39u4rFFqKp DIrf3QW43dPIXROv/RT9YA67oQjwNDMqNnuK20+8NHEDTzRKzB/0LXk1qVgjLuUmGn5Wn45qI/Wb+ aH3zMjUfm9nwG7zMdtCset1WYG4JleSHMMYM6draO56c5bd4MLJOfN8zGDs+Gymxv7W49UtIVjb2B ufX9fFAMINiOYG81W+xStucdcvkE3Ik01SRqmsu7LwKrJKA0j3KZz4+76JSWhk+qzMitfiGU+vRTC Yp0hpY2ECclQTjBYRZ8/cv0zUjRZyBA==; 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 1e8D8Z-0004qS-15; Fri, 27 Oct 2017 22:29:59 +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 1e8D6s-0003zi-01 for linux-arm-kernel@lists.infradead.org; Fri, 27 Oct 2017 22:28:18 +0000 Received: by mail-io0-x241.google.com with SMTP id i38so15742600iod.2 for ; Fri, 27 Oct 2017 15:27:53 -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=/4DTJM9bAK21PX08O6yHyFc9bQTkYVxynoCynYgrEIo=; b=PZA+r0VPyCrM7hQNE56umlozzvrhy4yakyDqRiUXNUJELsz091aiTumpvxG2+fSHNU qUJ+j3M9E6JIJPfsP6TNUDri+cCIb6jQefPbOJmL+ulMofKsXk2Fsj8cbFMm0xoDzrPz 0xUxp5YGL6gRFzJIZXRhayH1C+FCCLMqtKXZEfJJlj7L4wXDB429WTbW8Jfjy7QStxcA uQXwBpMG6IZkpRAAQtjE/GewK5r1gIYjrDHCsGoGSYKC0fR454INEH17od5q9YDCY2DJ Iu2wywaLvJ86+ytTawzxWpPa9eHLsrH2qHKf1pH969w74iWAvWo56vmOefuM05ahMKol eOcw== 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=/4DTJM9bAK21PX08O6yHyFc9bQTkYVxynoCynYgrEIo=; b=dLo3tKWA00UtNYhonHUYX4WDOl2U1T64f+QWSDGrGXKKeyKKq6tHGR4Q6XpMH78/C4 kVkyOHYd3VvW/7XHEMj7Yr4Nl5mnhhyETW7ddMbWELi3iwjWUMVZK96tVdV8D+udJCD8 RobSkyEx81tmmCX8sWaet5dIghGOKiQkoJGZSroRsQdym60BoK2PPiOyENsfhcVFO0cv 0h76tw3lnO2A4E330rsdHD+RuddS7Kfy+KmIaz4Hpjr2cfb+OdA1IXd8q4xAiGeJDSAU 7rArEYrnGtM0rV/5dzLYeFO5IBiCaliE3m7C+nPTeRHsiWrY3jfjlkjUAqBYh9RKAuid jV5Q== X-Gm-Message-State: AMCzsaU6XAdl1QGSDX+SDl/J9XS585hRpsXfV+DmlEc+jLyNJ8FDiW5s 7BF2ieG8SjYBHDt+KCgAx/oRXA== X-Google-Smtp-Source: ABhQp+T1tG+f3dWYCtQj2dDh9x08NOwQm/gInPBf3C339YiLrm7Wbc1scBRjpjKZJJ7px6ghmOaSSA== X-Received: by 10.107.18.74 with SMTP id a71mr2581823ioj.58.1509143273046; Fri, 27 Oct 2017 15:27:53 -0700 (PDT) Received: from nebulus.mtv.corp.google.com ([100.98.120.17]) by smtp.gmail.com with ESMTPSA id 16sm3759123ioc.88.2017.10.27.15.27.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Oct 2017 15:27:52 -0700 (PDT) From: Mark Salyzyn To: linux-kernel@vger.kernel.org Subject: [PATCH v3 11/12] lib: vdso: Add support for CLOCK_BOOTTIME Date: Fri, 27 Oct 2017 15:27:37 -0700 Message-Id: <20171027222747.58391-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_152814_233256_3974D353 X-CRM114-Status: GOOD ( 15.86 ) 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_BOOTTIME as it is popular for measuring relative time on systems expected to suspend() or hibernate(). 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: - rebased and changed from 3/3 to 10/10, fortified commit message. v3: - move arch/arm/vdso/vgettimeofday.c to lib/vdso/vgettimeofday.c --- arch/arm/include/asm/vdso_datapage.h | 1 + arch/arm/kernel/vdso.c | 1 + arch/arm64/include/asm/vdso_datapage.h | 1 + arch/arm64/kernel/vdso.c | 1 + lib/vdso/vgettimeofday.c | 56 ++++++++++++++++++++++++++++++++++ 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/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(); diff --git a/lib/vdso/vgettimeofday.c b/lib/vdso/vgettimeofday.c index 2cafd732c65f..0546ff12673d 100644 --- a/lib/vdso/vgettimeofday.c +++ b/lib/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 /* ARCH_PROVIDES_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 /* ARCH_PROVIDES_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;