From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id BC61B7F71 for ; Fri, 14 Nov 2014 07:20:37 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 13 Nov 2014 22:30:38 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.97,862,1389772800"; d="scan'208";a="416363118" Received: from kmsmsx152.gar.corp.intel.com ([172.21.73.87]) by FMSMGA003.fm.intel.com with ESMTP; 13 Nov 2014 22:21:35 -0800 Received: from pgsmsx105.gar.corp.intel.com (10.221.44.96) by KMSMSX152.gar.corp.intel.com (172.21.73.87) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 14 Nov 2014 14:30:33 +0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by pgsmsx105.gar.corp.intel.com (10.221.44.96) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 14 Nov 2014 14:30:32 +0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.110]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.5]) with mapi id 14.03.0195.001; Fri, 14 Nov 2014 14:30:31 +0800 From: "Xie, Huawei" To: "Chen, Jing D" , "dev@dpdk.org" Thread-Topic: [PATCH 1/2] examples/vhost: support new VMDQ API and new nic i40e Thread-Index: AQHP/sjpL7dqql0QIkKS8daJYJ8krJxeDOxAgAGdXzA= Date: Fri, 14 Nov 2014 06:30:30 +0000 Message-ID: References: <1415831647-11139-1-git-send-email-huawei.xie@intel.com> <1415831647-11139-2-git-send-email-huawei.xie@intel.com> <4341B239C0EFF9468EE453F9E9F4604D0161CABA@shsmsx102.ccr.corp.intel.com> In-Reply-To: <4341B239C0EFF9468EE453F9E9F4604D0161CABA@shsmsx102.ccr.corp.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 1/2] examples/vhost: support new VMDQ API and new nic i40e X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Nov 2014 06:20:39 -0000 > -----Original Message----- > From: Chen, Jing D > Sent: Wednesday, November 12, 2014 10:58 PM > To: Xie, Huawei; dev@dpdk.org > Subject: RE: [PATCH 1/2] examples/vhost: support new VMDQ API and new nic > i40e >=20 > Hi, >=20 > > -----Original Message----- > > From: Xie, Huawei > > Sent: Thursday, November 13, 2014 6:34 AM > > To: dev@dpdk.org > > Cc: Chen, Jing D; Xie, Huawei > > Subject: [PATCH 1/2] examples/vhost: support new VMDQ API and new nic > > i40e > > > > In Niantic, if VMDQ mode is set, all queues are allocated to VMDQ in DP= DK. > > In I40E, only configured part of continous queues are allocated to VMDQ= . > > The rte_eth_dev_info structure is extened to provide VMDQ queue base, > > queue number, and VMDQ pool base information. > > This patch support the new VMDQ API in vhost example. > > > > FIXME in PMD: > > * added mac address will be flushed at rte_eth_dev_start. > > * we don't support selectively setting up queues well. > > > > Signed-off-by: Huawei Xie > > --- > > examples/vhost/main.c | 25 +++++++++++++++++++------ > > 1 file changed, 19 insertions(+), 6 deletions(-) > > > > diff --git a/examples/vhost/main.c b/examples/vhost/main.c > > index a93f7a0..2b1bf02 100644 > > --- a/examples/vhost/main.c > > +++ b/examples/vhost/main.c > > @@ -53,7 +53,7 @@ > > > > #include "main.h" > > > > -#define MAX_QUEUES 128 > > +#define MAX_QUEUES 256 > > > > /* the maximum number of external ports supported */ > > #define MAX_SUP_PORTS 1 > > @@ -282,6 +282,9 @@ static struct rte_eth_conf vmdq_conf_default =3D { > > static unsigned lcore_ids[RTE_MAX_LCORE]; > > static uint8_t ports[RTE_MAX_ETHPORTS]; > > static unsigned num_ports =3D 0; /**< The number of ports specified in > > command line */ > > +static uint16_t num_pf_queues, num_vmdq_queues; > > +static uint16_t vmdq_pool_base, vmdq_queue_base; > > +static uint16_t queues_per_pool; > > > > static const uint16_t external_pkt_default_vlan_tag =3D 2000; > > const uint16_t vlan_tags[] =3D { > > @@ -417,7 +420,6 @@ port_init(uint8_t port) > > > > /*configure the number of supported virtio devices based on VMDQ > > limits */ > > num_devices =3D dev_info.max_vmdq_pools; > > - num_queues =3D dev_info.max_rx_queues; > > > > if (zero_copy) { > > rx_ring_size =3D num_rx_descriptor; > > @@ -437,10 +439,19 @@ port_init(uint8_t port) > > retval =3D get_eth_conf(&port_conf, num_devices); > > if (retval < 0) > > return retval; > > + /* NIC queues are divided into pf queues and vmdq queues. */ > > + 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_devices * 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; > > + printf("pf queue num: %u, configured vmdq pool num: %u, each > > vmdq pool has %u queues\n", > > + num_pf_queues, num_devices, queues_per_pool); > > > > if (port >=3D rte_eth_dev_count()) return -1; > > > > - rx_rings =3D (uint16_t)num_queues, > > + rx_rings =3D (uint16_t)dev_info.max_rx_queues; >=20 > You removed line 'num_queues =3D dev_info.max_rx_queues' and calculate > 'num_queues' > with another equation. I assume you thought it may not equals. > So, why you assign dev_info.max_rx_queues to rx_rings again? Won't it bet= ter to > use 'num_queues' Actually they are the same here. We use max_rx_queues just to say that we initialize all queues rather than = part of queues. If all PMDs(1G,10G,i40e) supports selectively initializing queues, then we = could only initialize num_device queues rather than total queues, even without initializing PF qu= eues.. >=20 > > /* Configure ethernet device. */ > > retval =3D rte_eth_dev_configure(port, rx_rings, tx_rings, &port_conf= ); > > if (retval !=3D 0) > > @@ -931,7 +942,8 @@ link_vmdq(struct vhost_dev *vdev, struct rte_mbuf > > *m) > > vdev->vlan_tag); > > > > /* Register the MAC address. */ > > - ret =3D rte_eth_dev_mac_addr_add(ports[0], &vdev->mac_address, > > (uint32_t)dev->device_fh); > > + ret =3D rte_eth_dev_mac_addr_add(ports[0], &vdev->mac_address, > > + (uint32_t)dev->device_fh + > > vmdq_pool_base); > > if (ret) > > RTE_LOG(ERR, VHOST_DATA, "(%"PRIu64") Failed to add > > device MAC address to VMDQ\n", > > dev->device_fh); > > @@ -2602,7 +2614,7 @@ new_device (struct virtio_net *dev) > > ll_dev->vdev =3D vdev; > > add_data_ll_entry(&ll_root_used, ll_dev); > > vdev->vmdq_rx_q > > - =3D dev->device_fh * (num_queues / num_devices); > > + =3D dev->device_fh * queues_per_pool + vmdq_queue_base; > > > > if (zero_copy) { > > uint32_t index =3D vdev->vmdq_rx_q; > > @@ -2837,7 +2849,8 @@ MAIN(int argc, char *argv[]) > > unsigned lcore_id, core_id =3D 0; > > unsigned nb_ports, valid_num_ports; > > int ret; > > - uint8_t portid, queue_id =3D 0; > > + uint8_t portid; > > + uint16_t queue_id; > > static pthread_t tid; > > > > /* init EAL */ > > -- > > 1.8.1.4