From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6FE26A04F2; Mon, 8 Jun 2020 17:54:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4731F2C4F; Mon, 8 Jun 2020 17:53:58 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id 5D2FF2BFA for ; Mon, 8 Jun 2020 17:53:56 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1591631635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zy9SX9HLBxDU8NCQGVsonMwEDQG7tr3qWyOBC9+151s=; b=Aq6uSHwknIhedPdEDwGpK8SliWKiSkw/PqE9fo4hEsb84yKUTFhOL2kXWWR7mnz2cHIxSw rKF9ZEfjb7cRDcwgk+x5KsYLMAWnIFHzMgWZ3PlTvgZGNXLHnnfgOYJndpXs8DiPkMSAdN WCYohG2NLD8Yan9/ErZT1J7Z9PyGf0U= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-299-0Sy2ZlgOMACG_cCaoeJIDw-1; Mon, 08 Jun 2020 11:53:52 -0400 X-MC-Unique: 0Sy2ZlgOMACG_cCaoeJIDw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 715F9801504; Mon, 8 Jun 2020 15:53:51 +0000 (UTC) Received: from localhost.localdomain (unknown [10.36.110.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C0A978FA9; Mon, 8 Jun 2020 15:53:49 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, david.marchand@redhat.com, wenzhuo.lu@intel.com, beilei.xing@intel.com, bernard.iremonger@intel.com, grive@u256.net Cc: Maxime Coquelin Date: Mon, 8 Jun 2020 17:53:30 +0200 Message-Id: <20200608155330.163874-3-maxime.coquelin@redhat.com> In-Reply-To: <20200608155330.163874-1-maxime.coquelin@redhat.com> References: <20200608155330.163874-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v20.11 2/2] eal: improve device probing API 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" This patch makes rte_dev_probe() to return the rte_device pointer on success and NULL on error instead of returning 0 on success and negative value on error. The goal is to avoid that the calling application iterates the devices list afterwards to retrieve the pointer. Retrieving the pointer is required for calling rte_dev_remove() later. Signed-off-by: Maxime Coquelin --- app/test-pmd/testpmd.c | 2 +- drivers/net/failsafe/failsafe.c | 5 +++-- lib/librte_eal/common/eal_common_dev.c | 18 ++++++++++-------- lib/librte_eal/include/rte_dev.h | 4 ++-- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 4989d22ca8..f777f449a8 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2764,7 +2764,7 @@ attach_port(char *identifier) return; } - if (rte_dev_probe(identifier) < 0) { + if (rte_dev_probe(identifier) == NULL) { TESTPMD_LOG(ERR, "Failed to attach port %s\n", identifier); return; } diff --git a/drivers/net/failsafe/failsafe.c b/drivers/net/failsafe/failsafe.c index 72362f35de..e32effdef2 100644 --- a/drivers/net/failsafe/failsafe.c +++ b/drivers/net/failsafe/failsafe.c @@ -341,6 +341,7 @@ rte_pmd_failsafe_probe(struct rte_vdev_device *vdev) struct rte_eth_dev *eth_dev; struct sub_device *sdev; struct rte_devargs devargs; + struct rte_device *dev; uint8_t i; int ret; @@ -378,8 +379,8 @@ rte_pmd_failsafe_probe(struct rte_vdev_device *vdev) continue; } if (!devargs_already_listed(&devargs)) { - ret = rte_dev_probe(devargs.name); - if (ret < 0) { + dev = rte_dev_probe(devargs.name); + if (dev == NULL) { ERROR("Failed to probe devargs %s", devargs.name); continue; diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index 9e4f09d83e..72baae2e48 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -120,7 +120,9 @@ rte_eal_hotplug_add(const char *busname, const char *devname, if (ret != 0) return ret; - ret = rte_dev_probe(devargs); + if (rte_dev_probe(devargs) == NULL) + ret = -1; + free(devargs); return ret; @@ -192,7 +194,7 @@ local_dev_probe(const char *devargs, struct rte_device **new_dev) return ret; } -int +struct rte_device * rte_dev_probe(const char *devargs) { struct eal_dev_mp_req req; @@ -212,12 +214,12 @@ rte_dev_probe(const char *devargs) if (ret != 0) { RTE_LOG(ERR, EAL, "Failed to send hotplug request to primary\n"); - return -ENOMSG; + return NULL; } if (req.result != 0) RTE_LOG(ERR, EAL, "Failed to hotplug add device\n"); - return req.result; + return NULL; } /* attach a shared device from primary start from here: */ @@ -236,7 +238,7 @@ rte_dev_probe(const char *devargs) * process. */ if (ret != -EEXIST) - return ret; + return dev; } /* primary send attach sync request to secondary. */ @@ -261,11 +263,11 @@ rte_dev_probe(const char *devargs) /* for -EEXIST, we don't need to rollback. */ if (ret == -EEXIST) - return ret; + return dev; goto rollback; } - return 0; + return dev; rollback: req.t = EAL_DEV_REQ_TYPE_ATTACH_ROLLBACK; @@ -282,7 +284,7 @@ rte_dev_probe(const char *devargs) "Failed to rollback device attach on primary." "Devices in secondary may not sync with primary\n"); - return ret; + return NULL; } int diff --git a/lib/librte_eal/include/rte_dev.h b/lib/librte_eal/include/rte_dev.h index c8d985fb5c..9cf7c7fd71 100644 --- a/lib/librte_eal/include/rte_dev.h +++ b/lib/librte_eal/include/rte_dev.h @@ -148,9 +148,9 @@ int rte_eal_hotplug_add(const char *busname, const char *devname, * @param devargs * Device arguments including bus, class and driver properties. * @return - * 0 on success, negative on error. + * Generic device pointer on success, NULL on error. */ -int rte_dev_probe(const char *devargs); +struct rte_device *rte_dev_probe(const char *devargs); /** * Hotplug remove a given device from a specific bus. -- 2.26.2