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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 BA25DC433DB for ; Wed, 24 Feb 2021 11:14:30 +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 4A7A664E83 for ; Wed, 24 Feb 2021 11:14:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4A7A664E83 Authentication-Results: mail.kernel.org; dmarc=fail (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=aUlQY7/TJrG3kqWOMooBsweg8/T9NAZ72zDvzc6SqO8=; b=RHfBP+6g3ADmEs0JSVjTVT/Hz b8/2XGePkW55pT0k0gxupACxy0xrPCxZrCEzjaRkPydsN452UkCJIRwoD0hSYstkiZdFL9vzgwbF/ nHziTCMHTlqUljI9aIYlRKdK8sR1FoHJGIgXrsxhdooHSaZ8qHpt7IsLtV8hLi8yLs+zAqY0Mr6qk 1wWyaSqO+ncsQ6TdjioJFbpMKp2y1vXfqTr8CNCpF4XfVwm+dqk7MSkdvLkVFPgAg5rIK0rx00aBU PssnslrxGRIjycV+Zgg8Y8LwvgNA8D/H3iSSoNDw1b+j3g22LmzavUyGfOdBlxCLFZhPPJ+UX8kyE M9w3merYg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lEs6I-0003g4-IX; Wed, 24 Feb 2021 11:13:02 +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 1lEs6G-0003fc-Nl for linux-arm-kernel@lists.infradead.org; Wed, 24 Feb 2021 11:13:01 +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 857361FB; Wed, 24 Feb 2021 03:12:58 -0800 (PST) Received: from C02TD0UTHF1T.local (unknown [10.57.52.137]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EE7CA3F73B; Wed, 24 Feb 2021 03:12:56 -0800 (PST) Date: Wed, 24 Feb 2021 11:12:54 +0000 From: Mark Rutland To: Marc Zyngier Subject: Re: [PATCH 3/3] arm64: Add missing ISB after invalidating TLB in enter_vhe Message-ID: <20210224111254.GB50741@C02TD0UTHF1T.local> References: <20210224093738.3629662-1-maz@kernel.org> <20210224093738.3629662-4-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210224093738.3629662-4-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210224_061300_857095_0BD5A379 X-CRM114-Status: GOOD ( 19.13 ) 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: Will Deacon , Guillaume Tucker , Catalin Marinas , kernel-team@android.com, Ard Biesheuvel , 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 Wed, Feb 24, 2021 at 09:37:38AM +0000, Marc Zyngier wrote: > Although there has been a bit of back and forth on the subject, > it appears that invalidating TLBs requires an ISB instruction > after the TLBI/DSB sequence, as documented in d0b7a302d58a > ("Revert "arm64: Remove unnecessary ISBs from set_{pte,pmd,pud}""). > > Add the missing ISB in enter_vhe(), just in case. > > Fixes: f359182291c7 ("arm64: Provide an 'upgrade to VHE' stub hypercall") > Suggested-by: Will Deacon > Signed-off-by: Marc Zyngier Same comment as for patch 2; with the commit message similarly updated: Acked-by: Mark Rutland Thanks, Mark. > --- > arch/arm64/kernel/hyp-stub.S | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm64/kernel/hyp-stub.S b/arch/arm64/kernel/hyp-stub.S > index ae56787ea7c1..5eccbd62fec8 100644 > --- a/arch/arm64/kernel/hyp-stub.S > +++ b/arch/arm64/kernel/hyp-stub.S > @@ -152,6 +152,7 @@ SYM_CODE_START_LOCAL(enter_vhe) > // Invalidate TLBs before enabling the MMU > tlbi vmalle1 > dsb nsh > + isb > > // Enable the EL2 S1 MMU, as set up from EL1 > mrs_s x0, SYS_SCTLR_EL12 > -- > 2.29.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel