From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wi0-f177.google.com (mail-wi0-f177.google.com [209.85.212.177]) by dpdk.org (Postfix) with ESMTP id 1E8C35AA7 for ; Mon, 12 Jan 2015 15:04:07 +0100 (CET) Received: by mail-wi0-f177.google.com with SMTP id l15so14842034wiw.4 for ; Mon, 12 Jan 2015 06:04:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=g5GUqNDCyzOilHeuC5x08zzpthGs4kWjR3gNnoP07jA=; b=cmW9E9YWT7fiIGys944QsjwoDArS73ErrlgmkI0GbX9FV0Il+hq8/y7ofGQvfpdAHk sWOFzcaVfOrput2gbGCtzZj/OjLP+rhuxE+DuR7QyFvo591hXG8Ys9o/P/wbgNaPsAnG 1+XXUrMIZ/RXO3GCPRKswnpjFvLHdWqjpwa3jZlLecZ0N3JvUH757c7DcCcs6NLpiq4P g7ecYZoStE89EpYoBc12JVXqlPqOZR1QyVaidwLrx1oGVDmPsBeyNdZ+Ca1qDrwNSJMu 2uwYta8KsddYIVGg/3QpBl3+HB9PBnWhe1vbSroqJcNXq5YZ9qql57UjFP7hX2MONy9Q Y4tw== X-Gm-Message-State: ALoCoQmLKunBXYc87AUDpyassfjTyBDjmkt1NchBW0lhuRUYS9rkd8aOOul7QnAUCp+GgueEgvUd X-Received: by 10.194.94.1 with SMTP id cy1mr33495286wjb.127.1421071446841; Mon, 12 Jan 2015 06:04:06 -0800 (PST) Received: from [10.0.0.165] (system.cloudius-systems.com. [84.94.198.183]) by mx.google.com with ESMTPSA id cg8sm21776347wjc.1.2015.01.12.06.04.04 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jan 2015 06:04:06 -0800 (PST) Message-ID: <54B3D453.7070807@cloudius-systems.com> Date: Mon, 12 Jan 2015 16:04:03 +0200 From: Vlad Zolotarov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Ouyang Changchun , dev@dpdk.org References: <1420612355-6666-1-git-send-email-changchun.ouyang@intel.com> <1421042352-22399-1-git-send-email-changchun.ouyang@intel.com> <1421042352-22399-6-git-send-email-changchun.ouyang@intel.com> In-Reply-To: <1421042352-22399-6-git-send-email-changchun.ouyang@intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v6 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: Mon, 12 Jan 2015 14:04:07 -0000 On 01/12/15 07:59, Ouyang Changchun wrote: > It needs config RSS and IXGBE_MRQC and IXGBE_VFPSRTYPE to enable VF RSS. > > The psrtype will determine how many queues the received packets will distribute 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. > > Signed-off-by: Changchun Ouyang Reviewed-by: Vlad Zolotarov > > Changes in v6: > - Raise an error for the case of ETH_16_POOLS in config vf rss, as the previous > logic have changed it into: ETH_32_POOLS. > > Changes in v4: > - The number of rxq from config should be power of 2 and should not bigger than > max VF rxq number(negotiated between guest and host). > > --- > lib/librte_pmd_ixgbe/ixgbe_pf.c | 15 ++++++ > lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 102 +++++++++++++++++++++++++++++++++----- > 2 files changed, 105 insertions(+), 12 deletions(-) > > diff --git a/lib/librte_pmd_ixgbe/ixgbe_pf.c b/lib/librte_pmd_ixgbe/ixgbe_pf.c > index dbda9b5..93f6e43 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); > > + /* > + * 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 == ETH_MQ_RX_VMDQ_RSS) { > + if (RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool == 8) { > + RTE_ETH_DEV_SRIOV(eth_dev).active = ETH_32_POOLS; > + RTE_ETH_DEV_SRIOV(eth_dev).nb_q_per_pool = 4; > + RTE_ETH_DEV_SRIOV(eth_dev).def_pool_q_idx = > + 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); > > diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > index f69abda..20627df 100644 > --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c > @@ -3327,6 +3327,67 @@ ixgbe_alloc_rx_queue_mbufs(struct igb_rx_queue *rxq) > } > > static int > +ixgbe_config_vf_rss(struct rte_eth_dev *dev) > +{ > + struct ixgbe_hw *hw; > + uint32_t mrqc; > + > + ixgbe_rss_configure(dev); > + > + hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); > + > + /* MRQC: enable VF RSS */ > + mrqc = IXGBE_READ_REG(hw, IXGBE_MRQC); > + mrqc &= ~IXGBE_MRQC_MRQE_MASK; > + switch (RTE_ETH_DEV_SRIOV(dev).active) { > + case ETH_64_POOLS: > + mrqc |= IXGBE_MRQC_VMDQRSS64EN; > + break; > + > + case ETH_32_POOLS: > + mrqc |= IXGBE_MRQC_VMDQRSS32EN; > + break; > + > + default: > + PMD_INIT_LOG(ERR, "Invalid pool number in IOV mode with VMDQ RSS"); > + return -EINVAL; > + } > + > + IXGBE_WRITE_REG(hw, IXGBE_MRQC, mrqc); > + > + return 0; > +} > + > +static int > +ixgbe_config_vf_default(struct rte_eth_dev *dev) > +{ > + struct ixgbe_hw *hw = > + IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); > + > + switch (RTE_ETH_DEV_SRIOV(dev).active) { > + case ETH_64_POOLS: > + IXGBE_WRITE_REG(hw, IXGBE_MRQC, > + IXGBE_MRQC_VMDQEN); > + break; > + > + 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; > + } > + return 0; > +} > + > +static int > ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev) > { > struct ixgbe_hw *hw = > @@ -3358,24 +3419,25 @@ 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 > + * Support RSS together with VMDq & SRIOV > */ > - case ETH_64_POOLS: > - IXGBE_WRITE_REG(hw, IXGBE_MRQC, IXGBE_MRQC_VMDQEN); > - break; > - > - case ETH_32_POOLS: > - IXGBE_WRITE_REG(hw, IXGBE_MRQC, IXGBE_MRQC_VMDQRT4TCEN); > + 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; > > - case ETH_16_POOLS: > - IXGBE_WRITE_REG(hw, IXGBE_MRQC, IXGBE_MRQC_VMDQRT8TCEN); > - break; > + /* FIXME if support DCB/RSS together with VMDq & SRIOV */ > + case ETH_MQ_RX_VMDQ_DCB: > + case ETH_MQ_RX_VMDQ_DCB_RSS: > + PMD_INIT_LOG(ERR, > + "Could not support DCB with VMDq & SRIOV"); > + return -1; > default: > - PMD_INIT_LOG(ERR, "invalid pool number in IOV mode"); > + ixgbe_config_vf_default(dev); > + break; > } > } > > @@ -3993,6 +4055,19 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev) > PMD_INIT_FUNC_TRACE(); > hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private); > > + if (rte_is_power_of_2(dev->data->nb_rx_queues) == 0) { > + PMD_INIT_LOG(ERR, "The number of Rx queue invalid, " > + "it should be power of 2"); > + return -1; > + } > + > + if (dev->data->nb_rx_queues > hw->mac.max_rx_queues) { > + PMD_INIT_LOG(ERR, "The number of Rx queue invalid, " > + "it should be equal to or less than %d", > + hw->mac.max_rx_queues); > + return -1; > + } > + > /* > * 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 +4169,9 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev) > IXGBE_PSRTYPE_IPV6HDR; > #endif > > + /* Set RQPL for VF RSS according to max Rx queue */ > + psrtype |= (dev->data->nb_rx_queues >> 1) << > + IXGBE_PSRTYPE_RQPL_SHIFT; > IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, psrtype); > > if (dev->data->dev_conf.rxmode.enable_scatter) {