netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, kuba@kernel.org, linux-can@vger.kernel.org,
	kernel@pengutronix.de, "Oleksij Rempel" <o.rempel@pengutronix.de>,
	stable@vger.kernel.org,
	"Alexander Hölzl" <alexander.hoelzl@gmx.net>,
	"Marc Kleine-Budde" <mkl@pengutronix.de>
Subject: [PATCH net 3/5] net: can: j1939: recover socket queue on CAN bus error during BAM transmission
Date: Fri, 21 Jun 2024 13:23:38 +0200	[thread overview]
Message-ID: <20240621121739.434355-4-mkl@pengutronix.de> (raw)
In-Reply-To: <20240621121739.434355-1-mkl@pengutronix.de>

From: Oleksij Rempel <o.rempel@pengutronix.de>

Addresses an issue where a CAN bus error during a BAM transmission
could stall the socket queue, preventing further transmissions even
after the bus error is resolved. The fix activates the next queued
session after the error recovery, allowing communication to continue.

Fixes: 9d71dd0c70099 ("can: add support of SAE J1939 protocol")
Cc: stable@vger.kernel.org
Reported-by: Alexander Hölzl <alexander.hoelzl@gmx.net>
Tested-by: Alexander Hölzl <alexander.hoelzl@gmx.net>
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://lore.kernel.org/all/20240528070648.1947203-1-o.rempel@pengutronix.de
Cc: stable@vger.kernel.org
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 net/can/j1939/transport.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c
index c6569f98d251..4be73de5033c 100644
--- a/net/can/j1939/transport.c
+++ b/net/can/j1939/transport.c
@@ -1696,6 +1696,8 @@ static int j1939_xtp_rx_rts_session_active(struct j1939_session *session,
 
 		j1939_session_timers_cancel(session);
 		j1939_session_cancel(session, J1939_XTP_ABORT_BUSY);
+		if (session->transmission)
+			j1939_session_deactivate_activate_next(session);
 
 		return -EBUSY;
 	}
-- 
2.43.0



  parent reply	other threads:[~2024-06-21 12:17 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-21 11:23 [PATCH net 0/5] pull-request: can 2024-06-21 Marc Kleine-Budde
2024-06-21 11:23 ` [PATCH net 1/5] net: can: j1939: enhanced error handling for tightly received RTS messages in xtp_rx_rts_session_new Marc Kleine-Budde
2024-06-22  1:20   ` patchwork-bot+netdevbpf
2024-06-21 11:23 ` [PATCH net 2/5] net: can: j1939: Initialize unused data in j1939_send_one() Marc Kleine-Budde
2024-06-21 11:23 ` Marc Kleine-Budde [this message]
2024-06-21 11:23 ` [PATCH net 4/5] can: kvaser_usb: fix return value for hif_usb_send_regout Marc Kleine-Budde
2024-06-21 11:23 ` [PATCH net 5/5] can: mcp251xfd: fix infinite loop when xmit fails Marc Kleine-Budde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240621121739.434355-4-mkl@pengutronix.de \
    --to=mkl@pengutronix.de \
    --cc=alexander.hoelzl@gmx.net \
    --cc=davem@davemloft.net \
    --cc=kernel@pengutronix.de \
    --cc=kuba@kernel.org \
    --cc=linux-can@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=o.rempel@pengutronix.de \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).