From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 8E0825A06 for ; Sun, 4 Jan 2015 03:10:41 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga102.fm.intel.com with ESMTP; 03 Jan 2015 18:10:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,691,1406617200"; d="scan'208";a="507131020" Received: from pgsmsx105.gar.corp.intel.com ([10.221.44.96]) by orsmga003.jf.intel.com with ESMTP; 03 Jan 2015 18:05:10 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by PGSMSX105.gar.corp.intel.com (10.221.44.96) with Microsoft SMTP Server (TLS) id 14.3.195.1; Sun, 4 Jan 2015 10:10:38 +0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.216]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.182]) with mapi id 14.03.0195.001; Sun, 4 Jan 2015 10:10:36 +0800 From: "Liang, Cunming" To: "Ouyang, Changchun" , "dev@dpdk.org" Thread-Topic: [PATCH v3 5/6] ixgbe: Config VF RSS Thread-Index: AQHQHznCLVcKhRLWr0+yUiyuDPlXuZyvQe5A Date: Sun, 4 Jan 2015 02:10:35 +0000 Message-ID: References: <1419389808-9559-1-git-send-email-changchun.ouyang@intel.com> <1419398584-19520-1-git-send-email-changchun.ouyang@intel.com> <1419398584-19520-6-git-send-email-changchun.ouyang@intel.com> In-Reply-To: <1419398584-19520-6-git-send-email-changchun.ouyang@intel.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 v3 5/6] ixgbe: Config VF RSS 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: Sun, 04 Jan 2015 02:10:42 -0000 > -----Original Message----- > From: Ouyang, Changchun > Sent: Wednesday, December 24, 2014 1:23 PM > To: dev@dpdk.org > Cc: Liang, Cunming; Cao, Waterman; Ouyang, Changchun > Subject: [PATCH v3 5/6] ixgbe: Config VF RSS >=20 > It needs config RSS and IXGBE_MRQC and IXGBE_VFPSRTYPE to enable VF RSS. >=20 > The psrtype will determine how many queues the received packets will dist= ribute > to, > and the value of psrtype should depends on both facet: max VF rxq number > which > has been negotiated with PF, and the number of rxq specified in config on= guest. >=20 > Signed-off-by: Changchun Ouyang > --- > lib/librte_pmd_ixgbe/ixgbe_pf.c | 15 +++++++ > lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 92 > ++++++++++++++++++++++++++++++++++----- > 2 files changed, 97 insertions(+), 10 deletions(-) >=20 > diff --git a/lib/librte_pmd_ixgbe/ixgbe_pf.c b/lib/librte_pmd_ixgbe/ixgbe= _pf.c > index cbb0145..9c9dad8 100644 > --- a/lib/librte_pmd_ixgbe/ixgbe_pf.c > +++ b/lib/librte_pmd_ixgbe/ixgbe_pf.c > @@ -187,6 +187,21 @@ int ixgbe_pf_host_configure(struct rte_eth_dev > *eth_dev) > IXGBE_WRITE_REG(hw, IXGBE_MPSAR_LO(hw->mac.num_rar_entries), > 0); > IXGBE_WRITE_REG(hw, IXGBE_MPSAR_HI(hw->mac.num_rar_entries), > 0); >=20 > + /* > + * VF RSS can support at most 4 queues for each VF, even if > + * 8 queues are available for each VF, it need refine to 4 > + * queues here due to this limitation, otherwise no queue > + * will receive any packet even RSS is enabled. > + */ > + if (eth_dev->data->dev_conf.rxmode.mq_mode =3D=3D > ETH_MQ_RX_VMDQ_RSS) { > + if (RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool =3D=3D 8) { > + RTE_ETH_DEV_SRIOV(eth_dev).active =3D ETH_32_POOLS; > + RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool =3D 4; > + RTE_ETH_DEV_SRIOV(eth_dev).def_pool_q_idx =3D > + dev_num_vf(eth_dev) * 4; > + } > + } > + > /* set VMDq map to default PF pool */ > hw->mac.ops.set_vmdq(hw, 0, > RTE_ETH_DEV_SRIOV(eth_dev).def_vmdq_idx); >=20 > diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > index f69abda..a7c17a4 100644 > --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > @@ -3327,6 +3327,39 @@ ixgbe_alloc_rx_queue_mbufs(struct igb_rx_queue > *rxq) > } >=20 > static int > +ixgbe_config_vf_rss(struct rte_eth_dev *dev) > +{ > + struct ixgbe_hw *hw; > + uint32_t mrqc; > + > + ixgbe_rss_configure(dev); > + > + hw =3D IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); > + > + /* MRQC: enable VF RSS */ > + mrqc =3D IXGBE_READ_REG(hw, IXGBE_MRQC); > + mrqc &=3D ~IXGBE_MRQC_MRQE_MASK; > + switch (RTE_ETH_DEV_SRIOV(dev).active) { > + case ETH_64_POOLS: > + mrqc |=3D IXGBE_MRQC_VMDQRSS64EN; > + break; > + > + case ETH_32_POOLS: > + case ETH_16_POOLS: > + mrqc |=3D IXGBE_MRQC_VMDQRSS32EN; > + break; > + > + default: > + PMD_INIT_LOG(ERR, "Invalid pool number in IOV mode"); > + return -EINVAL; > + } > + > + IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc); > + > + return 0; > +} > + > +static int > ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev) > { > struct ixgbe_hw *hw =3D > @@ -3358,24 +3391,38 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev > *dev) > default: ixgbe_rss_disable(dev); > } > } else { > - switch (RTE_ETH_DEV_SRIOV(dev).active) { > /* > * SRIOV active scheme > * FIXME if support DCB/RSS together with VMDq & SRIOV > */ > - case ETH_64_POOLS: > - IXGBE_WRITE_REG(hw, IXGBE_MRQC, > IXGBE_MRQC_VMDQEN); > + switch (dev->data->dev_conf.rxmode.mq_mode) { > + case ETH_MQ_RX_RSS: > + case ETH_MQ_RX_VMDQ_RSS: > + ixgbe_config_vf_rss(dev); > break; >=20 > - case ETH_32_POOLS: > - IXGBE_WRITE_REG(hw, IXGBE_MRQC, > IXGBE_MRQC_VMDQRT4TCEN); > - break; > + default: > + switch (RTE_ETH_DEV_SRIOV(dev).active) { [Liang, Cunming] Just a minor comments. To avoid a switch branch inside an= other switch, we can have a ixgbe_config_vf_default(), which process all the things if no RSS/DCB required in multi-queue setting. Then we can put all the 'switch(SRIOV(dev).active){...}' in it. > + case ETH_64_POOLS: > + IXGBE_WRITE_REG(hw, IXGBE_MRQC, > + IXGBE_MRQC_VMDQEN); > + break; >=20 > - case ETH_16_POOLS: > - IXGBE_WRITE_REG(hw, IXGBE_MRQC, > IXGBE_MRQC_VMDQRT8TCEN); > + case ETH_32_POOLS: > + IXGBE_WRITE_REG(hw, IXGBE_MRQC, > + IXGBE_MRQC_VMDQRT4TCEN); > + break; > + > + case ETH_16_POOLS: > + IXGBE_WRITE_REG(hw, IXGBE_MRQC, > + IXGBE_MRQC_VMDQRT8TCEN); > + break; > + default: > + PMD_INIT_LOG(ERR, > + "invalid pool number in IOV mode"); > + break; > + } > break; > - default: > - PMD_INIT_LOG(ERR, "invalid pool number in IOV mode"); > } > } >=20 > @@ -3989,10 +4036,32 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev) > uint16_t buf_size; > uint16_t i; > int ret; > + uint16_t valid_rxq_num; >=20 > PMD_INIT_FUNC_TRACE(); > hw =3D IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); >=20 > + valid_rxq_num =3D RTE_MIN(dev->data->nb_rx_queues, hw- > >mac.max_rx_queues); > + > + /* > + * VMDq RSS can't support 3 queues, so config it into 4 queues, > + * and give user a hint that some packets may loss if it doesn't > + * poll the queue where those packets are distributed to. > + */ > + if (valid_rxq_num =3D=3D 3) [Liang, Cunming] According to the inline comment, it makes more sense to us= e 'if (valid_rxq_num >=3D 3)'. In case, the value returned by max_rx_queues is not less equal than 4.=20 > + valid_rxq_num =3D 4; > + > + if (dev->data->nb_rx_queues > valid_rxq_num) { > + PMD_INIT_LOG(ERR, "The number of Rx queue invalid, " > + "it should be equal to or less than %d", > + valid_rxq_num); > + return -1; > + } else if (dev->data->nb_rx_queues < valid_rxq_num) > + PMD_INIT_LOG(ERR, "The number of Rx queue is less " > + "than the number of available Rx queues:%d, " > + "packets in Rx queues(q_id >=3D %d) may loss.", > + valid_rxq_num, dev->data->nb_rx_queues); > + > /* > * When the VF driver issues a IXGBE_VF_RESET request, the PF driver > * disables the VF receipt of packets if the PF MTU is > 1500. > @@ -4094,6 +4163,9 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev) > IXGBE_PSRTYPE_IPV6HDR; > #endif >=20 > + /* Set RQPL for VF RSS according to max Rx queue */ > + psrtype |=3D (valid_rxq_num >> 1) << > + IXGBE_PSRTYPE_RQPL_SHIFT; > IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, psrtype); >=20 > if (dev->data->dev_conf.rxmode.enable_scatter) { > -- > 1.8.4.2