From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id 78210AAA4 for ; Wed, 21 Mar 2018 18:16:16 +0100 (CET) Received: by mail-wr0-f195.google.com with SMTP id s18so5968308wrg.9 for ; Wed, 21 Mar 2018 10:16:16 -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=g6s+Ue7lnHofH1x5wHr4ZnPVnh5376m5UTMC2iBn+RldxHI0xz5Awzr3gq25OyNOMF 0EMrNzMFSzHT2cW2pk9L/6tgTTUznJu/wOGHDEcMteYsA/rU5961nCJCsGGVybK8K2Mc 6SWLll6vgagdmwSMq8ynlRiKdgnVeFHMCUhjCoJUSaSYwUGHogomeqz43nE8W9QDtznK OKZnORHHt3X7egyjJ+mpVFW8qmdeS6qmDoc84J+vpfOR10Vkvt/d0mPJmcT2FRuW/hER M9ZbBfbSwvbmQU6REdqB31yFokm35hs/7T8aEfC71QDXc4/6WEfKihVNHF1N2/TZVHDz rnsg== 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=lEgcHAyRZsUORbDMtdi9MfHLyhiovOW8F4RVNmLZCmH89yruI9AEZbuF5oJ+KxLWTe eYIuyAsaghWeVaCA9Hy83Q/syYA/2/XuyMW39ddWyclzqhHKMggGkCGU4+wCXlgkhJ/I hvMcIB3Ld+fdOyJXpKDEE9dxKGqK07ESR8v9nNh2Is/suhJjrRGNWjKnDnqAzhR8Z9Zi cYTzRSEV7dwCfFg/Xj2SxxRc+LarL0qXYpdx0o21iXWjJXLkXxpIwcbWRUW87uvmzkOG vfQgGH/LYiKVvJMDrLrGSs6gF2qjEZRYDnmufTQny5XOC+DCBO0ncscWmnmaY8nnDsIU YuVg== X-Gm-Message-State: AElRT7FVv7lHRLshXGMqsBqKaFGC5ILYw5tK3APvne7/uhVXqXQUfnps j/D0sjirCqUI+MplfTaDJmIpqAEJ X-Google-Smtp-Source: AG47ELv0NdSd2WwcsbIoQ7VoeFwjzYujxqnJJeO1nbH1WczyL1d4rCZMlYrVUvI7uZDjsqS43cBeEQ== X-Received: by 10.223.176.171 with SMTP id i40mr16173592wra.246.1521652575689; Wed, 21 Mar 2018 10:16:15 -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 l10sm4224101wrf.37.2018.03.21.10.16.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Mar 2018 10:16:14 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Wed, 21 Mar 2018 18:15:34 +0100 Message-Id: <51420606ea617f477d2ae3384b7a6fc0b19ca795.1521652453.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 v2 13/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: Wed, 21 Mar 2018 17:16:16 -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