Skip to content

Commit 95d50eb

Browse files
committed
iommu/amd: KVM: SVM: Pass NULL @vcpu_info to indicate "not guest mode"
Pass NULL to amd_ir_set_vcpu_affinity() to communicate "don't post to a vCPU" now that there's no need to communicate information back to KVM about the previous vCPU (KVM does its own tracking). Tested-by: Sairaj Kodilkar <sarunkod@amd.com> Link: https://lore.kernel.org/r/20250611224604.313496-24-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent c4cdbaf commit 95d50eb

File tree

2 files changed

+11
-15
lines changed

2 files changed

+11
-15
lines changed

arch/x86/kvm/svm/avic.c

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -928,18 +928,10 @@ int avic_pi_update_irte(struct kvm_kernel_irqfd *irqfd, struct kvm *kvm,
928928
}
929929
}
930930

931-
ret = 0;
932-
if (enable_remapped_mode) {
933-
/* Use legacy mode in IRTE */
934-
struct amd_iommu_pi_data pi;
935-
936-
/**
937-
* Here, pi is used to:
938-
* - Tell IOMMU to use legacy mode for this interrupt.
939-
*/
940-
pi.is_guest_mode = false;
941-
ret = irq_set_vcpu_affinity(host_irq, &pi);
942-
}
931+
if (enable_remapped_mode)
932+
ret = irq_set_vcpu_affinity(host_irq, NULL);
933+
else
934+
ret = 0;
943935
out:
944936
srcu_read_unlock(&kvm->irq_srcu, idx);
945937
return ret;

drivers/iommu/amd/iommu.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3864,7 +3864,6 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)
38643864
{
38653865
int ret;
38663866
struct amd_iommu_pi_data *pi_data = vcpu_info;
3867-
struct vcpu_data *vcpu_pi_info = pi_data->vcpu_data;
38683867
struct amd_ir_data *ir_data = data->chip_data;
38693868
struct irq_2_irte *irte_info = &ir_data->irq_2_irte;
38703869
struct iommu_dev_data *dev_data;
@@ -3885,9 +3884,14 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)
38853884
return -EINVAL;
38863885

38873886
ir_data->cfg = irqd_cfg(data);
3888-
pi_data->ir_data = ir_data;
38893887

3890-
if (pi_data->is_guest_mode) {
3888+
if (pi_data) {
3889+
struct vcpu_data *vcpu_pi_info = pi_data->vcpu_data;
3890+
3891+
pi_data->ir_data = ir_data;
3892+
3893+
WARN_ON_ONCE(!pi_data->is_guest_mode);
3894+
38913895
ir_data->ga_root_ptr = (vcpu_pi_info->pi_desc_addr >> 12);
38923896
ir_data->ga_vector = vcpu_pi_info->vector;
38933897
ir_data->ga_tag = pi_data->ga_tag;

0 commit comments

Comments
 (0)