Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 205C0538A for ; Wed, 26 Apr 2023 17:23:49 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-b98f3ca02b5so12151847276.1 for ; Wed, 26 Apr 2023 10:23:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1682529828; x=1685121828; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=pAiG4M4zdB3ZPS4C+GQYfSIhvMBL1SgC8o3oTmyskQQ=; b=CxpcHMMhr7Fgwt8dYCe2BOA8DJw7t6x9BkvXVWXeb0YcCgwBkQtF8DnD/Ths5GSkI+ v1t6R1QGyERjMK+D5NseLjfRctZKQ27CUmT2R2sxrBuZgxaYCjhf1Q3jh6mCN9m3BV0m 8xrYcP0CJHnbSlXzofhde25irTEsX55L2leF3+KTYcPagKp5YJm0DsWFUp1E9iIs/Qfg dLolmFoUiq2Ag2B9x/JQmfADG5PWsZMerC2tpy/RA6s3lFNGK6dq/L+QRCKTXXOYAasa hh9gRXO3KGJ3MEqKZgFnLLicv3QlxI1RiT1WpnZdOn88tlx03NNf4+OnFQfWhAudgup1 9Uiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682529828; x=1685121828; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=pAiG4M4zdB3ZPS4C+GQYfSIhvMBL1SgC8o3oTmyskQQ=; b=VWoCI2vRGYXzoxHkLcX3NCdp6P/WxQpLj5cHtZMBpPyeTJPZslbBfVYHGRdLaFUKTc 4P1U/8FqZERaWgGiHh9HP3MEQDTNyUowI1ilZnKAkEe74Y3kEtRLo8GPtd2nxORdQ+eU 1mXsf03FNEu1SDUjyFkg+ySVsDjpv1Vj7yFcLcxT1mky3YkcU7ZK0tPZrnobujLZEjye qHr/QaX47K0tWkZcd78oKyIChVFO570K0IwlAnY5mh5tL413dVYvI4nQAn/qqtpreW9i zZmbYV5hY7CBvHY+TvSAMtHZB7/UIYhO38sY/4Y0RvK63tWt3HSb2drWBM/kFkCLKRBS LDHQ== X-Gm-Message-State: AAQBX9faLJCBRomHMk2Cy6CZlnylfnpB2PGJgrtFuMfHv/v+CTFl79wO FBhYRdCKv0rZXrtbJIA2h5sV/rqbW9T9qg== X-Google-Smtp-Source: AKy350ZC4mXk7wOxH8b9fUBEzfpbdi/sM13by1NauZUSpknjsByveFQnwFClX/PKT22DO0G93jmh0idMzU6hCQ== X-Received: from ricarkol4.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:1248]) (user=ricarkol job=sendgmr) by 2002:a25:d6ca:0:b0:b95:ecc5:5796 with SMTP id n193-20020a25d6ca000000b00b95ecc55796mr8271060ybg.12.1682529828133; Wed, 26 Apr 2023 10:23:48 -0700 (PDT) Date: Wed, 26 Apr 2023 17:23:26 +0000 In-Reply-To: <20230426172330.1439644-1-ricarkol@google.com> Precedence: bulk X-Mailing-List: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20230426172330.1439644-1-ricarkol@google.com> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog Message-ID: <20230426172330.1439644-9-ricarkol@google.com> Subject: [PATCH v8 08/12] KVM: arm64: Add kvm_uninit_stage2_mmu() From: Ricardo Koller To: pbonzini@redhat.com, maz@kernel.org, oupton@google.com, yuzenghui@huawei.com, dmatlack@google.com Cc: kvm@vger.kernel.org, kvmarm@lists.linux.dev, qperret@google.com, catalin.marinas@arm.com, andrew.jones@linux.dev, seanjc@google.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, eric.auger@redhat.com, gshan@redhat.com, reijiw@google.com, rananta@google.com, bgardon@google.com, ricarkol@gmail.com, Ricardo Koller , Shaoqin Huang Content-Type: text/plain; charset="UTF-8" Add kvm_uninit_stage2_mmu() and move kvm_free_stage2_pgd() into it. A future commit will add some more things to do inside of kvm_uninit_stage2_mmu(). Signed-off-by: Ricardo Koller Reviewed-by: Shaoqin Huang Reviewed-by: Gavin Shan --- arch/arm64/include/asm/kvm_mmu.h | 1 + arch/arm64/kvm/mmu.c | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/kvm_mmu.h b/arch/arm64/include/asm/kvm_mmu.h index 27e63c111f78a..20c50e00496d8 100644 --- a/arch/arm64/include/asm/kvm_mmu.h +++ b/arch/arm64/include/asm/kvm_mmu.h @@ -172,6 +172,7 @@ void __init free_hyp_pgds(void); void stage2_unmap_vm(struct kvm *kvm); int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu, unsigned long type); +void kvm_uninit_stage2_mmu(struct kvm *kvm); void kvm_free_stage2_pgd(struct kvm_s2_mmu *mmu); int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa, phys_addr_t pa, unsigned long size, bool writable); diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 92f8872550f26..46f005a894e57 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -771,6 +771,11 @@ int kvm_init_stage2_mmu(struct kvm *kvm, struct kvm_s2_mmu *mmu, unsigned long t return err; } +void kvm_uninit_stage2_mmu(struct kvm *kvm) +{ + kvm_free_stage2_pgd(&kvm->arch.mmu); +} + static void stage2_unmap_memslot(struct kvm *kvm, struct kvm_memory_slot *memslot) { @@ -1864,7 +1869,7 @@ void kvm_arch_memslots_updated(struct kvm *kvm, u64 gen) void kvm_arch_flush_shadow_all(struct kvm *kvm) { - kvm_free_stage2_pgd(&kvm->arch.mmu); + kvm_uninit_stage2_mmu(kvm); } void kvm_arch_flush_shadow_memslot(struct kvm *kvm, -- 2.40.1.495.gc816e09b53d-goog