From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id F087C1C7F9 for ; Sun, 8 Apr 2018 04:22:29 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Apr 2018 19:22:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,421,1517904000"; d="scan'208";a="40184184" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by FMSMGA003.fm.intel.com with ESMTP; 07 Apr 2018 19:22:28 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 7 Apr 2018 19:22:27 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.319.2; Sat, 7 Apr 2018 19:22:27 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.151]) by shsmsx102.ccr.corp.intel.com ([169.254.2.184]) with mapi id 14.03.0319.002; Sun, 8 Apr 2018 10:22:25 +0800 From: "Zhang, Qi Z" To: "Rosen, Rami" , "thomas@monjalon.net" , "Ananyev, Konstantin" CC: "dev@dpdk.org" , "Xing, Beilei" , "Wu, Jingjing" , "Lu, Wenzhuo" Thread-Topic: [dpdk-dev] [PATCH v5 2/3] app/testpmd: add command for queue setup Thread-Index: AQHTyi6m4P6P6/7+YUe8Mf6HIWUuJ6P09Y4AgAE2d9A= Date: Sun, 8 Apr 2018 02:22:24 +0000 Message-ID: <039ED4275CED7440929022BC67E706115318A38A@SHSMSX103.ccr.corp.intel.com> References: <20180212045314.171616-1-qi.z.zhang@intel.com> <20180402025935.33312-1-qi.z.zhang@intel.com> <20180402025935.33312-3-qi.z.zhang@intel.com> <9B0331B6EBBD0E4684FBFAEDA55776F95319DB0C@HASMSX110.ger.corp.intel.com> In-Reply-To: <9B0331B6EBBD0E4684FBFAEDA55776F95319DB0C@HASMSX110.ger.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v5 2/3] app/testpmd: add command for queue setup X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Apr 2018 02:22:30 -0000 > -----Original Message----- > From: Rosen, Rami > Sent: Saturday, April 7, 2018 11:50 PM > To: Zhang, Qi Z ; thomas@monjalon.net; Ananyev, > Konstantin > Cc: dev@dpdk.org; Xing, Beilei ; Wu, Jingjing > ; Lu, Wenzhuo ; Zhang, Qi Z > > Subject: RE: [dpdk-dev] [PATCH v5 2/3] app/testpmd: add command for queue > setup >=20 >=20 >=20 > -----Original Message----- > From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Qi Zhang > Sent: Monday, April 02, 2018 06:00 > To: thomas@monjalon.net; Ananyev, Konstantin > > Cc: dev@dpdk.org; Xing, Beilei ; Wu, Jingjing > ; Lu, Wenzhuo ; Zhang, Qi Z > > Subject: [dpdk-dev] [PATCH v5 2/3] app/testpmd: add command for queue > setup >=20 > Add new command to setup queue: > queue setup (rx|tx) (port_id) (queue_idx) (ring_size) (offloads) >=20 > rte_eth_[rx|tx]_queue_setup will be called corresponsively >=20 > Signed-off-by: Qi Zhang > --- > v5: > - fix command description. >=20 > v4: > - fix missing offload in command line. >=20 > v3: > - add offload parameter to queue setup command. > - couple code refactory. >=20 > app/test-pmd/cmdline.c | 129 > ++++++++++++++++++++++++++++ > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7 ++ > 2 files changed, 136 insertions(+) >=20 > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index > d1dc1de6c..449c7c634 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" >=20 > + "queue setup (rx|tx) (port_id) (queue_idx) (ring_size) > (offloads)\n" > + " setup a rx or tx queue.\n\n" > + > , list_pkt_forwarding_modes() > ); > } > @@ -16030,6 +16033,131 @@ cmdline_parse_inst_t cmd_load_from_file =3D { > }, > }; >=20 > +/* 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; > + uint64_t offloads; > +}; > + > +/* Common CLI fields for queue setup */ cmdline_parse_token_string_t > +cmd_queue_setup_queue =3D > + TOKEN_STRING_INITIALIZER(struct cmd_queue_setup_result, queue, > +"queue"); cmdline_parse_token_string_t cmd_queue_setup_setup =3D > + TOKEN_STRING_INITIALIZER(struct cmd_queue_setup_result, setup, > +"setup"); cmdline_parse_token_string_t cmd_queue_setup_rxtx =3D > + TOKEN_STRING_INITIALIZER(struct cmd_queue_setup_result, rxtx, > +"rx#tx"); cmdline_parse_token_num_t cmd_queue_setup_port_id =3D > + TOKEN_NUM_INITIALIZER(struct cmd_queue_setup_result, port_id, > UINT16); > +cmdline_parse_token_num_t cmd_queue_setup_queue_idx =3D > + TOKEN_NUM_INITIALIZER(struct cmd_queue_setup_result, queue_idx, > +UINT16); cmdline_parse_token_num_t cmd_queue_setup_ring_size =3D > + TOKEN_NUM_INITIALIZER(struct cmd_queue_setup_result, ring_size, > +UINT16); cmdline_parse_token_num_t cmd_queue_setup_offloads =3D > + TOKEN_NUM_INITIALIZER(struct cmd_queue_setup_result, offloads, > +UINT64); > + > +static void > +cmd_queue_setup_parsed( > + void *parsed_result, > + __attribute__((unused)) struct cmdline *cl, > + __attribute__((unused)) void *data) > +{ > + struct cmd_queue_setup_result *res =3D parsed_result; > + struct rte_port *port; > + struct rte_mempool *mp; > + unsigned int socket_id; > + uint8_t rx =3D 1; > + int ret; > + > + if (port_id_is_invalid(res->port_id, ENABLED_WARN)) > + return; > + > + if (!strcmp(res->rxtx, "tx")) > + rx =3D 0; > + > + if (rx && res->ring_size <=3D rx_free_thresh) { >=20 >=20 > [Rami Rosen] Nitpick: shouldn't it be: must > rx_free_thresh: ? Good capture, will fix. >=20 > + printf("Invalid ring_size, must >=3D rx_free_thresh: %d\n", > + rx_free_thresh); > + return; > + } > + > + if (rx && res->queue_idx >=3D nb_rxq) { > + printf("Invalid rx queue index, must < nb_rxq: %d\n", > + nb_rxq); > + return; > + } > + > + if (!rx && res->queue_idx >=3D nb_txq) { > + printf("Invalid tx queue index, must < nb_txq: %d\n", > + nb_txq); > + return; > + } > + > + port =3D &ports[res->port_id]; > + if (rx) { > + struct rte_eth_rxconf rxconf =3D port->rx_conf; > + > + rxconf.offloads =3D res->offloads; > + socket_id =3D rxring_numa[res->port_id]; > + if (!numa_support || socket_id =3D=3D NUMA_NO_CONFIG) > + socket_id =3D port->socket_id; > + > + mp =3D mbuf_pool_find(socket_id); > + if (mp =3D=3D NULL) { > + printf("Failed to setup RX queue: " > + "No mempool allocation" > + " on the socket %d\n", > + rxring_numa[res->port_id]); > + return; > + } > + ret =3D rte_eth_rx_queue_setup(res->port_id, > + res->queue_idx, > + res->ring_size, > + socket_id, > + &rxconf, > + mp); > + if (ret) > + printf("Failed to setup RX queue\n"); > + } else { > + struct rte_eth_txconf txconf =3D port->tx_conf; > + > + txconf.offloads =3D res->offloads; > + socket_id =3D txring_numa[res->port_id]; > + if (!numa_support || socket_id =3D=3D NUMA_NO_CONFIG) > + socket_id =3D port->socket_id; > + > + ret =3D rte_eth_tx_queue_setup(res->port_id, > + res->queue_idx, > + res->ring_size, > + socket_id, > + &txconf); > + if (ret) > + printf("Failed to setup TX queue\n"); > + } > +} > + > +cmdline_parse_inst_t cmd_queue_setup =3D { > + .f =3D cmd_queue_setup_parsed, > + .data =3D NULL, > + .help_str =3D "queue setup > ", > + .tokens =3D { > + (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, > + (void *)&cmd_queue_setup_offloads, > + NULL, > + }, > +}; > + > /* > ***************************************************************** > *************** */ >=20 > /* list of instructions */ > @@ -16272,6 +16400,7 @@ cmdline_parse_ctx_t main_ctx[] =3D { > (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, > }; >=20 > diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst > b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > index a766ac795..e8e0b0a4e 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:: >=20 > testpmd> ptype mapping reset (port_id) >=20 > +queue setup > +~~~~~~~~~~~ > + > +Setup a rx or tx queue:: > + > + testpmd> queue setup (rx|tx) (port_id) (queue_idx) (ring_size) > + (offloads) > + > Port Functions > -------------- >=20 > -- > 2.13.6