| Message ID | CAPm50aKYh-qXt_MmQvbSH6Tye=yxrwAp_x_jcJHh=8ZoA=1P_A@mail.gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] KVM: use unified srcu interface function | expand |
On 12/25/22 13:48, Hao Peng wrote: > From: Peng Hao <flyingpeng@tencent.com> > > kvm->irq_routing is protected by kvm->irq_srcu. > > Signed-off-by: Peng Hao <flyingpeng@tencent.com> Please use the same email to send your message from, for the author, and for the Signed-off-by. Perhaps you can do git config user.name "Peng Hao (Tencent)" git config user.email flyingpenghao@gmail.com ? This is a common set up for people that do not use the company email to write to mailing lists. Paolo > --- > virt/kvm/irqchip.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c > index 1e567d1f6d3d..d3ccfe922880 100644 > --- a/virt/kvm/irqchip.c > +++ b/virt/kvm/irqchip.c > @@ -18,6 +18,10 @@ > #include <linux/export.h> > #include <trace/events/kvm.h> > > +#define kvm_get_irq_routing(kvm) \ > + srcu_dereference_check((kvm)->irq_routing, &(kvm)->irq_srcu, \ > + lockdep_is_held(&(kvm)->irq_lock)) > + > int kvm_irq_map_gsi(struct kvm *kvm, > struct kvm_kernel_irq_routing_entry *entries, int gsi) > { > @@ -25,8 +29,7 @@ int kvm_irq_map_gsi(struct kvm *kvm, > struct kvm_kernel_irq_routing_entry *e; > int n = 0; > > - irq_rt = srcu_dereference_check(kvm->irq_routing, &kvm->irq_srcu, > - lockdep_is_held(&kvm->irq_lock)); > + irq_rt = kvm_get_irq_routing(kvm); > if (irq_rt && gsi < irq_rt->nr_rt_entries) { > hlist_for_each_entry(e, &irq_rt->map[gsi], link) { > entries[n] = *e; > @@ -216,7 +219,7 @@ int kvm_set_irq_routing(struct kvm *kvm, > } > > mutex_lock(&kvm->irq_lock); > - old = rcu_dereference_protected(kvm->irq_routing, 1); > + old = kvm_get_irq_routing(kvm); > rcu_assign_pointer(kvm->irq_routing, new); > kvm_irq_routing_update(kvm); > kvm_arch_irq_routing_update(kvm); > -- > 2.27.0
diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index 1e567d1f6d3d..d3ccfe922880 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -18,6 +18,10 @@ #include <linux/export.h> #include <trace/events/kvm.h> +#define kvm_get_irq_routing(kvm) \ + srcu_dereference_check((kvm)->irq_routing, &(kvm)->irq_srcu, \ + lockdep_is_held(&(kvm)->irq_lock)) + int kvm_irq_map_gsi(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *entries, int gsi) { @@ -25,8 +29,7 @@ int kvm_irq_map_gsi(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e; int n = 0; - irq_rt = srcu_dereference_check(kvm->irq_routing, &kvm->irq_srcu, - lockdep_is_held(&kvm->irq_lock)); + irq_rt = kvm_get_irq_routing(kvm); if (irq_rt && gsi < irq_rt->nr_rt_entries) { hlist_for_each_entry(e, &irq_rt->map[gsi], link) { entries[n] = *e; @@ -216,7 +219,7 @@ int kvm_set_irq_routing(struct kvm *kvm, } mutex_lock(&kvm->irq_lock); - old = rcu_dereference_protected(kvm->irq_routing, 1); + old = kvm_get_irq_routing(kvm); rcu_assign_pointer(kvm->irq_routing, new); kvm_irq_routing_update(kvm); kvm_arch_irq_routing_update(kvm);