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 CA7EDA0524 for ; Fri, 5 Feb 2021 12:33:52 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C6411188A0F; Fri, 5 Feb 2021 12:33:52 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 5C3CE40682 for ; Fri, 5 Feb 2021 12:33:51 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id 7so7378849wrz.0 for ; Fri, 05 Feb 2021 03:33:51 -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=ihVEbQktv25hrOyaJLjBOv30wEcuDhsrE1VlOtmFaSo=; b=lT44hgLsQXLYCLbO+teB9PqUgPZNh6naqgssb3M4/WFZakVxcLK1Me+E13IocVn/Er TPeI/B8nVtisRrOYRTtSI+93L0cUyiWeaeLFszky0SZlquZHgA5CBQvnR+KmZ8OO2NjD GEArgDp0NxEnOj7IbG9dSkWpbCDtM6fqquZF8JmGkHR5b7Fhps6jbFymGtsem6oZfcGG jRVeNsdFWxp6eUaXIXPtxDS/iWM7wRj2xO+nNyLvy66Y/LBbigUXqlGlzWREgvyKZ+7/ Sb4qTz+F2iivNxbGXy3D8uPndnrenWtDvElLzOKYqi3AAplYtc8kFMJ/JFIY/dr4yTdo 78zA== 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=ihVEbQktv25hrOyaJLjBOv30wEcuDhsrE1VlOtmFaSo=; b=j+AgUw1hdBTTXmEIJsBFR2gKK7O/RuVrc0YXWdKKKbVeJndITTdwbHGyy9EApZhBMd 03ROrtbapxrquiAplOxQ7ndkVzxut6bWSFLt+71Zh0IpWlgpgqULrlJk9TGFrB6yClXq eELs7kMbbq/ZAn9wh0jQeGi4l6dhM+crz1iup5xOv6nV4TA6vJDyLNvWKk2ZsclhQvVu hHDcOfpdShmZxUmqhHwluyEQhpTJ9dnnEHAvwc0n5dIlDdvGFWgZD6VcyMKJwpTMT6gw 6vq0d9A0r3by1NNzgaQJD6mJyoj4kao6308xL93e8gY/jbNLeqqpqTrVrhXs3UDZxIgI HsdQ== X-Gm-Message-State: AOAM530z4q/byHmqYkxXYPk5i/3AUFHrVyZimVs6s1SmlcdCdXXqQQ6L hylspVOGDduC8lkrhNSQirs= X-Google-Smtp-Source: ABdhPJwUUpj4WOjVx3Mc3pemPYvfPsOeF1gyiQp5i59tGq85xN0By/TVcTV+WmnvVvnoXh0Czz9tyQ== X-Received: by 2002:a5d:65cd:: with SMTP id e13mr4509754wrw.120.1612524831208; Fri, 05 Feb 2021 03:33:51 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 13sm7904276wmj.11.2021.02.05.03.33.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:50 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Feb 2021 11:17:30 +0000 Message-Id: <20210205111920.1272063-164-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/liquidio: 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/323ebde1407fb49f024176e845ff957c1c27dae2 Thanks. Luca Boccassi --- >From 323ebde1407fb49f024176e845ff957c1c27dae2 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:28 +0000 Subject: [PATCH] net/liquidio: fix jumbo frame flag condition for MTU set [ upstream commit 92c87229a9b096a53a5a9763bfee0198d20a91ea ] 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: 9f1c00266d82 ("net/liquidio: add API to set MTU") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit --- drivers/net/liquidio/lio_ethdev.c | 2 +- drivers/net/liquidio/lio_ethdev.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c index d4dd3768cd..eb0fdab45a 100644 --- a/drivers/net/liquidio/lio_ethdev.c +++ b/drivers/net/liquidio/lio_ethdev.c @@ -481,7 +481,7 @@ lio_dev_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) return -1; } - if (frame_len > RTE_ETHER_MAX_LEN) + if (frame_len > LIO_ETH_MAX_LEN) eth_dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else diff --git a/drivers/net/liquidio/lio_ethdev.h b/drivers/net/liquidio/lio_ethdev.h index 74cd2fb6c6..d33be1c44d 100644 --- a/drivers/net/liquidio/lio_ethdev.h +++ b/drivers/net/liquidio/lio_ethdev.h @@ -13,6 +13,9 @@ #define LIO_LSC_TIMEOUT 100000 /* 100000us (100ms) */ #define LIO_MAX_CMD_TIMEOUT 10000 /* 10000ms (10s) */ +/* The max frame size with default MTU */ +#define LIO_ETH_MAX_LEN (RTE_ETHER_MTU + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN) + #define LIO_DEV(_eth_dev) ((_eth_dev)->data->dev_private) /* LIO Response condition variable */ -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.625406128 +0000 +++ 0164-net-liquidio-fix-jumbo-frame-flag-condition-for-MTU-.patch 2021-02-05 11:18:29.114696976 +0000 @@ -1 +1 @@ -From 92c87229a9b096a53a5a9763bfee0198d20a91ea Mon Sep 17 00:00:00 2001 +From 323ebde1407fb49f024176e845ff957c1c27dae2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 92c87229a9b096a53a5a9763bfee0198d20a91ea ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org