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 257F1A0524 for ; Fri, 5 Feb 2021 12:33:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1F0F3188A07; Fri, 5 Feb 2021 12:33:37 +0100 (CET) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id 4F0FA40682 for ; Fri, 5 Feb 2021 12:33:35 +0100 (CET) Received: by mail-wm1-f52.google.com with SMTP id m1so5649894wml.2 for ; Fri, 05 Feb 2021 03:33:35 -0800 (PST) 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=ucyCzSI+fUKPK8OTM1LArCkPdHL2p6G2+FU0vO0sAuQ=; b=Htak+LS64i9q0KpC3co6nU350joJE5jBbdLSsAg97/roHHpBEFxfRckMo7RaS75mtb EuFUg3n5Wuf8vTgmFdE5MNEtVhHhiyVgMtOWztj9BpkAn2KMGY8pDjsk8M6PmtOsEsFl O2GS4BCo0TvishBHq3amHSwq69taSilRgWF/w7IKIKeJAezrhAUAOQiOYZ0lS7r9VKF2 54R8ezRxabFE1rQ6rcxTplGZI8Y/7vhbcK6aiCp/J9CMr1pcA10H84uhRLepMqC2ABz4 DjTD8KlGkuAR8m8GgQ82HwWRNv/Ti000kjP071I/pDUyJJXmhY9h4zBxE8Ef99d2f9Cq 2rxg== 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=ucyCzSI+fUKPK8OTM1LArCkPdHL2p6G2+FU0vO0sAuQ=; b=EPMS8tJdUcyuJLGgAJ+e/7uZzf0QG/RJyO2kuzROt+mQxQcHuRYizQxdlDO9gLQEwp Mm4cRFrqaxT2Dvu/1mCrmBOUSHqUQfgZhuJdJBvjx8JGfTPbjiT2MsHvfvzQ3NN/2Qa/ Xq/Api5/AHy5CUYgW2TDUhMV+X7sDmBnXb/PcwaKL81c6RtzOiPlEVA8HTCPBlmk71zO tPSeqKcn9kC/yHWLF3B7INXqq8F/lBVYNDHA2cTzk9P39NKwBD5WSlgZ7IhNW2RAQMvm DTUpgT+QxCBfc5KkI/ZPwr1sET24VHkm1yFN47bZlH0CxPT/I0XifsPCuFREyzHgw3la XO/A== X-Gm-Message-State: AOAM530/kTx+fefC90kvuTKc8WQju8h0VcwDwfNwNxatKYNrygfNZaB4 NHvdxyTACTBxJMJvR4qj7s/6MjMncZXchm4x X-Google-Smtp-Source: ABdhPJyylAKqOUuWCw2Lk+wOfu20+5KiutEs/UgDoJrvrRWCLJ9yt4YRietWV/hoasmO5kZJTje6Gg== X-Received: by 2002:a1c:7301:: with SMTP id d1mr3188061wmb.33.1612524815112; Fri, 05 Feb 2021 03:33:35 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u3sm13097846wre.54.2021.02.05.03.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:34 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Feb 2021 11:17:25 +0000 Message-Id: <20210205111920.1272063-159-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/cxgbe: fix jumbo frame flag condition' has been queued to stable release 20.11.1 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 20.11.1 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/07/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/9326ad37af4c1c8876e71b09234e57967666d581 Thanks. Luca Boccassi --- >From 9326ad37af4c1c8876e71b09234e57967666d581 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:23 +0000 Subject: [PATCH] net/cxgbe: fix jumbo frame flag condition [ upstream commit 5dfbad550cafbc09aaaff07072cb2eb5f2a1fdaa ] The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition. If 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 normalize the boundary condition with 'RTE_ETHER_MTU' and overhead even though current overhead is 18. Fixes: 4b2eff452d2e ("cxgbe: enable jumbo frames") Fixes: 0ec33be4c857 ("cxgbe: allow to change mtu") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit --- drivers/net/cxgbe/cxgbe.h | 4 ++++ drivers/net/cxgbe/cxgbe_ethdev.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/net/cxgbe/cxgbe.h b/drivers/net/cxgbe/cxgbe.h index ef62af1c3f..7c89a028bf 100644 --- a/drivers/net/cxgbe/cxgbe.h +++ b/drivers/net/cxgbe/cxgbe.h @@ -19,6 +19,10 @@ #define CXGBE_MAX_RX_PKTLEN (9000 + RTE_ETHER_HDR_LEN + \ RTE_ETHER_CRC_LEN) /* max pkt */ +/* The max frame size with default MTU */ +#define CXGBE_ETH_MAX_LEN (RTE_ETHER_MTU + \ + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN) + /* Max poll time is 100 * 100msec = 10 sec */ #define CXGBE_LINK_STATUS_POLL_MS 100 /* 100ms */ #define CXGBE_LINK_STATUS_POLL_CNT 100 /* Max number of times to poll */ diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c index 98d0362fa3..480d6f58a8 100644 --- a/drivers/net/cxgbe/cxgbe_ethdev.c +++ b/drivers/net/cxgbe/cxgbe_ethdev.c @@ -300,7 +300,7 @@ int cxgbe_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) return -EINVAL; /* set to jumbo mode if needed */ - if (new_mtu > RTE_ETHER_MAX_LEN) + if (new_mtu > CXGBE_ETH_MAX_LEN) eth_dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else @@ -669,7 +669,7 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, rxq->fl.size = temp_nb_desc; /* Set to jumbo mode if necessary */ - if (pkt_len > RTE_ETHER_MAX_LEN) + if (pkt_len > CXGBE_ETH_MAX_LEN) eth_dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.420344213 +0000 +++ 0159-net-cxgbe-fix-jumbo-frame-flag-condition.patch 2021-02-05 11:18:29.106696824 +0000 @@ -1 +1 @@ -From 5dfbad550cafbc09aaaff07072cb2eb5f2a1fdaa Mon Sep 17 00:00:00 2001 +From 9326ad37af4c1c8876e71b09234e57967666d581 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5dfbad550cafbc09aaaff07072cb2eb5f2a1fdaa ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -41 +42 @@ -index eb4258fe17..cfa385bab7 100644 +index 98d0362fa3..480d6f58a8 100644 @@ -44 +45 @@ -@@ -301,7 +301,7 @@ int cxgbe_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) +@@ -300,7 +300,7 @@ int cxgbe_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) @@ -53 +54 @@ -@@ -670,7 +670,7 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev, +@@ -669,7 +669,7 @@ int cxgbe_dev_rx_queue_setup(struct rte_eth_dev *eth_dev,