From: Gaetan Rivet <grive@u256.net>
To: dev@dpdk.org
Cc: longli@microsoft.com, stable@dpdk.org
Subject: [dpdk-dev] [PATCH] net/failsafe: fix state synchro cleanup
Date: Mon, 12 Oct 2020 16:19:04 +0200 [thread overview]
Message-ID: <deb765fed1c11bcbbd5b9bf711852f24f456f5c7.1602512275.git.grive@u256.net> (raw)
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
next reply other threads:[~2020-10-12 14:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 14:19 Gaetan Rivet [this message]
2020-10-13 14:49 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=deb765fed1c11bcbbd5b9bf711852f24f456f5c7.1602512275.git.grive@u256.net \
--to=grive@u256.net \
--cc=dev@dpdk.org \
--cc=longli@microsoft.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).