From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 8F049A051C
for <public@inbox.dpdk.org>; Tue, 11 Feb 2020 12:27:50 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 7C4A11BF7C;
Tue, 11 Feb 2020 12:27:50 +0100 (CET)
Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com
[209.85.221.67]) by dpdk.org (Postfix) with ESMTP id F0BF01BF7C
for <stable@dpdk.org>; Tue, 11 Feb 2020 12:27:48 +0100 (CET)
Received: by mail-wr1-f67.google.com with SMTP id t3so11895748wru.7
for <stable@dpdk.org>; Tue, 11 Feb 2020 03:27:48 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=WdUxAK85h/4aRqGqEgA/rrII680af7is4Z2ap2ymePA=;
b=sEMPb3UvtyBZyYsbP8V4oLVpGAvntxg9cDRNkvUTAwkuXrza81x+AidJStY9RAE4nG
0PZIwE5EbZmofFvyuuCZEV2jxgrcdGDN2NExFCAJxQ5sCyhqzGC/wv01g2ymVzQfBioh
st8FNeaO2zgr2I3DeNGNOr5+OJTpqbXqeltp4arcEVTWKe7TF0Lm6R/+iGuwmFl86pli
VN7XN7RLshaqFS1GkyHzxd7wz4EVOiDyacjapGIei3l10lJSZ00HufrbfQQrExnnewfr
Lc5bHC5E8mRy6EAV+4VTavl6Elax52iQeXsYpBDm4Idc33QSfzDm9m8qQ+U5cSp7f0Af
x8GA==
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:mime-version:content-transfer-encoding;
bh=WdUxAK85h/4aRqGqEgA/rrII680af7is4Z2ap2ymePA=;
b=let3BLFndf6NL4EUvqEsBOXAqw9SeSunAoEo9LjjIGMyIJJfPrGL7krSp/BeR/vAUN
l5Ffgg1rGLSHCdRBqdt8E5TzsSgR/dctxfTmkz8mcdFEnYYJ0jfl++Nkx24ite6hUvbV
zgNNtUoSvj3eFyhaNgIoIbIjXbQqv0nT36h3j0grwut0rfBVrGcY+4Pp8T3kiv5ur9Rs
52h5DOGwL4k4KDCBRiv8vqh5na0FPx/1aOat/PcA6cIArKbDJ7nn8am3j4K9yV6a5aIf
lg/ndY+qc6zqyKIILmdGJFAVXP2E9WmQps+1SteeLf2V1RgyEEhZr2pP8Vl/+SMgIbqK
9jgw==
X-Gm-Message-State: APjAAAWO3oS7JxLdQJSHhfeRbz07Lk6yxj3WidiITs57xpPcwubC2/DQ
uuhqhps2QAJac6Tmj9oUS2KevH9pfYs=
X-Google-Smtp-Source: APXvYqxwjtW6SaKbxQM/V5JJVpQFDiNIZpome4XtgE24CLP0oLNWqGZr8qHnGGsghySgwhCMaXijyQ==
X-Received: by 2002:adf:fa86:: with SMTP id h6mr7959426wrr.418.1581420467737;
Tue, 11 Feb 2020 03:27:47 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id q10sm3337774wme.16.2020.02.11.03.27.46
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 11 Feb 2020 03:27:47 -0800 (PST)
From: luca.boccassi@gmail.com
To: Ajit Khaparde <ajit.khaparde@broadcom.com>
Cc: Lance Richardson <lance.richardson@broadcom.com>,
dpdk stable <stable@dpdk.org>
Date: Tue, 11 Feb 2020 11:20:03 +0000
Message-Id: <20200211112216.3929-57-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com>
References: <20200211112216.3929-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/bnxt: fix overwriting error message' has
been queued to stable release 19.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. 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.
Thanks.
Luca Boccassi
---
>From d82523e5dc9bbeb10702682401cbb2fcd2bb4128 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Fri, 20 Dec 2019 18:42:18 -0800
Subject: [PATCH] net/bnxt: fix overwriting error message
[ upstream commit 88d57889c9f8034e5075a299e4300a862da6449a ]
In some cases when flow creation fails, we overwrite the specific
error message with a generic error message. This patch fixes it.
Fixes: d24610f7bfda ("net/bnxt: allow flow creation when RSS is enabled")
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Lance Richardson <lance.richardson@broadcom.com>
---
drivers/net/bnxt/bnxt_flow.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index 2293de2c37..c694367300 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1455,7 +1455,7 @@ ret:
if (rxq && !vnic->rx_queue_cnt)
rxq->vnic = &bp->vnic_info[0];
}
- return rc;
+ return -rte_errno;
}
static
@@ -1775,7 +1775,7 @@ free_flow:
rte_flow_error_set(error, 0,
RTE_FLOW_ERROR_TYPE_NONE, NULL,
"Flow with pattern exists, updating destination queue");
- else
+ else if (!rte_errno)
rte_flow_error_set(error, -ret,
RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
"Failed to create flow.");
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-11 11:17:41.044527327 +0000
+++ 0057-net-bnxt-fix-overwriting-error-message.patch 2020-02-11 11:17:38.436002020 +0000
@@ -1,13 +1,14 @@
-From 88d57889c9f8034e5075a299e4300a862da6449a Mon Sep 17 00:00:00 2001
+From d82523e5dc9bbeb10702682401cbb2fcd2bb4128 Mon Sep 17 00:00:00 2001
From: Ajit Khaparde <ajit.khaparde@broadcom.com>
Date: Fri, 20 Dec 2019 18:42:18 -0800
Subject: [PATCH] net/bnxt: fix overwriting error message
+[ upstream commit 88d57889c9f8034e5075a299e4300a862da6449a ]
+
In some cases when flow creation fails, we overwrite the specific
error message with a generic error message. This patch fixes it.
Fixes: d24610f7bfda ("net/bnxt: allow flow creation when RSS is enabled")
-Cc: stable@dpdk.org
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
Reviewed-by: Lance Richardson <lance.richardson@broadcom.com>
@@ -16,10 +17,10 @@
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
-index 707aedcec7..cde1fa41c4 100644
+index 2293de2c37..c694367300 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
-@@ -1485,7 +1485,7 @@ ret:
+@@ -1455,7 +1455,7 @@ ret:
if (rxq && !vnic->rx_queue_cnt)
rxq->vnic = &bp->vnic_info[0];
}
@@ -28,7 +29,7 @@
}
static
-@@ -1815,7 +1815,7 @@ free_flow:
+@@ -1775,7 +1775,7 @@ free_flow:
rte_flow_error_set(error, 0,
RTE_FLOW_ERROR_TYPE_NONE, NULL,
"Flow with pattern exists, updating destination queue");