@@ -1821,3 +1821,22 @@ socket path is ``/var/run/import_ipc_socket``.
Port 0 is attached. Now total ports is 1
Done
+
+port map external RxQ
+~~~~~~~~~~~~~~~~~~~~~
+
+API for external RxQ mapping management.
+
+Map HW queue index (32 bit) to rte_flow queue index (16 bit) for external RxQ::
+
+ testpmd> port (port_id) ext_rxq map (rte_queue_id) (hw_queue_id)
+
+Unmap external Rx queue rte_flow index mapping::
+
+ testpmd> port (port_id) ext_rxq unmap (rte_queue_id)
+
+where:
+
+* ``rte_queue_id``: queue index in range [64536, 65535].
+ This range is the highest 1000 numbers represented by 16 bits.
+* ``hw_queue_id``: queue index given by HW in queue creation.
@@ -334,13 +334,162 @@ static cmdline_parse_inst_t mlx5_test_cmd_port_host_shaper = {
}
};
+/* Map HW queue index to rte queue index. */
+struct cmd_map_ext_rxq {
+ cmdline_fixed_string_t port;
+ portid_t port_id;
+ cmdline_fixed_string_t ext_rxq;
+ cmdline_fixed_string_t map;
+ uint16_t rte_queue_id;
+ uint32_t hw_queue_id;
+};
+
+cmdline_parse_token_string_t cmd_map_ext_rxq_port =
+ TOKEN_STRING_INITIALIZER(struct cmd_map_ext_rxq, port, "port");
+cmdline_parse_token_num_t cmd_map_ext_rxq_port_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_map_ext_rxq, port_id, RTE_UINT16);
+cmdline_parse_token_string_t cmd_map_ext_rxq_ext_rxq =
+ TOKEN_STRING_INITIALIZER(struct cmd_map_ext_rxq, ext_rxq, "ext_rxq");
+cmdline_parse_token_string_t cmd_map_ext_rxq_map =
+ TOKEN_STRING_INITIALIZER(struct cmd_map_ext_rxq, map, "map");
+cmdline_parse_token_num_t cmd_map_ext_rxq_rte_queue_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_map_ext_rxq, rte_queue_id, RTE_UINT16);
+cmdline_parse_token_num_t cmd_map_ext_rxq_hw_queue_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_map_ext_rxq, hw_queue_id, RTE_UINT32);
+
+static void
+cmd_map_ext_rxq_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_map_ext_rxq *res = parsed_result;
+ int ret;
+
+ if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+ return;
+ ret = rte_pmd_mlx5_external_rx_queue_id_map(res->port_id,
+ res->rte_queue_id,
+ res->hw_queue_id);
+ switch (ret) {
+ case 0:
+ break;
+ case -EINVAL:
+ fprintf(stderr, "invalid rte_flow index (%u), out of range\n",
+ res->rte_queue_id);
+ break;
+ case -ENODEV:
+ fprintf(stderr, "invalid port_id %u\n", res->port_id);
+ break;
+ case -ENOTSUP:
+ fprintf(stderr, "function not implemented or supported\n");
+ break;
+ case -EEXIST:
+ fprintf(stderr, "mapping with index %u already exists\n",
+ res->rte_queue_id);
+ break;
+ default:
+ fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
+ }
+}
+
+cmdline_parse_inst_t cmd_map_ext_rxq = {
+ .f = cmd_map_ext_rxq_parsed,
+ .data = NULL,
+ .help_str = "port <port_id> ext_rxq map <rte_queue_id> <hw_queue_id>",
+ .tokens = {
+ (void *)&cmd_map_ext_rxq_port,
+ (void *)&cmd_map_ext_rxq_port_id,
+ (void *)&cmd_map_ext_rxq_ext_rxq,
+ (void *)&cmd_map_ext_rxq_map,
+ (void *)&cmd_map_ext_rxq_rte_queue_id,
+ (void *)&cmd_map_ext_rxq_hw_queue_id,
+ NULL,
+ }
+};
+
+/* Unmap HW queue index to rte queue index. */
+struct cmd_unmap_ext_rxq {
+ cmdline_fixed_string_t port;
+ portid_t port_id;
+ cmdline_fixed_string_t ext_rxq;
+ cmdline_fixed_string_t unmap;
+ uint16_t queue_id;
+};
+
+cmdline_parse_token_string_t cmd_unmap_ext_rxq_port =
+ TOKEN_STRING_INITIALIZER(struct cmd_unmap_ext_rxq, port, "port");
+cmdline_parse_token_num_t cmd_unmap_ext_rxq_port_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_unmap_ext_rxq, port_id, RTE_UINT16);
+cmdline_parse_token_string_t cmd_unmap_ext_rxq_ext_rxq =
+ TOKEN_STRING_INITIALIZER(struct cmd_unmap_ext_rxq, ext_rxq, "ext_rxq");
+cmdline_parse_token_string_t cmd_unmap_ext_rxq_unmap =
+ TOKEN_STRING_INITIALIZER(struct cmd_unmap_ext_rxq, unmap, "unmap");
+cmdline_parse_token_num_t cmd_unmap_ext_rxq_queue_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_unmap_ext_rxq, queue_id, RTE_UINT16);
+
+static void
+cmd_unmap_ext_rxq_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_unmap_ext_rxq *res = parsed_result;
+ int ret;
+
+ if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+ return;
+ ret = rte_pmd_mlx5_external_rx_queue_id_unmap(res->port_id,
+ res->queue_id);
+ switch (ret) {
+ case 0:
+ break;
+ case -EINVAL:
+ fprintf(stderr, "invalid rte_flow index (%u), "
+ "out of range, doesn't exist or still referenced\n",
+ res->queue_id);
+ break;
+ case -ENODEV:
+ fprintf(stderr, "invalid port_id %u\n", res->port_id);
+ break;
+ case -ENOTSUP:
+ fprintf(stderr, "function not implemented or supported\n");
+ break;
+ default:
+ fprintf(stderr, "programming error: (%s)\n", strerror(-ret));
+ }
+}
+
+cmdline_parse_inst_t cmd_unmap_ext_rxq = {
+ .f = cmd_unmap_ext_rxq_parsed,
+ .data = NULL,
+ .help_str = "port <port_id> ext_rxq unmap <queue_id>",
+ .tokens = {
+ (void *)&cmd_unmap_ext_rxq_port,
+ (void *)&cmd_unmap_ext_rxq_port_id,
+ (void *)&cmd_unmap_ext_rxq_ext_rxq,
+ (void *)&cmd_unmap_ext_rxq_unmap,
+ (void *)&cmd_unmap_ext_rxq_queue_id,
+ NULL,
+ }
+};
+
static struct testpmd_driver_commands mlx5_driver_cmds = {
.commands = {
{
.ctx = &mlx5_test_cmd_port_host_shaper,
.help = "mlx5 set port (port_id) host_shaper avail_thresh_triggered (on|off)"
- "rate (rate_num):\n"
- " Set HOST_SHAPER avail_thresh_triggered and rate with port_id\n\n",
+ "rate (rate_num):\n"
+ " Set HOST_SHAPER avail_thresh_triggered and rate with port_id\n\n",
+ },
+ {
+ .ctx = &cmd_map_ext_rxq,
+ .help = "port (port_id) ext_rxq map (rte_queue_id) (hw_queue_id)\n"
+ " Map HW queue index (32 bit) to rte_flow"
+ " queue index (16 bit) for external RxQ\n\n",
+ },
+ {
+ .ctx = &cmd_unmap_ext_rxq,
+ .help = "port (port_id) ext_rxq unmap (rte_queue_id)\n"
+ " Unmap external Rx queue rte_flow index mapping\n\n",
},
{
.ctx = NULL,