Re: [PATCH 1/4] KVM: TDX: Move apicv_pre_state_restore to posted_intr.c

Binbin Wu
2025-03-14T02:36:48Z

On 3/14/2025 3:30 AM, Vishal Verma wrote:
> In preparation for a cleanup of the x86_ops struct for TDX, which turns
> several of the ops definitions to macros, move the
> vt_apicv_pre_state_restore() helper into posted_intr.c.
>
> Based on a patch by Sean Christopherson <seanjc@google.com>
>
> Link: https://lore.kernel.org/kvm/Z6v9yjWLNTU6X90d@google.com/
> Cc: Sean Christopherson <seanjc@google.com>
> Cc: Rick Edgecombe <rick.p.edgecombe@intel.com>
> Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>

Reviewed-by: Binbin Wu <binbin.wu@linxu.intel.com>

> ---
> arch/x86/kvm/vmx/posted_intr.h | 1 +
> arch/x86/kvm/vmx/main.c | 10 +---------
> arch/x86/kvm/vmx/posted_intr.c | 8 ++++++++
> 3 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/kvm/vmx/posted_intr.h b/arch/x86/kvm/vmx/posted_intr.h
> index 68605ca7ef68..9d0677a2ba0e 100644
> --- a/arch/x86/kvm/vmx/posted_intr.h
> +++ b/arch/x86/kvm/vmx/posted_intr.h
> @@ -11,6 +11,7 @@ void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu);
> void vmx_vcpu_pi_put(struct kvm_vcpu *vcpu);
> void pi_wakeup_handler(void);
> void __init pi_init_cpu(int cpu);
> +void pi_apicv_pre_state_restore(struct kvm_vcpu *vcpu);
> bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu);
> int vmx_pi_update_irte(struct kvm *kvm, unsigned int host_irq,
> uint32_t guest_irq, bool set);
> diff --git a/arch/x86/kvm/vmx/main.c b/arch/x86/kvm/vmx/main.c
> index 320c96e1e80a..9d201ddb794a 100644
> --- a/arch/x86/kvm/vmx/main.c
> +++ b/arch/x86/kvm/vmx/main.c
> @@ -315,14 +315,6 @@ static void vt_set_virtual_apic_mode(struct kvm_vcpu *vcpu)
> return vmx_set_virtual_apic_mode(vcpu);
> }
>
> -static void vt_apicv_pre_state_restore(struct kvm_vcpu *vcpu)
> -{
> - struct pi_desc *pi = vcpu_to_pi_desc(vcpu);
> -
> - pi_clear_on(pi);
> - memset(pi->pir, 0, sizeof(pi->pir));
> -}
> -
> static void vt_hwapic_isr_update(struct kvm_vcpu *vcpu, int max_isr)
> {
> if (is_td_vcpu(vcpu))
> @@ -983,7 +975,7 @@ struct kvm_x86_ops vt_x86_ops __initdata = {
> .set_apic_access_page_addr = vt_set_apic_access_page_addr,
> .refresh_apicv_exec_ctrl = vt_refresh_apicv_exec_ctrl,
> .load_eoi_exitmap = vt_load_eoi_exitmap,
> - .apicv_pre_state_restore = vt_apicv_pre_state_restore,
> + .apicv_pre_state_restore = pi_apicv_pre_state_restore,
> .required_apicv_inhibits = VMX_REQUIRED_APICV_INHIBITS,
> .hwapic_isr_update = vt_hwapic_isr_update,
> .sync_pir_to_irr = vt_sync_pir_to_irr,
> diff --git a/arch/x86/kvm/vmx/posted_intr.c b/arch/x86/kvm/vmx/posted_intr.c
> index f2ca37b3f606..a140af060bb8 100644
> --- a/arch/x86/kvm/vmx/posted_intr.c
> +++ b/arch/x86/kvm/vmx/posted_intr.c
> @@ -241,6 +241,14 @@ void __init pi_init_cpu(int cpu)
> raw_spin_lock_init(&per_cpu(wakeup_vcpus_on_cpu_lock, cpu));
> }
>
> +void pi_apicv_pre_state_restore(struct kvm_vcpu *vcpu)
> +{
> + struct pi_desc *pi = vcpu_to_pi_desc(vcpu);
> +
> + pi_clear_on(pi);
> + memset(pi->pir, 0, sizeof(pi->pir));
> +}
> +
> bool pi_has_pending_interrupt(struct kvm_vcpu *vcpu)
> {
> struct pi_desc *pi_desc = vcpu_to_pi_desc(vcpu);
>