patches for DPDK stable branches
 help / color / Atom feed
* [dpdk-stable] [PATCH] net/failsafe: fix state synchro cleanup
@ 2020-10-12 14:19 Gaetan Rivet
  2020-10-13 14:49 ` Ferruh Yigit
  0 siblings, 1 reply; 2+ messages in thread
From: Gaetan Rivet @ 2020-10-12 14:19 UTC (permalink / raw)
  To: dev; +Cc: longli, stable

During a hotplug attempt, failsafe will try to bring a subdevice that
just appeared to its internal state. On error, the subdevice is marked
for removal and will be cleaned up.

However failsafe_dev_remove() only remove active devices. Devices that
failed during probe will be stuck in DEV_PARSED state repeatedly.

Consider all devices when doing a removal round, but limit burst control
and stats saving to active devices.

Fixes: 598fb8aec6f6 ("net/failsafe: support device removal")
Cc: stable@dpdk.org
Signed-off-by: Gaetan Rivet <grive@u256.net>
---
 drivers/net/failsafe/failsafe_ether.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/drivers/net/failsafe/failsafe_ether.c b/drivers/net/failsafe/failsafe_ether.c
index 2b748bd8b4..30f778dbf2 100644
--- a/drivers/net/failsafe/failsafe_ether.c
+++ b/drivers/net/failsafe/failsafe_ether.c
@@ -383,14 +383,23 @@ failsafe_dev_remove(struct rte_eth_dev *dev)
 	struct sub_device *sdev;
 	uint8_t i;
 
-	FOREACH_SUBDEV_STATE(sdev, i, dev, DEV_ACTIVE)
-		if (sdev->remove && fs_rxtx_clean(sdev)) {
-			if (fs_lock(dev, 1) != 0)
-				return;
+	FOREACH_SUBDEV(sdev, i, dev) {
+		if (!sdev->remove)
+			continue;
+
+		/* Active devices must have finished their burst and
+		 * their stats must be saved.
+		 */
+		if (sdev->state >= DEV_ACTIVE &&
+		    fs_rxtx_clean(sdev) == 0)
+			continue;
+		if (fs_lock(dev, 1) != 0)
+			return;
+		if (sdev->state >= DEV_ACTIVE)
 			fs_dev_stats_save(sdev);
-			fs_dev_remove(sdev);
-			fs_unlock(dev, 1);
-		}
+		fs_dev_remove(sdev);
+		fs_unlock(dev, 1);
+	}
 }
 
 static int
-- 
2.28.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [dpdk-stable] [PATCH] net/failsafe: fix state synchro cleanup
  2020-10-12 14:19 [dpdk-stable] [PATCH] net/failsafe: fix state synchro cleanup Gaetan Rivet
@ 2020-10-13 14:49 ` Ferruh Yigit
  0 siblings, 0 replies; 2+ messages in thread
From: Ferruh Yigit @ 2020-10-13 14:49 UTC (permalink / raw)
  To: Gaetan Rivet, dev; +Cc: longli, stable

On 10/12/2020 3:19 PM, Gaetan Rivet wrote:
> During a hotplug attempt, failsafe will try to bring a subdevice that
> just appeared to its internal state. On error, the subdevice is marked
> for removal and will be cleaned up.
> 
> However failsafe_dev_remove() only remove active devices. Devices that
> failed during probe will be stuck in DEV_PARSED state repeatedly.
> 
> Consider all devices when doing a removal round, but limit burst control
> and stats saving to active devices.
> 
> Fixes: 598fb8aec6f6 ("net/failsafe: support device removal")
> Cc: stable@dpdk.org
> Signed-off-by: Gaetan Rivet <grive@u256.net>

Applied to dpdk-next-net/main, thanks.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, back to index

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-12 14:19 [dpdk-stable] [PATCH] net/failsafe: fix state synchro cleanup Gaetan Rivet
2020-10-13 14:49 ` Ferruh Yigit

patches for DPDK stable branches

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/ public-inbox