From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 2BDC92C57 for ; Fri, 20 Jan 2017 14:33:51 +0100 (CET) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP; 20 Jan 2017 05:33:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,258,1477983600"; d="scan'208";a="50769961" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga004.jf.intel.com with ESMTP; 20 Jan 2017 05:33:50 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 20 Jan 2017 05:33:49 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0248.002; Fri, 20 Jan 2017 21:33:47 +0800 From: "Wu, Jingjing" To: "Iremonger, Bernard" , "dev@dpdk.org" , "Lu, Wenzhuo" , "Zhang, Helin" Thread-Topic: [PATCH v4 2/2] app/testpmd: add command to configure VMDq Thread-Index: AQHScOBU0Z4pqQ3DGUK6/qMmbXIc5qFBXqqw Date: Fri, 20 Jan 2017 13:33:46 +0000 Message-ID: <9BB6961774997848B5B42BEC655768F810CCE666@SHSMSX103.ccr.corp.intel.com> References: <1484229492-18902-1-git-send-email-bernard.iremonger@intel.com> <1484671162-18493-3-git-send-email-bernard.iremonger@intel.com> In-Reply-To: <1484671162-18493-3-git-send-email-bernard.iremonger@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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 v4 2/2] app/testpmd: add command to configure VMDq 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: Fri, 20 Jan 2017 13:33:52 -0000 > -----Original Message----- > From: Iremonger, Bernard > Sent: Wednesday, January 18, 2017 12:39 AM > To: dev@dpdk.org; Lu, Wenzhuo ; Wu, Jingjing > ; Zhang, Helin > Cc: Iremonger, Bernard > Subject: [PATCH v4 2/2] app/testpmd: add command to configure VMDq >=20 > Add the following command to configure VMDq: > port config vmdq >=20 > Add new command to testpmd user guide. >=20 > Signed-off-by: Bernard Iremonger > --- > app/test-pmd/cmdline.c | 60 +++++++++++++ > app/test-pmd/testpmd.c | 126 ++++++++++++++++++++++= +++++- > app/test-pmd/testpmd.h | 1 + > doc/guides/testpmd_app_ug/testpmd_funcs.rst | 7 ++ > 4 files changed, 193 insertions(+), 1 deletion(-) >=20 > diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index > 21d10e4..30969b4 100644 > --- a/app/test-pmd/cmdline.c > +++ b/app/test-pmd/cmdline.c > @@ -629,6 +629,9 @@ static void cmd_help_long_parsed(void *parsed_result, > " pfc (on|off)\n" > " Set the DCB mode.\n\n" >=20 > + "port config (port_id) vmdq\n" > + " Configure VMDq.\n\n" > + > "port config all burst (value)\n" > " Set the number of packets per burst.\n\n" >=20 > @@ -2322,6 +2325,62 @@ cmdline_parse_inst_t cmd_config_dcb =3D { > }, > }; >=20 > +/* *** Configure VMDq *** */ > +struct cmd_config_vmdq { > + cmdline_fixed_string_t port; > + cmdline_fixed_string_t config; > + uint8_t port_id; > + cmdline_fixed_string_t vmdq; > +}; > + > +static void > +cmd_config_vmdq_parsed(void *parsed_result, > + __attribute__((unused)) struct cmdline *cl, > + __attribute__((unused)) void *data) { > + struct cmd_config_vmdq *res =3D parsed_result; > + portid_t port_id =3D res->port_id; > + struct rte_port *port; > + int ret; > + > + port =3D &ports[port_id]; > + /** Check if the port is not started **/ > + if (port->port_status !=3D RTE_PORT_STOPPED) { > + printf("Please stop port %d first\n", port_id); > + return; > + } > + > + ret =3D init_port_vmdq_config(port_id); > + if (ret !=3D 0) { > + printf("Cannot initialize network ports.\n"); > + return; > + } > + > + cmd_reconfig_device_queue(port_id, 0, 1); } I think the device also need to be reconfigured, it should be cmd_reconfig_device_queue(port_id, 1, 1); > + > +cmdline_parse_token_string_t cmd_config_vmdq_port =3D > + TOKEN_STRING_INITIALIZER(struct cmd_config_vmdq, port, "port"); > +cmdline_parse_token_string_t cmd_config_vmdq_config =3D > + TOKEN_STRING_INITIALIZER(struct cmd_config_vmdq, config, "config"); > +cmdline_parse_token_num_t cmd_config_vmdq_port_id =3D > + TOKEN_NUM_INITIALIZER(struct cmd_config_vmdq, port_id, UINT8); > +cmdline_parse_token_string_t cmd_config_vmdq_vmdq =3D > + TOKEN_STRING_INITIALIZER(struct cmd_config_vmdq, vmdq, "vmdq"); > + > +cmdline_parse_inst_t cmd_config_vmdq =3D { > + .f =3D cmd_config_vmdq_parsed, > + .data =3D NULL, > + .help_str =3D "port config vmdq", > + .tokens =3D { > + (void *)&cmd_config_vmdq_port, > + (void *)&cmd_config_vmdq_config, > + (void *)&cmd_config_vmdq_port_id, > + (void *)&cmd_config_vmdq_vmdq, > + NULL, > + }, > +}; > + > /* *** configure number of packets per burst *** */ struct cmd_config_b= urst { > cmdline_fixed_string_t port; > @@ -12438,6 +12497,7 @@ cmdline_parse_ctx_t main_ctx[] =3D { > (cmdline_parse_inst_t *)&cmd_link_flow_control_set_autoneg, > (cmdline_parse_inst_t *)&cmd_priority_flow_control_set, > (cmdline_parse_inst_t *)&cmd_config_dcb, > + (cmdline_parse_inst_t *)&cmd_config_vmdq, > (cmdline_parse_inst_t *)&cmd_read_reg, > (cmdline_parse_inst_t *)&cmd_read_reg_bit_field, > (cmdline_parse_inst_t *)&cmd_read_reg_bit, diff --git a/app/test- > pmd/testpmd.c b/app/test-pmd/testpmd.c index bfb2f8e..11d263d 100644 > --- a/app/test-pmd/testpmd.c > +++ b/app/test-pmd/testpmd.c > @@ -1,7 +1,7 @@ > /*- > * BSD LICENSE > * > - * Copyright(c) 2010-2016 Intel Corporation. All rights reserved. > + * Copyright(c) 2010-2017 Intel Corporation. All rights reserved. > * All rights reserved. > * > * Redistribution and use in source and binary forms, with or without > @@ -196,6 +196,34 @@ uint8_t dcb_test =3D 0; queueid_t nb_rxq =3D 1; /**= < > Number of RX queues per port. */ queueid_t nb_txq =3D 1; /**< Number of = TX > queues per port. */ >=20 > +static const struct rte_eth_conf vmdq_conf_default =3D { > + .rxmode =3D { > + .mq_mode =3D ETH_MQ_RX_VMDQ_ONLY, > + .split_hdr_size =3D 0, > + .header_split =3D 0, /**< Header Split disabled */ > + .hw_ip_checksum =3D 0, /**< IP checksum offload disabled */ > + .hw_vlan_filter =3D 0, /**< VLAN filtering disabled */ > + .jumbo_frame =3D 0, /**< Jumbo Frame Support disabled */ > + }, > + > + .txmode =3D { > + .mq_mode =3D ETH_MQ_TX_NONE, > + }, > + .rx_adv_conf =3D { > + /* > + * should be overridden separately in code with > + * appropriate values > + */ > + .vmdq_rx_conf =3D { > + .nb_queue_pools =3D ETH_8_POOLS, > + .enable_default_pool =3D 0, > + .default_pool =3D 0, > + .nb_pool_maps =3D 0, > + .pool_map =3D {{0, 0},}, > + }, > + }, > +}; > + > /* > * Configurable number of RX/TX ring descriptors. > */ > @@ -1895,6 +1923,102 @@ const uint16_t vlan_tags[] =3D { > 24, 25, 26, 27, 28, 29, 30, 31 > }; >=20 > +const uint16_t num_vlans =3D RTE_DIM(vlan_tags); static uint16_t > +num_pf_queues, num_vmdq_queues; static uint16_t vmdq_pool_base, > +vmdq_queue_base; > +/* number of pools (if user does not specify any, 8 by default */ > +static uint32_t num_queues =3D 8; static uint32_t num_pools =3D 8; > + > +/** > + * Builds up the correct configuration for vmdq based on the vlan tags > +array > + * given above, and determine the queue number and pool map number > +according to > + * valid pool number > + */ > +static int > +get_eth_vmdq_conf(struct rte_eth_conf *eth_conf, uint32_t num_pools) { > + struct rte_eth_vmdq_rx_conf conf; > + uint8_t i; > + > + conf.nb_queue_pools =3D (enum rte_eth_nb_pools)num_pools; > + conf.nb_pool_maps =3D num_pools; > + conf.enable_default_pool =3D 0; > + conf.default_pool =3D 0; /* set explicit value, even if not used */ > + > + for (i =3D 0; i < conf.nb_pool_maps; i++) { > + conf.pool_map[i].vlan_id =3D vlan_tags[i]; > + conf.pool_map[i].pools =3D (1UL << (i % num_pools)); > + } > + > + (void)(rte_memcpy(eth_conf, &vmdq_conf_default, sizeof(*eth_conf))); > + (void)(rte_memcpy(ð_conf->rx_adv_conf.vmdq_rx_conf, &conf, > + sizeof(eth_conf->rx_adv_conf.vmdq_rx_conf))); > + return 0; > +} > + > +/** > + * Configures VMDq for a given port using global settings. > + */ > +int > +init_port_vmdq_config(uint8_t port) > +{ > + struct rte_eth_dev_info dev_info; > + struct rte_eth_conf port_conf; > + uint16_t rx_queues, tx_queues; > + int retval; > + uint16_t queues_per_pool; > + uint32_t max_nb_pools; > + > + if (port >=3D rte_eth_dev_count()) > + return -1; > + /** > + * The max pool number from dev_info will be used to validate the pool > + * number. > + */ > + rte_eth_dev_info_get(port, &dev_info); > + max_nb_pools =3D (uint32_t)dev_info.max_vmdq_pools; > + /** > + * We allow to process part of VMDQ pools specified by num_pools in > + * command line. > + */ Only found "static uint32_t num_pools =3D 8;", haven't found any code relat= ed with the num_pools as command arguments. > + if (num_pools > max_nb_pools) { > + printf("num_pools %d >max_nb_pools %d\n", > + num_pools, max_nb_pools); > + return -1; > + } > + > + retval =3D get_eth_vmdq_conf(&port_conf, num_pools); > + if (retval < 0) > + return retval; > + > + /* > + * NIC queues are divided into pf queues and vmdq queues. > + */ > + /* There is assumption here all ports have the same configuration! */ > + num_pf_queues =3D dev_info.max_rx_queues - > dev_info.vmdq_queue_num; > + queues_per_pool =3D dev_info.vmdq_queue_num / > dev_info.max_vmdq_pools; > + num_vmdq_queues =3D num_pools * queues_per_pool; > + num_queues =3D num_pf_queues + num_vmdq_queues; > + vmdq_queue_base =3D dev_info.vmdq_queue_base; > + vmdq_pool_base =3D dev_info.vmdq_pool_base; The variable is set only for printing? > + > + printf("num_pf_queues: %u num_pools: %u\n", num_pf_queues, > num_pools); > + printf("each vmdq pool has %u queues\n", queues_per_pool); > + printf("vmdq_queue_base: %d vmdq_pool_base: %d\n", > vmdq_queue_base, > +vmdq_pool_base); > + > + /* > + * All queues including pf queues are setup. > + * This is because VMDQ queues doesn't always start from zero, and the > + * PMD layer doesn't support selectively initialising part of rx/tx > + * queues. > + */ > + rx_queues =3D (uint16_t)dev_info.max_rx_queues; > + tx_queues =3D (uint16_t)dev_info.max_tx_queues; > + retval =3D rte_eth_dev_configure(port, rx_queues, tx_queues, > &port_conf); > + return retval; > +} > + > static int > get_eth_dcb_conf(struct rte_eth_conf *eth_conf, > enum dcb_mode_enable dcb_mode, > diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index > ee59460..67bb641 100644 > --- a/app/test-pmd/testpmd.h > +++ b/app/test-pmd/testpmd.h > @@ -582,6 +582,7 @@ uint8_t port_is_bonding_slave(portid_t slave_pid); i= nt > init_port_dcb_config(portid_t pid, enum dcb_mode_enable dcb_mode, > enum rte_eth_nb_tcs num_tcs, > uint8_t pfc_en); > +int init_port_vmdq_config(uint8_t port); > int start_port(portid_t pid); > void stop_port(portid_t pid); > void close_port(portid_t pid); > diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst > b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > index 60f30bb..ddc4016 100644 > --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst > +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst > @@ -1438,6 +1438,13 @@ Set the DCB mode for an individual port:: >=20 > The traffic class should be 4 or 8. >=20 > +port config - VMDq > +~~~~~~~~~~~~~~~~~~ > + > +Configure VMDq for an individual port:: > + > + testpmd> port config (port_id) vmdq > + > port config - Burst > ~~~~~~~~~~~~~~~~~~~ >=20 > -- > 2.10.1