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 C4082A0524 for ; Thu, 4 Feb 2021 12:38:59 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD7652407AD; Thu, 4 Feb 2021 12:38:59 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 211D42407A3 for ; Thu, 4 Feb 2021 12:38:58 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l7cyN-0005mH-Lp; Thu, 04 Feb 2021 11:38:55 +0000 From: Christian Ehrhardt To: Steve Yang Cc: Ferruh Yigit , Lance Richardson , Wisam Jaddo , Xiaoyun Li , Bo Chen , dpdk stable Date: Thu, 4 Feb 2021 12:29:54 +0100 Message-Id: <20210204112954.2488123-139-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> References: <20210204112954.2488123-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix setting maximum packet length' has been queued to stable release 19.11.7 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 19.11.7 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/06/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/8b8aa89e89b6d8e07d95cbd8b7c2815b1f6c73dd Thanks. Christian Ehrhardt --- >From 8b8aa89e89b6d8e07d95cbd8b7c2815b1f6c73dd Mon Sep 17 00:00:00 2001 From: Steve Yang Date: Thu, 28 Jan 2021 12:07:08 +0000 Subject: [PATCH] app/testpmd: fix setting maximum packet length [ upstream commit 0c4abd368880349cf9df2770b1d18890b08441ae ] "port config all max-pkt-len" command fails because it doesn't set the 'DEV_RX_OFFLOAD_JUMBO_FRAME' offload flag properly. Commit in the fixes line moved the 'DEV_RX_OFFLOAD_JUMBO_FRAME' offload flag update from 'cmd_config_max_pkt_len_parsed()' to 'init_config()'. 'init_config()' function is only called during testpmd startup, but the flag status needs to be calculated whenever 'max_rx_pkt_len' changes. The issue can be reproduced as [1], where the 'max-pkt-len' reduced and 'DEV_RX_OFFLOAD_JUMBO_FRAME' offload flag should be cleared but it didn't. Adding the 'update_jumbo_frame_offload()' helper function to update 'DEV_RX_OFFLOAD_JUMBO_FRAME' offload flag and 'max_rx_pkt_len'. This function is called both by 'init_config()' and 'cmd_config_max_pkt_len_parsed()'. Default 'max-pkt-len' value set to zero, 'update_jumbo_frame_offload()' updates it to "RTE_ETHER_MTU + PMD specific Ethernet overhead" when it is zero. If '--max-pkt-len=N' argument provided, it will be used instead. And with each "port config all max-pkt-len" command, the 'DEV_RX_OFFLOAD_JUMBO_FRAME' offload flag, 'max-pkt-len' and MTU is updated. [1] -------------------------------------------------------------------------- dpdk-testpmd -c 0xf -n 4 -- -i --max-pkt-len=9000 --tx-offloads=0x8000 --rxq=4 --txq=4 --disable-rss testpmd> set verbose 3 testpmd> port stop all testpmd> port config all max-pkt-len 1518 testpmd> port start all // Got fail error info without this patch Configuring Port 0 (socket 1) Ethdev port_id=0 rx_queue_id=0, new added offloads 0x800 must be within per-queue offload capabilities 0x0 in rte_eth_rx_queue_setup() Fail to configure port 0 rx queues //<-- Fail error info; -------------------------------------------------------------------------- Bugzilla ID: 625 Fixes: 761c4d66900f ("app/testpmd: fix max Rx packet length for VLAN packets") Signed-off-by: Steve Yang Signed-off-by: Ferruh Yigit Acked-by: Lance Richardson Acked-by: Wisam Jaddo Acked-by: Xiaoyun Li Tested-by: Bo Chen --- app/test-pmd/cmdline.c | 13 ++++++ app/test-pmd/testpmd.c | 102 +++++++++++++++++++++++++++++++++-------- app/test-pmd/testpmd.h | 2 + 3 files changed, 98 insertions(+), 19 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 21211907eb..9a9da744a1 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1974,7 +1974,9 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, __attribute__((unused)) void *data) { struct cmd_config_max_pkt_len_result *res = parsed_result; + uint32_t max_rx_pkt_len_backup = 0; portid_t pid; + int ret; if (!all_ports_stopped()) { printf("Please stop all ports first\n"); @@ -1993,7 +1995,18 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, if (res->value == port->dev_conf.rxmode.max_rx_pkt_len) return; + ret = eth_dev_info_get_print_err(pid, &port->dev_info); + if (ret != 0) { + printf("rte_eth_dev_info_get() failed for port %u\n", + pid); + return; + } + + max_rx_pkt_len_backup = port->dev_conf.rxmode.max_rx_pkt_len; + port->dev_conf.rxmode.max_rx_pkt_len = res->value; + if (update_jumbo_frame_offload(pid) != 0) + port->dev_conf.rxmode.max_rx_pkt_len = max_rx_pkt_len_backup; } else { printf("Unknown parameter\n"); return; diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 0797e634fe..a1823e00d9 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -421,8 +421,11 @@ lcoreid_t latencystats_lcore_id = -1; * Ethernet device configuration. */ struct rte_eth_rxmode rx_mode = { - .max_rx_pkt_len = RTE_ETHER_MAX_LEN, - /**< Default maximum frame length. */ + /* Default maximum frame length. + * Zero is converted to "RTE_ETHER_MTU + PMD Ethernet overhead" + * in init_config(). + */ + .max_rx_pkt_len = 0, }; struct rte_eth_txmode tx_mode = { @@ -1301,7 +1304,6 @@ init_config(void) struct rte_gro_param gro_param; uint32_t gso_types; uint16_t data_size; - uint16_t eth_overhead; bool warning = 0; int k; int ret; @@ -1338,22 +1340,10 @@ 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_mtu != UINT16_MAX && - port->dev_info.max_rx_pktlen > port->dev_info.max_mtu) - eth_overhead = port->dev_info.max_rx_pktlen - - port->dev_info.max_mtu; - else - eth_overhead = - RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN; - - if (port->dev_conf.rxmode.max_rx_pkt_len <= - (uint32_t)(RTE_ETHER_MTU + eth_overhead)) - port->dev_conf.rxmode.max_rx_pkt_len = - RTE_ETHER_MTU + eth_overhead; - else - port->dev_conf.rxmode.offloads |= - DEV_RX_OFFLOAD_JUMBO_FRAME; + ret = update_jumbo_frame_offload(pid); + if (ret != 0) + printf("Updating jumbo frame offload failed for port %u\n", + pid); if (!(port->dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)) @@ -3261,6 +3251,80 @@ rxtx_port_config(struct rte_port *port) } } +/* + * Helper function to arrange max_rx_pktlen value and JUMBO_FRAME offload, + * MTU is also aligned if JUMBO_FRAME offload is not set. + * + * port->dev_info should be set before calling this function. + * + * return 0 on success, negative on error + */ +int +update_jumbo_frame_offload(portid_t portid) +{ + struct rte_port *port = &ports[portid]; + uint32_t eth_overhead; + uint64_t rx_offloads; + int ret; + bool on; + + /* Update the max_rx_pkt_len to have MTU as RTE_ETHER_MTU */ + if (port->dev_info.max_mtu != UINT16_MAX && + port->dev_info.max_rx_pktlen > port->dev_info.max_mtu) + eth_overhead = port->dev_info.max_rx_pktlen - + port->dev_info.max_mtu; + else + eth_overhead = RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN; + + rx_offloads = port->dev_conf.rxmode.offloads; + + /* Default config value is 0 to use PMD specific overhead */ + if (port->dev_conf.rxmode.max_rx_pkt_len == 0) + port->dev_conf.rxmode.max_rx_pkt_len = RTE_ETHER_MTU + eth_overhead; + + if (port->dev_conf.rxmode.max_rx_pkt_len <= RTE_ETHER_MTU + eth_overhead) { + rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; + on = false; + } else { + if ((port->dev_info.rx_offload_capa & DEV_RX_OFFLOAD_JUMBO_FRAME) == 0) { + printf("Frame size (%u) is not supported by port %u\n", + port->dev_conf.rxmode.max_rx_pkt_len, + portid); + return -1; + } + rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; + on = true; + } + + if (rx_offloads != port->dev_conf.rxmode.offloads) { + uint16_t qid; + + port->dev_conf.rxmode.offloads = rx_offloads; + + /* Apply JUMBO_FRAME offload configuration to Rx queue(s) */ + for (qid = 0; qid < port->dev_info.nb_rx_queues; qid++) { + if (on) + port->rx_conf[qid].offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; + else + port->rx_conf[qid].offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; + } + } + + /* If JUMBO_FRAME is set MTU conversion done by ethdev layer, + * if unset do it here + */ + if ((rx_offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) == 0) { + ret = rte_eth_dev_set_mtu(portid, + port->dev_conf.rxmode.max_rx_pkt_len - eth_overhead); + if (ret) + printf("Failed to set MTU to %u for port %u\n", + port->dev_conf.rxmode.max_rx_pkt_len - eth_overhead, + portid); + } + + return 0; +} + void init_port_config(void) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 2b1e9a24f9..4dbcee3a62 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -883,6 +883,8 @@ uint16_t tx_pkt_set_md(uint16_t port_id, __rte_unused uint16_t queue, void add_tx_md_callback(portid_t portid); void remove_tx_md_callback(portid_t portid); +int update_jumbo_frame_offload(portid_t portid); + /* * Work-around of a compilation error with ICC on invocations of the * rte_be_to_cpu_16() function. -- 2.30.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-04 12:04:33.631358784 +0100 +++ 0139-app-testpmd-fix-setting-maximum-packet-length.patch 2021-02-04 12:04:28.238789930 +0100 @@ -1 +1 @@ -From 0c4abd368880349cf9df2770b1d18890b08441ae Mon Sep 17 00:00:00 2001 +From 8b8aa89e89b6d8e07d95cbd8b7c2815b1f6c73dd Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0c4abd368880349cf9df2770b1d18890b08441ae ] + @@ -49 +50,0 @@ -Cc: stable@dpdk.org @@ -60,2 +61,2 @@ - app/test-pmd/testpmd.h | 1 + - 3 files changed, 97 insertions(+), 19 deletions(-) + app/test-pmd/testpmd.h | 2 + + 3 files changed, 98 insertions(+), 19 deletions(-) @@ -64 +65 @@ -index c6ace2dd25..b338f5fe63 100644 +index 21211907eb..9a9da744a1 100644 @@ -67,2 +68,2 @@ -@@ -1877,7 +1877,9 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, - __rte_unused void *data) +@@ -1974,7 +1974,9 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, + __attribute__((unused)) void *data) @@ -77 +78 @@ -@@ -1896,7 +1898,18 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, +@@ -1993,7 +1995,18 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, @@ -97 +98 @@ -index c256e719ae..555852ae5e 100644 +index 0797e634fe..a1823e00d9 100644 @@ -100 +101 @@ -@@ -443,8 +443,11 @@ lcoreid_t latencystats_lcore_id = -1; +@@ -421,8 +421,11 @@ lcoreid_t latencystats_lcore_id = -1; @@ -114 +115 @@ -@@ -1410,7 +1413,6 @@ init_config(void) +@@ -1301,7 +1304,6 @@ init_config(void) @@ -122 +123 @@ -@@ -1447,22 +1449,10 @@ init_config(void) +@@ -1338,22 +1340,10 @@ init_config(void) @@ -149 +150 @@ -@@ -3358,6 +3348,80 @@ rxtx_port_config(struct rte_port *port) +@@ -3261,6 +3251,80 @@ rxtx_port_config(struct rte_port *port) @@ -231 +232 @@ -index 5f23162107..2f8f5a92e4 100644 +index 2b1e9a24f9..4dbcee3a62 100644 @@ -234,5 +235,3 @@ -@@ -1005,6 +1005,7 @@ uint16_t tx_pkt_set_dynf(uint16_t port_id, __rte_unused uint16_t queue, - __rte_unused void *user_param); - void add_tx_dynf_callback(portid_t portid); - void remove_tx_dynf_callback(portid_t portid); -+int update_jumbo_frame_offload(portid_t portid); +@@ -883,6 +883,8 @@ uint16_t tx_pkt_set_md(uint16_t port_id, __rte_unused uint16_t queue, + void add_tx_md_callback(portid_t portid); + void remove_tx_md_callback(portid_t portid); @@ -239,0 +239,2 @@ ++int update_jumbo_frame_offload(portid_t portid); ++ @@ -241,0 +243 @@ + * rte_be_to_cpu_16() function.