From patchwork Tue Apr 24 11:31:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 38797 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A6D272C17; Tue, 24 Apr 2018 13:31:38 +0200 (CEST) Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id A27691DBC for ; Tue, 24 Apr 2018 13:31:32 +0200 (CEST) Received: by mail-wr0-f196.google.com with SMTP id p5-v6so21805746wre.12 for ; Tue, 24 Apr 2018 04:31:32 -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=1vBV+BP282H03Lm5BCzbXZLdoE51GH0ER4zzSWrfePA=; b=XdIGd+JJFkDnehxqjXub/Uc9xNgKqhjmyeGZZTbvrSdn4EHHhlR0zlYjrFxDn1qUlI XGrsDTFAP7CbFTFHNecofY+GVao1Ku8G7yV3bLsaBxvR7ZlWdtyGwp/2qhNLKwiAJN+I /3obx0x0l87LJXsQLL+L8ng3OBL61aLaFXzomIjY4qCUfB41d8G8ocTeura/K4WAlKcn YJ8LwuWJtL7j24zjwR3X934fDBbCjwGp7i7FMlnSx5gpXnzWCH/FQ+M9EZAtWiBttIx7 WHhEr+oCZhr19uGzD7JHWXEHlRUiyNMNNJHAo3sTXONneN0VU0UXSI/C3brttdpsGHU5 q8Sg== 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=1vBV+BP282H03Lm5BCzbXZLdoE51GH0ER4zzSWrfePA=; b=T+hP/VtLY9liQav2PiKVoQWe0C/PFRiUXhvMRc0HIVyG+xX6E5zNwh7LzYbdl5HQtL DJUc2ys+m+eajSk/GM8GO3ektg6AHPuzapquSiIL9RRUbsyczemuhNa8dZ212GXBE+PZ En8LqQ3tfXjzEXeD/bCJwIMoSp4yBBW9KmxL2Zs8FYJel1eqkMvrqgu+6+gtHsmRr1zd zWZdLePXoF+dOmaJhcwAh9Lvw1AY6rzAXm4w969Ih3Cm8QBq/yuKgQMGHOK3oxSPsc5l 78fcxO43dodjK7INBkLOBzuTUnAASb7qcxLEflfyq510Z7ZGqzQxY24pfCDHKMrhffQf j26A== X-Gm-Message-State: ALQs6tCo8Z1Bf3JMi1rFDYHiHrBtiABERfewdGKC5TPK8+5lRW9ipZpp BbAu2e11pcG4P9vbuchgYcefLvf7 X-Google-Smtp-Source: AIpwx4+NJ+89V0lW05TQeb9vESwWded1PSPrgGdS4FbEU4pFFjJtyp/iZuCgOJiQK/zChHsJpCYhgQ== X-Received: by 2002:adf:8111:: with SMTP id 17-v6mr20605033wrm.109.1524569492105; Tue, 24 Apr 2018 04:31:32 -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 u37-v6sm16138844wrb.53.2018.04.24.04.31.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 04:31:31 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Tue, 24 Apr 2018 13:31:11 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 2/2] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 646d6c090..f9b5eb596 100644 --- a/drivers/bus/vdev/rte_bus_vdev.h +++ b/drivers/bus/vdev/rte_bus_vdev.h @@ -25,6 +25,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 f8dd1f5e6..c135554c0 100644 --- a/drivers/bus/vdev/vdev.c +++ b/drivers/bus/vdev/vdev.c @@ -358,15 +358,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; }