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 785E3A0524 for ; Fri, 5 Feb 2021 12:33:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70988188946; Fri, 5 Feb 2021 12:33:19 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id DF0BC188A0F for ; Fri, 5 Feb 2021 12:33:18 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id c12so7294186wrc.7 for ; Fri, 05 Feb 2021 03:33:18 -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=hLNNHUTgCMf7EzS1B/TW9hY0MTGjWitlcz7J1K8ia80=; b=M9Z6D0BvHX4kZ/9omd7/yDGVoriki/7NDuzIXY/zy5o/kgVSYqsQ3uC+stcWq7O9BG 4wfXbIok4tNMVi2kI4B4f/vP9m2M02Uhsw6dby3z5BOYVtRBXzIGmBYw6P2Q3XZL3/dK VzWNt5WctqBB6tovrGLFHvb9/sarSoPXQ8K/e1ciUnAQ4ZqgDfeQ7G7AmUu0TrfIkNfb +1+BG8vzxdEUdDoZI02Lpezk5f8qTg9UMgWcdj3sPz5O+CZJyYz7JVr+Vea0+5Aig65+ +9Y0BXknOqXtw/4oV9xsacklrc9H2mtYjqUp+nfqYxcDw/avUl/QCDy8MvhIv/K+yJa4 v6rw== 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=hLNNHUTgCMf7EzS1B/TW9hY0MTGjWitlcz7J1K8ia80=; b=BQtqd1ifY9ohz33XrmHEGAUYoP7aE5EWPpB/52GZAO4TwruRV4FX5JTZbKhoYcArPx Fd5/NZAxicxbWErboFUpFxO78EycGxUfpr9+5WtnBpCduODbWufNa9gToen1DVDQnSC2 aE8+TRsI0jaJPqoy6YW0/cfR9bZPRneOWqxbtO4dkK27xiEtIORpoOpThsSQbvBVl1DX 5CEwmJkYKcEemhoDzrqJqkK3KdasKLeeEoYX7xOoaSC9ucKdack2/BXd2wj0r4iB/44k 2Ds6v9I6yPV5RLOnAg52QgVAYPqErDm4+VT2BE44FtnxCpaV+jHP1yLNk2yKSxgFPuji xvMQ== X-Gm-Message-State: AOAM53051VQbTExg93LtYXehRhyfmus/dsfZH2nLdUqXxYXGLTi82AKo FTMnnHWhstzTvFCNLuKDvRI= X-Google-Smtp-Source: ABdhPJwnqjTpFMkiq4R6HRr/i6CaaW5neO/c7HkxZR73Rljj9B80aVAyT4O4tfvmeQVBmTIwS8nTnQ== X-Received: by 2002:adf:e4c9:: with SMTP id v9mr4433930wrm.277.1612524798737; Fri, 05 Feb 2021 03:33:18 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id j7sm12688735wrp.72.2021.02.05.03.33.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:18 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Nithin Dabilpuram , dpdk stable Date: Fri, 5 Feb 2021 11:17:20 +0000 Message-Id: <20210205111920.1272063-154-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/octeontx2: fix jumbo frame flag condition for MTU' 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/297cbb21e3659824caa835830d8e0b7a0464529b Thanks. Luca Boccassi --- >From 297cbb21e3659824caa835830d8e0b7a0464529b Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:18 +0000 Subject: [PATCH] net/octeontx2: fix jumbo frame flag condition for MTU [ upstream commit 3a921cd69bdbf39ba2a17af0c01f0000c6efb893 ] 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: 0e2efd02db58 ("net/octeontx2: add MTU set operation") Signed-off-by: Steve Yang Acked-by: Nithin Dabilpuram --- drivers/net/octeontx2/otx2_ethdev.h | 2 ++ drivers/net/octeontx2/otx2_ethdev_ops.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h index 3b9871f4dc..99f0469d89 100644 --- a/drivers/net/octeontx2/otx2_ethdev.h +++ b/drivers/net/octeontx2/otx2_ethdev.h @@ -51,6 +51,8 @@ /* ETH_HLEN+ETH_FCS+2*VLAN_HLEN */ #define NIX_L2_OVERHEAD \ (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 8) +#define NIX_L2_MAX_LEN \ + (RTE_ETHER_MTU + NIX_L2_OVERHEAD) /* HW config of frame size doesn't include FCS */ #define NIX_MAX_HW_FRS 9212 diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c index b36d37b9f7..963cc285ed 100644 --- a/drivers/net/octeontx2/otx2_ethdev_ops.c +++ b/drivers/net/octeontx2/otx2_ethdev_ops.c @@ -58,7 +58,7 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) if (rc) return rc; - if (frame_size > RTE_ETHER_MAX_LEN) + if (frame_size > NIX_L2_MAX_LEN) dev->rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else dev->rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.209650038 +0000 +++ 0154-net-octeontx2-fix-jumbo-frame-flag-condition-for-MTU.patch 2021-02-05 11:18:29.090696519 +0000 @@ -1 +1 @@ -From 3a921cd69bdbf39ba2a17af0c01f0000c6efb893 Mon Sep 17 00:00:00 2001 +From 297cbb21e3659824caa835830d8e0b7a0464529b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3a921cd69bdbf39ba2a17af0c01f0000c6efb893 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org