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 3A317A0524 for ; Fri, 5 Feb 2021 12:39:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 34307188A61; Fri, 5 Feb 2021 12:39:02 +0100 (CET) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 79DA54067B for ; Fri, 5 Feb 2021 12:39:00 +0100 (CET) Received: by mail-wr1-f45.google.com with SMTP id p15so7290149wrq.8 for ; Fri, 05 Feb 2021 03:39:00 -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=f0LzOAEm9fUk57X73zq06d38LVx1yT2RVjeEUBGEGYI=; b=N1jy49GdBSlhb/PBSVZ1CZ5hTuJMrtMCSLAIla+EgkGo9QJhy85L4j2/O1q7/UnWqL 8Iw2PLMV/5jyvFboAMdp2rXvsCqfZ/1hrIBLPAe4c0fdc8K/3PQLmIo1lbofNi6aUK0O 1emJIEAozS2wJZJMSagtNvCXwEFw5azy2yeHbhAGHNPoGNi7eRsYEpefB8ZsmoUwAMOp OI8nzqOP3DYywQPKRa0OWM/J8Q48ZODs7URya7cKuLNCXGea/gjzAV9k1dVluO4n0+l2 4Nx/mv7FEDrWYKwEybFlkxfGkJqg4np0FL0HSh/KKUlqY3zaCMPPUr7qLxfpsnPFt7qu OEGA== 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=f0LzOAEm9fUk57X73zq06d38LVx1yT2RVjeEUBGEGYI=; b=ABuVL21RYFwEM0PlV94jA073qRhSkpuN2BbHY9D0lKQUu/4tpR7hL4RHIioOSGEli8 5mOHBrPxMtOOKZbwA9FW9/6pp1VASF+zC3OUh/Rp9+3CPFdGGC/s+COmob7DwOsdY2L1 tZ865ydZwP4cD6zGjWN/KDLRS20VLJGHYG8D6RASD9nd3PJx/7pGx1BqmEIzwN2kxLA3 pLjqj2wAtnPy2eBrSpxyBn9RITx8t5PxLNQoBMNwPlRMiq2ppnwcCMhOakSx9PIV36ns OJ+JOpduRmEOsEUKM1yKSta6ZOmu9L89mO1BHvc6HEb1NTgMo39U/nNl7LhY+gsFOg5p bMfw== X-Gm-Message-State: AOAM533d4fKVrVIGMm16eD9+i8CC4TAgRacxcOcLjkHnL4nW5hsIvU3Y F41BioShuxOVd4JEHPVDvWQ= X-Google-Smtp-Source: ABdhPJzt+nE1Gazz7lt2ukCUKQdywmworLMbIy+cncha1pd4R0iPsywlWJ9yErGcx7bgwTKmU+HUeQ== X-Received: by 2002:a5d:524a:: with SMTP id k10mr4603827wrc.394.1612525140321; Fri, 05 Feb 2021 03:39:00 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id u206sm8753610wme.12.2021.02.05.03.38.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:38:59 -0800 (PST) From: luca.boccassi@gmail.com To: Liron Himi Cc: Yuri Chipchev , dpdk stable Date: Fri, 5 Feb 2021 11:19:03 +0000 Message-Id: <20210205111920.1272063-257-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/mvpp2: remove CRC length from MRU validation' 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/217cacc32ee61d0900947149d2cc37c2024e9811 Thanks. Luca Boccassi --- >From 217cacc32ee61d0900947149d2cc37c2024e9811 Mon Sep 17 00:00:00 2001 From: Liron Himi Date: Wed, 27 Jan 2021 18:09:18 +0200 Subject: [PATCH] net/mvpp2: remove CRC length from MRU validation [ upstream commit 31536a6892ef9dfe98be26b65d9235d82ea9f9f1 ] CRC is being removed by HW before packet get write to the buffer, so CRC len should not be included in MRU validation Fixes: 79ec62028b9a ("net/mvpp2: update MTU and MRU related calculations") Signed-off-by: Liron Himi Reviewed-by: Yuri Chipchev --- drivers/net/mvpp2/mrvl_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index 0c338c0c00..eafe4f7ac9 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -441,8 +441,8 @@ mrvl_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) * when this feature has not been enabled/supported so far * (TODO check scattered_rx flag here once scattered RX is supported). */ - if (mru + MRVL_PKT_OFFS > mbuf_data_size) { - mru = mbuf_data_size - MRVL_PKT_OFFS; + if (mru - RTE_ETHER_CRC_LEN + MRVL_PKT_OFFS > mbuf_data_size) { + mru = mbuf_data_size + RTE_ETHER_CRC_LEN - MRVL_PKT_OFFS; mtu = MRVL_PP2_MRU_TO_MTU(mru); MRVL_LOG(WARNING, "MTU too big, max MTU possible limitted " "by current mbuf size: %u. Set MTU to %u, MRU to %u", -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.494472669 +0000 +++ 0257-net-mvpp2-remove-CRC-length-from-MRU-validation.patch 2021-02-05 11:18:29.274700022 +0000 @@ -1 +1 @@ -From 31536a6892ef9dfe98be26b65d9235d82ea9f9f1 Mon Sep 17 00:00:00 2001 +From 217cacc32ee61d0900947149d2cc37c2024e9811 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 31536a6892ef9dfe98be26b65d9235d82ea9f9f1 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index e95c6e5992..476227b9a1 100644 +index 0c338c0c00..eafe4f7ac9 100644