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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 6BDDFC433DF for ; Mon, 6 Jul 2020 16:57:23 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 3B2A420708 for ; Mon, 6 Jul 2020 16:57:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="lGBLqwSG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B2A420708 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+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=merlin.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=zlfJunIQpJh56bwoQ0P8gFk8Lx2FwlBDnICaYfcC6Xg=; b=lGBLqwSGe0kHrYA1Csqt8sh1N ahQPOUgi2L1dTKuROr9wptn0Sh4JfrnGL5f3qthcIaknkRnhf2wj846l6upPf73fHVUbSAQv6XFRw jWrvqctbwkUnLhzK/ii/ls5CO2C6ew19yRDV70Taj9ffrl1EZMtBXF+vzqfFEEl6SZkNH2pdDhoJX Ay4eF0IqlkAcgz/FTXxaF2oA9ZcSUs0XQgUnPbz2hpw8yWB0ipoCGcaHwXDbFMBlrj8lZuRlSwGPm 9gNMS2BfZBEn4PdOWUPCuBOm2AAysS9jXeef10FVVjktCixW6lV9QLmUsmY/ZqsfzYlMi1EbVulvF nIlskECzA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsUPU-0005DJ-Jf; Mon, 06 Jul 2020 16:56:04 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jsUPR-0005CV-Ph for linux-arm-kernel@lists.infradead.org; Mon, 06 Jul 2020 16:56:02 +0000 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 6AAC41FB; Mon, 6 Jul 2020 09:55:56 -0700 (PDT) Received: from C02TD0UTHF1T.local (unknown [10.57.13.106]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2529F3F68F; Mon, 6 Jul 2020 09:55:53 -0700 (PDT) Date: Mon, 6 Jul 2020 17:55:44 +0100 From: Mark Rutland To: Marc Zyngier Subject: Re: [PATCH v2 2/4] arm64: arch_timer: Allow an workaround descriptor to disable compat vdso Message-ID: <20200706165534.GA61340@C02TD0UTHF1T.local> References: <20200706163802.1836732-1-maz@kernel.org> <20200706163802.1836732-3-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200706163802.1836732-3-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200706_125601_897861_5AA0A954 X-CRM114-Status: GOOD ( 14.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-team@android.com, Catalin Marinas , Daniel Lezcano , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Thomas Gleixner , Vincenzo Frascino , Will Deacon , 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+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Jul 06, 2020 at 05:38:00PM +0100, Marc Zyngier wrote: > As we are about to disable the vdso for compat tasks in some circumstances, > let's allow a workaround descriptor to express exactly that. > > Cc: stable@vger.kernel.org > Signed-off-by: Marc Zyngier Acked-by: Mark Rutland Mark. > --- > arch/arm64/include/asm/arch_timer.h | 1 + > drivers/clocksource/arm_arch_timer.c | 3 +++ > 2 files changed, 4 insertions(+) > > diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h > index 7ae54d7d333a..9f0ec21d6327 100644 > --- a/arch/arm64/include/asm/arch_timer.h > +++ b/arch/arm64/include/asm/arch_timer.h > @@ -58,6 +58,7 @@ struct arch_timer_erratum_workaround { > u64 (*read_cntvct_el0)(void); > int (*set_next_event_phys)(unsigned long, struct clock_event_device *); > int (*set_next_event_virt)(unsigned long, struct clock_event_device *); > + bool disable_compat_vdso; > }; > > DECLARE_PER_CPU(const struct arch_timer_erratum_workaround *, > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index ecf7b7db2d05..a8e4fb429f52 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -566,6 +566,9 @@ void arch_timer_enable_workaround(const struct arch_timer_erratum_workaround *wa > if (wa->read_cntvct_el0) { > clocksource_counter.vdso_clock_mode = VDSO_CLOCKMODE_NONE; > vdso_default = VDSO_CLOCKMODE_NONE; > + } else if (wa->disable_compat_vdso && vdso_default != VDSO_CLOCKMODE_NONE) { > + vdso_default = VDSO_CLOCKMODE_ARCHTIMER_NOCOMPAT; > + clocksource_counter.vdso_clock_mode = vdso_default; > } > } > > -- > 2.27.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel