@@ -56,8 +56,6 @@ struct vmci_guest_device {
5656
5757 bool exclusive_vectors ;
5858
59- struct tasklet_struct datagram_tasklet ;
60- struct tasklet_struct bm_tasklet ;
6159 struct wait_queue_head inout_wq ;
6260
6361 void * data_buffer ;
@@ -304,9 +302,8 @@ static int vmci_check_host_caps(struct pci_dev *pdev)
304302 * This function assumes that it has exclusive access to the data
305303 * in register(s) for the duration of the call.
306304 */
307- static void vmci_dispatch_dgs (unsigned long data )
305+ static void vmci_dispatch_dgs (struct vmci_guest_device * vmci_dev )
308306{
309- struct vmci_guest_device * vmci_dev = (struct vmci_guest_device * )data ;
310307 u8 * dg_in_buffer = vmci_dev -> data_buffer ;
311308 struct vmci_datagram * dg ;
312309 size_t dg_in_buffer_size = VMCI_MAX_DG_SIZE ;
@@ -465,10 +462,8 @@ static void vmci_dispatch_dgs(unsigned long data)
465462 * Scans the notification bitmap for raised flags, clears them
466463 * and handles the notifications.
467464 */
468- static void vmci_process_bitmap (unsigned long data )
465+ static void vmci_process_bitmap (struct vmci_guest_device * dev )
469466{
470- struct vmci_guest_device * dev = (struct vmci_guest_device * )data ;
471-
472467 if (!dev -> notification_bitmap ) {
473468 dev_dbg (dev -> dev , "No bitmap present in %s\n" , __func__ );
474469 return ;
@@ -486,13 +481,13 @@ static irqreturn_t vmci_interrupt(int irq, void *_dev)
486481 struct vmci_guest_device * dev = _dev ;
487482
488483 /*
489- * If we are using MSI-X with exclusive vectors then we simply schedule
490- * the datagram tasklet , since we know the interrupt was meant for us.
484+ * If we are using MSI-X with exclusive vectors then we simply call
485+ * vmci_dispatch_dgs() , since we know the interrupt was meant for us.
491486 * Otherwise we must read the ICR to determine what to do.
492487 */
493488
494489 if (dev -> exclusive_vectors ) {
495- tasklet_schedule ( & dev -> datagram_tasklet );
490+ vmci_dispatch_dgs ( dev );
496491 } else {
497492 unsigned int icr ;
498493
@@ -502,12 +497,12 @@ static irqreturn_t vmci_interrupt(int irq, void *_dev)
502497 return IRQ_NONE ;
503498
504499 if (icr & VMCI_ICR_DATAGRAM ) {
505- tasklet_schedule ( & dev -> datagram_tasklet );
500+ vmci_dispatch_dgs ( dev );
506501 icr &= ~VMCI_ICR_DATAGRAM ;
507502 }
508503
509504 if (icr & VMCI_ICR_NOTIFICATION ) {
510- tasklet_schedule ( & dev -> bm_tasklet );
505+ vmci_process_bitmap ( dev );
511506 icr &= ~VMCI_ICR_NOTIFICATION ;
512507 }
513508
@@ -536,7 +531,7 @@ static irqreturn_t vmci_interrupt_bm(int irq, void *_dev)
536531 struct vmci_guest_device * dev = _dev ;
537532
538533 /* For MSI-X we can just assume it was meant for us. */
539- tasklet_schedule ( & dev -> bm_tasklet );
534+ vmci_process_bitmap ( dev );
540535
541536 return IRQ_HANDLED ;
542537}
@@ -638,10 +633,6 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
638633 vmci_dev -> iobase = iobase ;
639634 vmci_dev -> mmio_base = mmio_base ;
640635
641- tasklet_init (& vmci_dev -> datagram_tasklet ,
642- vmci_dispatch_dgs , (unsigned long )vmci_dev );
643- tasklet_init (& vmci_dev -> bm_tasklet ,
644- vmci_process_bitmap , (unsigned long )vmci_dev );
645636 init_waitqueue_head (& vmci_dev -> inout_wq );
646637
647638 if (mmio_base != NULL ) {
@@ -808,8 +799,9 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
808799 * Request IRQ for legacy or MSI interrupts, or for first
809800 * MSI-X vector.
810801 */
811- error = request_irq (pci_irq_vector (pdev , 0 ), vmci_interrupt ,
812- IRQF_SHARED , KBUILD_MODNAME , vmci_dev );
802+ error = request_threaded_irq (pci_irq_vector (pdev , 0 ), NULL ,
803+ vmci_interrupt , IRQF_SHARED ,
804+ KBUILD_MODNAME , vmci_dev );
813805 if (error ) {
814806 dev_err (& pdev -> dev , "Irq %u in use: %d\n" ,
815807 pci_irq_vector (pdev , 0 ), error );
@@ -823,19 +815,21 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
823815 * between the vectors.
824816 */
825817 if (vmci_dev -> exclusive_vectors ) {
826- error = request_irq (pci_irq_vector (pdev , 1 ),
827- vmci_interrupt_bm , 0 , KBUILD_MODNAME ,
828- vmci_dev );
818+ error = request_threaded_irq (pci_irq_vector (pdev , 1 ), NULL ,
819+ vmci_interrupt_bm , 0 ,
820+ KBUILD_MODNAME , vmci_dev );
829821 if (error ) {
830822 dev_err (& pdev -> dev ,
831823 "Failed to allocate irq %u: %d\n" ,
832824 pci_irq_vector (pdev , 1 ), error );
833825 goto err_free_irq ;
834826 }
835827 if (caps_in_use & VMCI_CAPS_DMA_DATAGRAM ) {
836- error = request_irq (pci_irq_vector (pdev , 2 ),
837- vmci_interrupt_dma_datagram ,
838- 0 , KBUILD_MODNAME , vmci_dev );
828+ error = request_threaded_irq (pci_irq_vector (pdev , 2 ),
829+ NULL ,
830+ vmci_interrupt_dma_datagram ,
831+ 0 , KBUILD_MODNAME ,
832+ vmci_dev );
839833 if (error ) {
840834 dev_err (& pdev -> dev ,
841835 "Failed to allocate irq %u: %d\n" ,
@@ -871,8 +865,6 @@ static int vmci_guest_probe_device(struct pci_dev *pdev,
871865
872866err_free_irq :
873867 free_irq (pci_irq_vector (pdev , 0 ), vmci_dev );
874- tasklet_kill (& vmci_dev -> datagram_tasklet );
875- tasklet_kill (& vmci_dev -> bm_tasklet );
876868
877869err_disable_msi :
878870 pci_free_irq_vectors (pdev );
@@ -943,9 +935,6 @@ static void vmci_guest_remove_device(struct pci_dev *pdev)
943935 free_irq (pci_irq_vector (pdev , 0 ), vmci_dev );
944936 pci_free_irq_vectors (pdev );
945937
946- tasklet_kill (& vmci_dev -> datagram_tasklet );
947- tasklet_kill (& vmci_dev -> bm_tasklet );
948-
949938 if (vmci_dev -> notification_bitmap ) {
950939 /*
951940 * The device reset above cleared the bitmap state of the
0 commit comments