From patchwork Thu Apr 19 16:50:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jianfeng Tan X-Patchwork-Id: 38574 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 83A61D149; Thu, 19 Apr 2018 18:48:22 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 95D18AAC4 for ; Thu, 19 Apr 2018 18:48:19 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Apr 2018 09:48:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,469,1517904000"; d="scan'208";a="52069905" Received: from dpdk06.sh.intel.com ([10.67.110.196]) by orsmga002.jf.intel.com with ESMTP; 19 Apr 2018 09:48:17 -0700 From: Jianfeng Tan To: dev@dpdk.org Cc: thomas@monjalon.net, Jianfeng Tan Date: Thu, 19 Apr 2018 16:50:15 +0000 Message-Id: <1524156618-81402-3-git-send-email-jianfeng.tan@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1524156618-81402-1-git-send-email-jianfeng.tan@intel.com> References: <1520177405-59091-1-git-send-email-jianfeng.tan@intel.com> <1524156618-81402-1-git-send-email-jianfeng.tan@intel.com> Subject: [dpdk-dev] [PATCH v3 2/5] bus/vdev: add lock on vdev device list X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" As we could add virtual devices from different threads now, we add a spin lock to protect the vdev device list. Suggested-by: Anatoly Burakov Signed-off-by: Jianfeng Tan Reviewed-by: Qi Zhang --- drivers/bus/vdev/vdev.c | 61 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 14 deletions(-) diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index f8dd1f5..181a15a 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -33,6 +33,8 @@ TAILQ_HEAD(vdev_device_list, rte_vdev_device); static struct vdev_device_list vdev_device_list = TAILQ_HEAD_INITIALIZER(vdev_device_list); +static rte_spinlock_t vdev_device_list_lock = RTE_SPINLOCK_INITIALIZER; + struct vdev_driver_list vdev_driver_list = TAILQ_HEAD_INITIALIZER(vdev_driver_list); @@ -149,6 +151,7 @@ vdev_probe_all_drivers(struct rte_vdev_device *dev) return ret; } +/* The caller shall be responsible for thread-safe */ static struct rte_vdev_device * find_vdev(const char *name) { @@ -203,10 +206,6 @@ rte_vdev_init(const char *name, const char *args) if (name == NULL) return -EINVAL; - dev = find_vdev(name); - if (dev) - return -EEXIST; - devargs = alloc_devargs(name, args); if (!devargs) return -ENOMEM; @@ -221,16 +220,28 @@ rte_vdev_init(const char *name, const char *args) dev->device.numa_node = SOCKET_ID_ANY; dev->device.name = devargs->name; + rte_spinlock_lock(&vdev_device_list_lock); + if (find_vdev(name)) { + rte_spinlock_unlock(&vdev_device_list_lock); + ret = -EEXIST; + goto fail; + } + TAILQ_INSERT_TAIL(&vdev_device_list, dev, next); + rte_spinlock_unlock(&vdev_device_list_lock); + ret = vdev_probe_all_drivers(dev); if (ret) { if (ret > 0) VDEV_LOG(ERR, "no driver found for %s\n", name); + /* If fails, remove it from vdev list */ + rte_spinlock_lock(&vdev_device_list_lock); + TAILQ_REMOVE(&vdev_device_list, dev, next); + rte_spinlock_unlock(&vdev_device_list_lock); goto fail; } TAILQ_INSERT_TAIL(&devargs_list, devargs, next); - TAILQ_INSERT_TAIL(&vdev_device_list, dev, next); return 0; fail: @@ -266,17 +277,25 @@ rte_vdev_uninit(const char *name) if (name == NULL) return -EINVAL; + rte_spinlock_lock(&vdev_device_list_lock); dev = find_vdev(name); - if (!dev) + if (!dev) { + rte_spinlock_unlock(&vdev_device_list_lock); return -ENOENT; + } + TAILQ_REMOVE(&vdev_device_list, dev, next); + rte_spinlock_unlock(&vdev_device_list_lock); devargs = dev->device.devargs; ret = vdev_remove_driver(dev); - if (ret) + if (ret) { + /* If fails, add back to vdev list */ + rte_spinlock_lock(&vdev_device_list_lock); + TAILQ_INSERT_TAIL(&vdev_device_list, dev, next); + rte_spinlock_unlock(&vdev_device_list_lock); return ret; - - TAILQ_REMOVE(&vdev_device_list, dev, next); + } TAILQ_REMOVE(&devargs_list, devargs, next); @@ -314,19 +333,25 @@ vdev_scan(void) if (devargs->bus != &rte_vdev_bus) continue; - dev = find_vdev(devargs->name); - if (dev) - continue; - dev = calloc(1, sizeof(*dev)); if (!dev) return -1; + rte_spinlock_lock(&vdev_device_list_lock); + + if (find_vdev(devargs->name)) { + rte_spinlock_unlock(&vdev_device_list_lock); + free(dev); + continue; + } + dev->device.devargs = devargs; dev->device.numa_node = SOCKET_ID_ANY; dev->device.name = devargs->name; TAILQ_INSERT_TAIL(&vdev_device_list, dev, next); + + rte_spinlock_unlock(&vdev_device_list_lock); } return 0; @@ -340,6 +365,10 @@ vdev_probe(void) /* call the init function for each virtual device */ TAILQ_FOREACH(dev, &vdev_device_list, next) { + /* we don't use the vdev lock here, as it's only used in DPDK + * initialization; and we don't want to hold such a lock when + * we call each driver probe. + */ if (dev->device.driver) continue; @@ -360,14 +389,18 @@ vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, { struct rte_vdev_device *dev; + rte_spinlock_lock(&vdev_device_list_lock); TAILQ_FOREACH(dev, &vdev_device_list, next) { if (start && &dev->device == start) { start = NULL; continue; } - if (cmp(&dev->device, data) == 0) + if (cmp(&dev->device, data) == 0) { + rte_spinlock_unlock(&vdev_device_list_lock); return &dev->device; + } } + rte_spinlock_unlock(&vdev_device_list_lock); return NULL; }