Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Mon, 13 Jun 2022 09:32:08 +0200
From:   Marc Kleine-Budde <mkl@pengutronix.de>
To:     Dario Binacchi <dario.binacchi@amarulasolutions.com>
Cc:     linux-kernel@vger.kernel.org, michael@amarulasolutions.com,
        Amarula patchwork <linux-amarula@amarulasolutions.com>,
        Oliver Hartkopp <socketcan@hartkopp.net>,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jakub Kicinski <kuba@kernel.org>,
        Jiri Slaby <jirislaby@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
        Vincent Mailhol <mailhol.vincent@wanadoo.fr>,
        Wolfgang Grandegger <wg@grandegger.com>,
        linux-can@vger.kernel.org, netdev@vger.kernel.org
Subject: Re: [PATCH v3 12/13] can: slcan: extend the protocol with error info
Message-ID: <20220613073208.anak24kpffnngube@pengutronix.de>
References: <20220612213927.3004444-1-dario.binacchi@amarulasolutions.com>
 <20220612213927.3004444-13-dario.binacchi@amarulasolutions.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="hi4omindgk2aohao"
Content-Disposition: inline
In-Reply-To: <20220612213927.3004444-13-dario.binacchi@amarulasolutions.com>
Precedence: bulk


--hi4omindgk2aohao
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On 12.06.2022 23:39:26, Dario Binacchi wrote:
> It extends the protocol to receive the adapter CAN communication errors
> and forward them to the netdev upper levels.
>=20
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
>=20
> ---
>=20
> (no changes since v2)
>=20
> Changes in v2:
> - Protect decoding against the case the len value is longer than the
>   received data.

Where is that check?

> - Continue error handling even if no skb can be allocated.
>=20
>  drivers/net/can/slcan/slcan-core.c | 130 ++++++++++++++++++++++++++++-
>  1 file changed, 129 insertions(+), 1 deletion(-)
>=20
> diff --git a/drivers/net/can/slcan/slcan-core.c b/drivers/net/can/slcan/s=
lcan-core.c
> index 3df35ae8f040..48077edb9497 100644
> --- a/drivers/net/can/slcan/slcan-core.c
> +++ b/drivers/net/can/slcan/slcan-core.c
> @@ -175,8 +175,118 @@ int slcan_enable_err_rst_on_open(struct net_device =
*ndev, bool on)
>    *			STANDARD SLCAN DECAPSULATION			 *
>    **********************************************************************=
**/
> =20
> +static void slc_bump_err(struct slcan *sl)
> +{
> +	struct net_device *dev =3D sl->dev;
> +	struct sk_buff *skb;
> +	struct can_frame *cf;
> +	char *cmd =3D sl->rbuff;
> +	bool rx_errors =3D false, tx_errors =3D false;
> +	int i, len;
> +
> +	if (*cmd !=3D 'e')
> +		return;

This has already been checked in the caller, right?

> +
> +	cmd +=3D SLC_CMD_LEN;
> +	/* get len from sanitized ASCII value */
> +	len =3D *cmd++;
> +	if (len >=3D '0' && len < '9')
> +		len -=3D '0';
> +	else
> +		return;
> +
> +	skb =3D alloc_can_err_skb(dev, &cf);
> +
> +	if (skb)
> +		cf->can_id |=3D CAN_ERR_PROT | CAN_ERR_BUSERROR;
> +
> +	for (i =3D 0; i < len; i++, cmd++) {
> +		switch (*cmd) {
> +		case 'a':
> +			netdev_dbg(dev, "ACK error\n");
> +			tx_errors =3D true;

Nitpick:
Please decide if you want to set tx/tx_errors here and increment at the
end of the function....or.....

> +			if (skb) {
> +				cf->can_id |=3D CAN_ERR_ACK;
> +				cf->data[3] =3D CAN_ERR_PROT_LOC_ACK;
> +			}
> +
> +			break;
> +		case 'b':
> +			netdev_dbg(dev, "Bit0 error\n");
> +			tx_errors =3D true;
> +			if (skb)
> +				cf->data[2] |=3D CAN_ERR_PROT_BIT0;
> +
> +			break;
> +		case 'B':
> +			netdev_dbg(dev, "Bit1 error\n");
> +			tx_errors =3D true;
> +			if (skb)
> +				cf->data[2] |=3D CAN_ERR_PROT_BIT1;
> +
> +			break;
> +		case 'c':
> +			netdev_dbg(dev, "CRC error\n");
> +			rx_errors =3D true;
> +			if (skb) {
> +				cf->data[2] |=3D CAN_ERR_PROT_BIT;
> +				cf->data[3] =3D CAN_ERR_PROT_LOC_CRC_SEQ;
> +			}
> +
> +			break;
> +		case 'f':
> +			netdev_dbg(dev, "Form Error\n");
> +			rx_errors =3D true;
> +			if (skb)
> +				cf->data[2] |=3D CAN_ERR_PROT_FORM;
> +
> +			break;
> +		case 'o':
> +			netdev_dbg(dev, "Rx overrun error\n");
> +			dev->stats.rx_over_errors++;
> +			dev->stats.rx_errors++;

=2E...if you want to increment in the case.

> +			if (skb) {
> +				cf->can_id |=3D CAN_ERR_CRTL;
> +				cf->data[1] =3D CAN_ERR_CRTL_RX_OVERFLOW;
> +			}
> +
> +			break;
> +		case 'O':
> +			netdev_dbg(dev, "Tx overrun error\n");
> +			dev->stats.tx_errors++;
> +			if (skb) {
> +				cf->can_id |=3D CAN_ERR_CRTL;
> +				cf->data[1] =3D CAN_ERR_CRTL_TX_OVERFLOW;
> +			}
> +
> +			break;
> +		case 's':
> +			netdev_dbg(dev, "Stuff error\n");
> +			rx_errors =3D true;
> +			if (skb)
> +				cf->data[2] |=3D CAN_ERR_PROT_STUFF;
> +
> +			break;
> +		default:
> +			if (skb)
> +				dev_kfree_skb(skb);
> +
> +			return;
> +		}
> +	}
> +
> +	if (rx_errors)
> +		dev->stats.rx_errors++;
> +
> +	if (tx_errors)
> +		dev->stats.tx_errors++;
> +
> +	if (skb)
> +		netif_rx(skb);
> +}
> +
>  /* Send one completely decapsulated can_frame to the network layer */
> -static void slc_bump(struct slcan *sl)
> +static void slc_bump_frame(struct slcan *sl)
>  {
>  	struct sk_buff *skb;
>  	struct can_frame *cf;
> @@ -255,6 +365,24 @@ static void slc_bump(struct slcan *sl)
>  	dev_kfree_skb(skb);
>  }
> =20
> +static void slc_bump(struct slcan *sl)
> +{
> +	switch (sl->rbuff[0]) {
> +	case 'r':
> +		fallthrough;
> +	case 't':
> +		fallthrough;
> +	case 'R':
> +		fallthrough;
> +	case 'T':
> +		return slc_bump_frame(sl);
> +	case 'e':
> +		return slc_bump_err(sl);
> +	default:
> +		return;
> +	}
> +}
> +
>  /* parse tty input stream */
>  static void slcan_unesc(struct slcan *sl, unsigned char s)
>  {
> --=20
> 2.32.0
>=20
>=20

Marc

--=20
Pengutronix e.K.                 | Marc Kleine-Budde           |
Embedded Linux                   | https://www.pengutronix.de  |
Vertretung West/Dortmund         | Phone: +49-231-2826-924     |
Amtsgericht Hildesheim, HRA 2686 | Fax:   +49-5121-206917-5555 |

--hi4omindgk2aohao
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAABCgAdFiEEBsvAIBsPu6mG7thcrX5LkNig010FAmKm5/UACgkQrX5LkNig
011BTAf+LVMpE9mxzEZB/h0rR6tDLiBIjNvITU9UdnF/yiCZCmW0Yd7XqgM/2d/B
MaW/KH5KEN+MspVoNy0urOdxUbWa8PNE9W3EQpqFc8ZrZ7K2ADu26OHWEosAMNDx
vFAPl6H0mATaUyNLgUli+Eb5822i88AwM7//IiDWrmM4c992Oywff9+Z7JVtC5CH
1A2pd2dleefWs7obcDTORI0dlDuWIXserMeJQbdQkbndA2dn7OIEcViDyySH8sdL
qKpNZeC+/HIeEgEEBrl7ag6Fa/ZVP2LZJilk55GRKp0xSSmlxoXkxTjlXz39UGW5
E7OvzB8Lij+ENpX4AR/gGrey/NxzkA==
=pIY1
-----END PGP SIGNATURE-----

--hi4omindgk2aohao--