From: Qi Zhang <qi.z.zhang@intel.com>
To: thomas@monjalon.net
Cc: dev@dpdk.org, beilei.xing@intel.com, jingjing.wu@intel.com,
wenzhuo.lu@intel.com, Qi Zhang <qi.z.zhang@intel.com>
Subject: [dpdk-dev] [PATCH v2 3/4] app/testpmd: add command for queue setup
Date: Fri, 2 Mar 2018 12:13:05 +0800 [thread overview]
Message-ID: <20180302041306.90324-4-qi.z.zhang@intel.com> (raw)
In-Reply-To: <20180302041306.90324-1-qi.z.zhang@intel.com>
Add new command to setup queue:
queue setup (rx|tx) (port_id) (queue_idx) (ring_size)
rte_eth_[rx|tx]_queue_setup will be called corresponsively
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
app/test-pmd/cmdline.c | 136 ++++++++++++++++++++++++++++
doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7 ++
2 files changed, 143 insertions(+)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b4522f46a..b725f644d 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -774,6 +774,9 @@ static void cmd_help_long_parsed(void *parsed_result,
"port tm hierarchy commit (port_id) (clean_on_fail)\n"
" Commit tm hierarchy.\n\n"
+ "queue setup (rx|tx) (port_id) (queue_idx) (ring_size)\n"
+ " setup a not started queue or re-setup a started queue.\n\n"
+
, list_pkt_forwarding_modes()
);
}
@@ -16030,6 +16033,138 @@ cmdline_parse_inst_t cmd_load_from_file = {
},
};
+/* Queue Setup */
+
+/* Common result structure for queue setup */
+struct cmd_queue_setup_result {
+ cmdline_fixed_string_t queue;
+ cmdline_fixed_string_t setup;
+ cmdline_fixed_string_t rxtx;
+ portid_t port_id;
+ uint16_t queue_idx;
+ uint16_t ring_size;
+};
+
+/* Common CLI fields for queue setup */
+cmdline_parse_token_string_t cmd_queue_setup_queue =
+ TOKEN_STRING_INITIALIZER(struct cmd_queue_setup_result, queue, "queue");
+cmdline_parse_token_string_t cmd_queue_setup_setup =
+ TOKEN_STRING_INITIALIZER(struct cmd_queue_setup_result, setup, "setup");
+cmdline_parse_token_string_t cmd_queue_setup_rxtx =
+ TOKEN_STRING_INITIALIZER(struct cmd_queue_setup_result, rxtx, "rx#tx");
+cmdline_parse_token_num_t cmd_queue_setup_port_id =
+ TOKEN_NUM_INITIALIZER(struct cmd_queue_setup_result, port_id, UINT16);
+cmdline_parse_token_num_t cmd_queue_setup_queue_idx =
+ TOKEN_NUM_INITIALIZER(struct cmd_queue_setup_result, queue_idx, UINT16);
+cmdline_parse_token_num_t cmd_queue_setup_ring_size =
+ TOKEN_NUM_INITIALIZER(struct cmd_queue_setup_result, ring_size, UINT16);
+
+static void
+cmd_queue_setup_parsed(
+ void *parsed_result,
+ __attribute__((unused)) struct cmdline *cl,
+ __attribute__((unused)) void *data)
+{
+ struct cmd_queue_setup_result *res = parsed_result;
+ struct rte_port *port;
+ struct rte_mempool *mp;
+ uint8_t rx = 1;
+ int ret;
+
+ if (port_id_is_invalid(res->port_id, ENABLED_WARN))
+ return;
+
+ if (!strcmp(res->rxtx, "tx"))
+ rx = 0;
+
+ if (rx && res->ring_size <= rx_free_thresh) {
+ printf("Invalid ring_size, must >= rx_free_thresh: %d\n",
+ rx_free_thresh);
+ return;
+ }
+
+ if (rx && res->queue_idx >= nb_rxq) {
+ printf("Invalid rx queue index, must < nb_rxq: %d\n",
+ nb_rxq);
+ return;
+ }
+
+ if (!rx && res->queue_idx >= nb_txq) {
+ printf("Invalid tx queue index, must < nb_txq: %d\n",
+ nb_txq);
+ return;
+ }
+
+ port = &ports[res->port_id];
+ if (rx) {
+ if (numa_support &&
+ (rxring_numa[res->port_id] != NUMA_NO_CONFIG)) {
+ mp = mbuf_pool_find(rxring_numa[res->port_id]);
+ if (mp == NULL) {
+ printf("Failed to setup RX queue: "
+ "No mempool allocation"
+ " on the socket %d\n",
+ rxring_numa[res->port_id]);
+ return;
+ }
+ ret = rte_eth_rx_queue_setup(res->port_id,
+ res->queue_idx,
+ res->ring_size,
+ rxring_numa[res->port_id],
+ &(port->rx_conf),
+ mp);
+ } else {
+ mp = mbuf_pool_find(port->socket_id);
+ if (mp == NULL) {
+ printf("Failed to setup RX queue:"
+ "No mempool allocation"
+ " on the socket %d\n",
+ port->socket_id);
+ return;
+ }
+ ret = rte_eth_rx_queue_setup(res->port_id,
+ res->queue_idx,
+ res->ring_size,
+ port->socket_id,
+ &(port->rx_conf),
+ mp);
+ }
+ if (ret)
+ printf("Failed to setup RX queue\n");
+ } else {
+ if ((numa_support) &&
+ (txring_numa[res->port_id] != NUMA_NO_CONFIG))
+ ret = rte_eth_tx_queue_setup(res->port_id,
+ res->queue_idx,
+ res->ring_size,
+ txring_numa[res->port_id],
+ &(port->tx_conf));
+ else
+ ret = rte_eth_tx_queue_setup(res->port_id,
+ res->queue_idx,
+ res->ring_size,
+ port->socket_id,
+ &(port->tx_conf));
+ if (ret)
+ printf("Failed to setup TX queue\n");
+ }
+}
+
+cmdline_parse_inst_t cmd_queue_setup = {
+ .f = cmd_queue_setup_parsed,
+ .data = NULL,
+ .help_str = "queue setup <rx|tx> <port_id> <queue_idx> <ring_size>",
+ .tokens = {
+ (void *)&cmd_queue_setup_queue,
+ (void *)&cmd_queue_setup_setup,
+ (void *)&cmd_queue_setup_rxtx,
+ (void *)&cmd_queue_setup_port_id,
+ (void *)&cmd_queue_setup_queue_idx,
+ (void *)&cmd_queue_setup_ring_size,
+ NULL,
+ },
+};
+
/* ******************************************************************************** */
/* list of instructions */
@@ -16272,6 +16407,7 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_del_port_tm_node,
(cmdline_parse_inst_t *)&cmd_set_port_tm_node_parent,
(cmdline_parse_inst_t *)&cmd_port_tm_hierarchy_commit,
+ (cmdline_parse_inst_t *)&cmd_queue_setup,
NULL,
};
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index a766ac795..74269cb03 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1444,6 +1444,13 @@ Reset ptype mapping table::
testpmd> ptype mapping reset (port_id)
+queue setup
+~~~~~~~~~~~
+
+Setup a not started queue or re-setup a started queue::
+
+ testpmd> queue setup (rx|tx) (port_id) (queue_idx) (ring_size)
+
Port Functions
--------------
--
2.13.6
next prev parent reply other threads:[~2018-03-02 4:13 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-12 4:53 [dpdk-dev] [PATCH 0/4] deferred " Qi Zhang
2018-02-12 4:53 ` [dpdk-dev] [PATCH 1/4] ether: support " Qi Zhang
2018-02-12 13:55 ` Thomas Monjalon
2018-02-12 4:53 ` [dpdk-dev] [PATCH 2/4] app/testpmd: add parameters for " Qi Zhang
2018-02-12 4:53 ` [dpdk-dev] [PATCH 3/4] app/testpmd: add command for " Qi Zhang
2018-02-12 4:53 ` [dpdk-dev] [PATCH 4/4] net/i40e: enable deferred " Qi Zhang
2018-03-02 4:13 ` [dpdk-dev] [PATCH v2 0/4] " Qi Zhang
2018-03-02 4:13 ` [dpdk-dev] [PATCH v2 1/4] ether: support " Qi Zhang
2018-03-14 12:31 ` Ananyev, Konstantin
2018-03-15 3:13 ` Zhang, Qi Z
2018-03-15 13:16 ` Ananyev, Konstantin
2018-03-15 15:08 ` Zhang, Qi Z
2018-03-15 15:38 ` Ananyev, Konstantin
2018-03-16 0:42 ` Zhang, Qi Z
2018-03-02 4:13 ` [dpdk-dev] [PATCH v2 2/4] app/testpmd: add parameters for " Qi Zhang
2018-03-14 17:38 ` Ananyev, Konstantin
2018-03-15 3:58 ` Zhang, Qi Z
2018-03-15 13:42 ` Ananyev, Konstantin
2018-03-15 14:31 ` Zhang, Qi Z
2018-03-02 4:13 ` Qi Zhang [this message]
2018-03-14 17:36 ` [dpdk-dev] [PATCH v2 3/4] app/testpmd: add command for " Ananyev, Konstantin
2018-03-14 17:41 ` Ananyev, Konstantin
2018-03-15 3:59 ` Zhang, Qi Z
2018-03-02 4:13 ` [dpdk-dev] [PATCH v2 4/4] net/i40e: enable deferred " Qi Zhang
2018-03-14 12:35 ` Ananyev, Konstantin
2018-03-15 3:22 ` Zhang, Qi Z
2018-03-15 3:50 ` Zhang, Qi Z
2018-03-15 13:22 ` Ananyev, Konstantin
2018-03-15 14:30 ` Zhang, Qi Z
2018-03-15 15:22 ` Ananyev, Konstantin
2018-03-16 0:52 ` Zhang, Qi Z
2018-03-16 9:54 ` Ananyev, Konstantin
2018-03-16 11:00 ` Bruce Richardson
2018-03-16 13:18 ` Zhang, Qi Z
2018-03-16 14:15 ` Zhang, Qi Z
2018-03-16 18:47 ` Ananyev, Konstantin
2018-03-18 7:55 ` Zhang, Qi Z
2018-03-20 13:18 ` Ananyev, Konstantin
2018-03-21 1:53 ` Zhang, Qi Z
2018-03-21 7:28 ` [dpdk-dev] [PATCH v3 0/3] runtime " Qi Zhang
2018-03-21 7:28 ` [dpdk-dev] [PATCH v3 1/3] ether: support " Qi Zhang
2018-03-25 19:47 ` Ananyev, Konstantin
2018-03-21 7:28 ` [dpdk-dev] [PATCH v3 2/3] app/testpmd: add command for " Qi Zhang
2018-03-21 7:28 ` [dpdk-dev] [PATCH v3 3/3] net/i40e: enable runtime " Qi Zhang
2018-03-25 19:46 ` Ananyev, Konstantin
2018-03-26 8:49 ` Zhang, Qi Z
2018-03-26 8:59 ` [dpdk-dev] [PATCH v4 0/3] " Qi Zhang
2018-03-26 8:59 ` [dpdk-dev] [PATCH v4 1/3] ether: support " Qi Zhang
2018-03-26 8:59 ` [dpdk-dev] [PATCH v4 2/3] app/testpmd: add command for " Qi Zhang
2018-04-01 12:21 ` Ananyev, Konstantin
2018-03-26 8:59 ` [dpdk-dev] [PATCH v4 3/3] net/i40e: enable runtime " Qi Zhang
2018-04-01 12:18 ` Ananyev, Konstantin
2018-04-02 2:20 ` Zhang, Qi Z
2018-04-02 2:59 ` [dpdk-dev] [PATCH v5 0/3] " Qi Zhang
2018-04-02 2:59 ` [dpdk-dev] [PATCH v5 1/3] ether: support " Qi Zhang
2018-04-06 19:42 ` Rosen, Rami
2018-04-08 2:20 ` Zhang, Qi Z
2018-04-02 2:59 ` [dpdk-dev] [PATCH v5 2/3] app/testpmd: add command for " Qi Zhang
2018-04-07 15:49 ` Rosen, Rami
2018-04-08 2:22 ` Zhang, Qi Z
2018-04-02 2:59 ` [dpdk-dev] [PATCH v5 3/3] net/i40e: enable runtime " Qi Zhang
2018-04-02 23:36 ` [dpdk-dev] [PATCH v5 0/3] " Ananyev, Konstantin
2018-04-08 2:42 ` Qi Zhang
2018-04-08 2:42 ` [dpdk-dev] [PATCH v6 1/3] ether: support " Qi Zhang
2018-04-10 13:59 ` Thomas Monjalon
2018-04-20 11:14 ` Ferruh Yigit
2018-04-24 19:36 ` Thomas Monjalon
2018-04-25 5:33 ` Zhang, Qi Z
2018-04-25 7:54 ` Thomas Monjalon
2018-04-20 11:16 ` Ferruh Yigit
2018-04-08 2:42 ` [dpdk-dev] [PATCH v6 2/3] app/testpmd: add command for " Qi Zhang
2018-04-20 11:29 ` Ferruh Yigit
2018-04-22 11:57 ` Zhang, Qi Z
2018-04-08 2:42 ` [dpdk-dev] [PATCH v6 3/3] net/i40e: enable runtime " Qi Zhang
2018-04-20 11:17 ` Ferruh Yigit
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 0/5] " Qi Zhang
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 1/5] ethdev: support " Qi Zhang
2018-04-23 17:45 ` Ferruh Yigit
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 2/5] app/testpmd: add command for " Qi Zhang
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 3/5] app/testpmd: enable per queue configure Qi Zhang
2018-04-23 17:45 ` Ferruh Yigit
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 4/5] app/testpmd: enable queue ring size configure Qi Zhang
2018-04-23 17:45 ` Ferruh Yigit
2018-04-24 3:16 ` Zhang, Qi Z
2018-04-24 11:05 ` Ferruh Yigit
2018-04-22 11:58 ` [dpdk-dev] [PATCH v7 5/5] net/i40e: enable runtime queue setup Qi Zhang
2018-04-23 17:45 ` [dpdk-dev] [PATCH v7 0/5] " Ferruh Yigit
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 " Qi Zhang
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 1/5] ethdev: support " Qi Zhang
2018-04-24 14:01 ` Thomas Monjalon
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 2/5] app/testpmd: add command for " Qi Zhang
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 3/5] app/testpmd: enable per queue configure Qi Zhang
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 4/5] app/testpmd: enable queue ring size configure Qi Zhang
2018-04-24 12:44 ` [dpdk-dev] [PATCH v8 5/5] net/i40e: enable runtime queue setup Qi Zhang
2018-04-24 14:50 ` [dpdk-dev] [PATCH v8 0/5] " Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180302041306.90324-4-qi.z.zhang@intel.com \
--to=qi.z.zhang@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
--cc=thomas@monjalon.net \
--cc=wenzhuo.lu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).