Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22f258a1 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

i40e: use netdev_rss_key_fill() helper 



Use of well known RSS key increases attack surface.
Switch to a random one, using generic helper so that all
ports share a common key.

Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c41a4fba

drivers/net/ethernet/intel/i40e/i40e_main.c

+3 −7
Original line number Diff line number Diff line
@@ -7002,20 +7002,16 @@ static int i40e_setup_misc_vector(struct i40e_pf *pf) 
 **/

static int i40e_config_rss(struct i40e_pf *pf)

{

	/* Set of random keys generated using kernel random number generator */

	static const u32 seed[I40E_PFQF_HKEY_MAX_INDEX + 1] = {0x41b01687,

				0x183cfd8c, 0xce880440, 0x580cbc3c, 0x35897377,

				0x328b25e1, 0x4fa98922, 0xb7d90c14, 0xd5bad70d,

				0xcd15a2c1, 0xe8580225, 0x4a1e9d11, 0xfe5731be};

	u32 rss_key[I40E_PFQF_HKEY_MAX_INDEX + 1];

	struct i40e_hw *hw = &pf->hw;

	u32 lut = 0;

	int i, j;

	u64 hena;

	u32 reg_val;



	/* Fill out hash function seed */

	netdev_rss_key_fill(rss_key, sizeof(rss_key));

	for (i = 0; i <= I40E_PFQF_HKEY_MAX_INDEX; i++)

		wr32(hw, I40E_PFQF_HKEY(i), seed[i]);

		wr32(hw, I40E_PFQF_HKEY(i), rss_key[i]);



	/* By default we enable TCP/UDP with IPv4/IPv6 ptypes */

	hena = (u64)rd32(hw, I40E_PFQF_HENA(0)) |

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+3 −8
Original line number Diff line number Diff line
@@ -1434,18 +1434,12 @@ static int next_queue(struct i40evf_adapter *adapter, int j) 
 **/

static void i40evf_configure_rss(struct i40evf_adapter *adapter)

{

	u32 rss_key[I40E_VFQF_HKEY_MAX_INDEX + 1];

	struct i40e_hw *hw = &adapter->hw;

	u32 lut = 0;

	int i, j;

	u64 hena;



	/* Set of random keys generated using kernel random number generator */

	static const u32 seed[I40E_VFQF_HKEY_MAX_INDEX + 1] = {

			0x794221b4, 0xbca0c5ab, 0x6cd5ebd9, 0x1ada6127,

			0x983b3aa1, 0x1c4e71eb, 0x7f6328b2, 0xfcdc0da0,

			0xc135cafa, 0x7a6f7e2d, 0xe7102d28, 0x163cd12e,

			0x4954b126 };



	/* No RSS for single queue. */

	if (adapter->num_active_queues == 1) {

		wr32(hw, I40E_VFQF_HENA(0), 0);
@@ -1454,8 +1448,9 @@ static void i40evf_configure_rss(struct i40evf_adapter *adapter) 
	}



	/* Hash type is configured by the PF - we just supply the key */

	netdev_rss_key_fill(rss_key, sizeof(rss_key));

	for (i = 0; i <= I40E_VFQF_HKEY_MAX_INDEX; i++)

		wr32(hw, I40E_VFQF_HKEY(i), seed[i]);

		wr32(hw, I40E_VFQF_HKEY(i), rss_key[i]);



	/* Enable PCTYPES for RSS, TCP/UDP with IPv4/IPv6 */

	hena = I40E_DEFAULT_RSS_HENA;