From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by dpdk.org (Postfix) with ESMTP id 7EBC41AFEE for ; Thu, 15 Mar 2018 18:50:30 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id z9so12090317wmb.3 for ; Thu, 15 Mar 2018 10:50:30 -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=bfc9uCUHFr8fnyeNgzllzj/7a8IKZb7HI6FYhq+QNew=; b=ErCvHZUTP97aQBBbM/kjwXLkzA95D6t13WzbVGczKrvkX+MWe0aY0mWaDkhKaZAvj2 SkHLBqIVbGgbbhJJyg48CHMipaqlCh9PQZ2SfmyuTDjBcAUuHvNTGKE6f95UsM1tujMj Z7Zw9jLLcF9FsF4V+NrwVTJ1ityJcGzqFyy2iW2wbKoKBRBg5qHZZgPVI/S3Vh2YXuNI YLCwzmf6QoAScvI/RIbBQN04NVTZO43TMAPEgxc3rXFfyNd3ddpnaAQwBZWp7DQA2Qul M0B4re06lWSfpPenDM55Qmy9sRi88gaLunu4UCJOH+b8fhJJ9a/moVzAuhOidhtBoDj0 rXiA== 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=bfc9uCUHFr8fnyeNgzllzj/7a8IKZb7HI6FYhq+QNew=; b=FgO2LS5eF07cNcJG6Tfb9xMN9DGRB7XYWlcy/7nk6e05/gVEuoQOhBCYwgALoYKpQV WlYNMVRe9SqZ4PjUWdzqNNLuFA156Q5PNrI4OCqjiX2vqXdp1/XRKlspuuAbomNQiTiS KAS6USQWXyqXgEB4fj6BAMFS9Gv6f9tdSmaSvwW+WuTecNhS8XE5C9OWmH06FHfyDjKp wPOBhszpXdCOeVQIcMNF3asZiNQTuvFSJY8QfuSozhTfDbRbG/ebC2piDvZ1GmYvHpDt ATwNoxOKjTErH2U1KHqabp8f1Aq4qcnTEhTE2ZPa6Sva+UtIRR1xkJiq07dRVHWM1EzW x8KA== X-Gm-Message-State: AElRT7Ej9/KjWu2sqzkRAdb0gkibobAaGYKH9MW1PpT59UaVEnaB0Lfu UNrZuh0KroYTzEeT3qrpButQO4Tg X-Google-Smtp-Source: AG47ELt3+Jxaxf6ooS0euuSKq3jw+osAfxcKJWAhfyCvzWCa8qOgoPWS502fRCveynflS5R8q9uzbw== X-Received: by 10.28.51.67 with SMTP id z64mr5241459wmz.59.1521136229482; Thu, 15 Mar 2018 10:50:29 -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 69sm4756596wmp.36.2018.03.15.10.50.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Mar 2018 10:50:28 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Thu, 15 Mar 2018 18:49:45 +0100 Message-Id: <668247f7a6d9a891e0536bdec5df2edbd973192a.1521124599.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 15/18] 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, 15 Mar 2018 17:50:30 -0000 If start is set and a device before it matches the data, this device is returned. This produces 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 e4bc72463..68306f4eb 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