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 73E62A2E1B for ; Thu, 5 Sep 2019 12:19:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 68F531EFA6; Thu, 5 Sep 2019 12:19:38 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 585D71EFAC for ; Thu, 5 Sep 2019 12:19:37 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C6302190C022; Thu, 5 Sep 2019 10:19:36 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-52.ams2.redhat.com [10.36.117.52]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2CAB19C77; Thu, 5 Sep 2019 10:19:35 +0000 (UTC) From: Kevin Traynor To: Xiaoyu Min Cc: Viacheslav Ovsiienko , dpdk stable Date: Thu, 5 Sep 2019 11:17:50 +0100 Message-Id: <20190905101754.21933-50-ktraynor@redhat.com> In-Reply-To: <20190905101754.21933-1-ktraynor@redhat.com> References: <20190905101754.21933-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Thu, 05 Sep 2019 10:19:36 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix link speed info when link is down' 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/12/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/c11aabbcc556287815b9d35141d1dbcde0f31707 Thanks. Kevin Traynor --- >From c11aabbcc556287815b9d35141d1dbcde0f31707 Mon Sep 17 00:00:00 2001 From: Xiaoyu Min Date: Mon, 5 Aug 2019 16:02:03 +0800 Subject: [PATCH] net/mlx5: fix link speed info when link is down [ upstream commit 6fd05da9efbd387d0f1fdd7824bc5298dff368fe ] When the link is down, the link speed returned by ethtool is UINT32_MAX and the link status is 0. In this case, the DPDK ethdev link speed should be set to ETH_SPEED_NUM_NONE. Otherwise since link speed is non-zero but link status is zero, this is an inconsistent situation and -EAGAIN is returned, which is not right. Fixes: 188408719888 ("net/mlx5: fix support for newer link speeds") Signed-off-by: Xiaoyu Min Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c index 6a5bef117..9c7fc6b44 100644 --- a/drivers/net/mlx5/mlx5_ethdev.c +++ b/drivers/net/mlx5/mlx5_ethdev.c @@ -731,5 +731,6 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, return ret; } - dev_link.link_speed = ecmd->speed; + dev_link.link_speed = (ecmd->speed == UINT32_MAX) ? ETH_SPEED_NUM_NONE : + ecmd->speed; sc = ecmd->link_mode_masks[0] | ((uint64_t)ecmd->link_mode_masks[1] << 32); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-09-05 10:36:50.529123230 +0100 +++ 0050-net-mlx5-fix-link-speed-info-when-link-is-down.patch 2019-09-05 10:36:47.560699325 +0100 @@ -1 +1 @@ -From 6fd05da9efbd387d0f1fdd7824bc5298dff368fe Mon Sep 17 00:00:00 2001 +From c11aabbcc556287815b9d35141d1dbcde0f31707 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6fd05da9efbd387d0f1fdd7824bc5298dff368fe ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 9629cfb33..33a32fc2f 100644 +index 6a5bef117..9c7fc6b44 100644 @@ -27 +28 @@ -@@ -909,5 +909,6 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev, +@@ -731,5 +731,6 @@ mlx5_link_update_unlocked_gs(struct rte_eth_dev *dev,