2024-05-06 06:40:47

by Hou Wenlong

Subject: [PATCH] KVM: x86: Drop unused check_apicv_inhibit_reasons() callback definition

The check_apicv_inhibit_reasons() callback implementation was dropped in
the commit b3f257a84696 ("KVM: x86: Track required APICv inhibits with
variable, not callback"), but the definition removal was missed in the
final version patch (it was removed in the v4). Therefore, it should be
dropped, and the vmx_check_apicv_inhibit_reasons() function declaration
should also be removed.

Signed-off-by: Hou Wenlong <[email protected]>
---
arch/x86/include/asm/kvm_host.h | 1 -
arch/x86/kvm/vmx/x86_ops.h | 1 -
2 files changed, 2 deletions(-)

diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 1d13e3cd1dc5..a10d7f75c126 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -1702,7 +1702,6 @@ 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);
- 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);
diff --git a/arch/x86/kvm/vmx/x86_ops.h b/arch/x86/kvm/vmx/x86_ops.h
index 502704596c83..4cea42bcb11f 100644
--- a/arch/x86/kvm/vmx/x86_ops.h
+++ b/arch/x86/kvm/vmx/x86_ops.h
@@ -46,7 +46,6 @@ bool vmx_apic_init_signal_blocked(struct kvm_vcpu *vcpu);
void vmx_migrate_timers(struct kvm_vcpu *vcpu);
void vmx_set_virtual_apic_mode(struct kvm_vcpu *vcpu);
void vmx_apicv_pre_state_restore(struct kvm_vcpu *vcpu);
-bool vmx_check_apicv_inhibit_reasons(enum kvm_apicv_inhibit reason);
void vmx_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr);
void vmx_hwapic_isr_update(int max_isr);
bool vmx_guest_apic_has_interrupt(struct kvm_vcpu *vcpu);
--
2.31.1

2024-05-21 16:58:28

by Alejandro Jimenez

Subject: Re: [PATCH] KVM: x86: Drop unused check_apicv_inhibit_reasons() callback definition

On 5/6/24 02:35, Hou Wenlong wrote:
> The check_apicv_inhibit_reasons() callback implementation was dropped in
> the commit b3f257a84696 ("KVM: x86: Track required APICv inhibits with
> variable, not callback"), but the definition removal was missed in the
> final version patch (it was removed in the v4). Therefore, it should be
> dropped, and the vmx_check_apicv_inhibit_reasons() function declaration
> should also be removed.
>
> Signed-off-by: Hou Wenlong <[email protected]>

Reviewed-by: Alejandro Jimenez <[email protected]>

> ---
> arch/x86/include/asm/kvm_host.h | 1 -
> arch/x86/kvm/vmx/x86_ops.h | 1 -
> 2 files changed, 2 deletions(-)
>
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index 1d13e3cd1dc5..a10d7f75c126 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -1702,7 +1702,6 @@ 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);
> - 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);
> diff --git a/arch/x86/kvm/vmx/x86_ops.h b/arch/x86/kvm/vmx/x86_ops.h
> index 502704596c83..4cea42bcb11f 100644
> --- a/arch/x86/kvm/vmx/x86_ops.h
> +++ b/arch/x86/kvm/vmx/x86_ops.h
> @@ -46,7 +46,6 @@ bool vmx_apic_init_signal_blocked(struct kvm_vcpu *vcpu);
> void vmx_migrate_timers(struct kvm_vcpu *vcpu);
> void vmx_set_virtual_apic_mode(struct kvm_vcpu *vcpu);
> void vmx_apicv_pre_state_restore(struct kvm_vcpu *vcpu);
> -bool vmx_check_apicv_inhibit_reasons(enum kvm_apicv_inhibit reason);
> void vmx_hwapic_irr_update(struct kvm_vcpu *vcpu, int max_irr);
> void vmx_hwapic_isr_update(int max_isr);
> bool vmx_guest_apic_has_interrupt(struct kvm_vcpu *vcpu);

2024-06-12 01:20:25

by Sean Christopherson

Subject: Re: [PATCH] KVM: x86: Drop unused check_apicv_inhibit_reasons() callback definition

On Mon, 06 May 2024 14:35:02 +0800, Hou Wenlong wrote:
> The check_apicv_inhibit_reasons() callback implementation was dropped in
> the commit b3f257a84696 ("KVM: x86: Track required APICv inhibits with
> variable, not callback"), but the definition removal was missed in the
> final version patch (it was removed in the v4). Therefore, it should be
> dropped, and the vmx_check_apicv_inhibit_reasons() function declaration
> should also be removed.
>
> [...]

Applied to kvm-x86 misc, thanks!

[1/1] KVM: x86: Drop unused check_apicv_inhibit_reasons() callback definition
https://github.com/kvm-x86/linux/commit/c7d4c5f01961

--
https://github.com/kvm-x86/linux/tree/next