Thanks, PSB. > -----Original Message----- > From: Ananyev, Konstantin <konstantin.anan...@intel.com> > Sent: Monday, November 11, 2019 1:11 AM > To: Dekel Peled <dek...@mellanox.com>; Mcnamara, John > <john.mcnam...@intel.com>; Kovacevic, Marko > <marko.kovace...@intel.com>; nhor...@tuxdriver.com; > ajit.khapa...@broadcom.com; somnath.ko...@broadcom.com; Burakov, > Anatoly <anatoly.bura...@intel.com>; xuanziya...@huawei.com; > cloud.wangxiao...@huawei.com; zhouguoy...@huawei.com; Lu, Wenzhuo > <wenzhuo...@intel.com>; Matan Azrad <ma...@mellanox.com>; Shahaf > Shuler <shah...@mellanox.com>; Slava Ovsiienko > <viachesl...@mellanox.com>; rm...@marvell.com; > shsha...@marvell.com; maxime.coque...@redhat.com; Bie, Tiwei > <tiwei....@intel.com>; Wang, Zhihong <zhihong.w...@intel.com>; > yongw...@vmware.com; Thomas Monjalon <tho...@monjalon.net>; Yigit, > Ferruh <ferruh.yi...@intel.com>; arybche...@solarflare.com; Wu, Jingjing > <jingjing...@intel.com>; Iremonger, Bernard > <bernard.iremon...@intel.com> > Cc: dev@dpdk.org > Subject: RE: [PATCH v5 3/3] app/testpmd: use API to set max LRO packet size > > > > > > 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 <dek...@mellanox.com> > > Acked-by: Bernard Iremonger <bernard.iremon...@intel.com> > > Acked-by: Matan Azrad <ma...@mellanox.com> > > --- > > app/test-pmd/cmdline.c | 76 > +++++++++++++++++++++++++++++ > > app/test-pmd/config.c | 2 + > > app/test-pmd/parameters.c | 7 +++ > > 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, 100 insertions(+) > > > > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index > > 78c6899..2206a70 100644 > > --- a/app/test-pmd/cmdline.c > > +++ b/app/test-pmd/cmdline.c > > @@ -777,6 +777,9 @@ static void cmd_help_long_parsed(void > *parsed_result, > > "port config all max-pkt-len (value)\n" > > " Set the max packet length.\n\n" > > > > + "port config all max-lro-pkt-size (value)\n" > > + " Set the max LRO aggregated packet size.\n\n" > > + > > "port config all drop-en (on|off)\n" > > " Enable or disable packet drop on all RX queues of > all ports when no " > > "receive buffers available.\n\n" > > @@ -2040,6 +2043,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 <value>", > > + .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; > > @@ -19124,6 +19199,7 @@ struct cmd_show_rx_tx_desc_status_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 b603974..e1e5cf7 > > 100644 > > --- a/app/test-pmd/config.c > > +++ b/app/test-pmd/config.c > > @@ -616,6 +616,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..eda395b 100644 > > --- a/app/test-pmd/parameters.c > > +++ b/app/test-pmd/parameters.c > > @@ -107,6 +107,8 @@ > > printf(" --total-num-mbufs=N: set the number of mbufs to be > allocated " > > "in mbuf pools.\n"); > > printf(" --max-pkt-len=N: set the maximum size of packet to N > > bytes.\n"); > > + printf(" --max-lro-pkt-size=N: set the maximum LRO aggregated > packet " > > + "size to N bytes.\n"); > > #ifdef RTE_LIBRTE_CMDLINE > > printf(" --eth-peers-configfile=name: config file with ethernet > addresses " > > "of peer ports.\n"); > > @@ -592,6 +594,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 +891,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 > > 5ba9741..3fe694f 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, > > That looks like a change in current testpmd behavior, correct? > If so, is there real need for that? > Can't we have either some value for max_lro_pktlen, that would indicate > PMD to use the default value it prefers? > Or probably better to let have a separate function to set max lro size. > Then by default PMD will always use its preferred value, and when needed > user can change it via special function call. >
This is to keep consistent with max_rx_pkt_len use. > > }; > > > > 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 00e0c2a..721f740 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 9a5e5cb..9cfc82a 100644 > > --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst > > +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > > @@ -2147,6 +2147,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 > > ~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > -- > > 1.8.3.1