KVM TDX: TDP MMU: large page support
Subsystems (4)
v7 cover KVM TDX: TDP MMU: large page support
From: Isaku Yamahata <[email protected]>
This patch series is based on "v17 KVM TDX: basic feature support". It implements large page support for TDP MMU by allowing populating of the large page and splitting it when necessary.
Feedback for options to merge sub-pages into a large page are welcome.
Discussion on 1GB huge page support
===================================
This is out of scope of this patch series. It will be addressed as follow up. Currently I'm thinking the following design. Here is a rough sketch
TDH.PAGE.MEM.AUG() and TDG.MEM.PAGE.ACCEPT() support only 4KB and 2MB. not 1GB. Because it takes too long to convert 1GB page into private . It need to promote from 512 2MB pages to 1GB page on host side.
* On unmapping
Break large page from 1GB/2MB to 2MB/4KB. In some cases, break twice. 1GB -> 2MB -> 4KB. the 2MB page is allocated and 2MB mapping is allowed by shared/private. (no partial 4KB private/shared mix.)
* Mapping 2MB page
If some 4KB pages of 2MB are mapped, map all non-present 4KB pages and try to promote it to 2MB. Note: promotion to 2MB may fail if the guest accepted some, doesn't some. If there is no partial 4KB mapping (2MB entry in 1GB EPT page is none), map 2MB directly.
* Mapping 1GB page
When The 1GB page is allocated and 1GB mapping is alloed by shared/private, the following sketches the operations.
** Try to map all sub 2MB pages.
If the 2MB EPT entry has 4KB cyhild, skip the entry unless it maps the faulting GPA. Don't go down to map 4KB because mapping 4KB, it would take too logn to promote 2MB and try to promote it to 1GB.
If the 2MB EPT entry maps the faulting GPA, fallback to 2MB case.
** If there is no 4KB mapping, i.e. the 1GB EPT entry was none or the 2MB EPT
entry was none or leaf. (no child), try to promote only once. i.e. 2MB -> 1GB. Don't try promote twice from 4KB to 2MB to 1GB because it takes too long time.
* KVM NX recovery thread trying promote 4KB/2MB pages to 2MB/1GB page. ** 2MB EPT table: scan the EPT entries and map 4KB page if not present. If all 4KB pages are mapped, try to promote to 2MB mapping. The promotion may fail due to partial accept.
** 1GB EPT table: Scan the EPT entries and map 2MB page if not present. Don't go
down to 4KB page. If all 2MB pages are mapped, try to promote to 1GB mapping. the promoption may fail due to partial accept.
Splitting large pages when necessary
====================================
* It already tracking whether GFN is private or shared. When it's changed, update lpage_info to prevent a large page.
* TDX provides page level on Secure EPT violation. Pass around the page level that the lower level functions needs.
* Even if the page is the large page in the host, at the EPT level, only some sub-pages are mapped. In such cases abandon to map large pages and step into the sub-page level, unlike the conventional EPT.
* When zapping spte and the spte is for a large page, split and zap it unlike the conventional EPT because otherwise the protected page contents will be lost.
Merging small pages into a large page if possible
=================================================
On normal EPT violation, check whether pages can be merged into a large page after mapping it.
TDX operation
=============
The following describes what TDX operations procedures.
* EPT violation trick
Such track (zapping the EPT entry to trigger EPT violation) doesn't work for TDX. For TDX, it will lose the contents of the protected page to zap a page because the protected guest page is un-associated from the guest TD. Instead, TDX provides a different way to trigger EPT violation without losing the page contents so that VMM can detect guest TD activity by blocking/unblocking Secure-EPT entry. TDH.MEM.RANGE.BLOCK and TDH.MEM.RANGE.UNBLOCK. They correspond to clearing/setting a present bit in an EPT entry with page contents still kept. By TDH.MEM.RANGE.BLOCK and TLB shoot down, VMM can cause guest TD to trigger EPT violation. After that, VMM can unblock it by TDH.MEM.RANGE.UNBLOCK and resume guest TD execution. The procedure is as follows.
- Block Secure-EPT entry by TDH.MEM.RANGE.BLOCK.
- TLB shoot down.
- Wait for guest TD to trigger EPT violation.
- Unblock Secure-EPT entry by TDH.MEM.RANGE.UNBLOCK to resume the guest TD.
* merging sub-pages into a large page
The following steps are needed.
- Ensure that all sub-pages are mapped.
- TLB shoot down.
- Merge sub-pages into a large page (TDH.MEM.PAGE.PROMOTE). This requires all sub-pages are mapped.
- Cache flush Secure EPT page used to map subpages.
Thanks,
Changes from v6:
- Rebased to v18 TDX KVM v6.8-rc1 based patch series
- use struct tdx_module_args
- minor improve on comment, commit message
Changes from v5:
- Switched to TDX module 1.5 base.
Chnages from v4:
- Rebased to v16 TDX KVM v6.6-rc2 base
Changes from v3:
- Rebased to v15 TDX KVM v6.5-rc1 base
Changes from v2:
- implemented page merging path
- rebased to TDX KVM v11
Changes from v1:
- implemented page merging path
- rebased to UPM v10
- rebased to TDX KVM v10
- rebased to kvm.git queue + v6.1-rc8
Isaku Yamahata (4):
KVM: x86/tdp_mmu: Allocate private page table for large page split
KVM: x86/tdp_mmu: Try to merge pages into a large page
KVM: TDX: Implement merge pages into a large page
KVM: x86/mmu: Make kvm fault handler aware of large page of private
memslot
Xiaoyao Li (9):
KVM: TDX: Flush cache based on page size before TDX SEAMCALL
KVM: TDX: Pass KVM page level to tdh_mem_page_aug()
KVM: TDX: Pass size to reclaim_page()
KVM: TDX: Update tdx_sept_{set,drop}_private_spte() to support large
page
KVM: MMU: Introduce level info in PFERR code
KVM: TDX: Pass desired page level in err code for page fault handler
KVM: x86/tdp_mmu: Split the large page when zap leaf
KVM: x86/tdp_mmu, TDX: Split a large page when 4KB page within it
converted to shared
KVM: TDX: Allow 2MB large page for TD GUEST
arch/x86/include/asm/kvm-x86-ops.h | 3 + arch/x86/include/asm/kvm_host.h | 11 ++ arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/mmu/mmu.c | 45 +++-- arch/x86/kvm/mmu/mmu_internal.h | 35 +++- arch/x86/kvm/mmu/tdp_iter.c | 37 +++- arch/x86/kvm/mmu/tdp_iter.h | 2 + arch/x86/kvm/mmu/tdp_mmu.c | 276 ++++++++++++++++++++++++++--- arch/x86/kvm/vmx/common.h | 6 +- arch/x86/kvm/vmx/tdx.c | 222 +++++++++++++++++------ arch/x86/kvm/vmx/tdx_arch.h | 21 +++ arch/x86/kvm/vmx/tdx_errno.h | 3 + arch/x86/kvm/vmx/tdx_ops.h | 56 ++++-- arch/x86/kvm/vmx/vmx.c | 2 +- 14 files changed, 608 insertions(+), 112 deletions(-)
Signature · 1 line
2.25.1
PATCH v7 1/13 KVM: TDX: Flush cache based on page size before TDX SEAMCALL
From: Xiaoyao Li <[email protected]>
tdh_mem_page_aug() will support 2MB large page in the near future. Cache flush also needs to be 2MB instead of 4KB in such cases. Introduce a helper function to flush cache with page size info in preparation for large pages.
---
v6:
- catch up tdx_seamcall() change
--- arch/x86/kvm/vmx/tdx_ops.h | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-)
arch/x86/kvm/vmx/tdx_ops.h +14 -8
@@ -6,6 +6,7 @@#include <linux/compiler.h> +#include <asm/pgtable_types.h> #include <asm/archrandom.h> #include <asm/cacheflush.h> #include <asm/asm.h>
@@ -58,6 +59,11 @@ static inline int pg_level_to_tdx_sept_level(enum pg_level level)return level -1 ; } +static inline void tdx_clflush_page (hpa_t addr,enum pg_level level) +{ +clflush_cache_range (__va (addr),KVM_HPAGE_SIZE (level)); +} +/* * TDX module acquires its internal lock for resources. It doesn't spin to get * locks because of its restrictions of allowed execution time. Instead, it
@@ -95,7 +101,7 @@ static inline u64 tdh_mng_addcx(hpa_t tdr, hpa_t addr) .rdx = tdr, }; -clflush_cache_range (__va (addr),PAGE_SIZE ); +tdx_clflush_page (addr,PG_LEVEL_4K );return tdx_seamcall (TDH_MNG_ADDCX , &in,NULL ); }
@@ -109,7 +115,7 @@ static inline u64 tdh_mem_page_add(hpa_t tdr, gpa_t gpa, hpa_t hpa, hpa_t source .r9 = source, }; -clflush_cache_range (__va (hpa),PAGE_SIZE ); +tdx_clflush_page (hpa,PG_LEVEL_4K );return tdx_seamcall_sept (TDH_MEM_PAGE_ADD , &in, out); }
@@ -122,7 +128,7 @@ static inline u64 tdh_mem_sept_add(hpa_t tdr, gpa_t gpa, int level, hpa_t page, .r8 = page, }; -clflush_cache_range (__va (page),PAGE_SIZE ); +tdx_clflush_page (page,PG_LEVEL_4K );return tdx_seamcall_sept (TDH_MEM_SEPT_ADD , &in, out); }
@@ -155,7 +161,7 @@ static inline u64 tdh_vp_addcx(hpa_t tdvpr, hpa_t addr) .rdx = tdvpr, }; -clflush_cache_range (__va (addr),PAGE_SIZE ); +tdx_clflush_page (addr,PG_LEVEL_4K );return tdx_seamcall (TDH_VP_ADDCX , &in,NULL ); }
@@ -168,7 +174,7 @@ static inline u64 tdh_mem_page_relocate(hpa_t tdr, gpa_t gpa, hpa_t hpa, .r8 = hpa, }; -clflush_cache_range (__va (hpa),PAGE_SIZE ); +tdx_clflush_page (hpa,PG_LEVEL_4K );return tdx_seamcall_sept (TDH_MEM_PAGE_RELOCATE , &in, out); }
@@ -181,7 +187,7 @@ static inline u64 tdh_mem_page_aug(hpa_t tdr, gpa_t gpa, hpa_t hpa, .r8 = hpa, }; -clflush_cache_range (__va (hpa),PAGE_SIZE ); +tdx_clflush_page (hpa,PG_LEVEL_4K );return tdx_seamcall_sept (TDH_MEM_PAGE_AUG , &in, out); }
@@ -212,7 +218,7 @@ static inline u64 tdh_mng_create(hpa_t tdr, int hkid) .rdx = hkid, }; -clflush_cache_range (__va (tdr),PAGE_SIZE ); +tdx_clflush_page (tdr,PG_LEVEL_4K );return tdx_seamcall (TDH_MNG_CREATE , &in,NULL ); }
@@ -223,7 +229,7 @@ static inline u64 tdh_vp_create(hpa_t tdr, hpa_t tdvpr) .rdx = tdr, }; -clflush_cache_range (__va (tdvpr),PAGE_SIZE ); +tdx_clflush_page (tdvpr,PG_LEVEL_4K );return tdx_seamcall (TDH_VP_CREATE , &in,NULL ); }
Signature · 1 line
2.25.1
PATCH v7 2/13 KVM: TDX: Pass KVM page level to tdh_mem_page_aug()
In reply to [email protected]From: Xiaoyao Li <[email protected]>
Level info is needed in tdx_clflush_page() to generate the correct page size.
Besides, explicitly pass level info to SEAMCALL instead of assuming it's zero. It works naturally when 2MB support lands.
---
v7:
- Don't pass level to tdh_mem_page_add() as it supports only 4K page.
- catch up for change of tdx_seamcall()
--- arch/x86/kvm/vmx/tdx.c | 2 +- arch/x86/kvm/vmx/tdx_ops.h | 12 +++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx/tdx.c +1 -1
@@ -1520,7 +1520,7 @@ static int tdx_mem_page_aug(struct kvm *kvm, gfn_t gfn,union tdx_sept_entry entry;u64 err; - err =tdh_mem_page_aug (kvm_tdx->tdr_pa, gpa, hpa, &out); + err =tdh_mem_page_aug (kvm_tdx->tdr_pa, gpa, tdx_level, hpa, &out);if (unlikely (err ==TDX_ERROR_SEPT_BUSY )) {tdx_unpin (kvm, pfn);return -EAGAIN ;
arch/x86/kvm/vmx/tdx_ops.h +9 -3
@@ -59,6 +59,11 @@ static inline int pg_level_to_tdx_sept_level(enum pg_level level)return level -1 ; } +static inline enum pg_level tdx_sept_level_to_pg_level (int tdx_level) +{ +return tdx_level +1 ; +} +static inline void tdx_clflush_page (hpa_t addr,enum pg_level level) {clflush_cache_range (__va (addr),KVM_HPAGE_SIZE (level));
@@ -108,6 +113,7 @@ static inline u64 tdh_mng_addcx(hpa_t tdr, hpa_t addr)static inline u64 tdh_mem_page_add (hpa_t tdr,gpa_t gpa,hpa_t hpa,hpa_t source,struct tdx_module_args *out) { +/* TDH.MEM.PAGE.ADD() suports only 4K page. tdx 4K page level = 0 */ struct tdx_module_args in = { .rcx = gpa, .rdx = tdr,
@@ -178,16 +184,16 @@ static inline u64 tdh_mem_page_relocate(hpa_t tdr, gpa_t gpa, hpa_t hpa,return tdx_seamcall_sept (TDH_MEM_PAGE_RELOCATE , &in, out); } -static inline u64 tdh_mem_page_aug (hpa_t tdr,gpa_t gpa,hpa_t hpa, +static inline u64 tdh_mem_page_aug (hpa_t tdr,gpa_t gpa,int level,hpa_t hpa,struct tdx_module_args *out) {struct tdx_module_args in = { - .rcx = gpa, + .rcx = gpa | level, .rdx = tdr, .r8 = hpa, }; -tdx_clflush_page (hpa,PG_LEVEL_4K ); +tdx_clflush_page (hpa,tdx_sept_level_to_pg_level (level));return tdx_seamcall_sept (TDH_MEM_PAGE_AUG , &in, out); }
Signature · 1 line
2.25.1
PATCH v7 3/13 KVM: TDX: Pass size to reclaim_page()
In reply to [email protected]From: Xiaoyao Li <[email protected]>
A 2MB large page can be tdh_mem_page_aug()'ed to TD directly. In this case, it needs to reclaim and clear the page as 2MB size.
---
v5:
- Change type of page size from int to unsigned long
--- arch/x86/kvm/vmx/tdx.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
arch/x86/kvm/vmx/tdx.c +15 -12
@@ -277,12 +277,13 @@ static void tdx_disassociate_vp_on_cpu(struct kvm_vcpu *vcpu)smp_call_function_single (cpu, tdx_disassociate_vp_arg, vcpu,1 ); } -static void tdx_clear_page (unsigned long page_pa) +static void tdx_clear_page (unsigned long page_pa,unsigned long size) {const void *zero_page = (const void *)__va (page_to_phys (ZERO_PAGE (0 )));void *page =__va (page_pa);unsigned long i; +WARN_ON_ONCE (size %PAGE_SIZE );/* * When re-assign one page from old keyid to a new keyid, MOVDIR64B is * required to clear/write the page with new keyid to prevent integrity
@@ -291,7 +292,7 @@ static void tdx_clear_page(unsigned long page_pa)* clflush doesn't flush cache with HKID set. The cache line could be * poisoned (even without MKTME-i), clear the poison bit. */ -for (i =0 ; i <PAGE_SIZE ; i +=64 ) +for (i =0 ; i < size; i +=64 )movdir64b (page + i, zero_page);/* * MOVDIR64B store uses WC buffer. Prevent following memory reads
@@ -300,7 +301,7 @@ static void tdx_clear_page(unsigned long page_pa)__mb (); } -static int __tdx_reclaim_page (hpa_t pa) +static int __tdx_reclaim_page (hpa_t pa,enum pg_level level) {struct tdx_module_args out;u64 err;
@@ -318,17 +319,19 @@ static int __tdx_reclaim_page(hpa_t pa)pr_tdx_error (TDH_PHYMEM_PAGE_RECLAIM , err, &out);return -EIO ; } +/* out.r8 == tdx sept page level */ +WARN_ON_ONCE (out.r8 !=pg_level_to_tdx_sept_level (level));return 0 ; } -static int tdx_reclaim_page (hpa_t pa) +static int tdx_reclaim_page (hpa_t pa,enum pg_level level) {int r; - r =__tdx_reclaim_page (pa); + r =__tdx_reclaim_page (pa, level);if (!r) -tdx_clear_page (pa); +tdx_clear_page (pa,KVM_HPAGE_SIZE (level));return r; }
@@ -342,7 +345,7 @@ static void tdx_reclaim_control_page(unsigned long td_page_pa)* was already flushed by TDH.PHYMEM.CACHE.WB before here, So * cache doesn't need to be flushed again. */ -if (tdx_reclaim_page (td_page_pa)) +if (tdx_reclaim_page (td_page_pa,PG_LEVEL_4K ))/* * Leak the page on failure: * tdx_reclaim_page() returns an error if and only if there's an
@@ -573,7 +576,7 @@ void tdx_vm_free(struct kvm *kvm)if (!kvm_tdx->tdr_pa)return ; -if (__tdx_reclaim_page (kvm_tdx->tdr_pa)) +if (__tdx_reclaim_page (kvm_tdx->tdr_pa,PG_LEVEL_4K ))return ;/* * TDX module maps TDR with TDX global HKID. TDX module may access TDR
@@ -586,7 +589,7 @@ void tdx_vm_free(struct kvm *kvm)pr_tdx_error (TDH_PHYMEM_PAGE_WBINVD , err,NULL );return ; } -tdx_clear_page (kvm_tdx->tdr_pa); +tdx_clear_page (kvm_tdx->tdr_pa,PAGE_SIZE );free_page ((unsigned long )__va (kvm_tdx->tdr_pa)); kvm_tdx->tdr_pa =0 ;
@@ -1654,7 +1657,7 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn,* The HKID assigned to this TD was already freed and cache * was already flushed. We don't have to flush again. */ - err =tdx_reclaim_page (hpa); + err =tdx_reclaim_page (hpa, level);if (KVM_BUG_ON (err, kvm))return -EIO ;tdx_unpin (kvm, pfn);
@@ -1687,7 +1690,7 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn,pr_tdx_error (TDH_PHYMEM_PAGE_WBINVD , err,NULL );return -EIO ; } -tdx_clear_page (hpa); +tdx_clear_page (hpa,PAGE_SIZE );tdx_unpin (kvm, pfn);return 0 ; }
@@ -1799,7 +1802,7 @@ static int tdx_sept_free_private_spt(struct kvm *kvm, gfn_t gfn,* already flushed. We don't have to flush again. */ if (!is_hkid_assigned (kvm_tdx)) -return tdx_reclaim_page (__pa (private_spt)); +return tdx_reclaim_page (__pa (private_spt),PG_LEVEL_4K );/* * free_private_spt() is (obviously) called when a shadow page is being
Signature · 1 line
2.25.1
PATCH v7 4/13 KVM: TDX: Update tdx_sept_{set,drop}_private_spte() to support large page
In reply to [email protected]From: Xiaoyao Li <[email protected]>
Allow large page level AUG and REMOVE for TDX pages.
--- arch/x86/kvm/vmx/tdx.c | 68 ++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 33 deletions(-)
arch/x86/kvm/vmx/tdx.c +35 -33
@@ -1504,11 +1504,12 @@ void tdx_load_mmu_pgd(struct kvm_vcpu *vcpu, hpa_t root_hpa, int pgd_level)td_vmcs_write64 (to_tdx (vcpu),SHARED_EPT_POINTER , root_hpa &PAGE_MASK ); } -static void tdx_unpin (struct kvm *kvm,kvm_pfn_t pfn) +static void tdx_unpin (struct kvm *kvm,kvm_pfn_t pfn,enum pg_level level) { -struct page *page =pfn_to_page (pfn); +int i; -put_page (page); +for (i =0 ; i <KVM_PAGES_PER_HPAGE (level); i++) +put_page (pfn_to_page (pfn + i)); } static int tdx_mem_page_aug(struct kvm *kvm, gfn_t gfn,
@@ -1525,7 +1526,7 @@ static int tdx_mem_page_aug(struct kvm *kvm, gfn_t gfn, err =tdh_mem_page_aug (kvm_tdx->tdr_pa, gpa, tdx_level, hpa, &out);if (unlikely (err ==TDX_ERROR_SEPT_BUSY )) { -tdx_unpin (kvm, pfn); +tdx_unpin (kvm, pfn, level);return -EAGAIN ; }if (unlikely (err == (TDX_EPT_ENTRY_STATE_INCORRECT |TDX_OPERAND_ID_RCX ))) {
@@ -1534,7 +1535,7 @@ static int tdx_mem_page_aug(struct kvm *kvm, gfn_t gfn,if (level_state.level == tdx_level && level_state.state ==TDX_SEPT_PENDING && entry.leaf && entry.pfn == pfn && entry.sve) { -tdx_unpin (kvm, pfn); +tdx_unpin (kvm, pfn, level);WARN_ON_ONCE (!(to_kvm_tdx (kvm)->attributes &TDX_TD_ATTR_SEPT_VE_DISABLE ));return -EAGAIN ;
@@ -1542,7 +1543,7 @@ static int tdx_mem_page_aug(struct kvm *kvm, gfn_t gfn, }if (KVM_BUG_ON (err, kvm)) {pr_tdx_error (TDH_MEM_PAGE_AUG , err, &out); -tdx_unpin (kvm, pfn); +tdx_unpin (kvm, pfn, level);return -EIO ; }
@@ -1578,7 +1579,7 @@ static int tdx_mem_page_add(struct kvm *kvm, gfn_t gfn,* always uses vcpu 0's page table and protected by vcpu->mutex). */ if (KVM_BUG_ON (kvm_tdx->source_pa ==INVALID_PAGE , kvm)) { -tdx_unpin (kvm, pfn); +tdx_unpin (kvm, pfn, level);return -EINVAL ; }
@@ -1596,7 +1597,7 @@ static int tdx_mem_page_add(struct kvm *kvm, gfn_t gfn, }while (unlikely (err ==TDX_ERROR_SEPT_BUSY ));if (KVM_BUG_ON (err, kvm)) {pr_tdx_error (TDH_MEM_PAGE_ADD , err, &out); -tdx_unpin (kvm, pfn); +tdx_unpin (kvm, pfn, level);return -EIO ; }else if (measure) {for (i =0 ; i <PAGE_SIZE ; i +=TDX_EXTENDMR_CHUNKSIZE ) {
@@ -1616,10 +1617,7 @@ static int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn, enum pg_level level, kvm_pfn_t pfn) {struct kvm_tdx *kvm_tdx =to_kvm_tdx (kvm); - -/* TODO: handle large pages. */ -if (KVM_BUG_ON (level !=PG_LEVEL_4K , kvm)) -return -EINVAL ; +int i;/* * Because restricted mem doesn't support page migration with
@@ -1629,7 +1627,8 @@ static int tdx_sept_set_private_spte(struct kvm *kvm, gfn_t gfn,* TODO: Once restricted mem introduces callback on page migration, * implement it and remove get_page/put_page(). */ -get_page (pfn_to_page (pfn)); +for (i =0 ; i <KVM_PAGES_PER_HPAGE (level); i++) +get_page (pfn_to_page (pfn + i));if (likely (is_td_finalized (kvm_tdx)))return tdx_mem_page_aug (kvm, gfn, level, pfn);
@@ -1646,11 +1645,9 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn,gpa_t gpa =gfn_to_gpa (gfn);hpa_t hpa =pfn_to_hpa (pfn);hpa_t hpa_with_hkid; +int r =0 ;u64 err; - -/* TODO: handle large pages. */ -if (KVM_BUG_ON (level !=PG_LEVEL_4K , kvm)) -return -EINVAL ; +int i;if (unlikely (!is_hkid_assigned (kvm_tdx))) {/*
@@ -1660,7 +1657,7 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn, err =tdx_reclaim_page (hpa, level);if (KVM_BUG_ON (err, kvm))return -EIO ; -tdx_unpin (kvm, pfn); +tdx_unpin (kvm, pfn, level);return 0 ; }
@@ -1677,22 +1674,27 @@ static int tdx_sept_drop_private_spte(struct kvm *kvm, gfn_t gfn,return -EIO ; } - hpa_with_hkid =set_hkid_to_hpa (hpa, (u16 )kvm_tdx->hkid); -do { -/* -* TDX_OPERAND_BUSY can happen on locking PAMT entry. Because -* this page was removed above, other thread shouldn't be -* repeatedly operating on this page. Just retry loop. -*/ - err =tdh_phymem_page_wbinvd (hpa_with_hkid); - }while (unlikely (err == (TDX_OPERAND_BUSY |TDX_OPERAND_ID_RCX ))); -if (KVM_BUG_ON (err, kvm)) { -pr_tdx_error (TDH_PHYMEM_PAGE_WBINVD , err,NULL ); -return -EIO ; +for (i =0 ; i <KVM_PAGES_PER_HPAGE (level); i++) { + hpa_with_hkid =set_hkid_to_hpa (hpa, (u16 )kvm_tdx->hkid); +do { +/* +* TDX_OPERAND_BUSY can happen on locking PAMT entry. +* Because this page was removed above, other thread +* shouldn't be repeatedly operating on this page. +* Simple retry should work. +*/ + err =tdh_phymem_page_wbinvd (hpa_with_hkid); + }while (unlikely (err == (TDX_OPERAND_BUSY |TDX_OPERAND_ID_RCX ))); +if (KVM_BUG_ON (err, kvm)) { +pr_tdx_error (TDH_PHYMEM_PAGE_WBINVD , err,NULL ); + r = -EIO ; + }else { +tdx_clear_page (hpa,PAGE_SIZE ); +tdx_unpin (kvm, pfn + i,PG_LEVEL_4K ); + } + hpa +=PAGE_SIZE ; } -tdx_clear_page (hpa,PAGE_SIZE ); -tdx_unpin (kvm, pfn); -return 0 ; +return r; } static int tdx_sept_link_private_spt(struct kvm *kvm, gfn_t gfn,
Signature · 1 line
2.25.1
PATCH v7 5/13 KVM: MMU: Introduce level info in PFERR code
In reply to [email protected]From: Xiaoyao Li <[email protected]>
For TDX, EPT violation can happen when TDG.MEM.PAGE.ACCEPT.
And TDG.MEM.PAGE.ACCEPT contains the desired accept page level of TD guest.
1. KVM can map it with 4KB page while TD guest wants to accept 2MB page.
TD guest will get TDX_PAGE_SIZE_MISMATCH and it should try to accept 4KB size.
2. KVM can map it with 2MB page while TD guest wants to accept 4KB page.
KVM needs to honor it because
a) there is no way to tell guest KVM maps it as 2MB size. And
b) guest accepts it in 4KB size since guest knows some other 4KB page in the same 2MB range will be used as shared page.
For case 2, it need to pass desired page level to KVM MMU page fault handler. Use bit 29:31 of kvm PF error code for this purpose.
--- arch/x86/include/asm/kvm_host.h | 5 +++++ arch/x86/kvm/mmu/mmu.c | 5 +++++ 2 files changed, 10 insertions(+)
arch/x86/include/asm/kvm_host.h +5 -0
@@ -262,6 +262,8 @@ enum x86_intercept_stage;#define PFERR_FETCH_BIT 4#define PFERR_PK_BIT 5#define PFERR_SGX_BIT 15 +#define PFERR_LEVEL_START_BIT 29 +#define PFERR_LEVEL_END_BIT 31#define PFERR_GUEST_FINAL_BIT 32#define PFERR_GUEST_PAGE_BIT 33#define PFERR_GUEST_ENC_BIT 34
@@ -274,6 +276,7 @@ enum x86_intercept_stage;#define PFERR_FETCH_MASK BIT(PFERR_FETCH_BIT)#define PFERR_PK_MASK BIT(PFERR_PK_BIT)#define PFERR_SGX_MASK BIT(PFERR_SGX_BIT) +#define PFERR_LEVEL_MASK GENMASK_ULL(PFERR_LEVEL_END_BIT, PFERR_LEVEL_START_BIT)#define PFERR_GUEST_FINAL_MASK BIT_ULL(PFERR_GUEST_FINAL_BIT)#define PFERR_GUEST_PAGE_MASK BIT_ULL(PFERR_GUEST_PAGE_BIT)#define PFERR_GUEST_ENC_MASK BIT_ULL(PFERR_GUEST_ENC_BIT)
@@ -283,6 +286,8 @@ enum x86_intercept_stage; PFERR_WRITE_MASK | \ PFERR_PRESENT_MASK) +#define PFERR_LEVEL (err_code) (((err_code) & PFERR_LEVEL_MASK) >> PFERR_LEVEL_START_BIT) +/* apic attention bits */ #define KVM_APIC_CHECK_VAPIC 0/*
arch/x86/kvm/mmu/mmu.c +5 -0
@@ -4611,6 +4611,11 @@ bool __kvm_mmu_honors_guest_mtrrs(bool vm_has_noncoherent_dma)int kvm_tdp_page_fault (struct kvm_vcpu *vcpu,struct kvm_page_fault *fault) { +u8 err_level =PFERR_LEVEL (fault->error_code); + +if (err_level) + fault->max_level =min (fault->max_level, err_level); +/* * If the guest's MTRRs may be used to compute the "real" memtype, * restrict the mapping level to ensure KVM uses a consistent memtype
Signature · 1 line
2.25.1
PATCH v7 6/13 KVM: TDX: Pass desired page level in err code for page fault handler
In reply to [email protected]From: Xiaoyao Li <[email protected]>
For TDX, EPT violation can happen when TDG.MEM.PAGE.ACCEPT.
And TDG.MEM.PAGE.ACCEPT contains the desired accept page level of TD guest.
1. KVM can map it with 4KB page while TD guest wants to accept 2MB page.
TD geust will get TDX_PAGE_SIZE_MISMATCH and it should try to accept 4KB size.
2. KVM can map it with 2MB page while TD guest wants to accept 4KB page.
KVM needs to honor it because
a) there is no way to tell guest KVM maps it as 2MB size. And
b) guest accepts it in 4KB size since guest knows some other 4KB page in the same 2MB range will be used as shared page.
For case 2, it need to pass desired page level to MMU's page_fault_handler. Use bit 29:31 of kvm PF error code for this purpose.
--- arch/x86/kvm/vmx/common.h | 6 +++++- arch/x86/kvm/vmx/tdx.c | 22 ++++++++++++++++++++-- arch/x86/kvm/vmx/tdx_arch.h | 19 +++++++++++++++++++ arch/x86/kvm/vmx/vmx.c | 2 +- 4 files changed, 45 insertions(+), 4 deletions(-)
arch/x86/kvm/vmx/common.h +5 -1
@@ -67,7 +67,8 @@ static inline void vmx_handle_external_interrupt_irqoff(struct kvm_vcpu *vcpu, }static inline int __vmx_handle_ept_violation (struct kvm_vcpu *vcpu,gpa_t gpa, -unsigned long exit_qualification) +unsigned long exit_qualification, +int err_page_level) {u64 error_code;
@@ -90,6 +91,9 @@ static inline int __vmx_handle_ept_violation(struct kvm_vcpu *vcpu, gpa_t gpa,if (kvm_is_private_gpa (vcpu->kvm, gpa)) error_code |=PFERR_GUEST_ENC_MASK ; +if (err_page_level >PG_LEVEL_NONE ) + error_code |= (err_page_level <<PFERR_LEVEL_START_BIT ) &PFERR_LEVEL_MASK ; +return kvm_mmu_page_fault (vcpu, gpa, error_code,NULL ,0 ); }
arch/x86/kvm/vmx/tdx.c +20 -2
@@ -1858,7 +1858,20 @@ void tdx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode,static int tdx_handle_ept_violation (struct kvm_vcpu *vcpu) { +union tdx_ext_exit_qualification ext_exit_qual;unsigned long exit_qual; +int err_page_level =0 ; + + ext_exit_qual.full =tdexit_ext_exit_qual (vcpu); + +if (ext_exit_qual.type >=NUM_EXT_EXIT_QUAL ) { +pr_err ("EPT violation at gpa 0x%lx, with invalid ext exit qualification type 0x%x\n" , +tdexit_gpa (vcpu), ext_exit_qual.type); +kvm_vm_bugged (vcpu->kvm); +return 0 ; + }else if (ext_exit_qual.type ==EXT_EXIT_QUAL_ACCEPT ) { + err_page_level =tdx_sept_level_to_pg_level (ext_exit_qual.req_sept_level); + }if (kvm_is_private_gpa (vcpu->kvm,tdexit_gpa (vcpu))) {/*
@@ -1885,7 +1898,7 @@ static int tdx_handle_ept_violation(struct kvm_vcpu *vcpu) }trace_kvm_page_fault (vcpu,tdexit_gpa (vcpu), exit_qual); -return __vmx_handle_ept_violation (vcpu,tdexit_gpa (vcpu), exit_qual); +return __vmx_handle_ept_violation (vcpu,tdexit_gpa (vcpu), exit_qual, err_page_level); }static int tdx_handle_ept_misconfig (struct kvm_vcpu *vcpu)
@@ -2752,6 +2765,7 @@ static int tdx_init_mem_region(struct kvm *kvm, struct kvm_tdx_cmd *cmd)struct kvm_tdx_init_mem_region region;struct kvm_vcpu *vcpu;struct page *page; +u64 error_code;int idx, ret =0 ;bool added = false;
@@ -2809,7 +2823,11 @@ static int tdx_init_mem_region(struct kvm *kvm, struct kvm_tdx_cmd *cmd) kvm_tdx->source_pa =pfn_to_hpa (page_to_pfn (page)) | (cmd->flags &KVM_TDX_MEASURE_MEMORY_REGION ); - ret =kvm_mmu_map_tdp_page (vcpu, region.gpa,TDX_SEPT_PFERR , +/* TODO: large page support. */ + error_code =TDX_SEPT_PFERR ; + error_code |= (PG_LEVEL_4K <<PFERR_LEVEL_START_BIT ) & +PFERR_LEVEL_MASK ; + ret =kvm_mmu_map_tdp_page (vcpu, region.gpa, error_code,PG_LEVEL_4K );put_page (page);if (ret)
arch/x86/kvm/vmx/tdx_arch.h +19 -0
@@ -227,6 +227,25 @@ union tdx_sept_level_state {u64 raw; }; +union tdx_ext_exit_qualification { +struct { +u64 type :4 ; +u64 reserved0 :28 ; +u64 req_sept_level :3 ; +u64 err_sept_level :3 ; +u64 err_sept_state :8 ; +u64 err_sept_is_leaf :1 ; +u64 reserved1 :17 ; + }; +u64 full; +}; + +enum tdx_ext_exit_qualification_type { +EXT_EXIT_QUAL_NONE =0 , +EXT_EXIT_QUAL_ACCEPT =1 , +NUM_EXT_EXIT_QUAL , +}; +/* * Global scope metadata field ID. * See Table "Global Scope Metadata", TDX module 1.5 ABI spec.
arch/x86/kvm/vmx/vmx.c +1 -1
@@ -5752,7 +5752,7 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu)if (unlikely (allow_smaller_maxphyaddr && !kvm_vcpu_is_legal_gpa (vcpu, gpa)))return kvm_emulate_instruction (vcpu,0 ); -return __vmx_handle_ept_violation (vcpu, gpa, exit_qualification); +return __vmx_handle_ept_violation (vcpu, gpa, exit_qualification,PG_LEVEL_NONE ); }static int handle_ept_misconfig (struct kvm_vcpu *vcpu)
Signature · 1 line
2.25.1
PATCH v7 7/13 KVM: x86/tdp_mmu: Allocate private page table for large page split
In reply to [email protected]From: Isaku Yamahata <[email protected]>
Make tdp_mmu_alloc_sp_split() aware of private page table.
--- arch/x86/kvm/mmu/mmu_internal.h | 14 ++++++++++++++ arch/x86/kvm/mmu/tdp_mmu.c | 8 ++++++-- 2 files changed, 20 insertions(+), 2 deletions(-)
arch/x86/kvm/mmu/mmu_internal.h +14 -0
@@ -203,6 +203,15 @@ static inline void kvm_mmu_alloc_private_spt(struct kvm_vcpu *vcpu, struct kvm_m } } +static inline int kvm_alloc_private_spt_for_split (struct kvm_mmu_page *sp,gfp_t gfp) +{ + gfp &= ~__GFP_ZERO; + sp->private_spt = (void *)__get_free_page (gfp); +if (!sp->private_spt) +return -ENOMEM ; +return 0 ; +} +static inline void kvm_mmu_free_private_spt (struct kvm_mmu_page *sp) {if (sp->private_spt)
@@ -231,6 +240,11 @@ static inline void kvm_mmu_alloc_private_spt(struct kvm_vcpu *vcpu, struct kvm_m { } +static inline int kvm_alloc_private_spt_for_split (struct kvm_mmu_page *sp,gfp_t gfp) +{ +return -ENOMEM ; +} +static inline void kvm_mmu_free_private_spt (struct kvm_mmu_page *sp) { }
arch/x86/kvm/mmu/tdp_mmu.c +6 -2
@@ -1593,8 +1593,12 @@ static struct kvm_mmu_page *__tdp_mmu_alloc_sp_for_split(gfp_t gfp, union kvm_mm sp->role = role; sp->spt = (void *)__get_free_page (gfp); -/* TODO: large page support for private GPA. */ -WARN_ON_ONCE (kvm_mmu_page_role_is_private (role)); +if (kvm_mmu_page_role_is_private (role)) { +if (kvm_alloc_private_spt_for_split (sp, gfp)) { +free_page ((unsigned long )sp->spt); + sp->spt =NULL ; + } + }if (!sp->spt) {kmem_cache_free (mmu_page_header_cache, sp);return NULL ;
Signature · 1 line
2.25.1
PATCH v7 8/13 KVM: x86/tdp_mmu: Split the large page when zap leaf
In reply to [email protected]From: Xiaoyao Li <[email protected]>
When TDX enabled, a large page cannot be zapped if it contains mixed pages. In this case, it has to split the large page.
---
v7:
- remote unnecessary tlb shoot down in tdp_mmu_zap_leafs() to free unused split_sp.
--- arch/x86/kvm/Kconfig | 1 + arch/x86/kvm/mmu/mmu.c | 6 ++-- arch/x86/kvm/mmu/mmu_internal.h | 9 +++++ arch/x86/kvm/mmu/tdp_mmu.c | 60 ++++++++++++++++++++++++++++++--- 4 files changed, 69 insertions(+), 7 deletions(-)
arch/x86/kvm/Kconfig +1 -0
@@ -89,6 +89,7 @@ config KVM_INTEL tristate "KVM for Intel (and compatible) processors support" depends on KVM && IA32_FEAT_CTL select KVM_SW_PROTECTED_VM if INTEL_TDX_HOST + select KVM_GENERIC_MEMORY_ATTRIBUTES if INTEL_TDX_HOST select KVM_PRIVATE_MEM if INTEL_TDX_HOST help Provides support for KVM on processors equipped with Intel's VT
arch/x86/kvm/mmu/mmu.c +3 -3
@@ -7461,8 +7461,8 @@ bool kvm_arch_pre_set_memory_attributes(struct kvm *kvm,return kvm_unmap_gfn_range (kvm, range); } -static bool hugepage_test_mixed (struct kvm_memory_slot *slot,gfn_t gfn, -int level) +bool kvm_hugepage_test_mixed (struct kvm_memory_slot *slot,gfn_t gfn, +int level) {return lpage_info_slot (gfn, slot, level)->disallow_lpage &KVM_LPAGE_MIXED_FLAG ; }
@@ -7489,7 +7489,7 @@ static bool hugepage_has_attrs(struct kvm *kvm, struct kvm_memory_slot *slot,return kvm_range_has_memory_attributes (kvm, start, end, attrs);for (gfn = start; gfn < end; gfn +=KVM_PAGES_PER_HPAGE (level -1 )) { -if (hugepage_test_mixed (slot, gfn, level -1 ) || +if (kvm_hugepage_test_mixed (slot, gfn, level -1 ) || attrs !=kvm_get_memory_attributes (kvm, gfn))return false; }
arch/x86/kvm/mmu/mmu_internal.h +9 -0
@@ -461,4 +461,13 @@ void *mmu_memory_cache_alloc(struct kvm_mmu_memory_cache *mc);void track_possible_nx_huge_page (struct kvm *kvm,struct kvm_mmu_page *sp);void untrack_possible_nx_huge_page (struct kvm *kvm,struct kvm_mmu_page *sp); +#ifdef CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES +bool kvm_hugepage_test_mixed (struct kvm_memory_slot *slot,gfn_t gfn,int level); +#else +static inline bool kvm_hugepage_test_mixed (struct kvm_memory_slot *slot,gfn_t gfn,int level) +{ +return false; +} +#endif +#endif /* __KVM_X86_MMU_INTERNAL_H */
arch/x86/kvm/mmu/tdp_mmu.c +56 -4
96 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v7 9/13 KVM: x86/tdp_mmu, TDX: Split a large page when 4KB page within it converted to shared
In reply to [email protected]From: Xiaoyao Li <[email protected]>
When mapping the shared page for TDX, it needs to zap private alias.
In the case that private page is mapped as large page (2MB), it can be removed directly only when the whole 2MB is converted to shared. Otherwise, it has to split 2MB page into 512 4KB page, and only remove the pages that converted to shared.
When a present large leaf spte switches to present non-leaf spte, TDX needs to split the corresponding SEPT page to reflect it.
---
v7:
- catch up for tdx_seamcall() change
- typo in a comment of __set_private_spte_present()
- improved a comment in tdx_sept_split_private_spt()
v6:
- repeat TDH.MEM.PAGE.DEMOTE on TDX_INTERRUPTED_RESTARTABLE
--- arch/x86/include/asm/kvm-x86-ops.h | 1 + arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/kvm/mmu/tdp_mmu.c | 21 ++++++++++++++++----- arch/x86/kvm/vmx/tdx.c | 27 +++++++++++++++++++++++++-- arch/x86/kvm/vmx/tdx_arch.h | 1 + arch/x86/kvm/vmx/tdx_errno.h | 1 + arch/x86/kvm/vmx/tdx_ops.h | 13 +++++++++++++ 7 files changed, 59 insertions(+), 7 deletions(-)
arch/x86/include/asm/kvm-x86-ops.h +1 -0
@@ -105,6 +105,7 @@ KVM_X86_OP_OPTIONAL_RET0(get_mt_mask) KVM_X86_OP(load_mmu_pgd) KVM_X86_OP_OPTIONAL(link_private_spt) KVM_X86_OP_OPTIONAL(free_private_spt) +KVM_X86_OP_OPTIONAL(split_private_spt) KVM_X86_OP_OPTIONAL(set_private_spte) KVM_X86_OP_OPTIONAL(remove_private_spte) KVM_X86_OP_OPTIONAL(zap_private_spte)
arch/x86/include/asm/kvm_host.h +2 -0
@@ -1783,6 +1783,8 @@ struct kvm_x86_ops { void *private_spt);int (*free_private_spt)(struct kvm *kvm,gfn_t gfn,enum pg_level level,void *private_spt); +int (*split_private_spt)(struct kvm *kvm,gfn_t gfn,enum pg_level level, +void *private_spt);int (*set_private_spte)(struct kvm *kvm,gfn_t gfn,enum pg_level level,kvm_pfn_t pfn); int (*remove_private_spte)(struct kvm *kvm, gfn_t gfn, enum pg_level level,
arch/x86/kvm/mmu/tdp_mmu.c +16 -5
@@ -588,23 +588,34 @@ static int __must_check __set_private_spte_present(struct kvm *kvm, tdp_ptep_t s {bool was_present =is_shadow_present_pte (old_spte);bool is_present =is_shadow_present_pte (new_spte); +bool was_leaf = was_present &&is_last_spte (old_spte, level);bool is_leaf = is_present &&is_last_spte (new_spte, level);kvm_pfn_t new_pfn =spte_to_pfn (new_spte); +void *private_spt;int ret =0 ;lockdep_assert_held (&kvm->mmu_lock); -/* TDP MMU doesn't change present -> present */ -KVM_BUG_ON (was_present, kvm);/* * Use different call to either set up middle level * private page table, or leaf. */ -if (is_leaf) +if (level >PG_LEVEL_4K && was_leaf && !is_leaf) { +/* +* splitting large page into 4KB. +* tdp_mmu_split_huge_page() => tdp_mmu_link_sp() +*/ + private_spt =get_private_spt (gfn, new_spte, level); +KVM_BUG_ON (!private_spt, kvm); + ret =static_call (kvm_x86_zap_private_spte)(kvm, gfn, level); +kvm_flush_remote_tlbs (kvm); +if (!ret) + ret =static_call (kvm_x86_split_private_spt)(kvm, gfn, + level, private_spt); + }else if (is_leaf) ret =static_call (kvm_x86_set_private_spte)(kvm, gfn, level, new_pfn);else { -void *private_spt =get_private_spt (gfn, new_spte, level); - + private_spt =get_private_spt (gfn, new_spte, level);KVM_BUG_ON (!private_spt, kvm); ret =static_call (kvm_x86_link_private_spt)(kvm, gfn, level, private_spt); }
arch/x86/kvm/vmx/tdx.c +25 -2
@@ -1718,6 +1718,30 @@ static int tdx_sept_link_private_spt(struct kvm *kvm, gfn_t gfn,return 0 ; } +static int tdx_sept_split_private_spt (struct kvm *kvm,gfn_t gfn, +enum pg_level level,void *private_spt) +{ +int tdx_level =pg_level_to_tdx_sept_level (level); +struct kvm_tdx *kvm_tdx =to_kvm_tdx (kvm); +gpa_t gpa =gfn_to_gpa (gfn) &KVM_HPAGE_MASK (level); +hpa_t hpa =__pa (private_spt); +struct tdx_module_args out; +u64 err; + +/* See comment in tdx_sept_set_private_spte() to pin pages. */ +do { + err =tdh_mem_page_demote (kvm_tdx->tdr_pa, gpa, tdx_level, hpa, &out); + }while (err ==TDX_INTERRUPTED_RESTARTABLE ); +if (unlikely (err ==TDX_ERROR_SEPT_BUSY )) +return -EAGAIN ; +if (KVM_BUG_ON (err, kvm)) { +pr_tdx_error (TDH_MEM_PAGE_DEMOTE , err, &out); +return -EIO ; + } + +return 0 ; +} +static int tdx_sept_zap_private_spte (struct kvm *kvm,gfn_t gfn,enum pg_level level) {
@@ -1731,8 +1755,6 @@ static int tdx_sept_zap_private_spte(struct kvm *kvm, gfn_t gfn,if (unlikely (!is_hkid_assigned (kvm_tdx)))return 0 ; -/* For now large page isn't supported yet. */ -WARN_ON_ONCE (level !=PG_LEVEL_4K ); err =tdh_mem_range_block (kvm_tdx->tdr_pa, gpa, tdx_level, &out);if (unlikely (err ==TDX_ERROR_SEPT_BUSY ))return -EAGAIN ;
@@ -3286,6 +3308,7 @@ int __init tdx_hardware_setup(struct kvm_x86_ops *x86_ops) x86_ops->link_private_spt = tdx_sept_link_private_spt; x86_ops->free_private_spt = tdx_sept_free_private_spt; + x86_ops->split_private_spt = tdx_sept_split_private_spt; x86_ops->set_private_spte = tdx_sept_set_private_spte; x86_ops->remove_private_spte = tdx_sept_remove_private_spte; x86_ops->zap_private_spte = tdx_sept_zap_private_spte;
arch/x86/kvm/vmx/tdx_arch.h +1 -0
@@ -21,6 +21,7 @@#define TDH_MNG_CREATE 9#define TDH_VP_CREATE 10#define TDH_MNG_RD 11 +#define TDH_MEM_PAGE_DEMOTE 15#define TDH_MR_EXTEND 16#define TDH_MR_FINALIZE 17#define TDH_VP_FLUSH 18
arch/x86/kvm/vmx/tdx_errno.h +1 -0
@@ -11,6 +11,7 @@*/ #define TDX_NON_RECOVERABLE_VCPU 0x4000000100000000ULL#define TDX_INTERRUPTED_RESUMABLE 0x8000000300000000ULL +#define TDX_INTERRUPTED_RESTARTABLE 0x8000000400000000ULL#define TDX_OPERAND_INVALID 0xC000010000000000ULL#define TDX_OPERAND_BUSY 0x8000020000000000ULL#define TDX_PREVIOUS_TLB_EPOCH_BUSY 0x8000020100000000ULL
arch/x86/kvm/vmx/tdx_ops.h +13 -0
@@ -249,6 +249,19 @@ static inline u64 tdh_mng_rd(hpa_t tdr, u64 field, struct tdx_module_args *out)return tdx_seamcall (TDH_MNG_RD , &in, out); } +static inline u64 tdh_mem_page_demote (hpa_t tdr,gpa_t gpa,int level,hpa_t page, +struct tdx_module_args *out) +{ +struct tdx_module_args in = { + .rcx = gpa | level, + .rdx = tdr, + .r8 = page, + }; + +tdx_clflush_page (page,PG_LEVEL_4K ); +return tdx_seamcall_sept (TDH_MEM_PAGE_DEMOTE , &in, out); +} +static inline u64 tdh_mr_extend (hpa_t tdr,gpa_t gpa,struct tdx_module_args *out) {
Signature · 1 line
2.25.1
PATCH v7 10/13 KVM: x86/tdp_mmu: Try to merge pages into a large page
In reply to [email protected]From: Isaku Yamahata <[email protected]>
When a large page is passed to the KVM page fault handler and some of sub pages are already populated, try to merge sub pages into a large page. This situation can happen when the guest converts small pages into shared and convert it back into private.
When a large page is passed to KVM mmu page fault handler and the spte corresponding to the page is non-leaf (one or more of sub pages are already populated at lower page level), the current kvm mmu zaps non-leaf spte at a large page level, and populate a leaf spte at that level. Thus small pages are converted into a large page. However, it doesn't work for TDX because zapping and re-populating results in zeroing page content. Instead, populate all small pages and merge them into a large page.
Merging pages into a large page can fail when some sub pages are accepted and some are not. In such case, with the assumption that guest tries to accept at large page size for performance when possible, don't try to be smart to identify which page is still pending, map all pages at lower page level, and let vcpu re-execute.
---
v7:
- typo freezed => frozen
- return 0 when page is merged into 2M large page instead of -EAGAIN
v5:
- Fix memory leak
--- arch/x86/include/asm/kvm-x86-ops.h | 2 + arch/x86/include/asm/kvm_host.h | 4 + arch/x86/kvm/mmu/tdp_iter.c | 37 ++++-- arch/x86/kvm/mmu/tdp_iter.h | 2 + arch/x86/kvm/mmu/tdp_mmu.c | 176 ++++++++++++++++++++++++++++- 5 files changed, 211 insertions(+), 10 deletions(-)
arch/x86/include/asm/kvm-x86-ops.h +2 -0
@@ -106,9 +106,11 @@ KVM_X86_OP(load_mmu_pgd) KVM_X86_OP_OPTIONAL(link_private_spt) KVM_X86_OP_OPTIONAL(free_private_spt) KVM_X86_OP_OPTIONAL(split_private_spt) +KVM_X86_OP_OPTIONAL(merge_private_spt) KVM_X86_OP_OPTIONAL(set_private_spte) KVM_X86_OP_OPTIONAL(remove_private_spte) KVM_X86_OP_OPTIONAL(zap_private_spte) +KVM_X86_OP_OPTIONAL(unzap_private_spte) KVM_X86_OP(has_wbinvd_exit) KVM_X86_OP(get_l2_tsc_offset) KVM_X86_OP(get_l2_tsc_multiplier)
arch/x86/include/asm/kvm_host.h +4 -0
@@ -147,6 +147,7 @@#define KVM_MAX_HUGEPAGE_LEVEL PG_LEVEL_1G#define KVM_NR_PAGE_SIZES (KVM_MAX_HUGEPAGE_LEVEL - PG_LEVEL_4K + 1)#define KVM_HPAGE_GFN_SHIFT (x) (((x) - 1) * 9) +#define KVM_HPAGE_GFN_MASK (x) (~((1UL << KVM_HPAGE_GFN_SHIFT(x)) - 1))#define KVM_HPAGE_SHIFT (x) (PAGE_SHIFT + KVM_HPAGE_GFN_SHIFT(x))#define KVM_HPAGE_SIZE (x) (1UL << KVM_HPAGE_SHIFT(x))#define KVM_HPAGE_MASK (x) (~(KVM_HPAGE_SIZE(x) - 1))
@@ -1785,11 +1786,14 @@ struct kvm_x86_ops { void *private_spt);int (*split_private_spt)(struct kvm *kvm,gfn_t gfn,enum pg_level level,void *private_spt); +int (*merge_private_spt)(struct kvm *kvm,gfn_t gfn,enum pg_level level, +void *private_spt);int (*set_private_spte)(struct kvm *kvm,gfn_t gfn,enum pg_level level,kvm_pfn_t pfn);int (*remove_private_spte)(struct kvm *kvm,gfn_t gfn,enum pg_level level,kvm_pfn_t pfn);int (*zap_private_spte)(struct kvm *kvm,gfn_t gfn,enum pg_level level); +int (*unzap_private_spte)(struct kvm *kvm,gfn_t gfn,enum pg_level level);bool (*has_wbinvd_exit)(void );
arch/x86/kvm/mmu/tdp_iter.c +28 -9
@@ -71,6 +71,14 @@ tdp_ptep_t spte_to_child_pt(u64 spte, int level)return (tdp_ptep_t )__va (spte_to_pfn (spte) <<PAGE_SHIFT ); } +static void step_down (struct tdp_iter *iter,tdp_ptep_t child_pt) +{ + iter->level--; + iter->pt_path[iter->level -1 ] = child_pt; + iter->gfn =gfn_round_for_level (iter->next_last_level_gfn, iter->level); +tdp_iter_refresh_sptep (iter); +} +/* * Steps down one level in the paging structure towards the goal GFN. Returns * true if the iterator was able to step down a level, false otherwise.
@@ -92,14 +100,28 @@ static bool try_step_down(struct tdp_iter *iter)if (!child_pt)return false; - iter->level--; - iter->pt_path[iter->level -1 ] = child_pt; - iter->gfn =gfn_round_for_level (iter->next_last_level_gfn, iter->level); -tdp_iter_refresh_sptep (iter); - +step_down (iter, child_pt);return true; } +/* Steps down for frozen spte. Don't re-read sptep because it was frozen. */ +void tdp_iter_step_down (struct tdp_iter *iter,tdp_ptep_t child_pt) +{ +WARN_ON_ONCE (!child_pt); +WARN_ON_ONCE (iter->yielded); +WARN_ON_ONCE (iter->level == iter->min_level); + +step_down (iter, child_pt); +} + +void tdp_iter_step_side (struct tdp_iter *iter) +{ + iter->gfn +=KVM_PAGES_PER_HPAGE (iter->level); + iter->next_last_level_gfn = iter->gfn; + iter->sptep++; + iter->old_spte =kvm_tdp_mmu_read_spte (iter->sptep); +} +/* * Steps to the next entry in the current page table, at the current page table * level. The next entry could point to a page backing guest memory or another
@@ -117,10 +139,7 @@ static bool try_step_side(struct tdp_iter *iter) (SPTE_ENT_PER_PAGE - 1))return false; - iter->gfn +=KVM_PAGES_PER_HPAGE (iter->level); - iter->next_last_level_gfn = iter->gfn; - iter->sptep++; - iter->old_spte =kvm_tdp_mmu_read_spte (iter->sptep); +tdp_iter_step_side (iter);return true; }
arch/x86/kvm/mmu/tdp_iter.h +2 -0
@@ -134,6 +134,8 @@ void tdp_iter_start(struct tdp_iter *iter, struct kvm_mmu_page *root, int min_level, gfn_t next_last_level_gfn);void tdp_iter_next (struct tdp_iter *iter);void tdp_iter_restart (struct tdp_iter *iter); +void tdp_iter_step_side (struct tdp_iter *iter); +void tdp_iter_step_down (struct tdp_iter *iter,tdp_ptep_t child_pt);static inline union kvm_mmu_page_role tdp_iter_child_role (struct tdp_iter *iter) {
arch/x86/kvm/mmu/tdp_mmu.c +175 -1
188 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v7 11/13 KVM: TDX: Implement merge pages into a large page
In reply to [email protected]From: Isaku Yamahata <[email protected]>
Implement merge_private_stp callback.
---
v7:
- Fix subject, x86/tdp_mmu => TDX
- comment: use ulink instead of free for clarity
v6:
- repeat TDH.MEM.PAGE.PROMOTE() on TDX_INTERRUPTED_RESTARTABLE
--- arch/x86/kvm/vmx/tdx.c | 74 ++++++++++++++++++++++++++++++++++++ arch/x86/kvm/vmx/tdx_arch.h | 1 + arch/x86/kvm/vmx/tdx_errno.h | 2 + arch/x86/kvm/vmx/tdx_ops.h | 11 ++++++ 4 files changed, 88 insertions(+)
arch/x86/kvm/vmx/tdx.c +74 -0
@@ -1742,6 +1742,51 @@ static int tdx_sept_split_private_spt(struct kvm *kvm, gfn_t gfn,return 0 ; } +static int tdx_sept_merge_private_spt (struct kvm *kvm,gfn_t gfn, +enum pg_level level,void *private_spt) +{ +int tdx_level =pg_level_to_tdx_sept_level (level); +struct kvm_tdx *kvm_tdx =to_kvm_tdx (kvm); +struct tdx_module_args out; +gpa_t gpa =gfn_to_gpa (gfn) &KVM_HPAGE_MASK (level); +u64 err; + +/* See comment in tdx_sept_set_private_spte() */ +do { + err =tdh_mem_page_promote (kvm_tdx->tdr_pa, gpa, tdx_level, &out); + }while (err ==TDX_INTERRUPTED_RESTARTABLE ); +if (unlikely (err ==TDX_ERROR_SEPT_BUSY )) +return -EAGAIN ; +if (unlikely (err == (TDX_EPT_INVALID_PROMOTE_CONDITIONS | +TDX_OPERAND_ID_RCX ))) +/* +* Some pages are accepted, some pending. Need to wait for TD +* to accept all pages. Tell it the caller. +*/ +return -EAGAIN ; +if (KVM_BUG_ON (err, kvm)) { +pr_tdx_error (TDH_MEM_PAGE_PROMOTE , err, &out); +return -EIO ; + } +WARN_ON_ONCE (out.rcx !=__pa (private_spt)); + +/* +* TDH.MEM.PAGE.PROMOTE unlinks the Secure-EPT page for the lower level. +* Flush cache for reuse. +*/ +do { + err =tdh_phymem_page_wbinvd (set_hkid_to_hpa (__pa (private_spt), +to_kvm_tdx (kvm)->hkid)); + }while (unlikely (err == (TDX_OPERAND_BUSY |TDX_OPERAND_ID_RCX ))); +if (WARN_ON_ONCE (err)) { +pr_tdx_error (TDH_PHYMEM_PAGE_WBINVD , err,NULL ); +return -EIO ; + } + +tdx_clear_page (__pa (private_spt),PAGE_SIZE ); +return 0 ; +} +static int tdx_sept_zap_private_spte (struct kvm *kvm,gfn_t gfn,enum pg_level level) {
@@ -1816,6 +1861,33 @@ static void tdx_track(struct kvm *kvm) } +static int tdx_sept_unzap_private_spte (struct kvm *kvm,gfn_t gfn, +enum pg_level level) +{ +int tdx_level =pg_level_to_tdx_sept_level (level); +struct kvm_tdx *kvm_tdx =to_kvm_tdx (kvm); +gpa_t gpa =gfn_to_gpa (gfn) &KVM_HPAGE_MASK (level); +struct tdx_module_args out; +u64 err; + +do { + err =tdh_mem_range_unblock (kvm_tdx->tdr_pa, gpa, tdx_level, &out); + +/* +* tdh_mem_range_block() is accompanied with tdx_track() via kvm +* remote tlb flush. Wait for the caller of +* tdh_mem_range_block() to complete TDX track. +*/ + }while (err == (TDX_TLB_TRACKING_NOT_DONE |TDX_OPERAND_ID_SEPT )); +if (unlikely (err ==TDX_ERROR_SEPT_BUSY )) +return -EAGAIN ; +if (KVM_BUG_ON (err, kvm)) { +pr_tdx_error (TDH_MEM_RANGE_UNBLOCK , err, &out); +return -EIO ; + } +return 0 ; +} +static int tdx_sept_free_private_spt (struct kvm *kvm,gfn_t gfn,enum pg_level level,void *private_spt) {
@@ -3309,9 +3381,11 @@ int __init tdx_hardware_setup(struct kvm_x86_ops *x86_ops) x86_ops->link_private_spt = tdx_sept_link_private_spt; x86_ops->free_private_spt = tdx_sept_free_private_spt; x86_ops->split_private_spt = tdx_sept_split_private_spt; + x86_ops->merge_private_spt = tdx_sept_merge_private_spt; x86_ops->set_private_spte = tdx_sept_set_private_spte; x86_ops->remove_private_spte = tdx_sept_remove_private_spte; x86_ops->zap_private_spte = tdx_sept_zap_private_spte; + x86_ops->unzap_private_spte = tdx_sept_unzap_private_spte;return 0 ;
arch/x86/kvm/vmx/tdx_arch.h +1 -0
@@ -29,6 +29,7 @@#define TDH_MNG_KEY_FREEID 20#define TDH_MNG_INIT 21#define TDH_VP_INIT 22 +#define TDH_MEM_PAGE_PROMOTE 23#define TDH_MEM_SEPT_RD 25#define TDH_VP_RD 26#define TDH_MNG_KEY_RECLAIMID 27
arch/x86/kvm/vmx/tdx_errno.h +2 -0
@@ -24,6 +24,8 @@#define TDX_FLUSHVP_NOT_DONE 0x8000082400000000ULL#define TDX_EPT_WALK_FAILED 0xC0000B0000000000ULL#define TDX_EPT_ENTRY_NOT_FREE 0xC0000B0200000000ULL +#define TDX_TLB_TRACKING_NOT_DONE 0xC0000B0800000000ULL +#define TDX_EPT_INVALID_PROMOTE_CONDITIONS 0xC0000B0900000000ULL#define TDX_EPT_ENTRY_STATE_INCORRECT 0xC0000B0D00000000ULL/*
arch/x86/kvm/vmx/tdx_ops.h +11 -0
@@ -262,6 +262,17 @@ static inline u64 tdh_mem_page_demote(hpa_t tdr, gpa_t gpa, int level, hpa_t pagreturn tdx_seamcall_sept (TDH_MEM_PAGE_DEMOTE , &in, out); } +static inline u64 tdh_mem_page_promote (hpa_t tdr,gpa_t gpa,int level, +struct tdx_module_args *out) +{ +struct tdx_module_args in = { + .rcx = gpa | level, + .rdx = tdr, + }; + +return tdx_seamcall_sept (TDH_MEM_PAGE_PROMOTE , &in, out); +} +static inline u64 tdh_mr_extend (hpa_t tdr,gpa_t gpa,struct tdx_module_args *out) {
Signature · 1 line
2.25.1
PATCH v7 12/13 KVM: x86/mmu: Make kvm fault handler aware of large page of private memslot
In reply to [email protected]From: Isaku Yamahata <[email protected]>
struct kvm_page_fault.req_level is the page level which takes care of the faulted-in page size. For now its calculation is only for the conventional kvm memslot by host_pfn_mapping_level() that traverses page table.
However, host_pfn_mapping_level() cannot be used for private kvm memslot because private pages of private kvm memlost aren't mapped into user virtual address space. Instead, page order is given when getting pfn. Remember it in struct kvm_page_fault and use it.
--- arch/x86/kvm/mmu/mmu.c | 34 +++++++++++++++++---------------- arch/x86/kvm/mmu/mmu_internal.h | 12 +++++++++++- arch/x86/kvm/mmu/tdp_mmu.c | 2 +- 3 files changed, 30 insertions(+), 18 deletions(-)
arch/x86/kvm/mmu/mmu.c +18 -16
@@ -3154,10 +3154,10 @@ static int host_pfn_mapping_level(struct kvm *kvm, gfn_t gfn,static int __kvm_mmu_max_mapping_level (struct kvm *kvm,const struct kvm_memory_slot *slot, -gfn_t gfn,int max_level,bool is_private) +gfn_t gfn,int max_level,int host_level, +bool is_private) {struct kvm_lpage_info *linfo; -int host_level; max_level =min (max_level, max_huge_page_level);for ( ; max_level >PG_LEVEL_4K ; max_level--) {
@@ -3166,24 +3166,23 @@ static int __kvm_mmu_max_mapping_level(struct kvm *kvm,break ; } -if (is_private) -return max_level; -if (max_level ==PG_LEVEL_4K )return PG_LEVEL_4K ; - host_level =host_pfn_mapping_level (kvm, gfn, slot); +if (!is_private) { +WARN_ON_ONCE (host_level !=PG_LEVEL_NONE ); + host_level =host_pfn_mapping_level (kvm, gfn, slot); + } +WARN_ON_ONCE (host_level ==PG_LEVEL_NONE );return min (host_level, max_level); }int kvm_mmu_max_mapping_level (struct kvm *kvm,const struct kvm_memory_slot *slot,gfn_t gfn, -int max_level) +int max_level,bool faultin_private) { -bool is_private =kvm_slot_can_be_private (slot) && -kvm_mem_is_private (kvm, gfn); - -return __kvm_mmu_max_mapping_level (kvm, slot, gfn, max_level, is_private); +return __kvm_mmu_max_mapping_level (kvm, slot, gfn, max_level, +PG_LEVEL_NONE , faultin_private); }void kvm_mmu_hugepage_adjust (struct kvm_vcpu *vcpu,struct kvm_page_fault *fault)
@@ -3208,7 +3207,8 @@ void kvm_mmu_hugepage_adjust(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault*/ fault->req_level =__kvm_mmu_max_mapping_level (vcpu->kvm, slot, fault->gfn, fault->max_level, - fault->is_private); + fault->host_level, +kvm_is_faultin_private (fault));if (fault->req_level ==PG_LEVEL_4K || fault->huge_page_disallowed)return ;
@@ -4332,6 +4332,7 @@ static int kvm_faultin_pfn_private(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) {int max_order, r; +u8 max_level;if (!kvm_slot_can_be_private (fault->slot)) {kvm_mmu_prepare_memory_fault_exit (vcpu, fault);
@@ -4345,8 +4346,9 @@ static int kvm_faultin_pfn_private(struct kvm_vcpu *vcpu,return r; } - fault->max_level =min (kvm_max_level_for_order (max_order), - fault->max_level); + max_level =kvm_max_level_for_order (max_order); + fault->host_level = max_level; + fault->max_level =min (max_level, fault->max_level); fault->map_writable = !(fault->slot->flags &KVM_MEM_READONLY );return RET_PF_CONTINUE ;
@@ -4396,7 +4398,7 @@ static int __kvm_faultin_pfn(struct kvm_vcpu *vcpu, struct kvm_page_fault *faultreturn -EFAULT ; } -if (fault->is_private) +if (kvm_is_faultin_private (fault))return kvm_faultin_pfn_private (vcpu, fault); async = false;
@@ -6805,7 +6807,7 @@ static bool kvm_mmu_zap_collapsible_spte(struct kvm *kvm,*/ if (sp->role.direct && sp->role.level <kvm_mmu_max_mapping_level (kvm, slot, sp->gfn, -PG_LEVEL_NUM )) { +PG_LEVEL_NUM , false)) {kvm_zap_one_rmap_spte (kvm, rmap_head, sptep);if (kvm_available_flush_remote_tlbs_range ())
arch/x86/kvm/mmu/mmu_internal.h +11 -1
@@ -358,6 +358,9 @@ struct kvm_page_fault {* is changing its own translation in the guest page tables. */ bool write_fault_to_shadow_pgtable; + +/* valid only for private memslot && private gfn */ +enum pg_level host_level; };int kvm_tdp_page_fault (struct kvm_vcpu *vcpu,struct kvm_page_fault *fault);
@@ -452,7 +455,7 @@ static inline int kvm_mmu_do_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa,int kvm_mmu_max_mapping_level (struct kvm *kvm,const struct kvm_memory_slot *slot,gfn_t gfn, -int max_level); +int max_level,bool faultin_private);void kvm_mmu_hugepage_adjust (struct kvm_vcpu *vcpu,struct kvm_page_fault *fault);void disallowed_hugepage_adjust (struct kvm_page_fault *fault,u64 spte,int cur_level);
@@ -470,4 +473,11 @@ static inline bool kvm_hugepage_test_mixed(struct kvm_memory_slot *slot, gfn_t g }#endif +static inline bool kvm_is_faultin_private (const struct kvm_page_fault *fault) +{ +if (IS_ENABLED (CONFIG_KVM_GENERIC_PRIVATE_MEM )) +return fault->is_private &&kvm_slot_can_be_private (fault->slot); +return false; +} +#endif /* __KVM_X86_MMU_INTERNAL_H */
arch/x86/kvm/mmu/tdp_mmu.c +1 -1
@@ -2183,7 +2183,7 @@ static void zap_collapsible_spte_range(struct kvm *kvm,continue ; max_mapping_level =kvm_mmu_max_mapping_level (kvm, slot, - iter.gfn,PG_LEVEL_NUM ); + iter.gfn,PG_LEVEL_NUM , false);if (max_mapping_level < iter.level)continue ;
Signature · 1 line
2.25.1
PATCH v7 13/13 KVM: TDX: Allow 2MB large page for TD GUEST
In reply to [email protected]From: Xiaoyao Li <[email protected]>
Now that everything is there to support 2MB page for TD guest. Because TDX module TDH.MEM.PAGE.AUG supports 4KB page and 2MB page, set struct kvm_arch.tdp_max_page_level to 2MB page level.
--- arch/x86/kvm/mmu/tdp_mmu.c | 9 ++------- arch/x86/kvm/vmx/tdx.c | 4 ++-- 2 files changed, 4 insertions(+), 9 deletions(-)
arch/x86/kvm/mmu/tdp_mmu.c +2 -7
@@ -1544,14 +1544,9 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) sp->nx_huge_page_disallowed = fault->huge_page_disallowed; -if (is_shadow_present_pte (iter.old_spte)) { -/* -* TODO: large page support. -* Doesn't support large page for TDX now -*/ -KVM_BUG_ON (is_private_sptep (iter.sptep), vcpu->kvm); +if (is_shadow_present_pte (iter.old_spte)) r =tdp_mmu_split_huge_page (kvm, &iter, sp, true); - }else +else r =tdp_mmu_link_sp (kvm, &iter, sp, true);/*
arch/x86/kvm/vmx/tdx.c +2 -2
@@ -636,8 +636,8 @@ int tdx_vm_init(struct kvm *kvm)*/ kvm_mmu_set_mmio_spte_value (kvm,0 ); -/* TODO: Enable 2mb and 1gb large page support. */ - kvm->arch.tdp_max_page_level =PG_LEVEL_4K ; +/* TDH.MEM.PAGE.AUG supports up to 2MB page. */ + kvm->arch.tdp_max_page_level =PG_LEVEL_2M ;/* * This function initializes only KVM software construct. It doesn't
Signature · 1 line
2.25.1