diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2012-12-01 09:46:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 14:39:15 -0500 |
commit | b0209501dc7586cbfbf6d023f2dd3ce4621aff2c (patch) | |
tree | 2918b365f599b25540f966cc763ea6bc11eda770 /drivers/hv | |
parent | db11f12a11c9f04d504510e1cc20775209b0e509 (diff) |
Drivers: hv: Handle vmbus interrupts concurrently on all cpus
Vmbus interrupts are unique in that while the interrupt is delivered on a
given vector, these can be handled concurrently on different CPUs. Handle the
vmbus interrupts concurrently on all the CPUs.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hv')
-rw-r--r-- | drivers/hv/hv.c | 2 | ||||
-rw-r--r-- | drivers/hv/vmbus_drv.c | 21 |
2 files changed, 22 insertions, 1 deletions
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c index 363532add4c7..03e6a1eb1145 100644 --- a/drivers/hv/hv.c +++ b/drivers/hv/hv.c | |||
@@ -335,7 +335,7 @@ void hv_synic_init(void *irqarg) | |||
335 | shared_sint.as_uint64 = 0; | 335 | shared_sint.as_uint64 = 0; |
336 | shared_sint.vector = irq_vector; /* HV_SHARED_SINT_IDT_VECTOR + 0x20; */ | 336 | shared_sint.vector = irq_vector; /* HV_SHARED_SINT_IDT_VECTOR + 0x20; */ |
337 | shared_sint.masked = false; | 337 | shared_sint.masked = false; |
338 | shared_sint.auto_eoi = false; | 338 | shared_sint.auto_eoi = true; |
339 | 339 | ||
340 | wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64); | 340 | wrmsrl(HV_X64_MSR_SINT0 + VMBUS_MESSAGE_SINT, shared_sint.as_uint64); |
341 | 341 | ||
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index 6e4f85720f26..e066d418be97 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c | |||
@@ -33,6 +33,7 @@ | |||
33 | #include <acpi/acpi_bus.h> | 33 | #include <acpi/acpi_bus.h> |
34 | #include <linux/completion.h> | 34 | #include <linux/completion.h> |
35 | #include <linux/hyperv.h> | 35 | #include <linux/hyperv.h> |
36 | #include <linux/kernel_stat.h> | ||
36 | #include <asm/hyperv.h> | 37 | #include <asm/hyperv.h> |
37 | #include <asm/hypervisor.h> | 38 | #include <asm/hypervisor.h> |
38 | #include "hyperv_vmbus.h" | 39 | #include "hyperv_vmbus.h" |
@@ -501,6 +502,19 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id) | |||
501 | } | 502 | } |
502 | 503 | ||
503 | /* | 504 | /* |
505 | * vmbus interrupt flow handler: | ||
506 | * vmbus interrupts can concurrently occur on multiple CPUs and | ||
507 | * can be handled concurrently. | ||
508 | */ | ||
509 | |||
510 | void vmbus_flow_handler(unsigned int irq, struct irq_desc *desc) | ||
511 | { | ||
512 | kstat_incr_irqs_this_cpu(irq, desc); | ||
513 | |||
514 | desc->action->handler(irq, desc->action->dev_id); | ||
515 | } | ||
516 | |||
517 | /* | ||
504 | * vmbus_bus_init -Main vmbus driver initialization routine. | 518 | * vmbus_bus_init -Main vmbus driver initialization routine. |
505 | * | 519 | * |
506 | * Here, we | 520 | * Here, we |
@@ -535,6 +549,13 @@ static int vmbus_bus_init(int irq) | |||
535 | goto err_unregister; | 549 | goto err_unregister; |
536 | } | 550 | } |
537 | 551 | ||
552 | /* | ||
553 | * Vmbus interrupts can be handled concurrently on | ||
554 | * different CPUs. Establish an appropriate interrupt flow | ||
555 | * handler that can support this model. | ||
556 | */ | ||
557 | irq_set_handler(irq, vmbus_flow_handler); | ||
558 | |||
538 | vector = IRQ0_VECTOR + irq; | 559 | vector = IRQ0_VECTOR + irq; |
539 | 560 | ||
540 | /* | 561 | /* |