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 C1AABA052A; Mon, 25 Jan 2021 09:35:40 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D3822140DBD; Mon, 25 Jan 2021 09:35:34 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 52E13140DB9 for ; Mon, 25 Jan 2021 09:35:32 +0100 (CET) IronPort-SDR: PmIk/ugKHIi07hT1BmTePX3EF7ufibTLNEgGkBvwZxaC3AIL/FZ+vpZiY7Gj+CDbSm0S2UCWbP VjRmh350NZMA== X-IronPort-AV: E=McAfee;i="6000,8403,9874"; a="241220763" X-IronPort-AV: E=Sophos;i="5.79,373,1602572400"; d="scan'208";a="241220763" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2021 00:35:31 -0800 IronPort-SDR: 1bl4/bgOpml3q20auMLuvwzYGlsObwSDQxxXxfNAdZGKpH96oNCYW/n/2gUkl0Pqm8xTOVCrto JhTqsymDBGAQ== X-IronPort-AV: E=Sophos;i="5.79,373,1602572400"; d="scan'208";a="361281602" Received: from intel-npg-odc-srv01.cd.intel.com ([10.240.178.136]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2021 00:35:29 -0800 From: Steve Yang To: dev@dpdk.org Cc: wenzhuo.lu@intel.com, xiaoyun.li@intel.com, bernard.iremonger@intel.com, thomas@monjalon.net, ferruh.yigit@intel.com, andrew.rybchenko@oktetlabs.ru, qiming.yang@intel.com, Steve Yang Date: Mon, 25 Jan 2021 08:32:02 +0000 Message-Id: <20210125083202.38267-3-stevex.yang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210125083202.38267-1-stevex.yang@intel.com> References: <20210122090110.50453-1-stevex.yang@intel.com> <20210125083202.38267-1-stevex.yang@intel.com> Subject: [dpdk-dev] [PATCH v4 2/2] app/testpmd: fix max-pkt-len option invalid X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Moved the setting of 'DEV_RX_OFFLOAD_JUMBO_FRAME' from 'cmd_config_max_pkt_len_parsed()' to 'init_config()' caused fail the case where 'max_rx_pkt_len' is changed from the command line via "port config all max-pkt-len". The 'init_config()' function is only called when testpmd is started, but the DEV_RX_OFFLOAD_JUMBO_FRAME setting needs to be recomputed whenever 'max_rx_pkt_len' changes. Define the 'update_jumbo_frame_offload()' function for both 'init_config()' and 'cmd_config_max_pkt_len_parsed()', and detect if 'max_rx_pkt_len' should be update to 1500 + overhead as default configuration. At the same time, the offloads of rx queue also should update the value once port offloads changed (e.g.: disabled JUMBO_FRAME offload via changed max-pkt-len, reproduce steps [1]), otherwise, it would cause unexpected result. [1] -------------------------------------------------------------------------- ./x86_64-native-linuxapp-gcc/app/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 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; -------------------------------------------------------------------------- Fixes: 761c4d6690 ("app/testpmd: fix max Rx packet length for VLAN packets") Signed-off-by: Steve Yang --- app/test-pmd/cmdline.c | 1 + app/test-pmd/parameters.c | 1 + app/test-pmd/testpmd.c | 63 ++++++++++++++++++++++++++++----------- app/test-pmd/testpmd.h | 2 ++ 4 files changed, 50 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 89034c8b72..8b6b7b6206 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1901,6 +1901,7 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, printf("Unknown parameter\n"); return; } + update_jumbo_frame_offload(pid, false); } init_port_config(); diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index df5eb10d84..1c63156ddd 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -833,6 +833,7 @@ launch_args_parse(int argc, char** argv) "total-num-mbufs should be > 1024\n"); } if (!strcmp(lgopts[opt_idx].name, "max-pkt-len")) { + default_max_pktlen = false; n = atoi(optarg); if (n >= RTE_ETHER_MIN_LEN) rx_mode.max_rx_pkt_len = (uint32_t) n; diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index c256e719ae..f22d2be46d 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -531,6 +531,8 @@ uint16_t gso_max_segment_size = RTE_ETHER_MAX_LEN - RTE_ETHER_CRC_LEN; /* Holds the registered mbuf dynamic flags names. */ char dynf_names[64][RTE_MBUF_DYN_NAMESIZE]; +bool default_max_pktlen = true; + /* * Helper function to check if socket is already discovered. * If yes, return positive value. If not, return zero. @@ -1410,7 +1412,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; @@ -1447,22 +1448,7 @@ 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; + update_jumbo_frame_offload(pid, default_max_pktlen); if (!(port->dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)) @@ -3358,6 +3344,49 @@ rxtx_port_config(struct rte_port *port) } } +void +update_jumbo_frame_offload(portid_t portid, bool def_max_pktlen) +{ + struct rte_port *port = &ports[portid]; + uint32_t eth_overhead; + uint64_t rx_offloads; + + /* 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; + if (port->dev_conf.rxmode.max_rx_pkt_len <= + RTE_ETHER_MTU + eth_overhead) { + /* + * If command line option doesn't include --max-pkt-len, + * the default max_rx_pkt_len should be set to 1500 + overhead. + */ + if (def_max_pktlen) + port->dev_conf.rxmode.max_rx_pkt_len = + RTE_ETHER_MTU + eth_overhead; + rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; + } else + rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; + + /* Apply Rx offloads configuration to Rx queue(s) */ + if (rx_offloads != port->dev_conf.rxmode.offloads) { + uint16_t qid; + + port->dev_conf.rxmode.offloads = rx_offloads; + if (eth_dev_info_get_print_err(portid, &port->dev_info) != 0) + rte_exit(EXIT_FAILURE, + "rte_eth_dev_info_get() failed\n"); + + for (qid = 0; qid < port->dev_info.nb_rx_queues; qid++) + port->rx_conf[qid].offloads = rx_offloads; + } +} + void init_port_config(void) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 5f23162107..16f6fbefef 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -304,6 +304,7 @@ extern cmdline_parse_inst_t cmd_show_set_raw_all; extern uint16_t mempool_flags; +extern bool default_max_pktlen; /** * Forwarding Configuration * @@ -1005,6 +1006,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); +void update_jumbo_frame_offload(portid_t portid, bool def_max_pktlen); /* * Work-around of a compilation error with ICC on invocations of the -- 2.17.1