Commit 2a4db7ec authored by Slawomir Laba's avatar Slawomir Laba Committed by Lipeng Sang
Browse files

i40e: Fix ethtool rx-flow-hash setting for X722 

stable inclusion
from stable-v5.10.153
commit 23d5599058a060793a862b47d29edc87364e50f9
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I64YCA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=23d5599058a060793a862b47d29edc87364e50f9



--------------------------------

[ Upstream commit 54b5af5a ]

When enabling flow type for RSS hash via ethtool:

ethtool -N $pf rx-flow-hash tcp4|tcp6|udp4|udp6 s|d

the driver would fail to setup this setting on X722
device since it was using the mask on the register
dedicated for X710 devices.

Apply a different mask on the register when setting the
RSS hash for the X722 device.

When displaying the flow types enabled via ethtool:

ethtool -n $pf rx-flow-hash tcp4|tcp6|udp4|udp6

the driver would print wrong values for X722 device.

Fix this issue by testing masks for X722 device in
i40e_get_rss_hash_opts function.

Fixes: eb0dd6e4 ("i40e: Allow RSS Hash set with less than four parameters")
Signed-off-by: default avatarSlawomir Laba <slawomirx.laba@intel.com>
Signed-off-by: default avatarMichal Jaron <michalx.jaron@intel.com>
Signed-off-by: default avatarMateusz Palczewski <mateusz.palczewski@intel.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20221024100526.1874914-1-jacob.e.keller@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLipeng Sang <sanglipeng1@jd.com>
parent 556e035b

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

+23 −8
Original line number Diff line number Diff line
@@ -3095,10 +3095,17 @@ static int i40e_get_rss_hash_opts(struct i40e_pf *pf, struct ethtool_rxnfc *cmd) 


		if (cmd->flow_type == TCP_V4_FLOW ||

		    cmd->flow_type == UDP_V4_FLOW) {

			if (hw->mac.type == I40E_MAC_X722) {

				if (i_set & I40E_X722_L3_SRC_MASK)

					cmd->data |= RXH_IP_SRC;

				if (i_set & I40E_X722_L3_DST_MASK)

					cmd->data |= RXH_IP_DST;

			} else {

				if (i_set & I40E_L3_SRC_MASK)

					cmd->data |= RXH_IP_SRC;

				if (i_set & I40E_L3_DST_MASK)

					cmd->data |= RXH_IP_DST;

			}

		} else if (cmd->flow_type == TCP_V6_FLOW ||

			  cmd->flow_type == UDP_V6_FLOW) {

			if (i_set & I40E_L3_V6_SRC_MASK)
@@ -3405,12 +3412,15 @@ static int i40e_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, 


/**

 * i40e_get_rss_hash_bits - Read RSS Hash bits from register

 * @hw: hw structure

 * @nfc: pointer to user request

 * @i_setc: bits currently set

 *

 * Returns value of bits to be set per user request

 **/

static u64 i40e_get_rss_hash_bits(struct ethtool_rxnfc *nfc, u64 i_setc)

static u64 i40e_get_rss_hash_bits(struct i40e_hw *hw,

				  struct ethtool_rxnfc *nfc,

				  u64 i_setc)

{

	u64 i_set = i_setc;

	u64 src_l3 = 0, dst_l3 = 0;
@@ -3429,8 +3439,13 @@ static u64 i40e_get_rss_hash_bits(struct ethtool_rxnfc *nfc, u64 i_setc) 
		dst_l3 = I40E_L3_V6_DST_MASK;

	} else if (nfc->flow_type == TCP_V4_FLOW ||

		  nfc->flow_type == UDP_V4_FLOW) {

		if (hw->mac.type == I40E_MAC_X722) {

			src_l3 = I40E_X722_L3_SRC_MASK;

			dst_l3 = I40E_X722_L3_DST_MASK;

		} else {

			src_l3 = I40E_L3_SRC_MASK;

			dst_l3 = I40E_L3_DST_MASK;

		}

	} else {

		/* Any other flow type are not supported here */

		return i_set;
@@ -3545,7 +3560,7 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc) 
					       flow_pctype)) |

			((u64)i40e_read_rx_ctl(hw, I40E_GLQF_HASH_INSET(1,

					       flow_pctype)) << 32);

		i_set = i40e_get_rss_hash_bits(nfc, i_setc);

		i_set = i40e_get_rss_hash_bits(&pf->hw, nfc, i_setc);

		i40e_write_rx_ctl(hw, I40E_GLQF_HASH_INSET(0, flow_pctype),

				  (u32)i_set);

		i40e_write_rx_ctl(hw, I40E_GLQF_HASH_INSET(1, flow_pctype),

drivers/net/ethernet/intel/i40e/i40e_type.h

+4 −0
Original line number Diff line number Diff line
@@ -1404,6 +1404,10 @@ struct i40e_lldp_variables { 
#define I40E_PFQF_CTL_0_HASHLUTSIZE_512	0x00010000



/* INPUT SET MASK for RSS, flow director, and flexible payload */

#define I40E_X722_L3_SRC_SHIFT		49

#define I40E_X722_L3_SRC_MASK		(0x3ULL << I40E_X722_L3_SRC_SHIFT)

#define I40E_X722_L3_DST_SHIFT		41

#define I40E_X722_L3_DST_MASK		(0x3ULL << I40E_X722_L3_DST_SHIFT)

#define I40E_L3_SRC_SHIFT		47

#define I40E_L3_SRC_MASK		(0x3ULL << I40E_L3_SRC_SHIFT)

#define I40E_L3_V6_SRC_SHIFT		43