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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id CC881C3DA7F for ; Thu, 15 Aug 2024 16:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=cjsuR8bP/u9ofcMIQXdZluVIHKpuKXK5I0WJzi5GyYQ=; b=bvBgVW945+pMZGzhjxV7SiPpP0 bAngKxsbWx/gB5IiLrgNLX38+voRFdnYdW+lRicsXB2rrmdVB/9uWOXGG9zEczzOHFPCfjQrpWyq8 IzIiJhN83Z28FihgCC//76gzpJ6QTtp2RxekxgVwGGcj/edOnsKgEauGgakb1IMa5Tg+d/PlVtj07 0Kgu/R3lkdL621OTY/UhFgtQOc9vX80tybGFIsfcXuDstxKxSueeUzdL0zCOnAdqLJTDckOMlfNbM KP2pykUiTH+UtXC1LZ76VTtPhDmzUiZjHXe/WWxFE+mhVzLHsCZUrB3dOJrylCwGJ68BwApjOBQSa taie/iwQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sedeb-0000000AZ4u-1qZO; Thu, 15 Aug 2024 16:48:49 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seddt-0000000AYyV-0Xgm for linux-arm-kernel@lists.infradead.org; Thu, 15 Aug 2024 16:48:10 +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 048FC14BF; Thu, 15 Aug 2024 09:48:30 -0700 (PDT) Received: from raptor (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E9B6B3F6A8; Thu, 15 Aug 2024 09:48:01 -0700 (PDT) Date: Thu, 15 Aug 2024 17:47:58 +0100 From: Alexandru Elisei To: Marc Zyngier Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Joey Gouly , Anshuman Khandual , Przemyslaw Gaj Subject: Re: [PATCH v3 16/18] KVM: arm64: nv: Make AT+PAN instructions aware of FEAT_PAN3 Message-ID: References: <20240813100540.1955263-1-maz@kernel.org> <20240813100540.1955263-17-maz@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240813100540.1955263-17-maz@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240815_094805_232840_C0D38C80 X-CRM114-Status: GOOD ( 18.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Marc, On Tue, Aug 13, 2024 at 11:05:38AM +0100, Marc Zyngier wrote: > FEAT_PAN3 added a check for executable permissions to FEAT_PAN2. > Add the required SCTLR_ELx.EPAN and descriptor checks to handle > this correctly. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/kvm/at.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/kvm/at.c b/arch/arm64/kvm/at.c > index 6d5555e98557..c134bcd0338d 100644 > --- a/arch/arm64/kvm/at.c > +++ b/arch/arm64/kvm/at.c > @@ -728,6 +728,21 @@ static u64 compute_par_s1(struct kvm_vcpu *vcpu, struct s1_walk_result *wr, > return par; > } > > +static bool pan3_enabled(struct kvm_vcpu *vcpu, enum trans_regime regime) > +{ > + u64 sctlr; > + > + if (!kvm_has_feat(vcpu->kvm, ID_AA64MMFR1_EL1, PAN, PAN3)) > + return false; > + > + if (regime == TR_EL10) > + sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL1); > + else > + sctlr = vcpu_read_sys_reg(vcpu, SCTLR_EL2); > + > + return sctlr & SCTLR_EL1_EPAN; Checked that the EPAN is on the same position for SCTLR_EL1 and SCTLR_EL2. > +} > + > static u64 handle_at_slow(struct kvm_vcpu *vcpu, u32 op, u64 vaddr) > { > bool perm_fail, ur, uw, ux, pr, pw, px; > @@ -794,7 +809,7 @@ static u64 handle_at_slow(struct kvm_vcpu *vcpu, u32 op, u64 vaddr) > bool pan; > > pan = *vcpu_cpsr(vcpu) & PSR_PAN_BIT; > - pan &= ur || uw; > + pan &= ur || uw || (pan3_enabled(vcpu, wi.regime) && ux); > pw &= !pan; > pr &= !pan; > } Matches AArch64.S1DirectBasePermissions(). Reviewed-by: Alexandru Elisei Thanks, Alex