From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E1D79A0613 for ; Tue, 27 Aug 2019 11:31:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DA4451BFFA; Tue, 27 Aug 2019 11:31:00 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id D91D11C0D7 for ; Tue, 27 Aug 2019 11:30:59 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55BA33082E09; Tue, 27 Aug 2019 09:30:59 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 166FF5C1D6; Tue, 27 Aug 2019 09:30:57 +0000 (UTC) From: Kevin Traynor To: Asaf Penso Cc: Srinivas Narayan , Viacheslav Ovsiienko , dpdk stable Date: Tue, 27 Aug 2019 10:29:49 +0100 Message-Id: <20190827093032.20423-12-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Tue, 27 Aug 2019 09:30:59 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix condition for link update fallback' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" 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 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 Signed-off-by: Asaf Penso Acked-by: Viacheslav Ovsiienko --- 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@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)