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 85D03C55169 for ; Thu, 30 Jul 2026 07:11:53 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JAhWhZje9gmOpJhtyVPvANp/6kcIKzyOvMGnE5qE5Xw=; b=uauXXv32fN49lR2BXZ4qXtPsJT P4Dwqbukg5SYIuAZIT3Ux1Z6aZbBwSUvsDn4/Bp+eFAR9QCXfvXgd8xBc4VbDdue5kVWet8WAW/Wg YNME15HnO+w/fYLM4CkEk9W0xZJMDJhSmYLlGZEkh8m5GMzafOlUkXkCT2x0c+wNqvHjU9jHaCHyR 9aboGQAlyYoc/21uvQboYZnyVDZd/uYFu7doQXx5ElK5/J+baRjZ2/04VO0kUJ+xums0zW9rKEiA0 XeCKLCLgENsebR/scT+a284OEoBCkpT2Epps1Fnb/dHt6nuXZu5bwDa/0FtcijTSOf6Gi3ph0NqWj c/VMWibQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpKvZ-00000009giJ-3olV; Thu, 30 Jul 2026 07:11:37 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpKus-00000009gNU-0QPf for linux-arm-kernel@lists.infradead.org; Thu, 30 Jul 2026 07:10:54 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 07BAB4214F; Thu, 30 Jul 2026 07:10:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id DDF7E1F01564; Thu, 30 Jul 2026 07:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785395453; bh=JAhWhZje9gmOpJhtyVPvANp/6kcIKzyOvMGnE5qE5Xw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=SSBp+4jpb1EWcn9BcacpjFcmc1dj4Xz9sU0xd3TFoPMuQ2q7JoQ9UFGMAUVLVBbjc vB9atIHrq9B0r3IkwkeKbdOay1V7ujcU1dMMYiLMGaOAJhNBCIj/g+44AATLU7OgBg yp6vfMFShyv5XhOCxiQxd0HqvWkKyYC2M+CGC3HDDsUc31+fFN48uSmNiPGV+Q+1er I6Vri6GULZk8Q19PS7YHzDEl6SGIQGHErpm1lJqFvaQMkH9L/0dSIE+XKp70o+/ON8 F2WMVE0VZz5zOazzZ/s0ZZTPCmdjeNzHr4YzYEWqQPy+DV9M/SmGXi921pRdu6QyBZ gt2o0gGzImG2A== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.98.2) (envelope-from ) id 1wpKuq-0000000AOpW-18cG; Thu, 30 Jul 2026 07:10:52 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Steffen Eiden , Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Yao Yuan , Wei-Lin Chang , Vladimir Murzin Subject: [PATCH v4 18/29] KVM: arm64: Add kvm_has_nv{2,3}() predicates Date: Thu, 30 Jul 2026 08:10:11 +0100 Message-ID: <20260730071022.296811-19-maz@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260730071022.296811-1-maz@kernel.org> References: <20260730071022.296811-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, seiden@linux.ibm.com, joey.gouly@arm.com, suzuki.poulose@arm.com, oupton@kernel.org, yuzenghui@huawei.com, yaoyuan@linux.alibaba.com, weilin.chang@arm.com, vladimir.murzin@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false 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 Add a new set of predicates indicating whether VM is capable of NV2, NV3, and is in a nested NV3 context. This is going to become useful as we start dealing with a mix of behaviours (NV2, NV3, NV2 on NV3...). Reviewed-by: Yuan Yao Signed-off-by: Marc Zyngier --- arch/arm64/include/asm/kvm_emulate.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 9831166695186..bdb7dfaa271cd 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -266,6 +266,25 @@ static inline bool vserror_state_is_nested(struct kvm_vcpu *vcpu) (__vcpu_sys_reg(vcpu, HCRX_EL2) & HCRX_EL2_TMEA); } +static inline bool kvm_has_nv2(struct kvm *kvm) +{ + return (cpus_have_final_cap(ARM64_HAS_NESTED_VIRT) && + kvm_has_feat(kvm, ID_AA64MMFR4_EL1, NV_frac, NV2_ONLY)); +} + +static inline bool kvm_has_nv3(struct kvm *kvm) +{ + return (cpus_have_final_cap(ARM64_HAS_NV3) && + kvm_has_feat(kvm, ID_AA64MMFR4_EL1, NV_frac, NV3)); +} + +static inline bool is_nested_nv3_ctxt(struct kvm_vcpu *vcpu) +{ + return (has_vhe() && kvm_has_nv3(vcpu->kvm) && is_nested_ctxt(vcpu) && + (__vcpu_sys_reg(vcpu, HCR_EL2) & HCR_EL2_NV) && + (__vcpu_sys_reg(vcpu, HCRX_EL2) & HCRX_EL2_NVTGE)); +} + /* * The layout of SPSR for an AArch32 state is different when observed from an * AArch64 SPSR_ELx or an AArch32 SPSR_*. This function generates the AArch32 -- 2.47.3