kvm/irqchip: Speed up KVM_SET_GSI_ROUTING

When starting lots of dataplane devices the bootup takes very long on
Christian's s390 with irqfd patches. With larger setups he is even
able to trigger some timeouts in some components.  Turns out that the
KVM_SET_GSI_ROUTING ioctl takes very long (strace claims up to 0.1 sec)
when having multiple CPUs.  This is caused by the  synchronize_rcu and
the HZ=100 of s390.  By changing the code to use a private srcu we can
speed things up.  This patch reduces the boot time till mounting root
from 8 to 2 seconds on my s390 guest with 100 disks.

Uses of hlist_for_each_entry_rcu, hlist_add_head_rcu, hlist_del_init_rcu
are fine because they do not have lockdep checks (hlist_for_each_entry_rcu
uses rcu_dereference_raw rather than rcu_dereference, and write-sides
do not do rcu lockdep at all).

Note that we're hardly relying on the "sleepable" part of srcu.  We just
want SRCU's faster detection of grace periods.

Testing was done by Andrew Theurer using netperf tests STREAM, MAERTS
and RR.  The difference between results "before" and "after" the patch
has mean -0.2% and standard deviation 0.6%.  Using a paired t-test on the
data points says that there is a 2.5% probability that the patch is the
cause of the performance difference (rather than a random fluctuation).

(Restricting the t-test to RR, which is the most likely to be affected,
changes the numbers to respectively -0.3% mean, 0.7% stdev, and 8%
probability that the numbers actually say something about the patch.
The probability increases mostly because there are fewer data points).

Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> # s390
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

1 files changed, 16 insertions, 15 deletions

diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c
index 20dc9e4a8f6c..b43c275775cd 100644
--- a/virt/kvm/irqchip.c
+++ b/virt/kvm/irqchip.c
@@ -26,6 +26,7 @@
 
 #include <linux/kvm_host.h>
 #include <linux/slab.h>
+#include <linux/srcu.h>
 #include <linux/export.h>
 #include <trace/events/kvm.h>
 #include "irq.h"
@@ -33,19 +34,19 @@
 bool kvm_irq_has_notifier(struct kvm *kvm, unsigned irqchip, unsigned pin)
 {
         struct kvm_irq_ack_notifier *kian;
-        int gsi;
+        int gsi, idx;
 
-        rcu_read_lock();
-        gsi = rcu_dereference(kvm->irq_routing)->chip[irqchip][pin];
+        idx = srcu_read_lock(&kvm->irq_srcu);
+        gsi = srcu_dereference(kvm->irq_routing, &kvm->irq_srcu)->chip[irqchip][pin];
         if (gsi != -1)
                 hlist_for_each_entry_rcu(kian, &kvm->irq_ack_notifier_list,
                                          link)
                         if (kian->gsi == gsi) {
-                                rcu_read_unlock();
+                                srcu_read_unlock(&kvm->irq_srcu, idx);
                                 return true;
                         }
 
-        rcu_read_unlock();
+        srcu_read_unlock(&kvm->irq_srcu, idx);
 
         return false;
 }
@@ -54,18 +55,18 @@ EXPORT_SYMBOL_GPL(kvm_irq_has_notifier);
 void kvm_notify_acked_irq(struct kvm *kvm, unsigned irqchip, unsigned pin)
 {
         struct kvm_irq_ack_notifier *kian;
-        int gsi;
+        int gsi, idx;
 
         trace_kvm_ack_irq(irqchip, pin);
 
-        rcu_read_lock();
-        gsi = rcu_dereference(kvm->irq_routing)->chip[irqchip][pin];
+        idx = srcu_read_lock(&kvm->irq_srcu);
+        gsi = srcu_dereference(kvm->irq_routing, &kvm->irq_srcu)->chip[irqchip][pin];
         if (gsi != -1)
                 hlist_for_each_entry_rcu(kian, &kvm->irq_ack_notifier_list,
                                          link)
                         if (kian->gsi == gsi)
                                 kian->irq_acked(kian);
-        rcu_read_unlock();
+        srcu_read_unlock(&kvm->irq_srcu, idx);
 }
 
 void kvm_register_irq_ack_notifier(struct kvm *kvm,
@@ -85,7 +86,7 @@ void kvm_unregister_irq_ack_notifier(struct kvm *kvm,
         mutex_lock(&kvm->irq_lock);
         hlist_del_init_rcu(&kian->link);
         mutex_unlock(&kvm->irq_lock);
-        synchronize_rcu();
+        synchronize_srcu(&kvm->irq_srcu);
 #ifdef __KVM_HAVE_IOAPIC
         kvm_vcpu_request_scan_ioapic(kvm);
 #endif
@@ -115,7 +116,7 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level,
                 bool line_status)
 {
         struct kvm_kernel_irq_routing_entry *e, irq_set[KVM_NR_IRQCHIPS];
-        int ret = -1, i = 0;
+        int ret = -1, i = 0, idx;
         struct kvm_irq_routing_table *irq_rt;
 
         trace_kvm_set_irq(irq, level, irq_source_id);
@@ -124,12 +125,12 @@ int kvm_set_irq(struct kvm *kvm, int irq_source_id, u32 irq, int level,
          * IOAPIC.  So set the bit in both. The guest will ignore
          * writes to the unused one.
          */
-        rcu_read_lock();
-        irq_rt = rcu_dereference(kvm->irq_routing);
+        idx = srcu_read_lock(&kvm->irq_srcu);
+        irq_rt = srcu_dereference(kvm->irq_routing, &kvm->irq_srcu);
         if (irq < irq_rt->nr_rt_entries)
                 hlist_for_each_entry(e, &irq_rt->map[irq], link)
                         irq_set[i++] = *e;
-        rcu_read_unlock();
+        srcu_read_unlock(&kvm->irq_srcu, idx);
 
         while(i--) {
                 int r;
@@ -226,7 +227,7 @@ int kvm_set_irq_routing(struct kvm *kvm,
         kvm_irq_routing_update(kvm, new);
         mutex_unlock(&kvm->irq_lock);
 
-        synchronize_rcu();
+        synchronize_srcu_expedited(&kvm->irq_srcu);
 
         new = old;
         r = 0;