ice: Check for reset in progress during remove (afd9d4ab) · Commits · 戴 / test

The remove path does not currently check to see if a reset is in progress before proceeding. This can cause a resource collision resulting in various types of errors. Check for reset in progress and wait for a reasonable amount of time before allowing the remove to progress. 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

+2 −0

Original line number	Diff line number	Diff line
		@@ -76,6 +76,8 @@ extern const char ice_drv_ver[];
		#define ICE_MIN_INTR_PER_VF (ICE_MIN_QS_PER_VF + 1)
		#define ICE_DFLT_INTR_PER_VF (ICE_DFLT_QS_PER_VF + 1)

		#define ICE_MAX_RESET_WAIT 20

		#define ICE_VSIQF_HKEY_ARRAY_SIZE ((VSIQF_HKEY_MAX_INDEX + 1) * 4)

		#define ICE_DFLT_NETIF_M (NETIF_MSG_DRV \| NETIF_MSG_PROBE \| NETIF_MSG_LINK)

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -2182,6 +2182,12 @@ static void ice_remove(struct pci_dev *pdev)
		if (!pf)
		return;

		for (i = 0; i < ICE_MAX_RESET_WAIT; i++) {
		if (!ice_is_reset_in_progress(pf->state))
		break;
		msleep(100);
		}

		set_bit(__ICE_DOWN, pf->state);
		ice_service_task_stop(pf);

Admin message