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 6F5BAA0524 for ; Fri, 5 Feb 2021 12:33:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 60D821889A0; Fri, 5 Feb 2021 12:33:01 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id B189C188A03 for ; Fri, 5 Feb 2021 12:32:59 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id u14so5633215wmq.4 for ; Fri, 05 Feb 2021 03:32:59 -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=jJru/wXWI2pMqCeDpHejTWIrtG0K6x+P+KUAe9c/V6M=; b=ThzpFHdnXeG6iQcwygR/HASbnuLBi3yUDT0jy1fOAdmYtQnKksP3fi747yr/mfiXoF NVP72Y6VeCrJyyL4L5oTSC2Pmp3O8FmEWqlG89UTKob08OV3Nx2U1E/QIJPndgxm2h9F OnhXkezdPOtPynX/ThW7ZF6Rxsp5xamNBlHN3Dbm7RiVX2hi+8td2vdnCKTkpaVJWvWm TjnrpA1w/yAiASM8w02ojr3O6oJmPT78jd6kPNqfBdjHGHt9LRXcBY8QDyapiMR69DvO qLlaGb4eRF3f52kQrOnHNsZmKMJnp/80cFPACN3s92FsS9mRZieW0dmWQYMBTGqpbz3R //1Q== 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=jJru/wXWI2pMqCeDpHejTWIrtG0K6x+P+KUAe9c/V6M=; b=NR/S/efob+FjocyaDpL9rkqSu4L7ZrDjUuxDi1KGOgBHPy3xwqyq8jKyYuKOjHbkVs nuAzFm0io5EkOB/5s8wQumCIRa2aW4ZfgLJSqryUttItsd8wizV75N0Aivc3XMu29vV4 iIjRb917yvi0mAB7eUbrlvYzF/nqN3dxknkmmQKM84YcWX7YSHItkGEd5TL3O7QjA0GD tEaA2wB579/t0oRUgPHLlEyt3x3SYKhwHZmToTo8qB29fLLWI1tTSvLOQJTT4Xk0iZ1h tRd3WRRk63wHTYcNz7FEUJDvMNMO5btUu17gtTVzEBBFioRvqpjk6WsIaY57BWy2Xtk+ bvNQ== X-Gm-Message-State: AOAM532Pjt3V4/OhTgRZT1B7+dgwlPjWhFiwSlb9UMMngiqvkqv0MRZF JyvzKoH7Q8qevXVTtGNsD7SZphScxUd8gn2u X-Google-Smtp-Source: ABdhPJzRUbcbU3AJp/S6or8iY0THRIKIx2fXzPqDbeDHtpa/3G7iPgfX3ixEfEhi9stgibcsHQqkHg== X-Received: by 2002:a1c:6a16:: with SMTP id f22mr3183053wmc.176.1612524779501; Fri, 05 Feb 2021 03:32:59 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r12sm12171951wrp.13.2021.02.05.03.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:32:58 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Jeff Guo , dpdk stable Date: Fri, 5 Feb 2021 11:17:13 +0000 Message-Id: <20210205111920.1272063-147-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/e1000: 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/8e419ba40ca20a9d1df5256eec8e676da408a79e Thanks. Luca Boccassi --- >From 8e419ba40ca20a9d1df5256eec8e676da408a79e Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:11 +0000 Subject: [PATCH] net/e1000: fix jumbo frame flag condition for MTU set [ upstream commit b6c4c94175e8a72b3de9781bff3453a143cd868f ] 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: ef990fb56e55 ("net/e1000: convert to new Rx offloads API") Signed-off-by: Steve Yang Acked-by: Jeff Guo --- drivers/net/e1000/e1000_ethdev.h | 2 +- drivers/net/e1000/em_ethdev.c | 5 ++--- drivers/net/e1000/igb_ethdev.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/e1000/e1000_ethdev.h b/drivers/net/e1000/e1000_ethdev.h index 4755a5f333..3b4d9c3ee6 100644 --- a/drivers/net/e1000/e1000_ethdev.h +++ b/drivers/net/e1000/e1000_ethdev.h @@ -97,7 +97,7 @@ */ #define E1000_ETH_OVERHEAD (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + \ VLAN_TAG_SIZE) - +#define E1000_ETH_MAX_LEN (RTE_ETHER_MTU + E1000_ETH_OVERHEAD) /* * Maximum number of Ring Descriptors. * diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index 8ee9422bf4..2036c6e917 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -1799,8 +1799,7 @@ eth_em_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) if (ret != 0) return ret; - frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + - VLAN_TAG_SIZE; + frame_size = mtu + E1000_ETH_OVERHEAD; /* check that mtu is within the allowed range */ if (mtu < RTE_ETHER_MIN_MTU || frame_size > dev_info.max_rx_pktlen) @@ -1816,7 +1815,7 @@ eth_em_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) rctl = E1000_READ_REG(hw, E1000_RCTL); /* switch to jumbo mode if needed */ - if (frame_size > RTE_ETHER_MAX_LEN) { + if (frame_size > E1000_ETH_MAX_LEN) { dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; rctl |= E1000_RCTL_LPE; diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 647aa8d995..dfe87508c2 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -4369,7 +4369,7 @@ eth_igb_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) rctl = E1000_READ_REG(hw, E1000_RCTL); /* switch to jumbo mode if needed */ - if (frame_size > RTE_ETHER_MAX_LEN) { + if (frame_size > E1000_ETH_MAX_LEN) { dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; rctl |= E1000_RCTL_LPE; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:35.890453090 +0000 +++ 0147-net-e1000-fix-jumbo-frame-flag-condition-for-MTU-set.patch 2021-02-05 11:18:29.054695833 +0000 @@ -1 +1 @@ -From b6c4c94175e8a72b3de9781bff3453a143cd868f Mon Sep 17 00:00:00 2001 +From 8e419ba40ca20a9d1df5256eec8e676da408a79e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b6c4c94175e8a72b3de9781bff3453a143cd868f ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org