From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 420C3A0C47
for <public@inbox.dpdk.org>; Mon, 26 Jul 2021 15:55:07 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 3C36340DDA;
Mon, 26 Jul 2021 15:55:07 +0200 (CEST)
Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com
[209.85.128.48]) by mails.dpdk.org (Postfix) with ESMTP id 0D88E40DDA
for <stable@dpdk.org>; Mon, 26 Jul 2021 15:55:06 +0200 (CEST)
Received: by mail-wm1-f48.google.com with SMTP id
a80-20020a1c98530000b0290245467f26a4so66570wme.0
for <stable@dpdk.org>; Mon, 26 Jul 2021 06:55:06 -0700 (PDT)
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=cJWxtjIeKi0pxDAM+AuADvTJdMCke5W733kQSvpxNoU=;
b=Rt4MR/ANzwYoVI5l5/Lho4Zfn3vOV8xyQo1vDnOCQn2APfaAijkbQm5iHKpnLXIxlO
xOnQ8T8LOqNhxSYR8Dmn9tCNI7NcwRLbitKn0Mo3MpIhk5qP4vpGh+UvbEZKuI+Bk31q
iybS2gEIXmpmAxfuM6EdeGpauhAVtus2cYKEqoEjbtZM5qu25YtbOu4e/26BsaQAWnKX
kf/n6z4mt5T4ZEKxJfeBuUdcmWISGUG7t1F9iuetOVsr9R3ygHMWQoFnmiTnTLTQ6msd
v2N2HVDR8EszvnzLS5yD1AGevYY8vwoUQfEryv3ZFo5Hq6Xq6alg8Xg8NcFiyUGCbHq4
xY8w==
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=cJWxtjIeKi0pxDAM+AuADvTJdMCke5W733kQSvpxNoU=;
b=cpSNNwzzPpRFd7bU0YOykjk9RWBsez/aC4dkShMasXMqT/6k+K7EGktuROi2JH2VEN
OBlXDh3oAWPC4SRyJ8bmJV+MfS0Pulj5RZ3S8kGV1B3o60Xe6wCLTJERnm8RGt1mEBYC
TVpYjEnC2FFL+0v4yGnpoOL7mqL5xtXJMwvRYbkhbreLIGk/FRLqN/ecNAy5X9hIpqZm
lRCOw7jRlYjecaXh6pjNWnlBE1SCTxcadzYlmMX9AqmAGo6Q2USzpiw8g20roj+AR8mC
yUd25A62F6NbeYlQaSqPNClZ5OGncXeTCoVI55HmeQeE9A0aEngkzkO0fQyw02lOUPVF
OjsA==
X-Gm-Message-State: AOAM533TkfT3JptQ12zOgRVI03dvE2WYr1J29GtEycaJF2W/DahqxCHU
3BZR8PMYHgfn/Mff89UtZz8=
X-Google-Smtp-Source: ABdhPJzo8LGD7XdZMVlyjY63Lf5mKb7U+kncXyEsPgGmvZNPQ4fcvf6DSoY1rHPiCVfMlwAYlyWHfg==
X-Received: by 2002:a05:600c:3595:: with SMTP id
p21mr16591975wmq.105.1627307705777;
Mon, 26 Jul 2021 06:55:05 -0700 (PDT)
Received: from localhost ([137.220.125.106])
by smtp.gmail.com with ESMTPSA id p4sm1811727wre.83.2021.07.26.06.55.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 26 Jul 2021 06:55:05 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Dmitry Kozlyuk <dkozlyuk@nvidia.com>
Cc: Matan Azrad <matan@nvidia.com>,
dpdk stable <stable@dpdk.org>
Date: Mon, 26 Jul 2021 14:52:54 +0100
Message-Id: <20210726135322.149850-31-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com>
References: <20210712130551.2462159-1-luca.boccassi@gmail.com>
<20210726135322.149850-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/mlx5: fix indirect action modify rollback'
has been queued to stable release 20.11.3
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
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 20.11.3
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/28/21. 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/453f8bb23518e6625dc1cb7e9799449a41080055
Thanks.
Luca Boccassi
---
>From 453f8bb23518e6625dc1cb7e9799449a41080055 Mon Sep 17 00:00:00 2001
From: Dmitry Kozlyuk <dkozlyuk@nvidia.com>
Date: Wed, 21 Jul 2021 15:51:12 +0300
Subject: [PATCH] net/mlx5: fix indirect action modify rollback
[ upstream commit b7c8ea62d00f02c206ec2aded5581c2e0f01c377 ]
mlx5_ind_table_obj_modify() first references queues from the new list,
then applies the new list to HW. In case of apply failure the function
dereferenced queues from the old list, while it should be the new list.
Fixes: fa7ad49e96b5 ("net/mlx5: fix shared RSS action update")
Signed-off-by: Dmitry Kozlyuk <dkozlyuk@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
drivers/net/mlx5/mlx5_rxq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index edf91254b1..002df27ab4 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -2150,7 +2150,7 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,
error:
err = rte_errno;
for (j = 0; j < i; j++)
- mlx5_rxq_release(dev, ind_tbl->queues[j]);
+ mlx5_rxq_release(dev, queues[j]);
rte_errno = err;
DEBUG("Port %u cannot setup indirection table.", dev->data->port_id);
return ret;
--
2.30.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-07-26 13:53:17.473702541 +0100
+++ 0031-net-mlx5-fix-indirect-action-modify-rollback.patch 2021-07-26 13:53:15.865292959 +0100
@@ -1 +1 @@
-From b7c8ea62d00f02c206ec2aded5581c2e0f01c377 Mon Sep 17 00:00:00 2001
+From 453f8bb23518e6625dc1cb7e9799449a41080055 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b7c8ea62d00f02c206ec2aded5581c2e0f01c377 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 4a8b67e731..49165f482e 100644
+index edf91254b1..002df27ab4 100644
@@ -23 +24 @@
-@@ -2086,7 +2086,7 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,
+@@ -2150,7 +2150,7 @@ mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,
@@ -30,2 +31,2 @@
- DRV_LOG(DEBUG, "Port %u cannot setup indirection table.",
- dev->data->port_id);
+ DEBUG("Port %u cannot setup indirection table.", dev->data->port_id);
+ return ret;