From: Alex Williamson <alex.williamson@redhat.com>
To: alex.williamson@redhat.com
Cc: kvm@vger.kernel.org, eric.auger@redhat.com, clg@redhat.com,
reinette.chatre@intel.com, linux-kernel@vger.kernel.org,
kevin.tian@intel.com
Subject: [PATCH 5/7] vfio/platform: Disable virqfds on cleanup
Date: Wed, 6 Mar 2024 14:14:40 -0700 [thread overview]
Message-ID: <20240306211445.1856768-6-alex.williamson@redhat.com> (raw)
In-Reply-To: <20240306211445.1856768-1-alex.williamson@redhat.com>
irqfds for mask and unmask that are not specifically disabled by the
user are leaked. Remove any irqfds during cleanup
Cc: Eric Auger <eric.auger@redhat.com>
Fixes: a7fa7c77cf15 ("vfio/platform: implement IRQ masking/unmasking via an eventfd")
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
drivers/vfio/platform/vfio_platform_irq.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/vfio/platform/vfio_platform_irq.c b/drivers/vfio/platform/vfio_platform_irq.c
index 61a1bfb68ac7..a311d70c695b 100644
--- a/drivers/vfio/platform/vfio_platform_irq.c
+++ b/drivers/vfio/platform/vfio_platform_irq.c
@@ -321,8 +321,13 @@ void vfio_platform_irq_cleanup(struct vfio_platform_device *vdev)
{
int i;
- for (i = 0; i < vdev->num_irqs; i++)
+ for (i = 0; i < vdev->num_irqs; i++) {
+ int hwirq = vdev->get_irq(vdev, i);
+
+ vfio_virqfd_disable(&vdev->irqs[i].mask);
+ vfio_virqfd_disable(&vdev->irqs[i].unmask);
vfio_set_trigger(vdev, i, -1, NULL);
+ }
vdev->num_irqs = 0;
kfree(vdev->irqs);
--
2.43.2
next prev parent reply other threads:[~2024-03-06 21:15 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 21:14 [PATCH 0/7] vfio: Interrupt eventfd hardening Alex Williamson
2024-03-06 21:14 ` [PATCH 1/7] vfio/pci: Disable auto-enable of exclusive INTx IRQ Alex Williamson
2024-03-07 8:28 ` Tian, Kevin
2024-03-07 20:17 ` Alex Williamson
2024-03-08 7:20 ` Tian, Kevin
2024-03-07 8:39 ` Tian, Kevin
2024-03-07 20:23 ` Alex Williamson
2024-03-08 7:23 ` Tian, Kevin
2024-03-08 17:03 ` Alex Williamson
2024-03-08 17:05 ` Jason Gunthorpe
2024-03-06 21:14 ` [PATCH 2/7] vfio/pci: Lock external INTx masking ops Alex Williamson
2024-03-07 8:37 ` Tian, Kevin
2024-03-07 20:21 ` Alex Williamson
2024-03-08 7:17 ` Tian, Kevin
2024-03-08 20:45 ` Reinette Chatre
2024-03-06 21:14 ` [PATCH 3/7] vfio: Introduce interface to flush virqfd inject workqueue Alex Williamson
2024-03-07 8:58 ` Tian, Kevin
2024-03-08 20:46 ` Reinette Chatre
2024-03-06 21:14 ` [PATCH 4/7] vfio/pci: Create persistent INTx handler Alex Williamson
2024-03-08 7:14 ` Tian, Kevin
2024-03-08 20:46 ` Reinette Chatre
2024-03-06 21:14 ` Alex Williamson [this message]
2024-03-08 7:16 ` [PATCH 5/7] vfio/platform: Disable virqfds on cleanup Tian, Kevin
2024-03-08 18:09 ` Alex Williamson
2024-03-06 21:14 ` [PATCH 6/7] vfio/platform: Create persistent IRQ handlers Alex Williamson
2024-03-06 21:14 ` [PATCH 7/7] vfio/fsl-mc: Block calling interrupt handler without trigger Alex Williamson
2024-03-07 15:21 ` kernel test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240306211445.1856768-6-alex.williamson@redhat.com \
--to=alex.williamson@redhat.com \
--cc=clg@redhat.com \
--cc=eric.auger@redhat.com \
--cc=kevin.tian@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=reinette.chatre@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®