From patchwork Wed Nov 6 11:34:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dekel Peled X-Patchwork-Id: 62534 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C14FFA04AB; Wed, 6 Nov 2019 12:35:05 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 07F0F1C0D3; Wed, 6 Nov 2019 12:34:54 +0100 (CET) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 3F22F1C0BD for ; Wed, 6 Nov 2019 12:34:49 +0100 (CET) Received: from Internal Mail-Server by MTLPINE1 (envelope-from dekelp@mellanox.com) with ESMTPS (AES256-SHA encrypted); 6 Nov 2019 13:34:45 +0200 Received: from mtl-vdi-280.wap.labs.mlnx. (mtl-vdi-280.wap.labs.mlnx [10.128.130.87]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id xA6BYg5D030261; Wed, 6 Nov 2019 13:34:44 +0200 From: Dekel Peled To: john.mcnamara@intel.com, marko.kovacevic@intel.com, nhorman@tuxdriver.com, ajit.khaparde@broadcom.com, somnath.kotur@broadcom.com, anatoly.burakov@intel.com, xuanziyang2@huawei.com, cloud.wangxiaoyun@huawei.com, zhouguoyang@huawei.com, wenzhuo.lu@intel.com, konstantin.ananyev@intel.com, matan@mellanox.com, shahafs@mellanox.com, viacheslavo@mellanox.com, rmody@marvell.com, shshaikh@marvell.com, maxime.coquelin@redhat.com, tiwei.bie@intel.com, zhihong.wang@intel.com, yongwang@vmware.com, thomas@monjalon.net, ferruh.yigit@intel.com, arybchenko@solarflare.com, jingjing.wu@intel.com, bernard.iremonger@intel.com Cc: dev@dpdk.org Date: Wed, 6 Nov 2019 13:34:38 +0200 Message-Id: X-Mailer: git-send-email 1.7.1 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 3/3] app/testpmd: use API to set max LRO packet size X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" This patch implements use of the API for LRO aggregated packet max size. It adds command-line and runtime commands to configure this value, and adds option to show the supported value. Documentation is updated accordingly. Signed-off-by: Dekel Peled --- app/test-pmd/cmdline.c | 73 +++++++++++++++++++++++++++++ app/test-pmd/config.c | 2 + app/test-pmd/parameters.c | 5 ++ app/test-pmd/testpmd.c | 1 + doc/guides/testpmd_app_ug/run_app.rst | 5 ++ doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 ++++ 6 files changed, 95 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 4478069..edfa60f 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -2037,6 +2037,78 @@ struct cmd_config_max_pkt_len_result { }, }; +/* *** config max LRO aggregated packet size *** */ +struct cmd_config_max_lro_pkt_size_result { + cmdline_fixed_string_t port; + cmdline_fixed_string_t keyword; + cmdline_fixed_string_t all; + cmdline_fixed_string_t name; + uint32_t value; +}; + +static void +cmd_config_max_lro_pkt_size_parsed(void *parsed_result, + __attribute__((unused)) struct cmdline *cl, + __attribute__((unused)) void *data) +{ + struct cmd_config_max_lro_pkt_size_result *res = parsed_result; + portid_t pid; + + if (!all_ports_stopped()) { + printf("Please stop all ports first\n"); + return; + } + + RTE_ETH_FOREACH_DEV(pid) { + struct rte_port *port = &ports[pid]; + + if (!strcmp(res->name, "max-lro-pkt-size")) { + if (res->value == + port->dev_conf.rxmode.max_lro_pkt_size) + return; + + port->dev_conf.rxmode.max_lro_pkt_size = res->value; + } else { + printf("Unknown parameter\n"); + return; + } + } + + init_port_config(); + + cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1); +} + +cmdline_parse_token_string_t cmd_config_max_lro_pkt_size_port = + TOKEN_STRING_INITIALIZER(struct cmd_config_max_lro_pkt_size_result, + port, "port"); +cmdline_parse_token_string_t cmd_config_max_lro_pkt_size_keyword = + TOKEN_STRING_INITIALIZER(struct cmd_config_max_lro_pkt_size_result, + keyword, "config"); +cmdline_parse_token_string_t cmd_config_max_lro_pkt_size_all = + TOKEN_STRING_INITIALIZER(struct cmd_config_max_lro_pkt_size_result, + all, "all"); +cmdline_parse_token_string_t cmd_config_max_lro_pkt_size_name = + TOKEN_STRING_INITIALIZER(struct cmd_config_max_lro_pkt_size_result, + name, "max-lro-pkt-size"); +cmdline_parse_token_num_t cmd_config_max_lro_pkt_size_value = + TOKEN_NUM_INITIALIZER(struct cmd_config_max_lro_pkt_size_result, + value, UINT32); + +cmdline_parse_inst_t cmd_config_max_lro_pkt_size = { + .f = cmd_config_max_lro_pkt_size_parsed, + .data = NULL, + .help_str = "port config all max-lro-pkt-size ", + .tokens = { + (void *)&cmd_config_max_lro_pkt_size_port, + (void *)&cmd_config_max_lro_pkt_size_keyword, + (void *)&cmd_config_max_lro_pkt_size_all, + (void *)&cmd_config_max_lro_pkt_size_name, + (void *)&cmd_config_max_lro_pkt_size_value, + NULL, + }, +}; + /* *** configure port MTU *** */ struct cmd_config_mtu_result { cmdline_fixed_string_t port; @@ -19024,6 +19096,7 @@ struct cmd_show_port_supported_ptypes_result { (cmdline_parse_inst_t *)&cmd_config_rx_tx, (cmdline_parse_inst_t *)&cmd_config_mtu, (cmdline_parse_inst_t *)&cmd_config_max_pkt_len, + (cmdline_parse_inst_t *)&cmd_config_max_lro_pkt_size, (cmdline_parse_inst_t *)&cmd_config_rx_mode_flag, (cmdline_parse_inst_t *)&cmd_config_rss, (cmdline_parse_inst_t *)&cmd_config_rxtx_ring_size, diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index efe2812..50e6ac0 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -629,6 +629,8 @@ static int bus_match_all(const struct rte_bus *bus, const void *data) printf("Minimum size of RX buffer: %u\n", dev_info.min_rx_bufsize); printf("Maximum configurable length of RX packet: %u\n", dev_info.max_rx_pktlen); + printf("Maximum configurable size of LRO aggregated packet: %u\n", + dev_info.max_lro_pkt_size); if (dev_info.max_vfs) printf("Maximum number of VFs: %u\n", dev_info.max_vfs); if (dev_info.max_vmdq_pools) diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 9ea87c1..3e371e2 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -592,6 +592,7 @@ { "mbuf-size", 1, 0, 0 }, { "total-num-mbufs", 1, 0, 0 }, { "max-pkt-len", 1, 0, 0 }, + { "max-lro-pkt-size", 1, 0, 0 }, { "pkt-filter-mode", 1, 0, 0 }, { "pkt-filter-report-hash", 1, 0, 0 }, { "pkt-filter-size", 1, 0, 0 }, @@ -888,6 +889,10 @@ "Invalid max-pkt-len=%d - should be > %d\n", n, RTE_ETHER_MIN_LEN); } + if (!strcmp(lgopts[opt_idx].name, "max-lro-pkt-size")) { + n = atoi(optarg); + rx_mode.max_lro_pkt_size = (uint32_t) n; + } if (!strcmp(lgopts[opt_idx].name, "pkt-filter-mode")) { if (!strcmp(optarg, "signature")) fdir_conf.mode = diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 38acbc5..d4f67ec 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -419,6 +419,7 @@ struct fwd_engine * fwd_engines[] = { struct rte_eth_rxmode rx_mode = { .max_rx_pkt_len = RTE_ETHER_MAX_LEN, /**< Default maximum frame length. */ + .max_lro_pkt_size = RTE_ETHER_MAX_LEN, }; struct rte_eth_txmode tx_mode = { diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index ef677ba..bc17f3f 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -112,6 +112,11 @@ The command line options are: Set the maximum packet size to N bytes, where N >= 64. The default value is 1518. +* ``--max-lro-pkt-size=N`` + + Set the maximum LRO aggregated packet size to N bytes, where N >= 64. + The default value is 1518. + * ``--eth-peers-configfile=name`` Use a configuration file containing the Ethernet addresses of the peer ports. diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index c68a742..0267295 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -2139,6 +2139,15 @@ Set the maximum packet length:: This is equivalent to the ``--max-pkt-len`` command-line option. +port config - max-lro-pkt-size +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Set the maximum LRO aggregated packet size:: + + testpmd> port config all max-lro-pkt-size (value) + +This is equivalent to the ``--max-lro-pkt-size`` command-line option. + port config - Drop Packets ~~~~~~~~~~~~~~~~~~~~~~~~~~