From: Konstantin Ananyev <konstantin.anan...@intel.com>
Add command line option for setting the max frame size.
Signed-off-by: Konstantin Ananyev <konstantin.anan...@intel.com>
Signed-off-by: Kevin Laatz <kevin.la...@intel.com>
Reviewed-by: Conor Walsh <conor.wa...@intel.com>
---
doc/guides/sample_app_ug/ioat.rst | 4 +++-
examples/ioat/ioatfwd.c | 25 +++++++++++++++++++++++--
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/doc/guides/sample_app_ug/ioat.rst
b/doc/guides/sample_app_ug/ioat.rst
index 404ca2e19a..127129dd4b 100644
--- a/doc/guides/sample_app_ug/ioat.rst
+++ b/doc/guides/sample_app_ug/ioat.rst
@@ -46,7 +46,7 @@ The application requires a number of command line options:
.. code-block:: console
./<build_dir>/examples/dpdk-ioat [EAL options] -- [-p MASK] [-q NQ] [-s
RS] [-c <sw|hw>]
- [--[no-]mac-updating] [-b BS]
+ [--[no-]mac-updating] [-b BS] [-f FS]
where,
@@ -66,6 +66,8 @@ where,
* b BS: set the DMA batch size
+* f FS: set the max frame size
+
The application can be launched in various configurations depending on
provided parameters. The app can use up to 2 lcores: one of them receives
incoming traffic and makes a copy of each packet. The second lcore then
diff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c
index 4d132a87e5..1711827cea 100644
--- a/examples/ioat/ioatfwd.c
+++ b/examples/ioat/ioatfwd.c
@@ -25,6 +25,7 @@
#define CMD_LINE_OPT_COPY_TYPE "copy-type"
#define CMD_LINE_OPT_RING_SIZE "ring-size"
#define CMD_LINE_OPT_BATCH_SIZE "dma-batch-size"
+#define CMD_LINE_OPT_FRAME_SIZE "max-frame-size"
/* configurable number of RX/TX ring descriptors */
#define RX_DEFAULT_RINGSIZE 1024
@@ -104,6 +105,7 @@ static uint16_t nb_txd = TX_DEFAULT_RINGSIZE;
static volatile bool force_quit;
static uint32_t ioat_batch_sz = MAX_PKT_BURST;
+static uint32_t max_frame_size = RTE_ETHER_MAX_LEN;
/* ethernet addresses of ports */
static struct rte_ether_addr ioat_ports_eth_addr[RTE_MAX_ETHPORTS];
@@ -604,6 +606,7 @@ ioat_usage(const char *prgname)
{
printf("%s [EAL options] -- -p PORTMASK [-q NQ]\n"
" -b --dma-batch-size: number of requests per DMA batch\n"
+ " -f --max-frame-size: max frame size\n"
" -p --portmask: hexadecimal bitmask of ports to configure\n"
" -q NQ: number of RX queues per port (default is 1)\n"
" --[no-]mac-updating: Enable or disable MAC addresses
updating (enabled by default)\n"
@@ -647,6 +650,7 @@ ioat_parse_args(int argc, char **argv, unsigned int
nb_ports)
static const char short_options[] =
"b:" /* dma batch size */
"c:" /* copy type (sw|hw) */
+ "f:" /* max frame size */
"p:" /* portmask */
"q:" /* number of RX queues per port */
"s:" /* ring size */
@@ -660,6 +664,7 @@ ioat_parse_args(int argc, char **argv, unsigned int
nb_ports)
{CMD_LINE_OPT_COPY_TYPE, required_argument, NULL, 'c'},
{CMD_LINE_OPT_RING_SIZE, required_argument, NULL, 's'},
{CMD_LINE_OPT_BATCH_SIZE, required_argument, NULL, 'b'},
+ {CMD_LINE_OPT_FRAME_SIZE, required_argument, NULL, 'f'},
{NULL, 0, 0, 0}
};
@@ -684,6 +689,15 @@ ioat_parse_args(int argc, char **argv, unsigned int
nb_ports)
return -1;
}
break;
+ case 'f':
+ max_frame_size = atoi(optarg);
+ if (max_frame_size > RTE_ETHER_MAX_JUMBO_FRAME_LEN) {
+ printf("Invalid max frame size, %s.\n", optarg);
+ ioat_usage(prgname);
+ return -1;
+ }
+ break;
+
/* portmask */
case 'p':
ioat_enabled_port_mask = ioat_parse_portmask(optarg);
@@ -880,6 +894,11 @@ port_init(uint16_t portid, struct rte_mempool *mbuf_pool,
uint16_t nb_queues)
struct rte_eth_dev_info dev_info;
int ret, i;
+ if (max_frame_size > local_port_conf.rxmode.max_rx_pkt_len) {
+ local_port_conf.rxmode.max_rx_pkt_len = max_frame_size;
+ local_port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
+ }
+
/* Skip ports that are not enabled */
if ((ioat_enabled_port_mask & (1 << portid)) == 0) {
printf("Skipping disabled port %u\n", portid);
@@ -990,6 +1009,7 @@ main(int argc, char **argv)
uint16_t nb_ports, portid;
uint32_t i;
unsigned int nb_mbufs;
+ size_t sz;
/* Init EAL. 8< */
ret = rte_eal_init(argc, argv);
@@ -1019,9 +1039,10 @@ main(int argc, char **argv)
MIN_POOL_SIZE);
/* Create the mbuf pool */
+ sz = max_frame_size + RTE_PKTMBUF_HEADROOM;
+ sz = RTE_MAX(sz, (size_t)RTE_MBUF_DEFAULT_BUF_SIZE);
ioat_pktmbuf_pool = rte_pktmbuf_pool_create("mbuf_pool", nb_mbufs,
- MEMPOOL_CACHE_SIZE, 0, RTE_MBUF_DEFAULT_BUF_SIZE,
- rte_socket_id());
+ MEMPOOL_CACHE_SIZE, 0, sz, rte_socket_id());
if (ioat_pktmbuf_pool == NULL)
rte_exit(EXIT_FAILURE, "Cannot init mbuf pool\n");
/* >8 End of allocates mempool to hold the mbufs. */
--
2.30.2
