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 1FB2AA0524 for ; Fri, 5 Feb 2021 12:32:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 199F240682; Fri, 5 Feb 2021 12:32:48 +0100 (CET) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mails.dpdk.org (Postfix) with ESMTP id 47BCB188A07 for ; Fri, 5 Feb 2021 12:32:47 +0100 (CET) Received: by mail-wm1-f53.google.com with SMTP id j21so2936691wmj.0 for ; Fri, 05 Feb 2021 03:32:47 -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=YSuPfG0+OL+C2vRryFAyJidRVLT/KI17bxLR3tzpR7E=; b=pLGTvNQ6WJela0n3W4Wl7e1ooIpwWJAlCBc9tuRoIbf3OmKLRm19yttafMFMHp/+2n QREAkf5FBAYAHAIK0n/l7B+Fb8NnvaqEHnk58IIDxRSsIvHMwbs3yDDLao84D3thIoRh xziZgB8Cjq4suD1lxLVm2FYIgrJITzso1D2sxY7ktB9WBu1qtyadtp6K/1m3arBO6Fn6 JiOFyNXOuqoTC5YHMv9np5/GiQoqTBxzk7y43h1Lew9khgockmOvdpho2JXC0sIebXCY AV5Q6LgaoPURFS+/QXEf9MDAeqQ5gDuspzKrcjMESJL9n7mEIEzJnFnGsLqtAzgepHlp BvKQ== 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=YSuPfG0+OL+C2vRryFAyJidRVLT/KI17bxLR3tzpR7E=; b=k2WgpRS0vW33gwa2XkWO4mVozCMZrCT9JbQC6dohGGAUT/au9EKKEMU+oecjhmTROx 1nK7DWwdgrcJpWs4K6eEkpyWeD9WZtvismmnpd9F4NuQwcDD6rCNSXlYsUY5jOwoT8Yz HCFSsVfN/ghQc1inojhTNhWsrQHTrfmUFn3PysB3wjd6toOBoin7oT64pdy8RgtjcvUe eo1Qusen6GfD7mk6M09LlJNckYA+M72dHV8dpECJH+z8Le1X7q0g02OZhGMsx9tdrWJw IKVf8x0uRncrauVs4pn+wlwhfwz8lO9XAdf8++x0XTw6DgRUf6j55ZctgveCUzPJ5NuM eIPg== X-Gm-Message-State: AOAM531uauif8DKazemkaXtPtzx9UqW562dETpkGLHcnJKP80NPPSMip dary26kOlqDdB47y1VNHSLI= X-Google-Smtp-Source: ABdhPJw6eDEQL6Pf2ar2GdNfKzwM43y0K19FiRg4/RnWRTUHYC7lD8QetYdLoEEDEtW9dp1IA2cq7g== X-Received: by 2002:a1c:2143:: with SMTP id h64mr3196501wmh.60.1612524767034; Fri, 05 Feb 2021 03:32:47 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m10sm11969743wro.7.2021.02.05.03.32.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:32:46 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Hemant Agrawal , dpdk stable Date: Fri, 5 Feb 2021 11:17:11 +0000 Message-Id: <20210205111920.1272063-145-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/dpaa: 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/291718e0cc95e40cde80dbf496a481c62f91950b Thanks. Luca Boccassi --- >From 291718e0cc95e40cde80dbf496a481c62f91950b Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:09 +0000 Subject: [PATCH] net/dpaa: fix jumbo frame flag condition for MTU set [ upstream commit 1d57225d0e6992d3671843cdfc3efe10cf5b068c ] 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' and overhead, that perhaps impacts the cases of the jumbo frame related. Fixes: 25f854197abc ("net/dpaa: support jumbo frames") Signed-off-by: Steve Yang Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.c | 2 +- drivers/net/dpaa/dpaa_ethdev.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index f00279e004..0c87c136d7 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -184,7 +184,7 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) return -EINVAL; } - if (frame_size > RTE_ETHER_MAX_LEN) + if (frame_size > DPAA_ETH_MAX_LEN) dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index 659bceb467..a858b1372c 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -51,6 +51,10 @@ #define VLAN_TAG_SIZE 4 /** < Vlan Header Length */ #endif +#define DPAA_ETH_MAX_LEN (RTE_ETHER_MTU + \ + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + \ + VLAN_TAG_SIZE) + /* PCD frame queues */ #define DPAA_DEFAULT_NUM_PCD_QUEUES 1 #define DPAA_VSP_PROFILE_MAX_NUM 8 -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:35.805992963 +0000 +++ 0145-net-dpaa-fix-jumbo-frame-flag-condition-for-MTU-set.patch 2021-02-05 11:18:29.046695681 +0000 @@ -1 +1 @@ -From 1d57225d0e6992d3671843cdfc3efe10cf5b068c Mon Sep 17 00:00:00 2001 +From 291718e0cc95e40cde80dbf496a481c62f91950b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1d57225d0e6992d3671843cdfc3efe10cf5b068c ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org