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 043271BAE0 for ; Wed, 11 Apr 2018 02:05:00 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id s18so33340wrg.9 for ; Tue, 10 Apr 2018 17:04:59 -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=MynoHtiBH9aB4bQ5W9kT/BicsEqu2FAbam88/5u8FMCSYriPf/ze7klq3Row3YkxgL kNHrG1I48cltHwY+S2iD2+thLrAQ03teigAJRKI3aeyqJ03EquiN+46JAu1R5jnSuRY2 Tq+P3g+2tv1oTARPVkTBtPivPiSRc5j49wgGbRgDWk4EMnToBnHKghvWRgd3JmOACs9D ZZfnt834SQBd9V1fGNb5EyhKet9fj2E1N+KwRXKwkyhyG0nVJlFcielqssR1pnVUfyEM QFQhnN4gvMQoFBCWN90jyrgDRXUd9ZhotbneQ5Co5MDTJU+tDrwEuAQG0Z7IJ9z4DCgj wjwA== 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=jJrCDv6Hm/fUgrKZCODRTILOG7ZJEC1MfGIrNWNnHlM87wr0R9jUxO/du4luTbvkQX h/nppM5thn18Xm3fLjAdoRj0E59+Et0dQObXbrKz8yprsRbD/2ay9yaOcMp6Zq7yw3ZR Bjj5MudyWlhWpqEG6k/fCYFwFOY26M2Uc9GwdedXVSL+Vkc1H/8GLRFrxOoZIn939OYu /baI19ZgN5mGl1qJ7HaxY9kr4GpSaMbgdNXolIFObehTignNjj4mifvL6GEMha514byS 0T25Z9gRY5+7r0TB3PiIEoDxo6mDWKhI4JPxUgtKUqYGyuq2h3lTYs+T+TAA7NggoRCT ja/A== X-Gm-Message-State: ALQs6tCvcg8tpH+93P+w+NpIR8ElAYL3wvDQbuGFBgnpsrmC4kKNks3t ElyI9+YQZKUmbyOfGOpbXmq5RpS0 X-Google-Smtp-Source: AIpwx4+FYHSuEN/ZVTOsm1mJyE4kTrjdhmX6IVcF5Aong5e0senqkYbNI70wiUXKTWALq3ix6Ve6Qw== X-Received: by 10.223.219.1 with SMTP id s1mr1633476wri.125.1523405099400; Tue, 10 Apr 2018 17:04:59 -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 39sm7626563wry.89.2018.04.10.17.04.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Apr 2018 17:04:58 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Wed, 11 Apr 2018 02:04:16 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v5 15/21] 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, 11 Apr 2018 00:05:00 -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