[PATCH net-next 1/2] igb: Remove unnecessary flag setting in igb_set_flag_queue_pairs()

[PATCH net-next 1/2] igb: Remove unnecessary flag setting in igb_set_flag_queue_pairs()

[Shota Suzuki]

If VFs are enabled (max_vfs >= 1), both max_rss_queues and
adapter->rss_queues are set to 2 in the case of e1000_82576.
In this case, IGB_FLAG_QUEUE_PAIRS is always set in the default block as a
result of fall-through, thus setting it in the e1000_82576 block is not
necessary.

Signed-off-by: Shota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 3d4b502..340ba4fb 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2922,14 +2922,6 @@ void igb_set_flag_queue_pairs(struct igb_adapter *adapter,
 		/* Device supports enough interrupts without queue pairing. */
 		break;
 	case e1000_82576:
-		/* If VFs are going to be allocated with RSS queues then we
-		 * should pair the queues in order to conserve interrupts due
-		 * to limited supply.
-		 */
-		if ((adapter->rss_queues > 1) &&
-		    (adapter->vfs_allocated_count > 6))
-			adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
-		/* fall through */
 	case e1000_82580:
 	case e1000_i350:
 	case e1000_i354:
-- 
1.8.3.1

[Intel-wired-lan] [PATCH net-next 1/2] igb: Remove unnecessary flag setting in igb_set_flag_queue_pairs()

[Shota Suzuki]

If VFs are enabled (max_vfs >= 1), both max_rss_queues and
adapter->rss_queues are set to 2 in the case of e1000_82576.
In this case, IGB_FLAG_QUEUE_PAIRS is always set in the default block as a
result of fall-through, thus setting it in the e1000_82576 block is not
necessary.

Signed-off-by: Shota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 3d4b502..340ba4fb 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2922,14 +2922,6 @@ void igb_set_flag_queue_pairs(struct igb_adapter *adapter,
 		/* Device supports enough interrupts without queue pairing. */
 		break;
 	case e1000_82576:
-		/* If VFs are going to be allocated with RSS queues then we
-		 * should pair the queues in order to conserve interrupts due
-		 * to limited supply.
-		 */
-		if ((adapter->rss_queues > 1) &&
-		    (adapter->vfs_allocated_count > 6))
-			adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
-		/* fall through */
 	case e1000_82580:
 	case e1000_i350:
 	case e1000_i354:
-- 
1.8.3.1

[PATCH net-next 2/2] igb: Unpair the queues when changing the number of queues

[Shota Suzuki]

By the commit 72ddef0506da ("igb: Fix oops caused by missing queue
pairing"), the IGB_FLAG_QUEUE_PAIRS flag can now be set when changing the
number of queues by "ethtool -L", but it is never cleared unless the igb
driver is reloaded.
This patch clears it if queue pairing becomes unnecessary as a result of
"ethtool -L".

Signed-off-by: Shota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 340ba4fb..75ee25e 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2932,6 +2932,8 @@ void igb_set_flag_queue_pairs(struct igb_adapter *adapter,
 		 */
 		if (adapter->rss_queues > (max_rss_queues / 2))
 			adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
+		else
+			adapter->flags &= ~IGB_FLAG_QUEUE_PAIRS;
 		break;
 	}
 }
-- 
1.8.3.1

[Intel-wired-lan] [PATCH net-next 2/2] igb: Unpair the queues when changing the number of queues

[Shota Suzuki]

By the commit 72ddef0506da ("igb: Fix oops caused by missing queue
pairing"), the IGB_FLAG_QUEUE_PAIRS flag can now be set when changing the
number of queues by "ethtool -L", but it is never cleared unless the igb
driver is reloaded.
This patch clears it if queue pairing becomes unnecessary as a result of
"ethtool -L".

Signed-off-by: Shota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 340ba4fb..75ee25e 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2932,6 +2932,8 @@ void igb_set_flag_queue_pairs(struct igb_adapter *adapter,
 		 */
 		if (adapter->rss_queues > (max_rss_queues / 2))
 			adapter->flags |= IGB_FLAG_QUEUE_PAIRS;
+		else
+			adapter->flags &= ~IGB_FLAG_QUEUE_PAIRS;
 		break;
 	}
 }
-- 
1.8.3.1

RE: [PATCH net-next 1/2] igb: Remove unnecessary flag setting in igb_set_flag_queue_pairs()

[Brown, Aaron F]

> From: netdev-owner@vger.kernel.org [netdev-owner@vger.kernel.org] on behalf of Shota Suzuki 
> [suzuki_shota_t3@lab.ntt.co.jp]
> Sent: Friday, December 11, 2015 1:43 AM
> To: Kirsher, Jeffrey T; Brandeburg, Jesse; Nelson, Shannon; Wyborny, Carolyn; Skidmore, Donald C; 
> Ronciak, John; Williams, Mitch A; intel-wired-lan@lists.osuosl.org; netdev@vger.kernel.org
> Cc: suzuki_shota_t3@lab.ntt.co.jp
> Subject: [PATCH net-next 1/2] igb: Remove unnecessary flag setting in igb_set_flag_queue_pairs()
> 
> If VFs are enabled (max_vfs >= 1), both max_rss_queues and
> adapter->rss_queues are set to 2 in the case of e1000_82576.
> In this case, IGB_FLAG_QUEUE_PAIRS is always set in the default block as a
> result of fall-through, thus setting it in the e1000_82576 block is not
> necessary.

> Signed-off-by: Shota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
> ---
>  drivers/net/ethernet/intel/igb/igb_main.c | 8 --------
>  1 file changed, 8 deletions(-)

Tested-by: Aaron Brown <aaron.f.brown@intel.com>

[Intel-wired-lan] [PATCH net-next 1/2] igb: Remove unnecessary flag setting in igb_set_flag_queue_pairs()

[Brown, Aaron F]

> From: netdev-owner at vger.kernel.org [netdev-owner at vger.kernel.org] on behalf of Shota Suzuki 
> [suzuki_shota_t3 at lab.ntt.co.jp]
> Sent: Friday, December 11, 2015 1:43 AM
> To: Kirsher, Jeffrey T; Brandeburg, Jesse; Nelson, Shannon; Wyborny, Carolyn; Skidmore, Donald C; 
> Ronciak, John; Williams, Mitch A; intel-wired-lan at lists.osuosl.org; netdev at vger.kernel.org
> Cc: suzuki_shota_t3 at lab.ntt.co.jp
> Subject: [PATCH net-next 1/2] igb: Remove unnecessary flag setting in igb_set_flag_queue_pairs()
> 
> If VFs are enabled (max_vfs >= 1), both max_rss_queues and
> adapter->rss_queues are set to 2 in the case of e1000_82576.
> In this case, IGB_FLAG_QUEUE_PAIRS is always set in the default block as a
> result of fall-through, thus setting it in the e1000_82576 block is not
> necessary.

> Signed-off-by: Shota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
> ---
>  drivers/net/ethernet/intel/igb/igb_main.c | 8 --------
>  1 file changed, 8 deletions(-)

Tested-by: Aaron Brown <aaron.f.brown@intel.com>

RE: [Intel-wired-lan] [PATCH net-next 2/2] igb: Unpair the queues when changing the number of queues

[Brown, Aaron F]

> From: Intel-wired-lan [intel-wired-lan-bounces@lists.osuosl.org] on behalf of Shota Suzuki 
> [suzuki_shota_t3@lab.ntt.co.jp]
> Sent: Friday, December 11, 2015 1:44 AM
> To: Kirsher, Jeffrey T; Brandeburg, Jesse; Nelson, Shannon; Wyborny, Carolyn; Skidmore, Donald C; 
> Ronciak, John; Williams, Mitch A; intel-wired-lan@lists.osuosl.org; > netdev@vger.kernel.org
> Subject: [Intel-wired-lan] [PATCH net-next 2/2] igb: Unpair the queues when     changing the number of queues
> 
> By the commit 72ddef0506da ("igb: Fix oops caused by missing queue
> pairing"), the IGB_FLAG_QUEUE_PAIRS flag can now be set when changing the
> number of queues by "ethtool -L", but it is never cleared unless the igb
> driver is reloaded.
> This patch clears it if queue pairing becomes unnecessary as a result of
> "ethtool -L".
> 
> Signed-off-by: Shota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
> ---
>  drivers/net/ethernet/intel/igb/igb_main.c | 2 ++
>  1 file changed, 2 insertions(+)

Tested-by: Aaron Brown <aaron.f.brown@intel.com>

[Intel-wired-lan] [PATCH net-next 2/2] igb: Unpair the queues when changing the number of queues

[Brown, Aaron F]

> From: Intel-wired-lan [intel-wired-lan-bounces at lists.osuosl.org] on behalf of Shota Suzuki 
> [suzuki_shota_t3 at lab.ntt.co.jp]
> Sent: Friday, December 11, 2015 1:44 AM
> To: Kirsher, Jeffrey T; Brandeburg, Jesse; Nelson, Shannon; Wyborny, Carolyn; Skidmore, Donald C; 
> Ronciak, John; Williams, Mitch A; intel-wired-lan at lists.osuosl.org; > netdev at vger.kernel.org
> Subject: [Intel-wired-lan] [PATCH net-next 2/2] igb: Unpair the queues when     changing the number of queues
> 
> By the commit 72ddef0506da ("igb: Fix oops caused by missing queue
> pairing"), the IGB_FLAG_QUEUE_PAIRS flag can now be set when changing the
> number of queues by "ethtool -L", but it is never cleared unless the igb
> driver is reloaded.
> This patch clears it if queue pairing becomes unnecessary as a result of
> "ethtool -L".
> 
> Signed-off-by: Shota Suzuki <suzuki_shota_t3@lab.ntt.co.jp>
> ---
>  drivers/net/ethernet/intel/igb/igb_main.c | 2 ++
>  1 file changed, 2 insertions(+)

Tested-by: Aaron Brown <aaron.f.brown@intel.com>