From: Ryan Afranji <afranji@google.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org
Cc: sagis@google.com, bp@alien8.de, chao.p.peng@linux.intel.com,
dave.hansen@linux.intel.com, dmatlack@google.com,
erdemaktas@google.com, isaku.yamahata@intel.com,
kai.huang@intel.com, mingo@redhat.com, pbonzini@redhat.com,
seanjc@google.com, tglx@linutronix.de, zhi.wang.linux@gmail.com,
ackerleytng@google.com, andrew.jones@linux.dev,
david@redhat.com, hpa@zytor.com,
kirill.shutemov@linux.intel.com,
linux-kselftest@vger.kernel.org, tabba@google.com,
vannapurve@google.com, yan.y.zhao@intel.com,
rick.p.edgecombe@intel.com, Ryan Afranji <afranji@google.com>
Subject: [RFC PATCH v2 04/10] KVM: TDX: Implement moving mirror pages between 2 TDs
Date: Wed, 11 Jun 2025 21:16:31 +0000 [thread overview]
Message-ID: <c55c9b7099cbb646d63803110889ddeddf4c370f.1749672978.git.afranji@google.com> (raw)
In-Reply-To: <cover.1749672978.git.afranji@google.com>
From: Sagi Shahar <sagis@google.com>
Added functionality for moving the mirror EPT table from one TD to a new
one.
This function moves the root of the mirror EPT table and overwrites the
root of the destination.
Signed-off-by: Sagi Shahar <sagis@google.com>
Signed-off-by: Ryan Afranji <afranji@google.com>
---
arch/x86/kvm/mmu.h | 2 ++
arch/x86/kvm/mmu/mmu.c | 66 ++++++++++++++++++++++++++++++++++++++
arch/x86/kvm/mmu/tdp_mmu.c | 61 ++++++++++++++++++++++++++++++++---
arch/x86/kvm/mmu/tdp_mmu.h | 6 ++++
4 files changed, 130 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
index b4b6860ab971..b43d770daa05 100644
--- a/arch/x86/kvm/mmu.h
+++ b/arch/x86/kvm/mmu.h
@@ -102,6 +102,8 @@ void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu);
void kvm_mmu_sync_prev_roots(struct kvm_vcpu *vcpu);
void kvm_mmu_track_write(struct kvm_vcpu *vcpu, gpa_t gpa, const u8 *new,
int bytes);
+int kvm_mmu_move_mirror_pages_from(struct kvm_vcpu *vcpu,
+ struct kvm_vcpu *src_vcpu);
static inline int kvm_mmu_reload(struct kvm_vcpu *vcpu)
{
diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
index cbc84c6abc2e..09c1892e0ac1 100644
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -3943,6 +3943,72 @@ static int mmu_first_shadow_root_alloc(struct kvm *kvm)
return r;
}
+int kvm_mmu_move_mirror_pages_from(struct kvm_vcpu *vcpu,
+ struct kvm_vcpu *src_vcpu)
+{
+ struct kvm_mmu *mmu = vcpu->arch.mmu;
+ struct kvm_mmu *src_mmu = src_vcpu->arch.mmu;
+ gfn_t gfn_shared = kvm_gfn_direct_bits(vcpu->kvm);
+ hpa_t mirror_root_hpa;
+ int r = -EINVAL;
+
+ if (!gfn_shared)
+ return r;
+
+ r = mmu_topup_memory_caches(vcpu, !vcpu->arch.mmu->root_role.direct);
+ if (r)
+ return r;
+
+ /* Hold locks for both src and dst. Always take the src lock first. */
+ read_lock(&src_vcpu->kvm->mmu_lock);
+ write_lock_nested(&vcpu->kvm->mmu_lock, SINGLE_DEPTH_NESTING);
+
+ WARN_ON_ONCE(!is_tdp_mmu_active(vcpu));
+ WARN_ON_ONCE(!is_tdp_mmu_active(src_vcpu));
+
+ /*
+ * The mirror root is moved from the src to the dst and is marked as
+ * invalid in the src.
+ */
+ mirror_root_hpa = kvm_tdp_mmu_move_mirror_pages_from(vcpu, src_vcpu);
+ if (mirror_root_hpa == INVALID_PAGE) {
+ struct kvm_mmu_page *mirror_root;
+ union kvm_mmu_page_role role = vcpu->arch.mmu->root_role;
+
+ /*
+ * This likely means that the mirror root was already moved by
+ * another vCPU.
+ */
+ role.is_mirror = true;
+ mirror_root = kvm_tdp_mmu_get_vcpu_root(vcpu, role);
+ if (!mirror_root) {
+ r = -EINVAL;
+ goto out_unlock;
+ }
+ mirror_root_hpa = __pa(mirror_root->spt);
+ }
+
+ mmu->mirror_root_hpa = mirror_root_hpa;
+ mmu_free_root_page(src_vcpu->kvm, &src_mmu->mirror_root_hpa, NULL);
+ write_unlock(&vcpu->kvm->mmu_lock);
+ read_unlock(&src_vcpu->kvm->mmu_lock);
+
+ /* The direct root is allocated normally and is not moved from src. */
+ kvm_tdp_mmu_alloc_root(vcpu, false);
+
+ kvm_mmu_load_pgd(vcpu);
+ kvm_x86_call(flush_tlb_current)(vcpu);
+
+ return r;
+
+out_unlock:
+ write_unlock(&vcpu->kvm->mmu_lock);
+ read_unlock(&src_vcpu->kvm->mmu_lock);
+
+ return r;
+}
+EXPORT_SYMBOL(kvm_mmu_move_mirror_pages_from);
+
static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu)
{
struct kvm_mmu *mmu = vcpu->arch.mmu;
diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
index 115af5e4c5ed..212716ab7e8b 100644
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -251,6 +251,22 @@ static void tdp_mmu_init_child_sp(struct kvm_mmu_page *child_sp,
tdp_mmu_init_sp(child_sp, iter->sptep, iter->gfn, role);
}
+struct kvm_mmu_page *
+kvm_tdp_mmu_get_vcpu_root(struct kvm_vcpu *vcpu,
+ union kvm_mmu_page_role role)
+{
+ struct kvm *kvm = vcpu->kvm;
+ struct kvm_mmu_page *root;
+
+ lockdep_assert_held(&kvm->mmu_lock);
+ list_for_each_entry(root, &kvm->arch.tdp_mmu_roots, link) {
+ if (root->role.word == role.word &&
+ !WARN_ON_ONCE(!kvm_tdp_mmu_get_root(root)))
+ return root;
+ }
+ return NULL;
+}
+
void kvm_tdp_mmu_alloc_root(struct kvm_vcpu *vcpu, bool mirror)
{
struct kvm_mmu *mmu = vcpu->arch.mmu;
@@ -285,11 +301,9 @@ void kvm_tdp_mmu_alloc_root(struct kvm_vcpu *vcpu, bool mirror)
* fails, as the last reference to a root can only be put *after* the
* root has been invalidated, which requires holding mmu_lock for write.
*/
- list_for_each_entry(root, &kvm->arch.tdp_mmu_roots, link) {
- if (root->role.word == role.word &&
- !WARN_ON_ONCE(!kvm_tdp_mmu_get_root(root)))
- goto out_spin_unlock;
- }
+ root = kvm_tdp_mmu_get_vcpu_root(vcpu, role);
+ if (!!root)
+ goto out_spin_unlock;
root = tdp_mmu_alloc_sp(vcpu);
tdp_mmu_init_sp(root, NULL, 0, role);
@@ -321,6 +335,43 @@ void kvm_tdp_mmu_alloc_root(struct kvm_vcpu *vcpu, bool mirror)
}
}
+hpa_t kvm_tdp_mmu_move_mirror_pages_from(struct kvm_vcpu *vcpu,
+ struct kvm_vcpu *src_vcpu)
+{
+ union kvm_mmu_page_role role = vcpu->arch.mmu->root_role;
+ struct kvm *kvm = vcpu->kvm;
+ struct kvm *src_kvm = src_vcpu->kvm;
+ struct kvm_mmu_page *mirror_root = NULL;
+ s64 num_mirror_pages, old;
+
+ lockdep_assert_held_read(&src_vcpu->kvm->mmu_lock);
+ lockdep_assert_held_write(&vcpu->kvm->mmu_lock);
+
+ /* Find the mirror root of the source. */
+ role.is_mirror = true;
+ mirror_root = kvm_tdp_mmu_get_vcpu_root(src_vcpu, role);
+ if (!mirror_root)
+ return INVALID_PAGE;
+
+ /* Remove the mirror root from the src kvm and add it to dst kvm. */
+ spin_lock(&src_vcpu->kvm->arch.tdp_mmu_pages_lock);
+ list_del_rcu(&mirror_root->link);
+ spin_unlock(&src_vcpu->kvm->arch.tdp_mmu_pages_lock);
+
+ /* The destination holds a write lock so no spin_lock required. */
+ list_add_rcu(&mirror_root->link, &kvm->arch.tdp_mmu_roots);
+
+#ifdef CONFIG_KVM_PROVE_MMU
+ num_mirror_pages = atomic64_read(&src_kvm->arch.tdp_mirror_mmu_pages);
+ old = atomic64_cmpxchg(&kvm->arch.tdp_mirror_mmu_pages, 0,
+ num_mirror_pages);
+ /* The destination VM should have no mirror pages at this point. */
+ WARN_ON(old);
+ atomic64_set(&src_kvm->arch.tdp_mirror_mmu_pages, 0);
+#endif
+ return __pa(mirror_root->spt);
+}
+
static void handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn,
u64 old_spte, u64 new_spte, int level,
bool shared);
diff --git a/arch/x86/kvm/mmu/tdp_mmu.h b/arch/x86/kvm/mmu/tdp_mmu.h
index 52acf99d40a0..abb1a84d8b1c 100644
--- a/arch/x86/kvm/mmu/tdp_mmu.h
+++ b/arch/x86/kvm/mmu/tdp_mmu.h
@@ -63,6 +63,12 @@ static inline struct kvm_mmu_page *tdp_mmu_get_root(struct kvm_vcpu *vcpu,
return root_to_sp(vcpu->arch.mmu->root.hpa);
}
+struct kvm_mmu_page *
+kvm_tdp_mmu_get_vcpu_root(struct kvm_vcpu *vcpu,
+ union kvm_mmu_page_role role);
+hpa_t kvm_tdp_mmu_move_mirror_pages_from(struct kvm_vcpu *vcpu,
+ struct kvm_vcpu *src_vcpu);
+
bool kvm_tdp_mmu_zap_leafs(struct kvm *kvm, gfn_t start, gfn_t end, bool flush);
bool kvm_tdp_mmu_zap_sp(struct kvm *kvm, struct kvm_mmu_page *sp);
void kvm_tdp_mmu_zap_all(struct kvm *kvm);
--
2.50.0.rc1.591.g9c95f17f64-goog
next prev parent reply other threads:[~2025-06-11 21:17 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-11 21:16 [RFC PATCH v2 00/10] Add TDX intra-host migration support Ryan Afranji
2025-06-11 21:16 ` [RFC PATCH v2 01/10] KVM: Split tdp_mmu_pages to mirror and direct counters Ryan Afranji
2025-06-11 21:16 ` [RFC PATCH v2 02/10] KVM: x86: Adjust locking order in move_enc_context_from Ryan Afranji
2025-06-11 21:16 ` [RFC PATCH v2 03/10] KVM: TDX: Add base implementation for tdx_vm_move_enc_context_from Ryan Afranji
2025-06-11 21:16 ` Ryan Afranji [this message]
2025-06-11 21:16 ` [RFC PATCH v2 05/10] KVM: TDX: Allow vCPUs to be created for migration Ryan Afranji
2025-06-11 21:16 ` [RFC PATCH v2 06/10] KVM: TDX: Add core logic for TDX intra-host migration Ryan Afranji
2025-06-11 21:16 ` [RFC PATCH v2 07/10] KVM: selftests: Refactor userspace_mem_region creation out of vm_mem_add Ryan Afranji
2025-06-11 21:16 ` [RFC PATCH v2 08/10] KVM: selftests: TDX: Add tests for TDX in-place migration Ryan Afranji
2025-06-11 21:16 ` [RFC PATCH v2 09/10] KVM: selftests: Add TDX support for ucalls Ryan Afranji
2025-06-11 21:16 ` [RFC PATCH v2 10/10] KVM: selftests: Add irqfd/interrupts test for TDX with migration Ryan Afranji
2026-03-09 14:17 ` [RFC PATCH v2 00/10] Add TDX intra-host migration support Sean Christopherson
2026-03-09 15:04 ` Vishal Annapurve
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c55c9b7099cbb646d63803110889ddeddf4c370f.1749672978.git.afranji@google.com \
--to=afranji@google.com \
--cc=ackerleytng@google.com \
--cc=andrew.jones@linux.dev \
--cc=bp@alien8.de \
--cc=chao.p.peng@linux.intel.com \
--cc=dave.hansen@linux.intel.com \
--cc=david@redhat.com \
--cc=dmatlack@google.com \
--cc=erdemaktas@google.com \
--cc=hpa@zytor.com \
--cc=isaku.yamahata@intel.com \
--cc=kai.huang@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=rick.p.edgecombe@intel.com \
--cc=sagis@google.com \
--cc=seanjc@google.com \
--cc=tabba@google.com \
--cc=tglx@linutronix.de \
--cc=vannapurve@google.com \
--cc=x86@kernel.org \
--cc=yan.y.zhao@intel.com \
--cc=zhi.wang.linux@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®