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 5747AA0524 for ; Fri, 5 Feb 2021 12:39:03 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51E9A4067B; Fri, 5 Feb 2021 12:39:03 +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 B14D5188A59 for ; Fri, 5 Feb 2021 12:39:01 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id c4so7286852wru.9 for ; Fri, 05 Feb 2021 03:39:01 -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=o1x7+qp0AM9PdCppWqXpHXkdNfasVgIt8bwtfWEiobg=; b=kfJz1xrnT4ycPOYEncZea88GHsU4lMboDmPn9GfaqtotU/zlhwbPL96/wdgotw+c59 RoBONNkge+vddO62fxyAxpXns7KnfNa4+Hzdl9MynBkdeQSi7bEmAFZGi5sXUjl5c87l JkLkEXPu13gVg4u8Yl+/l/BZ7UJ5GaCp2GawmkJCeQtRrcRI7jDetbBHd97AO/82MXoK EMUR/XFiBlNtC7+jbPK1k5sYvUPEwL4t3W3h1W8AXuqFZbqNfJimDecnOEbeCiq3w398 A/PXYnPwCHT2fB/9S6KmFcRTK3n359ByAeqeDk4ZPP+8ysNkex5i+f8BfJxE2ChFbFtD 7ZVA== 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=o1x7+qp0AM9PdCppWqXpHXkdNfasVgIt8bwtfWEiobg=; b=Dg/b0TJcaG+rrSt7kl1JfKAZTeRDpR25uTxixffcidE6bdd2cgNOQxcfU9+5Mspg+4 hBlWSOONCi/THVSBMmM7vfAsjzaKYDN9pabsmJ574Bdwxs4DT4ENZuxg2PT7YRfgyqMG eA6GicgVHj3njDwzVKFwOKYB34QURK2S/SWISMqKQtqB/2XGlhJBKebTvJ/uHl5Y5lJe RPUzPEW22T8Ja6exaK3G2cmoKH5votEhG7VAg5ZCVbI0+B6H20OzAgigFD/k4cH3hZ13 5ivAZwG1Y85K/qFcMZJR/4IQiN1Sv8hhra9t4OtDNobtVq1/SYrihnxp6lzQzvo8mdIH XroQ== X-Gm-Message-State: AOAM530EJX1Ls7Y1biyTuUASlblObtzz5+3AhLlOwD6EJmHIcdms7hty Uxj4QYDjTkBsi9M0CVZvRKIEZ3AkTFcLIW6x X-Google-Smtp-Source: ABdhPJwKCtl344NN4kOxl7hlC6gxLRNWViNPGUhtfbX3iNQqh8FaPVFvvFhGami1IETRaaC/TOJahA== X-Received: by 2002:adf:e90d:: with SMTP id f13mr4400079wrm.371.1612525141534; Fri, 05 Feb 2021 03:39:01 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id n4sm11675663wrt.47.2021.02.05.03.39.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:39:00 -0800 (PST) From: luca.boccassi@gmail.com To: Liron Himi Cc: Yuri Chipchev , dpdk stable Date: Fri, 5 Feb 2021 11:19:04 +0000 Message-Id: <20210205111920.1272063-258-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: fix frame size checking' 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/7b20a6d2e519159c80281608b800270381895900 Thanks. Luca Boccassi --- >From 7b20a6d2e519159c80281608b800270381895900 Mon Sep 17 00:00:00 2001 From: Liron Himi Date: Wed, 27 Jan 2021 18:09:19 +0200 Subject: [PATCH] net/mvpp2: fix frame size checking [ upstream commit 1c9a958a8bfb7cb4e2082b97d01849d4ba91c13b ] Need to add CRC len to the frame-size to compare against max_rx_pkt_len which includes it. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mvpp2/mrvl_ethdev.c b/drivers/net/mvpp2/mrvl_ethdev.c index eafe4f7ac9..6cd5acd337 100644 --- a/drivers/net/mvpp2/mrvl_ethdev.c +++ b/drivers/net/mvpp2/mrvl_ethdev.c @@ -1699,7 +1699,8 @@ mrvl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc, return -EFAULT; } - frame_size = buf_size - RTE_PKTMBUF_HEADROOM - MRVL_PKT_EFFEC_OFFS; + frame_size = buf_size - RTE_PKTMBUF_HEADROOM - + MRVL_PKT_EFFEC_OFFS + RTE_ETHER_CRC_LEN; if (frame_size < max_rx_pkt_len) { MRVL_LOG(WARNING, "Mbuf size must be increased to %u bytes to hold up " -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.538823579 +0000 +++ 0258-net-mvpp2-fix-frame-size-checking.patch 2021-02-05 11:18:29.278700098 +0000 @@ -1 +1 @@ -From 1c9a958a8bfb7cb4e2082b97d01849d4ba91c13b Mon Sep 17 00:00:00 2001 +From 7b20a6d2e519159c80281608b800270381895900 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 1c9a958a8bfb7cb4e2082b97d01849d4ba91c13b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 476227b9a1..db81135f1b 100644 +index eafe4f7ac9..6cd5acd337 100644