* [dpdk-stable] [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode
@ 2017-03-07 23:40 Jingjing Wu
2017-03-07 23:40 ` [dpdk-stable] [DPDK 2/4] app/testpmd: fix init config for multi-queue mode Jingjing Wu
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Jingjing Wu @ 2017-03-07 23:40 UTC (permalink / raw)
To: qabuild; +Cc: Jingjing Wu, stable
In SRIOV case, ETH_MQ_RX_VMDQ_DCB and ETH_MQ_RX_DCB should be considered as
the same meaning, due to the multi-queue mapping is the same SRIOV and VMDq
in ixgbe.
Fixes: 27b609cbd1c6 ("ethdev: move the multi-queue mode check to specific drivers")
Cc: stable@dpdk.org
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
drivers/net/ixgbe/ixgbe_rxtx.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 9502432..72327bc 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -4135,9 +4135,8 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
break;
}
} else {
- /*
- * SRIOV active scheme
- * Support RSS together with VMDq & SRIOV
+ /* SRIOV active scheme
+ * Support RSS together with SRIOV.
*/
switch (dev->data->dev_conf.rxmode.mq_mode) {
case ETH_MQ_RX_RSS:
@@ -4145,10 +4144,13 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
ixgbe_config_vf_rss(dev);
break;
case ETH_MQ_RX_VMDQ_DCB:
+ case ETH_MQ_RX_DCB:
+ /* In SRIOV, the configuration is the same as VMDq case */
ixgbe_vmdq_dcb_configure(dev);
break;
- /* FIXME if support DCB/RSS together with VMDq & SRIOV */
+ /* DCB/RSS together with SRIOV is not supported */
case ETH_MQ_RX_VMDQ_DCB_RSS:
+ case ETH_MQ_RX_DCB_RSS:
PMD_INIT_LOG(ERR,
"Could not support DCB/RSS with VMDq & SRIOV");
return -1;
--
2.4.11
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-stable] [DPDK 2/4] app/testpmd: fix init config for multi-queue mode
2017-03-07 23:40 [dpdk-stable] [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode Jingjing Wu
@ 2017-03-07 23:40 ` Jingjing Wu
2017-03-07 23:46 ` Wu, Jingjing
2017-03-07 23:40 ` [dpdk-stable] [DPDK 3/4] app/testpmd: fix TC mapping in DCB init config Jingjing Wu
2017-03-07 23:46 ` [dpdk-stable] [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode Wu, Jingjing
2 siblings, 1 reply; 6+ messages in thread
From: Jingjing Wu @ 2017-03-07 23:40 UTC (permalink / raw)
To: qabuild; +Cc: Jingjing Wu, stable
In SRIOV mode, the mq_mode of rte_eth_rxmode should not carry VMDQ info
without rx_adv_conf setting.
Fixes: a30979f6ad7f ("app/testpmd: set Rx VMDq RSS mode")
Cc: stable@dpdk.org
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
app/test-pmd/testpmd.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index bfb2f8e..f695807 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1835,24 +1835,13 @@ init_port_config(void)
port->dev_conf.rx_adv_conf.rss_conf.rss_hf = 0;
}
- if (port->dcb_flag == 0 && port->dev_info.max_vfs == 0) {
+ if (port->dcb_flag == 0) {
if( port->dev_conf.rx_adv_conf.rss_conf.rss_hf != 0)
port->dev_conf.rxmode.mq_mode = ETH_MQ_RX_RSS;
else
port->dev_conf.rxmode.mq_mode = ETH_MQ_RX_NONE;
}
- if (port->dev_info.max_vfs != 0) {
- if (port->dev_conf.rx_adv_conf.rss_conf.rss_hf != 0)
- port->dev_conf.rxmode.mq_mode =
- ETH_MQ_RX_VMDQ_RSS;
- else
- port->dev_conf.rxmode.mq_mode =
- ETH_MQ_RX_NONE;
-
- port->dev_conf.txmode.mq_mode = ETH_MQ_TX_NONE;
- }
-
rxtx_port_config(port);
rte_eth_macaddr_get(pid, &port->eth_addr);
--
2.4.11
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-stable] [DPDK 3/4] app/testpmd: fix TC mapping in DCB init config
2017-03-07 23:40 [dpdk-stable] [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode Jingjing Wu
2017-03-07 23:40 ` [dpdk-stable] [DPDK 2/4] app/testpmd: fix init config for multi-queue mode Jingjing Wu
@ 2017-03-07 23:40 ` Jingjing Wu
2017-03-07 23:47 ` Wu, Jingjing
2017-03-07 23:46 ` [dpdk-stable] [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode Wu, Jingjing
2 siblings, 1 reply; 6+ messages in thread
From: Jingjing Wu @ 2017-03-07 23:40 UTC (permalink / raw)
To: qabuild; +Cc: Jingjing Wu, stable
Fix the UP and TC mapping to divide multiple UPs to TCs instead of mapping
the UPs who are lager than num_tcs to TC0.
Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic class")
Cc: stable@dpdk.org
Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
---
app/test-pmd/testpmd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index f695807..fa19f8f 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -1933,9 +1933,9 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf,
rx_conf->nb_tcs = num_tcs;
tx_conf->nb_tcs = num_tcs;
- for (i = 0; i < num_tcs; i++) {
- rx_conf->dcb_tc[i] = i;
- tx_conf->dcb_tc[i] = i;
+ for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
+ rx_conf->dcb_tc[i] = i % num_tcs;
+ tx_conf->dcb_tc[i] = i % num_tcs;
}
eth_conf->rxmode.mq_mode = ETH_MQ_RX_DCB_RSS;
eth_conf->rx_adv_conf.rss_conf.rss_hf = rss_hf;
--
2.4.11
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode
2017-03-07 23:40 [dpdk-stable] [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode Jingjing Wu
2017-03-07 23:40 ` [dpdk-stable] [DPDK 2/4] app/testpmd: fix init config for multi-queue mode Jingjing Wu
2017-03-07 23:40 ` [dpdk-stable] [DPDK 3/4] app/testpmd: fix TC mapping in DCB init config Jingjing Wu
@ 2017-03-07 23:46 ` Wu, Jingjing
2 siblings, 0 replies; 6+ messages in thread
From: Wu, Jingjing @ 2017-03-07 23:46 UTC (permalink / raw)
To: stable
resend by mistake, drop this.
> -----Original Message-----
> From: Wu, Jingjing
> Sent: Wednesday, March 8, 2017 7:40 AM
> To: qabuild <qabuild@intel.com>
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; stable@dpdk.org
> Subject: [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode
>
> In SRIOV case, ETH_MQ_RX_VMDQ_DCB and ETH_MQ_RX_DCB should be
> considered as the same meaning, due to the multi-queue mapping is the same
> SRIOV and VMDq in ixgbe.
>
> Fixes: 27b609cbd1c6 ("ethdev: move the multi-queue mode check to specific
> drivers")
>
> Cc: stable@dpdk.org
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> drivers/net/ixgbe/ixgbe_rxtx.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
> index 9502432..72327bc 100644
> --- a/drivers/net/ixgbe/ixgbe_rxtx.c
> +++ b/drivers/net/ixgbe/ixgbe_rxtx.c
> @@ -4135,9 +4135,8 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
> break;
> }
> } else {
> - /*
> - * SRIOV active scheme
> - * Support RSS together with VMDq & SRIOV
> + /* SRIOV active scheme
> + * Support RSS together with SRIOV.
> */
> switch (dev->data->dev_conf.rxmode.mq_mode) {
> case ETH_MQ_RX_RSS:
> @@ -4145,10 +4144,13 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev
> *dev)
> ixgbe_config_vf_rss(dev);
> break;
> case ETH_MQ_RX_VMDQ_DCB:
> + case ETH_MQ_RX_DCB:
> + /* In SRIOV, the configuration is the same as VMDq case */
> ixgbe_vmdq_dcb_configure(dev);
> break;
> - /* FIXME if support DCB/RSS together with VMDq & SRIOV */
> + /* DCB/RSS together with SRIOV is not supported */
> case ETH_MQ_RX_VMDQ_DCB_RSS:
> + case ETH_MQ_RX_DCB_RSS:
> PMD_INIT_LOG(ERR,
> "Could not support DCB/RSS with VMDq &
> SRIOV");
> return -1;
> --
> 2.4.11
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [DPDK 2/4] app/testpmd: fix init config for multi-queue mode
2017-03-07 23:40 ` [dpdk-stable] [DPDK 2/4] app/testpmd: fix init config for multi-queue mode Jingjing Wu
@ 2017-03-07 23:46 ` Wu, Jingjing
0 siblings, 0 replies; 6+ messages in thread
From: Wu, Jingjing @ 2017-03-07 23:46 UTC (permalink / raw)
To: stable
resend by mistake, drop this.
> -----Original Message-----
> From: Wu, Jingjing
> Sent: Wednesday, March 8, 2017 7:40 AM
> To: qabuild <qabuild@intel.com>
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; stable@dpdk.org
> Subject: [DPDK 2/4] app/testpmd: fix init config for multi-queue mode
>
> In SRIOV mode, the mq_mode of rte_eth_rxmode should not carry VMDQ info
> without rx_adv_conf setting.
>
> Fixes: a30979f6ad7f ("app/testpmd: set Rx VMDq RSS mode")
>
> Cc: stable@dpdk.org
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> app/test-pmd/testpmd.c | 13 +------------
> 1 file changed, 1 insertion(+), 12 deletions(-)
>
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> bfb2f8e..f695807 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -1835,24 +1835,13 @@ init_port_config(void)
> port->dev_conf.rx_adv_conf.rss_conf.rss_hf = 0;
> }
>
> - if (port->dcb_flag == 0 && port->dev_info.max_vfs == 0) {
> + if (port->dcb_flag == 0) {
> if( port->dev_conf.rx_adv_conf.rss_conf.rss_hf != 0)
> port->dev_conf.rxmode.mq_mode =
> ETH_MQ_RX_RSS;
> else
> port->dev_conf.rxmode.mq_mode =
> ETH_MQ_RX_NONE;
> }
>
> - if (port->dev_info.max_vfs != 0) {
> - if (port->dev_conf.rx_adv_conf.rss_conf.rss_hf != 0)
> - port->dev_conf.rxmode.mq_mode =
> - ETH_MQ_RX_VMDQ_RSS;
> - else
> - port->dev_conf.rxmode.mq_mode =
> - ETH_MQ_RX_NONE;
> -
> - port->dev_conf.txmode.mq_mode =
> ETH_MQ_TX_NONE;
> - }
> -
> rxtx_port_config(port);
>
> rte_eth_macaddr_get(pid, &port->eth_addr);
> --
> 2.4.11
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [dpdk-stable] [DPDK 3/4] app/testpmd: fix TC mapping in DCB init config
2017-03-07 23:40 ` [dpdk-stable] [DPDK 3/4] app/testpmd: fix TC mapping in DCB init config Jingjing Wu
@ 2017-03-07 23:47 ` Wu, Jingjing
0 siblings, 0 replies; 6+ messages in thread
From: Wu, Jingjing @ 2017-03-07 23:47 UTC (permalink / raw)
To: stable
resend by mistake, drop this.
> -----Original Message-----
> From: Wu, Jingjing
> Sent: Wednesday, March 8, 2017 7:40 AM
> To: qabuild <qabuild@intel.com>
> Cc: Wu, Jingjing <jingjing.wu@intel.com>; stable@dpdk.org
> Subject: [DPDK 3/4] app/testpmd: fix TC mapping in DCB init config
>
> Fix the UP and TC mapping to divide multiple UPs to TCs instead of mapping the
> UPs who are lager than num_tcs to TC0.
>
> Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic
> class")
>
> Cc: stable@dpdk.org
> Signed-off-by: Jingjing Wu <jingjing.wu@intel.com>
> ---
> app/test-pmd/testpmd.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> f695807..fa19f8f 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -1933,9 +1933,9 @@ get_eth_dcb_conf(struct rte_eth_conf *eth_conf,
> rx_conf->nb_tcs = num_tcs;
> tx_conf->nb_tcs = num_tcs;
>
> - for (i = 0; i < num_tcs; i++) {
> - rx_conf->dcb_tc[i] = i;
> - tx_conf->dcb_tc[i] = i;
> + for (i = 0; i < ETH_DCB_NUM_USER_PRIORITIES; i++) {
> + rx_conf->dcb_tc[i] = i % num_tcs;
> + tx_conf->dcb_tc[i] = i % num_tcs;
> }
> eth_conf->rxmode.mq_mode = ETH_MQ_RX_DCB_RSS;
> eth_conf->rx_adv_conf.rss_conf.rss_hf = rss_hf;
> --
> 2.4.11
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-03-07 23:47 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-07 23:40 [dpdk-stable] [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode Jingjing Wu
2017-03-07 23:40 ` [dpdk-stable] [DPDK 2/4] app/testpmd: fix init config for multi-queue mode Jingjing Wu
2017-03-07 23:46 ` Wu, Jingjing
2017-03-07 23:40 ` [dpdk-stable] [DPDK 3/4] app/testpmd: fix TC mapping in DCB init config Jingjing Wu
2017-03-07 23:47 ` Wu, Jingjing
2017-03-07 23:46 ` [dpdk-stable] [DPDK 1/4] net/ixgbe: fix multi-queue mode check in SRIOV mode Wu, Jingjing
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).