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 42DAEA0524 for ; Fri, 5 Feb 2021 12:33:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3DDE140682; Fri, 5 Feb 2021 12:33:38 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 95F02188A07 for ; Fri, 5 Feb 2021 12:33:36 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id l12so5758600wmq.2 for ; Fri, 05 Feb 2021 03:33:36 -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=8n51yWzlunEmiXus5kJaflbkyQa6igt6IJUByg4xqng=; b=uObGnfNPoway+LD0nOwfWu8TDdny4XBBV+83ryoqBJ+a75qrHaeqJwApH3I62OrhaY DZcS3wXRd1h4ypIZUvEekzp2xvWMV64cqxRwByGF7pn+8nj5N4peKTIXPRvYDgf9nncj bM+pF5aPgV8kMT8SndvfphIY32Ni8ayk/hMTypfid94+vNztK4H5tXi1x9e5f4SIkYci 2MNauY4mBvPOe0x/DnvbHRtxW7Bu5WovPNe0tDha+1PRst6+9GDlJhMimW4xQoF2WtaQ g3ZQ/Qhh0IzwjTCMssSrbuW2Bc51bAjAbVfZ+A+whD/peLQlJGnDEIMQoPwJSPEJJaQ5 d4Lw== 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=8n51yWzlunEmiXus5kJaflbkyQa6igt6IJUByg4xqng=; b=OFus5XiQFFB79Xn+4P35mWZyfQO1VdKbBGXKPJjj8gYSwqmqglNr55SdibxwCqEn+M 46TONA+kvbzWc+2QRWZVcYR/okZECFPxnSDZxXbXQWUXg8nJIUYifV16IsN6c5rYYtcj g29JgIOlxbyb6X1M3GkX/aVrrhIS7NBA4zDzUlq+6Jov6pl3Ob2mjKscgE4m8O23VV4l FnzEQiTI9uQzPYMcZOHmJSUZqMtVQGgoRG3QcJ9IdG0preHmJ/vvkFNnYCIS1hBDaZyL /iFTcjqbG5DD90AOxZhyhcbqyOFW8nCCuzKrkwWtBaoR0Su/scjpX2RygiIhYh4OYUKI BwkA== X-Gm-Message-State: AOAM532tVI6QLRWnM0ehum4DoGsUOy/0KNdFxefcgJ97xTmeimVI7Ffr XUgZH89DrJBmQaMMrpH+9p9z06ChbOrBJafH X-Google-Smtp-Source: ABdhPJwnaIYeOn7PzzqeOWcEjC48LhZDtq4/oIkXWIkGXQYKymkIXC02g5P6X0pMUsfRgMHCxzLO0w== X-Received: by 2002:a1c:2d8a:: with SMTP id t132mr3113505wmt.119.1612524816388; Fri, 05 Feb 2021 03:33:36 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 23sm8456523wmo.47.2021.02.05.03.33.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:35 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Feb 2021 11:17:26 +0000 Message-Id: <20210205111920.1272063-160-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/axgbe: 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/9075d36723329aacb57d8b006d059bbaa7bcfe17 Thanks. Luca Boccassi --- >From 9075d36723329aacb57d8b006d059bbaa7bcfe17 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:24 +0000 Subject: [PATCH] net/axgbe: fix jumbo frame flag condition for MTU set [ upstream commit 2570c033579aa8bf51bd995d8c4df8c3e3966386 ] 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: b58d8781fa1f ("net/axgbe: support setting MTU") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit --- drivers/net/axgbe/axgbe_ethdev.c | 2 +- drivers/net/axgbe/axgbe_ethdev.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_ethdev.c index cfe6aba73a..9cd056d04a 100644 --- a/drivers/net/axgbe/axgbe_ethdev.c +++ b/drivers/net/axgbe/axgbe_ethdev.c @@ -1439,7 +1439,7 @@ static int axgb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) dev->data->port_id); return -EBUSY; } - if (frame_size > RTE_ETHER_MAX_LEN) { + if (frame_size > AXGBE_ETH_MAX_LEN) { dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; val = 1; diff --git a/drivers/net/axgbe/axgbe_ethdev.h b/drivers/net/axgbe/axgbe_ethdev.h index 35a8476466..ac9210f2c8 100644 --- a/drivers/net/axgbe/axgbe_ethdev.h +++ b/drivers/net/axgbe/axgbe_ethdev.h @@ -125,6 +125,12 @@ /* MDIO port types */ #define AXGMAC_MAX_C22_PORT 3 +/* The max frame size with default MTU */ +#define AXGBE_ETH_MAX_LEN ( \ + RTE_ETHER_MTU + \ + RTE_ETHER_HDR_LEN + \ + RTE_ETHER_CRC_LEN) + /* Helper macro for descriptor handling * Always use AXGBE_GET_DESC_DATA to access the descriptor data * since the index is free-running and needs to be and-ed -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.463368613 +0000 +++ 0160-net-axgbe-fix-jumbo-frame-flag-condition-for-MTU-set.patch 2021-02-05 11:18:29.106696824 +0000 @@ -1 +1 @@ -From 2570c033579aa8bf51bd995d8c4df8c3e3966386 Mon Sep 17 00:00:00 2001 +From 9075d36723329aacb57d8b006d059bbaa7bcfe17 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2570c033579aa8bf51bd995d8c4df8c3e3966386 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index ddd903680d..ebe9a2876d 100644 +index cfe6aba73a..9cd056d04a 100644 @@ -28 +29 @@ -@@ -1490,7 +1490,7 @@ static int axgb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +@@ -1439,7 +1439,7 @@ static int axgb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) @@ -38 +39 @@ -index 1481fd9ff3..a6226729fe 100644 +index 35a8476466..ac9210f2c8 100644