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 EB366A0524 for ; Fri, 5 Feb 2021 12:33:04 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E5A33188A08; Fri, 5 Feb 2021 12:33:04 +0100 (CET) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mails.dpdk.org (Postfix) with ESMTP id C8075188A08 for ; Fri, 5 Feb 2021 12:33:03 +0100 (CET) Received: by mail-wr1-f51.google.com with SMTP id c4so7267780wru.9 for ; Fri, 05 Feb 2021 03:33:03 -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=91GkvbpD4u3HXJv4DLC2uc9DuvQBOdn71Y8BtjX7+yA=; b=Wi7Wmhf+E/I/2OKYI9C8bkqPgkPWUT6OEIuVrLe39fXCWo8DHxMdaRpmaxMRkbp3uv EglvZnumGz2Bq2Ip1t8ihyEfF3FznZVG8jcczuIk4OFTth47+N0FMuYG/kgOV+j1V0e/ smjUW60KzTiYxmIB3qswS3DjeIfXhNMrGMxP256L4bNauG3D9bkzFmzMM6IeeET554dm vlpUKmk5xtmD36eW9Nq9drwXgpHIfanKyGI7b0VBdt6AN2rmNxsT3usKrFgNtDM9Tpdn Fu/fFrExTMdKwczqxnbUm06JmjgFuwByAbuKlbIl8KKNa0V2aOkOglhMMf7g2B1TzsXI cslw== 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=91GkvbpD4u3HXJv4DLC2uc9DuvQBOdn71Y8BtjX7+yA=; b=CaFBvtHQvUCW2vF42yqICWLQl44+jL1izjC7BnDaOZ+MsbeiZAn6jxDhp/m94WCvhf 0QTWoZiR4A30jWAgdQWW52XHxfcOyWbEPDtnbMD9UgkZUZ0s/iEzCZYy51jhGFp3hXAG bQ03/TilvZpmDgmwRXiWHLfyCTToaJpn1BKplThMagJb0HU+D29AJWdKQ96kGuaxS2/n b+T96K0MfgAbbVP0bv39cs8TBSJbBOSxYTN4xyfUZMloZGaAo/1ZM6l3DsRiz1Hbrr+3 vfxOylduRdfWfJ+En67l4feS5iRcwOv2l2g/WNwaxvmESkC7b4sc/K90fsskVdWnGwpf A55g== X-Gm-Message-State: AOAM531dMLTQwrFVQLcW/xoW+SKtXmWyXToCtGT62DF1xf6ew3L3MsQD U/8ykYZhYiAwGhY1MS36mOw= X-Google-Smtp-Source: ABdhPJyN+Tx24c3y15WvSvK20f4/QKB3jxCdAowIwrQ4M2skALWM9lskkN3bOmLk6g55nq+FLiGxPw== X-Received: by 2002:a5d:47a8:: with SMTP id 8mr4441835wrb.180.1612524783558; Fri, 05 Feb 2021 03:33:03 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g194sm8439308wme.39.2021.02.05.03.33.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:02 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Ferruh Yigit , dpdk stable Date: Fri, 5 Feb 2021 11:17:16 +0000 Message-Id: <20210205111920.1272063-150-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/iavf: fix jumbo frame flag condition' 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/625dcdf1c9db8c0ecdde31e057c4a257431d1c06 Thanks. Luca Boccassi --- >From 625dcdf1c9db8c0ecdde31e057c4a257431d1c06 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:14 +0000 Subject: [PATCH] net/iavf: fix jumbo frame flag condition [ upstream commit 7abd466423c356dfc45e1046c009f23ce0b02c49 ] The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition, but the Ether overhead is larger than 18 when it supports dual VLAN tags. 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: 3fd7a3719c66 ("net/avf: enable ops for MTU setting") Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit --- drivers/net/iavf/iavf.h | 1 + drivers/net/iavf/iavf_ethdev.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index 6d5912d8c1..3328bd9327 100644 --- a/drivers/net/iavf/iavf.h +++ b/drivers/net/iavf/iavf.h @@ -66,6 +66,7 @@ #define IAVF_VLAN_TAG_SIZE 4 #define IAVF_ETH_OVERHEAD \ (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + IAVF_VLAN_TAG_SIZE * 2) +#define IAVF_ETH_MAX_LEN (RTE_ETHER_MTU + IAVF_ETH_OVERHEAD) #define IAVF_32_BIT_WIDTH (CHAR_BIT * 4) #define IAVF_48_BIT_WIDTH (CHAR_BIT * 6) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index f0151215e6..2a8b47c127 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -420,23 +420,23 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq) * correctly. */ if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) { - if (max_pkt_len <= RTE_ETHER_MAX_LEN || + if (max_pkt_len <= IAVF_ETH_MAX_LEN || max_pkt_len > IAVF_FRAME_SIZE_MAX) { PMD_DRV_LOG(ERR, "maximum packet length must be " "larger than %u and smaller than %u, " "as jumbo frame is enabled", - (uint32_t)RTE_ETHER_MAX_LEN, + (uint32_t)IAVF_ETH_MAX_LEN, (uint32_t)IAVF_FRAME_SIZE_MAX); return -EINVAL; } } else { if (max_pkt_len < RTE_ETHER_MIN_LEN || - max_pkt_len > RTE_ETHER_MAX_LEN) { + max_pkt_len > IAVF_ETH_MAX_LEN) { PMD_DRV_LOG(ERR, "maximum packet length must be " "larger than %u and smaller than %u, " "as jumbo frame is disabled", (uint32_t)RTE_ETHER_MIN_LEN, - (uint32_t)RTE_ETHER_MAX_LEN); + (uint32_t)IAVF_ETH_MAX_LEN); return -EINVAL; } } @@ -1169,7 +1169,7 @@ iavf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) return -EBUSY; } - if (frame_size > RTE_ETHER_MAX_LEN) + if (frame_size > IAVF_ETH_MAX_LEN) dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.042705245 +0000 +++ 0150-net-iavf-fix-jumbo-frame-flag-condition.patch 2021-02-05 11:18:29.078696291 +0000 @@ -1 +1 @@ -From 7abd466423c356dfc45e1046c009f23ce0b02c49 Mon Sep 17 00:00:00 2001 +From 625dcdf1c9db8c0ecdde31e057c4a257431d1c06 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7abd466423c356dfc45e1046c009f23ce0b02c49 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index af11268fe3..c934d2e614 100644 +index 6d5912d8c1..3328bd9327 100644 @@ -29 +30 @@ -@@ -73,6 +73,7 @@ +@@ -66,6 +66,7 @@ @@ -38 +39 @@ -index 87e6062737..871c3ed126 100644 +index f0151215e6..2a8b47c127 100644 @@ -41 +42 @@ -@@ -460,23 +460,23 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq) +@@ -420,23 +420,23 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq) @@ -69 +70 @@ -@@ -1303,7 +1303,7 @@ iavf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) +@@ -1169,7 +1169,7 @@ iavf_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)