KVM: SVM: Add support for VMCB state caching
cover KVM: SVM: Add support for VMCB state caching
Hi Avi, Hi Marcelo,
here is a patch-set which adds support for VMCB state caching to KVM. This is a new CPU feature where software can mark certain parts of the VMCB as unchanged since the last vmexit and the hardware can then avoid reloading these parts from memory.
The feature is implemented downwards-compatible in hardware, so a 0-bit means the state has changed and needs to be reloaded. This makes it possible to implement the bits without checking for the feature, as done in this patch-set (another reason is that the check is as expensive as clearing the bit). Processors which do not implement VMCB state caching just ignore these bits.
These patches were tested with multiple guests (Windows, Linux, also in parallel) and also with nested-svm.
The patches apply on-top of the intercept mask wrapping patch-set I sent earlier this week. Your feedback is appreciated.
Regards,
Joerg
arch/x86/include/asm/svm.h | 6 +++- arch/x86/kvm/svm.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletions(-)
Joerg Roedel (12):
KVM: SVM: Add clean-bits infrastructure code
KVM: SVM: Add clean-bit for intercetps, tsc-offset and pause filter count
KVM: SVM: Add clean-bit for IOPM_BASE and MSRPM_BASE
KVM: SVM: Add clean-bit for the ASID
KVM: SVM: Add clean-bit for interrupt state
KVM: SVM: Add clean-bit for NPT state
KVM: SVM: Add clean-bit for control registers
KVM: SVM: Add clean-bit for DR6 and DR7
KVM: SVM: Add clean-bit for GDT and IDT
KVM: SVM: Add clean-bit for Segements and CPL
KVM: SVM: Add clean-bit for CR2 register
KVM: SVM: Add clean-bit for LBR state
PATCH 1/12 KVM: SVM: Add clean-bits infrastructure code
This patch adds the infrastructure for the implementation of the individual clean-bits.
--- arch/x86/include/asm/svm.h | 6 +++++- arch/x86/kvm/svm.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletions(-)
arch/x86/include/asm/svm.h +5 -1
@@ -49,6 +49,9 @@ enum { INTERCEPT_MWAIT_COND, }; +enum { +VMCB_CLEAN_MAX , +};struct __attribute__ ((__packed__ ))vmcb_control_area {u32 intercept_cr;
@@ -79,7 +82,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area {u32 event_inj_err;u64 nested_cr3;u64 lbr_ctl; -u64 reserved_5; +u32 clean; +u32 reserved_5;u64 next_rip;u8 reserved_6[816 ]; };
arch/x86/kvm/svm.c +31 -0
@@ -185,6 +185,28 @@ static int nested_svm_vmexit(struct vcpu_svm *svm);static int nested_svm_check_exception (struct vcpu_svm *svm,unsigned nr,bool has_error_code,u32 error_code); +enum { +VMCB_DIRTY_MAX , +}; + +#define VMCB_ALWAYS_DIRTY_MASK 0U + +static inline void mark_all_dirty (struct vmcb *vmcb) +{ + vmcb->control.clean =0 ; +} + +static inline void mark_all_clean (struct vmcb *vmcb) +{ + vmcb->control.clean = ((1 <<VMCB_DIRTY_MAX ) -1 ) + & ~VMCB_ALWAYS_DIRTY_MASK ; +} + +static inline void mark_dirty (struct vmcb *vmcb,int bit) +{ + vmcb->control.clean &= ~(1 << bit); +} +static inline struct vcpu_svm *to_svm (struct kvm_vcpu *vcpu) { return container_of(vcpu, struct vcpu_svm, vcpu);
@@ -973,6 +995,8 @@ static void init_vmcb(struct vcpu_svm *svm)set_intercept (svm,INTERCEPT_PAUSE ); } +mark_all_dirty (svm->vmcb); +enable_gif (svm); }
@@ -1089,6 +1113,7 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)if (unlikely (cpu != vcpu->cpu)) { svm->asid_generation =0 ; +mark_all_dirty (svm->vmcb); }#ifdef CONFIG_X86_64
@@ -2139,6 +2164,8 @@ static int nested_svm_vmexit(struct vcpu_svm *svm) svm->vmcb->save.cpl =0 ; svm->vmcb->control.exit_int_info =0 ; +mark_all_dirty (svm->vmcb); +nested_svm_unmap (page);nested_svm_uninit_mmu_context (&svm->vcpu);
@@ -2350,6 +2377,8 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)enable_gif (svm); +mark_all_dirty (svm->vmcb); +return true; }
@@ -3487,6 +3516,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)if (unlikely (svm->vmcb->control.exit_code ==SVM_EXIT_EXCP_BASE +MC_VECTOR ))svm_handle_mce (svm); + +mark_all_clean (svm->vmcb); }#undef R
Signature · 1 line
1.7.1
Re: [PATCH 01/12] KVM: SVM: Add clean-bits infrastructure code
Review
Quoted 3 lines · Joerg Roedel
(quoted diff) +3
-0+enum { + VMCB_CLEAN_MAX, +};
This is a left-over from an earlier version. I forgot to remove it. Here is an updated patch. Sorry.
Quoted 1 line
From
7e3f4f175561429d0054daac94763e67d12424baMon Sep 17 00:00:00 2001
From: Joerg Roedel <[email protected]>
Date: Wed, 1 Dec 2010 12:01:08 +0100
Subject: [PATCH 01/12] KVM: SVM: Add clean-bits infrastructure code
This patch adds the infrastructure for the implementation of the individual clean-bits.
--- arch/x86/include/asm/svm.h | 3 ++- arch/x86/kvm/svm.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-)
arch/x86/include/asm/svm.h +2 -1
@@ -79,7 +79,8 @@ struct __attribute__ ((__packed__)) vmcb_control_area {u32 event_inj_err;u64 nested_cr3;u64 lbr_ctl; -u64 reserved_5; +u32 clean; +u32 reserved_5;u64 next_rip;u8 reserved_6[816 ]; };
arch/x86/kvm/svm.c +31 -0
@@ -185,6 +185,28 @@ static int nested_svm_vmexit(struct vcpu_svm *svm);static int nested_svm_check_exception (struct vcpu_svm *svm,unsigned nr,bool has_error_code,u32 error_code); +enum { +VMCB_DIRTY_MAX , +}; + +#define VMCB_ALWAYS_DIRTY_MASK 0U + +static inline void mark_all_dirty (struct vmcb *vmcb) +{ + vmcb->control.clean =0 ; +} + +static inline void mark_all_clean (struct vmcb *vmcb) +{ + vmcb->control.clean = ((1 <<VMCB_DIRTY_MAX ) -1 ) + & ~VMCB_ALWAYS_DIRTY_MASK ; +} + +static inline void mark_dirty (struct vmcb *vmcb,int bit) +{ + vmcb->control.clean &= ~(1 << bit); +} +static inline struct vcpu_svm *to_svm (struct kvm_vcpu *vcpu) { return container_of(vcpu, struct vcpu_svm, vcpu);
@@ -973,6 +995,8 @@ static void init_vmcb(struct vcpu_svm *svm)set_intercept (svm,INTERCEPT_PAUSE ); } +mark_all_dirty (svm->vmcb); +enable_gif (svm); }
@@ -1089,6 +1113,7 @@ static void svm_vcpu_load(struct kvm_vcpu *vcpu, int cpu)if (unlikely (cpu != vcpu->cpu)) { svm->asid_generation =0 ; +mark_all_dirty (svm->vmcb); }#ifdef CONFIG_X86_64
@@ -2139,6 +2164,8 @@ static int nested_svm_vmexit(struct vcpu_svm *svm) svm->vmcb->save.cpl =0 ; svm->vmcb->control.exit_int_info =0 ; +mark_all_dirty (svm->vmcb); +nested_svm_unmap (page);nested_svm_uninit_mmu_context (&svm->vcpu);
@@ -2350,6 +2377,8 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm)enable_gif (svm); +mark_all_dirty (svm->vmcb); +return true; }
@@ -3487,6 +3516,8 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)if (unlikely (svm->vmcb->control.exit_code ==SVM_EXIT_EXCP_BASE +MC_VECTOR ))svm_handle_mce (svm); + +mark_all_clean (svm->vmcb); }#undef R
Signature · 8 lines
1.7.1 -- AMD Operating System Research Center Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach General Managers: Alberto Bozzo, Andrew Bowd Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632
PATCH 2/12 KVM: SVM: Add clean-bit for intercetps, tsc-offset and pause filter count
In reply to Joerg RoedelThis patch adds the clean-bit for intercepts-vectors, the TSC offset and the pause-filter count to the appropriate places. The IO and MSR permission bitmaps are not subject to this bit.
--- arch/x86/kvm/svm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
arch/x86/kvm/svm.c +7 -0
@@ -186,6 +186,8 @@ static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr, bool has_error_code, u32 error_code);enum { +VMCB_INTERCEPTS ,/* Intercept vectors, TSC offset, +pause filter count */ VMCB_DIRTY_MAX , };
@@ -217,6 +219,8 @@ static void recalc_intercepts(struct vcpu_svm *svm)struct vmcb_control_area *c, *h;struct nested_state *g; +mark_dirty (svm->vmcb,VMCB_INTERCEPTS ); +if (!is_guest_mode (&svm->vcpu))return ;
@@ -854,6 +858,8 @@ static void svm_write_tsc_offset(struct kvm_vcpu *vcpu, u64 offset) } svm->vmcb->control.tsc_offset = offset + g_tsc_offset; + +mark_dirty (svm->vmcb,VMCB_INTERCEPTS ); }static void svm_adjust_tsc_offset (struct kvm_vcpu *vcpu,s64 adjustment)
@@ -863,6 +869,7 @@ static void svm_adjust_tsc_offset(struct kvm_vcpu *vcpu, s64 adjustment) svm->vmcb->control.tsc_offset += adjustment;if (is_guest_mode (vcpu)) svm->nested.hsave->control.tsc_offset += adjustment; +mark_dirty (svm->vmcb,VMCB_INTERCEPTS ); }static void init_vmcb (struct vcpu_svm *svm)
Signature · 1 line
1.7.1
PATCH 3/12 KVM: SVM: Add clean-bit for IOPM_BASE and MSRPM_BASE
In reply to Joerg RoedelThis patch adds the clean bit for the physical addresses of the MSRPM and the IOPM. It does not need to be set in the code because the only place where these values are changed is the nested-svm vmrun and vmexit path. These functions already mark the complete VMCB as dirty.
--- arch/x86/kvm/svm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
arch/x86/kvm/svm.c +1 -0
@@ -188,6 +188,7 @@ static int nested_svm_check_exception(struct vcpu_svm *svm, unsigned nr,enum {VMCB_INTERCEPTS ,/* Intercept vectors, TSC offset, pause filter count */ +VMCB_PERM_MAP ,/* IOPM Base and MSRPM Base */ VMCB_DIRTY_MAX , };
Signature · 1 line
1.7.1
PATCH 4/12 KVM: SVM: Add clean-bit for the ASID
In reply to Joerg RoedelThis patch implements the clean-bit for the asid in the vmcb.
--- arch/x86/kvm/svm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/x86/kvm/svm.c +3 -0
@@ -189,6 +189,7 @@ enum {VMCB_INTERCEPTS ,/* Intercept vectors, TSC offset, pause filter count */ VMCB_PERM_MAP ,/* IOPM Base and MSRPM Base */ +VMCB_ASID ,/* ASID */ VMCB_DIRTY_MAX, };
@@ -1488,6 +1489,8 @@ static void new_asid(struct vcpu_svm *svm, struct svm_cpu_data *sd) svm->asid_generation = sd->asid_generation; svm->vmcb->control.asid = sd->next_asid++; + +mark_dirty (svm->vmcb,VMCB_ASID ); }static void svm_set_dr7 (struct kvm_vcpu *vcpu,unsigned long value)
Signature · 1 line
1.7.1
PATCH 5/12 KVM: SVM: Add clean-bit for interrupt state
In reply to Joerg RoedelThis patch implements the clean-bit for all interrupt related state in the vmcb. This corresponds to vmcb offset 0x60-0x67.
--- arch/x86/kvm/svm.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
arch/x86/kvm/svm.c +7 -1
@@ -190,10 +190,12 @@ enum {pause filter count */ VMCB_PERM_MAP ,/* IOPM Base and MSRPM Base */ VMCB_ASID ,/* ASID */ +VMCB_INTR ,/* int_ctl, int_vector */ VMCB_DIRTY_MAX, }; -#define VMCB_ALWAYS_DIRTY_MASK 0U +/* TPR is always written before VMRUN */ +#define VMCB_ALWAYS_DIRTY_MASK (1U << VMCB_INTR)static inline void mark_all_dirty (struct vmcb *vmcb) {
@@ -2507,6 +2509,8 @@ static int clgi_interception(struct vcpu_svm *svm)svm_clear_vintr (svm); svm->vmcb->control.int_ctl &= ~V_IRQ_MASK ; +mark_dirty (svm->vmcb,VMCB_INTR ); +return 1 ; }
@@ -2877,6 +2881,7 @@ static int interrupt_window_interception(struct vcpu_svm *svm)kvm_make_request (KVM_REQ_EVENT , &svm->vcpu);svm_clear_vintr (svm); svm->vmcb->control.int_ctl &= ~V_IRQ_MASK ; +mark_dirty (svm->vmcb,VMCB_INTR );/* * If the user space waits to inject interrupts, exit as soon as * possible
@@ -3168,6 +3173,7 @@ static inline void svm_inject_irq(struct vcpu_svm *svm, int irq) control->int_ctl &= ~V_INTR_PRIO_MASK ; control->int_ctl |=V_IRQ_MASK | ((/*control->int_vector >> 4*/ 0xf ) <<V_INTR_PRIO_SHIFT ); +mark_dirty (svm->vmcb,VMCB_INTR ); }static void svm_set_irq (struct kvm_vcpu *vcpu)
Signature · 1 line
1.7.1
Re: [PATCH 05/12] KVM: SVM: Add clean-bit for interrupt state
Quoted 5 lines · Joerg Roedel
This patch implements the clean-bit for all interrupt related state in the vmcb. This corresponds to vmcb offset 0x60-0x67.
Signed-off-by Joerg Roedel <[email protected]>
Don't you have to mark dirty on sync_lapic_to_cr8?
Re: [PATCH 05/12] KVM: SVM: Add clean-bit for interrupt state
Quoted 8 lines · Marcelo Tosatti
Quoted 5 lines · Joerg Roedel
This patch implements the clean-bit for all interrupt related state in the vmcb. This corresponds to vmcb offset 0x60-0x67.
Signed-off-by Joerg Roedel <[email protected]>Don't you have to mark dirty on
sync_lapic_to_cr8?
In theory yes, but sync_lapic_to_cr8 is called in every vmexit/vmrun cycle. Thats why I added the interrupt bit to the always-dirty mask. I left this as a future optimization to only write cr8 to the vmcb when it actually changes.
Joerg
PATCH 6/12 KVM: SVM: Add clean-bit for NPT state
In reply to Joerg RoedelThis patch implements the clean-bit for all nested paging related state in the vmcb.
--- arch/x86/kvm/svm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/x86/kvm/svm.c +3 -0
@@ -191,6 +191,7 @@ enum {VMCB_PERM_MAP ,/* IOPM Base and MSRPM Base */ VMCB_ASID ,/* ASID */ VMCB_INTR ,/* int_ctl, int_vector */ +VMCB_NPT ,/* npt_en, nCR3, gPAT */ VMCB_DIRTY_MAX, };
@@ -1749,6 +1750,7 @@ static void nested_svm_set_tdp_cr3(struct kvm_vcpu *vcpu,struct vcpu_svm *svm =to_svm (vcpu); svm->vmcb->control.nested_cr3 = root; +mark_dirty (svm->vmcb,VMCB_NPT );force_new_asid (vcpu); }
@@ -3552,6 +3554,7 @@ static void set_tdp_cr3(struct kvm_vcpu *vcpu, unsigned long root)struct vcpu_svm *svm =to_svm (vcpu); svm->vmcb->control.nested_cr3 = root; +mark_dirty (svm->vmcb,VMCB_NPT );/* Also sync guest cr3 here in case we live migrate */ svm->vmcb->save.cr3 = vcpu->arch.cr3;
Signature · 1 line
1.7.1
PATCH 7/12 KVM: SVM: Add clean-bit for control registers
In reply to Joerg RoedelThis patch implements the CRx clean-bit for the vmcb. This bit covers cr0, cr3, cr4, and efer.
--- arch/x86/kvm/svm.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
arch/x86/kvm/svm.c +7 -0
@@ -192,6 +192,7 @@ enum {VMCB_ASID ,/* ASID */ VMCB_INTR ,/* int_ctl, int_vector */ VMCB_NPT ,/* npt_en, nCR3, gPAT */ +VMCB_CR ,/* CR0, CR3, CR4, EFER */ VMCB_DIRTY_MAX, };
@@ -441,6 +442,7 @@ static void svm_set_efer(struct kvm_vcpu *vcpu, u64 efer) efer &= ~EFER_LME ;to_svm (vcpu)->vmcb->save.efer = efer |EFER_SVME ; +mark_dirty (to_svm (vcpu)->vmcb,VMCB_CR ); }static int is_external_interrupt (u32 info)
@@ -1338,6 +1340,7 @@ static void update_cr0_intercept(struct vcpu_svm *svm) *hcr0 = (*hcr0 & ~SVM_CR0_SELECTIVE_MASK ) | (gcr0 &SVM_CR0_SELECTIVE_MASK ); +mark_dirty (svm->vmcb,VMCB_CR );if (gcr0 == *hcr0 && svm->vcpu.fpu_active) {clr_cr_intercept (svm,INTERCEPT_CR0_READ );
@@ -1404,6 +1407,7 @@ static void svm_set_cr0(struct kvm_vcpu *vcpu, unsigned long cr0)*/ cr0 &= ~(X86_CR0_CD |X86_CR0_NW ); svm->vmcb->save.cr0 = cr0; +mark_dirty (svm->vmcb,VMCB_CR );update_cr0_intercept (svm); }
@@ -1420,6 +1424,7 @@ static void svm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) cr4 |=X86_CR4_PAE ; cr4 |= host_cr4_mce;to_svm (vcpu)->vmcb->save.cr4 = cr4; +mark_dirty (to_svm (vcpu)->vmcb,VMCB_CR ); } static void svm_set_segment(struct kvm_vcpu *vcpu,
@@ -3546,6 +3551,7 @@ static void svm_set_cr3(struct kvm_vcpu *vcpu, unsigned long root)struct vcpu_svm *svm =to_svm (vcpu); svm->vmcb->save.cr3 = root; +mark_dirty (svm->vmcb,VMCB_CR );force_new_asid (vcpu); }
@@ -3558,6 +3564,7 @@ static void set_tdp_cr3(struct kvm_vcpu *vcpu, unsigned long root)/* Also sync guest cr3 here in case we live migrate */ svm->vmcb->save.cr3 = vcpu->arch.cr3; +mark_dirty (svm->vmcb,VMCB_CR );force_new_asid (vcpu); }
Signature · 1 line
1.7.1
PATCH 8/12 KVM: SVM: Add clean-bit for DR6 and DR7
In reply to Joerg RoedelThis patch implements the clean-bit for the dr6 and dr7 debug registers in the vmcb.
--- arch/x86/kvm/svm.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
arch/x86/kvm/svm.c +4 -0
@@ -193,6 +193,7 @@ enum {VMCB_INTR ,/* int_ctl, int_vector */ VMCB_NPT ,/* npt_en, nCR3, gPAT */ VMCB_CR ,/* CR0, CR3, CR4, EFER */ +VMCB_DR ,/* DR6, DR7 */ VMCB_DIRTY_MAX, };
@@ -1484,6 +1485,8 @@ static void svm_guest_debug(struct kvm_vcpu *vcpu, struct kvm_guest_debug *dbg)else svm->vmcb->save.dr7 = vcpu->arch.dr7; +mark_dirty (svm->vmcb,VMCB_DR ); +update_db_intercept (vcpu); }
@@ -1506,6 +1509,7 @@ static void svm_set_dr7(struct kvm_vcpu *vcpu, unsigned long value)struct vcpu_svm *svm =to_svm (vcpu); svm->vmcb->save.dr7 = value; +mark_dirty (svm->vmcb,VMCB_DR ); }static int pf_interception (struct vcpu_svm *svm)
Signature · 1 line
1.7.1
PATCH 9/12 KVM: SVM: Add clean-bit for GDT and IDT
In reply to Joerg RoedelThis patch implements the clean-bit for the base and limit of the gdt and idt in the vmcb.
--- arch/x86/kvm/svm.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
arch/x86/kvm/svm.c +3 -0
@@ -194,6 +194,7 @@ enum {VMCB_NPT ,/* npt_en, nCR3, gPAT */ VMCB_CR ,/* CR0, CR3, CR4, EFER */ VMCB_DR ,/* DR6, DR7 */ +VMCB_DT ,/* GDT, IDT */ VMCB_DIRTY_MAX, };
@@ -1304,6 +1305,7 @@ static void svm_set_idt(struct kvm_vcpu *vcpu, struct desc_ptr *dt) svm->vmcb->save.idtr.limit = dt->size; svm->vmcb->save.idtr.base = dt->address ; +mark_dirty (svm->vmcb,VMCB_DT ); }static void svm_get_gdt (struct kvm_vcpu *vcpu,struct desc_ptr *dt)
@@ -1320,6 +1322,7 @@ static void svm_set_gdt(struct kvm_vcpu *vcpu, struct desc_ptr *dt) svm->vmcb->save.gdtr.limit = dt->size; svm->vmcb->save.gdtr.base = dt->address ; +mark_dirty (svm->vmcb,VMCB_DT ); }static void svm_decache_cr0_guest_bits (struct kvm_vcpu *vcpu)
Signature · 1 line
1.7.1
PATCH 10/12 KVM: SVM: Add clean-bit for Segements and CPL
In reply to Joerg RoedelThis patch implements the clean-bit defined for the cs, ds, ss, an es segemnts and the current cpl saved in the vmcb.
--- arch/x86/kvm/svm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/x86/kvm/svm.c +2 -0
@@ -195,6 +195,7 @@ enum {VMCB_CR ,/* CR0, CR3, CR4, EFER */ VMCB_DR ,/* DR6, DR7 */ VMCB_DT ,/* GDT, IDT */ +VMCB_SEG ,/* CS, DS, SS, ES, CPL */ VMCB_DIRTY_MAX, };
@@ -1457,6 +1458,7 @@ static void svm_set_segment(struct kvm_vcpu *vcpu, = (svm->vmcb->save.cs.attrib >>SVM_SELECTOR_DPL_SHIFT ) &3 ; +mark_dirty (svm->vmcb,VMCB_SEG ); }static void update_db_intercept (struct kvm_vcpu *vcpu)
Signature · 1 line
1.7.1
PATCH 11/12 KVM: SVM: Add clean-bit for CR2 register
In reply to Joerg RoedelThis patch implements the clean-bit for the cr2 register in the vmcb.
--- arch/x86/kvm/svm.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
arch/x86/kvm/svm.c +3 -2
@@ -196,11 +196,12 @@ enum {VMCB_DR ,/* DR6, DR7 */ VMCB_DT ,/* GDT, IDT */ VMCB_SEG ,/* CS, DS, SS, ES, CPL */ +VMCB_CR2 ,/* CR2 only */ VMCB_DIRTY_MAX, }; -/* TPR is always written before VMRUN */ -#define VMCB_ALWAYS_DIRTY_MASK (1U << VMCB_INTR) +/* TPR and CR2 are always written before VMRUN */ +#define VMCB_ALWAYS_DIRTY_MASK ((1U << VMCB_INTR) | (1U << VMCB_CR2))static inline void mark_all_dirty (struct vmcb *vmcb) {
Signature · 1 line
1.7.1
PATCH 12/12 KVM: SVM: Add clean-bit for LBR state
In reply to Joerg RoedelThis patch implements the clean-bit for all LBR related state. This includes the debugctl, br_from, br_to, last_excp_from, and last_excp_to msrs.
--- arch/x86/kvm/svm.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/x86/kvm/svm.c +2 -0
@@ -197,6 +197,7 @@ enum {VMCB_DT ,/* GDT, IDT */ VMCB_SEG ,/* CS, DS, SS, ES, CPL */ VMCB_CR2 ,/* CR2 only */ +VMCB_LBR ,/* DBGCTL, BR_FROM, BR_TO, LAST_EX_FROM, LAST_EX_TO */ VMCB_DIRTY_MAX, };
@@ -2846,6 +2847,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 data)return 1 ; svm->vmcb->save.dbgctl = data; +mark_dirty (svm->vmcb,VMCB_LBR );if (data & (1ULL <<0 ))svm_enable_lbrv (svm);else
Signature · 1 line
1.7.1
Quoted 27 lines · Joerg Roedel
Hi Avi, Hi Marcelo,
here is a patch-set which adds support for VMCB state caching to KVM. This is a new CPU feature where software can mark certain parts of the VMCB as unchanged since the last vmexit and the hardware can then avoid reloading these parts from memory.
The feature is implemented downwards-compatible in hardware, so a 0-bit means the state has changed and needs to be reloaded. This makes it possible to implement the bits without checking for the feature, as done in this patch-set (another reason is that the check is as expensive as clearing the bit). Processors which do not implement VMCB state caching just ignore these bits.
These patches were tested with multiple guests (Windows, Linux, also in parallel) and also with nested-svm.
The patches apply on-top of the intercept mask wrapping patch-set I sent earlier this week. Your feedback is appreciated.
Regards,
Joergarch/x86/include/asm/svm.h | 6 +++- arch/x86/kvm/svm.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletions(-)
Quoted 13 lines
Joerg Roedel (12):
KVM: SVM: Add clean-bits infrastructure code
KVM: SVM: Add clean-bit for intercetps, tsc-offset and pause filter count
KVM: SVM: Add clean-bit forIOPM_BASEandMSRPM_BASE
KVM: SVM: Add clean-bit for the ASID
KVM: SVM: Add clean-bit for interrupt state
KVM: SVM: Add clean-bit for NPT state
KVM: SVM: Add clean-bit for control registers
KVM: SVM: Add clean-bit for DR6 and DR7
KVM: SVM: Add clean-bit for GDT and IDT
KVM: SVM: Add clean-bit for Segements and CPL
KVM: SVM: Add clean-bit for CR2 register
KVM: SVM: Add clean-bit for LBR state
Wouldnt it be good to wrap assignment of field & dirty bit update in wrappers, for long term maintainability?
Looks good to me, except comment on patch 5.
Quoted 42 lines · Marcelo Tosatti
Quoted 27 lines · Joerg Roedel
Hi Avi, Hi Marcelo,
here is a patch-set which adds support for VMCB state caching to KVM. This is a new CPU feature where software can mark certain parts of the VMCB as unchanged since the last vmexit and the hardware can then avoid reloading these parts from memory.
The feature is implemented downwards-compatible in hardware, so a 0-bit means the state has changed and needs to be reloaded. This makes it possible to implement the bits without checking for the feature, as done in this patch-set (another reason is that the check is as expensive as clearing the bit). Processors which do not implement VMCB state caching just ignore these bits.
These patches were tested with multiple guests (Windows, Linux, also in parallel) and also with nested-svm.
The patches apply on-top of the intercept mask wrapping patch-set I sent earlier this week. Your feedback is appreciated.
Regards,
Joergarch/x86/include/asm/svm.h | 6 +++- arch/x86/kvm/svm.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 1 deletions(-)Quoted 13 lines
Joerg Roedel (12):
KVM: SVM: Add clean-bits infrastructure code
KVM: SVM: Add clean-bit for intercetps, tsc-offset and pause filter count
KVM: SVM: Add clean-bit forIOPM_BASEandMSRPM_BASE
KVM: SVM: Add clean-bit for the ASID
KVM: SVM: Add clean-bit for interrupt state
KVM: SVM: Add clean-bit for NPT state
KVM: SVM: Add clean-bit for control registers
KVM: SVM: Add clean-bit for DR6 and DR7
KVM: SVM: Add clean-bit for GDT and IDT
KVM: SVM: Add clean-bit for Segements and CPL
KVM: SVM: Add clean-bit for CR2 register
KVM: SVM: Add clean-bit for LBR state
Quoted 2 lines
Wouldnt it be good to wrap assignment of field & dirty bit update in wrappers, for long term maintainability?
Right. I did that for the intercept masks already. Most other stuff is also already wrapped. But there is certainly still room for improvement.
Joerg
Avi Kivity
AppliedQuoted 14 lines · Joerg Roedel
Hi Avi, Hi Marcelo,
here is a patch-set which adds support for VMCB state caching to KVM. This is a new CPU feature where software can mark certain parts of the VMCB as unchanged since the last vmexit and the hardware can then avoid reloading these parts from memory.
The feature is implemented downwards-compatible in hardware, so a 0-bit means the state has changed and needs to be reloaded. This makes it possible to implement the bits without checking for the feature, as done in this patch-set (another reason is that the check is as expensive as clearing the bit). Processors which do not implement VMCB state caching just ignore these bits.
Quoted 6 lines
These patches were tested with multiple guests (Windows, Linux, also in parallel) and also with nested-svm.
The patches apply on-top of the intercept mask wrapping patch-set I sent earlier this week. Your feedback is appreciated.
Applied, thanks.
Signature · 1 line
error compiling committee.c: too many arguments to function