From patchwork Fri Oct 11 05:46:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175907 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp311288ill; Thu, 10 Oct 2019 23:02:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqwxbvNwJ/KPwlOiA/pFKgwIge02stByp29RS3rWpgRkKKu4tLesQGUAvO71ESM+JhBV03Ay X-Received: by 2002:a17:906:8391:: with SMTP id p17mr11593667ejx.216.1570773760201; Thu, 10 Oct 2019 23:02:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773760; cv=none; d=google.com; s=arc-20160816; b=aUubVWV2jXVdU7uPi+4RHmIKF3sWbOcqOE1PXD/heoAHetFBtclRg7G9CFd94zhSIG feN+gbWK7E8nwNPfxvD0B6yUMURtQxwp5sEImpd5W6Hp83N/U4CnvoviEpeqs4Z1dtQ8 01YjkOwWDUcgPc3LBjFH5qAxKfO3TO7OZAg3STZ5v2ZpaAgpRRsi0XRJIMzgPfwaBxQ/ bADY+K13jf9QOwyp9AD/uPlAHsckQWtVIQFztILO4XhxOv7WsVqFtjBjnfH8ftjxaVt6 83eZtUAZsdQs1gMdPqaWCA53HocZ/6MOPAw7AVjimyoWbGOO1l7Ey4bMY1PsZSGMcl/5 mIAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=Wp9nNPg8Bt81xEAMH0saKTdYDWhR2jwDr2IXPLJL0FY=; b=ybc4hMpbb486WMELtO1H6CkQeHGJQXCGbOtelpWTzmrJw+ngkU6CkoUIJ1DxnWDnGM TYwvzoAHs2PYlpFZNnR2fNbEj3tz1XlyInzql0axokzOSZLC3L7Bp1ZEPHVY/Nfy64ys lFU8Ms3vvabLxyoLCDodJ3cueuoaItTwxmehjWEMfQJI1CDTfusetzxAQpv7CJVT27BG H9TGE7mICJ/0DZqXmAIFmw0cLjZI9YaB570cSVyGhuZ1tT5LmakaQEydIRjmU8VgTFYJ i1cCXwU/dJAZZEO+ne1IDDSibXfuaEKuW6f75igd/iz/+KoZuZmgiwVT3jFAiVhONRnR hIiw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id a33si5049710edf.121.2019.10.10.23.02.40; Thu, 10 Oct 2019 23:02:40 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 499E61E91E; Fri, 11 Oct 2019 08:02:35 +0200 (CEST) Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by dpdk.org (Postfix) with ESMTP id 86F801E919; Fri, 11 Oct 2019 08:02:33 +0200 (CEST) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 1E6701A00C9; Fri, 11 Oct 2019 08:02:33 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 09DAE1A04E9; Fri, 11 Oct 2019 08:02:30 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 5B4E4402DA; Fri, 11 Oct 2019 14:02:25 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, stable@dpdk.org, Nipun Gupta Date: Fri, 11 Oct 2019 11:16:49 +0530 Message-Id: <20191011054657.21931-2-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 1/9] net/dpaa: fix supported RSS types 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 fixes the supported RSS types on DPAA platform Fixes: 15aa2a1b02e6 ("net/dpaa: update RSS offload types") Cc: stable@dpdk.org Signed-off-by: Nipun Gupta Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.h | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index f63a5f164..baaf8abd0 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -76,14 +76,11 @@ #define DPAA_DEBUG_FQ_TX_ERROR 1 #define DPAA_RSS_OFFLOAD_ALL ( \ - ETH_RSS_FRAG_IPV4 | \ - ETH_RSS_NONFRAG_IPV4_TCP | \ - ETH_RSS_NONFRAG_IPV4_UDP | \ - ETH_RSS_NONFRAG_IPV4_SCTP | \ - ETH_RSS_FRAG_IPV6 | \ - ETH_RSS_NONFRAG_IPV6_TCP | \ - ETH_RSS_NONFRAG_IPV6_UDP | \ - ETH_RSS_NONFRAG_IPV6_SCTP) + ETH_RSS_L2_PAYLOAD | \ + ETH_RSS_IP | \ + ETH_RSS_UDP | \ + ETH_RSS_TCP | \ + ETH_RSS_SCTP) #define DPAA_TX_CKSUM_OFFLOAD_MASK ( \ PKT_TX_IP_CKSUM | \ From patchwork Fri Oct 11 05:46:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175908 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp311465ill; Thu, 10 Oct 2019 23:02:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqzxZ4eTZD68S2F6XfyHwhtGKgRNfhFddXSKfIwGA2T6qV93CM3TIJbTR8pYHTYaRnLW1bvz X-Received: by 2002:a50:f192:: with SMTP id x18mr12072991edl.305.1570773769570; Thu, 10 Oct 2019 23:02:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773769; cv=none; d=google.com; s=arc-20160816; b=rzMWh2ZkTANOVYgPnjeBAcRSyv4WdCp62jvupEASuW5ktUJU3gcKseyZpWUOjirPb1 PjKZPDyTftT2XVWfU4SLgst3KIRXWaxtWfHpqDOAr22bzVWhRSAhxyj1dpe8e6isJvlT AlUqgOvD6EmzJPtc9+1av/uWJy6zjoiw41XHqd3k6LA31F0U0nBs79yYCj7dBvQcmSJ+ dSt3luOg7vhsYBmkAi2U6NVWA2GsJgnEvx55bPiOJXVA8FpWVnWDOvHC0X7Nl4rPCuI/ 3pBJGBqiZ4U9tyevfBcAGMf40UwQkWS64PoNBGtYqBPzbH5aAk0vjBOHteC47Ts2Iwfo Auog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=oN1x8970jxXlwNFHSupxDV4WGHdh2YVngP4azv1gCiA=; b=Nsaf2NdMfb9Z4/Lr5oFMJ89RdWBUHtIBl1m2J1ciXK71nW2D9zoqjCHEmD9jEfDsg8 7MVWbpX/khqbPBeuMlYqD5qbDvojmrW/16nibRYS6QpCHcWlNoaIngmGymJwUgA0sfA6 tzBgj0/H9Q0mxtBmlacLgoljtKNfjGrbbczcFcqQWIKeG468US2jlLTrduNY2msfb6ST GDPkoavCWGDsQxpkL/wFpW+wfc0pewYYgc9lcRNfIqGfrIgMj0k/sTzzxFdVOfo0+Flm c+qq1CcSxrHFaTZGpErJLuQj5bYsV+oUUsU8zDUOCAj2lmweK0RX5FMDPLLGRNFhtrU8 2vGA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id t18si4585718ejx.135.2019.10.10.23.02.49; Thu, 10 Oct 2019 23:02:49 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 264E01E93C; Fri, 11 Oct 2019 08:02:38 +0200 (CEST) Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by dpdk.org (Postfix) with ESMTP id AF34A1E91C; Fri, 11 Oct 2019 08:02:34 +0200 (CEST) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 6D96B1A04F8; Fri, 11 Oct 2019 08:02:34 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 5943C1A0500; Fri, 11 Oct 2019 08:02:31 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 1AFDD40299; Fri, 11 Oct 2019 14:02:26 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, stable@dpdk.org, Nipun Gupta Date: Fri, 11 Oct 2019 11:16:50 +0530 Message-Id: <20191011054657.21931-3-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 2/9] net/dpaa: fix LS1043 alignment check 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" On LS1043, we are good to check 128 byte alignment of offset to transmit out the packet Fixes: 9eba4a60c2f5 ("net/dpaa: support scatter gather in Tx for non DPAA buffer") Cc: stable@dpdk.org Signed-off-by: Nipun Gupta Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_rxtx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c index 2de1a1a7e..934be50e9 100644 --- a/drivers/net/dpaa/dpaa_rxtx.c +++ b/drivers/net/dpaa/dpaa_rxtx.c @@ -927,7 +927,7 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs) * the buffer in such case. */ if (dpaa_svr_family == SVR_LS1043A_FAMILY && - (mbuf->data_off & 0xFF) != 0x0) + (mbuf->data_off & 0x7F) != 0x0) realloc_mbuf = 1; seqn = mbuf->seqn; if (seqn != DPAA_INVALID_MBUF_SEQN) { From patchwork Fri Oct 11 05:46:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175909 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp311665ill; Thu, 10 Oct 2019 23:02:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqwLUTQFHN9JaLlOqeql6IxlVvE7qVeGubfP9OGEODkhEo9dF8sCscHWP326lXjkEm0ML3yF X-Received: by 2002:a17:906:f42:: with SMTP id h2mr11974906ejj.39.1570773778740; Thu, 10 Oct 2019 23:02:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773778; cv=none; d=google.com; s=arc-20160816; b=JGoWVN/rSXmHUjgdG/VnWgbZVlAT3KKMxLPrQvzkzBtRY9Dl3PqpUNvZU/tuT4qFoI pceD5tjC/FlqpRgxF4+7uDp33EdWZirSqE5LLxRi0GFfgP8cLEqR1e0gj/SKjFi/2X/B ByRKEMmqOdUxYPbzmc0FA11/UFFN7TqNzPB75vZh8zR1rYnFQKaR5FsPkj8o+UBpiJfB fzklNEJ5OAgzR7cT61xPLe4KlqlU28OKav0nLqE63TyRwoHCIwe34YxTID5lnX6Gr+xw kSRcxTdd9iN4HJqqFRnWj5zyI9CmoLbkOCWHiOAkmcR+5tdF19uFP9ANotx1IIdc7XrW FR7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=usMVH81zX6+WfJeGvBcjjYMsDqypoCJwV6mzVyIGDqY=; b=RSDZ08grCWTHkgWrUNKt9qtqDhtLiBb3OGHUhNSgUhZ+aeyZ0xMlTbMIZoH1k+obgv 19DzAusk53pVZpPfH9+Ep4WwsrTehu+1YAByoviNvEEFSh21ZNLxEWlv5sOw2CpCtqhR qdT14IKn1edDbetsuuevd/Ju/ihA11okLi0S9Zu3bf0oaH8hKswa/KAf8xRiYSECmZ1v sQtW4SblkddoVCCHv8SNWKhBEKGsGiXPxSbEOOqbbLvA2U9G3JA8BSBrBSpSG8YNTUDi MUuSaMx03enrpLRwrSJJUy7CEJ4my+lC1O1vM7UpbAVoGa4edDHgHmiiJYqw4YE9IHLK Ut2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id p14si5126277edc.227.2019.10.10.23.02.58; Thu, 10 Oct 2019 23:02:58 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2678C1E96A; Fri, 11 Oct 2019 08:02:41 +0200 (CEST) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id 56EC61E8ED; Fri, 11 Oct 2019 08:02:36 +0200 (CEST) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 345DC2004F8; Fri, 11 Oct 2019 08:02:36 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 1FBCE200094; Fri, 11 Oct 2019 08:02:33 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 7BAF8402E4; Fri, 11 Oct 2019 14:02:28 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, stable@dpdk.org, Nipun Gupta Date: Fri, 11 Oct 2019 11:16:51 +0530 Message-Id: <20191011054657.21931-4-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 3/9] common/dpaax: fallback to check separate memory node for VM 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" In Virtual Machine the memory node in the device tree is at '/proc/device-tree/memory/reg' which is separate from the memory node path on the host. This patch enables check on both the paths. Fixes: 2f3d633aa593 ("common/dpaax: add library for PA/VA translation table") Cc: stable@dpdk.org Signed-off-by: Nipun Gupta --- drivers/common/dpaax/dpaax_iova_table.c | 7 +++++-- drivers/common/dpaax/dpaax_iova_table.h | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/drivers/common/dpaax/dpaax_iova_table.c b/drivers/common/dpaax/dpaax_iova_table.c index 43c9c72e6..98b076e09 100644 --- a/drivers/common/dpaax/dpaax_iova_table.c +++ b/drivers/common/dpaax/dpaax_iova_table.c @@ -68,9 +68,12 @@ read_memory_node(unsigned int *count) *count = 0; ret = glob(MEM_NODE_PATH_GLOB, 0, NULL, &result); + if (ret != 0) + ret = glob(MEM_NODE_PATH_GLOB_VM, 0, NULL, &result); + if (ret != 0) { - DPAAX_DEBUG("Unable to glob device-tree memory node: (%s)(%d)", - MEM_NODE_PATH_GLOB, ret); + DPAAX_DEBUG("Unable to glob device-tree memory node (err: %d)", + ret); goto out; } diff --git a/drivers/common/dpaax/dpaax_iova_table.h b/drivers/common/dpaax/dpaax_iova_table.h index 138827e7b..fef97f6dd 100644 --- a/drivers/common/dpaax/dpaax_iova_table.h +++ b/drivers/common/dpaax/dpaax_iova_table.h @@ -45,6 +45,8 @@ extern struct dpaax_iova_table *dpaax_iova_table_p; * is SoC dependent, or even Uboot fixup dependent. */ #define MEM_NODE_PATH_GLOB "/proc/device-tree/memory[@0-9]*/reg" +/* For Virtual Machines memory node is at different path (below) */ +#define MEM_NODE_PATH_GLOB_VM "/proc/device-tree/memory/reg" /* Device file should be multiple of 16 bytes, each containing 8 byte of addr * and its length. Assuming max of 5 entries. */ From patchwork Fri Oct 11 05:46:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175910 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp311802ill; Thu, 10 Oct 2019 23:03:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIoQMKnvyeQdAOqR5gxHjL8KHyzCWT9OxfZOxu9ICDf02jwiE30IX8zUyMREe66gWSdB/k X-Received: by 2002:a05:6402:17f1:: with SMTP id t17mr11548144edy.11.1570773786532; Thu, 10 Oct 2019 23:03:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773786; cv=none; d=google.com; s=arc-20160816; b=s2HyhDjXhQKacZvNSXJl9BZNo0nBqfyvxd/j3viR0V+6DcJorQQMJDAcyWMmh5JVd6 F4fOxHo/EoBSz3W8l5YLqAECVdNKfex7S367AhR0VJZWZdaM1OMMd9cKL4t927sBnW9+ IpgDINoJaXVTvsi8Qy9SnNg0WZR+SmAM7DdFsEhVFoWkg9XLn2hSW7OcctMfXd59Hy74 w57Dnr9DR4Wk4M+TnusjY7TJEnXv/GIN4AgiIsG2T5+OxBAgdFykJQRf8aGAfq6aIsZw pkG3JwPmikegNCaBFpPBKLGvlfZHzASdQEcqJWWzwjAr8GR05pNW0wne1vREumEaCDCt IxIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=5WSJY5s2GBPSBQD8pIhSdfYrB+SiS+0Q9Z1oZafIZ+w=; b=oO3l2+qcsuxrpqX63dBQdlHDettNKEzLsLK3wiouVc8JVd5Ky0sY+PlrS6Jv7JkJjO kefxvkyVwKd/FqdRM2McAVzqOEmfcTNqqraF0MjkRQsk2bDzsgZv+Jf2BrC8yf8zW7JB uDCFgIfDjbm5FrIJfcVIE3wZzcOZo/2j4fFFQWs1k/6r4RiNf4YU2tPOOkp4W2Psutim vIHC7mUTD8ikEi+jvgaEguEsLjltZ+DSXPcUHvHCO2mztNqdlin9FH3v/TDSp9aee2dW Efh3KOUqRCOVoOUQqS3PaSz00ti0RS1rBFgKab4fv3D9k2FFeIO1GEVvdGWT/F4BoX5q jnXg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id c1si4633038edq.250.2019.10.10.23.03.06; Thu, 10 Oct 2019 23:03:06 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A03B31E8EE; Fri, 11 Oct 2019 08:02:43 +0200 (CEST) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id 664A11E932; Fri, 11 Oct 2019 08:02:37 +0200 (CEST) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 2D0C4200094; Fri, 11 Oct 2019 08:02:37 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 166772004E9; Fri, 11 Oct 2019 08:02:34 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id D0DA4402E7; Fri, 11 Oct 2019 14:02:29 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, stable@dpdk.org, Radu Bulie Date: Fri, 11 Oct 2019 11:16:52 +0530 Message-Id: <20191011054657.21931-5-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 4/9] mempool/dpaa2: panic on endless loop in mbuf release 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" When BMAN is not able to accept more buffers, it could be that there are no FBPR's (internal mem provided to bman) left. Panic in such conditions. Fixes: 5dc43d22b5ad ("mempool/dpaa2: add hardware offloaded mempool") Cc: stable@dpdk.org Signed-off-by: Radu Bulie --- drivers/mempool/dpaa2/dpaa2_hw_mempool.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c index f26c30b00..7e815a1ce 100644 --- a/drivers/mempool/dpaa2/dpaa2_hw_mempool.c +++ b/drivers/mempool/dpaa2/dpaa2_hw_mempool.c @@ -192,7 +192,7 @@ rte_dpaa2_mbuf_release(struct rte_mempool *pool __rte_unused, struct qbman_release_desc releasedesc; struct qbman_swp *swp; int ret; - int i, n; + int i, n, retry_count; uint64_t bufs[DPAA2_MBUF_MAX_ACQ_REL]; if (unlikely(!DPAA2_PER_LCORE_DPIO)) { @@ -225,9 +225,13 @@ rte_dpaa2_mbuf_release(struct rte_mempool *pool __rte_unused, } /* feed them to bman */ - do { - ret = qbman_swp_release(swp, &releasedesc, bufs, n); - } while (ret == -EBUSY); + retry_count = 0; + while ((ret = qbman_swp_release(swp, &releasedesc, bufs, n)) == + -EBUSY) { + retry_count++; + if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) + rte_panic("bman release retry exceeded, low fbpr?\n"); + } aligned: /* if there are more buffers to free */ @@ -243,10 +247,13 @@ rte_dpaa2_mbuf_release(struct rte_mempool *pool __rte_unused, #endif } - do { - ret = qbman_swp_release(swp, &releasedesc, bufs, - DPAA2_MBUF_MAX_ACQ_REL); - } while (ret == -EBUSY); + retry_count = 0; + while ((ret = qbman_swp_release(swp, &releasedesc, bufs, + DPAA2_MBUF_MAX_ACQ_REL)) == -EBUSY) { + retry_count++; + if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) + rte_panic("bman release retry exceeded, low fbpr?\n"); + } n += DPAA2_MBUF_MAX_ACQ_REL; } } From patchwork Fri Oct 11 05:46:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175912 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp312104ill; Thu, 10 Oct 2019 23:03:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqwCbVzzn93pYJjP31HzCipF6lYbWVG7dgVsMV5EnJquAovfz8F5sxk2/n30vjS+L77pI0xC X-Received: by 2002:a50:f384:: with SMTP id g4mr11644698edm.282.1570773802972; Thu, 10 Oct 2019 23:03:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773802; cv=none; d=google.com; s=arc-20160816; b=n2Bvjn3P4A9C4UBwqbr7Po9ioIJ1ojTMCDoKiPLGyujJ80lLQjHXSgXuJIf82/zycq GA4NTxa9wM0eOmYVzzXcGjJ4i+M+NiE6AOMNcOUyPNG+9bh+QoUIJn2k1FgaH1ggp2Pw gRUwvk5pdG29C3O7YDHRS0uYnW5Rpsv4OroYbtUpXX9QsfKE17nFzDBQTFAaUaNGqlJt Xltky4tVZeuqtNo/adLS3LyrxvT3vI2ZQgz5wy5eU/pYYc4Ce6rekWVwRLRWv6HycWOe oTyX/gcoyTMmzE3D2heb4zMxvTcnKgS0qYyvGyVAbJmq6zPWIPBbH27yD2/ec2Vqaado LUQg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=/t6/3iwqA00pLAonAjFFFeKxB6HhF0G7U6O4YFopAoY=; b=Xws3huQBQLvpFcteVGrAs7nUOLfUNcggbMX8VxJd91R0h4TDXKMO0IMy4SXsnL1wMo iq+j8m6h8uPeGmICXix9hV3iPfYILCxSmvBh87v/jFb4Xy3Bh+JASACKm8a1lbOBtCGl 8qvn6KXUFW7CPWcPGEWHCVK5fb7ykVxR8jDtM+Qpff1sb+THXRTxxX9dHVOJHQle8wEA rFb0MOqQovPPbngA7IV1CIffXdLvA3jZ1i1c11ppnXkHfba0d+DF2zV0xAAwf05M/YhR SO2O5C7FJ6YbsDmOOV6BzvfT9fBbB2/Hge7Q3AJFi8hWE9JirMml09sriPkYjZgWe52N yHaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id f29si4726689ejj.110.2019.10.10.23.03.22; Thu, 10 Oct 2019 23:03:22 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 81C261E9A8; Fri, 11 Oct 2019 08:02:48 +0200 (CEST) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id 55EF61E954; Fri, 11 Oct 2019 08:02:40 +0200 (CEST) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 169ED2000E5; Fri, 11 Oct 2019 08:02:40 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 54EFA2004EB; Fri, 11 Oct 2019 08:02:36 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 3C306402D2; Fri, 11 Oct 2019 14:02:31 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, stable@dpdk.org, Nipun Gupta , Radu Bulie Date: Fri, 11 Oct 2019 11:16:53 +0530 Message-Id: <20191011054657.21931-6-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 5/9] net/dpaa2: add retry and timeout in packet enqueue 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" In the packet transmit, if the QBMAN is not able to process the packets, the Tx function loops infinitely to send the packet out. This patch changes the logic retry for some time (count) and then return. Fixes: cd9935cec873 ("net/dpaa2: enable Rx and Tx operations") Fixes: 16c4a3c46ab7 ("bus/fslmc: add enqueue response read in qbman") Cc: stable@dpdk.org Signed-off-by: Nipun Gupta Signed-off-by: Radu Bulie --- drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 2 + drivers/net/dpaa2/dpaa2_rxtx.c | 72 ++++++++++++++++++++----- 2 files changed, 60 insertions(+), 14 deletions(-) -- 2.17.1 diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index 5087f68c6..d28c7159f 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -59,6 +59,8 @@ #define DPAA2_SWP_CINH_REGION 1 #define DPAA2_SWP_CENA_MEM_REGION 2 +#define DPAA2_MAX_TX_RETRY_COUNT 10000 + #define MC_PORTAL_INDEX 0 #define NUM_DPIO_REGIONS 2 #define NUM_DQS_PER_QUEUE 2 diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index b7b2d8652..52d913d9e 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -1135,15 +1135,28 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) #endif bufs++; } + loop = 0; + retry_count = 0; while (loop < frames_to_send) { - loop += qbman_swp_enqueue_multiple(swp, &eqdesc, + ret = qbman_swp_enqueue_multiple(swp, &eqdesc, &fd_arr[loop], &flags[loop], frames_to_send - loop); + if (unlikely(ret < 0)) { + retry_count++; + if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) { + num_tx += loop; + nb_pkts -= loop; + goto send_n_return; + } + } else { + loop += ret; + retry_count = 0; + } } - num_tx += frames_to_send; - nb_pkts -= frames_to_send; + num_tx += loop; + nb_pkts -= loop; } dpaa2_q->tx_pkts += num_tx; return num_tx; @@ -1153,13 +1166,22 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (loop) { unsigned int i = 0; + retry_count = 0; while (i < loop) { - i += qbman_swp_enqueue_multiple(swp, &eqdesc, - &fd_arr[i], - &flags[loop], - loop - i); + ret = qbman_swp_enqueue_multiple(swp, &eqdesc, + &fd_arr[i], + &flags[i], + loop - i); + if (unlikely(ret < 0)) { + retry_count++; + if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) + break; + } else { + i += ret; + retry_count = 0; + } } - num_tx += loop; + num_tx += i; } skip_tx: dpaa2_q->tx_pkts += num_tx; @@ -1365,15 +1387,28 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } bufs++; } + loop = 0; + retry_count = 0; while (loop < frames_to_send) { - loop += qbman_swp_enqueue_multiple_desc(swp, + ret = qbman_swp_enqueue_multiple_desc(swp, &eqdesc[loop], &fd_arr[loop], frames_to_send - loop); + if (unlikely(ret < 0)) { + retry_count++; + if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) { + num_tx += loop; + nb_pkts -= loop; + goto send_n_return; + } + } else { + loop += ret; + retry_count = 0; + } } - num_tx += frames_to_send; - nb_pkts -= frames_to_send; + num_tx += loop; + nb_pkts -= loop; } dpaa2_q->tx_pkts += num_tx; return num_tx; @@ -1383,11 +1418,20 @@ dpaa2_dev_tx_ordered(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) if (loop) { unsigned int i = 0; + retry_count = 0; while (i < loop) { - i += qbman_swp_enqueue_multiple_desc(swp, &eqdesc[loop], - &fd_arr[i], loop - i); + ret = qbman_swp_enqueue_multiple_desc(swp, + &eqdesc[loop], &fd_arr[i], loop - i); + if (unlikely(ret < 0)) { + retry_count++; + if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) + break; + } else { + i += ret; + retry_count = 0; + } } - num_tx += loop; + num_tx += i; } skip_tx: dpaa2_q->tx_pkts += num_tx; From patchwork Fri Oct 11 05:46:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175911 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp311950ill; Thu, 10 Oct 2019 23:03:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzjiS0fnufLwuRSeQZPrJRO75gzsPiTPdQPDIhmd0tDvttF4WUjiD/Rnw+sUcyC6UvWXLYW X-Received: by 2002:a05:6402:1b8a:: with SMTP id cc10mr11880190edb.202.1570773793613; Thu, 10 Oct 2019 23:03:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773793; cv=none; d=google.com; s=arc-20160816; b=ZU4M9ZwKFea6AjlyLwJ1z3fqtXWM4Z9V4d4KEQrEofshIRjTF+JwFgOq2RITFecI5Y jgvJl5Kz3fHdNjNQnWHm1sfcysogqI3y+ZAd5DLjH2I6GVVclMbgQhCwWasCC6sB7HAM Fqm0IfELV5C+sVxqv9i/Am/EP8smID5SCIduzVBJfHk9mTCh7lTd0ZtQ2ThD8V7b3zq9 JHFNONHG/GTOrW11ilJLGxDw1bJR6OfdgSMh35YmUtIDDPRtFtq+AvzoqJG17+a1bBm/ 1U3FJ7+o+0Mrpbm+jDbUn6DfNIz4y6aeKC0nqZNZ8jhiM1G5e5mv8ETY36r0pJaRDGuL 2cGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=TBzjmuR3Eylrx2Z/5mkGDeRghWLnFrSQFXfkkqso9xc=; b=vurqhpGg085qQ9+SETZuwSpEovNYSu9p4+mJMh27QW7WgqGDPh/iWT+IwcejQ1Y6nj jDiyrwWNBNYSVdGCXW4wWggvnISjM5+AcTg9Qb18CrKYBhKJMtfmrTGsHTaIX2Njl+/6 8NdBsib1gDNgSydcrBe/2HCDVOnD7m9CnpjPooVQ/4oUI1NSVwDNzeY/dSefsY3xh3S3 ZXgkL3nkesdQmJ18QhyHt+a7w7gmZUqaFWqI4R84+NEwguF8o9slCDQDNHmD6qiHs+CU ahpgA8mk5Ld9hNhbcnveZgK0ylTFHSZfLcIUJu473L7aGWcLZLCrjRw7Qe1VHsuDN+Gc xopA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id c24si4718829edt.364.2019.10.10.23.03.13; Thu, 10 Oct 2019 23:03:13 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 42FD01E937; Fri, 11 Oct 2019 08:02:46 +0200 (CEST) Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by dpdk.org (Postfix) with ESMTP id 24BED1E932; Fri, 11 Oct 2019 08:02:40 +0200 (CEST) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 07DDD1A04E3; Fri, 11 Oct 2019 08:02:40 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id E6E171A04EE; Fri, 11 Oct 2019 08:02:36 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id A2902402FF; Fri, 11 Oct 2019 14:02:32 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, stable@dpdk.org, Nipun Gupta Date: Fri, 11 Oct 2019 11:16:54 +0530 Message-Id: <20191011054657.21931-7-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 6/9] raw/dpaa2_qdma: add retry and timeout in packet enqueue 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 adds the logic in the DPAA2 QDMA packet enqueue API Fixes: 4d9a3f2a0159 ("raw/dpaa2_qdma: support RBP mode") Cc: stable@dpdk.org Signed-off-by: Nipun Gupta --- drivers/raw/dpaa2_qdma/dpaa2_qdma.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -- 2.17.1 Acked-by: Hemant Agrawal diff --git a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c index a391913b0..af678273d 100644 --- a/drivers/raw/dpaa2_qdma/dpaa2_qdma.c +++ b/drivers/raw/dpaa2_qdma/dpaa2_qdma.c @@ -541,13 +541,21 @@ dpdmai_dev_enqueue_multi(struct dpaa2_dpdmai_dev *dpdmai_dev, } /* Enqueue the packet to the QBMAN */ - uint32_t enqueue_loop = 0; + uint32_t enqueue_loop = 0, retry_count = 0; while (enqueue_loop < loop) { - enqueue_loop += qbman_swp_enqueue_multiple(swp, + ret = qbman_swp_enqueue_multiple(swp, &eqdesc, &fd[enqueue_loop], NULL, loop - enqueue_loop); + if (unlikely(ret < 0)) { + retry_count++; + if (retry_count > DPAA2_MAX_TX_RETRY_COUNT) + return num_tx - (loop - enqueue_loop); + } else { + enqueue_loop += ret; + retry_count = 0; + } } nb_jobs -= loop; } From patchwork Fri Oct 11 05:46:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175914 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp312325ill; Thu, 10 Oct 2019 23:03:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqwjZ2ftuuJeHod1IdMWWrTZF1lhkKLITnRFnbTKLWe0FSEYuB5HKAOGHVbQC9aGmEEhiYTK X-Received: by 2002:a17:906:b6c6:: with SMTP id ec6mr12115052ejb.54.1570773819034; Thu, 10 Oct 2019 23:03:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773819; cv=none; d=google.com; s=arc-20160816; b=Nl65D3s6h3mN7gWf0U8XUycxBNh9hqjEgLRRL9Ctu6Jn6e3Kdtd7lyc+vFyehDYXYy KsU9hHaNXT5hNXiOEkxO/HG45Ki6l0uBr3lk+I59SCnjz0kTvr4wt/AkKeGkojtyYwNu 4wGu/Q8N3+Xo/OFi+UHT9kE4rEPqjvONMEr1qgczikfZR/KccCtZ7DZg5XltrCbQ6u1p VzvVR7OBH0GEqV/+eJRC3O9e3ZOXp1D5cZQpuphs9AfRK9ewvVY2uScq0gsWg7nbf2su Y0VdMwOIIiLX1hG3ty59/edBnMi2f8vzExX2ON+W1xTXZ2XpJBi+jyUIA4RK+iqIerUc gpVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=yMzQMAIix6gQMlstUC8mQTY+bQBJvL78Lq2INujXIzk=; b=i4dDlul0cvbTCr0FyoQnZwLQYpg6wGof7xR6TxeHB9N628t2rWXaR1FiKZMbKWxwoZ UsYx+TBDnqyqlXYFLu1hNa2rQzu+OVMd/bqkuYrsf9JfnC6fGEnMf8AVQYSK+f2MoKJL hvezBge50Rd8eX4a4vDcANhzD/WX+eoiyY8jIXif3LaGB2Eqqtvmv8wXGkAqa2X314Lz zUfvMmXQR5CfCHhdRdyFtSfZP7j1a+VBEziA7w6QYXfOwEBcU+cXbhCOwwh997Cn90be lPJtOjdaSXiANea7cpn7SBjLjypDC3pjMCxv4wv+NIK3mGT2ATbNebpJ228i8+kWYs2v 1HGg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id h17si5597477edb.89.2019.10.10.23.03.38; Thu, 10 Oct 2019 23:03:39 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BEA291E9C5; Fri, 11 Oct 2019 08:02:51 +0200 (CEST) Received: from inva020.nxp.com (inva020.nxp.com [92.121.34.13]) by dpdk.org (Postfix) with ESMTP id 006CA1E97A; Fri, 11 Oct 2019 08:02:41 +0200 (CEST) Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id BBA371A02AF; Fri, 11 Oct 2019 08:02:41 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id A72351A0501; Fri, 11 Oct 2019 08:02:38 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 11EB9402DA; Fri, 11 Oct 2019 14:02:33 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, stable@dpdk.org, Nipun Gupta Date: Fri, 11 Oct 2019 11:16:55 +0530 Message-Id: <20191011054657.21931-8-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 7/9] raw/dpaa2_cmdif: add retry and timeout in packet enqueue 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 adds retry in the DPAA2 CMDIF packet enqueue API Fixes: 53c71586c789 ("raw/dpaa2_cmdif: support enqueue/dequeue operations") Cc: stable@dpdk.org Signed-off-by: Nipun Gupta --- drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 Acked-by: Hemant Agrawal diff --git a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c index 3f42da1fe..ae53114b5 100644 --- a/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c +++ b/drivers/raw/dpaa2_cmdif/dpaa2_cmdif.c @@ -62,6 +62,7 @@ dpaa2_cmdif_enqueue_bufs(struct rte_rawdev *dev, struct qbman_fd fd; struct qbman_eq_desc eqdesc; struct qbman_swp *swp; + uint32_t retry_count = 0; int ret; RTE_SET_USED(count); @@ -100,11 +101,15 @@ dpaa2_cmdif_enqueue_bufs(struct rte_rawdev *dev, ret = qbman_swp_enqueue_multiple(swp, &eqdesc, &fd, NULL, 1); if (ret < 0 && ret != -EBUSY) DPAA2_CMDIF_ERR("Transmit failure with err: %d\n", ret); - } while (ret == -EBUSY); + retry_count++; + } while ((ret == -EBUSY) && (retry_count < DPAA2_MAX_TX_RETRY_COUNT)); + + if (ret < 0) + return ret; DPAA2_CMDIF_DP_DEBUG("Successfully transmitted a packet\n"); - return 0; + return 1; } static int From patchwork Fri Oct 11 05:46:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175913 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp312203ill; Thu, 10 Oct 2019 23:03:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5tVLQhKUru/kxJoBKmBJEMlrNchyc/TpbKoMZtrXF4Th2JchuLTAC9dOHx7v5k5nlQMVI X-Received: by 2002:a17:906:6a43:: with SMTP id n3mr11854891ejs.292.1570773811097; Thu, 10 Oct 2019 23:03:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773811; cv=none; d=google.com; s=arc-20160816; b=ZUfnLIfOPZPuxvpDDwvMI44L09HjoU8kvqc+4R2+KM1OyOr5Jg4w5MkaGDc4cpr/7w 5/IKCMGvlYQQ0q0xK2o9JAOralKWmVtYGSCjSegzV/UWc6JrqMDZDLVPuEUpJaFTE+zq 1dO2bhdDIYd4F0jhwwoAS2jmXy3hvAHsRgG18RBpG6dnQC3NNJ/IFpLR1oeCTYOGKWyv 3umDJJXmVkix0c8FrqFEopQHIfdT0NEP6g46BBbVt51NNN/dujWf0mWNKNmQddjhRbSy le0qL5jSZHdHhzk8o+lFjM3vjoFTYIXSaP4YE9uUDKBToy+M1WTG5aYbEG3H5piyi3IF 9RDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=DxCMn8zwp1aA6We1jteGvVDRyTLLIDGmLQSYD15LD+c=; b=uYUxAcEYc7SaR+pRWwAxOXGEkp4c4FzOVAGHkcNTSw03UzhTjuzhBSlmL2QkDT20Q4 9o/UPmHz1zNso2cVOdeQ8Tpyi6aOA8kU4gqa4khJz1RLbrfkORPu0caRh7ckAFRShydQ 8C/agor4977yjmsiHE0P9X6par/mQAVmPWH0yAsAaJrnx6wYCgq+nRm5QNBYwqWCuTdX Xap1abZCtCAjw7p53ajJC1exDjqOwZ7y2GonqVgkHbBygdHi/5yEZPmH3CXt7h175+sX tlfcU2IxtGUUx2CYIyk72ZA3ASmGJtD7S82DswtM3jMpQbmIYPS195ecLZUNxNpgozbB PLHg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id e43si5041836eda.296.2019.10.10.23.03.30; Thu, 10 Oct 2019 23:03:31 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BB2D1E9B6; Fri, 11 Oct 2019 08:02:50 +0200 (CEST) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id 89C6F1E97A for ; Fri, 11 Oct 2019 08:02:41 +0200 (CEST) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 694A1200094; Fri, 11 Oct 2019 08:02:41 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id DEBF52004CD; Fri, 11 Oct 2019 08:02:38 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id C564A40299; Fri, 11 Oct 2019 14:02:35 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com Date: Fri, 11 Oct 2019 11:16:56 +0530 Message-Id: <20191011054657.21931-9-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 8/9] bus/dpaa: moving qbman global init to bus 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" From: Hemant Agrawal DPAA SEC shall be able to work independent of DPAA ETH driver. This patch moves qbman init to bus, so that any driver can use them even when no eth resources are present or none of the eth devices are probed. Signed-off-by: Hemant Agrawal --- drivers/bus/dpaa/dpaa_bus.c | 21 +++++++++++++++++++-- drivers/bus/dpaa/rte_bus_dpaa_version.map | 2 -- drivers/crypto/dpaa_sec/dpaa_sec.c | 8 ++++++++ drivers/net/dpaa/dpaa_ethdev.c | 14 -------------- 4 files changed, 27 insertions(+), 18 deletions(-) -- 2.17.1 diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c index 1d8a294b1..882b6e2f3 100644 --- a/drivers/bus/dpaa/dpaa_bus.c +++ b/drivers/bus/dpaa/dpaa_bus.c @@ -561,8 +561,24 @@ rte_dpaa_bus_probe(void) return 0; /* Device list creation is only done once */ - if (!process_once) + if (!process_once) { rte_dpaa_bus_dev_build(); + if (rte_eal_process_type() == RTE_PROC_PRIMARY) { + /* One time load of Qman/Bman drivers */ + ret = qman_global_init(); + if (ret) { + DPAA_PMD_ERR("QMAN initialization failed: %d", + ret); + return ret; + } + ret = bman_global_init(); + if (ret) { + DPAA_PMD_ERR("BMAN initialization failed: %d", + ret); + return ret; + } + } + } process_once = 1; /* If no device present on DPAA bus nothing needs to be done */ @@ -600,7 +616,8 @@ rte_dpaa_bus_probe(void) RTE_DEV_WHITELISTED)) { ret = drv->probe(drv, dev); if (ret) { - DPAA_BUS_ERR("Unable to probe.\n"); + DPAA_BUS_ERR("unable to probe:%s", + dev->name); } else { dev->driver = drv; dev->device.driver = &drv->driver; diff --git a/drivers/bus/dpaa/rte_bus_dpaa_version.map b/drivers/bus/dpaa/rte_bus_dpaa_version.map index a221522c2..3b411aa13 100644 --- a/drivers/bus/dpaa/rte_bus_dpaa_version.map +++ b/drivers/bus/dpaa/rte_bus_dpaa_version.map @@ -4,7 +4,6 @@ DPDK_17.11 { bman_acquire; bman_free_pool; bman_get_params; - bman_global_init; bman_new_pool; bman_query_free_buffers; bman_release; @@ -50,7 +49,6 @@ DPDK_17.11 { qman_enqueue_multi; qman_fq_fqid; qman_fq_state; - qman_global_init; qman_init_fq; qman_poll_dqrr; qman_query_fq_np; diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 1754862be..ce9a87095 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -2718,6 +2718,14 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, } } + if (unlikely(!RTE_PER_LCORE(dpaa_io))) { + retval = rte_dpaa_portal_init((void *)1); + if (retval) { + DPAA_SEC_ERR("Unable to initialize portal"); + return retval; + } + } + /* Invoke PMD device initialization function */ retval = dpaa_sec_dev_init(cryptodev); if (retval == 0) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index caf255d67..16b52b5e1 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -1576,20 +1576,6 @@ rte_dpaa_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, } if (!is_global_init && (rte_eal_process_type() == RTE_PROC_PRIMARY)) { - /* One time load of Qman/Bman drivers */ - ret = qman_global_init(); - if (ret) { - DPAA_PMD_ERR("QMAN initialization failed: %d", - ret); - return ret; - } - ret = bman_global_init(); - if (ret) { - DPAA_PMD_ERR("BMAN initialization failed: %d", - ret); - return ret; - } - if (access("/tmp/fmc.bin", F_OK) == -1) { RTE_LOG(INFO, PMD, "* FMC not configured.Enabling default mode\n"); From patchwork Fri Oct 11 05:46:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 175915 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp312489ill; Thu, 10 Oct 2019 23:03:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqy0DtlknKfYQMwbkesut7Pe6Y5OuU/HpZdY5NtsbjgT2X5R7BCz2FFXfiAGAE1AwMpEcq3z X-Received: by 2002:aa7:cfc2:: with SMTP id r2mr268387edy.229.1570773827574; Thu, 10 Oct 2019 23:03:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570773827; cv=none; d=google.com; s=arc-20160816; b=BCrOLKh01e/VoapN60VUjjh5866fQqWg9cK37wk+nJ/x5g5ZiwPq85Jji1K6RgoGQr 9EPsyW/urryTlwGONbb2IvTi0sxQ1YX+h8f4F29F8YbSVQLkQu0hnuOnd8LloQcUNv5B VWfL3YUPdpwVewpuZMUzKjVmDIUAtXqTTB8utMYzR6EhVxy0EiwTYk1khIkXcUHyconM pV65T7nYKDTW0gkQMOVwIluODARBwiFscchBOPtngWVQDiAz9HVf/HsyV3ANMGO7GkgT 8dLzLhJTsy5OuiUVFBkM03wsjAsYT2OFufQZC4ObEE092WxIxjM/uCKEKwdg0bEfQTTk uD0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=oz3rre3cU5Bh7wSL3PrKrjAKg0kHnX+VedT9WemeVz4=; b=bvBeNOs/ihJ2g25eRpzxoeM3sFO8Eh3rJcKK/r9ZndGWLhRxGVGmgegcjB7g+wRC2Q nHgYTQS/eZpMK9A5K8l8FoU5ps35lfC+SRPfdLSbGeUQkdBQHUalTW1NOJnjOz/pWo6o RFbd+r0yvScqxcQTlHIRXFXXVyVBkptVLXxzsmZbP3Eviux75PoFWIM/kzR2aD7yhig3 XPf7fPFfV3xvCLKzANxPPbZ7yKqqFoLvJvs+VzBx60+Jz+ZtAq7cElwQgMi2ER9kFEYK Fe+nYwAs0LxyH0dqQkJTFdjnOAXpKOcW1vHYYeTEF4HDSXs3fsBY3nU62bwkGb5YHNwk I4Fw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id f2si4755848ejw.335.2019.10.10.23.03.47; Thu, 10 Oct 2019 23:03:47 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8FCBB1E97D; Fri, 11 Oct 2019 08:02:53 +0200 (CEST) Received: from inva021.nxp.com (inva021.nxp.com [92.121.34.21]) by dpdk.org (Postfix) with ESMTP id 658491E983 for ; Fri, 11 Oct 2019 08:02:43 +0200 (CEST) Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 30C542004CD; Fri, 11 Oct 2019 08:02:43 +0200 (CEST) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 7C80D2004EB; Fri, 11 Oct 2019 08:02:40 +0200 (CEST) Received: from GDB1.ap.freescale.net (GDB1.ap.freescale.net [10.232.132.179]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id CB4BC402E4; Fri, 11 Oct 2019 14:02:36 +0800 (SGT) From: Nipun Gupta To: dev@dpdk.org Cc: ferruh.yigit@intel.com, hemant.agrawal@nxp.com, sachin.saxena@nxp.com, Shreyansh Jain Date: Fri, 11 Oct 2019 11:16:57 +0530 Message-Id: <20191011054657.21931-10-nipun.gupta@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191011054657.21931-1-nipun.gupta@nxp.com> References: <20191011054657.21931-1-nipun.gupta@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP Subject: [dpdk-dev] [PATCH 9/9] bus/fslmc: sanitize device name parsing for clarity 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" From: Shreyansh Jain remove unneccessary dup and free Signed-off-by: Shreyansh Jain --- drivers/bus/fslmc/fslmc_bus.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -- 2.17.1 diff --git a/drivers/bus/fslmc/fslmc_bus.c b/drivers/bus/fslmc/fslmc_bus.c index eff15f25d..251f148da 100644 --- a/drivers/bus/fslmc/fslmc_bus.c +++ b/drivers/bus/fslmc/fslmc_bus.c @@ -236,8 +236,9 @@ rte_fslmc_parse(const char *name, void *addr) { uint16_t dev_id; char *t_ptr; - char *sep = NULL; + const char *sep; uint8_t sep_exists = 0; + int ret = -1; DPAA2_BUS_DEBUG("Parsing dev=(%s)", name); @@ -267,10 +268,11 @@ rte_fslmc_parse(const char *name, void *addr) } else { DPAA2_BUS_DEBUG("Invalid device for matching (%s).", name); + ret = -EINVAL; goto err_out; } } else - sep = strdup(name); + sep = name; jump_out: /* Validate device name */ @@ -284,23 +286,23 @@ rte_fslmc_parse(const char *name, void *addr) strncmp("dpdmai", sep, 6) && strncmp("dpdmux", sep, 6)) { DPAA2_BUS_DEBUG("Unknown or unsupported device (%s)", sep); + ret = -EINVAL; goto err_out; } t_ptr = strchr(sep, '.'); if (!t_ptr || sscanf(t_ptr + 1, "%hu", &dev_id) != 1) { DPAA2_BUS_ERR("Missing device id in device name (%s)", sep); + ret = -EINVAL; goto err_out; } if (addr) strcpy(addr, sep); - return 0; + ret = 0; err_out: - if (!sep_exists && sep) - free(sep); - return -EINVAL; + return ret; } static int