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 9667742CBC for ; Thu, 15 Jun 2023 03:35:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 916B942D52; Thu, 15 Jun 2023 03:35:01 +0200 (CEST) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id A71B240E0F for ; Thu, 15 Jun 2023 03:35:00 +0200 (CEST) Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3f8d61cb36cso13170925e9.1 for ; Wed, 14 Jun 2023 18:35:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686792900; x=1689384900; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=O7H8LDR0mFwJT95gdqX4xbVZHK7718iFVQpJqpRDKlY=; b=iZHAd9KsX78mCWjrSBFHXsWIVAcKisnBHdwzRXf8mE9SooaNJAVtnZ5DrLGo8CdeH4 N4RygwEQ4DWvITumsRLcOp8g3wZCszO6hSnFw7LLU3KfeBfXbpmliP0aMHFc6e4Os5/t HQVxeHrR9VOgLUC9pLBjndh0lKlwhws1/kVpNiWw/MTyiHkEpTfN9/2c8LKNwEmJYTgy SAbF3+kdQeodySSGZjwD8Tdr93WBmCHgcBgS5lCUY5ZdgzpJgqP0txacvHbURywp1cHM zZKlBKi2tmojJhWv25z3LDT49JEzVAXVIF0kMHV6Um0iOMqUJBDFyHNip5oony9+L4Zj Gk8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686792900; x=1689384900; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=O7H8LDR0mFwJT95gdqX4xbVZHK7718iFVQpJqpRDKlY=; b=P74173wrEfL80O4l0F3cWrL+GCXUC5xB/PaNRlH8f3sgOBsfEmHLTOy3HKMLxFOmrr 9o1PjMejVICHfgAs2Xp9BYWN3IXTjVHK6bAE/HZKelK/ax4wMwPHbhwJ+bl3vRfLWomH YmsfO7zZ/zJc/ALQYAaGVx4vHTairYD/Avh5+XS7dE2Div1loDDeMMz/AvcQX/mqgOSL V+BT8g8bjZmQ3ZAmXIQsed2NU4hDdAhckF75+MlGOYbrB60RnsqBOKFc1xpPhA4BCSVB 076KeDwkVYU2idZpR0BbUcLdCWpSverUwJTq+6nTdNhRv1+ZuNsDsMXg99e5wsimjvBJ cRbw== X-Gm-Message-State: AC+VfDw7fsjDlLZCy8Kv40HlpLFYbL/kSVRcZSV73hiqAxiz3viV87Cp Hzo0SCpGZ1qfxllBJVtYV9G/6fRmyzY2MH7d X-Google-Smtp-Source: ACHHUZ5O4LjHwkG24pl1yA2UxezKJ9kP7ISTaWEFkJ6xEHkDp9Hz0Hbah6v6WrDkPvAvgfj/JaH3HQ== X-Received: by 2002:a1c:7909:0:b0:3f8:a15:b516 with SMTP id l9-20020a1c7909000000b003f80a15b516mr12277151wme.7.1686792900294; Wed, 14 Jun 2023 18:35:00 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id z8-20020a05600c220800b003f8db429095sm2521292wml.28.2023.06.14.18.34.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 18:34:59 -0700 (PDT) From: luca.boccassi@gmail.com To: Kaijun Zeng Cc: Ferruh Yigit , dpdk stable Subject: patch 'net/vmxnet3: fix return code in initializing' has been queued to stable release 20.11.9 Date: Thu, 15 Jun 2023 02:32:35 +0100 Message-Id: <20230615013258.1439718-40-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230615013258.1439718-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 20.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/17/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/fa78b38a87afb809472ac28d2fe0bb7f6c0118a7 Thanks. Luca Boccassi --- >From fa78b38a87afb809472ac28d2fe0bb7f6c0118a7 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 --- drivers/net/vmxnet3/vmxnet3_rxtx.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_rxtx.c b/drivers/net/vmxnet3/vmxnet3_rxtx.c index 91bcfcd6fd..19691d5372 100644 --- a/drivers/net/vmxnet3/vmxnet3_rxtx.c +++ b/drivers/net/vmxnet3/vmxnet3_rxtx.c @@ -1270,11 +1270,18 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev) for (j = 0; j < VMXNET3_RX_CMDRING_SIZE; j++) { /* 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; } /* * Updating device with the index:next2fill to fill the -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-15 01:56:36.767158075 +0100 +++ 0040-net-vmxnet3-fix-return-code-in-initializing.patch 2023-06-15 01:56:34.643542964 +0100 @@ -1 +1 @@ -From 8a2de735318b38ba93a041cb2f209889bde02689 Mon Sep 17 00:00:00 2001 +From fa78b38a87afb809472ac28d2fe0bb7f6c0118a7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a2de735318b38ba93a041cb2f209889bde02689 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -15 +15,0 @@ - .mailmap | 1 + @@ -17 +17 @@ - 2 files changed, 12 insertions(+), 4 deletions(-) + 1 file changed, 11 insertions(+), 4 deletions(-) @@ -19,12 +18,0 @@ -diff --git a/.mailmap b/.mailmap -index 42f198f284..986ba9c988 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -687,6 +687,7 @@ Jun Yang - Junyu Jiang - Juraj Linkeš - Kai Ji -+Kaijun Zeng - Kaisen You - Kaiwen Deng - Kalesh AP @@ -32 +20 @@ -index 148f65383e..380f41f98b 100644 +index 91bcfcd6fd..19691d5372 100644 @@ -35 +23 @@ -@@ -1337,11 +1337,18 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev) +@@ -1270,11 +1270,18 @@ vmxnet3_dev_rxtx_init(struct rte_eth_dev *dev)