From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2199DC43460 for ; Mon, 12 Apr 2021 12:56:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E494261261 for ; Mon, 12 Apr 2021 12:56:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241456AbhDLM4q (ORCPT ); Mon, 12 Apr 2021 08:56:46 -0400 Received: from foss.arm.com ([217.140.110.172]:50006 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241413AbhDLM4p (ORCPT ); Mon, 12 Apr 2021 08:56:45 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CDA50D6E; Mon, 12 Apr 2021 05:56:26 -0700 (PDT) Received: from [10.37.12.6] (unknown [10.37.12.6]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BEDEF3F73B; Mon, 12 Apr 2021 05:56:24 -0700 (PDT) Subject: Re: [PATCH RESEND v1 2/4] lib/vdso: Add vdso_data pointer as input to __arch_get_timens_vdso_data() To: Christophe Leroy , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, dima@arista.com, avagin@gmail.com, arnd@arndb.de, tglx@linutronix.de, luto@kernel.org, linux-arch@vger.kernel.org References: <539c4204b1baa77c55f758904a1ea239abbc7a5c.1617209142.git.christophe.leroy@csgroup.eu> From: Vincenzo Frascino Message-ID: Date: Mon, 12 Apr 2021 13:56:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <539c4204b1baa77c55f758904a1ea239abbc7a5c.1617209142.git.christophe.leroy@csgroup.eu> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 3/31/21 5:48 PM, Christophe Leroy wrote: > For the same reason as commit e876f0b69dc9 ("lib/vdso: Allow > architectures to provide the vdso data pointer"), powerpc wants to > avoid calculation of relative position to code. > > As the timens_vdso_data is next page to vdso_data, provide > vdso_data pointer to __arch_get_timens_vdso_data() in order > to ease the calculation on powerpc in following patches. > > Signed-off-by: Christophe Leroy Reviewed-by: Vincenzo Frascino > --- > arch/arm64/include/asm/vdso/compat_gettimeofday.h | 3 ++- > arch/arm64/include/asm/vdso/gettimeofday.h | 2 +- > arch/s390/include/asm/vdso/gettimeofday.h | 3 ++- > arch/x86/include/asm/vdso/gettimeofday.h | 3 ++- > lib/vdso/gettimeofday.c | 15 +++++++++------ > 5 files changed, 16 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/include/asm/vdso/compat_gettimeofday.h b/arch/arm64/include/asm/vdso/compat_gettimeofday.h > index 7508b0ac1d21..ecb6fd4c3c64 100644 > --- a/arch/arm64/include/asm/vdso/compat_gettimeofday.h > +++ b/arch/arm64/include/asm/vdso/compat_gettimeofday.h > @@ -155,7 +155,8 @@ static __always_inline const struct vdso_data *__arch_get_vdso_data(void) > } > > #ifdef CONFIG_TIME_NS > -static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void) > +static __always_inline > +const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd) > { > const struct vdso_data *ret; > > diff --git a/arch/arm64/include/asm/vdso/gettimeofday.h b/arch/arm64/include/asm/vdso/gettimeofday.h > index 631ab1281633..de86230a9436 100644 > --- a/arch/arm64/include/asm/vdso/gettimeofday.h > +++ b/arch/arm64/include/asm/vdso/gettimeofday.h > @@ -100,7 +100,7 @@ const struct vdso_data *__arch_get_vdso_data(void) > > #ifdef CONFIG_TIME_NS > static __always_inline > -const struct vdso_data *__arch_get_timens_vdso_data(void) > +const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd) > { > return _timens_data; > } > diff --git a/arch/s390/include/asm/vdso/gettimeofday.h b/arch/s390/include/asm/vdso/gettimeofday.h > index ed89ef742530..383c53c3dddd 100644 > --- a/arch/s390/include/asm/vdso/gettimeofday.h > +++ b/arch/s390/include/asm/vdso/gettimeofday.h > @@ -68,7 +68,8 @@ long clock_getres_fallback(clockid_t clkid, struct __kernel_timespec *ts) > } > > #ifdef CONFIG_TIME_NS > -static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void) > +static __always_inline > +const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd) > { > return _timens_data; > } > diff --git a/arch/x86/include/asm/vdso/gettimeofday.h b/arch/x86/include/asm/vdso/gettimeofday.h > index df01d7349d79..1936f21ed8cd 100644 > --- a/arch/x86/include/asm/vdso/gettimeofday.h > +++ b/arch/x86/include/asm/vdso/gettimeofday.h > @@ -58,7 +58,8 @@ extern struct ms_hyperv_tsc_page hvclock_page > #endif > > #ifdef CONFIG_TIME_NS > -static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void) > +static __always_inline > +const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd) > { > return __timens_vdso_data; > } > diff --git a/lib/vdso/gettimeofday.c b/lib/vdso/gettimeofday.c > index c6f6dee08746..ce2f69552003 100644 > --- a/lib/vdso/gettimeofday.c > +++ b/lib/vdso/gettimeofday.c > @@ -49,13 +49,15 @@ static inline bool vdso_cycles_ok(u64 cycles) > static __always_inline int do_hres_timens(const struct vdso_data *vdns, clockid_t clk, > struct __kernel_timespec *ts) > { > - const struct vdso_data *vd = __arch_get_timens_vdso_data(); > + const struct vdso_data *vd; > const struct timens_offset *offs = &vdns->offset[clk]; > const struct vdso_timestamp *vdso_ts; > u64 cycles, last, ns; > u32 seq; > s64 sec; > > + vd = vdns - (clk == CLOCK_MONOTONIC_RAW ? CS_RAW : CS_HRES_COARSE); > + vd = __arch_get_timens_vdso_data(vd); > if (clk != CLOCK_MONOTONIC_RAW) > vd = &vd[CS_HRES_COARSE]; > else > @@ -92,7 +94,8 @@ static __always_inline int do_hres_timens(const struct vdso_data *vdns, clockid_ > return 0; > } > #else > -static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void) > +static __always_inline > +const struct vdso_data *__arch_get_timens_vdso_data(const struct vdso_data *vd) > { > return NULL; > } > @@ -162,7 +165,7 @@ static __always_inline int do_hres(const struct vdso_data *vd, clockid_t clk, > static __always_inline int do_coarse_timens(const struct vdso_data *vdns, clockid_t clk, > struct __kernel_timespec *ts) > { > - const struct vdso_data *vd = __arch_get_timens_vdso_data(); > + const struct vdso_data *vd = __arch_get_timens_vdso_data(vdns); > const struct vdso_timestamp *vdso_ts = &vd->basetime[clk]; > const struct timens_offset *offs = &vdns->offset[clk]; > u64 nsec; > @@ -310,7 +313,7 @@ __cvdso_gettimeofday_data(const struct vdso_data *vd, > if (unlikely(tz != NULL)) { > if (IS_ENABLED(CONFIG_TIME_NS) && > vd->clock_mode == VDSO_CLOCKMODE_TIMENS) > - vd = __arch_get_timens_vdso_data(); > + vd = __arch_get_timens_vdso_data(vd); > > tz->tz_minuteswest = vd[CS_HRES_COARSE].tz_minuteswest; > tz->tz_dsttime = vd[CS_HRES_COARSE].tz_dsttime; > @@ -333,7 +336,7 @@ __cvdso_time_data(const struct vdso_data *vd, __kernel_old_time_t *time) > > if (IS_ENABLED(CONFIG_TIME_NS) && > vd->clock_mode == VDSO_CLOCKMODE_TIMENS) > - vd = __arch_get_timens_vdso_data(); > + vd = __arch_get_timens_vdso_data(vd); > > t = READ_ONCE(vd[CS_HRES_COARSE].basetime[CLOCK_REALTIME].sec); > > @@ -363,7 +366,7 @@ int __cvdso_clock_getres_common(const struct vdso_data *vd, clockid_t clock, > > if (IS_ENABLED(CONFIG_TIME_NS) && > vd->clock_mode == VDSO_CLOCKMODE_TIMENS) > - vd = __arch_get_timens_vdso_data(); > + vd = __arch_get_timens_vdso_data(vd); > > /* > * Convert the clockid to a bitmask and use it to check which > -- Regards, Vincenzo