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 033E5A0524 for ; Fri, 5 Feb 2021 12:33:36 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F099140682; Fri, 5 Feb 2021 12:33:35 +0100 (CET) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 1F62F188A0C for ; Fri, 5 Feb 2021 12:33:34 +0100 (CET) Received: by mail-wr1-f54.google.com with SMTP id 7so7377957wrz.0 for ; Fri, 05 Feb 2021 03:33:34 -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=AGp2fPaucHmh9U+/TTXu32aumftESHx0IGm/9p019uc=; b=HP04hqYOnesQ+Bs7/NAGkNhN7GNjIt5MPn0T/JM9MfqQmqwPj2Rd6UobIYTl9XF49B knMrQgLoadyRXL9r2Ww/HXeN6/HIjDUAMmBSrXv72Ifvl6NOc8uE8hgFOop27Uil6rY+ KlbXg/ELPGksYslRCZZ5TMFI7Kbtvy8h3RUl2xV3YyI6NGKll8WOc1Y7faV0+BDyvNw9 s3BG75qRr8sOb2F8HPjGsW9Ger7JlsBBCAuAbRduV+qhyQUwfpqoxmGM0MKCOBc8lX2t ErDOIqEdqKgBob5gok0Rdj94AUI5FmlUPlmUE0T/lA3l5ZH24IB0MpNX9FiyblVwNZfH FSlA== 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=AGp2fPaucHmh9U+/TTXu32aumftESHx0IGm/9p019uc=; b=WBTPtvRQyK+Miq0dIkhTV4J5rn6PLR037KGo9GMzNlUmhXRsG9NFnmFPIdktxaJNgW JSn8uKMJsLADQBou69u1Bu8PbT3vHRUCIe/EDB3SMSGhGuK1iImd4G030gb8U1Qnjmtd yVCADmbOBHgXwUF3j+ToccDmXKo6C6sizFJL/Bg1/87C7G+iHx52a7f+s0uRNUaMIHDK /uJ849MYoW8WFmnYJkRb/Lm/4cCqvL4O+PHOM+w2/T6E/CKA5YnfpAMy4f2r8wJvbl1w Zl/ZBB5sFro7UR6zGFYDEx7fM/Iphmwu39DljVem+R4Ka97jucFsaniXM+51g8dxyDtm 6/yg== X-Gm-Message-State: AOAM53015Rhxv4NoC5AuC6SYSxoHxcpGq7yErmzLYbdx9LzZpVepWbPg ljNjJDnBpoeu5ZyVHVQu9DKCcHQRk0hBKZ5G X-Google-Smtp-Source: ABdhPJyLnGhF5kOi6xHHwr2T9n+A3u3XRvcia7yXetvkPJRceqsM4hiB0IsWoM6ZOcj+dx3UpqvkUw== X-Received: by 2002:a5d:4bc2:: with SMTP id l2mr4655703wrt.204.1612524813880; Fri, 05 Feb 2021 03:33:33 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i18sm12558575wrn.29.2021.02.05.03.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:33 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Jeff Guo , dpdk stable Date: Fri, 5 Feb 2021 11:17:24 +0000 Message-Id: <20210205111920.1272063-158-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/ixgbe: 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/3d98b60dab993ef5103a11aa2912c005f8bb6817 Thanks. Luca Boccassi --- >From 3d98b60dab993ef5103a11aa2912c005f8bb6817 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:22 +0000 Subject: [PATCH] net/ixgbe: fix jumbo frame flag condition [ upstream commit 48554c7db7eaef9b7c69f7ad8dd60fe53e78fbde ] 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: 59d0ecdbf0e1 ("ethdev: MTU accessors") Fixes: 95a27b3ba5f5 ("net/ixgbe: enable jumbo frame for VF") Signed-off-by: Steve Yang Acked-by: Jeff Guo --- drivers/net/ixgbe/ixgbe_ethdev.c | 2 +- drivers/net/ixgbe/ixgbe_ethdev.h | 3 +++ drivers/net/ixgbe/ixgbe_pf.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index d7a1806ab8..fa0f5afd03 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -5173,7 +5173,7 @@ ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0); /* switch to jumbo mode if needed */ - if (frame_size > RTE_ETHER_MAX_LEN) { + if (frame_size > IXGBE_ETH_MAX_LEN) { dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; hlreg0 |= IXGBE_HLREG0_JUMBOEN; diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h index 3d35ea791b..a0ce18ca24 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.h +++ b/drivers/net/ixgbe/ixgbe_ethdev.h @@ -104,6 +104,9 @@ /* The overhead from MTU to max frame size. */ #define IXGBE_ETH_OVERHEAD (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN) +/* The max frame size with default MTU */ +#define IXGBE_ETH_MAX_LEN (RTE_ETHER_MTU + IXGBE_ETH_OVERHEAD) + /* bit of VXLAN tunnel type | 7 bits of zeros | 8 bits of zeros*/ #define IXGBE_FDIR_VXLAN_TUNNEL_TYPE 0x8000 /* bit of NVGRE tunnel type | 7 bits of zeros | 8 bits of zeros*/ diff --git a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c index 833863af5a..89698e8470 100644 --- a/drivers/net/ixgbe/ixgbe_pf.c +++ b/drivers/net/ixgbe/ixgbe_pf.c @@ -575,7 +575,7 @@ ixgbe_set_vf_lpe(struct rte_eth_dev *dev, __rte_unused uint32_t vf, uint32_t *ms IXGBE_MHADD_MFS_MASK) >> IXGBE_MHADD_MFS_SHIFT; if (max_frs < new_mtu) { hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0); - if (new_mtu > RTE_ETHER_MAX_LEN) { + if (new_mtu > IXGBE_ETH_MAX_LEN) { dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; hlreg0 |= IXGBE_HLREG0_JUMBOEN; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.377806590 +0000 +++ 0158-net-ixgbe-fix-jumbo-frame-flag-condition.patch 2021-02-05 11:18:29.102696747 +0000 @@ -1 +1 @@ -From 48554c7db7eaef9b7c69f7ad8dd60fe53e78fbde Mon Sep 17 00:00:00 2001 +From 3d98b60dab993ef5103a11aa2912c005f8bb6817 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 48554c7db7eaef9b7c69f7ad8dd60fe53e78fbde ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -27 +28 @@ -index 97acf35d24..c8b9ec8c11 100644 +index d7a1806ab8..fa0f5afd03 100644 @@ -30 +31 @@ -@@ -5174,7 +5174,7 @@ ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +@@ -5173,7 +5173,7 @@ ixgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)