From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by dpdk.org (Postfix) with ESMTP id 814CFA499 for ; Tue, 27 Mar 2018 01:19:23 +0200 (CEST) Received: by mail-wr0-f193.google.com with SMTP id d1so8494541wrj.13 for ; Mon, 26 Mar 2018 16:19:23 -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=CBizV8xnImk9YXYqDoufto1j5SZuj7CwPr21XNTDnPg=; b=TqwOvaxmM1Ayb71uDb/TUDSK4MW+bfXtWJzn0aljLGu1nNkKRKkJCDtlcPoDZ+VrUS AdStCg5L+lOoNuTOhdeLWPOaI1pIdF/E6ohCi/dcQflQfGWv9S2xJlNk2JV2YogFJGii cB7/FSXjsagcLsB5F6WQzatkiKxblHvbkL+s6WxN/nu943fLrH4Og1VgRQhKqqCBLJ2Y i+SJ92LfQT//3TaukINZwcINcDlAJM8otO48YmywbYJICsVHdZ2hDn3ITRQnnxorDnLO 2+xDrHvmCUdW2pRLUIObrU1r5tb9V5rvGYVmFIlD+YAWpCU2GBzPVH0QseMkzgx5ue9D VvaQ== 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=CBizV8xnImk9YXYqDoufto1j5SZuj7CwPr21XNTDnPg=; b=cdRfCaTdYXDrc5+xXUnjsvDHKFkH1ZYgNCQFFQPz5R4BnyFoO7qQoYIF9LziBbD0vS KUL/SovAH8OnhhkzKPUKd9Rixhc8VcKBk/FJEWcVCfjMcyeJwTnwLNeWslsWRHXusCu9 9vv+1lzb4JCbofhcw9XwA+TQDFeATMi/eieHwXoxiMG+bAd+A4y4IaKPCQlEqsYVKigK 9VO8PiIs0L+nhD6Hc8c9QSyYh6Myb80xCi2U28qDRrrV1Hk/zlrIUqvJ8bZ2ZK8P/0YR kMvwj4Z+VhUwXPp9mh2uBIIuLFnvQ5qm09Hdo1I5U9d74WURiOLG0KfleySO/FXpxFc1 nECA== X-Gm-Message-State: AElRT7E6rcte43R592DQUgLnrGUdCLci7ZNzMzzPvOREj36LRmSexf6N z6e4oVFxlFpW04yYN+o6XCsW8kK7 X-Google-Smtp-Source: AG47ELvADsABs5u1qrOq6ioI3Ye+Wf3eXYjSOyIdBw89xA3dWuRzvOSZH8n9StR+jUmkDewl7dKZkg== X-Received: by 10.223.199.10 with SMTP id k10mr31413693wrg.186.1522106362855; Mon, 26 Mar 2018 16:19:22 -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 67sm343712wra.9.2018.03.26.16.19.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 16:19:22 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Tue, 27 Mar 2018 01:18:39 +0200 Message-Id: <91999be303191e0c971b01f4b728b1f262c5abcb.1522105876.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 v3 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: Mon, 26 Mar 2018 23:19:23 -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 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