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@xxxxxxxxxx>
Signed-off-by: Marc Kleine-Budde <mkl@xxxxxxxxxxxxxx>
---
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
