From patchwork Sat Feb 15 15:01:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13976119 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 727D6C021A0 for ; Sat, 15 Feb 2025 15:03:49 +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=JsZD39MkYzrRAMSjpRjblFQBKTsjDsTNOcXoEIiJjik=; b=dhnRcIzTQhokmPIUjW8NVX7ti8 jUw78OYqXHgTkL4xPw0O9RSLT7O5qP3ECSumwr9wOJ8QFimF6gX8kcLRPlbVUFjpipUzw4PCbUj/E klpVtV5RDPZX52NGnT9LmKVf+OzK5jDvtHfIUA3zVlxW0UF1F/lF0qjxTin9dT3uvZhlG7sgiw/tx oEfZtqVw4urTCZwfdm1AP4INBASLCUuWwEcQIA1Mihp+gQ1+2Sv+rBc1ru6svLABmTRm1r72bKoJy lEOvZDwir3hHJFaao+F7VH3i8dODtRvnKn0Y+pQNk/+zrObZB54Kc2RQYEL0nssI2/N4xWvC0w6n/ mLku9fLQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tjJhf-00000000HSG-29hU; Sat, 15 Feb 2025 15:03:35 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tjJgC-00000000H1J-05FX for linux-arm-kernel@lists.infradead.org; Sat, 15 Feb 2025 15:02:05 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 702CB5C53D8; Sat, 15 Feb 2025 15:01:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 929B7C4CEE6; Sat, 15 Feb 2025 15:02:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1739631722; bh=migc+/Y2aJXFVZi166UkMK87POYOQpgx2NfW5hQSCSk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E+wxmMx9gMnxeSPyOc1vymSvsXablzAlkd/Qh4EM88UWpN9RIgIOC9NLXhITxeKwr C9zDcZ9+u1Q5MEEacPfc4TwFaRiCimSKRhs2zTTQ7K5qcHeB04nLqVWQ56SEK1Stoy U1IFCLjIo3dTP4fJppi/fsLZ4UL0CaBeqTNRUilG3xfmFdNVORTS1fozxbGIyBAh4b c6rC0NBfuQ51fblKIR6OjxCjHYFshQ33WKyfSn3wdoCB2Re+WwuQOuJOFDxq2aUZBv Lv54yPbcKBUmlwfC1JsrL3eEIPg6IgJWceaJ9DCwSELTzItwrPR0QUaRxmydUxR4NF h+BFLWjdalpZQ== 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.95) (envelope-from ) id 1tjJg8-004Nz6-Im; Sat, 15 Feb 2025 15:02:00 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Eric Auger Subject: [PATCH 02/14] KVM: arm64: nv: Allocate VNCR page when required Date: Sat, 15 Feb 2025 15:01:22 +0000 Message-Id: <20250215150134.3765791-3-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20250215150134.3765791-1-maz@kernel.org> References: <20250215150134.3765791-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, joey.gouly@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, eric.auger@redhat.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250215_070204_116005_51538D78 X-CRM114-Status: GOOD ( 11.60 ) 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 If running a NV guest on an ARMv8.4-NV capable system, let's allocate an additional page that will be used by the hypervisor to fulfill system register accesses. Signed-off-by: Marc Zyngier --- arch/arm64/kvm/nested.c | 9 +++++++++ arch/arm64/kvm/reset.c | 1 + 2 files changed, 10 insertions(+) diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 0c9387d2f5070..952a1558f5214 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -54,6 +54,12 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu) struct kvm_s2_mmu *tmp; int num_mmus, ret = 0; + if (!vcpu->arch.ctxt.vncr_array) + vcpu->arch.ctxt.vncr_array = (u64 *)__get_free_page(GFP_KERNEL | __GFP_ZERO); + + if (!vcpu->arch.ctxt.vncr_array) + return -ENOMEM; + /* * Let's treat memory allocation failures as benign: If we fail to * allocate anything, return an error and keep the allocated array @@ -84,6 +90,9 @@ int kvm_vcpu_init_nested(struct kvm_vcpu *vcpu) for (int i = kvm->arch.nested_mmus_size; i < num_mmus; i++) kvm_free_stage2_pgd(&kvm->arch.nested_mmus[i]); + free_page((unsigned long)vcpu->arch.ctxt.vncr_array); + vcpu->arch.ctxt.vncr_array = NULL; + return ret; } diff --git a/arch/arm64/kvm/reset.c b/arch/arm64/kvm/reset.c index 803e11b0dc8f5..3c48527aef360 100644 --- a/arch/arm64/kvm/reset.c +++ b/arch/arm64/kvm/reset.c @@ -158,6 +158,7 @@ void kvm_arm_vcpu_destroy(struct kvm_vcpu *vcpu) if (sve_state) kvm_unshare_hyp(sve_state, sve_state + vcpu_sve_state_size(vcpu)); kfree(sve_state); + free_page((unsigned long)vcpu->arch.ctxt.vncr_array); kfree(vcpu->arch.ccsidr); }