Skip to content

Commit d583fbd

Browse files
maluka-dmytrobonzini
authored andcommitted
KVM: irqfd: Make resampler_list an RCU list
It is useful to be able to do read-only traversal of the list of all the registered irqfd resamplers without locking the resampler_lock mutex. In particular, we are going to traverse it to search for a resampler registered for the given irq of an irqchip, and that will be done with an irqchip spinlock (ioapic->lock) held, so it is undesirable to lock a mutex in this context. So turn this list into an RCU list. For protecting the read side, reuse kvm->irq_srcu which is already used for protecting a number of irq related things (kvm->irq_routing, irqfd->resampler->list, kvm->irq_ack_notifier_list, kvm->arch.mask_notifier_list). Signed-off-by: Dmytro Maluka <[email protected]> Message-Id: <[email protected]> Signed-off-by: Paolo Bonzini <[email protected]>
1 parent e5c972c commit d583fbd

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

include/linux/kvm_host.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,7 @@ struct kvm {
755755
struct {
756756
spinlock_t lock;
757757
struct list_head items;
758+
/* resampler_list update side is protected by resampler_lock. */
758759
struct list_head resampler_list;
759760
struct mutex resampler_lock;
760761
} irqfds;

include/linux/kvm_irqfd.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct kvm_kernel_irqfd_resampler {
3131
/*
3232
* Entry in list of kvm->irqfd.resampler_list. Use for sharing
3333
* resamplers among irqfds on the same gsi.
34-
* Accessed and modified under kvm->irqfds.resampler_lock
34+
* RCU list modified under kvm->irqfds.resampler_lock
3535
*/
3636
struct list_head link;
3737
};

virt/kvm/eventfd.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,12 @@ irqfd_resampler_shutdown(struct kvm_kernel_irqfd *irqfd)
9696
synchronize_srcu(&kvm->irq_srcu);
9797

9898
if (list_empty(&resampler->list)) {
99-
list_del(&resampler->link);
99+
list_del_rcu(&resampler->link);
100100
kvm_unregister_irq_ack_notifier(kvm, &resampler->notifier);
101+
/*
102+
* synchronize_srcu(&kvm->irq_srcu) already called
103+
* in kvm_unregister_irq_ack_notifier().
104+
*/
101105
kvm_set_irq(kvm, KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID,
102106
resampler->notifier.gsi, 0, false);
103107
kfree(resampler);
@@ -369,7 +373,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
369373
resampler->notifier.irq_acked = irqfd_resampler_ack;
370374
INIT_LIST_HEAD(&resampler->link);
371375

372-
list_add(&resampler->link, &kvm->irqfds.resampler_list);
376+
list_add_rcu(&resampler->link, &kvm->irqfds.resampler_list);
373377
kvm_register_irq_ack_notifier(kvm,
374378
&resampler->notifier);
375379
irqfd->resampler = resampler;

0 commit comments

Comments
 (0)