Commit 3ac3e6ea authored by Michal Jaron's avatar Michal Jaron Committed by sanglipeng
Browse files

i40e: Fix not setting default xps_cpus after reset 

stable inclusion
from stable-v5.10.159
commit 215f3ac53b18515aea136aa6934ff98c271ed322
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I7NTXH

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



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

[ Upstream commit 82e0572b ]

During tx rings configuration default XPS queue config is set and
__I40E_TX_XPS_INIT_DONE is locked. __I40E_TX_XPS_INIT_DONE state is
cleared and set again with default mapping only during queues build,
it means after first setup or reset with queues rebuild. (i.e.
ethtool -L <interface> combined <number>) After other resets (i.e.
ethtool -t <interface>) XPS_INIT_DONE is not cleared and those default
maps cannot be set again. It results in cleared xps_cpus mapping
until queues are not rebuild or mapping is not set by user.

Add clearing __I40E_TX_XPS_INIT_DONE state during reset to let
the driver set xps_cpus to defaults again after it was cleared.

Fixes: 6f853d4f ("i40e: allow XPS with QoS enabled")
Signed-off-by: default avatarMichal Jaron <michalx.jaron@intel.com>
Signed-off-by: default avatarKamil Maziarz <kamil.maziarz@intel.com>
Tested-by: Gurucharan <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 423d33d0

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

+18 −1
Original line number Diff line number Diff line
@@ -10065,6 +10065,21 @@ static int i40e_rebuild_channels(struct i40e_vsi *vsi) 
	return 0;

}



/**

 * i40e_clean_xps_state - clean xps state for every tx_ring

 * @vsi: ptr to the VSI

 **/

static void i40e_clean_xps_state(struct i40e_vsi *vsi)

{

	int i;



	if (vsi->tx_rings)

		for (i = 0; i < vsi->num_queue_pairs; i++)

			if (vsi->tx_rings[i])

				clear_bit(__I40E_TX_XPS_INIT_DONE,

					  vsi->tx_rings[i]->state);

}



/**

 * i40e_prep_for_reset - prep for the core to reset

 * @pf: board private structure
@@ -10096,9 +10111,11 @@ static void i40e_prep_for_reset(struct i40e_pf *pf, bool lock_acquired) 
		rtnl_unlock();



	for (v = 0; v < pf->num_alloc_vsi; v++) {

		if (pf->vsi[v])

		if (pf->vsi[v]) {

			i40e_clean_xps_state(pf->vsi[v]);

			pf->vsi[v]->seid = 0;

		}

	}



	i40e_shutdown_adminq(&pf->hw);