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=-5.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham 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 CB731C282DA for ; Tue, 16 Apr 2019 17:09:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 98D8B20872 for ; Tue, 16 Apr 2019 17:09:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="nDANPBhv" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98D8B20872 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=+a+VXw1jW1i45Cqja1apK+MkKbpZ3Q7aXpebuV4sgrQ=; b=nDANPBhvrZiDgm Pe30znsdBHHYSyswRAOeQ7c6z9g11Mp1zPH74hFFXwfwZ3mmsc4+/ROReCAkzZ7WGG1km0NRJXT9o ASd+NZd6QN5iF1HiTSP1TYVjbkxGhiOSm3osMciJk2plEZDswtNzL0Vq+plXqzgW011Kk6umPk6Sr RMjFju1amN+JzVh3AR6Gv9odrGJZDr5LfevNgRA6mrSRqWmbPfN9YbEccd1KJWWXTThTgfaadV8/Q 5E+9ETj1Jpb2i40nu9rdXTt54vJ2eZTWwFuZuzXFQa1V+EMt7mMAvSa3Wxpss5kRqetEKd7SHKyKQ YKyMOsAAZBBBjXvvSHSQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGRaM-0003VX-PE; Tue, 16 Apr 2019 17:09:30 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hGRaK-0003Uc-Gy for linux-arm-kernel@lists.infradead.org; Tue, 16 Apr 2019 17:09:29 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 54C8F80D; Tue, 16 Apr 2019 10:09:28 -0700 (PDT) Received: from fuggles.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 83B403F59C; Tue, 16 Apr 2019 10:09:25 -0700 (PDT) Date: Tue, 16 Apr 2019 18:09:23 +0100 From: Will Deacon To: Catalin Marinas Subject: Re: [PATCH v2 1/5] arm64: Fix vDSO clock_getres() Message-ID: <20190416170923.GD7342@fuggles.cambridge.arm.com> References: <20190416161434.32691-1-vincenzo.frascino@arm.com> <20190416161434.32691-2-vincenzo.frascino@arm.com> <20190416162432.GI28994@arrakis.emea.arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20190416162432.GI28994@arrakis.emea.arm.com> User-Agent: Mutt/1.11.1+86 (6f28e57d73f2) () X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190416_100928_562807_B3B41F95 X-CRM114-Status: GOOD ( 12.71 ) 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: linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, Shuah Khan , Vincent Chen , Arnd Bergmann , Benjamin Herrenschmidt , Heiko Carstens , Paul Mackerras , Greentime Hu , linux-kselftest@vger.kernel.org, Michael Ellerman , Martin Schwidefsky , Thomas Gleixner , Vincenzo Frascino , linuxppc-dev@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Apr 16, 2019 at 05:24:33PM +0100, Catalin Marinas wrote: > On Tue, Apr 16, 2019 at 05:14:30PM +0100, Vincenzo Frascino wrote: > > diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c > > index 2d419006ad43..5f5759d51c33 100644 > > --- a/arch/arm64/kernel/vdso.c > > +++ b/arch/arm64/kernel/vdso.c > > @@ -245,6 +245,8 @@ void update_vsyscall(struct timekeeper *tk) > > vdso_data->cs_shift = tk->tkr_mono.shift; > > } > > > > + vdso_data->hrtimer_res = hrtimer_resolution; > > This should be a WRITE_ONCE(), just in case. > > > + > > smp_wmb(); > > ++vdso_data->tb_seq_count; > > } > > diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S > > index c39872a7b03c..e2e9dfe9ba4a 100644 > > --- a/arch/arm64/kernel/vdso/gettimeofday.S > > +++ b/arch/arm64/kernel/vdso/gettimeofday.S > > @@ -296,32 +296,32 @@ ENDPROC(__kernel_clock_gettime) > > /* int __kernel_clock_getres(clockid_t clock_id, struct timespec *res); */ > > ENTRY(__kernel_clock_getres) > > .cfi_startproc > > + adr vdso_data, _vdso_data > > cmp w0, #CLOCK_REALTIME > > ccmp w0, #CLOCK_MONOTONIC, #0x4, ne > > ccmp w0, #CLOCK_MONOTONIC_RAW, #0x4, ne > > - b.ne 1f > > + b.ne 2f > > > > - ldr x2, 5f > > - b 2f > > -1: > > +1: /* Get hrtimer_res */ > > + ldr x2, [vdso_data, #CLOCK_REALTIME_RES] > > And here we need an "ldr w2, ..." since hrtimer_res is u32. > > With the above (which Will can fix up): > > Reviewed-by: Catalin Marinas Applied, with the above and a few extra cleanups. Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel