Skip to contentSkip to conversation

ibmvnic: device remove has higher precedence over reset

RFC PATCH In review Lijun Pan 3 participants 3 messages Jan 19, 2021

Subsystems (4)
lore
Share & tools
lore

Lijun Pan

author
#0 lore raw

RFC PATCH 1/1 ibmvnic: device remove has higher precedence over reset

Returning -EBUSY in ibmvnic_remove() does not actually hold the removal procedure since driver core doesn't care for the return value (see __device_release_driver() in drivers/base/dd.c calling dev->bus->remove()) though vio_bus_remove
(in arch/powerpc/platforms/pseries/vio.c) records the return value and passes it on. [1]

During the device removal precedure, we should not schedule any new reset, and rely on the flush_work and flush_delayed_work to complete the pending resets, and specifically we need to let __ibmvnic_reset() keep running while in REMOVING state since flush_work and flush_delayed_work shall call __ibmvnic_reset finally.

[1] https://lore.kernel.org/linuxppc-dev/[email protected]/T/#m48f5befd96bc9842ece2a3ad14f4c27747206a53

Fixes 7d7195a026ba ("ibmvnic: Do not process device remove during device reset")
---
 drivers/net/ethernet/ibm/ibmvnic.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +1 -7
index aed985e08e8a..11f28fd03057 100644
@@ -2235,8 +2235,7 @@ static void __ibmvnic_reset(struct work_struct *work)
 	while (rwi) {
 		spin_lock_irqsave(&adapter->state_lock, flags);
 
-		if (adapter->state == VNIC_REMOVING ||
-		    adapter->state == VNIC_REMOVED) {
+		if (adapter->state == VNIC_REMOVED) {
 			spin_unlock_irqrestore(&adapter->state_lock, flags);
 			kfree(rwi);
 			rc = EBUSY;
@@ -5372,11 +5371,6 @@ static int ibmvnic_remove(struct vio_dev *dev)
 	unsigned long flags;
 
 	spin_lock_irqsave(&adapter->state_lock, flags);
-	if (test_bit(0, &adapter->resetting)) {
-		spin_unlock_irqrestore(&adapter->state_lock, flags);
-		return -EBUSY;
-	}
-
 	adapter->state = VNIC_REMOVING;
 	spin_unlock_irqrestore(&adapter->state_lock, flags);
 
Signature · 1 line
2.22.0
#1 lore raw
Quoted 26 lines · Lijun Pan

Returning -EBUSY in ibmvnic_remove() does not actually hold the removal procedure since driver core doesn't care for the return value (see __device_release_driver() in drivers/base/dd.c calling dev->bus->remove()) though vio_bus_remove
(in arch/powerpc/platforms/pseries/vio.c) records the return value and passes it on. [1]

During the device removal precedure, we should not schedule any new reset, and rely on the flush_work and flush_delayed_work to complete the pending resets, and specifically we need to let __ibmvnic_reset() keep running while in REMOVING state since flush_work and flush_delayed_work shall call __ibmvnic_reset finally.

[1] https://lore.kernel.org/linuxppc-dev/[email protected]/T/#m48f5befd96bc9842ece2a3ad14f4c27747206a53

Fixes 7d7195a026ba ("ibmvnic: Do not process device remove during device reset")
---
 drivers/net/ethernet/ibm/ibmvnic.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +0 -0
index aed985e08e8a..11f28fd03057 100644

drivers/net/ethernet/ibm/ibmvnic.c static void __ibmvnic_reset(struct work_struct *work) · line 2238

Quoted 6 lines
drivers/net/ethernet/ibm/ibmvnic.c +1 -2
@@ -2235,8 +2235,7 @@ static void __ibmvnic_reset(struct work_struct *work)
 	while (rwi) {
 		spin_lock_irqsave(&adapter->state_lock, flags);
 
-		if (adapter->state == VNIC_REMOVING ||
-		    adapter->state == VNIC_REMOVED) {
+		if (adapter->state == VNIC_REMOVED) {

I think you need to keep the check for VNIC_REMOVING. Otherwise you don't prevent that a new reset being queued after ibmvnic_remove() set the state to VNIC_REMOVING. Am I missing something?

Quoted 4 lines
drivers/net/ethernet/ibm/ibmvnic.c +0 -0
 			spin_unlock_irqrestore(&adapter->state_lock, flags);
 			kfree(rwi);
 			rc = EBUSY;

drivers/net/ethernet/ibm/ibmvnic.c static int ibmvnic_remove(struct vio_dev *dev) · line 5375

Quoted 10 lines
drivers/net/ethernet/ibm/ibmvnic.c +0 -5
@@ -5372,11 +5371,6 @@ static int ibmvnic_remove(struct vio_dev *dev)
 	unsigned long flags;
 
 	spin_lock_irqsave(&adapter->state_lock, flags);
-	if (test_bit(0, &adapter->resetting)) {
-		spin_unlock_irqrestore(&adapter->state_lock, flags);
-		return -EBUSY;
-	}
-
 	adapter->state = VNIC_REMOVING;
 	spin_unlock_irqrestore(&adapter->state_lock, flags);

Best regards
Uwe

Signature · 2 lines
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |
#2 lore raw
Quoted 31 lines · Uwe Kleine-König
Quoted 29 lines · Lijun Pan

Returning -EBUSY in ibmvnic_remove() does not actually hold the removal procedure since driver core doesn't care for the return value (see __device_release_driver() in drivers/base/dd.c calling dev->bus->remove()) though vio_bus_remove
(in arch/powerpc/platforms/pseries/vio.c) records the return value and passes it on. [1]

During the device removal precedure, we should not schedule any new reset, and rely on the flush_work and flush_delayed_work to complete the pending resets, and specifically we need to let __ibmvnic_reset() keep running while in REMOVING state since flush_work and flush_delayed_work shall call __ibmvnic_reset finally.

[1] https://lore.kernel.org/linuxppc-dev/[email protected]/T/#m48f5befd96bc9842ece2a3ad14f4c27747206a53

Fixes 7d7195a026ba ("ibmvnic: Do not process device remove during device reset")
---
 drivers/net/ethernet/ibm/ibmvnic.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/net/ethernet/ibm/ibmvnic.c +0 -0
index aed985e08e8a..11f28fd03057 100644
@@ -2235,8 +2235,7 @@ static void __ibmvnic_reset(struct work_struct *work)
      while (rwi) {
              spin_lock_irqsave(&adapter->state_lock, flags);
 
Quoted 7 lines

drivers/net/ethernet/ibm/ibmvnic.c static void __ibmvnic_reset(struct work_struct *work) · line 2238

Quoted 3 lines
drivers/net/ethernet/ibm/ibmvnic.c +1 -2
-             if (adapter->state == VNIC_REMOVING ||
-                 adapter->state == VNIC_REMOVED) {
+             if (adapter->state == VNIC_REMOVED) {

I think you need to keep the check for VNIC_REMOVING. Otherwise you don't prevent that a new reset being queued after ibmvnic_remove() set the state to VNIC_REMOVING. Am I missing something?

I leave the checking for REMOVING there in ibmvnic_reset, which is the function to schedule/queue up the resets.
Here I delete the REMOVING in __ibmvnic_reset to let it run and finish. Otherwise flush_work will not do anything if __ibmvnic_reset() just return doing nothing.

I can explain it in the commit message.

Quoted 22 lines
Quoted 5 lines
drivers/net/ethernet/ibm/ibmvnic.c +0 -0
                      spin_unlock_irqrestore(&adapter->state_lock, flags);
                      kfree(rwi);
                      rc = EBUSY;

drivers/net/ethernet/ibm/ibmvnic.c static int ibmvnic_remove(struct vio_dev *dev) · line 5375

Quoted 10 lines
drivers/net/ethernet/ibm/ibmvnic.c +0 -5
@@ -5372,11 +5371,6 @@ static int ibmvnic_remove(struct vio_dev *dev)
      unsigned long flags;
 
      spin_lock_irqsave(&adapter->state_lock, flags);
-     if (test_bit(0, &adapter->resetting)) {
-             spin_unlock_irqrestore(&adapter->state_lock, flags);
-             return -EBUSY;
-     }
-
      adapter->state = VNIC_REMOVING;
      spin_unlock_irqrestore(&adapter->state_lock, flags);

Best regards
Uwe

--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | https://www.pengutronix.de/ |