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 D930DA0524 for ; Fri, 5 Feb 2021 12:33:33 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3095188A07; Fri, 5 Feb 2021 12:33:33 +0100 (CET) Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mails.dpdk.org (Postfix) with ESMTP id C4974188A07 for ; Fri, 5 Feb 2021 12:33:32 +0100 (CET) Received: by mail-wr1-f46.google.com with SMTP id d16so7257438wro.11 for ; Fri, 05 Feb 2021 03:33:32 -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=z8PsCT4DBiukoQYPbWGibdw7P8Yb7LC2JrYHuuuDpNE=; b=uhRiMHARwHfAEY8XXHP5gBFx4kNxLXyih+NeOX0hh7oZzzZJX4Ot/oEiT70k3U+mLt /wuI7HusDkmM6mzrOCrIGyWO3esAQsPRSblsMCNMMocE7hwl3RnBLwvVKj9UoR7aMevI 05pcDZq4bMk3NmhOgFJfLmjk2CSAAtdWdbAu8TsL4bANZjqmVT2pQVZrRrnaRG13xT8M ZrbKXQBIHn3nlUrjy0eb9ti7X3xkBTs6o55qHA2EbHE1gGWtnTvTWU/+7s+OnlHLVoax YJJvvU72A/USvnQcKdiidrEoLRrr0CDamQcx0Xf479nOsMortuWZq+nOqbpo2e3a5ags ym7A== 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=z8PsCT4DBiukoQYPbWGibdw7P8Yb7LC2JrYHuuuDpNE=; b=TtgMrmOCaKy33J7ppzUHs/MBZuS+EV2mvDFY9Y3hIkX7acBfRFLFLNV+u7BFdVl5gr 3KvlkE7MINAzfh4WbHb72zxreSKiTzKYF3Ppu0uqHw1FMDzfOKjzu8BExeKxKGjV6o1Q d3QWQKcojNHwQR2N4gNMS9rXt8Eu0EUaYjzSo0QNe67jQTHIjZAcvk1Lma/BMtWZf3sL NmT44MXCYvaKHps5gYMROycixoYL7RMXwjjpYaLsVNIP+dOQaIcCUMmBF0a9uA2Ryvhn XKitxLILJJdQrwq8OmF974dyTT46v0ZDzbgLvNG5Bh1Y82JO6D+PHrgI/7+M/k9PRWoR PoSA== X-Gm-Message-State: AOAM532+DQGzjw2wvgSU52Kg2atG1xlIXx9pePT5+NAa8I6ydd1Nxpdj okWGh+eWu6pEqG8FlA4sNebDLxQlzyk7vkDZ X-Google-Smtp-Source: ABdhPJwQpjLh9Am389icv46f8brwC6jZ0BpvbO/fh1SxYkhw3eIwCk7Vqf1BWwBPB2nAwd9jsxyYnw== X-Received: by 2002:adf:ce89:: with SMTP id r9mr4595058wrn.345.1612524812613; Fri, 05 Feb 2021 03:33:32 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id p5sm7803026wmq.3.2021.02.05.03.33.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:31 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Feb 2021 11:17:23 +0000 Message-Id: <20210205111920.1272063-157-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/thunderx: fix jumbo frame flag condition for MTU set' 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/698666b4988f60471ae8dd55b7fb751672a7f0ac Thanks. Luca Boccassi --- >From 698666b4988f60471ae8dd55b7fb751672a7f0ac Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:21 +0000 Subject: [PATCH] net/thunderx: fix jumbo frame flag condition for MTU set [ upstream commit d2869184ae39d2773df12d1f7a0b96e5fb2d4ed4 ] The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition, but the Ether overhead is larger than 18 when it supports dual VLAN tags. 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' and overhead, that perhaps impacts the cases of the jumbo frame related. Fixes: 65d9804edc05 ("net/thunderx: support MTU configuration") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit --- drivers/net/thunderx/base/nicvf_hw_defs.h | 1 + drivers/net/thunderx/nicvf_ethdev.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/thunderx/base/nicvf_hw_defs.h b/drivers/net/thunderx/base/nicvf_hw_defs.h index b12c8ec50a..adc8ec943d 100644 --- a/drivers/net/thunderx/base/nicvf_hw_defs.h +++ b/drivers/net/thunderx/base/nicvf_hw_defs.h @@ -176,6 +176,7 @@ #define NIC_HW_MAX_MTU (9190) #define NIC_HW_MAX_FRS (NIC_HW_MAX_MTU + NIC_HW_L2_OVERHEAD) #define NIC_HW_MAX_SEGS (12) +#define NIC_HW_L2_MAX_LEN (RTE_ETHER_MTU + NIC_HW_L2_OVERHEAD) /* Descriptor alignments */ #define NICVF_RBDR_BASE_ALIGN_BYTES (128) /* 7 bits */ diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index b6bb05e500..c2e7c334d4 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -176,7 +176,7 @@ nicvf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu) (frame_size + 2 * VLAN_TAG_SIZE > buffsz * NIC_HW_MAX_SEGS)) return -EINVAL; - if (frame_size > RTE_ETHER_MAX_LEN) + if (frame_size > NIC_HW_L2_MAX_LEN) rxmode->offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else rxmode->offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.332147620 +0000 +++ 0157-net-thunderx-fix-jumbo-frame-flag-condition-for-MTU-.patch 2021-02-05 11:18:29.094696595 +0000 @@ -1 +1 @@ -From d2869184ae39d2773df12d1f7a0b96e5fb2d4ed4 Mon Sep 17 00:00:00 2001 +From 698666b4988f60471ae8dd55b7fb751672a7f0ac Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d2869184ae39d2773df12d1f7a0b96e5fb2d4ed4 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org