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 57AD3A0524 for ; Fri, 5 Feb 2021 12:33:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 517CB40682; Fri, 5 Feb 2021 12:33:18 +0100 (CET) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 9CC86188A0B for ; Fri, 5 Feb 2021 12:33:17 +0100 (CET) Received: by mail-wr1-f50.google.com with SMTP id g10so7344320wrx.1 for ; Fri, 05 Feb 2021 03:33:17 -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=CvFnDhrjNZrisMHRDD2M70z/wRvjyti/2erGN9vCPa4=; b=U+5IjoKTnGlwfnZBNVLND9x27Mtr2qnwz6eDbO7zrCHxfmBF8QI2M0mn27afMD7j9C Ar7706wc1C0otRncWvIcifIZiEsKL5x6PPpjmvwfyZjjSdKain6OHqq2kXDo2UzfHrMm j75YW9vPb0Dn2EH1aP+6X8JKWUecXyYtO+OVwciTYxiEukn2+Q5Hglj4tj1Y3Z9tDQGi UEZqfVrx2ZvaErz/jMI9FhMIRMY3mv/+NuREKZipziBudk4dfWxBgP8ZbjEebcJc2cA7 a32FNteBHkrUzVRRZ31hrnTeMr26jNbe0MUreXRYr2etlYR62mMogKQQu5q7LXbVQb18 mOmA== 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=CvFnDhrjNZrisMHRDD2M70z/wRvjyti/2erGN9vCPa4=; b=sF7R5ax3hL/kE5Obs8y+PkRqUp6epwmx1GtH6S6K9sUQ2jf6Fm3jixbubZsSdqq74z kzmROvPXYejzvEBrIwxh/Yk+Kg5xGB1MluPCUn/4lYqw5l/lig5zN6j5/mJVmfZKZMc+ ceg3xLRKFrKCNxtaXU5H3IdcG5zOim2hxamHedO5yyb0r/Y43IxqnbQ5rOQmE8o6pUSh P/9SoquRWFbXSJN7+Cd4MrQgRGJoX5M7PMTz3BvMVClZ3OBmJW8+uen4zj+Sf4/pDqRv XQ8spnE9rZR18zpTNl35oMVKTFHtAF9nuq+5TiQGMx4meMr9Waf8cl5serDjPHIkXIEk sQaA== X-Gm-Message-State: AOAM532WuqPrKiFUH6pkqLDPIaAikdhhDPcFqT0/x7ITXB+RVRCoxfK9 TKSWpB4NrjnwXrC5sJqSv7Q= X-Google-Smtp-Source: ABdhPJznsXyef0Rf3aIW64Weeq9VHZdeY9OJkn7DwoYU8rc08XDQZDP3TGJlFY2qp2kUrDyfkEUm1w== X-Received: by 2002:a5d:6510:: with SMTP id x16mr4360908wru.175.1612524797462; Fri, 05 Feb 2021 03:33:17 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id h14sm8726232wmq.45.2021.02.05.03.33.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:33:16 -0800 (PST) From: luca.boccassi@gmail.com To: Steve Yang Cc: Ferruh Yigit , Harman Kalra , dpdk stable Date: Fri, 5 Feb 2021 11:17:19 +0000 Message-Id: <20210205111920.1272063-153-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/octeontx: 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/d077817ac65df8fc9604f9c843e27b7fd8365166 Thanks. Luca Boccassi --- >From d077817ac65df8fc9604f9c843e27b7fd8365166 Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Mon, 18 Jan 2021 07:04:17 +0000 Subject: [PATCH] net/octeontx: fix jumbo frame flag condition for MTU set [ upstream commit e6ad69e40f17063b5b9526399610b70deb6c09db ] 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: 3151e6a687a3 ("net/octeontx: support MTU") Signed-off-by: Steve Yang Reviewed-by: Ferruh Yigit Acked-by: Harman Kalra --- drivers/net/octeontx/octeontx_ethdev.c | 2 +- drivers/net/octeontx/octeontx_ethdev.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c index 3ee7b043fd..81779885d5 100644 --- a/drivers/net/octeontx/octeontx_ethdev.c +++ b/drivers/net/octeontx/octeontx_ethdev.c @@ -552,7 +552,7 @@ octeontx_dev_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 > OCCTX_L2_MAX_LEN) nic->rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; else nic->rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; diff --git a/drivers/net/octeontx/octeontx_ethdev.h b/drivers/net/octeontx/octeontx_ethdev.h index 7246fb6d1d..780a094ffa 100644 --- a/drivers/net/octeontx/octeontx_ethdev.h +++ b/drivers/net/octeontx/octeontx_ethdev.h @@ -44,6 +44,7 @@ /* ETH_HLEN+ETH_FCS+2*VLAN_HLEN */ #define OCCTX_L2_OVERHEAD (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + \ OCCTX_MAX_VTAG_ACT_SIZE) +#define OCCTX_L2_MAX_LEN (RTE_ETHER_MTU + OCCTX_L2_OVERHEAD) /* Since HW FRS includes NPC VTAG insertion space, user has reduced FRS */ #define OCCTX_MAX_FRS \ -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:36.171701055 +0000 +++ 0153-net-octeontx-fix-jumbo-frame-flag-condition-for-MTU-.patch 2021-02-05 11:18:29.090696519 +0000 @@ -1 +1 @@ -From e6ad69e40f17063b5b9526399610b70deb6c09db Mon Sep 17 00:00:00 2001 +From d077817ac65df8fc9604f9c843e27b7fd8365166 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e6ad69e40f17063b5b9526399610b70deb6c09db ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org