ixgbe: Check for RSS key before setting value
Subsystems (2)
Tony Nguyen
maintainerPATCH v2 1/3 ixgbe: Check for RSS key before setting value
The RSS key is being repopulated every time the interface is brought up regardless of whether there is an existing value. If the user sets the RSS key and the interface is brought up (e.g. reset), the user specified RSS key will be overwritten.
This patch changes the rss_key to a pointer so we can check to see if the key has been populated and preserve it accordingly.
--- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 +--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 30 ++++++++++++++++++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- 4 files changed, 31 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe.h +1 -1
@@ -769,7 +769,7 @@ struct ixgbe_adapter {u8 rss_indir_tbl[IXGBE_MAX_RETA_ENTRIES ];#define IXGBE_RSS_KEY_SIZE 40/* size of RSS Hash Key in bytes */ -u32 rss_key[IXGBE_RSS_KEY_SIZE /sizeof (u32)]; +u32 *rss_key; };static inline u8 ixgbe_max_rss_indices (struct ixgbe_adapter *adapter)
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +1 -3
@@ -2967,9 +2967,7 @@ static int ixgbe_rss_indir_tbl_max(struct ixgbe_adapter *adapter)static u32 ixgbe_get_rxfh_key_size (struct net_device *netdev) { -struct ixgbe_adapter *adapter =netdev_priv (netdev); - -return sizeof (adapter->rss_key); +return IXGBE_RSS_KEY_SIZE ; }static u32 ixgbe_rss_indir_size (struct net_device *netdev)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +28 -2
@@ -3638,6 +3638,28 @@ void ixgbe_store_key(struct ixgbe_adapter *adapter) }/** +* ixgbe_init_rss_key - Initialize adapter RSS key +* @adapter: device handle +* +* Allocates and initializes the RSS key if it is not allocated. +**/ +static inline int ixgbe_init_rss_key (struct ixgbe_adapter *adapter) +{ +u32 *rss_key; + +if (!adapter->rss_key) { + rss_key =kzalloc (IXGBE_RSS_KEY_SIZE ,GFP_KERNEL ); +if (unlikely (!rss_key)) +return -ENOMEM ; + +netdev_rss_key_fill (rss_key,IXGBE_RSS_KEY_SIZE ); + adapter->rss_key = rss_key; + } + +return 0 ; +} + +/** * ixgbe_store_reta - Write the RETA table to HW * @adapter: device handle *
@@ -3739,7 +3761,7 @@ static void ixgbe_setup_vfreta(struct ixgbe_adapter *adapter)/* Fill out hash function seeds */ for (i =0 ; i <10 ; i++)IXGBE_WRITE_REG (hw,IXGBE_PFVFRSSRK (i, pf_pool), - adapter->rss_key[i]); + *(adapter->rss_key + i));/* Fill out the redirection table */ for (i =0 , j =0 ; i <64 ; i++, j++) {
@@ -3800,7 +3822,6 @@ static void ixgbe_setup_mrqc(struct ixgbe_adapter *adapter)if (adapter->flags2 &IXGBE_FLAG2_RSS_FIELD_IPV6_UDP ) rss_field |=IXGBE_MRQC_RSS_FIELD_IPV6_UDP ; -netdev_rss_key_fill (adapter->rss_key,sizeof (adapter->rss_key));if ((hw->mac.type >= ixgbe_mac_X550) && (adapter->flags &IXGBE_FLAG_SRIOV_ENABLED )) {unsigned int pf_pool = adapter->num_vfs;
@@ -6014,6 +6035,9 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter,if (!adapter->mac_table)return -ENOMEM ; +if (ixgbe_init_rss_key (adapter)) +return -ENOMEM ; +/* Set MAC specific capability flags and exceptions */ switch (hw->mac.type) {case ixgbe_mac_82598EB:
@@ -10400,6 +10424,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)iounmap (adapter->io_addr);kfree (adapter->jump_tables[0 ]);kfree (adapter->mac_table); +kfree (adapter->rss_key); err_ioremap: disable_dev = !test_and_set_bit (__IXGBE_DISABLED, &adapter->state);free_netdev (netdev);
@@ -10484,6 +10509,7 @@ static void ixgbe_remove(struct pci_dev *pdev) }kfree (adapter->mac_table); +kfree (adapter->rss_key); disable_dev = !test_and_set_bit (__IXGBE_DISABLED, &adapter->state);free_netdev (netdev);
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c +1 -1
@@ -1113,7 +1113,7 @@ static int ixgbe_get_vf_rss_key(struct ixgbe_adapter *adapter,return -EOPNOTSUPP ; } -memcpy (rss_key, adapter->rss_key,sizeof (adapter->rss_key)); +memcpy (rss_key, adapter->rss_key,IXGBE_RSS_KEY_SIZE );return 0 ; }
Signature · 1 line
2.9.3
Tony Nguyen
maintainerPATCH v2 2/3 ixgbevf: Fix errors in retrieving RETA and RSS from PF
Mailbox support for getting RETA and RSS is available for only 82599 and x540; a previous patch reversed the logic and these adapters were returning not supported.
Also, the NACK check in ixgbevf_get_rss_key_locked() was checking for the command IXGBE_VF_GET_RETA instead of IXGBE_VF_GET_RSS_KEY.
This patch corrects both issues by correcting the logic and checking for the right command.
--- drivers/net/ethernet/intel/ixgbevf/vf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/ethernet/intel/ixgbevf/vf.c +3 -3
@@ -333,7 +333,7 @@ int ixgbevf_get_reta_locked(struct ixgbe_hw *hw, u32 *reta, int num_rx_queues)switch (hw->api_version) {case ixgbe_mbox_api_13:case ixgbe_mbox_api_12: -if (hw->mac.type >= ixgbe_mac_X550_vf) +if (hw->mac.type < ixgbe_mac_X550_vf)break ;default :return -EOPNOTSUPP ;
@@ -399,7 +399,7 @@ int ixgbevf_get_rss_key_locked(struct ixgbe_hw *hw, u8 *rss_key)switch (hw->api_version) {case ixgbe_mbox_api_13:case ixgbe_mbox_api_12: -if (hw->mac.type >= ixgbe_mac_X550_vf) +if (hw->mac.type < ixgbe_mac_X550_vf)break ;default :return -EOPNOTSUPP ;
@@ -419,7 +419,7 @@ int ixgbevf_get_rss_key_locked(struct ixgbe_hw *hw, u8 *rss_key) msgbuf[0 ] &= ~IXGBE_VT_MSGTYPE_CTS ;/* If the operation has been refused by a PF return -EPERM */ -if (msgbuf[0 ] == (IXGBE_VF_GET_RETA |IXGBE_VT_MSGTYPE_NACK )) +if (msgbuf[0 ] == (IXGBE_VF_GET_RSS_KEY |IXGBE_VT_MSGTYPE_NACK ))return -EPERM ;/* If we didn't get an ACK there must have been
Signature · 1 line
2.9.3
Bowers
PATCH v2 2/3 ixgbevf: Fix errors in retrieving RETA and RSS from PF
Quoted 15 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, April 13, 2017 7:26 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v2 2/3] ixgbevf: Fix errors in retrieving RETA and RSS from PFMailbox support for getting RETA and RSS is available for only 82599 and x540; a previous patch reversed the logic and these adapters were returning not supported.
Also, the NACK check in
ixgbevf_get_rss_key_locked()was checking for the commandIXGBE_VF_GET_RETAinstead ofIXGBE_VF_GET_RSS_KEY.
Quoted 7 lines
This patch corrects both issues by correcting the logic and checking for the right command.
Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ixgbevf/vf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Tony Nguyen
maintainerPATCH v2 3/3 ixgbevf: Check for RSS key before setting value
In reply to Tony NguyenThe RSS key is being repopulated every time the interface is brought up regardless of whether there is an existing value. If the user sets the RSS key and the interface is brought up (e.g. reset), the user specified RSS key will be overwritten.
This patch changes the rss_key to a pointer so we can check to see if the key has been populated and preserve it accordingly.
---
v2: Changed return type for ixgbevf_init_rss_key() from bool to int since it can return -ENOMEM.
drivers/net/ethernet/intel/ixgbevf/ethtool.c | 3 ++- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 33 +++++++++++++++++++++-- 3 files changed, 34 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbevf/ethtool.c +2 -1
@@ -855,7 +855,8 @@ static int ixgbevf_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key,if (adapter->hw.mac.type >= ixgbe_mac_X550_vf) {if (key) -memcpy (key, adapter->rss_key,sizeof (adapter->rss_key)); +memcpy (key, adapter->rss_key, +ixgbevf_get_rxfh_key_size (netdev));if (indir) {int i;
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h +1 -1
@@ -319,7 +319,7 @@ struct ixgbevf_adapter {spinlock_t mbx_lock;unsigned long last_reset; -u32 rss_key[IXGBEVF_VFRSSRK_REGS ]; +u32 *rss_key;u8 rss_indir_tbl[IXGBEVF_X550_VFRETA_SIZE ]; };
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +31 -2
@@ -1661,6 +1661,28 @@ static void ixgbevf_rx_desc_queue_enable(struct ixgbevf_adapter *adapter, reg_idx); } +/** +* ixgbevf_init_rss_key - Initialize adapter RSS key +* @adapter: device handle +* +* Allocates and initializes the RSS key if it is not allocated. +**/ +static inline int ixgbevf_init_rss_key (struct ixgbevf_adapter *adapter) +{ +u32 *rss_key; + +if (!adapter->rss_key) { + rss_key =kzalloc (IXGBEVF_RSS_HASH_KEY_SIZE ,GFP_KERNEL ); +if (unlikely (!rss_key)) +return -ENOMEM ; + +netdev_rss_key_fill (rss_key,IXGBEVF_RSS_HASH_KEY_SIZE ); + adapter->rss_key = rss_key; + } + +return 0 ; +} +static void ixgbevf_setup_vfmrqc (struct ixgbevf_adapter *adapter) {struct ixgbe_hw *hw = &adapter->hw;
@@ -1669,9 +1691,8 @@ static void ixgbevf_setup_vfmrqc(struct ixgbevf_adapter *adapter)u8 i, j;/* Fill out hash function seeds */ -netdev_rss_key_fill (adapter->rss_key,sizeof (adapter->rss_key));for (i =0 ; i <IXGBEVF_VFRSSRK_REGS ; i++) -IXGBE_WRITE_REG (hw,IXGBE_VFRSSRK (i), adapter->rss_key[i]); +IXGBE_WRITE_REG (hw,IXGBE_VFRSSRK (i), *(adapter->rss_key + i));for (i =0 , j =0 ; i <IXGBEVF_X550_VFRETA_SIZE ; i++, j++) {if (j == rss_i)
@@ -2612,6 +2633,12 @@ static int ixgbevf_sw_init(struct ixgbevf_adapter *adapter) hw->mbx.ops.init_params (hw); +if (hw->mac.type >= ixgbe_mac_X550_vf) { + err =ixgbevf_init_rss_key (adapter); +if (err) + goto out; + } +/* assume legacy case in which PF would only give VF 2 queues */ hw->mac.max_tx_queues =2 ; hw->mac.max_rx_queues =2 ;
@@ -4142,6 +4169,7 @@ static int ixgbevf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err_sw_init:ixgbevf_reset_interrupt_capability (adapter);iounmap (adapter->io_addr); +kfree (adapter->rss_key); err_ioremap: disable_dev = !test_and_set_bit (__IXGBEVF_DISABLED, &adapter->state);free_netdev (netdev);
@@ -4188,6 +4216,7 @@ static void ixgbevf_remove(struct pci_dev *pdev)hw_dbg (&adapter->hw,"Remove complete\n" ); +kfree (adapter->rss_key); disable_dev = !test_and_set_bit (__IXGBEVF_DISABLED, &adapter->state);free_netdev (netdev);
Signature · 1 line
2.9.3
Bowers
PATCH v2 3/3 ixgbevf: Check for RSS key before setting value
Quoted 19 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, April 13, 2017 7:26 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v2 3/3] ixgbevf: Check for RSS key before setting valueThe RSS key is being repopulated every time the interface is brought up regardless of whether there is an existing value. If the user sets the RSS key and the interface is brought up (e.g. reset), the user specified RSS key will be overwritten.
This patch changes the
rss_keyto a pointer so we can check to see if the key has been populated and preserve it accordingly.Signed-off-by Tony Nguyen <[email protected]>---
Quoted 8 lines
v2: Changed return type for
ixgbevf_init_rss_key()from bool to int since it can return-ENOMEM.drivers/net/ethernet/intel/ixgbevf/ethtool.c | 3 ++- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 33 +++++++++++++++++++++-- 3 files changed, 34 insertions(+), 4 deletions(-)
Bowers
PATCH v2 1/3 ixgbe: Check for RSS key before setting value
In reply to Tony NguyenQuoted 16 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Tony Nguyen
Sent: Thursday, April 13, 2017 7:26 AM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v2 1/3] ixgbe: Check for RSS key before setting valueThe RSS key is being repopulated every time the interface is brought up regardless of whether there is an existing value. If the user sets the RSS key and the interface is brought up (e.g. reset), the user specified RSS key will be overwritten.
This patch changes the
rss_keyto a pointer so we can check to see if the key has been populated and preserve it accordingly.
Quoted 8 lines
Signed-off-by Tony Nguyen <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 4 +--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 30 ++++++++++++++++++++++-- drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 2 +- 4 files changed, 31 insertions(+), 7 deletions(-)