From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Ziyang Xuan <william.xuanziyang@huawei.com>
Cc: robin@protonic.nl, linux@rempel-privat.de,
socketcan@hartkopp.net, mkl@pengutronix.de, davem@davemloft.net,
kuba@kernel.org, linux-can@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH net] can: j1939: fix errant alert in j1939_tp_rxtimer
Date: Fri, 10 Sep 2021 14:35:04 +0200 [thread overview]
Message-ID: <20210910123504.GI26100@pengutronix.de> (raw)
In-Reply-To: <20210906094219.95924-1-william.xuanziyang@huawei.com>
On Mon, Sep 06, 2021 at 05:42:19PM +0800, Ziyang Xuan wrote:
> 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>
Acked-by: Oleksij Rempel <o.rempel@pengutronix.de>
Thank you!
> ---
> 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
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
next prev parent reply other threads:[~2021-09-10 12:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2021-10-17 10:40 ` 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=20210910123504.GI26100@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rempel-privat.de \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=robin@protonic.nl \
--cc=socketcan@hartkopp.net \
--cc=william.xuanziyang@huawei.com \
/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.