Hello folks! Here is a proof of concept for the new UAPI for j1939. It can be tested with following patch on can-utils: https://github.com/olerem/can-utils/commit/608923c7c0b196e97690d1ea03886a600601db2c What kind of information would be needed for the: RTS, DPO and ABORT? Do any thing else is needed? Regards, Oleksij On Fri, Jul 02, 2021 at 03:12:08PM +0200, Oleksij Rempel wrote: > To be able to create applications with user friendly feedback, we need be > able to provide receive status information. > > Typical ETP transfer may take seconds or even hours. To gave user some > clue or show some progress bar, the stack should push status update. > Same as for the TX information, the socket error queue will be used with > following new signals: > - J1939_EE_INFO_RX_RTS - received and accepted request to send signal. > - J1939_EE_INFO_RX_DPO - received data package offset signal > - J1939_EE_INFO_RX_ABORT - RX session was aborted > > Instead of completion signal, user will get data package. > > Signed-off-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx> > --- > include/uapi/linux/can/j1939.h | 3 ++ > net/can/j1939/j1939-priv.h | 4 +++ > net/can/j1939/socket.c | 56 +++++++++++++++++++++++++++------- > net/can/j1939/transport.c | 10 ++++++ > 4 files changed, 62 insertions(+), 11 deletions(-) > > diff --git a/include/uapi/linux/can/j1939.h b/include/uapi/linux/can/j1939.h > index df6e821075c1..d7cd0a858820 100644 > --- a/include/uapi/linux/can/j1939.h > +++ b/include/uapi/linux/can/j1939.h > @@ -83,6 +83,9 @@ enum { > enum { > J1939_EE_INFO_NONE, > J1939_EE_INFO_TX_ABORT, > + J1939_EE_INFO_RX_RTS, > + J1939_EE_INFO_RX_DPO, > + J1939_EE_INFO_RX_ABORT, > }; > > struct j1939_filter { > diff --git a/net/can/j1939/j1939-priv.h b/net/can/j1939/j1939-priv.h > index 93b8ad7f7d04..f6df20808f5e 100644 > --- a/net/can/j1939/j1939-priv.h > +++ b/net/can/j1939/j1939-priv.h > @@ -23,6 +23,9 @@ enum j1939_sk_errqueue_type { > J1939_ERRQUEUE_TX_ACK, > J1939_ERRQUEUE_TX_SCHED, > J1939_ERRQUEUE_TX_ABORT, > + J1939_ERRQUEUE_RX_RTS, > + J1939_ERRQUEUE_RX_DPO, > + J1939_ERRQUEUE_RX_ABORT, > }; > > /* j1939 devices */ > @@ -87,6 +90,7 @@ struct j1939_priv { > struct list_head j1939_socks; > > struct kref rx_kref; > + u32 rx_tskey; > }; > > void j1939_ecu_put(struct j1939_ecu *ecu); > diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c > index c2bf1c02597e..6e0443408761 100644 > --- a/net/can/j1939/socket.c > +++ b/net/can/j1939/socket.c > @@ -930,21 +930,16 @@ j1939_sk_get_timestamping_opt_stats(struct j1939_session *session) > return stats; > } > > -void j1939_sk_errqueue(struct j1939_session *session, > - enum j1939_sk_errqueue_type type) > +static void __j1939_sk_errqueue(struct j1939_session *session, struct sock *sk, > + enum j1939_sk_errqueue_type type) > { > struct j1939_priv *priv = session->priv; > - struct sock *sk = session->sk; > struct j1939_sock *jsk; > struct sock_exterr_skb *serr; > struct sk_buff *skb; > char *state = "UNK"; > int err; > > - /* currently we have no sk for the RX session */ > - if (!sk) > - return; > - > jsk = j1939_sk(sk); > > if (!(jsk->state & J1939_SOCK_ERRQUEUE)) > @@ -970,7 +965,7 @@ void j1939_sk_errqueue(struct j1939_session *session, > serr->ee.ee_errno = ENOMSG; > serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING; > serr->ee.ee_info = SCM_TSTAMP_ACK; > - state = "ACK"; > + state = "TX ACK"; > break; > case J1939_ERRQUEUE_TX_SCHED: > if (!(sk->sk_tsflags & SOF_TIMESTAMPING_TX_SCHED)) { > @@ -981,13 +976,31 @@ void j1939_sk_errqueue(struct j1939_session *session, > serr->ee.ee_errno = ENOMSG; > serr->ee.ee_origin = SO_EE_ORIGIN_TIMESTAMPING; > serr->ee.ee_info = SCM_TSTAMP_SCHED; > - state = "SCH"; > + state = "TX SCH"; > break; > case J1939_ERRQUEUE_TX_ABORT: > serr->ee.ee_errno = session->err; > serr->ee.ee_origin = SO_EE_ORIGIN_LOCAL; > serr->ee.ee_info = J1939_EE_INFO_TX_ABORT; > - state = "ABT"; > + state = "TX ABT"; > + break; > + case J1939_ERRQUEUE_RX_RTS: > + serr->ee.ee_errno = session->err; > + serr->ee.ee_origin = SO_EE_ORIGIN_LOCAL; > + serr->ee.ee_info = J1939_EE_INFO_RX_RTS; > + state = "RX RTS"; > + break; > + case J1939_ERRQUEUE_RX_DPO: > + serr->ee.ee_errno = session->err; > + serr->ee.ee_origin = SO_EE_ORIGIN_LOCAL; > + serr->ee.ee_info = J1939_EE_INFO_RX_DPO; > + state = "RX DPO"; > + break; > + case J1939_ERRQUEUE_RX_ABORT: > + serr->ee.ee_errno = session->err; > + serr->ee.ee_origin = SO_EE_ORIGIN_LOCAL; > + serr->ee.ee_info = J1939_EE_INFO_RX_ABORT; > + state = "RX ABT"; > break; > default: > netdev_err(priv->ndev, "Unknown errqueue type %i\n", type); > @@ -997,7 +1010,7 @@ void j1939_sk_errqueue(struct j1939_session *session, > if (sk->sk_tsflags & SOF_TIMESTAMPING_OPT_ID) > serr->ee.ee_data = session->tskey; > > - netdev_dbg(session->priv->ndev, "%s: 0x%p tskey: %i, state: %s\n", > + netdev_info(session->priv->ndev, "%s: 0x%p tskey: %i, state: %s\n", > __func__, session, session->tskey, state); > err = sock_queue_err_skb(sk, skb); > > @@ -1005,6 +1018,27 @@ void j1939_sk_errqueue(struct j1939_session *session, > kfree_skb(skb); > }; > > +void j1939_sk_errqueue(struct j1939_session *session, > + enum j1939_sk_errqueue_type type) > +{ > + struct j1939_priv *priv = session->priv; > + struct j1939_sock *jsk; > + > + if (session->sk) { > + /* send TX notifications to the socket of origin */ > + __j1939_sk_errqueue(session, session->sk, type); > + return; > + } > + > + /* spread RX notifications to all sockets subscribed to this session */ > + spin_lock_bh(&priv->j1939_socks_lock); > + list_for_each_entry(jsk, &priv->j1939_socks, list) { > + if (j1939_sk_recv_match_one(jsk, &session->skcb)) > + __j1939_sk_errqueue(session, &jsk->sk, type); > + } > + spin_unlock_bh(&priv->j1939_socks_lock); > +}; > + > void j1939_sk_send_loop_abort(struct sock *sk, int err) > { > sk->sk_err = err; > diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c > index 362cf38cacca..3b59b4d4d4ff 100644 > --- a/net/can/j1939/transport.c > +++ b/net/can/j1939/transport.c > @@ -1087,6 +1087,8 @@ static void __j1939_session_cancel(struct j1939_session *session, > > if (session->sk) > j1939_sk_send_loop_abort(session->sk, session->err); > + else > + j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_ABORT); > } > > static void j1939_session_cancel(struct j1939_session *session, > @@ -1297,6 +1299,8 @@ static void j1939_xtp_rx_abort_one(struct j1939_priv *priv, struct sk_buff *skb, > session->err = j1939_xtp_abort_to_errno(priv, abort); > if (session->sk) > j1939_sk_send_loop_abort(session->sk, session->err); > + else > + j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_ABORT); > j1939_session_deactivate_activate_next(session); > > abort_put: > @@ -1597,6 +1601,9 @@ j1939_session *j1939_xtp_rx_rts_session_new(struct j1939_priv *priv, > session->pkt.rx = 0; > session->pkt.tx = 0; > > + session->tskey = priv->rx_tskey++; > + j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_RTS); > + > WARN_ON_ONCE(j1939_session_activate(session)); > > return session; > @@ -1719,6 +1726,9 @@ static void j1939_xtp_rx_dpo_one(struct j1939_session *session, > session->pkt.dpo = j1939_etp_ctl_to_packet(skb->data); > session->last_cmd = dat[0]; > j1939_tp_set_rxtimeout(session, 750); > + > + if (!session->transmission) > + j1939_sk_errqueue(session, J1939_ERRQUEUE_RX_DPO); > } > > static void j1939_xtp_rx_dpo(struct j1939_priv *priv, struct sk_buff *skb, > -- > 2.30.2 > > > -- 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 |
