Commit 9bc73b91 authored by Martyna Szapar-Mudlaw's avatar Martyna Szapar-Mudlaw Committed by Wen Zhiwei
Browse files

ice: Fix lldp packets dropping after changing the number of channels 

stable inclusion
from stable-v6.6.52
commit d21559e2037e09dbcaff3ad0780ac67021eae4f4
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYXOD

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



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

[ Upstream commit 9debb703e14939dfafa5d403f27c4feb2e9f6501 ]

After vsi setup refactor commit 6624e780 ("ice: split ice_vsi_setup
into smaller functions") ice_cfg_sw_lldp function which removes rx rule
directing LLDP packets to vsi is moved from ice_vsi_release to
ice_vsi_decfg function. ice_vsi_decfg is used in more cases than just in
vsi_release resulting in unnecessary removal of rx lldp packets handling
switch rule. This leads to lldp packets being dropped after a change number
of channels via ethtool.
This patch moves ice_cfg_sw_lldp function that removes rx lldp sw rule back
to ice_vsi_release function.

Fixes: 6624e780 ("ice: split ice_vsi_setup into smaller functions")
Reported-by: default avatarMatěj Grégr <mgregr@netx.as>
Closes: https://lore.kernel.org/intel-wired-lan/1be45a76-90af-4813-824f-8398b69745a9@netx.as/T/#u


Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarMartyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com>
Tested-by: Pucha Himasekhar Reddy <himasekharx.reddy.pucha@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 avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent a5aebc46

drivers/net/ethernet/intel/ice/ice_lib.c

+8 −7
Original line number Diff line number Diff line
@@ -2600,13 +2600,6 @@ void ice_vsi_decfg(struct ice_vsi *vsi) 
	struct ice_pf *pf = vsi->back;

	int err;



	/* The Rx rule will only exist to remove if the LLDP FW

	 * engine is currently stopped

	 */

	if (!ice_is_safe_mode(pf) && vsi->type == ICE_VSI_PF &&

	    !test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags))

		ice_cfg_sw_lldp(vsi, false, false);



	ice_rm_vsi_lan_cfg(vsi->port_info, vsi->idx);

	err = ice_rm_vsi_rdma_cfg(vsi->port_info, vsi->idx);

	if (err)
@@ -2953,6 +2946,14 @@ int ice_vsi_release(struct ice_vsi *vsi) 
		ice_rss_clean(vsi);



	ice_vsi_close(vsi);



	/* The Rx rule will only exist to remove if the LLDP FW

	 * engine is currently stopped

	 */

	if (!ice_is_safe_mode(pf) && vsi->type == ICE_VSI_PF &&

	    !test_bit(ICE_FLAG_FW_LLDP_AGENT, pf->flags))

		ice_cfg_sw_lldp(vsi, false, false);



	ice_vsi_decfg(vsi);



	/* retain SW VSI data structure since it is needed to unregister and