KVM: x86: skip gfn_track allocation when possible
Subsystems (5)
cover KVM: x86: skip gfn_track allocation when possible
From: David Stevens <[email protected]>
Skip allocating gfn_track arrays when tracking of guest write access to pages is not required. For VMs where the allocation can be avoided, this saves 2 bytes per 4KB of guest memory.
Write tracking is used to manage shadow page tables in three cases - when tdp is not supported, when nested virtualization is used, and for GVT-g. By combining the existing tdp_enable flag and nested module param with a new config that indicates when something outside of KVM (i.e. GVT-g) needs write tracking, KVM can determine when initializing a VM if gfn_track arrays are definitely not necessary.
This straightforward approach has the downside that for VMs where nested virtualization is enabled but never used, gfn_track arrays are still allocated. Instead of going so far as to try to initialize things on demand, key off of whether or not X86_FEATURE_VMX is set in the guest's cpuid to support per-VM configuration instead of system wide configuration based on the nested module param.
David Stevens (3):
KVM: x86: add config for non-kvm users of page tracking
KVM: x86/mmu: skip page tracking when possible
KVM: VMX: skip page tracking based on cpuid
arch/x86/include/asm/kvm-x86-ops.h | 1 + arch/x86/include/asm/kvm_host.h | 4 +- arch/x86/include/asm/kvm_page_track.h | 7 ++- arch/x86/kvm/Kconfig | 3 ++ arch/x86/kvm/cpuid.c | 55 +++++++++++++++----- arch/x86/kvm/mmu/page_track.c | 74 +++++++++++++++++++++++++-- arch/x86/kvm/svm/svm.c | 10 +++- arch/x86/kvm/vmx/vmx.c | 13 ++++- arch/x86/kvm/x86.c | 5 +- drivers/gpu/drm/i915/Kconfig | 1 + 10 files changed, 150 insertions(+), 23 deletions(-)
Signature · 1 line
2.33.0.464.g1972c5931b-goog
PATCH 1/3 KVM: x86: add config for non-kvm users of page tracking
From: David Stevens <[email protected]>
Add a config option that allows kvm to determine whether or not there are any external users of page tracking.
--- arch/x86/kvm/Kconfig | 3 +++ drivers/gpu/drm/i915/Kconfig | 1 + 2 files changed, 4 insertions(+)
arch/x86/kvm/Kconfig +3 -0
@@ -129,4 +129,7 @@ config KVM_MMU_AUDIT This option adds a R/W kVM module parameter 'mmu_audit', which allows auditing of KVM MMU events at runtime. +config KVM_EXTERNAL_WRITE_TRACKING + bool + endif # VIRTUALIZATION
drivers/gpu/drm/i915/Kconfig +1 -0
@@ -126,6 +126,7 @@ config DRM_I915_GVT_KVMGT depends on DRM_I915_GVT depends on KVM depends on VFIO_MDEV + select KVM_EXTERNAL_WRITE_TRACKING default n help Choose this option if you want to enable KVMGT support for
Signature · 1 line
2.33.0.464.g1972c5931b-goog
PATCH 2/3 KVM: x86/mmu: skip page tracking when possible
In reply to David StevensFrom: David Stevens <[email protected]>
Skip allocating gfn_track arrays if nothing will use them, to save 2 bytes per 4kb of guest memory. This can be done when there are no external users of page tracking (i.e. GVT-g is disabled), KVM is using tdp, and the guest doesn't support nested virtualization.
--- arch/x86/include/asm/kvm-x86-ops.h | 1 + arch/x86/include/asm/kvm_host.h | 2 ++ arch/x86/include/asm/kvm_page_track.h | 5 +++-- arch/x86/kvm/mmu/page_track.c | 25 +++++++++++++++++++++---- arch/x86/kvm/svm/svm.c | 6 ++++++ arch/x86/kvm/vmx/vmx.c | 6 ++++++ arch/x86/kvm/x86.c | 5 +++-- 7 files changed, 42 insertions(+), 8 deletions(-)
arch/x86/include/asm/kvm-x86-ops.h +1 -0
@@ -18,6 +18,7 @@ KVM_X86_OP_NULL(hardware_unsetup) KVM_X86_OP_NULL(cpu_has_accelerated_tpr) KVM_X86_OP(has_emulated_msr) KVM_X86_OP(vcpu_after_set_cpuid) +KVM_X86_OP(nested_enabled) KVM_X86_OP(vm_init) KVM_X86_OP_NULL(vm_destroy) KVM_X86_OP(vcpu_create)
arch/x86/include/asm/kvm_host.h +2 -0
@@ -1049,6 +1049,7 @@ struct kvm_arch {struct list_head lpage_disallowed_mmu_pages;struct kvm_page_track_notifier_node mmu_sp_tracker;struct kvm_page_track_notifier_head track_notifier_head; +bool mmu_uses_page_tracking;/* * Protects marking pages unsync during page faults, as TDP MMU page * faults only take mmu_lock for read. For simplicity, the unsync
@@ -1302,6 +1303,7 @@ struct kvm_x86_ops {bool (*cpu_has_accelerated_tpr)(void );bool (*has_emulated_msr)(struct kvm *kvm,u32 index);void (*vcpu_after_set_cpuid)(struct kvm_vcpu *vcpu); +bool (*nested_enabled)(void );unsigned int vm_size;int (*vm_init)(struct kvm *kvm);
arch/x86/include/asm/kvm_page_track.h +3 -2
@@ -46,11 +46,12 @@ struct kvm_page_track_notifier_node { struct kvm_page_track_notifier_node *node); }; -void kvm_page_track_init (struct kvm *kvm); +void kvm_page_track_init (struct kvm *kvm,bool mmu_uses_page_tracking);void kvm_page_track_cleanup (struct kvm *kvm);void kvm_page_track_free_memslot (struct kvm_memory_slot *slot); -int kvm_page_track_create_memslot (struct kvm_memory_slot *slot, +int kvm_page_track_create_memslot (struct kvm *kvm, +struct kvm_memory_slot *slot,unsigned long npages); void kvm_slot_page_track_add_page(struct kvm *kvm,
arch/x86/kvm/mmu/page_track.c +21 -4
@@ -29,11 +29,16 @@ void kvm_page_track_free_memslot(struct kvm_memory_slot *slot) } } -int kvm_page_track_create_memslot (struct kvm_memory_slot *slot, +int kvm_page_track_create_memslot (struct kvm *kvm, +struct kvm_memory_slot *slot,unsigned long npages) {int i; +if (!IS_ENABLED (CONFIG_KVM_EXTERNAL_WRITE_TRACKING ) && + !kvm->arch.mmu_uses_page_tracking) +return 0 ; +for (i =0 ; i <KVM_PAGE_TRACK_MAX ; i++) { slot->arch.gfn_track[i] = kvcalloc(npages, sizeof(*slot->arch.gfn_track[i]),
@@ -61,10 +66,15 @@ static void update_gfn_track(struct kvm_memory_slot *slot, gfn_t gfn, enum kvm_page_track_mode mode, short count) { int index, val; +unsigned short *arr; + + arr = slot->arch.gfn_track[mode]; +if (WARN_ON (!arr)) +return ; index =gfn_to_index (gfn, slot->base_gfn,PG_LEVEL_4K ); - val = slot->arch.gfn_track[mode][index]; + val = arr[index];if (WARN_ON (val + count <0 || val + count >USHRT_MAX ))return ;
@@ -143,6 +153,7 @@ bool kvm_page_track_is_active(struct kvm_vcpu *vcpu, gfn_t gfn, enum kvm_page_track_mode mode) {struct kvm_memory_slot *slot; +unsigned short *arr;int index;if (WARN_ON (!page_track_mode_is_valid (mode)))
@@ -152,8 +163,12 @@ bool kvm_page_track_is_active(struct kvm_vcpu *vcpu, gfn_t gfn,if (!slot)return false; + arr = slot->arch.gfn_track[mode]; +if (!arr) +return false; + index =gfn_to_index (gfn, slot->base_gfn,PG_LEVEL_4K ); -return !!READ_ONCE (slot->arch.gfn_track[mode][index]); +return !!READ_ONCE (arr[index]); }void kvm_page_track_cleanup (struct kvm *kvm)
@@ -164,13 +179,15 @@ void kvm_page_track_cleanup(struct kvm *kvm)cleanup_srcu_struct (&head->track_srcu); } -void kvm_page_track_init (struct kvm *kvm) +void kvm_page_track_init (struct kvm *kvm,bool mmu_uses_page_tracking) {struct kvm_page_track_notifier_head *head; head = &kvm->arch.track_notifier_head;init_srcu_struct (&head->track_srcu);INIT_HLIST_HEAD (&head->track_notifier_list); + + kvm->arch.mmu_uses_page_tracking = mmu_uses_page_tracking; }/*
arch/x86/kvm/svm/svm.c +6 -0
@@ -4049,6 +4049,11 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) } } +static bool svm_nested_enabled (void ) +{ +return nested; +} +static bool svm_has_wbinvd_exit (void ) {return true;
@@ -4590,6 +4595,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .get_exit_info = svm_get_exit_info, .vcpu_after_set_cpuid = svm_vcpu_after_set_cpuid, + .nested_enabled = svm_nested_enabled, .has_wbinvd_exit = svm_has_wbinvd_exit,
arch/x86/kvm/vmx/vmx.c +6 -0
@@ -7225,6 +7225,11 @@ static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)vmx_update_exception_bitmap (vcpu); } +static bool vmx_nested_enabled (void ) +{ +return nested; +} +static __init void vmx_set_cpu_caps (void ) {kvm_set_cpu_caps ();
@@ -7637,6 +7642,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { .get_exit_info = vmx_get_exit_info, .vcpu_after_set_cpuid = vmx_vcpu_after_set_cpuid, + .nested_enabled = vmx_nested_enabled, .has_wbinvd_exit = cpu_has_vmx_wbinvd_exit,
arch/x86/kvm/x86.c +3 -2
@@ -11174,7 +11174,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)kvm_apicv_init (kvm);kvm_hv_init_vm (kvm); -kvm_page_track_init (kvm); +kvm_page_track_init (kvm, !tdp_enabled || +static_call (kvm_x86_nested_enabled));kvm_mmu_init_vm (kvm);kvm_xen_init_vm (kvm);
@@ -11474,7 +11475,7 @@ static int kvm_alloc_memslot_metadata(struct kvm *kvm, } } -if (kvm_page_track_create_memslot (slot, npages)) +if (kvm_page_track_create_memslot (kvm, slot, npages)) goto out_free;return 0 ;
Signature · 1 line
2.33.0.464.g1972c5931b-goog
PATCH 3/3 KVM: VMX: skip page tracking based on cpuid
In reply to David StevensFrom: David Stevens <[email protected]>
Consider X86_FEATURE_VMX when determining whether or not page tracking is necessary, since that flag can be used to control whether or not a particular guest supports nested virtualization. When the flag is toggled, it is necessary to free/allocate gfn_track arrays for any already existing slots.
If cpuid is heterogeneous or is modified after KVM_RUN, page tracking may not work properly. This may cause guest instability, as per the caveat on KVM_SET_CPUID{,2}. Host stability should not be affected.
--- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/include/asm/kvm_page_track.h | 2 + arch/x86/kvm/cpuid.c | 55 +++++++++++++++++++++------ arch/x86/kvm/mmu/page_track.c | 49 ++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 4 +- arch/x86/kvm/vmx/vmx.c | 7 +++- 6 files changed, 104 insertions(+), 15 deletions(-)
arch/x86/include/asm/kvm_host.h +1 -1
@@ -1302,7 +1302,7 @@ struct kvm_x86_ops {void (*hardware_unsetup)(void );bool (*cpu_has_accelerated_tpr)(void );bool (*has_emulated_msr)(struct kvm *kvm,u32 index); -void (*vcpu_after_set_cpuid)(struct kvm_vcpu *vcpu); +int (*vcpu_after_set_cpuid)(struct kvm_vcpu *vcpu);bool (*nested_enabled)(void );unsigned int vm_size;
arch/x86/include/asm/kvm_page_track.h +2 -0
@@ -49,6 +49,8 @@ struct kvm_page_track_notifier_node {void kvm_page_track_init (struct kvm *kvm,bool mmu_uses_page_tracking);void kvm_page_track_cleanup (struct kvm *kvm); +int kvm_page_tracking_mmu_enable (struct kvm *kvm,bool enable); +void kvm_page_track_free_memslot (struct kvm_memory_slot *slot); int kvm_page_track_create_memslot(struct kvm *kvm, struct kvm_memory_slot *slot,
arch/x86/kvm/cpuid.c +43 -12
111 lines not on this page · raw message
arch/x86/kvm/mmu/page_track.c +49 -0
55 lines not on this page · raw message
arch/x86/kvm/svm/svm.c +3 -1
@@ -3981,7 +3981,7 @@ static u64 svm_get_mt_mask(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio)return 0 ; } -static void svm_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu) +static int svm_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu) {struct vcpu_svm *svm =to_svm (vcpu);struct kvm_cpuid_entry2 *best;
@@ -4047,6 +4047,8 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)set_msr_interception (vcpu, svm->msrpm,MSR_IA32_SYSENTER_EIP ,1 ,1 );set_msr_interception (vcpu, svm->msrpm,MSR_IA32_SYSENTER_ESP ,1 ,1 ); } + +return 0 ; }static bool svm_nested_enabled (void )
arch/x86/kvm/vmx/vmx.c +6 -1
@@ -7166,7 +7166,7 @@ static void update_intel_pt_cfg(struct kvm_vcpu *vcpu) vmx->pt_desc.ctl_bitmask &= ~(0xfULL << (32 + i *4 )); } -static void vmx_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu) +static int vmx_vcpu_after_set_cpuid (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu);
@@ -7223,6 +7223,11 @@ static void vmx_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu)/* Refresh #PF interception to account for MAXPHYADDR changes. */ vmx_update_exception_bitmap (vcpu); + +if (tdp_enabled) +return kvm_page_tracking_mmu_enable (vcpu->kvm, +nested_vmx_allowed (vcpu)); +return 0 ; }static bool vmx_nested_enabled (void )
Signature · 1 line
2.33.0.464.g1972c5931b-goog
Paolo Bonzini
maintainerQuoted 6 lines · David Stevens
This straightforward approach has the downside that for VMs where nested virtualization is enabled but never used,
gfn_trackarrays are still allocated. Instead of going so far as to try to initialize things on demand, key off of whether or notX86_FEATURE_VMXis set in the guest's cpuid to support per-VM configuration instead of system wide configuration based on the nested module param.
Can you allocate it lazily like we do for the rmap?
Paolo