ice: Fix napi delete calls for remove (25525b69) · Commits · 戴 / test

In the remove path, the vsi->netdev is being set to NULL before the call to free vectors. This is causing the netif_napi_del call to never be made. Add a call to ice_napi_del to the same location as the calls to unregister_netdev and just prior to them. This will use the reverse flow as the register and netif_napi_add calls. Signed-off-by:

Dave Ertman <david.m.ertman@intel.com> Signed-off-by:

Anirudh Venkataramanan <anirudh.venkataramanan@intel.com> Tested-by:

Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by:

Jeff Kirsher <jeffrey.t.kirsher@intel.com>

drivers/net/ethernet/intel/ice/ice.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -370,5 +370,6 @@ int ice_set_rss(struct ice_vsi vsi, u8 seed, u8 *lut, u16 lut_size);
		int ice_get_rss(struct ice_vsi vsi, u8 seed, u8 *lut, u16 lut_size);
		void ice_fill_rss_lut(u8 *lut, u16 rss_table_size, u16 rss_size);
		void ice_print_link_msg(struct ice_vsi *vsi, bool isup);
		void ice_napi_del(struct ice_vsi *vsi);

		#endif /* _ICE_H_ */

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -2458,6 +2458,7 @@ int ice_vsi_release(struct ice_vsi *vsi)
		* on this wq
		*/
		if (vsi->netdev && !ice_is_reset_in_progress(pf->state)) {
		ice_napi_del(vsi);
		unregister_netdev(vsi->netdev);
		free_netdev(vsi->netdev);
		vsi->netdev = NULL;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1465,7 +1465,7 @@ skip_req_irq:
		* ice_napi_del - Remove NAPI handler for the VSI
		* @vsi: VSI for which NAPI handler is to be removed
		*/
		static void ice_napi_del(struct ice_vsi *vsi)
		void ice_napi_del(struct ice_vsi *vsi)
		{
		int v_idx;

Admin message