Commit b3f257a8 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Track required APICv inhibits with variable, not callback 



Track the per-vendor required APICv inhibits with a variable instead of
calling into vendor code every time KVM wants to query the set of
required inhibits.  The required inhibits are a property of the vendor's
virtualization architecture, i.e. are 100% static.

Using a variable allows the compiler to inline the check, e.g. generate
a single-uop TEST+Jcc, and thus eliminates any desire to avoid checking
inhibits for performance reasons.

No functional change intended.

Reviewed-by: default avatarMaxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20230106011306.85230-32-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e2ed3e64

arch/x86/include/asm/kvm-x86-ops.h

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ KVM_X86_OP(set_nmi_mask) 
KVM_X86_OP(enable_nmi_window)

KVM_X86_OP(enable_irq_window)

KVM_X86_OP_OPTIONAL(update_cr8_intercept)

KVM_X86_OP(check_apicv_inhibit_reasons)

KVM_X86_OP(refresh_apicv_exec_ctrl)

KVM_X86_OP_OPTIONAL(hwapic_irr_update)

KVM_X86_OP_OPTIONAL(hwapic_isr_update)

arch/x86/include/asm/kvm_host.h

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

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

	bool (*check_apicv_inhibit_reasons)(enum kvm_apicv_inhibit reason);

	const unsigned long required_apicv_inhibits;

	bool allow_apicv_in_x2apic_without_x2apic_virtualization;

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

	void (*hwapic_irr_update)(struct kvm_vcpu *vcpu, int max_irr);

arch/x86/kvm/svm/avic.c

+0 −19
Original line number Diff line number Diff line
@@ -963,25 +963,6 @@ int avic_pi_update_irte(struct kvm *kvm, unsigned int host_irq, 
	return ret;

}



bool avic_check_apicv_inhibit_reasons(enum kvm_apicv_inhibit reason)

{

	ulong supported = BIT(APICV_INHIBIT_REASON_DISABLE) |

			  BIT(APICV_INHIBIT_REASON_ABSENT) |

			  BIT(APICV_INHIBIT_REASON_HYPERV) |

			  BIT(APICV_INHIBIT_REASON_NESTED) |

			  BIT(APICV_INHIBIT_REASON_IRQWIN) |

			  BIT(APICV_INHIBIT_REASON_PIT_REINJ) |

			  BIT(APICV_INHIBIT_REASON_BLOCKIRQ) |

			  BIT(APICV_INHIBIT_REASON_SEV)      |

			  BIT(APICV_INHIBIT_REASON_PHYSICAL_ID_ALIASED) |

			  BIT(APICV_INHIBIT_REASON_APIC_ID_MODIFIED) |

			  BIT(APICV_INHIBIT_REASON_APIC_BASE_MODIFIED) |

			  BIT(APICV_INHIBIT_REASON_LOGICAL_ID_ALIASED);



	return supported & BIT(reason);

}





static inline int

avic_update_iommu_vcpu_affinity(struct kvm_vcpu *vcpu, int cpu, bool r)

{

arch/x86/kvm/svm/svm.c

+1 −1
Original line number Diff line number Diff line
@@ -4773,8 +4773,8 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { 
	.update_cr8_intercept = svm_update_cr8_intercept,

	.set_virtual_apic_mode = avic_refresh_virtual_apic_mode,

	.refresh_apicv_exec_ctrl = avic_refresh_apicv_exec_ctrl,

	.check_apicv_inhibit_reasons = avic_check_apicv_inhibit_reasons,

	.apicv_post_state_restore = avic_apicv_post_state_restore,

	.required_apicv_inhibits = AVIC_REQUIRED_APICV_INHIBITS,



	.get_exit_info = svm_get_exit_info,

arch/x86/kvm/svm/svm.h

+15 −1
Original line number Diff line number Diff line
@@ -621,6 +621,21 @@ void svm_switch_vmcb(struct vcpu_svm *svm, struct kvm_vmcb_info *target_vmcb); 
extern struct kvm_x86_nested_ops svm_nested_ops;



/* avic.c */

#define AVIC_REQUIRED_APICV_INHIBITS			\

(							\

	BIT(APICV_INHIBIT_REASON_DISABLE) |		\

	BIT(APICV_INHIBIT_REASON_ABSENT) |		\

	BIT(APICV_INHIBIT_REASON_HYPERV) |		\

	BIT(APICV_INHIBIT_REASON_NESTED) |		\

	BIT(APICV_INHIBIT_REASON_IRQWIN) |		\

	BIT(APICV_INHIBIT_REASON_PIT_REINJ) |		\

	BIT(APICV_INHIBIT_REASON_BLOCKIRQ) |		\

	BIT(APICV_INHIBIT_REASON_SEV)      |		\

	BIT(APICV_INHIBIT_REASON_PHYSICAL_ID_ALIASED) |	\

	BIT(APICV_INHIBIT_REASON_APIC_ID_MODIFIED) |	\

	BIT(APICV_INHIBIT_REASON_APIC_BASE_MODIFIED) |	\

	BIT(APICV_INHIBIT_REASON_LOGICAL_ID_ALIASED)	\

)



bool avic_hardware_setup(struct kvm_x86_ops *ops);

int avic_ga_log_notifier(u32 ga_tag);
@@ -634,7 +649,6 @@ void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu); 
void avic_vcpu_put(struct kvm_vcpu *vcpu);

void avic_apicv_post_state_restore(struct kvm_vcpu *vcpu);

void avic_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu);

bool avic_check_apicv_inhibit_reasons(enum kvm_apicv_inhibit reason);

int avic_pi_update_irte(struct kvm *kvm, unsigned int host_irq,

			uint32_t guest_irq, bool set);

void avic_vcpu_blocking(struct kvm_vcpu *vcpu);