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 4B111A0524 for ; Fri, 5 Feb 2021 12:32:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3AE9840682; Fri, 5 Feb 2021 12:32:59 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 6DC1140682 for ; Fri, 5 Feb 2021 12:32:58 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id m13so7268029wro.12 for ; Fri, 05 Feb 2021 03:32:58 -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=HVE8zTU8jcrpllz5nL9/7v7sX6BhPfBtXL5nUPJP9EU=; b=hOamX3pY4XNsCpg9n6yqK6FIb3DtS9TOWMBgAIbybjb8VkVFxXNJm4OH1HwInKeIXL fARjgM8Kgip7C0vzEe7tei6h96NkFtWquIAED6/JAi3W6dopPbFxyK+FalgFqKfjGicN TUgxXCIuZDTTqomHSGni6r0+DGQ2LG9bQV/IJelVItqar5BccUyqYZJsi2Wt02I+3EEA SqUDdqLIIks21IzDhE5cekp4z2WqKpGQ9S5d5TjZCVuS+yxWIV94vSn/yN5j3PjPUaQq W9hBKdmFL2JW1Z2JaWEHVhjzn3bM1JRhWGYMfKBQ3xsMWTGJc/FFmxyfYNtukvqlgDrG MfWg== 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=HVE8zTU8jcrpllz5nL9/7v7sX6BhPfBtXL5nUPJP9EU=; b=pNKT5b9CER/CrLJLnQ/5NPEoTZIaJD0IS1vAMACEVXyg79VMTQmDwhg/HccGMP5INl DgNG11nyDHFrxvjfNOZiKWMwt33WowChoA8xPt04/aEAfGP6+L/VIn8farsNx0ev+4lt MxFI5yLd6zaR12y5Kon7T7sVfOk6I8+PhswDJZWgfuHVkjlssOHTtg9nW22Lb/eHVYj7 P/6IBNxcbPmvZh6+U1Qp30mdqhKmRd8IweHaKOkH36FFdiD2AyvFDXVLYHFNt8uU5+JW IkP3rDYWAyBtDbSCKhz07oNkbK6zYMLm4e6IojTX1/zSJPkxp6ZuNWUvfLWOwe84R7+1 HRVQ== X-Gm-Message-State: AOAM53059pVDJTYXzt441p6fgsdY4hdbfInYvgjz6pWZabvhYMyDX4hg RJZX1v01NCv4hq6g+EZEkQY= X-Google-Smtp-Source: ABdhPJz6OWVJUvWM9XGi3WbhXy110X7vGWiUfpeBy20q3s5n4ui6wtdqIknp8vyJslaF+qNRAjavDA== X-Received: by 2002:adf:f009:: with SMTP id j9mr4511592wro.35.1612524778222; Fri, 05 Feb 2021 03:32:58 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a17sm12529238wrx.63.2021.02.05.03.32.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:32:57 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Hemant Agrawal , dpdk stable Date: Fri, 5 Feb 2021 11:17:12 +0000 Message-Id: <20210205111920.1272063-146-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/dpaa2: 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/b6cf1f01e6e46167a94f7212451e2e3a67096898 Thanks. Luca Boccassi --- >From b6cf1f01e6e46167a94f7212451e2e3a67096898 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:10 +0000 Subject: [PATCH] net/dpaa2: fix jumbo frame flag condition for MTU set [ upstream commit 043b57155615f4d046733c0c538bdf720f06f80e ] 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: e16408499412 ("net/dpaa2: configure jumbo frames") Signed-off-by: Steve Yang Acked-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 2 +- drivers/net/dpaa2/dpaa2_ethdev.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index ab6863300e..6f38da3cce 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -1420,7 +1420,7 @@ dpaa2_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) if (mtu < RTE_ETHER_MIN_MTU || frame_size > DPAA2_MAX_RX_PKT_LEN) return -EINVAL; - if (frame_size > RTE_ETHER_MAX_LEN) + if (frame_size > DPAA2_ETH_MAX_LEN) dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 8d82f74684..cacb11bd3e 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -26,6 +26,10 @@ #define DPAA2_RX_DEFAULT_NBDESC 512 +#define DPAA2_ETH_MAX_LEN (RTE_ETHER_MTU + \ + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + \ + VLAN_TAG_SIZE) + /*default tc to be used for ,congestion, distribution etc configuration. */ #define DPAA2_DEF_TC 0 -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:35.850792845 +0000 +++ 0146-net-dpaa2-fix-jumbo-frame-flag-condition-for-MTU-set.patch 2021-02-05 11:18:29.050695758 +0000 @@ -1 +1 @@ -From 043b57155615f4d046733c0c538bdf720f06f80e Mon Sep 17 00:00:00 2001 +From b6cf1f01e6e46167a94f7212451e2e3a67096898 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 043b57155615f4d046733c0c538bdf720f06f80e ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org