From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E35B7A0527 for ; Mon, 9 Nov 2020 19:50:41 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DC9DE69C8; Mon, 9 Nov 2020 19:50:40 +0100 (CET) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by dpdk.org (Postfix) with ESMTP id EEA6869C8 for ; Mon, 9 Nov 2020 19:50:37 +0100 (CET) Received: by mail-wr1-f49.google.com with SMTP id r17so5980389wrw.1 for ; Mon, 09 Nov 2020 10:50:37 -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=thaHeDmx3MRDMLR9mWxmPKHR2O2awCQ4LPz7Vd2jmx4=; b=rOCB09Erkbk/oUPVoj7W7GsS4C9oXkhvWtRPavfU0TTT9wnd3d6F97HaZtl4VHsczE NROLzMHXpm1b8Cq3SuxtCU9Wywva2Qw2VzkEVj9imtbkUXEvvdUWKym1Ij0f5dvWXq9l ++bKGXh6DeumpKXieUvu+DWnle4llQNz/6wHHENAPHOq7Y6H26bK7TcgpXZmeOHG4Guz 5a0L3RctBFDFhL3q/ibEVVYQqCjKaK/tdiIYQtHf5vYWk1Gk4dJyLSYf6uStfeyg+4p6 eHYT/Tm18xPDWet7HN2FwM5dEuzntZTd0MQxS3ux+Kb5kMKZHHlsgXbUAo7GuG77APiN 6teA== 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=thaHeDmx3MRDMLR9mWxmPKHR2O2awCQ4LPz7Vd2jmx4=; b=ryozdCCRDe66MqMMyCGBbclX6OIgyUI2IOpQMZ1y4qZ6UaSt229T8dQsri0JOWTkpi LixVhAVW64bRPD2ByaKzcXs4fLLasgF5JGz78vq4aS/Hma9zyZQXi3sYrhOcLgTfKBKW IlZVAKu8XkqjFyKTJ4JGo9pxiKnv8Hh0UvbUU/sLjUBnNH28RSkd2RVKxFEPiz5wWwUc xGt9lPwQ5QHK3cBfog/HWyWCE2sYfUZEQDi/LBZzumKEKmxHF7D6NZNkhSmb2fUhhEZb 8jCXwnA6RyBgL3on4JQuaiK4UOZfoUTExG59gZT5UKwN+R7kW4VupI/8mOFrT3gvMrHz pzHQ== X-Gm-Message-State: AOAM53033XAIHUIsSlO06wDXYtqtukVDNPJaE/0Srk+qrrIF7URHqz3s lzTDTOa3rngQiNOBb4buNe8= X-Google-Smtp-Source: ABdhPJwE2AzalpnhJfpN4Sz3lEhgiggW/Px+nw0gFMfQ2F8QOgE08csGCbcRdvsnUaJ4dhFKWwjp9A== X-Received: by 2002:a5d:6744:: with SMTP id l4mr18809156wrw.378.1604947836692; Mon, 09 Nov 2020 10:50:36 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t11sm318694wmf.35.2020.11.09.10.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 10:50:35 -0800 (PST) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: Andrew Rybchenko , Lance Richardson , Ferruh Yigit , dpdk stable Date: Mon, 9 Nov 2020 18:50:30 +0000 Message-Id: <20201109185030.3478760-2-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201109185030.3478760-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-207-luca.boccassi@gmail.com> <20201109185030.3478760-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: revert max Rx packet length adjustment' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/11/20. 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/93be79055bd21dc8909186107db7d2e4ccaba8bd Thanks. Luca Boccassi --- >From 93be79055bd21dc8909186107db7d2e4ccaba8bd Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 5 Nov 2020 18:05:41 +0100 Subject: [PATCH] app/testpmd: revert max Rx packet length adjustment [ upstream commit 13e0b599acfd7ec7d92a48c827be03bdc491429b ] The fix of max_rx_pkt_len for allowing VLAN packets in all cases was breaking configuration of some drivers. Example with virtio: Ethdev port_id=0 max_rx_pkt_len 11229 > max valid value 9728 Fail to configure port 0 Trying to fix the logic was revealing other issues in some drivers. That's why it is decided to revert. The workaround for the original issue would be to set the MTU explicitly from the application with rte_eth_dev_set_mtu(). See RFC: https://patches.dpdk.org/patch/83756/ Fixes: f6870a7ed6b3 ("app/testpmd: fix max Rx packet length for VLAN packet") Reported-by: Andrew Rybchenko Signed-off-by: Thomas Monjalon Acked-by: Lance Richardson Acked-by: Ferruh Yigit --- app/test-pmd/testpmd.c | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index cb4c365cb1..7f59cb02d1 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -1301,7 +1301,6 @@ init_config(void) struct rte_gro_param gro_param; uint32_t gso_types; uint16_t data_size; - uint16_t overhead_len; bool warning = 0; int k; int ret; @@ -1338,28 +1337,6 @@ init_config(void) rte_exit(EXIT_FAILURE, "rte_eth_dev_info_get() failed\n"); - /* Update the max_rx_pkt_len to have MTU as RTE_ETHER_MTU */ - if (port->dev_info.max_rx_pktlen && port->dev_info.max_mtu) - overhead_len = port->dev_info.max_rx_pktlen - - port->dev_info.max_mtu; - else - overhead_len = RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN; - - port->dev_conf.rxmode.max_rx_pkt_len = - RTE_ETHER_MTU + overhead_len; - - /* - * This is workaround to avoid resize max rx packet len. - * Ethdev assumes jumbo frame size must be greater than - * RTE_ETHER_MAX_LEN, and will resize 'max_rx_pkt_len' to - * default value when it is greater than RTE_ETHER_MAX_LEN - * for normal frame. - */ - if (port->dev_conf.rxmode.max_rx_pkt_len > RTE_ETHER_MAX_LEN) { - port->dev_conf.rxmode.offloads |= - DEV_RX_OFFLOAD_JUMBO_FRAME; - } - if (!(port->dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)) port->dev_conf.txmode.offloads &= -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-09 18:49:40.643685401 +0000 +++ 0002-app-testpmd-revert-max-Rx-packet-length-adjustment.patch 2020-11-09 18:49:40.576079407 +0000 @@ -1 +1 @@ -From 13e0b599acfd7ec7d92a48c827be03bdc491429b Mon Sep 17 00:00:00 2001 +From 93be79055bd21dc8909186107db7d2e4ccaba8bd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 13e0b599acfd7ec7d92a48c827be03bdc491429b ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -32 +33 @@ -index c263121a9a..33fc0fddf5 100644 +index cb4c365cb1..7f59cb02d1 100644 @@ -35 +36 @@ -@@ -1421,7 +1421,6 @@ init_config(void) +@@ -1301,7 +1301,6 @@ init_config(void) @@ -43 +44 @@ -@@ -1458,28 +1457,6 @@ init_config(void) +@@ -1338,28 +1337,6 @@ init_config(void)