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 33DE6A0093
for <public@inbox.dpdk.org>; Tue, 19 May 2020 15:13:58 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 282941D702;
Tue, 19 May 2020 15:13:58 +0200 (CEST)
Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com
[209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 028C61D8EC
for <stable@dpdk.org>; Tue, 19 May 2020 15:13:54 +0200 (CEST)
Received: by mail-wr1-f66.google.com with SMTP id l18so15867041wrn.6
for <stable@dpdk.org>; Tue, 19 May 2020 06:13:54 -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=eutkYHuvwen46Hb4DOUqLVgpzHDQmvQv0IPjhQytBHo=;
b=jht0hwg6OzRZS3oDTIig4bmB8eHf07CE7k5Pe/3QQxxIvQlPKZugUvgCZ1aB+Pbwfu
S7+M47ueMZg5EOZrDNw3RsYV2ryOjoM53WkzYwbPkdKj8ONhEvWb8fScA1g2aWFUDUoh
f8OhQ6+nVFr1yWGdE6DtZcBHH50kcZSB4CELxGTDIi3zFKOou5VpSnX/Fi1sAKAsLLC3
Xtq7iTTiXxFgfg5l0q0G/NCjxEMjZCmOgXRWDvjf6eErP/QR/ZwQ0f7W2cciJ4QtKUrn
SRY71W59/cMfBK538dZD+GqruoChy5WzoCjESp0cLFM0zvG1hz5oZPeiKzMY9RMPc2Km
SEUg==
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=eutkYHuvwen46Hb4DOUqLVgpzHDQmvQv0IPjhQytBHo=;
b=cab6l4F1dg4JgCPQZtuaeVBbkBAqshiNgJ3Eo+hoR1k7/+xFd0oWGMoVh4GFpzgHej
eYNDWCLvTJVY1n1ovOcCApDch1XzeaaFE+05otWpns68G7cOT7jXYZoUkMVh4xzA+SSN
/IjIphjT0djc5zEQMQKp2/HOf7hCgMGmktrdGiuSRdBg6QVcYpA5c+twUD82jEy3upM5
aeDe7QwQgtnaCNdkmh7BTp9GVbLN1kwQk2lX9GAI5XNNxU5edVtXymGtBkkbAYfXUIaP
3vqHy4fPl0ofSd90/YquXcS22jIAKoHwITLuLdBeOA9QJH51lcypXKW7q1XR2GgltaID
mA9A==
X-Gm-Message-State: AOAM532SkQUPjy4xfXuhJc+dus0cBuE+XLXfzvfkM43kcenCFnNtZMCS
Zozng/ZWkzvjbv5tn7E8EJ8=
X-Google-Smtp-Source: ABdhPJw4ZyP+truIQDxZU1PVk30douNlZh4IhUU5wdpha8oq0L/AO9FhAseMcbAPYWKU0nXl/h7QTw==
X-Received: by 2002:a5d:604b:: with SMTP id j11mr25362757wrt.193.1589894034732;
Tue, 19 May 2020 06:13:54 -0700 (PDT)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id c16sm20567382wrv.62.2020.05.19.06.13.54
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 19 May 2020 06:13:54 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Xiaoyu Min <jackmin@mellanox.com>
Cc: Viacheslav Ovsiienko <viacheslavo@mellanox.com>,
Matan Azrad <matan@mellanox.com>, dpdk stable <stable@dpdk.org>
Date: Tue, 19 May 2020 14:04:48 +0100
Message-Id: <20200519130549.112823-153-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com>
References: <20200519125804.104349-1-luca.boccassi@gmail.com>
<20200519130549.112823-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/mlx5: fix RSS enablement' has been queued
to stable release 19.11.3
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.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 05/21/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 831152d0d94a8548aa804ece84acd2ac1529fc8b Mon Sep 17 00:00:00 2001
From: Xiaoyu Min <jackmin@mellanox.com>
Date: Wed, 29 Apr 2020 16:00:42 +0300
Subject: [PATCH] net/mlx5: fix RSS enablement
[ upstream commit 0afac6dcca44dea15f23e93851b6e52f014a98e4 ]
PMD create some default control rules with RSS action
if it's not isolated mode.
However whether default control rules need to do RSS or not should be
controlled by device configuration, the mq_mode of rxmode configuration
in specific.
In another word, only when mq_mode is configured with ETH_MQ_RX_RSS_FLAG
set, then RSS is needed for default rules.
Fixes: c64ccc0eca2f ("mlx5: fix overwritten RSS configuration")
Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
---
drivers/net/mlx5/mlx5_flow.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index bb8538e816..15d895c847 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -4691,6 +4691,8 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
if (!priv->reta_idx_n || !priv->rxqs_n) {
return 0;
}
+ if (!(dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG))
+ action_rss.types = 0;
for (i = 0; i != priv->reta_idx_n; ++i)
queue[i] = (*priv->reta_idx)[i];
flow = flow_list_create(dev, &priv->ctrl_flows,
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-05-19 14:04:50.677331839 +0100
+++ 0153-net-mlx5-fix-RSS-enablement.patch 2020-05-19 14:04:44.484653231 +0100
@@ -1,8 +1,10 @@
-From 0afac6dcca44dea15f23e93851b6e52f014a98e4 Mon Sep 17 00:00:00 2001
+From 831152d0d94a8548aa804ece84acd2ac1529fc8b Mon Sep 17 00:00:00 2001
From: Xiaoyu Min <jackmin@mellanox.com>
Date: Wed, 29 Apr 2020 16:00:42 +0300
Subject: [PATCH] net/mlx5: fix RSS enablement
+[ upstream commit 0afac6dcca44dea15f23e93851b6e52f014a98e4 ]
+
PMD create some default control rules with RSS action
if it's not isolated mode.
@@ -14,7 +16,6 @@
set, then RSS is needed for default rules.
Fixes: c64ccc0eca2f ("mlx5: fix overwritten RSS configuration")
-Cc: stable@dpdk.org
Signed-off-by: Xiaoyu Min <jackmin@mellanox.com>
Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
@@ -25,10 +26,10 @@
1 file changed, 2 insertions(+)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index e9ae2f782c..cb593c9449 100644
+index bb8538e816..15d895c847 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -4912,6 +4912,8 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
+@@ -4691,6 +4691,8 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
if (!priv->reta_idx_n || !priv->rxqs_n) {
return 0;
}
@@ -36,7 +37,7 @@
+ action_rss.types = 0;
for (i = 0; i != priv->reta_idx_n; ++i)
queue[i] = (*priv->reta_idx)[i];
- flow_idx = flow_list_create(dev, &priv->ctrl_flows,
+ flow = flow_list_create(dev, &priv->ctrl_flows,
--
2.20.1