[v2] net/iavf: refactor part of watchdog
Checks
Commit Message
This commit refactors two parts of the watchdog:
1. Cancel the rte_eal_alarm when closing the watchdog to avoid
ASAN heap-use-after-free error in some conditions.
2. Modify the logs when enabling and disabling the watchdog to be
more detailed.
Fixes: af801b0374e3 ("net/iavf: add devargs to control watchdog")
Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
---
v2: improve git log
---
drivers/net/iavf/iavf_ethdev.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
Comments
> -----Original Message-----
> From: Zeng, ZhichaoX <zhichaox.zeng@intel.com>
> Sent: Monday, August 14, 2023 5:10 PM
> To: dev@dpdk.org
> Cc: Zhang, Qi Z <qi.z.zhang@intel.com>; Jiale, SongX <songx.jiale@intel.com>;
> Zeng, ZhichaoX <zhichaox.zeng@intel.com>; Wu, Jingjing
> <jingjing.wu@intel.com>; Xing, Beilei <beilei.xing@intel.com>
> Subject: [PATCH v2] net/iavf: refactor part of watchdog
>
> This commit refactors two parts of the watchdog:
> 1. Cancel the rte_eal_alarm when closing the watchdog to avoid
> ASAN heap-use-after-free error in some conditions.
> 2. Modify the logs when enabling and disabling the watchdog to be
> more detailed.
>
> Fixes: af801b0374e3 ("net/iavf: add devargs to control watchdog")
> Signed-off-by: Zhichao Zeng <zhichaox.zeng@intel.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
@@ -324,24 +324,31 @@ iavf_dev_watchdog(void *cb_arg)
void
iavf_dev_watchdog_enable(struct iavf_adapter *adapter)
{
- if (adapter->devargs.watchdog_period && !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 enabled device watchdog");
- } else {
+ 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");
+ }
}
}
void
iavf_dev_watchdog_disable(struct iavf_adapter *adapter)
{
- if (adapter->devargs.watchdog_period && adapter->vf.watchdog_enabled) {
- PMD_DRV_LOG(INFO, "Disabling device watchdog");
- adapter->vf.watchdog_enabled = false;
+ 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);
+ }
}
}