From: "Martin Hundebøll" <martin@geanix.com>
To: Wolfgang Grandegger <wg@grandegger.com>,
Marc Kleine-Budde <mkl@pengutronix.de>,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Chandrasekar Ramakrishnan <rcsekar@samsung.com>
Cc: linux-can@vger.kernel.org, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
"Martin Hundebøll" <martin@geanix.com>
Subject: [PATCH 1/2] can: netlink: support setting hardware filters
Date: Thu, 17 Aug 2023 12:10:13 +0200 [thread overview]
Message-ID: <20230817101014.3484715-2-martin@geanix.com> (raw)
In-Reply-To: <20230817101014.3484715-1-martin@geanix.com>
Add a netlink flag to pass per-device hardware filter configurations
similar to the per-socket software filters. Since different devices
supports different numbers and forms of filters (e.g. standard and
extended message IDs), a driver callback is added to validate the passed
filters.
Each filter consist of an ID value and a mask. The latter controls which
bit(s) in the message ID to filter against, and the former controls what
values the matched bits must have to accept the message.
For example, setting id=3f0 and mask=7f0 will accept messages with IDs
ranging from 0x3f0 to 0x3ff.
Each driver needs to implement first the validate_hw_filter() function,
and then configure the filters found in can->hw_filter when upping the
interface.
Signed-off-by: Martin Hundebøll <martin@geanix.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/dev/dev.c | 3 +++
drivers/net/can/dev/netlink.c | 33 ++++++++++++++++++++++++++++++++
include/linux/can/dev.h | 5 +++++
include/uapi/linux/can/netlink.h | 1 +
4 files changed, 42 insertions(+)
diff --git a/drivers/net/can/dev/dev.c b/drivers/net/can/dev/dev.c
index 7f9334a8af50..c62d2af49e74 100644
--- a/drivers/net/can/dev/dev.c
+++ b/drivers/net/can/dev/dev.c
@@ -280,6 +280,9 @@ EXPORT_SYMBOL_GPL(alloc_candev_mqs);
/* Free space of the CAN network device */
void free_candev(struct net_device *dev)
{
+ struct can_priv *priv = netdev_priv(dev);
+
+ kfree(priv->hw_filter);
free_netdev(dev);
}
EXPORT_SYMBOL_GPL(free_candev);
diff --git a/drivers/net/can/dev/netlink.c b/drivers/net/can/dev/netlink.c
index 036d85ef07f5..72cec9212bb8 100644
--- a/drivers/net/can/dev/netlink.c
+++ b/drivers/net/can/dev/netlink.c
@@ -22,6 +22,7 @@ static const struct nla_policy can_policy[IFLA_CAN_MAX + 1] = {
[IFLA_CAN_TERMINATION] = { .type = NLA_U16 },
[IFLA_CAN_TDC] = { .type = NLA_NESTED },
[IFLA_CAN_CTRLMODE_EXT] = { .type = NLA_NESTED },
+ [IFLA_CAN_HW_FILTER] = { .type = NLA_UNSPEC },
};
static const struct nla_policy can_tdc_policy[IFLA_CAN_TDC_MAX + 1] = {
@@ -386,6 +387,38 @@ static int can_changelink(struct net_device *dev, struct nlattr *tb[],
priv->termination = termval;
}
+ if (data[IFLA_CAN_HW_FILTER]) {
+ int len = nla_len(data[IFLA_CAN_HW_FILTER]);
+ int num_filter = len / sizeof(struct can_filter);
+ struct can_filter *filter = nla_data(data[IFLA_CAN_HW_FILTER]);
+
+ if (!priv->validate_hw_filter)
+ return -EOPNOTSUPP;
+
+ /* Do not allow changing HW filters while running */
+ if (dev->flags & IFF_UP)
+ return -EBUSY;
+
+ if (len % sizeof(struct can_filter))
+ return -EINVAL;
+
+ /* let the CAN driver validate the given hw filters */
+ err = priv->validate_hw_filter(dev, filter, num_filter);
+ if (err)
+ return err;
+
+ kfree(priv->hw_filter);
+ priv->hw_filter = NULL;
+ priv->hw_filter_cnt = 0;
+
+ if (len) {
+ priv->hw_filter = kmemdup(filter, len, GFP_KERNEL);
+ if (!priv->hw_filter)
+ return -ENOMEM;
+ priv->hw_filter_cnt = num_filter;
+ }
+ }
+
return 0;
}
diff --git a/include/linux/can/dev.h b/include/linux/can/dev.h
index 982ba245eb41..a6b27c75c4ac 100644
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
@@ -56,6 +56,8 @@ struct can_priv {
const u32 *data_bitrate_const;
unsigned int data_bitrate_const_cnt;
u32 bitrate_max;
+ struct can_filter *hw_filter;
+ unsigned int hw_filter_cnt;
struct can_clock clock;
unsigned int termination_const_cnt;
@@ -80,6 +82,9 @@ struct can_priv {
int (*do_set_data_bittiming)(struct net_device *dev);
int (*do_set_mode)(struct net_device *dev, enum can_mode mode);
int (*do_set_termination)(struct net_device *dev, u16 term);
+ int (*validate_hw_filter)(struct net_device *dev,
+ struct can_filter *hwf,
+ unsigned int hwf_cnt);
int (*do_get_state)(const struct net_device *dev,
enum can_state *state);
int (*do_get_berr_counter)(const struct net_device *dev,
diff --git a/include/uapi/linux/can/netlink.h b/include/uapi/linux/can/netlink.h
index 02ec32d69474..2dfa09153bc4 100644
--- a/include/uapi/linux/can/netlink.h
+++ b/include/uapi/linux/can/netlink.h
@@ -138,6 +138,7 @@ enum {
IFLA_CAN_BITRATE_MAX,
IFLA_CAN_TDC,
IFLA_CAN_CTRLMODE_EXT,
+ IFLA_CAN_HW_FILTER,
/* add new constants above here */
__IFLA_CAN_MAX,
--
2.41.0
next prev parent reply other threads:[~2023-08-17 10:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-17 10:10 [PATCH 0/2] can: per-device hardware filter support Martin Hundebøll
2023-08-17 10:10 ` Martin Hundebøll [this message]
2023-08-17 16:45 ` [PATCH 1/2] can: netlink: support setting hardware filters Jakub Kicinski
2023-08-19 13:10 ` Vincent Mailhol
2023-08-19 13:29 ` Vincent Mailhol
2023-08-20 19:20 ` Oliver Hartkopp
2023-08-21 16:50 ` Vincent Mailhol
2023-08-17 10:10 ` [PATCH 2/2] can: m_can: support setting hw filters Martin Hundebøll
2023-08-17 10:37 ` [PATCH 0/2] can: per-device hardware filter support Oliver Hartkopp
2023-08-17 11:05 ` [PATCH] can: ip: support hw-filter setting Martin Hundebøll
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=20230817101014.3484715-2-martin@geanix.com \
--to=martin@geanix.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=rcsekar@samsung.com \
--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 read-only IMAP folder(s) and NNTP newsgroup(s).