From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by dpdk.org (Postfix) with ESMTP id B82895AA8 for ; Mon, 12 Jan 2015 15:06:22 +0100 (CET) Received: by mail-wg0-f43.google.com with SMTP id k14so19445661wgh.2 for ; Mon, 12 Jan 2015 06:06:22 -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=lKVMZ/pyHWFZfqqLiHbET5r6kCt6PkwYbheDNttbUrQ=; b=hGlEaI1Hr5d/YWk55zlT8wNKsbk0RKIQ/dxsnBr9Z3xt+TES8pOjWSLRkzg2IH3wqc A1TUlaTQK7NMoKFTc5k9g7ntT7POw7ziQUBUulNiXOn2a7uVfNUQmJWLwMcQdrhOodex zqW4E3bgCQG3ie3sj9IIxENn/PbJdr+931Yr858dQtETaqh7OY4dj37IwVjcn+0TVv5S TRBAxl4/AtjqwoSMg4O5waU0MeJI93wOhK1GCocyGkJ9vZpe3JS5xB+SEuqdMtRceOlr tQ3Cg3kvGlhNWz36Gd6Mr0vW8SMVMorKQ1k6tOHISrHMCDB5hazpLaaC0CreX+/9U4DB Zm8Q== X-Gm-Message-State: ALoCoQkEZ1AtH1Mhsh+nmHGA58grGGXvv1/pouVPEne24ofAURXGQd4kHwWKkag02zVmwUC8ZGL8 X-Received: by 10.180.20.6 with SMTP id j6mr30006152wie.59.1421071582491; Mon, 12 Jan 2015 06:06:22 -0800 (PST) Received: from [10.0.0.165] (system.cloudius-systems.com. [84.94.198.183]) by mx.google.com with ESMTPSA id n5sm10374993wic.6.2015.01.12.06.06.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jan 2015 06:06:22 -0800 (PST) Message-ID: <54B3D4DC.5090909@cloudius-systems.com> Date: Mon, 12 Jan 2015 16:06:20 +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-5-git-send-email-changchun.ouyang@intel.com> In-Reply-To: <1421042352-22399-5-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 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: Mon, 12 Jan 2015 14:06:23 -0000 On 01/12/15 07:59, 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 Reviewed-by: Vlad Zolotarov > > changes in v6: > - More clear error message when queue number is invalid. > > changes in v5: > - Fix '<' issue, it should be '<=' to test rxq number; > - Extract a function to remove the embeded switch-case statement. > > --- > lib/librte_ether/rte_ethdev.c | 51 ++++++++++++++++++++++++++++++++++++++----- > 1 file changed, 46 insertions(+), 5 deletions(-) > > diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c > index 95f2ceb..e9e3368 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 = &rte_eth_devices[port_id]; > + switch (nb_rx_q) { > + case 1: > + case 2: > + RTE_ETH_DEV_SRIOV(dev).active = > + ETH_64_POOLS; > + break; > + case 4: > + RTE_ETH_DEV_SRIOV(dev).active = > + ETH_32_POOLS; > + break; > + default: > + return -EINVAL; > + } > + > + RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool = nb_rx_q; > + RTE_ETH_DEV_SRIOV(dev).def_pool_q_idx = > + 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 != 0) { > /* check multi-queue mode */ > - if ((dev_conf->rxmode.mq_mode == ETH_MQ_RX_RSS) || > - (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) || > + if ((dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB) || > (dev_conf->rxmode.mq_mode == ETH_MQ_RX_DCB_RSS) || > (dev_conf->txmode.mq_mode == 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,26 @@ 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=%" 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 = ETH_MQ_RX_VMDQ_RSS; > + if (nb_rx_q <= RTE_ETH_DEV_SRIOV(dev).nb_q_per_pool) > + if (rte_eth_dev_check_vf_rss_rxq_num(port_id, nb_rx_q) != 0) { > + PMD_DEBUG_TRACE("ethdev port_id=%d" > + " SRIOV active, invalid queue" > + " number for VMDQ RSS, allowed" > + " value are 1, 2 or 4\n", > + port_id); > + 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 = ETH_MQ_RX_VMDQ_ONLY; > @@ -553,8 +596,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 = 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 = 1; > break; > } >