From: Oliver Hartkopp <socketcan@hartkopp.net>
To: gregkh@linuxfoundation.org, stable@vger.kernel.org, sashal@kernel.org
Cc: linux-can@vger.kernel.org, lukas.magel@posteo.net,
patches@lists.linux.dev, maxime.jayat@mobile-devices.fr,
mkl@pengutronix.de, michal.sojka@cvut.cz,
Patrick Menschel <menschel.p@posteo.de>,
Oliver Hartkopp <socketcan@hartkopp.net>
Subject: [PATCH stable 5.10 03/10] can: isotp: Add error message if txqueuelen is too small
Date: Tue, 31 Oct 2023 10:29:11 +0100 [thread overview]
Message-ID: <20231031092918.2668-4-socketcan@hartkopp.net> (raw)
In-Reply-To: <20231031092918.2668-1-socketcan@hartkopp.net>
From: Patrick Menschel <menschel.p@posteo.de>
commit c69d190f7bb9a03cf5237d45a457993730d01605 upstream
This patch adds an additional error message in case that txqueuelen is
set too small and advices the user to increase txqueuelen.
This is likely to happen even with small transfers if txqueuelen is at
default value 10 frames.
Link: https://lore.kernel.org/r/20210427052150.2308-4-menschel.p@posteo.de
Signed-off-by: Patrick Menschel <menschel.p@posteo.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
---
net/can/isotp.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/can/isotp.c b/net/can/isotp.c
index 009d5216f3ea..ef72e5344789 100644
--- a/net/can/isotp.c
+++ b/net/can/isotp.c
@@ -811,14 +811,16 @@ static enum hrtimer_restart isotp_tx_timer_handler(struct hrtimer *hrtimer)
skb->dev = dev;
can_skb_set_owner(skb, sk);
can_send_ret = can_send(skb, 1);
- if (can_send_ret)
+ if (can_send_ret) {
pr_notice_once("can-isotp: %s: can_send_ret %pe\n",
__func__, ERR_PTR(can_send_ret));
-
+ if (can_send_ret == -ENOBUFS)
+ pr_notice_once("can-isotp: tx queue is full, increasing txqueuelen may prevent this error\n");
+ }
if (so->tx.idx >= so->tx.len) {
/* we are done */
so->tx.state = ISOTP_IDLE;
dev_put(dev);
wake_up_interruptible(&so->wait);
--
2.34.1
next prev parent reply other threads:[~2023-10-31 9:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-31 9:29 [PATCH stable 5.10 00/10] can: isotp: upgrade to latest 6.1 LTS code base Oliver Hartkopp
2023-10-31 9:29 ` [PATCH stable 5.10 01/10] can: isotp: change error format from decimal to symbolic error names Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: change error format from decimal to symbolic error names" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 02/10] can: isotp: add symbolic error message to isotp_module_init() Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: add symbolic error message to isotp_module_init()" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` Oliver Hartkopp [this message]
2023-11-06 11:23 ` Patch "can: isotp: Add error message if txqueuelen is too small" " gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 04/10] can: isotp: set max PDU size to 64 kByte Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: set max PDU size to 64 kByte" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 05/10] can: isotp: isotp_bind(): return -EINVAL on incorrect CAN ID formatting Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: isotp_bind(): return -EINVAL on incorrect CAN ID formatting" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 06/10] can: isotp: check CAN address family in isotp_bind() Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: check CAN address family in isotp_bind()" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 07/10] can: isotp: handle wait_event_interruptible() return values Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: handle wait_event_interruptible() return values" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 08/10] can: isotp: add local echo tx processing and tx without FC Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: add local echo tx processing and tx without FC" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 09/10] can: isotp: isotp_bind(): do not validate unused address information Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: isotp_bind(): do not validate unused address information" has been added to the 5.10-stable tree gregkh
2023-10-31 9:29 ` [PATCH stable 5.10 10/10] can: isotp: isotp_sendmsg(): fix TX state detection and wait behavior Oliver Hartkopp
2023-11-06 11:23 ` Patch "can: isotp: isotp_sendmsg(): fix TX state detection and wait behavior" has been added to the 5.10-stable tree gregkh
2023-11-06 11:23 ` [PATCH stable 5.10 00/10] can: isotp: upgrade to latest 6.1 LTS code base Greg KH
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=20231031092918.2668-4-socketcan@hartkopp.net \
--to=socketcan@hartkopp.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-can@vger.kernel.org \
--cc=lukas.magel@posteo.net \
--cc=maxime.jayat@mobile-devices.fr \
--cc=menschel.p@posteo.de \
--cc=michal.sojka@cvut.cz \
--cc=mkl@pengutronix.de \
--cc=patches@lists.linux.dev \
--cc=sashal@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.