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 31F431B64C for ; Sun, 15 Apr 2018 17:08:31 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id q13so15871571wre.3 for ; Sun, 15 Apr 2018 08:08:31 -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=iSkW006ThLPT5uiHBVP7wih8BA15FwCFEV3aTgjYO6LKlMqWfREXitNFiW61fKINwD spbDyz54pkqPTT8FXeX3QuSwtBIUBfky4KLMo4ezoXRUnWKrmVXi9oQ1TKYYW6UNWK7g Yy6kUasNSkz64dn/Uk8MA4c7ci1q1mg6bXYbKXPKxPWogMENZFsEpy6Fydj/gjtt/aMd 1RonrakKBCBnS1SLlWVwYVw/45dLeEBTMNLIcM34KTwF5tC9Qk7joT2IECB4EbvGhMRd QQxXFYZawLrACLT+nD/coGIBrBdalygL8XoaZ/O8N1nSK1IaxelBRWeiNQHb1G7GKIXq SB3g== 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=jhQ/OD18X4VuzjNzsMf7rxw4CIBpFsKnE9UcGQT5DuPWOneKIBlgel7gLs4sHD28n1 wTGGoSZVLNEv3s41VpCZ/vsW9R1F818Mzbum7BalRg/JFRlSFkMgClrzoknWS6yRHXBx mCJ0iBYmcFGdHQ3/P65q49M+szMknqDUOjBgMzwbQ/XxWhVXaA4zuwcealplYVbrtTeM Ap67rzhD33yB12Gg+NbuNXxyiAUvrI7PaBrbtrJ5TVJcMXvjOcE217VToK5ryINF7uyq q2mRilzSAZFix+Rfo1YlPQdT8JhuK97gltqRUw7azwsk6YvJxCkHTv6CF38VmRAu2RWc GbQA== X-Gm-Message-State: ALQs6tAJU97KGeO5YKn6AksPdPnyFEqG77GX6M9TWC7YQ0Ad1cin+gth mADSvvlWokeEDrJn2o2JpzcI9Bu+ X-Google-Smtp-Source: AIpwx4+/tPUfvBuKJud2lsAyyb3UsTIAECZHSILtFdBjwuff8LGm1WogSPAkzNy50Pr/wp88mSmgTQ== X-Received: by 10.28.48.149 with SMTP id w143mr8727918wmw.88.1523804910445; Sun, 15 Apr 2018 08:08:30 -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 r200sm13673438wmb.39.2018.04.15.08.08.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 15 Apr 2018 08:08:29 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet , stable@dpdk.org Date: Sun, 15 Apr 2018 17:07:45 +0200 Message-Id: <2993a83dc8338388b555f9908dff2c4c61d7b771.1523804657.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 v7 16/22] 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: Sun, 15 Apr 2018 15:08:31 -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 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; } -- 2.11.0