From: Vlad Zolotarov <vladz@cloudius-systems.com>
To: netdev@vger.kernel.org
Cc: jeffrey.t.kirsher@intel.com, intel-wired-lan@lists.osuosl.org,
avi@cloudius-systems.com, gleb@cloudius-systems.com,
Vlad Zolotarov <vladz@cloudius-systems.com>
Subject: [PATCH net-next v10 7/7] ixgbevf: Add the appropriate ethtool ops to query RSS indirection table and key
Date: Mon, 30 Mar 2015 21:35:29 +0300 [thread overview]
Message-ID: <1427740529-9605-8-git-send-email-vladz@cloudius-systems.com> (raw)
In-Reply-To: <1427740529-9605-1-git-send-email-vladz@cloudius-systems.com>
Added get_rxfh_indir_size, get_rxfh_key_size and get_rxfh ethtool_ops callbacks
implementations.
This enables the ethtool's "-x" and "--show-rxfh[-indir]" options for VF devices.
This patch adds the support for 82599 and x540 devices only. Support for other
devices will be added later.
Signed-off-by: Vlad Zolotarov <vladz@cloudius-systems.com>
---
New in v10:
- Move the mailbox locks outside the vf.c functions.
- Use IXGBEVF_82599_RETA_SIZE macro.
New in v9:
- Use IXGBEVF_RSS_HASH_KEY_SIZE macro.
New in v6:
- Added a required get_rxnfc callback to ixgbevf_ethtool_ops.
New in v4:
- Removed not needed braces in if-statement in ixgbevf_get_rxfh_indir_size().
New in v3:
- Added a proper support for x550 devices: return the correct redirection table size.
New in v2:
- Added a detailed description to the patch.
---
drivers/net/ethernet/intel/ixgbevf/ethtool.c | 69 ++++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/drivers/net/ethernet/intel/ixgbevf/ethtool.c b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
index e83c85b..b2f5b16 100644
--- a/drivers/net/ethernet/intel/ixgbevf/ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbevf/ethtool.c
@@ -794,6 +794,71 @@ static int ixgbevf_set_coalesce(struct net_device *netdev,
return 0;
}
+static int ixgbevf_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info,
+ u32 *rules __always_unused)
+{
+ struct ixgbevf_adapter *adapter = netdev_priv(dev);
+
+ switch (info->cmd) {
+ case ETHTOOL_GRXRINGS:
+ info->data = adapter->num_rx_queues;
+ return 0;
+ default:
+ hw_dbg(&adapter->hw, "Command parameters not supported\n");
+ return -EOPNOTSUPP;
+ }
+}
+
+static u32 ixgbevf_get_rxfh_indir_size(struct net_device *netdev)
+{
+ struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+ /* We support this operation only for 82599 and x540 at the moment */
+ if (adapter->hw.mac.type < ixgbe_mac_X550_vf)
+ return IXGBEVF_82599_RETA_SIZE;
+
+ return 0;
+}
+
+static u32 ixgbevf_get_rxfh_key_size(struct net_device *netdev)
+{
+ struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+
+ /* We support this operation only for 82599 and x540 at the moment */
+ if (adapter->hw.mac.type < ixgbe_mac_X550_vf)
+ return IXGBEVF_RSS_HASH_KEY_SIZE;
+
+ return 0;
+}
+
+static int ixgbevf_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,
+ u8 *hfunc)
+{
+ struct ixgbevf_adapter *adapter = netdev_priv(netdev);
+ int err = 0;
+
+ if (hfunc)
+ *hfunc = ETH_RSS_HASH_TOP;
+
+ /* If neither indirection table nor hash key was requested - just
+ * return a success avoiding taking any locks.
+ */
+ if (!indir && !key)
+ return 0;
+
+ spin_lock_bh(&adapter->mbx_lock);
+ if (indir)
+ err = ixgbevf_get_reta_locked(&adapter->hw, indir,
+ adapter->num_rx_queues);
+
+ if (!err && key)
+ err = ixgbevf_get_rss_key_locked(&adapter->hw, key);
+
+ spin_unlock_bh(&adapter->mbx_lock);
+
+ return err;
+}
+
static const struct ethtool_ops ixgbevf_ethtool_ops = {
.get_settings = ixgbevf_get_settings,
.get_drvinfo = ixgbevf_get_drvinfo,
@@ -811,6 +876,10 @@ static const struct ethtool_ops ixgbevf_ethtool_ops = {
.get_ethtool_stats = ixgbevf_get_ethtool_stats,
.get_coalesce = ixgbevf_get_coalesce,
.set_coalesce = ixgbevf_set_coalesce,
+ .get_rxnfc = ixgbevf_get_rxnfc,
+ .get_rxfh_indir_size = ixgbevf_get_rxfh_indir_size,
+ .get_rxfh_key_size = ixgbevf_get_rxfh_key_size,
+ .get_rxfh = ixgbevf_get_rxfh,
};
void ixgbevf_set_ethtool_ops(struct net_device *netdev)
--
2.1.0
next prev parent reply other threads:[~2015-03-30 18:35 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-30 18:35 [PATCH net-next v10 0/7]: ixgbevf: Allow querying VFs RSS indirection table and key Vlad Zolotarov
2015-03-30 18:35 ` [PATCH net-next v10 1/7] if_link: Add an additional parameter to ifla_vf_info for RSS querying Vlad Zolotarov
2015-03-31 7:34 ` Jeff Kirsher
2015-04-10 23:12 ` [Intel-wired-lan] " Schmitt, Phillip J
2015-03-30 18:35 ` [PATCH net-next v10 2/7] ixgbe: Add a new netdev op to allow/prevent a VF from querying an RSS info Vlad Zolotarov
2015-03-31 7:35 ` Jeff Kirsher
2015-04-10 23:12 ` [Intel-wired-lan] " Schmitt, Phillip J
2015-03-30 18:35 ` [PATCH net-next v10 3/7] ixgbe: Add a RETA query command to VF-PF channel API Vlad Zolotarov
2015-03-31 7:35 ` Jeff Kirsher
2015-03-31 23:55 ` [Intel-wired-lan] " Tantilov, Emil S
2015-04-01 7:29 ` Vlad Zolotarov
2015-04-01 7:33 ` Jeff Kirsher
2015-03-30 18:35 ` [PATCH net-next v10 4/7] ixgbevf: Add a RETA query code Vlad Zolotarov
2015-03-31 7:35 ` Jeff Kirsher
2015-04-10 23:12 ` [Intel-wired-lan] " Schmitt, Phillip J
2015-03-30 18:35 ` [PATCH net-next v10 5/7] ixgbe: Add GET_RSS_KEY command to VF-PF channel commands set Vlad Zolotarov
2015-03-31 7:35 ` Jeff Kirsher
2015-04-10 23:12 ` [Intel-wired-lan] " Schmitt, Phillip J
2015-03-30 18:35 ` [PATCH net-next v10 6/7] ixgbevf: Add RSS Key query code Vlad Zolotarov
2015-03-31 7:36 ` Jeff Kirsher
2015-04-10 23:12 ` [Intel-wired-lan] " Schmitt, Phillip J
2015-03-30 18:35 ` Vlad Zolotarov [this message]
2015-03-31 7:36 ` [PATCH net-next v10 7/7] ixgbevf: Add the appropriate ethtool ops to query RSS indirection table and key Jeff Kirsher
2015-04-10 23:12 ` [Intel-wired-lan] " Schmitt, Phillip J
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=1427740529-9605-8-git-send-email-vladz@cloudius-systems.com \
--to=vladz@cloudius-systems.com \
--cc=avi@cloudius-systems.com \
--cc=gleb@cloudius-systems.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=jeffrey.t.kirsher@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).