| Message ID | 20210906094219.95924-1-william.xuanziyang@huawei.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] can: j1939: fix errant alert in j1939_tp_rxtimer | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | fail | 3 blamed authors not CCed: ecathinds@gmail.com maxime.jayat@mobile-devices.fr lkp@intel.com; 4 maintainers not CCed: ecathinds@gmail.com kernel@pengutronix.de maxime.jayat@mobile-devices.fr lkp@intel.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 14 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
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 > >
On 06.09.2021 17:42:19, 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 scenarios Typo fixed while applying. > 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> Added to linux-can/testing, added stable on Cc. Thanks, Marc
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),
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(-)