From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Alexander Duyck <alexander.h.duyck@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 09/15] ixgbe: Add support for displaying the number of Tx/Rx channels
Date: Sat, 16 Feb 2013 00:33:30 -0800 [thread overview]
Message-ID: <1361003616-3422-10-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1361003616-3422-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Alexander Duyck <alexander.h.duyck@intel.com>
This patch adds support for the ethtool get_channels operation.
Since the ixgbe driver has to support DCB as well as the other modes the
assumption I made here is that the number of channels in DCB modes refers
to the number of queues per traffic class, not the number of queues total.
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Reviewed-by: John Fastabend <john.r.fastabend@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 72 ++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index db67359..cba27c6 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -2731,6 +2731,77 @@ static int ixgbe_get_ts_info(struct net_device *dev,
return 0;
}
+static unsigned int ixgbe_max_channels(struct ixgbe_adapter *adapter)
+{
+ unsigned int max_combined;
+ u8 tcs = netdev_get_num_tc(adapter->netdev);
+
+ if (!(adapter->flags & IXGBE_FLAG_MSIX_ENABLED)) {
+ /* We only support one q_vector without MSI-X */
+ max_combined = 1;
+ } else if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED) {
+ /* SR-IOV currently only allows one queue on the PF */
+ max_combined = 1;
+ } else if (tcs > 1) {
+ /* For DCB report channels per traffic class */
+ if (adapter->hw.mac.type == ixgbe_mac_82598EB) {
+ /* 8 TC w/ 4 queues per TC */
+ max_combined = 4;
+ } else if (tcs > 4) {
+ /* 8 TC w/ 8 queues per TC */
+ max_combined = 8;
+ } else {
+ /* 4 TC w/ 16 queues per TC */
+ max_combined = 16;
+ }
+ } else if (adapter->atr_sample_rate) {
+ /* support up to 64 queues with ATR */
+ max_combined = IXGBE_MAX_FDIR_INDICES;
+ } else {
+ /* support up to 16 queues with RSS */
+ max_combined = IXGBE_MAX_RSS_INDICES;
+ }
+
+ return max_combined;
+}
+
+static void ixgbe_get_channels(struct net_device *dev,
+ struct ethtool_channels *ch)
+{
+ struct ixgbe_adapter *adapter = netdev_priv(dev);
+
+ /* report maximum channels */
+ ch->max_combined = ixgbe_max_channels(adapter);
+
+ /* report info for other vector */
+ if (adapter->flags & IXGBE_FLAG_MSIX_ENABLED) {
+ ch->max_other = NON_Q_VECTORS;
+ ch->other_count = NON_Q_VECTORS;
+ }
+
+ /* record RSS queues */
+ ch->combined_count = adapter->ring_feature[RING_F_RSS].indices;
+
+ /* nothing else to report if RSS is disabled */
+ if (ch->combined_count == 1)
+ return;
+
+ /* we do not support ATR queueing if SR-IOV is enabled */
+ if (adapter->flags & IXGBE_FLAG_SRIOV_ENABLED)
+ return;
+
+ /* same thing goes for being DCB enabled */
+ if (netdev_get_num_tc(dev) > 1)
+ return;
+
+ /* if ATR is disabled we can exit */
+ if (!adapter->atr_sample_rate)
+ return;
+
+ /* report flow director queues as maximum channels */
+ ch->combined_count = adapter->ring_feature[RING_F_FDIR].indices;
+}
+
static const struct ethtool_ops ixgbe_ethtool_ops = {
.get_settings = ixgbe_get_settings,
.set_settings = ixgbe_set_settings,
@@ -2759,6 +2830,7 @@ static const struct ethtool_ops ixgbe_ethtool_ops = {
.set_coalesce = ixgbe_set_coalesce,
.get_rxnfc = ixgbe_get_rxnfc,
.set_rxnfc = ixgbe_set_rxnfc,
+ .get_channels = ixgbe_get_channels,
.get_ts_info = ixgbe_get_ts_info,
};
--
1.7.11.7
next prev parent reply other threads:[~2013-02-16 8:33 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-16 8:33 [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2013.02.16 Jeff Kirsher
2013-02-16 8:33 ` [net-next 01/15] e1000: fix whitespace issues and multi-line comments Jeff Kirsher
2013-02-16 8:33 ` [net-next 02/15] e1000e: display a warning message when SmartSpeed works Jeff Kirsher
2013-02-16 8:33 ` [net-next 03/15] igbvf: Make next_to_watch a pointer and adjust memory barriers to avoid races Jeff Kirsher
2013-02-16 8:33 ` [net-next 04/15] igb: increase timeout for ethtool offline self-test Jeff Kirsher
2013-02-16 8:33 ` [net-next 05/15] ixgbe: Define FCoE and Flow director limits much sooner to allow for changes Jeff Kirsher
2013-02-16 8:33 ` [net-next 06/15] ixgbe: Add function for setting XPS queue mapping Jeff Kirsher
2013-02-16 8:33 ` [net-next 07/15] ixgbe: Update ixgbe driver to use __netdev_pick_tx in ixgbe_select_queue Jeff Kirsher
2013-02-16 8:33 ` [net-next 08/15] ixgbe: Make ixgbe_setup_tc usable even when DCB is not enabled Jeff Kirsher
2013-02-16 8:33 ` Jeff Kirsher [this message]
2013-02-16 8:33 ` [net-next 10/15] ixgbe: Add support for set_channels ethtool operation Jeff Kirsher
2013-02-16 8:33 ` [net-next 11/15] ixgbe: fix possible data corruption in read_i2c_byte Jeff Kirsher
2013-02-16 8:33 ` [net-next 12/15] ixgbe: cleanup error checking in ixgbe_identify_sfp_module_generic() Jeff Kirsher
2013-02-16 8:33 ` [net-next 13/15] ixgbe: implement SFF diagnostic monitoring via ethtool Jeff Kirsher
2013-02-16 10:53 ` Michał Mirosław
2013-02-17 6:16 ` Tantilov, Emil S
2013-02-17 13:41 ` Michał Mirosław
2013-02-19 22:14 ` Ben Hutchings
2013-02-20 0:26 ` Tantilov, Emil S
2013-02-16 8:33 ` [net-next 14/15] ixgbe: fix Tx timeouts with BQL Jeff Kirsher
2013-02-16 8:33 ` [net-next 15/15] ixgbe: Update DESC_NEEDED define to adjust for changes to MAX_SKB_FRAGS Jeff Kirsher
2013-02-18 17:37 ` [net-next 00/15][pull request] Intel Wired LAN Driver Updates 2013.02.16 David Miller
2013-02-19 18:06 ` Tantilov, Emil S
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=1361003616-3422-10-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=alexander.h.duyck@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sassmann@redhat.com \
/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).