iavf_dev_watchdog_enable() runs on the interrupt thread from the link
change and reset impending handlers, while iavf_dev_watchdog_disable()
runs on a control thread from dev_stop and dev_close. Disable clears
`watchdog_enabled` before cancelling the alarm. An enable landing in
between sets the flag again and arms a new alarm, which the cancel then
removes. The flag is left set with no alarm armed, so every later enable
is a no-op and the watchdog is dead until the port is re-probed.
Serialise enable and disable with a spinlock held across the flag
update and the alarm set or cancel.
Fixes: 4c9b1d2ff616 ("net/iavf: refactor watchdog")
Cc: [email protected]
Signed-off-by: Ciara Loftus <[email protected]>
---
drivers/net/intel/iavf/iavf.h | 1 +
drivers/net/intel/iavf/iavf_ethdev.c | 37 +++++++++++++++++-----------
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/drivers/net/intel/iavf/iavf.h b/drivers/net/intel/iavf/iavf.h
index 04c2900afe..0c98ae28e1 100644
--- a/drivers/net/intel/iavf/iavf.h
+++ b/drivers/net/intel/iavf/iavf.h
@@ -247,6 +247,7 @@ struct iavf_info {
/** iAVF watchdog enable */
bool watchdog_enabled;
+ rte_spinlock_t watchdog_lock;
/* Event from pf */
bool dev_closed;
diff --git a/drivers/net/intel/iavf/iavf_ethdev.c
b/drivers/net/intel/iavf/iavf_ethdev.c
index 83470a636d..10069feae2 100644
--- a/drivers/net/intel/iavf/iavf_ethdev.c
+++ b/drivers/net/intel/iavf/iavf_ethdev.c
@@ -374,16 +374,19 @@ iavf_dev_watchdog_enable(struct iavf_adapter *adapter)
{
if (!adapter->devargs.watchdog_period) {
PMD_DRV_LOG(INFO, "Device watchdog is disabled");
- } else {
- if (!adapter->vf.watchdog_enabled) {
- PMD_DRV_LOG(INFO, "Enabling device watchdog, period is
%dμs",
-
adapter->devargs.watchdog_period);
- adapter->vf.watchdog_enabled = true;
- if (rte_eal_alarm_set(adapter->devargs.watchdog_period,
- &iavf_dev_watchdog, (void
*)adapter))
- PMD_DRV_LOG(ERR, "Failed to enable device
watchdog");
- }
+ return;
+ }
+
+ rte_spinlock_lock(&adapter->vf.watchdog_lock);
+ if (!adapter->vf.watchdog_enabled) {
+ PMD_DRV_LOG(INFO, "Enabling device watchdog, period is %dμs",
+ adapter->devargs.watchdog_period);
+ adapter->vf.watchdog_enabled = true;
+ if (rte_eal_alarm_set(adapter->devargs.watchdog_period,
+ &iavf_dev_watchdog, (void *)adapter))
+ PMD_DRV_LOG(ERR, "Failed to enable device watchdog");
}
+ rte_spinlock_unlock(&adapter->vf.watchdog_lock);
}
void
@@ -391,13 +394,16 @@ iavf_dev_watchdog_disable(struct iavf_adapter *adapter)
{
if (!adapter->devargs.watchdog_period) {
PMD_DRV_LOG(INFO, "Device watchdog is not enabled");
- } else {
- if (adapter->vf.watchdog_enabled) {
- PMD_DRV_LOG(INFO, "Disabling device watchdog");
- adapter->vf.watchdog_enabled = false;
- rte_eal_alarm_cancel(&iavf_dev_watchdog, (void
*)adapter);
- }
+ return;
+ }
+
+ rte_spinlock_lock(&adapter->vf.watchdog_lock);
+ if (adapter->vf.watchdog_enabled) {
+ PMD_DRV_LOG(INFO, "Disabling device watchdog");
+ adapter->vf.watchdog_enabled = false;
+ rte_eal_alarm_cancel(&iavf_dev_watchdog, (void *)adapter);
}
+ rte_spinlock_unlock(&adapter->vf.watchdog_lock);
}
static int
@@ -3077,6 +3083,7 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
adapter->mac_primary_set = false;
adapter->tpid = RTE_ETHER_TYPE_VLAN; /* VLAN TPID set to 0x8100 by
default */
rte_spinlock_init(&adapter->phc_sync_lock);
+ rte_spinlock_init(&vf->watchdog_lock);
if (!rte_atomic_load_explicit(&vf->in_reset_recovery,
rte_memory_order_relaxed) &&
iavf_dev_event_handler_init())
--
2.43.0
