Skip to contentSkip to conversation

can-raw: add msg_flags to distinguish local traffic

PATCH In review Kurt Van Dijck 4 participants 6 messages Oct 19, 2010 5 messages not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 can-raw: add msg_flags to distinguish local traffic

The difference in V3 is proper documentation.
Both code & documentation look very complete now.

CAN has no addressing scheme. It is currently impossible for userspace to tell is a received CAN frame comes from another process on the local host, or from a remote CAN device.
This patch add support for userspace applications to distinguish between 'own', 'local' and 'remote' CAN traffic. Distinction is made by returning flags in msg->msg_flags in the call to recvmsg.
The Documentation/... explains the flags.

---
 Documentation/networking/can.txt |   13 +++++++++++++
 net/can/raw.c                    |   33 ++++++++++++++++++++++++++++++---
 2 files changed, 43 insertions(+), 3 deletions(-)
Documentation/networking/can.txt +13 -0
index cd79735..bc015d0 100644
@@ -22,6 +22,7 @@ This file contains
       4.1.2 RAW socket option CAN_RAW_ERR_FILTER
       4.1.3 RAW socket option CAN_RAW_LOOPBACK
       4.1.4 RAW socket option CAN_RAW_RECV_OWN_MSGS
+      4.1.5 RAW socket returned flags
     4.2 Broadcast Manager protocol sockets (SOCK_DGRAM)
     4.3 connected transport protocols (SOCK_SEQPACKET)
     4.4 unconnected transport protocols (SOCK_DGRAM)
@@ -471,6 +472,18 @@ solution for a couple of reasons:
     setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
                &recv_own_msgs, sizeof(recv_own_msgs));
 
+  4.1.5 RAW socket returned flags
+
+  When using recvmsg() call, the msg->msg_flags may contain following flags:
+
+    MSG_DONTROUTE: set when the received frame was created on the local host.
+
+    MSG_CONFIRM: set when the frame was sent via the socket it is received on.
+        This flag can be interpreted as a 'transmission confirmation'
+	when the CAN driver supports the echo of CAN frames on driver level,
+	see 3.2 and 6.2.
+	In order to receive such messages, CAN_RAW_RECV_OWN_MSGS must be set.
+
   4.2 Broadcast Manager protocol sockets (SOCK_DGRAM)
   4.3 connected transport protocols (SOCK_SEQPACKET)
   4.4 unconnected transport protocols (SOCK_DGRAM)
net/can/raw.c +30 -3
index 7d77e67..a9edd69 100644
@@ -90,23 +90,39 @@ struct raw_sock {
 	can_err_mask_t err_mask;
 };
 
+/*
+ * Return pointer to store the extra msg flags for raw_recvmsg().
+ * We use the space of one unsigned int beyond the 'struct sockaddr_can'
+ * in skb->cb.
+ */
+static inline unsigned int *raw_flags(struct sk_buff *skb)
+{
+	BUILD_BUG_ON(sizeof(skb->cb) <= (sizeof(struct sockaddr_can)
+				+ sizeof(unsigned int)));
+
+	/* return pointer after struct sockaddr_can */
+	return (unsigned int *)(&((struct sockaddr_can *)skb->cb)[1]);
+}
+
 static inline struct raw_sock *raw_sk(const struct sock *sk)
 {
 	return (struct raw_sock *)sk;
 }
 
-static void raw_rcv(struct sk_buff *skb, void *data)
+static void raw_rcv(struct sk_buff *oskb, void *data)
 {
 	struct sock *sk = (struct sock *)data;
 	struct raw_sock *ro = raw_sk(sk);
 	struct sockaddr_can *addr;
+	struct sk_buff *skb;
+	unsigned int *pflags;
 
 	/* check the received tx sock reference */
-	if (!ro->recv_own_msgs && skb->sk == sk)
+	if (!ro->recv_own_msgs && oskb->sk == sk)
 		return;
 
 	/* clone the given skb to be able to enqueue it into the rcv queue */
-	skb = skb_clone(skb, GFP_ATOMIC);
+	skb = skb_clone(oskb, GFP_ATOMIC);
 	if (!skb)
 		return;
 
@@ -123,6 +139,14 @@ static void raw_rcv(struct sk_buff *skb, void *data)
 	addr->can_family  = AF_CAN;
 	addr->can_ifindex = skb->dev->ifindex;
 
+	/* prepare the flags for raw_recvmsg() */
+	pflags = raw_flags(skb);
+	*pflags = 0;
+	if (oskb->sk)
+		*pflags |= MSG_DONTROUTE;
+	if (oskb->sk == sk)
+		*pflags |= MSG_CONFIRM;
+
 	if (sock_queue_rcv_skb(sk, skb) < 0)
 		kfree_skb(skb);
 }
@@ -707,6 +731,9 @@ static int raw_recvmsg(struct kiocb *iocb, struct socket *sock,
 		memcpy(msg->msg_name, skb->cb, msg->msg_namelen);
 	}
 
+	/* assign the flags that have been recorded in raw_rcv() */
+	msg->msg_flags |= *(raw_flags(skb));
+
 	skb_free_datagram(sk, skb);
 
 	return size;

A message that is not in the archive (sent off-list or not yet received): 20101019090247.GB334-MxZ6Iy/zr/UdbCeoMzGj59i2O/[email protected]

#2 lore raw

Hello Kurt,

Quoted 24 lines · On Tuesday 19 October 2010, 11:02:47 Kurt Van Dijck wrote:
(quoted diff) +0 -0

b/Documentation/networking/can.txt index cd79735..bc015d0 100644

Documentation/networking/can.txt +4 -0
@@ -22,6 +22,7 @@ This file contains
       4.1.2 RAW socket option CAN_RAW_ERR_FILTER
       4.1.3 RAW socket option CAN_RAW_LOOPBACK
       4.1.4 RAW socket option CAN_RAW_RECV_OWN_MSGS
+      4.1.5 RAW socket returned flags
     4.2 Broadcast Manager protocol sockets (SOCK_DGRAM)
     4.3 connected transport protocols (SOCK_SEQPACKET)
     4.4 unconnected transport protocols (SOCK_DGRAM)
@@ -471,6 +472,18 @@ solution for a couple of reasons:
     setsockopt(s, SOL_CAN_RAW, CAN_RAW_RECV_OWN_MSGS,
                &recv_own_msgs, sizeof(recv_own_msgs));
 
+  4.1.5 RAW socket returned flags
+
+  When using recvmsg() call, the msg->msg_flags may contain following

flags: +
+ MSG_DONTROUTE: set when the received frame was created on the local
host. +
+ MSG_CONFIRM: set when the frame was sent via the socket it is received
on. + This flag can be interpreted as a 'transmission confirmation'

Documentation/networking/can.txt solution for a couple of reasons: · line 486

Quoted 4 lines
Documentation/networking/can.txt +4 -0
+	when the CAN driver supports the echo of CAN frames on driver level,
+	see 3.2 and 6.2.
+	In order to receive such messages, CAN_RAW_RECV_OWN_MSGS must be set.
+

You mixed tabs and spaces at MSG_CONFIRM entry. Dunno if that was intended.

Regards,
Alexander

A message that is not in the archive (sent off-list or not yet received): 201010191113.46999.alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org

#4 lore raw
Quoted 1 line · Alexander Stein

You mixed tabs and spaces at MSG_CONFIRM entry. Dunno if that was intended.

That was not intended.
Is that a problem (I never studied the code style wrt. Documentation)?

Quoted 3 lines

Regards,
Alexander

Thanks,
Kurt

A message that is not in the archive (sent off-list or not yet received): 20101019095703.GA436-MxZ6Iy/zr/UdbCeoMzGj59i2O/[email protected]

#6 lore raw
Quoted 6 lines · On Tuesday 19 October 2010, 11:57:03 Kurt Van Dijck wrote:
Quoted 2 lines · Alexander Stein

You mixed tabs and spaces at MSG_CONFIRM entry. Dunno if that was intended.

That was not intended.
Is that a problem (I never studied the code style wrt. Documentation)?

Dunno if this is a problem, I just stumbled over it.

Regards,
Alexander

A message that is not in the archive (sent off-list or not yet received): 201010191228.10914.alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org

#8 lore raw
Quoted 9 lines · Alexander Stein
Quoted 6 lines · On Tuesday 19 October 2010, 11:57:03 Kurt Van Dijck wrote:
Quoted 2 lines · Alexander Stein

You mixed tabs and spaces at MSG_CONFIRM entry. Dunno if that was intended.

That was not intended.
Is that a problem (I never studied the code style wrt. Documentation)?

Dunno if this is a problem, I just stumbled over it.

Well, I think it's not worth an extra patch but should be fixed when the files need to be touched anyway (for other reasons/fixes).

Just my .02 euro.

Wolfgang.

A message that is not in the archive (sent off-list or not yet received): [email protected]

#10 lore raw
Quoted 6 lines · Wolfgang Grandegger
Quoted 5 lines · Alexander Stein
Quoted 4 lines · On Tuesday 19 October 2010, 11:57:03 Kurt Van Dijck wrote:
Quoted 2 lines · Alexander Stein

You mixed tabs and spaces at MSG_CONFIRM entry. Dunno if that was intended.

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

That was not intended.
Is that a problem (I never studied the code style wrt. Documentation)?

Dunno if this is a problem, I just stumbled over it.

Well, I think it's not worth an extra patch but should be fixed when the files need to be touched anyway (for other reasons/fixes).

But there's also no need to commit a broken indention.

Quoted 1 line

From my side i would prefer a V4 and you can put in my

directly if you like.

Thanks,
Oliver