[PATCH 1/2] igb/ixgbe: ETH_MQ_RX_NONE should disable RSS

[PATCH 1/2] igb/ixgbe: ETH_MQ_RX_NONE should disable RSS

[Maxime Leroy]

As explained in rte_ethdev.h, ETH_MQ_RX_NONE allows to not choose RSS, DCB
or VMDQ mode to select the rx queues.

But the igb/ixgbe code always select RSS mode with ETH_MQ_RX_NONE. This patch
fixes this incoherence between the api and the source code.

Signed-off-by: Maxime Leroy <maxime.leroy-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
---
 lib/librte_pmd_e1000/igb_rxtx.c   |    4 ++--
 lib/librte_pmd_ixgbe/ixgbe_rxtx.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c
index f785d9f..641ceea 100644
--- a/lib/librte_pmd_e1000/igb_rxtx.c
+++ b/lib/librte_pmd_e1000/igb_rxtx.c
@@ -1745,8 +1745,6 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
 	 	*/
 		if (dev->data->nb_rx_queues > 1)
 			switch (dev->data->dev_conf.rxmode.mq_mode) {
-			case ETH_MQ_RX_NONE:
-				/* if mq_mode not assign, we use rss mode.*/
 			case ETH_MQ_RX_RSS:
 				igb_rss_configure(dev);
 				break;
@@ -1754,6 +1752,8 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
 				/*Configure general VMDQ only RX parameters*/
 				igb_vmdq_rx_hw_configure(dev); 
 				break;
+			case ETH_MQ_RX_NONE:
+				/* if mq_mode is none, disable rss mode.*/
 			default: 
 				igb_rss_disable(dev);
 				break;
diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
index 0f7be95..e1b90f9 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
@@ -3217,8 +3217,6 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
 		 */
 		if (dev->data->nb_rx_queues > 1)
 			switch (dev->data->dev_conf.rxmode.mq_mode) {
-			case ETH_MQ_RX_NONE:
-				/* if mq_mode not assign, we use rss mode.*/
 			case ETH_MQ_RX_RSS:
 				ixgbe_rss_configure(dev);
 				break;
@@ -3231,6 +3229,8 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
 				ixgbe_vmdq_rx_hw_configure(dev);
 				break;
 			
+			case ETH_MQ_RX_NONE:
+				/* if mq_mode is none, disable rss mode.*/
 			default: ixgbe_rss_disable(dev);
 			}
 		else
-- 
1.7.10.4

[PATCH 2/2] igb/ixgbe: allow RSS with only one Rx queue

[Maxime Leroy]

We should be able to enable RSS with one Rx queue.
RSS hash can be useful independently of the number of queues.
Applications can use RSS hash to identify different flows.

Signed-off-by: Maxime Leroy <maxime.leroy-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
---
 lib/librte_pmd_e1000/igb_rxtx.c   |    7 ++-----
 lib/librte_pmd_ixgbe/ixgbe_rxtx.c |    7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/librte_pmd_e1000/igb_rxtx.c b/lib/librte_pmd_e1000/igb_rxtx.c
index 641ceea..8c1e2cc 100644
--- a/lib/librte_pmd_e1000/igb_rxtx.c
+++ b/lib/librte_pmd_e1000/igb_rxtx.c
@@ -1743,8 +1743,7 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
 		/*
 	 	* SRIOV inactive scheme
 	 	*/
-		if (dev->data->nb_rx_queues > 1)
-			switch (dev->data->dev_conf.rxmode.mq_mode) {
+		switch (dev->data->dev_conf.rxmode.mq_mode) {
 			case ETH_MQ_RX_RSS:
 				igb_rss_configure(dev);
 				break;
@@ -1757,9 +1756,7 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
 			default: 
 				igb_rss_disable(dev);
 				break;
-			}
-		else
-			igb_rss_disable(dev);
+		}
 	}
  
 	return 0;
diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
index e1b90f9..ae9eda8 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
@@ -3215,8 +3215,7 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
 	 	 * SRIOV inactive scheme
 		 * any DCB/RSS w/o VMDq multi-queue setting
 		 */
-		if (dev->data->nb_rx_queues > 1)
-			switch (dev->data->dev_conf.rxmode.mq_mode) {
+		switch (dev->data->dev_conf.rxmode.mq_mode) {
 			case ETH_MQ_RX_RSS:
 				ixgbe_rss_configure(dev);
 				break;
@@ -3232,9 +3231,7 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
 			case ETH_MQ_RX_NONE:
 				/* if mq_mode is none, disable rss mode.*/
 			default: ixgbe_rss_disable(dev);
-			}
-		else
-			ixgbe_rss_disable(dev);
+		}
 	} else {
 		switch (RTE_ETH_DEV_SRIOV(dev).active) {
 		/*
-- 
1.7.10.4

Re: [PATCH 2/2] igb/ixgbe: allow RSS with only one Rx queue

[Ivan Boule]

On 11/19/2013 02:03 PM, Maxime Leroy wrote:
> It should be possible to enable RSS with a single Rx queue.
> The RSS hash can be useful independently of the number of RX queues.
> Hence, DPDK applications can use the hardware-computed RSS hash to 
> manage in software different IP packet flows.
>
> Signed-off-by: Maxime Leroy <maxime.leroy-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> ---
>   lib/librte_pmd_e1000/igb_rxtx.c   |    7 ++-----
>   lib/librte_pmd_ixgbe/ixgbe_rxtx.c |    7 ++-----
>   2 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/lib/librte_pmd_e1000/igb_rxtx.c 
> b/lib/librte_pmd_e1000/igb_rxtx.c
> index 641ceea..8c1e2cc 100644
> --- a/lib/librte_pmd_e1000/igb_rxtx.c
> +++ b/lib/librte_pmd_e1000/igb_rxtx.c
> @@ -1743,8 +1743,7 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
>           /*
>            * SRIOV inactive scheme
>            */
> -        if (dev->data->nb_rx_queues > 1)
> -            switch (dev->data->dev_conf.rxmode.mq_mode) {
> +        switch (dev->data->dev_conf.rxmode.mq_mode) {
>               case ETH_MQ_RX_RSS:
>                   igb_rss_configure(dev);
>                   break;
> @@ -1757,9 +1756,7 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
>               default:
>                   igb_rss_disable(dev);
>                   break;
> -            }
> -        else
> -            igb_rss_disable(dev);
> +        }
>       }
>          return 0;
> diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c 
> b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> index e1b90f9..ae9eda8 100644
> --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> @@ -3215,8 +3215,7 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
>             * SRIOV inactive scheme
>            * any DCB/RSS w/o VMDq multi-queue setting
>            */
> -        if (dev->data->nb_rx_queues > 1)
> -            switch (dev->data->dev_conf.rxmode.mq_mode) {
> +        switch (dev->data->dev_conf.rxmode.mq_mode) {
>               case ETH_MQ_RX_RSS:
>                   ixgbe_rss_configure(dev);
>                   break;
> @@ -3232,9 +3231,7 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
>               case ETH_MQ_RX_NONE:
>                   /* if mq_mode is none, disable rss mode.*/
>               default: ixgbe_rss_disable(dev);
> -            }
> -        else
> -            ixgbe_rss_disable(dev);
> +        }
>       } else {
>           switch (RTE_ETH_DEV_SRIOV(dev).active) {
>           /*

Acked by Ivan Boule <ivan.boule-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

-- 
Ivan Boule
6WIND Development Engineer

Re: [PATCH 2/2] igb/ixgbe: allow RSS with only one Rx queue

[Thomas Monjalon]

20/11/2013 10:37, Ivan Boule :
> On 11/19/2013 02:03 PM, Maxime Leroy wrote:
> > It should be possible to enable RSS with a single Rx queue.
> > The RSS hash can be useful independently of the number of RX queues.
> > Hence, DPDK applications can use the hardware-computed RSS hash to
> > manage in software different IP packet flows.
> > 
> > Signed-off-by: Maxime Leroy <maxime.leroy-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> 
> Acked by Ivan Boule <ivan.boule-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Applied

-- 
Thomas

Re: [PATCH 1/2] igb/ixgbe: ETH_MQ_RX_NONE should disable RSS

[Ivan Boule]

On 11/19/2013 02:03 PM, Maxime Leroy wrote:
> As explained in rte_ethdev.h, ETH_MQ_RX_NONE allows to not choose 
> between RSS, DCB
> or VMDQ modes for the selection of a rx queue.
>
> But the igb/ixgbe code always silently selects the RSS mode with 
> ETH_MQ_RX_NONE. This patch
> fixes this incoherence between the API and the implementation.
>
> Signed-off-by: Maxime Leroy <maxime.leroy-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> ---
>   lib/librte_pmd_e1000/igb_rxtx.c   |    4 ++--
>   lib/librte_pmd_ixgbe/ixgbe_rxtx.c |    4 ++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/librte_pmd_e1000/igb_rxtx.c 
> b/lib/librte_pmd_e1000/igb_rxtx.c
> index f785d9f..641ceea 100644
> --- a/lib/librte_pmd_e1000/igb_rxtx.c
> +++ b/lib/librte_pmd_e1000/igb_rxtx.c
> @@ -1745,8 +1745,6 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
>            */
>           if (dev->data->nb_rx_queues > 1)
>               switch (dev->data->dev_conf.rxmode.mq_mode) {
> -            case ETH_MQ_RX_NONE:
> -                /* if mq_mode not assign, we use rss mode.*/
>               case ETH_MQ_RX_RSS:
>                   igb_rss_configure(dev);
>                   break;
> @@ -1754,6 +1752,8 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
>                   /*Configure general VMDQ only RX parameters*/
>                   igb_vmdq_rx_hw_configure(dev);
>                   break;
> +            case ETH_MQ_RX_NONE:
> +                /* if mq_mode is none, disable rss mode.*/
>               default:
>                   igb_rss_disable(dev);
>                   break;
> diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c 
> b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> index 0f7be95..e1b90f9 100644
> --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> @@ -3217,8 +3217,6 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
>            */
>           if (dev->data->nb_rx_queues > 1)
>               switch (dev->data->dev_conf.rxmode.mq_mode) {
> -            case ETH_MQ_RX_NONE:
> -                /* if mq_mode not assign, we use rss mode.*/
>               case ETH_MQ_RX_RSS:
>                   ixgbe_rss_configure(dev);
>                   break;
> @@ -3231,6 +3229,8 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
>                   ixgbe_vmdq_rx_hw_configure(dev);
>                   break;
>
> +            case ETH_MQ_RX_NONE:
> +                /* if mq_mode is none, disable rss mode.*/
>               default: ixgbe_rss_disable(dev);
>               }
>           else

Acked by Ivan Boule <ivan.boule-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

-- 
Ivan Boule
6WIND Development Engineer

Re: [PATCH 1/2] igb/ixgbe: ETH_MQ_RX_NONE should disable RSS

[Thomas Monjalon]

20/11/2013 10:49, Ivan Boule :
> On 11/19/2013 02:03 PM, Maxime Leroy wrote:
> > As explained in rte_ethdev.h, ETH_MQ_RX_NONE allows to not choose
> > between RSS, DCB
> > or VMDQ modes for the selection of a rx queue.
> > 
> > But the igb/ixgbe code always silently selects the RSS mode with
> > ETH_MQ_RX_NONE. This patch
> > fixes this incoherence between the API and the implementation.
> > 
> > Signed-off-by: Maxime Leroy <maxime.leroy-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> 
> Acked by Ivan Boule <ivan.boule-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

Applied

-- 
Thomas

Re: [PATCH 1/2] igb/ixgbe: ETH_MQ_RX_NONE should disable RSS

[Prashant Upadhyaya]

Hi,

So if I have multiple queues and was using ETH_MQ_RX_NONE (and therefore utilizing RSS), it will stop working for me now after this patch ?

Regards
-Prashant


-----Original Message-----
From: dev [mailto:dev-bounces-VfR2kkLFssw@public.gmane.org] On Behalf Of Ivan Boule
Sent: Wednesday, November 20, 2013 3:20 PM
To: Maxime Leroy
Cc: dev-VfR2kkLFssw@public.gmane.org
Subject: Re: [dpdk-dev] [PATCH 1/2] igb/ixgbe: ETH_MQ_RX_NONE should disable RSS

On 11/19/2013 02:03 PM, Maxime Leroy wrote:
> As explained in rte_ethdev.h, ETH_MQ_RX_NONE allows to not choose
> between RSS, DCB or VMDQ modes for the selection of a rx queue.
>
> But the igb/ixgbe code always silently selects the RSS mode with
> ETH_MQ_RX_NONE. This patch fixes this incoherence between the API and
> the implementation.
>
> Signed-off-by: Maxime Leroy <maxime.leroy-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>
> ---
>   lib/librte_pmd_e1000/igb_rxtx.c   |    4 ++--
>   lib/librte_pmd_ixgbe/ixgbe_rxtx.c |    4 ++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/lib/librte_pmd_e1000/igb_rxtx.c
> b/lib/librte_pmd_e1000/igb_rxtx.c index f785d9f..641ceea 100644
> --- a/lib/librte_pmd_e1000/igb_rxtx.c
> +++ b/lib/librte_pmd_e1000/igb_rxtx.c
> @@ -1745,8 +1745,6 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
>            */
>           if (dev->data->nb_rx_queues > 1)
>               switch (dev->data->dev_conf.rxmode.mq_mode) {
> -            case ETH_MQ_RX_NONE:
> -                /* if mq_mode not assign, we use rss mode.*/
>               case ETH_MQ_RX_RSS:
>                   igb_rss_configure(dev);
>                   break;
> @@ -1754,6 +1752,8 @@ igb_dev_mq_rx_configure(struct rte_eth_dev *dev)
>                   /*Configure general VMDQ only RX parameters*/
>                   igb_vmdq_rx_hw_configure(dev);
>                   break;
> +            case ETH_MQ_RX_NONE:
> +                /* if mq_mode is none, disable rss mode.*/
>               default:
>                   igb_rss_disable(dev);
>                   break;
> diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> index 0f7be95..e1b90f9 100644
> --- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> +++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
> @@ -3217,8 +3217,6 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
>            */
>           if (dev->data->nb_rx_queues > 1)
>               switch (dev->data->dev_conf.rxmode.mq_mode) {
> -            case ETH_MQ_RX_NONE:
> -                /* if mq_mode not assign, we use rss mode.*/
>               case ETH_MQ_RX_RSS:
>                   ixgbe_rss_configure(dev);
>                   break;
> @@ -3231,6 +3229,8 @@ ixgbe_dev_mq_rx_configure(struct rte_eth_dev *dev)
>                   ixgbe_vmdq_rx_hw_configure(dev);
>                   break;
>
> +            case ETH_MQ_RX_NONE:
> +                /* if mq_mode is none, disable rss mode.*/
>               default: ixgbe_rss_disable(dev);
>               }
>           else

Acked by Ivan Boule <ivan.boule-pdR9zngts4EAvxtiuMwx3w@public.gmane.org>

--
Ivan Boule
6WIND Development Engineer





===============================================================================
Please refer to http://www.aricent.com/legal/email_disclaimer.html
for important disclosures regarding this electronic communication.
===============================================================================

Re: [PATCH 1/2] igb/ixgbe: ETH_MQ_RX_NONE should disable RSS

[Thomas Monjalon]

20/11/2013 11:06, Prashant Upadhyaya :
> So if I have multiple queues and was using ETH_MQ_RX_NONE (and therefore
> utilizing RSS), it will stop working for me now after this patch ?

Yes, you should use ETH_MQ_RX_RSS to explicitly enable RSS.

> ======================================================================
> Please refer to http://www.aricent.com/legal/email_disclaimer.html
> for important disclosures regarding this electronic communication.
> ======================================================================

Please do not use this type of disclaimer on a public mailing list.

-- 
Thomas