From: Oleksij Rempel <o.rempel@pengutronix.de>
To: Wolfgang Grandegger <wg@grandegger.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
Oliver Hartkopp <socketcan@hartkopp.net>
Cc: Oleksij Rempel <o.rempel@pengutronix.de>,
Devid Antonio Filoni <devid.filoni@egluetechnologies.com>,
kernel@pengutronix.de, linux-can@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
David Jander <david@protonic.nl>
Subject: [PATCH 1/1] can: skb: add and set local_origin flag
Date: Wed, 11 May 2022 14:19:13 +0200 [thread overview]
Message-ID: <20220511121913.2696181-1-o.rempel@pengutronix.de> (raw)
Add new can_skb_priv::local_origin flag to be able detect egress
packages even if they was sent directly from kernel and not assigned to
some socket.
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Cc: Devid Antonio Filoni <devid.filoni@egluetechnologies.com>
---
drivers/net/can/dev/skb.c | 3 +++
include/linux/can/skb.h | 1 +
net/can/raw.c | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/net/can/dev/skb.c b/drivers/net/can/dev/skb.c
index 61660248c69e..3e2357fb387e 100644
--- a/drivers/net/can/dev/skb.c
+++ b/drivers/net/can/dev/skb.c
@@ -63,6 +63,7 @@ int can_put_echo_skb(struct sk_buff *skb, struct net_device *dev,
/* save frame_len to reuse it when transmission is completed */
can_skb_prv(skb)->frame_len = frame_len;
+ can_skb_prv(skb)->local_origin = true;
skb_tx_timestamp(skb);
@@ -200,6 +201,7 @@ struct sk_buff *alloc_can_skb(struct net_device *dev, struct can_frame **cf)
can_skb_reserve(skb);
can_skb_prv(skb)->ifindex = dev->ifindex;
can_skb_prv(skb)->skbcnt = 0;
+ can_skb_prv(skb)->local_origin = false;
*cf = skb_put_zero(skb, sizeof(struct can_frame));
@@ -231,6 +233,7 @@ struct sk_buff *alloc_canfd_skb(struct net_device *dev,
can_skb_reserve(skb);
can_skb_prv(skb)->ifindex = dev->ifindex;
can_skb_prv(skb)->skbcnt = 0;
+ can_skb_prv(skb)->local_origin = false;
*cfd = skb_put_zero(skb, sizeof(struct canfd_frame));
diff --git a/include/linux/can/skb.h b/include/linux/can/skb.h
index fdb22b00674a..1b8a8cf2b13b 100644
--- a/include/linux/can/skb.h
+++ b/include/linux/can/skb.h
@@ -52,6 +52,7 @@ struct can_skb_priv {
int ifindex;
int skbcnt;
unsigned int frame_len;
+ bool local_origin;
struct can_frame cf[];
};
diff --git a/net/can/raw.c b/net/can/raw.c
index b7dbb57557f3..df2d9334b395 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -173,7 +173,7 @@ static void raw_rcv(struct sk_buff *oskb, void *data)
/* add CAN specific message flags for raw_recvmsg() */
pflags = raw_flags(skb);
*pflags = 0;
- if (oskb->sk)
+ if (can_skb_prv(skb)->local_origin)
*pflags |= MSG_DONTROUTE;
if (oskb->sk == sk)
*pflags |= MSG_CONFIRM;
--
2.30.2
next reply other threads:[~2022-05-11 12:19 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-11 12:19 Oleksij Rempel [this message]
2022-05-11 12:38 ` [PATCH 1/1] can: skb: add and set local_origin flag Oliver Hartkopp
2022-05-11 12:53 ` Oleksij Rempel
2022-05-11 13:05 ` Marc Kleine-Budde
2022-05-11 13:24 ` Oliver Hartkopp
2022-05-11 13:55 ` Marc Kleine-Budde
2022-05-11 13:24 ` Marc Kleine-Budde
2022-05-11 14:36 ` Marc Kleine-Budde
2022-05-11 14:50 ` Oliver Hartkopp
2022-05-11 14:54 ` Marc Kleine-Budde
2022-05-11 14:57 ` Oliver Hartkopp
2022-05-12 6:23 ` Oliver Hartkopp
2022-05-12 7:58 ` Marc Kleine-Budde
2022-05-14 3:43 ` Vincent Mailhol
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220511121913.2696181-1-o.rempel@pengutronix.de \
--to=o.rempel@pengutronix.de \
--cc=david@protonic.nl \
--cc=devid.filoni@egluetechnologies.com \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=socketcan@hartkopp.net \
--cc=wg@grandegger.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).