This is a note to let you know that I've just added the patch titled
vfio/fsl-mc: Block calling interrupt handler without trigger
to the 6.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
vfio-fsl-mc-block-calling-interrupt-handler-without-trigger.patch
and it can be found in the queue-6.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 7447d911af699a15f8d050dfcb7c680a86f87012 Mon Sep 17 00:00:00 2001
From: Alex Williamson <alex.williamson@xxxxxxxxxx>
Date: Fri, 8 Mar 2024 16:05:28 -0700
Subject: vfio/fsl-mc: Block calling interrupt handler without trigger
From: Alex Williamson <alex.williamson@xxxxxxxxxx>
commit 7447d911af699a15f8d050dfcb7c680a86f87012 upstream.
The eventfd_ctx trigger pointer of the vfio_fsl_mc_irq object is
initially NULL and may become NULL if the user sets the trigger
eventfd to -1. The interrupt handler itself is guaranteed that
trigger is always valid between request_irq() and free_irq(), but
the loopback testing mechanisms to invoke the handler function
need to test the trigger. The triggering and setting ioctl paths
both make use of igate and are therefore mutually exclusive.
The vfio-fsl-mc driver does not make use of irqfds, nor does it
support any sort of masking operations, therefore unlike vfio-pci
and vfio-platform, the flow can remain essentially unchanged.
Cc: Diana Craciun <diana.craciun@xxxxxxxxxxx>
Cc: <stable@xxxxxxxxxxxxxxx>
Fixes: cc0ee20bd969 ("vfio/fsl-mc: trigger an interrupt via eventfd")
Reviewed-by: Kevin Tian <kevin.tian@xxxxxxxxx>
Reviewed-by: Eric Auger <eric.auger@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20240308230557.805580-8-alex.williamson@xxxxxxxxxx
Signed-off-by: Alex Williamson <alex.williamson@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--- a/drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c
+++ b/drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c
@@ -141,13 +141,14 @@ static int vfio_fsl_mc_set_irq_trigger(s
irq = &vdev->mc_irqs[index];
if (flags & VFIO_IRQ_SET_DATA_NONE) {
- vfio_fsl_mc_irq_handler(hwirq, irq);
+ if (irq->trigger)
+ eventfd_signal(irq->trigger);
} else if (flags & VFIO_IRQ_SET_DATA_BOOL) {
u8 trigger = *(u8 *)data;
- if (trigger)
- vfio_fsl_mc_irq_handler(hwirq, irq);
+ if (trigger && irq->trigger)
+ eventfd_signal(irq->trigger);
}
return 0;
Patches currently in stable-queue which might be from alex.williamson@xxxxxxxxxx are
queue-6.6/vfio-pci-create-persistent-intx-handler.patch
queue-6.6/vfio-fsl-mc-block-calling-interrupt-handler-without-trigger.patch
queue-6.6/vfio-platform-disable-virqfds-on-cleanup.patch
queue-6.6/vfio-pci-disable-auto-enable-of-exclusive-intx-irq.patch
queue-6.6/vfio-pci-lock-external-intx-masking-ops.patch
queue-6.6/vfio-introduce-interface-to-flush-virqfd-inject-workqueue.patch
queue-6.6/vfio-pds-always-clear-the-save-restore-fds-on-reset.patch
queue-6.6/vfio-platform-create-persistent-irq-handlers.patch
