[PATCH v3 2/2] net/ncsi: fix state race during channel probe completion

Potin Lai
2025-01-13T02:37:33Z

From: Cosmo Chou <chou.cosmo@gmail.com>

During channel probing, the last NCSI_PKT_CMD_DP command can trigger
an unnecessary schedule_work() via ncsi_free_request(). We observed
that subsequent config states were triggered before the scheduled
work completed, causing potential state handling issues.

Fix this by clearing req_flags when processing the last package.

Fixes: 8e13f70be05e ("net/ncsi: Probe single packages to avoid conflict")
Signed-off-by: Cosmo Chou <chou.cosmo@gmail.com>
---
net/ncsi/ncsi-manage.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c
index bf276eaf9330..99e3a5883617 100644
--- a/net/ncsi/ncsi-manage.c
+++ b/net/ncsi/ncsi-manage.c
@@ -1491,7 +1491,10 @@ static void ncsi_probe_channel(struct ncsi_dev_priv *ndp)
}
break;
case ncsi_dev_state_probe_dp:
- ndp->pending_req_num = 1;
+ if (ndp->package_probe_id + 1 < 8)
+ ndp->pending_req_num = 1;
+ else
+ nca.req_flags = 0;

/* Deselect the current package */
nca.type = NCSI_PKT_CMD_DP;

--
2.31.1