patch 'net/iavf: keep watchdog armed for the whole reset window' has been queued to stable release 24.11.9

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 24.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/29/26. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/f1fbd0cb83af0bd8a8099ec594db6d0f6c399cae

Thanks.

Luca Boccassi

---
>From f1fbd0cb83af0bd8a8099ec594db6d0f6c399cae Mon Sep 17 00:00:00 2001
From: Anurag Mandal <anurag.mandal at intel.com>
Date: Tue, 18 Aug 2026 04:57:31 +0000
Subject: [PATCH] net/iavf: keep watchdog armed for the whole reset window

[ upstream commit a0e296420a70bb482a438b18a68cfb9b516422c1 ]

The device watchdog polls VFGEN_RSTAT to detect a VF reset and drives
the auto-reset recovery path.  It is disabled when a link-up event
arrives, on the assumption that a working link means no reset is in
flight. That assumption does not hold during recovery.

Keep the watchdog armed while vf->in_reset_recovery is set, and enable
it on VIRTCHNL_EVENT_RESET_IMPENDING, so it stays armed from the PF
reset notification until recovery completes.

Fixes: ece7d7eef04f ("net/iavf: fix duplicate VF reset during PF reset recovery")

Signed-off-by: Anurag Mandal <anurag.mandal at intel.com>
Acked-by: Ciara Loftus <ciara.loftus at intel.com>
---
 drivers/net/iavf/iavf_vchnl.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index e71f260aae8..dd521a7a84c 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -260,7 +260,7 @@ iavf_handle_link_change_event(struct rte_eth_dev *dev,
 	 * (link is down or a VF reset is in progress); the watchdog drives
 	 * auto-reset recovery, so it must remain armed in those cases.
 	 */
-	if (vf->link_up && !vf->vf_reset)
+	if (vf->link_up && !vf->vf_reset && !vf->in_reset_recovery)
 		iavf_dev_watchdog_disable(adapter);
 	else
 		iavf_dev_watchdog_enable(adapter);
@@ -332,6 +332,7 @@ iavf_read_msg_from_pf(struct iavf_adapter *adapter, uint16_t buf_len,
 			if (!vf->vf_reset) {
 				vf->vf_reset = true;
 				iavf_set_no_poll(adapter, false);
+				iavf_dev_watchdog_enable(adapter);
 				iavf_dev_event_post(vf->eth_dev,
 					RTE_ETH_EVENT_INTR_RESET,
 					NULL, 0);
@@ -512,6 +513,7 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
 		if (!vf->vf_reset) {
 			vf->vf_reset = true;
 			iavf_set_no_poll(adapter, false);
+			iavf_dev_watchdog_enable(adapter);
 			iavf_dev_event_post(dev, RTE_ETH_EVENT_INTR_RESET,
 				NULL, 0);
 		}
-- 
2.47.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2026-10-27 11:43:56.877371412 +0000
+++ 0082-net-iavf-keep-watchdog-armed-for-the-whole-reset-win.patch	2026-10-27 11:43:53.602062172 +0000
@@ -1 +1 @@
-From a0e296420a70bb482a438b18a68cfb9b516422c1 Mon Sep 17 00:00:00 2001
+From f1fbd0cb83af0bd8a8099ec594db6d0f6c399cae Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit a0e296420a70bb482a438b18a68cfb9b516422c1 ]
+
@@ -16 +17,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
- drivers/net/intel/iavf/iavf_vchnl.c | 4 +++-
+ drivers/net/iavf/iavf_vchnl.c | 4 +++-
@@ -24,4 +25,4 @@
-diff --git a/drivers/net/intel/iavf/iavf_vchnl.c b/drivers/net/intel/iavf/iavf_vchnl.c
-index 43b5f29cad..e3120c655d 100644
---- a/drivers/net/intel/iavf/iavf_vchnl.c
-+++ b/drivers/net/intel/iavf/iavf_vchnl.c
+diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
+index e71f260aae8..dd521a7a84c 100644
+--- a/drivers/net/iavf/iavf_vchnl.c
++++ b/drivers/net/iavf/iavf_vchnl.c
@@ -42,2 +42,0 @@
- 				if (adapter->devargs.no_poll_on_link_down)
- 					iavf_dev_tx_drain(vf->eth_dev);
@@ -45 +44,3 @@
-@@ -572,6 +573,7 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
+ 					RTE_ETH_EVENT_INTR_RESET,
+ 					NULL, 0);
+@@ -512,6 +513,7 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg,
@@ -50,2 +50,0 @@
- 			if (adapter->devargs.no_poll_on_link_down)
- 				iavf_dev_tx_drain(dev);
@@ -52,0 +52,2 @@
+ 				NULL, 0);
+ 		}