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 3F18658DD for ; Fri, 9 Jan 2015 06:54:52 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 08 Jan 2015 21:54:50 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.07,728,1413270000"; d="scan'208";a="659132584" Received: from pgsmsx104.gar.corp.intel.com ([10.221.44.91]) by fmsmga002.fm.intel.com with ESMTP; 08 Jan 2015 21:54:49 -0800 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by PGSMSX104.gar.corp.intel.com (10.221.44.91) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 9 Jan 2015 13:54:06 +0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.216]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.110]) with mapi id 14.03.0195.001; Fri, 9 Jan 2015 13:54:05 +0800 From: "Ouyang, Changchun" To: Vlad Zolotarov , "dev@dpdk.org" Thread-Topic: [dpdk-dev] [PATCH v5 4/6] ether: Check VMDq RSS mode Thread-Index: AQHQKkPI7vFXsCD2skSW3XXepfB/fJy1bcUAgACfFQCAAT6nQA== Date: Fri, 9 Jan 2015 05:54:05 +0000 Message-ID: References: <1420355937-18484-1-git-send-email-changchun.ouyang@intel.com> <1420612355-6666-1-git-send-email-changchun.ouyang@intel.com> <1420612355-6666-5-git-send-email-changchun.ouyang@intel.com> <54AE4BA2.9040802@cloudius-systems.com> <54AED114.5070907@cloudius-systems.com> In-Reply-To: <54AED114.5070907@cloudius-systems.com> Accept-Language: zh-CN, 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 v5 4/6] ether: Check VMDq RSS mode 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, 09 Jan 2015 05:54:54 -0000 > -----Original Message----- > From: Vlad Zolotarov [mailto:vladz@cloudius-systems.com] > Sent: Friday, January 9, 2015 2:49 AM > To: Ouyang, Changchun; dev@dpdk.org > Subject: Re: [dpdk-dev] [PATCH v5 4/6] ether: Check VMDq RSS mode >=20 >=20 > On 01/08/15 11:19, Vlad Zolotarov wrote: > > > > On 01/07/15 08:32, Ouyang Changchun wrote: > >> Check mq mode for VMDq RSS, handle it correctly instead of returning > >> an error; Also remove the limitation of per pool queue number has max > >> value of 1, because the per pool queue number could be 2 or 4 if it > >> is VMDq RSS mode; > >> > >> The number of rxq specified in config will determine the mq mode for > >> VMDq RSS. > >> > >> Signed-off-by: Changchun Ouyang > >> > >> changes in v5: > >> - Fix '<' issue, it should be '<=3D' to test rxq number; > >> - Extract a function to remove the embeded switch-case statement. > >> > >> --- > >> lib/librte_ether/rte_ethdev.c | 50 > >> ++++++++++++++++++++++++++++++++++++++----- > >> 1 file changed, 45 insertions(+), 5 deletions(-) > >> > >> diff --git a/lib/librte_ether/rte_ethdev.c > >> b/lib/librte_ether/rte_ethdev.c index 95f2ceb..8363e26 100644 > >> --- a/lib/librte_ether/rte_ethdev.c > >> +++ b/lib/librte_ether/rte_ethdev.c > >> @@ -503,6 +503,31 @@ rte_eth_dev_tx_queue_config(struct > rte_eth_dev > >> *dev, uint16_t nb_queues) > >> } > >> static int > >> +rte_eth_dev_check_vf_rss_rxq_num(uint8_t port_id, uint16_t nb_rx_q) > >> +{ > >> + struct rte_eth_dev *dev =3D &rte_eth_devices[port_id]; > >> + switch (nb_rx_q) { > >> + case 1: > >> + case 2: > >> + RTE_ETH_DEV_SRIOV(dev).active =3D > >> + ETH_64_POOLS; > >> + break; > >> + case 4: > >> + RTE_ETH_DEV_SRIOV(dev).active =3D > >> + ETH_32_POOLS; > >> + break; > >> + default: > >> + return -EINVAL; > >> + } > >> + > >> + RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool =3D nb_rx_q; > >> + RTE_ETH_DEV_SRIOV(dev).def_pool_q_idx =3D > >> + dev->pci_dev->max_vfs * nb_rx_q; > >> + > >> + return 0; > >> +} > >> + > >> +static int > >> rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, > >> uint16_t nb_tx_q, > >> const struct rte_eth_conf *dev_conf) > >> { > >> @@ -510,8 +535,7 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, > >> uint16_t nb_rx_q, uint16_t nb_tx_q, > >> if (RTE_ETH_DEV_SRIOV(dev).active !=3D 0) { > >> /* check multi-queue mode */ > >> - if ((dev_conf->rxmode.mq_mode =3D=3D ETH_MQ_RX_RSS) || > >> - (dev_conf->rxmode.mq_mode =3D=3D ETH_MQ_RX_DCB) || > >> + if ((dev_conf->rxmode.mq_mode =3D=3D ETH_MQ_RX_DCB) || > >> (dev_conf->rxmode.mq_mode =3D=3D ETH_MQ_RX_DCB_RSS) || > >> (dev_conf->txmode.mq_mode =3D=3D ETH_MQ_TX_DCB)) { > >> /* SRIOV only works in VMDq enable mode */ @@ -525,7 > >> +549,6 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t > >> nb_rx_q, uint16_t nb_tx_q, > >> } > >> switch (dev_conf->rxmode.mq_mode) { > >> - case ETH_MQ_RX_VMDQ_RSS: > >> case ETH_MQ_RX_VMDQ_DCB: > >> case ETH_MQ_RX_VMDQ_DCB_RSS: > >> /* DCB/RSS VMDQ in SRIOV mode, not implement yet */ @@ > >> -534,6 +557,25 @@ rte_eth_dev_check_mq_mode(uint8_t port_id, > uint16_t > >> nb_rx_q, uint16_t nb_tx_q, > >> "unsupported VMDQ mq_mode rx %u\n", > >> port_id, dev_conf->rxmode.mq_mode); > >> return (-EINVAL); > >> + case ETH_MQ_RX_RSS: > >> + PMD_DEBUG_TRACE("ethdev port_id=3D%" PRIu8 > >> + " SRIOV active, " > >> + "Rx mq mode is changed from:" > >> + "mq_mode %u into VMDQ mq_mode %u\n", > >> + port_id, > >> + dev_conf->rxmode.mq_mode, > >> + dev->data->dev_conf.rxmode.mq_mode); > >> + case ETH_MQ_RX_VMDQ_RSS: > >> + dev->data->dev_conf.rxmode.mq_mode =3D > ETH_MQ_RX_VMDQ_RSS; > >> + if (nb_rx_q <=3D RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool) > >> + if (rte_eth_dev_check_vf_rss_rxq_num(port_id, > >> nb_rx_q) !=3D 0) { > >> + PMD_DEBUG_TRACE("ethdev port_id=3D%d" > >> + " SRIOV active, invalid queue" > >> + " number for VMDQ RSS\n", > >> + port_id); > > > > Some nitpicking here: I'd add the allowed values descriptions to the > > error message. Something like: "invalid queue number for VMDQ RSS. > > Allowed values are 1, 2 or 4\n". > > > >> + return -EINVAL; > >> + } > >> + break; > >> default: /* ETH_MQ_RX_VMDQ_ONLY or ETH_MQ_RX_NONE */ > >> /* if nothing mq mode configure, use default scheme */ > >> dev->data->dev_conf.rxmode.mq_mode =3D > >> ETH_MQ_RX_VMDQ_ONLY; @@ -553,8 +595,6 @@ > >> rte_eth_dev_check_mq_mode(uint8_t port_id, uint16_t nb_rx_q, > uint16_t nb_tx_q, > >> default: /* ETH_MQ_TX_VMDQ_ONLY or ETH_MQ_TX_NONE */ > >> /* if nothing mq mode configure, use default scheme */ > >> dev->data->dev_conf.txmode.mq_mode =3D > ETH_MQ_TX_VMDQ_ONLY; > >> - if (RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool > 1) > >> - RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool =3D 1; > > > > I'm not sure u may just remove it. These lines originally belong to a > > different flow. Are u sure u can remove them like that? What if the > > mq_mode is ETH_MQ_RX_NONE and nb_q_per_pool has been initialized > to 4 > > or 8 in ixgbe_pf_host_init()? >=20 > I misread the patch - these lines belong to the txmode.mq_mode switch cas= e. > I think it's ok to remove these really strange lines here. And when I loo= k at it i > think for the similar reasons the similar lines should be removed in the = Rx > case too: consider non-RSS case with MQ DCB Tx configuration. >=20 I search code in this function, only one place has =20 " if (RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool > 1)=20 RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool =3D 1;" The only place is default branch, which is for rx_none, or vmdq_only mode, We don't need remove this, as it should assign as 1 because it did use 1 qu= eue per pool.