netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: John Fastabend <john.r.fastabend@intel.com>,
	netdev@vger.kernel.org, gospo@redhat.com,
	Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 07/13] ixgbe: setup redirection table for multiple packet buffers
Date: Fri, 10 Jun 2011 20:02:15 -0700	[thread overview]
Message-ID: <1307761341-5267-8-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1307761341-5267-1-git-send-email-jeffrey.t.kirsher@intel.com>

From: John Fastabend <john.r.fastabend@intel.com>

Setup RSS redirection table to be compatible with multiple packet
buffers. Currently, this works on 82599 devices because the RSS
redirection index is masked by the number of queues per packet
buffer.

This sets the cap on the RSS table to maxq.

Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Tested-by: Ross Brattain <ross.b.brattain@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
 drivers/net/ixgbe/ixgbe_main.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index f829d36..e81dc85 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -2939,6 +2939,10 @@ static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)
 	u32 rxcsum;
 	int i, j;
 	u8 tcs = netdev_get_num_tc(adapter->netdev);
+	int maxq = adapter->ring_feature[RING_F_RSS].indices;
+
+	if (tcs)
+		maxq = min(maxq, adapter->num_tx_queues / tcs);
 
 	/* Fill out hash function seeds */
 	for (i = 0; i < 10; i++)
@@ -2946,7 +2950,7 @@ static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)
 
 	/* Fill out redirection table */
 	for (i = 0, j = 0; i < 128; i++, j++) {
-		if (j == adapter->ring_feature[RING_F_RSS].indices)
+		if (j == maxq)
 			j = 0;
 		/* reta = 4-byte sliding window of
 		 * 0x00..(indices-1)(indices-1)00..etc. */
-- 
1.7.5.2


  parent reply	other threads:[~2011-06-11  3:02 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-11  3:02 [net-next 00/13][pull request] Intel Wired LAN Driver Update Jeff Kirsher
2011-06-11  3:02 ` [net-next 01/13] ixgbe: dcbnl reduce duplicated code and indentation Jeff Kirsher
2011-06-11  3:02 ` [net-next 02/13] ixgbe: consolidate packet buffer allocation Jeff Kirsher
2011-06-11  3:02 ` [net-next 03/13] ixgbe: consolidate MRQC and MTQC handling Jeff Kirsher
2011-06-11  3:02 ` [net-next 04/13] ixgbe: configure minimal packet buffers to support TC Jeff Kirsher
2011-06-11  3:02 ` [net-next 05/13] ixgbe: DCB use existing TX and RX queues Jeff Kirsher
2011-06-11  3:02 ` [net-next 06/13] ixgbe: DCB 82598 devices, tx_idx and rx_idx swapped Jeff Kirsher
2011-06-11  3:02 ` Jeff Kirsher [this message]
2011-06-11  3:02 ` [net-next 08/13] ixgbe: fix bit mask for DCB version Jeff Kirsher
2011-06-11  3:02 ` [net-next 09/13] ixgbe: DCB and perfect filters can coexist Jeff Kirsher
2011-06-11  3:02 ` [net-next 10/13] ixgbe: DCB, remove unneeded ixgbe_dcb_txq_to_tc() routine Jeff Kirsher
2011-06-11  3:02 ` [net-next 11/13] ixgbe: add support for Dell CEM Jeff Kirsher
2011-06-11  3:02 ` [net-next 12/13] ixgbe: setup per CPU PCI pool for FCoE DDP Jeff Kirsher
2011-06-11  3:02 ` [net-next 13/13] ixgbe: use per NUMA node lock " Jeff Kirsher
2011-06-11  5:18   ` Eric Dumazet
2011-06-11  5:42     ` Eric Dumazet
2011-06-12  2:00       ` David Miller
2011-06-13 23:59       ` Vasu Dev
2011-06-14  0:02     ` Vasu Dev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1307761341-5267-8-git-send-email-jeffrey.t.kirsher@intel.com \
    --to=jeffrey.t.kirsher@intel.com \
    --cc=davem@davemloft.net \
    --cc=gospo@redhat.com \
    --cc=john.r.fastabend@intel.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).