From 2ebacaa7d13fa33d91e65f6a2e060eba3b0e1e5c Mon Sep 17 00:00:00 2001 From: Maciej Czekaj Date: Fri, 26 Aug 2016 13:46:42 +0200 Subject: [PATCH] app/testpmd: configure flowgen packet size with --txpkts "flowgen" forwarding mode has fixed packet size (300). Let it re-use --txpkts option for specifying generated packet size. Signed-off-by: Maciej Czekaj Acked-by: Pablo de Lara --- app/test-pmd/config.c | 2 +- app/test-pmd/flowgen.c | 3 +-- app/test-pmd/parameters.c | 3 ++- doc/guides/testpmd_app_ug/run_app.rst | 3 ++- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 8b0b240ff0..c97efdee1b 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -953,7 +953,7 @@ rxtx_config_display(void) rx_mode.hw_strip_crc ? "enabled" : "disabled", nb_pkt_per_burst); - if (cur_fwd_eng == &tx_only_engine) + if (cur_fwd_eng == &tx_only_engine || cur_fwd_eng == &flow_gen_engine) printf(" packet len=%u - nb packet segments=%d\n", (unsigned)tx_pkt_length, (int) tx_pkt_nb_segs); diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index 379ee01f79..b13ff89a36 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -73,7 +73,6 @@ /* hardcoded configuration (for now) */ static unsigned cfg_n_flows = 1024; -static unsigned cfg_pkt_size = 300; static uint32_t cfg_ip_src = IPv4(10, 254, 0, 0); static uint32_t cfg_ip_dst = IPv4(10, 253, 0, 0); static uint16_t cfg_udp_src = 1000; @@ -117,7 +116,7 @@ ip_sum(const unaligned_uint16_t *hdr, int hdr_len) static void pkt_burst_flow_gen(struct fwd_stream *fs) { - unsigned pkt_size = cfg_pkt_size - 4; /* Adjust FCS */ + unsigned pkt_size = tx_pkt_length - 4; /* Adjust FCS */ struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_mempool *mbp; struct rte_mbuf *pkt; diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index c45f78a030..08e5a76f98 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -191,7 +191,8 @@ usage(char* progname) "(0 <= mapping <= %d).\n", RTE_ETHDEV_QUEUE_STAT_CNTRS - 1); printf(" --no-flush-rx: Don't flush RX streams before forwarding." " Used mainly with PCAP drivers.\n"); - printf(" --txpkts=X[,Y]*: set TX segment sizes.\n"); + printf(" --txpkts=X[,Y]*: set TX segment sizes" + " or total packet length.\n"); printf(" --disable-link-check: disable check on link status when " "starting/stopping ports.\n"); } diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index fe6b7f19ff..d7c5120911 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -454,7 +454,8 @@ The commandline options are: * ``--txpkts=X[,Y]`` - Set TX segment sizes. + Set TX segment sizes or total packet length. Valid for ``tx-only`` + and ``flowgen`` forwarding modes. * ``--disable-link-check`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 5caca30115..186ae690b0 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -405,7 +405,7 @@ When retry is enabled, the transmit delay time and number of retries can also be set txpkts ~~~~~~~~~~ -Set the length of each segment of the TX-ONLY packets:: +Set the length of each segment of the TX-ONLY packets or length of packet for FLOWGEN mode:: testpmd> set txpkts (x[,y]*) -- 2.20.1