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 2D94AC4828E for ; Fri, 2 Feb 2024 08:52:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc: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=LBB4h+kLWpcAg/u8CCEBn95P1AMp5XENe3415p8F0P0=; b=TEFhIdMhXoXAjj zehcQ4bO4oNRHtNGmTB8VZa3CCQtkVhax8N+YGZZyIZKwbYQ1aznNZb+TNZYnfy4T0O1zWESBuqJA McOXBn1clVFmEGzfdzCXsaE6bPo6em7qG15mpFFcukAKeJ/3B3PsXSYlX9Tz6iS8ytuLW4s+ssLvT fi9tbial/YYHsGFylTl4Ilgd4kmq28/OSpKfF/PBsJ5KyJ2jNU6YlG/9tWIwUyQ89RsTRfZSwHm36 4wtZjx4VCS31yQba6kRf8fIbTvpmF+toa39hTwBbdHXCUW/e/Ja05aw8vz2NmKSLUbSxURMm0b72A WkwM26bqPusYdSOJb3tQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVpHv-0000000AqVn-0c0m; Fri, 02 Feb 2024 08:52:43 +0000 Received: from out-175.mta0.migadu.com ([2001:41d0:1004:224b::af]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rVpHs-0000000AqVK-0IXk for linux-arm-kernel@lists.infradead.org; Fri, 02 Feb 2024 08:52:41 +0000 Date: Fri, 2 Feb 2024 08:52:32 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1706863957; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=V2lAMePr/K6lbW7Qik331AA4YHgUfzD7xr04Rpz9q0o=; b=K0ekZaauHHiL+/kBICbfivyofXqElkBLsVXqRwtTDm2EryXohT7WCkFI4APeRZETVk/uGz 01vpTzJ4UA4McJ/D5acMtzlJBBvQl2FSLKBy1+N10kAHnwep0Cdd4BUJr1nL4xYWwKNJTd 4bZZIns+92eC5dQe+GZ+6oIRHaclPTY= X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Oliver Upton To: Marc Zyngier Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, James Morse , Suzuki K Poulose , Zenghui Yu , Catalin Marinas , Will Deacon , Joey Gouly , Mark Brown Subject: Re: [PATCH v2 06/25] KVM: arm64: nv: Add sanitising to VNCR-backed HCRX_EL2 Message-ID: References: <20240130204533.693853-1-maz@kernel.org> <20240130204533.693853-7-maz@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240130204533.693853-7-maz@kernel.org> X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240202_005240_532285_C392581F X-CRM114-Status: GOOD ( 18.40 ) 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: , 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 Tue, Jan 30, 2024 at 08:45:13PM +0000, Marc Zyngier wrote: > Just like its little friends, HCRX_EL2 gets the feature set treatment > when backed by VNCR. > > Signed-off-by: Marc Zyngier > --- > arch/arm64/kvm/nested.c | 42 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 42 insertions(+) > > diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c > index cdeef3259193..72db632b115a 100644 > --- a/arch/arm64/kvm/nested.c > +++ b/arch/arm64/kvm/nested.c > @@ -263,6 +263,48 @@ int kvm_init_nv_sysregs(struct kvm *kvm) > res1 |= HCR_E2H; > set_sysreg_masks(kvm, HCR_EL2, res0, res1); > > + /* HCRX_EL2 */ > + res0 = HCRX_EL2_RES0; > + res1 = HCRX_EL2_RES1; I'm a bit worried that we're depending on the meaning of these generated RES0/RES1 bitmasks not changing behind our backs. Not like people read anything, but do you think it'd make sense to add a warning comment to the sysreg file that adding new encodings can have a functional change on KVM? > + if (!kvm_has_feat(kvm, ID_AA64ISAR3_EL1, PACM, TRIVIAL_IMP)) > + res0 |= HCRX_EL2_PACMEn; > + if (!kvm_has_feat(kvm, ID_AA64PFR2_EL1, FPMR, IMP)) > + res0 |= HCRX_EL2_EnFPM; > + if (!kvm_has_feat(kvm, ID_AA64PFR1_EL1, GCS, IMP)) > + res0 |= HCRX_EL2_GCSEn; > + if (!kvm_has_feat(kvm, ID_AA64ISAR2_EL1, SYSREG_128, IMP)) > + res0 |= HCRX_EL2_EnIDCP128; > + if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, ADERR, DEV_ASYNC)) > + res0 |= (HCRX_EL2_EnSDERR | HCRX_EL2_EnSNERR); > + if (!kvm_has_feat(kvm, ID_AA64PFR1_EL1, DF2, IMP)) > + res0 |= HCRX_EL2_TMEA; > + if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, D128, IMP)) > + res0 |= HCRX_EL2_D128En; > + if (!kvm_has_feat(kvm, ID_AA64PFR1_EL1, THE, IMP)) > + res0 |= HCRX_EL2_PTTWI; Ok, not fair. The latest public version of the ARM ARM doesn't have any of this. Where are you getting it from? > + if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, SCTLRX, IMP)) > + res0 |= HCRX_EL2_SCTLR2En; > + if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, TCRX, IMP)) > + res0 |= HCRX_EL2_TCR2En; > + if (!kvm_has_feat(kvm, ID_AA64ISAR2_EL1, MOPS, IMP)) > + res0 |= (HCRX_EL2_MSCEn | HCRX_EL2_MCE2); > + if (!kvm_has_feat(kvm, ID_AA64MMFR1_EL1, CMOW, IMP)) > + res0 |= HCRX_EL2_CMOW; > + if (!kvm_has_feat(kvm, ID_AA64PFR1_EL1, NMI, IMP)) > + res0 |= (HCRX_EL2_VFNMI | HCRX_EL2_VINMI | HCRX_EL2_TALLINT); > + if (!kvm_has_feat(kvm, ID_AA64PFR1_EL1, SME, IMP) || > + !(read_sysreg_s(SYS_SMIDR_EL1) & SMIDR_EL1_SMPS)) > + res0 |= HCRX_EL2_SMPME; > + if (!kvm_has_feat(kvm, ID_AA64ISAR1_EL1, XS, IMP)) > + res0 |= (HCRX_EL2_FGTnXS | HCRX_EL2_FnXS); > + if (!kvm_has_feat(kvm, ID_AA64ISAR1_EL1, LS64, LS64_V)) > + res0 |= HCRX_EL2_EnASR; > + if (!kvm_has_feat(kvm, ID_AA64ISAR1_EL1, LS64, LS64)) > + res0 |= HCRX_EL2_EnALS; > + if (!kvm_has_feat(kvm, ID_AA64ISAR1_EL1, LS64, LS64_ACCDATA)) > + res0 |= HCRX_EL2_EnAS0; > + set_sysreg_masks(kvm, HCRX_EL2, res0, res1); > + > /* HFG[RW]TR_EL2 */ > res0 = res1 = 0; > if (!(__vcpu_has_feature(&kvm->arch, KVM_ARM_VCPU_PTRAUTH_ADDRESS) && > -- > 2.39.2 > -- Thanks, Oliver _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel