From: Gregory Etelson <[email protected]> Add support for selective Rx using existing rxoffs and rxpkts command line parameters.
When both rxoffs and rxpkts are specified on PMDs supporting selective Rx, testpmd automatically: 1. Inserts segments with NULL mempool for gaps between configured segments to discard unwanted data. 2. Adds a trailing segment with NULL mempool to cover any remaining data up to the max packet length. Example usage to receive only Ethernet header and a segment at offset 128: --rxoffs=0,128 --rxpkts=14,64 This creates segments: - [0-13]: 14 bytes with mempool (received) - [14-127]: 114 bytes with NULL mempool (discarded) - [128-191]: 64 bytes with mempool (received) - [192-max]: remaining bytes with NULL mempool (discarded) Note: RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT is required for this feature and is checked at ethdev API level. This check is removed from testpmd to allow negative testing of the API. Signed-off-by: Gregory Etelson <[email protected]> --- app/test-pmd/testpmd.c | 69 ++++++++++++++++++++++----- doc/guides/testpmd_app_ug/run_app.rst | 20 ++++++++ 2 files changed, 78 insertions(+), 11 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index e2569d9e30..3ddcfee654 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2731,6 +2731,16 @@ port_is_started(portid_t port_id) return 1; } +static struct rte_eth_rxseg_split * +next_rx_seg(union rte_eth_rxseg *segs, uint16_t *idx) +{ + if (*idx >= MAX_SEGS_BUFFER_SPLIT) { + fprintf(stderr, "Too many segments (max %u)\n", MAX_SEGS_BUFFER_SPLIT); + return NULL; + } + return &segs[(*idx)++].split; +} + /* Configure the Rx with optional split. */ int rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, @@ -2744,31 +2754,68 @@ rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, uint32_t prev_hdrs = 0; int ret; - if ((rx_pkt_nb_segs > 1) && - (rx_conf->offloads & RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT)) { + if (rx_pkt_nb_segs > 1 || rx_pkt_nb_offs > 0) { + struct rte_eth_dev_info dev_info; + uint16_t seg_idx = 0; + uint16_t next_offset = 0; + + ret = rte_eth_dev_info_get(port_id, &dev_info); + if (ret != 0) + return ret; + /* multi-segment configuration */ for (i = 0; i < rx_pkt_nb_segs; i++) { - struct rte_eth_rxseg_split *rx_seg = &rx_useg[i].split; - /* - * Use last valid pool for the segments with number - * exceeding the pool index. - */ + struct rte_eth_rxseg_split *rx_seg; + uint16_t seg_offset; + + seg_offset = i < rx_pkt_nb_offs ? + rx_pkt_seg_offsets[i] : next_offset; + + /* Insert selective Rx discard segment if there's a gap */ + if (seg_offset > next_offset) { + rx_seg = next_rx_seg(rx_useg, &seg_idx); + if (rx_seg == NULL) + return -EINVAL; + rx_seg->offset = next_offset; + rx_seg->length = seg_offset - next_offset; + rx_seg->mp = NULL; + next_offset = seg_offset; + } + + rx_seg = next_rx_seg(rx_useg, &seg_idx); + if (rx_seg == NULL) + return -EINVAL; mp_n = (i >= mbuf_data_size_n) ? mbuf_data_size_n - 1 : i; mpx = mbuf_pool_find(socket_id, mp_n); - /* Handle zero as mbuf data buffer size. */ - rx_seg->offset = i < rx_pkt_nb_offs ? - rx_pkt_seg_offsets[i] : 0; + rx_seg->offset = seg_offset; rx_seg->mp = mpx ? mpx : mp; if (rx_pkt_hdr_protos[i] != 0 && rx_pkt_seg_lengths[i] == 0) { rx_seg->proto_hdr = rx_pkt_hdr_protos[i] & ~prev_hdrs; prev_hdrs |= rx_seg->proto_hdr; + } else if (rx_pkt_nb_offs > 0 && rx_pkt_seg_lengths[i] == 0) { + /* Insert fake discard segment if explicitly requested */ + rx_seg->mp = NULL; + rx_seg->length = 0; } else { rx_seg->length = rx_pkt_seg_lengths[i] ? rx_pkt_seg_lengths[i] : mbuf_data_size[mp_n]; } + + next_offset = seg_offset + rx_seg->length; } - rx_conf->rx_nseg = rx_pkt_nb_segs; + + /* Add trailing selective Rx discard segment up to max packet length */ + if (rx_pkt_nb_offs > 0 && next_offset < dev_info.max_rx_pktlen) { + struct rte_eth_rxseg_split *rx_seg = next_rx_seg(rx_useg, &seg_idx); + if (rx_seg == NULL) + return -EINVAL; + rx_seg->offset = next_offset; + rx_seg->length = dev_info.max_rx_pktlen - next_offset; + rx_seg->mp = NULL; + } + + rx_conf->rx_nseg = seg_idx; rx_conf->rx_seg = rx_useg; rx_conf->rx_mempools = NULL; rx_conf->rx_nmempool = 0; diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index 1a4a4b6c12..b59991ed89 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -364,6 +364,11 @@ The command line options are: feature is engaged. Affects only the queues configured with split offloads (currently BUFFER_SPLIT is supported only). + When used with ``--rxpkts`` on PMDs supporting selective Rx, + enables receiving only specific packet segments and discarding the rest. + Gaps between configured segments and any trailing data up to the max packet length + are automatically filled with NULL mempool segments (data is discarded). + * ``--rxpkts=X[,Y]`` Set the length of segments to scatter packets on receiving if split @@ -373,6 +378,21 @@ The command line options are: command line parameter and the mbufs to receive will be allocated sequentially from these extra memory pools. + Note: ``--rxoffs`` is required to enable selective Rx in testpmd. + To receive only the first N bytes, use ``--rxoffs=0 --rxpkts=N``. + + To receive only the Ethernet header (14 bytes at offset 0) and + a 64-byte segment starting at offset 128, while discarding the rest:: + + --rxoffs=0,128 --rxpkts=14,64 + + This configuration will: + + * Receive 14 bytes at offset 0 (Ethernet header) + * Discard bytes 14-127 (inserted NULL mempool segment) + * Receive 64 bytes at offset 128 + * Discard remaining bytes (inserted NULL mempool segment) + * ``--txpkts=X[,Y]`` Set TX segment sizes or total packet length. Valid for ``tx-only`` -- 2.54.0
