Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp4775254ybb; Tue, 24 Mar 2020 05:11:21 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtaIkNlOEyckEjrSl8GTFvcxik+NT5P3hGJrhgd/Zj92oXVpNFHuHFCTtWghcLOkiY3RCIh X-Received: by 2002:a4a:d258:: with SMTP id e24mr1837562oos.93.1585051881802; Tue, 24 Mar 2020 05:11:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585051881; cv=none; d=google.com; s=arc-20160816; b=YIOl3oDGAoVaTUPXGgCbQ5Ueie//lEbhPpndnYvx8v4fFD4tJ+17TMJn6YJQCbQg02 3JWDAaIj6oNrp3nXD3vT9SzhcTYdknWVY21r0MpTJlYw/OEC5gAOF2FdeXkNfDkY8lOw JcyABGqRZGGKwxAlYjc0SSUTjiH2gweLnevLyyMj1EaaJcC0WJBfVvMSI7Na0vv5k+Pm jLYEhbZMh/rhE/u5QBp6vyN6cE2yhkFswlyEjixlyR4/MxVl+X86hboyey1c6xnsfSVT nwI1lkyFHfIo9Nl8oExZRpwJmuznARcRC4mVixcaiksE/ZUPzBmExNNgPSD3BuZNMqWX Fgew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=VLQt7WW1Co9Ljig/eip7LHOhzW+GmOX6icCee5m2LuA=; b=C61lvbBvve8RpyD8TTxZ65MkEUfEU2UXM9/BaB6Gf9NBh9p7ufESrar37yCmcBVHwp 9w5NBa6YS57t9kawvCS2h1MWlKB/b7RHYvsDHs5IyYHJT2U11BTK9VhWsXGRVPvac95a I27xmVKJMAOlGOlnWjWg3P+iZGMwEBdadTUvOX9/rlNqCEJ1A/Bz8gdQGonH3luFIIxA 1AOE0bPHJVlp+TCoPyW/RW5Iw+Qk7hjVUJA2+HqpXmT/asFi5UXT1y68SfvujzIV2/Am 0SiFTkyQi+dxMJ6nVbC0Pd00lb94Duxv5odvPSZwruQ9wBCm8QNKiStGa9f76tbaght1 zLcQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m4si10088970otk.132.2020.03.24.05.11.08; Tue, 24 Mar 2020 05:11:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727461AbgCXMKl (ORCPT + 99 others); Tue, 24 Mar 2020 08:10:41 -0400 Received: from foss.arm.com ([217.140.110.172]:33316 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727066AbgCXMKl (ORCPT ); Tue, 24 Mar 2020 08:10:41 -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 8ACCA1FB; Tue, 24 Mar 2020 05:10:40 -0700 (PDT) Received: from e119884-lin.cambridge.arm.com (e119884-lin.cambridge.arm.com [10.1.196.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6F9903F792; Tue, 24 Mar 2020 05:10:39 -0700 (PDT) From: Vincenzo Frascino To: linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: tglx@linutronix.de, Vincenzo Frascino , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Martin Schwidefsky Subject: [PATCH v6] s390: Fix vDSO clock_getres() Date: Tue, 24 Mar 2020 12:10:27 +0000 Message-Id: <20200324121027.21665-1-vincenzo.frascino@arm.com> X-Mailer: git-send-email 2.25.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org clock_getres in the vDSO library has to preserve the same behaviour of posix_get_hrtimer_res(). In particular, posix_get_hrtimer_res() does: sec = 0; ns = hrtimer_resolution; and hrtimer_resolution depends on the enablement of the high resolution timers that can happen either at compile or at run time. Fix the s390 vdso implementation of clock_getres keeping a copy of hrtimer_resolution in vdso data and using that directly. Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Christian Borntraeger Signed-off-by: Vincenzo Frascino Acked-by: Martin Schwidefsky --- arch/s390/include/asm/vdso.h | 1 + arch/s390/kernel/asm-offsets.c | 2 +- arch/s390/kernel/time.c | 1 + arch/s390/kernel/vdso64/clock_getres.S | 10 +++++----- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/s390/include/asm/vdso.h b/arch/s390/include/asm/vdso.h index 3bcfdeb01395..0cd085cdeb4f 100644 --- a/arch/s390/include/asm/vdso.h +++ b/arch/s390/include/asm/vdso.h @@ -36,6 +36,7 @@ struct vdso_data { __u32 tk_shift; /* Shift used for xtime_nsec 0x60 */ __u32 ts_dir; /* TOD steering direction 0x64 */ __u64 ts_end; /* TOD steering end 0x68 */ + __u32 hrtimer_res; /* hrtimer resolution 0x70 */ }; struct vdso_per_cpu_data { diff --git a/arch/s390/kernel/asm-offsets.c b/arch/s390/kernel/asm-offsets.c index ce33406cfe83..19b825d0b93d 100644 --- a/arch/s390/kernel/asm-offsets.c +++ b/arch/s390/kernel/asm-offsets.c @@ -76,6 +76,7 @@ int main(void) OFFSET(__VDSO_TK_SHIFT, vdso_data, tk_shift); OFFSET(__VDSO_TS_DIR, vdso_data, ts_dir); OFFSET(__VDSO_TS_END, vdso_data, ts_end); + OFFSET(__VDSO_CLOCK_REALTIME_RES, vdso_data, hrtimer_res); OFFSET(__VDSO_ECTG_BASE, vdso_per_cpu_data, ectg_timer_base); OFFSET(__VDSO_ECTG_USER, vdso_per_cpu_data, ectg_user_time); OFFSET(__VDSO_GETCPU_VAL, vdso_per_cpu_data, getcpu_val); @@ -86,7 +87,6 @@ int main(void) DEFINE(__CLOCK_REALTIME_COARSE, CLOCK_REALTIME_COARSE); DEFINE(__CLOCK_MONOTONIC_COARSE, CLOCK_MONOTONIC_COARSE); DEFINE(__CLOCK_THREAD_CPUTIME_ID, CLOCK_THREAD_CPUTIME_ID); - DEFINE(__CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC); DEFINE(__CLOCK_COARSE_RES, LOW_RES_NSEC); BLANK(); /* idle data offsets */ diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c index f9d070d016e3..b1113b519432 100644 --- a/arch/s390/kernel/time.c +++ b/arch/s390/kernel/time.c @@ -301,6 +301,7 @@ void update_vsyscall(struct timekeeper *tk) vdso_data->tk_mult = tk->tkr_mono.mult; vdso_data->tk_shift = tk->tkr_mono.shift; + vdso_data->hrtimer_res = hrtimer_resolution; smp_wmb(); ++vdso_data->tb_update_count; } diff --git a/arch/s390/kernel/vdso64/clock_getres.S b/arch/s390/kernel/vdso64/clock_getres.S index 081435398e0a..022b58c980db 100644 --- a/arch/s390/kernel/vdso64/clock_getres.S +++ b/arch/s390/kernel/vdso64/clock_getres.S @@ -17,12 +17,14 @@ .type __kernel_clock_getres,@function __kernel_clock_getres: CFI_STARTPROC - larl %r1,4f + larl %r1,3f + lg %r0,0(%r1) cghi %r2,__CLOCK_REALTIME_COARSE je 0f cghi %r2,__CLOCK_MONOTONIC_COARSE je 0f - larl %r1,3f + larl %r1,_vdso_data + l %r0,__VDSO_CLOCK_REALTIME_RES(%r1) cghi %r2,__CLOCK_REALTIME je 0f cghi %r2,__CLOCK_MONOTONIC @@ -36,7 +38,6 @@ __kernel_clock_getres: jz 2f 0: ltgr %r3,%r3 jz 1f /* res == NULL */ - lg %r0,0(%r1) xc 0(8,%r3),0(%r3) /* set tp->tv_sec to zero */ stg %r0,8(%r3) /* store tp->tv_usec */ 1: lghi %r2,0 @@ -45,6 +46,5 @@ __kernel_clock_getres: svc 0 br %r14 CFI_ENDPROC -3: .quad __CLOCK_REALTIME_RES -4: .quad __CLOCK_COARSE_RES +3: .quad __CLOCK_COARSE_RES .size __kernel_clock_getres,.-__kernel_clock_getres -- 2.25.2