Commit 8d14695f authored by Yang Zhang's avatar Yang Zhang Committed by Gleb Natapov
Browse files

x86, apicv: add virtual x2apic support 



basically to benefit from apicv, we need to enable virtualized x2apic mode.
Currently, we only enable it when guest is really using x2apic.

Also, clear MSR bitmap for corresponding x2apic MSRs when guest enabled x2apic:
0x800 - 0x8ff: no read intercept for apicv register virtualization,
               except APIC ID and TMCCT which need software's assistance to
               get right value.

Reviewed-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: default avatarKevin Tian <kevin.tian@intel.com>
Signed-off-by: default avatarYang Zhang <yang.z.zhang@Intel.com>
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
parent 83d4c286

arch/x86/include/asm/kvm_host.h

+1 −0
Original line number Diff line number Diff line
@@ -699,6 +699,7 @@ struct kvm_x86_ops { 
	void (*enable_nmi_window)(struct kvm_vcpu *vcpu);

	void (*enable_irq_window)(struct kvm_vcpu *vcpu);

	void (*update_cr8_intercept)(struct kvm_vcpu *vcpu, int tpr, int irr);

	void (*set_virtual_x2apic_mode)(struct kvm_vcpu *vcpu, bool set);

	int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);

	int (*get_tdp_level)(void);

	u64 (*get_mt_mask)(struct kvm_vcpu *vcpu, gfn_t gfn, bool is_mmio);

arch/x86/include/asm/vmx.h

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ 
#define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001

#define SECONDARY_EXEC_ENABLE_EPT               0x00000002

#define SECONDARY_EXEC_RDTSCP			0x00000008

#define SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE   0x00000010

#define SECONDARY_EXEC_ENABLE_VPID              0x00000020

#define SECONDARY_EXEC_WBINVD_EXITING		0x00000040

#define SECONDARY_EXEC_UNRESTRICTED_GUEST	0x00000080

arch/x86/kvm/lapic.c

+10 −9
Original line number Diff line number Diff line
@@ -140,11 +140,6 @@ static inline int apic_enabled(struct kvm_lapic *apic) 
	(LVT_MASK | APIC_MODE_MASK | APIC_INPUT_POLARITY | \

	 APIC_LVT_REMOTE_IRR | APIC_LVT_LEVEL_TRIGGER)



static inline int apic_x2apic_mode(struct kvm_lapic *apic)

{

	return apic->vcpu->arch.apic_base & X2APIC_ENABLE;

}



static inline int kvm_apic_id(struct kvm_lapic *apic)

{

	return (kvm_apic_get_reg(apic, APIC_ID) >> 24) & 0xff;
@@ -1303,6 +1298,7 @@ u64 kvm_lapic_get_cr8(struct kvm_vcpu *vcpu) 


void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value)

{

	u64 old_value = vcpu->arch.apic_base;

	struct kvm_lapic *apic = vcpu->arch.apic;



	if (!apic) {
@@ -1324,11 +1320,16 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) 
		value &= ~MSR_IA32_APICBASE_BSP;



	vcpu->arch.apic_base = value;

	if (apic_x2apic_mode(apic)) {

	if ((old_value ^ value) & X2APIC_ENABLE) {

		if (value & X2APIC_ENABLE) {

			u32 id = kvm_apic_id(apic);

			u32 ldr = ((id >> 4) << 16) | (1 << (id & 0xf));

			kvm_apic_set_ldr(apic, ldr);

			kvm_x86_ops->set_virtual_x2apic_mode(vcpu, true);

		} else

			kvm_x86_ops->set_virtual_x2apic_mode(vcpu, false);

	}



	apic->base_address = apic->vcpu->arch.apic_base &

			     MSR_IA32_APICBASE_BASE;

arch/x86/kvm/lapic.h

+5 −0
Original line number Diff line number Diff line
@@ -126,4 +126,9 @@ static inline int kvm_lapic_enabled(struct kvm_vcpu *vcpu) 
	return kvm_apic_present(vcpu) && kvm_apic_sw_enabled(vcpu->arch.apic);

}



static inline int apic_x2apic_mode(struct kvm_lapic *apic)

{

	return apic->vcpu->arch.apic_base & X2APIC_ENABLE;

}



#endif

arch/x86/kvm/svm.c

+6 −0
Original line number Diff line number Diff line
@@ -3571,6 +3571,11 @@ static void update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr) 
		set_cr_intercept(svm, INTERCEPT_CR8_WRITE);

}



static void svm_set_virtual_x2apic_mode(struct kvm_vcpu *vcpu, bool set)

{

	return;

}



static int svm_nmi_allowed(struct kvm_vcpu *vcpu)

{

	struct vcpu_svm *svm = to_svm(vcpu);
@@ -4290,6 +4295,7 @@ static struct kvm_x86_ops svm_x86_ops = { 
	.enable_nmi_window = enable_nmi_window,

	.enable_irq_window = enable_irq_window,

	.update_cr8_intercept = update_cr8_intercept,

	.set_virtual_x2apic_mode = svm_set_virtual_x2apic_mode,



	.set_tss_addr = svm_set_tss_addr,

	.get_tdp_level = get_npt_level,

CRA Git | Maintained and supported by SUSTech CRA and CCSE