From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4F41442ECF for ; Thu, 20 Jul 2023 17:23:30 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4AE6640685; Thu, 20 Jul 2023 17:23:30 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 10D42400D6 for ; Thu, 20 Jul 2023 17:23:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866607; 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=xKTnsty1inI9FU0hiNQAlilJeN/Td3lkNiMzGgIRPNs=; b=O80ZOBqm5qYUOZAkEMb1BSEqqd7Sv/Z4pfLPI4oaYfITdl9GMDndHe7ovQEDqjqnEyIOoo fPUdnmCAZEM0IWfVWCHutRGn5csItVDOoq1QB2UwC/t7cAvOVX6UhzQfk/N+UEZ7tmly5n Vw5CbWTiJpov38Nsj4Fsa8/cpWd/Re8= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-384-ifvN3BWBN2C_ABliknRW4w-1; Thu, 20 Jul 2023 11:21:56 -0400 X-MC-Unique: ifvN3BWBN2C_ABliknRW4w-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D29A01C09072; Thu, 20 Jul 2023 15:21:09 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id CB0FC492C13; Thu, 20 Jul 2023 15:21:08 +0000 (UTC) From: Kevin Traynor To: Kaijun Zeng Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/vmxnet3: fix return code in initializing' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:18:00 +0100 Message-ID: <20230720151942.262154-49-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f68f4b2b8b4b4650f31939f043c906a7182aabe4 Thanks. Kevin --- >From f68f4b2b8b4b4650f31939f043c906a7182aabe4 Mon Sep 17 00:00:00 2001 From: Kaijun Zeng Date: Wed, 7 Jun 2023 13:57:25 -0400 Subject: [PATCH] net/vmxnet3: fix return code in initializing [ upstream commit 8a2de735318b38ba93a041cb2f209889bde02689 ] Improve error handling Bugzilla ID: 1239 Fixes: dfaff37fc46d ("vmxnet3: import new vmxnet3 poll mode driver implementation") Signed-off-by: Kaijun Zeng Reviewed-by: Ferruh Yigit --- .mailmap | 1 + drivers/net/vmxnet3/vmxnet3_rxtx.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index 5e85db906b..288cc4913c 100644 --- a/.mailmap +++ b/.mailmap @@ -678,4 +678,5 @@ Junyu Jiang Juraj Linkeš Kai Ji +Kaijun Zeng Kaiwen Deng Kalesh AP diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index 76bfdbaaa3..a01f2c3cdd 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -1270,9 +1270,16 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev) /* Passing 0 as alloc_num will allocate full ring */ ret = vmxnet3_post_rx_bufs(rxq, j); - if (ret <= 0) { + + /* Zero number of descriptors in the configuration of the RX queue */ + if (ret == 0) { PMD_INIT_LOG(ERR, - "ERROR: Posting Rxq: %d buffers ring: %d", - i, j); - return -ret; + "Invalid configuration in Rx queue: %d, buffers ring: %d\n", + i, j); + return -EINVAL; + } + /* Return the error number */ + if (ret < 0) { + PMD_INIT_LOG(ERR, "Posting Rxq: %d buffers ring: %d", i, j); + return ret; } /* -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:00.952265304 +0100 +++ 0049-net-vmxnet3-fix-return-code-in-initializing.patch 2023-07-20 16:17:54.718750741 +0100 @@ -1 +1 @@ -From 8a2de735318b38ba93a041cb2f209889bde02689 Mon Sep 17 00:00:00 2001 +From f68f4b2b8b4b4650f31939f043c906a7182aabe4 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a2de735318b38ba93a041cb2f209889bde02689 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 42f198f284..986ba9c988 100644 +index 5e85db906b..288cc4913c 100644 @@ -23 +24 @@ -@@ -688,4 +688,5 @@ Junyu Jiang +@@ -678,4 +678,5 @@ Junyu Jiang @@ -27 +27,0 @@ - Kaisen You @@ -28,0 +29 @@ + Kalesh AP @@ -30 +31 @@ -index 148f65383e..380f41f98b 100644 +index 76bfdbaaa3..a01f2c3cdd 100644 @@ -33 +34 @@ -@@ -1338,9 +1338,16 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev) +@@ -1270,9 +1270,16 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)