From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 9920AA488 for ; Thu, 29 Mar 2018 23:24:31 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id d1so6549519wrj.13 for ; Thu, 29 Mar 2018 14:24:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=F7pQAHawOSPs8TlTRAwB7NilZYbIFeACE6wujSIN/Sg=; b=BLa9Hx8MvbIUwxDE/ZaIjQs3LKnW4z3H/gxWTE30OVRgfzKl74+SWuWrwroyUEma7a 0zUYQ8GbikGkAU/Mg0sU+MVdRiaoQVpw8S+03j+8b6KG/U3156CoqwLMcuGTbKrHQcc+ 27n/yp7Ni2o0TNTJNbLYFo8e1KPORpI/he2c3RsVDbArd5s+bOWpLXkQET4HGY3Jmlcl Gc+2zK/FJoOmqjeXI2Ur5v7H/Xs0/aalUqBZdNbi+nQLA8dcQfNTuJgQkLuv6/EwFJ5u zElbsanufFtCSMHjaIro6VKSgrSEZeczvKDUgGpQnvi0x51LQ5xuX/7gBJSMvyeybRkx P8EQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=F7pQAHawOSPs8TlTRAwB7NilZYbIFeACE6wujSIN/Sg=; b=fjTccjgIDStJyfwyR8hwH6eusAhoV5iZkvNehyAUdCsGrgMV3PUYo5xy4U8ML6X9j7 dAPfz6vcAMbbrnqbn4lg/w0EXM7bEaxU0nK59HM3/Yux9dMOhKkqz81DeLhDVTKbPQ91 s8t1SgFXuSWhhCAOXpbkAvlhd3QQAm9zdYwFDq1x8T8arImwm2dNQ8bdGXaYHd7TBSct /S0XVO0xJfXcy/Pg/SQIuGw1zLiQzEYRrbCi/AcDkh4nWYQYR/1RBAAHiblqjZlJR7e+ I/pgyIculAfs36odRFzkP2CCNG7NunTtiyvAmw6o3YvV4Bz34BexqiHB5euEk5a14EwH ljng== X-Gm-Message-State: AElRT7GxmrOLmy+Yln5EODvya2LZtjRAVrw8ssvMBqQDvlr13CHWTsTd FMkObg5EJfxU7VITLxXKnJSqAfK3 X-Google-Smtp-Source: AIpwx4+GiRQKpCsA2KrsOm48swpsTP2WKzjPu3UnZau1tmUsYM/IiNhEYd8yEFl0F67xWRLqpocFuQ== X-Received: by 10.223.208.133 with SMTP id y5mr7435252wrh.216.1522358670928; Thu, 29 Mar 2018 14:24:30 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id m35sm11907457wrm.59.2018.03.29.14.24.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Mar 2018 14:24:30 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Thu, 29 Mar 2018 23:23:39 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 15/20] bus/vdev: fix find device implementation 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: , X-List-Received-Date: Thu, 29 Mar 2018 21:24:33 -0000 If start is set and a device before it matches the data, this device is returned. This induces potentially infinite loops. Fixes: c7fe1eea8a74 ("bus: simplify finding starting point") Cc: stable@dpdk.org Signed-off-by: Gaetan Rivet --- drivers/bus/vdev/rte_bus_vdev.h | 3 +++ drivers/bus/vdev/vdev.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/bus/vdev/rte_bus_vdev.h b/drivers/bus/vdev/rte_bus_vdev.h index f9d8a2383..4da9967c6 100644 --- a/drivers/bus/vdev/rte_bus_vdev.h +++ b/drivers/bus/vdev/rte_bus_vdev.h @@ -53,6 +53,9 @@ struct rte_vdev_device { #define RTE_DEV_TO_VDEV(ptr) \ container_of(ptr, struct rte_vdev_device, device) +#define RTE_DEV_TO_VDEV_CONST(ptr) \ + container_of(ptr, const struct rte_vdev_device, device) + static inline const char * rte_vdev_device_name(const struct rte_vdev_device *dev) { diff --git a/drivers/bus/vdev/vdev.c b/drivers/bus/vdev/vdev.c index 7eae319cb..66fe63e85 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -386,15 +386,19 @@ static struct rte_device * vdev_find_device(const struct rte_device *start, rte_dev_cmp_t cmp, const void *data) { + const struct rte_vdev_device *vstart; struct rte_vdev_device *dev; - TAILQ_FOREACH(dev, &vdev_device_list, next) { - if (start && &dev->device == start) { - start = NULL; - continue; - } + if (start != NULL) { + vstart = RTE_DEV_TO_VDEV_CONST(start); + dev = TAILQ_NEXT(vstart, next); + } else { + dev = TAILQ_FIRST(&vdev_device_list); + } + while (dev != NULL) { if (cmp(&dev->device, data) == 0) return &dev->device; + dev = TAILQ_NEXT(dev, next); } return NULL; } -- 2.11.0