From: Alex Williamson <alex.williamson@redhat.com>
To: kvm@vger.kernel.org
Cc: eric.auger@redhat.com, alex.williamson@redhat.com,
linux-kernel@vger.kernel.org
Subject: [PATCH 1/7] vfio: Fix group release deadlock
Date: Fri, 09 Jun 2017 15:59:34 -0600 [thread overview]
Message-ID: <20170609215934.31986.87512.stgit@gimli.home> (raw)
In-Reply-To: <20170609215816.31986.89321.stgit@gimli.home>
If vfio_iommu_group_notifier() acquires a group reference and that
reference becomes the last reference to the group, then vfio_group_put
introduces a deadlock code path where we're trying to unregister from
the iommu notifier chain from within a callout of that chain. Use a
work_struct to release this reference asynchronously.
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
drivers/vfio/vfio.c | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
index 561084ab387f..f2e24d5699f2 100644
--- a/drivers/vfio/vfio.c
+++ b/drivers/vfio/vfio.c
@@ -423,6 +423,34 @@ static void vfio_group_put(struct vfio_group *group)
kref_put_mutex(&group->kref, vfio_group_release, &vfio.group_lock);
}
+struct vfio_group_put_work {
+ struct work_struct work;
+ struct vfio_group *group;
+};
+
+static void vfio_group_put_bg(struct work_struct *work)
+{
+ struct vfio_group_put_work *do_work;
+
+ do_work = container_of(work, struct vfio_group_put_work, work);
+
+ vfio_group_put(do_work->group);
+ kfree(do_work);
+}
+
+static void vfio_group_schedule_put(struct vfio_group *group)
+{
+ struct vfio_group_put_work *do_work;
+
+ do_work = kmalloc(sizeof(*do_work), GFP_KERNEL);
+ if (WARN_ON(!do_work))
+ return;
+
+ INIT_WORK(&do_work->work, vfio_group_put_bg);
+ do_work->group = group;
+ schedule_work(&do_work->work);
+}
+
/* Assume group_lock or group reference is held */
static void vfio_group_get(struct vfio_group *group)
{
@@ -762,7 +790,14 @@ static int vfio_iommu_group_notifier(struct notifier_block *nb,
break;
}
- vfio_group_put(group);
+ /*
+ * If we're the last reference to the group, the group will be
+ * released, which includes unregistering the iommu group notifier.
+ * We hold a read-lock on that notifier list, unregistering needs
+ * a write-lock... deadlock. Release our reference asyncronously
+ * to avoid that situation.
+ */
+ vfio_group_schedule_put(group);
return NOTIFY_OK;
}
next prev parent reply other threads:[~2017-06-09 21:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-09 21:59 [PATCH 0/7] vfio: Fix release ordering races and use driver_override Alex Williamson
2017-06-09 21:59 ` Alex Williamson [this message]
2017-06-14 12:31 ` [PATCH 1/7] vfio: Fix group release deadlock Auger Eric
2017-06-09 21:59 ` [PATCH 2/7] kvm-vfio: Decouple only when we match a group Alex Williamson
2017-06-12 16:28 ` Paolo Bonzini
2017-06-14 12:31 ` Auger Eric
2017-06-09 21:59 ` [PATCH 3/7] vfio: New external user group/file match Alex Williamson
2017-06-12 16:27 ` Paolo Bonzini
2017-06-14 12:42 ` Auger Eric
2017-06-09 21:59 ` [PATCH 4/7] iommu: Add driver-not-bound notification Alex Williamson
2017-06-09 22:21 ` Joerg Roedel
2017-06-09 22:43 ` Alex Williamson
2017-06-10 21:39 ` Joerg Roedel
2017-06-14 12:52 ` Auger Eric
2017-06-09 22:00 ` [PATCH 5/7] vfio: Create interface for vfio bus drivers to register Alex Williamson
2017-06-14 13:17 ` Auger Eric
2017-06-09 22:00 ` [PATCH 6/7] vfio: Register pci, platform, amba, and mdev bus drivers Alex Williamson
2017-06-14 13:17 ` Auger Eric
2017-06-09 22:00 ` [PATCH 7/7] vfio: Use driver_override to avert binding to compromising drivers Alex Williamson
2017-06-19 14:03 ` Auger Eric
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=20170609215934.31986.87512.stgit@gimli.home \
--to=alex.williamson@redhat.com \
--cc=eric.auger@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/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®