From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: matan@mellanox.com, ferruh.yigit@intel.com
Subject: [dpdk-dev] [PATCH v2] bus/vdev: fix scope of device list lock
Date: Mon, 21 May 2018 18:45:44 +0200 [thread overview]
Message-ID: <20180521164544.26421-1-thomas@monjalon.net> (raw)
In-Reply-To: <20180521161156.25724-1-thomas@monjalon.net>
The lock vdev_device_list_lock was taken before calling
"remove" function for the device.
So it prevents to remove sub-devices (as in failsafe) inside
its own "remove" function, because of a deadlock.
The lock is now only protecting the device list inside
the bus driver.
Fixes: 35f462839b69 ("bus/vdev: add lock on device list")
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v2: reduce scope more by moving unlock
---
drivers/bus/vdev/vdev.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c
index 099b9ff85..470cff46c 100644
--- a/drivers/bus/vdev/vdev.c
+++ b/drivers/bus/vdev/vdev.c
@@ -293,25 +293,24 @@ rte_vdev_uninit(const char *name)
if (name == NULL)
return -EINVAL;
- rte_spinlock_lock(&vdev_device_list_lock);
-
dev = find_vdev(name);
if (!dev) {
ret = -ENOENT;
- goto unlock;
+ return ret;
}
ret = vdev_remove_driver(dev);
if (ret)
- goto unlock;
+ return ret;
+ rte_spinlock_lock(&vdev_device_list_lock);
TAILQ_REMOVE(&vdev_device_list, dev, next);
+ rte_spinlock_unlock(&vdev_device_list_lock);
+
devargs = dev->device.devargs;
rte_devargs_remove(devargs->bus->name, devargs->name);
free(dev);
-unlock:
- rte_spinlock_unlock(&vdev_device_list_lock);
return ret;
}
--
2.16.2
next prev parent reply other threads:[~2018-05-21 16:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-21 16:11 [dpdk-dev] [PATCH] bus/vdev: reduce " Thomas Monjalon
2018-05-21 16:45 ` Thomas Monjalon [this message]
2018-05-21 17:28 ` [dpdk-dev] [PATCH v2] bus/vdev: fix " Matan Azrad
2018-05-22 9:11 ` Gaëtan Rivet
2018-05-22 9:05 ` [dpdk-dev] [PATCH] bus/vdev: reduce " Burakov, Anatoly
2018-05-22 9:20 ` Thomas Monjalon
2018-05-22 11:37 ` [dpdk-dev] [PATCH v3] bus/vdev: replace device list lock by a recursive one Thomas Monjalon
2018-05-22 12:08 ` Matan Azrad
2018-05-22 13:34 ` Burakov, Anatoly
2018-05-22 14:38 ` Thomas Monjalon
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=20180521164544.26421-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=matan@mellanox.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;
as well as URLs for NNTP newsgroup(s).