Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

can: raw: add missing error queue support

Error queue are not yet implemented in CAN-raw sockets.

The problem: a userland call to recvmsg(soc, msg, MSG_ERRQUEUE) on a
CAN-raw socket would unqueue messages from the normal queue without
any kind of error or warning. As such, it prevented CAN drivers from
using the functionalities that relies on the error queue such as
skb_tx_timestamp().

SCM_CAN_RAW_ERRQUEUE is defined as the type for the CAN raw error
queue. SCM stands for "Socket control messages". The name is inspired
from SCM_J1939_ERRQUEUE of include/uapi/linux/can/j1939.h.

Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Link: https://lore.kernel.org/r/20200926162527.270030-1-mailhol.vincent@wanadoo.fr
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

authored by

Vincent Mailhol and committed by
Marc Kleine-Budde
eb88531b d61469dc

+7
+3
include/uapi/linux/can/raw.h
··· 49 49 #include <linux/can.h> 50 50 51 51 #define SOL_CAN_RAW (SOL_CAN_BASE + CAN_RAW) 52 + enum { 53 + SCM_CAN_RAW_ERRQUEUE = 1, 54 + }; 52 55 53 56 /* for socket options affecting the socket (not the global system) */ 54 57
+4
net/can/raw.c
··· 804 804 noblock = flags & MSG_DONTWAIT; 805 805 flags &= ~MSG_DONTWAIT; 806 806 807 + if (flags & MSG_ERRQUEUE) 808 + return sock_recv_errqueue(sk, msg, size, 809 + SOL_CAN_RAW, SCM_CAN_RAW_ERRQUEUE); 810 + 807 811 skb = skb_recv_datagram(sk, flags, noblock, &err); 808 812 if (!skb) 809 813 return err;