[dpdk-stable] patch 'net/mlx5: fix condition for link update fallback' has been queued to LTS release 18.11.3

Kevin Traynor ktraynor at redhat.com
Tue Aug 27 11:29:49 CEST 2019


Hi,

FYI, your patch has been queued to LTS release 18.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 09/03/19. 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-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/922f0d11369dc4204790d4a7ce9ca7eb4615c427

Thanks.

Kevin Traynor

---
>From 922f0d11369dc4204790d4a7ce9ca7eb4615c427 Mon Sep 17 00:00:00 2001
From: Asaf Penso <asafp at mellanox.com>
Date: Wed, 19 Jun 2019 09:52:45 +0000
Subject: [PATCH] net/mlx5: fix condition for link update fallback

[ upstream commit cb1d2cce9539f1131a01585888903ab3546d51d9 ]

mlx5_link_update uses the newer ethtool command
ETHTOOL_GLINKSETTINGS to determine interface capabilities but falls
back to the older (deprecated) ETHTOOL_GSET command if the new
method fails for any reason.
The older method only supports reporting of capabilities up to 40G.

However, mlx5_link_update_unlocked_gs can return a failure for a
number of reasons (including the link being down).
Using the older method in cases of transient failure of the method
can result in reporting of reduced capabilities to the application.

The older method (mlx5_link_update_unlocked_gset) should only be
invoked if the newer method returns EOPNOTSUPP.

Fixes: 7d2e32f76cfc ("net/mlx5: fix ethtool link setting call order")

Reported-by: Srinivas Narayan <srinivas.narayan at att.com>
Signed-off-by: Asaf Penso <asafp at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
---
 drivers/net/mlx5/mlx5_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index fb8e313a2..6a5bef117 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -803,5 +803,5 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
 	do {
 		ret = mlx5_link_update_unlocked_gs(dev, &dev_link);
-		if (ret)
+		if (ret == -ENOTSUP)
 			ret = mlx5_link_update_unlocked_gset(dev, &dev_link);
 		if (ret == 0)
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:11.550265413 +0100
+++ 0012-net-mlx5-fix-condition-for-link-update-fallback.patch	2019-08-27 09:40:10.863145772 +0100
@@ -1 +1 @@
-From cb1d2cce9539f1131a01585888903ab3546d51d9 Mon Sep 17 00:00:00 2001
+From 922f0d11369dc4204790d4a7ce9ca7eb4615c427 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cb1d2cce9539f1131a01585888903ab3546d51d9 ]
+
@@ -21 +22,0 @@
-Cc: stable at dpdk.org
@@ -31 +32 @@
-index 0c7162d7e..eeefe4df3 100644
+index fb8e313a2..6a5bef117 100644
@@ -34 +35 @@
-@@ -1052,5 +1052,5 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)
+@@ -803,5 +803,5 @@ mlx5_link_update(struct rte_eth_dev *dev, int wait_to_complete)


More information about the stable mailing list