Browse Source

random: add interrupt callback to VMBus IRQ handler

The Hyper-V Linux Integration Services use the VMBus implementation for
communication with the Hypervisor. VMBus registers its own interrupt
handler that completely bypasses the common Linux interrupt handling.
This implies that the interrupt entropy collector is not triggered.

This patch adds the interrupt entropy collection callback into the VMBus
interrupt handler function.

Cc: stable@kernel.org
Signed-off-by: Stephan Mueller <stephan.mueller@atsec.com>
Signed-off-by: Stephan Mueller <smueller@chronox.de>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Stephan Mueller 9 years ago
parent
commit
4b44f2d18a
2 changed files with 4 additions and 0 deletions
  1. 1 0
      drivers/char/random.c
  2. 3 0
      drivers/hv/vmbus_drv.c

+ 1 - 0
drivers/char/random.c

@@ -946,6 +946,7 @@ void add_interrupt_randomness(int irq, int irq_flags)
 	/* award one bit for the contents of the fast pool */
 	/* award one bit for the contents of the fast pool */
 	credit_entropy_bits(r, credit + 1);
 	credit_entropy_bits(r, credit + 1);
 }
 }
+EXPORT_SYMBOL_GPL(add_interrupt_randomness);
 
 
 #ifdef CONFIG_BLOCK
 #ifdef CONFIG_BLOCK
 void add_disk_randomness(struct gendisk *disk)
 void add_disk_randomness(struct gendisk *disk)

+ 3 - 0
drivers/hv/vmbus_drv.c

@@ -42,6 +42,7 @@
 #include <linux/screen_info.h>
 #include <linux/screen_info.h>
 #include <linux/kdebug.h>
 #include <linux/kdebug.h>
 #include <linux/efi.h>
 #include <linux/efi.h>
+#include <linux/random.h>
 #include "hyperv_vmbus.h"
 #include "hyperv_vmbus.h"
 
 
 static struct acpi_device  *hv_acpi_dev;
 static struct acpi_device  *hv_acpi_dev;
@@ -806,6 +807,8 @@ static void vmbus_isr(void)
 		else
 		else
 			tasklet_schedule(hv_context.msg_dpc[cpu]);
 			tasklet_schedule(hv_context.msg_dpc[cpu]);
 	}
 	}
+
+	add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0);
 }
 }