From: Shannon Nelson <snelson@pensando.io>
To: netdev@vger.kernel.org, davem@davemloft.net
Cc: Shannon Nelson <snelson@pensando.io>
Subject: [PATCH v3 net-next 5/8] ionic: support ethtool rxhash disable
Date: Wed, 4 Mar 2020 21:23:16 -0800 [thread overview]
Message-ID: <20200305052319.14682-6-snelson@pensando.io> (raw)
In-Reply-To: <20200305052319.14682-1-snelson@pensando.io>
We can disable rxhashing by setting rss_types to 0. The user
can toggle this with "ethtool -K <ethX> rxhash off|on",
which calls into the .ndo_set_features callback with the
NETIF_F_RXHASH feature bit set or cleared. This patch adds
a check for that bit and updates the FW if necessary.
Signed-off-by: Shannon Nelson <snelson@pensando.io>
---
drivers/net/ethernet/pensando/ionic/ionic_lif.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
index d1567e477b1f..4b953f9e9084 100644
--- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c
+++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -1094,6 +1094,7 @@ static int ionic_set_nic_features(struct ionic_lif *lif,
u64 vlan_flags = IONIC_ETH_HW_VLAN_TX_TAG |
IONIC_ETH_HW_VLAN_RX_STRIP |
IONIC_ETH_HW_VLAN_RX_FILTER;
+ u64 old_hw_features;
int err;
ctx.cmd.lif_setattr.features = ionic_netdev_features_to_nic(features);
@@ -1101,9 +1102,13 @@ static int ionic_set_nic_features(struct ionic_lif *lif,
if (err)
return err;
+ old_hw_features = lif->hw_features;
lif->hw_features = le64_to_cpu(ctx.cmd.lif_setattr.features &
ctx.comp.lif_setattr.features);
+ if ((old_hw_features ^ lif->hw_features) & IONIC_ETH_HW_RX_HASH)
+ ionic_lif_rss_config(lif, lif->rss_types, NULL, NULL);
+
if ((vlan_flags & features) &&
!(vlan_flags & le64_to_cpu(ctx.comp.lif_setattr.features)))
dev_info_once(lif->ionic->dev, "NIC is not supporting vlan offload, likely in SmartNIC mode\n");
@@ -1357,13 +1362,15 @@ int ionic_lif_rss_config(struct ionic_lif *lif, const u16 types,
.cmd.lif_setattr = {
.opcode = IONIC_CMD_LIF_SETATTR,
.attr = IONIC_LIF_ATTR_RSS,
- .rss.types = cpu_to_le16(types),
.rss.addr = cpu_to_le64(lif->rss_ind_tbl_pa),
},
};
unsigned int i, tbl_sz;
- lif->rss_types = types;
+ if (lif->hw_features & IONIC_ETH_HW_RX_HASH) {
+ lif->rss_types = types;
+ ctx.cmd.lif_setattr.rss.types = cpu_to_le16(types);
+ }
if (key)
memcpy(lif->rss_hash_key, key, IONIC_RSS_HASH_KEY_SIZE);
--
2.17.1
next prev parent reply other threads:[~2020-03-05 5:23 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-05 5:23 [PATCH v3 net-next 0/8] ionic updates Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 1/8] ionic: keep ionic dev on lif init fail Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 2/8] ionic: remove pragma packed Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 3/8] ionic: improve irq numa locality Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 4/8] ionic: clean up bitflag usage Shannon Nelson
2020-03-05 5:23 ` Shannon Nelson [this message]
2020-03-05 5:23 ` [PATCH v3 net-next 6/8] ionic: print pci bus lane info Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 7/8] ionic: add support for device id 0x1004 Shannon Nelson
2020-03-05 22:03 ` Jakub Kicinski
2020-03-06 0:41 ` Shannon Nelson
2020-03-06 1:18 ` Jakub Kicinski
2020-03-06 7:43 ` Shannon Nelson
2020-03-06 18:20 ` Jakub Kicinski
2020-03-06 20:32 ` Shannon Nelson
2020-03-06 21:28 ` Jakub Kicinski
2020-03-06 22:57 ` Shannon Nelson
2020-03-05 5:23 ` [PATCH v3 net-next 8/8] ionic: drop ethtool driver version Shannon Nelson
2020-03-05 6:10 ` Leon Romanovsky
2020-03-05 7:20 ` Shannon Nelson
2020-03-05 7:52 ` Leon Romanovsky
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=20200305052319.14682-6-snelson@pensando.io \
--to=snelson@pensando.io \
--cc=davem@davemloft.net \
--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).