Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH net] can: j1939: fix errant alert in j1939_tp_rxtimer
@ 2021-09-06  9:42 Ziyang Xuan
  2021-09-10 12:35 ` Oleksij Rempel
  2021-10-17 10:40 ` Marc Kleine-Budde
  0 siblings, 2 replies; 3+ messages in thread
From: Ziyang Xuan @ 2021-09-06  9:42 UTC (permalink / raw)
  To: robin; +Cc: linux, socketcan, mkl, davem, kuba, linux-can, netdev, linux-kernel

When the session state is J1939_SESSION_DONE, j1939_tp_rxtimer() will
give an alert "rx timeout, send abort", but do nothing actually.
Move the alert into session active judgment condition, it is more
reasonable.

One of the scenarioes is that j1939_tp_rxtimer() execute followed by
j1939_xtp_rx_abort_one(). After j1939_xtp_rx_abort_one(), the session
state is J1939_SESSION_DONE, then j1939_tp_rxtimer() give an alert.

Fixes: 9d71dd0c7009 ("can: add support of SAE J1939 protocol")
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
---
 net/can/j1939/transport.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index 0f8309314075..d3f0a062b400 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -1226,12 +1226,11 @@ static enum hrtimer_restart j1939_tp_rxtimer(struct hrtimer *hrtimer)
 		session->err = -ETIME;
 		j1939_session_deactivate(session);
 	} else {
-		netdev_alert(priv->ndev, "%s: 0x%p: rx timeout, send abort\n",
-			     __func__, session);
-
 		j1939_session_list_lock(session->priv);
 		if (session->state >= J1939_SESSION_ACTIVE &&
 		    session->state < J1939_SESSION_ACTIVE_MAX) {
+			netdev_alert(priv->ndev, "%s: 0x%p: rx timeout, send abort\n",
+				     __func__, session);
 			j1939_session_get(session);
 			hrtimer_start(&session->rxtimer,
 				      ms_to_ktime(J1939_XTP_ABORT_TIMEOUT_MS),
-- 
2.25.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-10-17 10:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-06  9:42 [PATCH net] can: j1939: fix errant alert in j1939_tp_rxtimer Ziyang Xuan
2021-09-10 12:35 ` Oleksij Rempel
2021-10-17 10:40 ` Marc Kleine-Budde

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).