Skip to content

Commit fd92bd3

Browse files
Maxim Levitskysean-jc
authored andcommitted
KVM: SVM: switch to raw spinlock for svm->ir_list_lock
Use a raw spinlock for vcpu_svm.ir_list_lock as the lock can be taken during schedule() via kvm_sched_out() => __avic_vcpu_put(), and "normal" spinlocks are sleepable locks when PREEMPT_RT=y. This fixes the following lockdep warning: ============================= [ BUG: Invalid wait context ] 6.12.0-146.1640_2124176644.el10.x86_64+debug #1 Not tainted ----------------------------- qemu-kvm/38299 is trying to lock: ff11000239725600 (&svm->ir_list_lock){....}-{3:3}, at: __avic_vcpu_put+0xfd/0x300 [kvm_amd] other info that might help us debug this: context-{5:5} 2 locks held by qemu-kvm/38299: #0: ff11000239723ba8 (&vcpu->mutex){+.+.}-{4:4}, at: kvm_vcpu_ioctl+0x240/0xe00 [kvm] #1: ff11000b906056d8 (&rq->__lock){-.-.}-{2:2}, at: raw_spin_rq_lock_nested+0x2e/0x130 stack backtrace: CPU: 1 UID: 0 PID: 38299 Comm: qemu-kvm Kdump: loaded Not tainted 6.12.0-146.1640_2124176644.el10.x86_64+debug #1 PREEMPT(voluntary) Hardware name: AMD Corporation QUARTZ/QUARTZ, BIOS RQZ100AB 09/14/2023 Call Trace: <TASK> dump_stack_lvl+0x6f/0xb0 __lock_acquire+0x921/0xb80 lock_acquire.part.0+0xbe/0x270 _raw_spin_lock_irqsave+0x46/0x90 __avic_vcpu_put+0xfd/0x300 [kvm_amd] svm_vcpu_put+0xfa/0x130 [kvm_amd] kvm_arch_vcpu_put+0x48c/0x790 [kvm] kvm_sched_out+0x161/0x1c0 [kvm] prepare_task_switch+0x36b/0xf60 __schedule+0x4f7/0x1890 schedule+0xd4/0x260 xfer_to_guest_mode_handle_work+0x54/0xc0 vcpu_run+0x69a/0xa70 [kvm] kvm_arch_vcpu_ioctl_run+0xdc0/0x17e0 [kvm] kvm_vcpu_ioctl+0x39f/0xe00 [kvm] Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com> Link: https://patch.msgid.link/20251030194130.307900-1-mlevitsk@redhat.com [sean: massage changelog] Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent aaac099 commit fd92bd3

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

arch/x86/kvm/svm/avic.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ int avic_init_vcpu(struct vcpu_svm *svm)
788788
struct kvm_vcpu *vcpu = &svm->vcpu;
789789

790790
INIT_LIST_HEAD(&svm->ir_list);
791-
spin_lock_init(&svm->ir_list_lock);
791+
raw_spin_lock_init(&svm->ir_list_lock);
792792

793793
if (!enable_apicv || !irqchip_in_kernel(vcpu->kvm))
794794
return 0;
@@ -816,9 +816,9 @@ static void svm_ir_list_del(struct kvm_kernel_irqfd *irqfd)
816816
if (!vcpu)
817817
return;
818818

819-
spin_lock_irqsave(&to_svm(vcpu)->ir_list_lock, flags);
819+
raw_spin_lock_irqsave(&to_svm(vcpu)->ir_list_lock, flags);
820820
list_del(&irqfd->vcpu_list);
821-
spin_unlock_irqrestore(&to_svm(vcpu)->ir_list_lock, flags);
821+
raw_spin_unlock_irqrestore(&to_svm(vcpu)->ir_list_lock, flags);
822822
}
823823

824824
int avic_pi_update_irte(struct kvm_kernel_irqfd *irqfd, struct kvm *kvm,
@@ -855,7 +855,7 @@ int avic_pi_update_irte(struct kvm_kernel_irqfd *irqfd, struct kvm *kvm,
855855
* list of IRQs being posted to the vCPU, to ensure the IRTE
856856
* isn't programmed with stale pCPU/IsRunning information.
857857
*/
858-
guard(spinlock_irqsave)(&svm->ir_list_lock);
858+
guard(raw_spinlock_irqsave)(&svm->ir_list_lock);
859859

860860
/*
861861
* Update the target pCPU for IOMMU doorbells if the vCPU is
@@ -972,7 +972,7 @@ static void __avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu,
972972
* up-to-date entry information, or that this task will wait until
973973
* svm_ir_list_add() completes to set the new target pCPU.
974974
*/
975-
spin_lock_irqsave(&svm->ir_list_lock, flags);
975+
raw_spin_lock_irqsave(&svm->ir_list_lock, flags);
976976

977977
entry = svm->avic_physical_id_entry;
978978
WARN_ON_ONCE(entry & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK);
@@ -997,7 +997,7 @@ static void __avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu,
997997

998998
avic_update_iommu_vcpu_affinity(vcpu, h_physical_id, action);
999999

1000-
spin_unlock_irqrestore(&svm->ir_list_lock, flags);
1000+
raw_spin_unlock_irqrestore(&svm->ir_list_lock, flags);
10011001
}
10021002

10031003
void avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
@@ -1035,7 +1035,7 @@ static void __avic_vcpu_put(struct kvm_vcpu *vcpu, enum avic_vcpu_action action)
10351035
* or that this task will wait until svm_ir_list_add() completes to
10361036
* mark the vCPU as not running.
10371037
*/
1038-
spin_lock_irqsave(&svm->ir_list_lock, flags);
1038+
raw_spin_lock_irqsave(&svm->ir_list_lock, flags);
10391039

10401040
avic_update_iommu_vcpu_affinity(vcpu, -1, action);
10411041

@@ -1059,7 +1059,7 @@ static void __avic_vcpu_put(struct kvm_vcpu *vcpu, enum avic_vcpu_action action)
10591059

10601060
svm->avic_physical_id_entry = entry;
10611061

1062-
spin_unlock_irqrestore(&svm->ir_list_lock, flags);
1062+
raw_spin_unlock_irqrestore(&svm->ir_list_lock, flags);
10631063
}
10641064

10651065
void avic_vcpu_put(struct kvm_vcpu *vcpu)

arch/x86/kvm/svm/svm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@ struct vcpu_svm {
329329
* back into remapped mode).
330330
*/
331331
struct list_head ir_list;
332-
spinlock_t ir_list_lock;
332+
raw_spinlock_t ir_list_lock;
333333

334334
struct vcpu_sev_es_state sev_es;
335335

0 commit comments

Comments
 (0)