ibmvnic: enhance resetting status check during module exit (3ada2881) · Commits · 戴 / test

Based on the discussion with Sukadev Bhattiprolu and Dany Madden, we believe that checking adapter->resetting bit is preferred since RESETTING state flag is not as strict as resetting bit. RESETTING state flag is removed since it is verbose now. Fixes: ("ibmvnic: Do not process device remove during device reset") Signed-off-by:

Lijun Pan <ljp@linux.ibm.com> Signed-off-by:

Jakub Kicinski <kuba@kernel.org>

drivers/net/ethernet/ibm/ibmvnic.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -2215,7 +2215,6 @@ static void __ibmvnic_reset(struct work_struct *work)

		if (!saved_state) {
		reset_state = adapter->state;
		adapter->state = VNIC_RESETTING;
		saved_state = true;
		}
		spin_unlock_irqrestore(&adapter->state_lock, flags);
		@@ -5280,7 +5279,7 @@ static int ibmvnic_remove(struct vio_dev *dev)
		unsigned long flags;

		spin_lock_irqsave(&adapter->state_lock, flags);
		if (adapter->state == VNIC_RESETTING) {
		if (test_bit(0, &adapter->resetting)) {
		spin_unlock_irqrestore(&adapter->state_lock, flags);
		return -EBUSY;
		}

drivers/net/ethernet/ibm/ibmvnic.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -942,8 +942,7 @@ enum vnic_state {VNIC_PROBING = 1,
		VNIC_CLOSING,
		VNIC_CLOSED,
		VNIC_REMOVING,
		VNIC_REMOVED,
		VNIC_RESETTING};
		VNIC_REMOVED};

		enum ibmvnic_reset_reason {VNIC_RESET_FAILOVER = 1,
		VNIC_RESET_MOBILITY,

Admin message