From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id CF742A0524 for ; Thu, 4 Feb 2021 12:36:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 770BF240774; Thu, 4 Feb 2021 12:36:03 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id C3B76240748 for ; Thu, 4 Feb 2021 12:36:01 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cvZ-0005Rc-Iz; Thu, 04 Feb 2021 11:36:01 +0000 From: Christian Ehrhardt To: Steve Yang Cc: Ferruh Yigit , dpdk stable Date: Thu, 4 Feb 2021 12:28:40 +0100 Message-Id: <20210204112954.2488123-65-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/sfc: fix jumbo frame flag condition for MTU set' has been queued to stable release 19.11.7 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 stable release 19.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/06/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/ffce2b898da36ee81ecae9da7f2b2714559a265e Thanks. Christian Ehrhardt --- >From ffce2b898da36ee81ecae9da7f2b2714559a265e Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:20 +0000 Subject: [PATCH] net/sfc: fix jumbo frame flag condition for MTU set [ upstream commit 7910fd21211f402aac7b7e7d4b6d70f224f0f9be ] The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition, but the Ether overhead is larger than 18 when it supports VLAN tag. That will cause the jumbo flag rx offload is wrong when MTU size is 'RTE_ETHER_MTU'. This fix will change the boundary condition with 'RTE_ETHER_MTU', that perhaps impacts the cases of the jumbo frame related. Fixes: ff6a1197c3b1 ("net/sfc: convert to new Rx offload API") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit --- drivers/net/sfc/sfc_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index d33c476bd7..9517cebd65 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -984,7 +984,7 @@ sfc_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) * The driver does not use it, but other PMDs update jumbo frame * flag and max_rx_pkt_len when MTU is set. */ - if (mtu > RTE_ETHER_MAX_LEN) { + if (mtu > RTE_ETHER_MTU) { struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode; rxmode->offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; } -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:30.796957793 +0100 +++ 0065-net-sfc-fix-jumbo-frame-flag-condition-for-MTU-set.patch 2021-02-04 12:04:28.058789756 +0100 @@ -1 +1 @@ -From 7910fd21211f402aac7b7e7d4b6d70f224f0f9be Mon Sep 17 00:00:00 2001 +From ffce2b898da36ee81ecae9da7f2b2714559a265e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7910fd21211f402aac7b7e7d4b6d70f224f0f9be ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 93fc7baa0d..f2f5336435 100644 +index d33c476bd7..9517cebd65 100644 @@ -27 +28 @@ -@@ -1017,7 +1017,7 @@ sfc_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) +@@ -984,7 +984,7 @@ sfc_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)