* [patch net-next 0/8] devlink: introduce notifications filtering
@ 2023-11-15 14:17 Jiri Pirko
2023-11-15 14:17 ` [patch net-next 1/8] devlink: use devl_is_registered() helper instead xa_get_mark() Jiri Pirko
` (8 more replies)
0 siblings, 9 replies; 20+ messages in thread
From: Jiri Pirko @ 2023-11-15 14:17 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
From: Jiri Pirko <jiri@nvidia.com>
Currently the user listening on a socket for devlink notifications
gets always all messages for all existing devlink instances and objects,
even if he is interested only in one of those. That may cause
unnecessary overhead on setups with thousands of instances present.
User is currently able to narrow down the devlink objects replies
to dump commands by specifying select attributes.
Allow similar approach for notifications providing user a new
notify-filter-set command to select attributes with values
the notification message has to match. In that case, it is delivered
to the socket.
Note that the filtering is done per-socket, so multiple users may
specify different selection of attributes with values.
This patchset initially introduces support for following attributes:
DEVLINK_ATTR_BUS_NAME
DEVLINK_ATTR_DEV_NAME
DEVLINK_ATTR_PORT_INDEX
Patches #1 - #4 are preparations in devlink code, patch #3 is
an optimization done on the way.
Patches #5 and #6 are preparations in netlink and generic netlink code.
Patch #7 is the main one in this set implementing of
the notify-filter-set command and the actual
per-socket filtering.
Patch #8 extends the infrastructure allowing to filter according
to a port index.
Example:
$ devlink mon port pci/0000:08:00.0/32768
[port,new] pci/0000:08:00.0/32768: type notset flavour pcisf controller 0 pfnum 0 sfnum 107 splittable false
function:
hw_addr 00:00:00:00:00:00 state inactive opstate detached roce enable
[port,new] pci/0000:08:00.0/32768: type eth flavour pcisf controller 0 pfnum 0 sfnum 107 splittable false
function:
hw_addr 00:00:00:00:00:00 state inactive opstate detached roce enable
[port,new] pci/0000:08:00.0/32768: type eth netdev eth3 flavour pcisf controller 0 pfnum 0 sfnum 107 splittable false
function:
hw_addr 00:00:00:00:00:00 state inactive opstate detached roce enable
[port,new] pci/0000:08:00.0/32768: type eth netdev eth3 flavour pcisf controller 0 pfnum 0 sfnum 107 splittable false
function:
hw_addr 00:00:00:00:00:00 state inactive opstate detached roce enable
[port,new] pci/0000:08:00.0/32768: type eth flavour pcisf controller 0 pfnum 0 sfnum 107 splittable false
function:
hw_addr 00:00:00:00:00:00 state inactive opstate detached roce enable
[port,new] pci/0000:08:00.0/32768: type notset flavour pcisf controller 0 pfnum 0 sfnum 107 splittable false
function:
hw_addr 00:00:00:00:00:00 state inactive opstate detached roce enable
[port,del] pci/0000:08:00.0/32768: type notset flavour pcisf controller 0 pfnum 0 sfnum 107 splittable false
function:
hw_addr 00:00:00:00:00:00 state inactive opstate detached roce enable
Jiri Pirko (8):
devlink: use devl_is_registered() helper instead xa_get_mark()
devlink: introduce __devl_is_registered() helper and use it instead of
xa_get_mark()
devlink: send notifications only if there are listeners
devlink: introduce a helper for netlink multicast send
genetlink: implement release callback and free sk_user_data there
genetlink: introduce helpers to do filtered multicast
devlink: add a command to set notification filter and use it for
multicasts
devlink: extend multicast filtering by port index
Documentation/netlink/specs/devlink.yaml | 11 ++++
include/net/genetlink.h | 35 +++++++++--
include/net/netlink.h | 31 ++++++++--
include/uapi/linux/devlink.h | 2 +
net/devlink/dev.c | 13 ++--
net/devlink/devl_internal.h | 58 +++++++++++++++++-
net/devlink/health.c | 10 ++-
net/devlink/linecard.c | 5 +-
net/devlink/netlink.c | 77 ++++++++++++++++++++++++
net/devlink/netlink_gen.c | 16 ++++-
net/devlink/netlink_gen.h | 4 +-
net/devlink/param.c | 5 +-
net/devlink/port.c | 8 ++-
net/devlink/rate.c | 5 +-
net/devlink/region.c | 6 +-
net/devlink/trap.c | 18 +++---
net/netlink/genetlink.c | 6 ++
tools/net/ynl/generated/devlink-user.c | 33 ++++++++++
tools/net/ynl/generated/devlink-user.h | 56 +++++++++++++++++
19 files changed, 356 insertions(+), 43 deletions(-)
--
2.41.0
^ permalink raw reply [flat|nested] 20+ messages in thread
* [patch net-next 1/8] devlink: use devl_is_registered() helper instead xa_get_mark()
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
@ 2023-11-15 14:17 ` Jiri Pirko
2023-11-15 20:11 ` Jacob Keller
2023-11-15 14:17 ` [patch net-next 2/8] devlink: introduce __devl_is_registered() helper and use it instead of xa_get_mark() Jiri Pirko
` (7 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Jiri Pirko @ 2023-11-15 14:17 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
From: Jiri Pirko <jiri@nvidia.com>
Instead of checking the xarray mark directly using xa_get_mark() helper
use devl_is_registered() helper which wraps it up. Note that there are
couple more users of xa_get_mark() left which are going to be handled
by the next patch.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/devlink/dev.c | 4 ++--
net/devlink/rate.c | 2 +-
net/devlink/trap.c | 9 ++++++---
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/net/devlink/dev.c b/net/devlink/dev.c
index 4fc7adb32663..4667ab3e9ff1 100644
--- a/net/devlink/dev.c
+++ b/net/devlink/dev.c
@@ -201,7 +201,7 @@ static void devlink_notify(struct devlink *devlink, enum devlink_command cmd)
int err;
WARN_ON(cmd != DEVLINK_CMD_NEW && cmd != DEVLINK_CMD_DEL);
- WARN_ON(!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED));
+ WARN_ON(!devl_is_registered(devlink));
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!msg)
@@ -977,7 +977,7 @@ static void __devlink_flash_update_notify(struct devlink *devlink,
cmd != DEVLINK_CMD_FLASH_UPDATE_END &&
cmd != DEVLINK_CMD_FLASH_UPDATE_STATUS);
- if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+ if (!devl_is_registered(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
diff --git a/net/devlink/rate.c b/net/devlink/rate.c
index 94b289b93ff2..e2190cf22beb 100644
--- a/net/devlink/rate.c
+++ b/net/devlink/rate.c
@@ -146,7 +146,7 @@ static void devlink_rate_notify(struct devlink_rate *devlink_rate,
WARN_ON(cmd != DEVLINK_CMD_RATE_NEW && cmd != DEVLINK_CMD_RATE_DEL);
- if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+ if (!devl_is_registered(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
diff --git a/net/devlink/trap.c b/net/devlink/trap.c
index c26313e7ca08..908085e2c990 100644
--- a/net/devlink/trap.c
+++ b/net/devlink/trap.c
@@ -1173,7 +1173,8 @@ devlink_trap_group_notify(struct devlink *devlink,
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_GROUP_NEW &&
cmd != DEVLINK_CMD_TRAP_GROUP_DEL);
- if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+
+ if (!devl_is_registered(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1234,7 +1235,8 @@ static void devlink_trap_notify(struct devlink *devlink,
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_NEW &&
cmd != DEVLINK_CMD_TRAP_DEL);
- if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+
+ if (!devl_is_registered(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1710,7 +1712,8 @@ devlink_trap_policer_notify(struct devlink *devlink,
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW &&
cmd != DEVLINK_CMD_TRAP_POLICER_DEL);
- if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+
+ if (!devl_is_registered(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
--
2.41.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [patch net-next 2/8] devlink: introduce __devl_is_registered() helper and use it instead of xa_get_mark()
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
2023-11-15 14:17 ` [patch net-next 1/8] devlink: use devl_is_registered() helper instead xa_get_mark() Jiri Pirko
@ 2023-11-15 14:17 ` Jiri Pirko
2023-11-15 20:11 ` Jacob Keller
2023-11-15 14:17 ` [patch net-next 3/8] devlink: send notifications only if there are listeners Jiri Pirko
` (6 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Jiri Pirko @ 2023-11-15 14:17 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
From: Jiri Pirko <jiri@nvidia.com>
Introduce __devl_is_registered() which does not assert on devlink
instance lock and use it in notifications which may be called
without devlink instance lock held.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/devlink/devl_internal.h | 7 ++++++-
net/devlink/linecard.c | 2 +-
net/devlink/port.c | 2 +-
net/devlink/region.c | 3 ++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 183dbe3807ab..381b8e62d906 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -90,10 +90,15 @@ extern struct genl_family devlink_nl_family;
struct devlink *devlinks_xa_find_get(struct net *net, unsigned long *indexp);
+static inline bool __devl_is_registered(struct devlink *devlink)
+{
+ return xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED);
+}
+
static inline bool devl_is_registered(struct devlink *devlink)
{
devl_assert_locked(devlink);
- return xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED);
+ return __devl_is_registered(devlink);
}
typedef void devlink_rel_notify_cb_t(struct devlink *devlink, u32 obj_index);
diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
index 2f1c317b64cd..9d080ac1734b 100644
--- a/net/devlink/linecard.c
+++ b/net/devlink/linecard.c
@@ -136,7 +136,7 @@ static void devlink_linecard_notify(struct devlink_linecard *linecard,
WARN_ON(cmd != DEVLINK_CMD_LINECARD_NEW &&
cmd != DEVLINK_CMD_LINECARD_DEL);
- if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+ if (!__devl_is_registered(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
diff --git a/net/devlink/port.c b/net/devlink/port.c
index 7634f187fa50..f229a8699214 100644
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -512,7 +512,7 @@ static void devlink_port_notify(struct devlink_port *devlink_port,
WARN_ON(cmd != DEVLINK_CMD_PORT_NEW && cmd != DEVLINK_CMD_PORT_DEL);
- if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+ if (!__devl_is_registered(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
diff --git a/net/devlink/region.c b/net/devlink/region.c
index 0aab7b82d678..396930324da4 100644
--- a/net/devlink/region.c
+++ b/net/devlink/region.c
@@ -234,7 +234,8 @@ static void devlink_nl_region_notify(struct devlink_region *region,
struct sk_buff *msg;
WARN_ON(cmd != DEVLINK_CMD_REGION_NEW && cmd != DEVLINK_CMD_REGION_DEL);
- if (!xa_get_mark(&devlinks, devlink->index, DEVLINK_REGISTERED))
+
+ if (!__devl_is_registered(devlink))
return;
msg = devlink_nl_region_notify_build(region, snapshot, cmd, 0, 0);
--
2.41.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [patch net-next 3/8] devlink: send notifications only if there are listeners
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
2023-11-15 14:17 ` [patch net-next 1/8] devlink: use devl_is_registered() helper instead xa_get_mark() Jiri Pirko
2023-11-15 14:17 ` [patch net-next 2/8] devlink: introduce __devl_is_registered() helper and use it instead of xa_get_mark() Jiri Pirko
@ 2023-11-15 14:17 ` Jiri Pirko
2023-11-15 20:17 ` Jacob Keller
2023-11-15 14:17 ` [patch net-next 4/8] devlink: introduce a helper for netlink multicast send Jiri Pirko
` (5 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Jiri Pirko @ 2023-11-15 14:17 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
From: Jiri Pirko <jiri@nvidia.com>
Introduce devlink_nl_notify_need() helper and using it to check at the
beginning of notification functions to avoid overhead of composing
notification messages in case nobody listens.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/devlink/dev.c | 5 ++++-
net/devlink/devl_internal.h | 6 ++++++
net/devlink/health.c | 3 +++
net/devlink/linecard.c | 2 +-
net/devlink/param.c | 2 +-
net/devlink/port.c | 2 +-
net/devlink/rate.c | 2 +-
net/devlink/region.c | 2 +-
net/devlink/trap.c | 6 +++---
9 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/net/devlink/dev.c b/net/devlink/dev.c
index 4667ab3e9ff1..582b5177f403 100644
--- a/net/devlink/dev.c
+++ b/net/devlink/dev.c
@@ -203,6 +203,9 @@ static void devlink_notify(struct devlink *devlink, enum devlink_command cmd)
WARN_ON(cmd != DEVLINK_CMD_NEW && cmd != DEVLINK_CMD_DEL);
WARN_ON(!devl_is_registered(devlink));
+ if (!devlink_nl_notify_need(devlink))
+ return;
+
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!msg)
return;
@@ -977,7 +980,7 @@ static void __devlink_flash_update_notify(struct devlink *devlink,
cmd != DEVLINK_CMD_FLASH_UPDATE_END &&
cmd != DEVLINK_CMD_FLASH_UPDATE_STATUS);
- if (!devl_is_registered(devlink))
+ if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 381b8e62d906..8b48a07eb7b7 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -172,6 +172,12 @@ int devlink_nl_put_nested_handle(struct sk_buff *msg, struct net *net,
struct devlink *devlink, int attrtype);
int devlink_nl_msg_reply_and_new(struct sk_buff **msg, struct genl_info *info);
+static inline bool devlink_nl_notify_need(struct devlink *devlink)
+{
+ return genl_has_listeners(&devlink_nl_family, devlink_net(devlink),
+ DEVLINK_MCGRP_CONFIG);
+}
+
/* Notify */
void devlink_notify_register(struct devlink *devlink);
void devlink_notify_unregister(struct devlink *devlink);
diff --git a/net/devlink/health.c b/net/devlink/health.c
index 695df61f8ac2..93eae8b5d2d3 100644
--- a/net/devlink/health.c
+++ b/net/devlink/health.c
@@ -496,6 +496,9 @@ static void devlink_recover_notify(struct devlink_health_reporter *reporter,
WARN_ON(cmd != DEVLINK_CMD_HEALTH_REPORTER_RECOVER);
ASSERT_DEVLINK_REGISTERED(devlink);
+ if (!devlink_nl_notify_need(devlink))
+ return;
+
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
if (!msg)
return;
diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
index 9d080ac1734b..45b36975ee6f 100644
--- a/net/devlink/linecard.c
+++ b/net/devlink/linecard.c
@@ -136,7 +136,7 @@ static void devlink_linecard_notify(struct devlink_linecard *linecard,
WARN_ON(cmd != DEVLINK_CMD_LINECARD_NEW &&
cmd != DEVLINK_CMD_LINECARD_DEL);
- if (!__devl_is_registered(devlink))
+ if (!__devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
diff --git a/net/devlink/param.c b/net/devlink/param.c
index d74df09311a9..6bb6aee5d937 100644
--- a/net/devlink/param.c
+++ b/net/devlink/param.c
@@ -343,7 +343,7 @@ static void devlink_param_notify(struct devlink *devlink,
* will replay the notifications if the params are added/removed
* outside of the lifetime of the instance.
*/
- if (!devl_is_registered(devlink))
+ if (!devlink_nl_notify_need(devlink) || !devl_is_registered(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
diff --git a/net/devlink/port.c b/net/devlink/port.c
index f229a8699214..32f4d0331e63 100644
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -512,7 +512,7 @@ static void devlink_port_notify(struct devlink_port *devlink_port,
WARN_ON(cmd != DEVLINK_CMD_PORT_NEW && cmd != DEVLINK_CMD_PORT_DEL);
- if (!__devl_is_registered(devlink))
+ if (!__devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
diff --git a/net/devlink/rate.c b/net/devlink/rate.c
index e2190cf22beb..0371a2dd3e0a 100644
--- a/net/devlink/rate.c
+++ b/net/devlink/rate.c
@@ -146,7 +146,7 @@ static void devlink_rate_notify(struct devlink_rate *devlink_rate,
WARN_ON(cmd != DEVLINK_CMD_RATE_NEW && cmd != DEVLINK_CMD_RATE_DEL);
- if (!devl_is_registered(devlink))
+ if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
diff --git a/net/devlink/region.c b/net/devlink/region.c
index 396930324da4..f1402da66277 100644
--- a/net/devlink/region.c
+++ b/net/devlink/region.c
@@ -235,7 +235,7 @@ static void devlink_nl_region_notify(struct devlink_region *region,
WARN_ON(cmd != DEVLINK_CMD_REGION_NEW && cmd != DEVLINK_CMD_REGION_DEL);
- if (!__devl_is_registered(devlink))
+ if (!__devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
return;
msg = devlink_nl_region_notify_build(region, snapshot, cmd, 0, 0);
diff --git a/net/devlink/trap.c b/net/devlink/trap.c
index 908085e2c990..3ca1ca7e2e64 100644
--- a/net/devlink/trap.c
+++ b/net/devlink/trap.c
@@ -1174,7 +1174,7 @@ devlink_trap_group_notify(struct devlink *devlink,
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_GROUP_NEW &&
cmd != DEVLINK_CMD_TRAP_GROUP_DEL);
- if (!devl_is_registered(devlink))
+ if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1236,7 +1236,7 @@ static void devlink_trap_notify(struct devlink *devlink,
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_NEW &&
cmd != DEVLINK_CMD_TRAP_DEL);
- if (!devl_is_registered(devlink))
+ if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
@@ -1713,7 +1713,7 @@ devlink_trap_policer_notify(struct devlink *devlink,
WARN_ON_ONCE(cmd != DEVLINK_CMD_TRAP_POLICER_NEW &&
cmd != DEVLINK_CMD_TRAP_POLICER_DEL);
- if (!devl_is_registered(devlink))
+ if (!devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
return;
msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
--
2.41.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [patch net-next 4/8] devlink: introduce a helper for netlink multicast send
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
` (2 preceding siblings ...)
2023-11-15 14:17 ` [patch net-next 3/8] devlink: send notifications only if there are listeners Jiri Pirko
@ 2023-11-15 14:17 ` Jiri Pirko
2023-11-15 20:18 ` Jacob Keller
2023-11-15 14:17 ` [patch net-next 5/8] genetlink: implement release callback and free sk_user_data there Jiri Pirko
` (4 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Jiri Pirko @ 2023-11-15 14:17 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
From: Jiri Pirko <jiri@nvidia.com>
Introduce a helper devlink_nl_notify_send() so each object notification
function does not have to call genlmsg_multicast_netns() with the same
arguments.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/devlink/dev.c | 6 ++----
net/devlink/devl_internal.h | 7 +++++++
net/devlink/health.c | 3 +--
net/devlink/linecard.c | 3 +--
net/devlink/param.c | 3 +--
net/devlink/port.c | 3 +--
net/devlink/rate.c | 3 +--
net/devlink/region.c | 3 +--
net/devlink/trap.c | 9 +++------
9 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/net/devlink/dev.c b/net/devlink/dev.c
index 582b5177f403..ecbc6d51b624 100644
--- a/net/devlink/dev.c
+++ b/net/devlink/dev.c
@@ -216,8 +216,7 @@ static void devlink_notify(struct devlink *devlink, enum devlink_command cmd)
return;
}
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
- msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
int devlink_nl_get_doit(struct sk_buff *skb, struct genl_info *info)
@@ -991,8 +990,7 @@ static void __devlink_flash_update_notify(struct devlink *devlink,
if (err)
goto out_free_msg;
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
- msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
return;
out_free_msg:
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 8b48a07eb7b7..e19e8dd47092 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -178,6 +178,13 @@ static inline bool devlink_nl_notify_need(struct devlink *devlink)
DEVLINK_MCGRP_CONFIG);
}
+static inline void devlink_nl_notify_send(struct devlink *devlink,
+ struct sk_buff *msg)
+{
+ genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
+ msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+}
+
/* Notify */
void devlink_notify_register(struct devlink *devlink);
void devlink_notify_unregister(struct devlink *devlink);
diff --git a/net/devlink/health.c b/net/devlink/health.c
index 93eae8b5d2d3..2f06e4ddbf3b 100644
--- a/net/devlink/health.c
+++ b/net/devlink/health.c
@@ -509,8 +509,7 @@ static void devlink_recover_notify(struct devlink_health_reporter *reporter,
return;
}
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink), msg,
- 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
void
diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
index 45b36975ee6f..67f70a621d27 100644
--- a/net/devlink/linecard.c
+++ b/net/devlink/linecard.c
@@ -150,8 +150,7 @@ static void devlink_linecard_notify(struct devlink_linecard *linecard,
return;
}
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
- msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
void devlink_linecards_notify_register(struct devlink *devlink)
diff --git a/net/devlink/param.c b/net/devlink/param.c
index 6bb6aee5d937..854a3af65db9 100644
--- a/net/devlink/param.c
+++ b/net/devlink/param.c
@@ -356,8 +356,7 @@ static void devlink_param_notify(struct devlink *devlink,
return;
}
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
- msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
static void devlink_params_notify(struct devlink *devlink,
diff --git a/net/devlink/port.c b/net/devlink/port.c
index 32f4d0331e63..758df3000a1b 100644
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -525,8 +525,7 @@ static void devlink_port_notify(struct devlink_port *devlink_port,
return;
}
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink), msg,
- 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
static void devlink_ports_notify(struct devlink *devlink,
diff --git a/net/devlink/rate.c b/net/devlink/rate.c
index 0371a2dd3e0a..7139e67e93ae 100644
--- a/net/devlink/rate.c
+++ b/net/devlink/rate.c
@@ -159,8 +159,7 @@ static void devlink_rate_notify(struct devlink_rate *devlink_rate,
return;
}
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink), msg,
- 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
void devlink_rates_notify_register(struct devlink *devlink)
diff --git a/net/devlink/region.c b/net/devlink/region.c
index f1402da66277..fd6bfabc0c33 100644
--- a/net/devlink/region.c
+++ b/net/devlink/region.c
@@ -242,8 +242,7 @@ static void devlink_nl_region_notify(struct devlink_region *region,
if (IS_ERR(msg))
return;
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink), msg,
- 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
void devlink_regions_notify_register(struct devlink *devlink)
diff --git a/net/devlink/trap.c b/net/devlink/trap.c
index 3ca1ca7e2e64..5d18c7424df1 100644
--- a/net/devlink/trap.c
+++ b/net/devlink/trap.c
@@ -1188,8 +1188,7 @@ devlink_trap_group_notify(struct devlink *devlink,
return;
}
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
- msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
void devlink_trap_groups_notify_register(struct devlink *devlink)
@@ -1249,8 +1248,7 @@ static void devlink_trap_notify(struct devlink *devlink,
return;
}
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
- msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
void devlink_traps_notify_register(struct devlink *devlink)
@@ -1727,8 +1725,7 @@ devlink_trap_policer_notify(struct devlink *devlink,
return;
}
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
- msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ devlink_nl_notify_send(devlink, msg);
}
void devlink_trap_policers_notify_register(struct devlink *devlink)
--
2.41.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [patch net-next 5/8] genetlink: implement release callback and free sk_user_data there
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
` (3 preceding siblings ...)
2023-11-15 14:17 ` [patch net-next 4/8] devlink: introduce a helper for netlink multicast send Jiri Pirko
@ 2023-11-15 14:17 ` Jiri Pirko
2023-11-15 14:17 ` [patch net-next 6/8] genetlink: introduce helpers to do filtered multicast Jiri Pirko
` (3 subsequent siblings)
8 siblings, 0 replies; 20+ messages in thread
From: Jiri Pirko @ 2023-11-15 14:17 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
From: Jiri Pirko <jiri@nvidia.com>
If any generic netlink family would like to allocate data store the
pointer to sk_user_data, there is no way to do cleanup in the family
code.
Assume that kfree() is good for now, as the only user introduced by the
follow-up patch (devlink) will use kzalloc() for the allocation of
the memory pointed by a pointer stored in sk_user_data. If later on
this needs to be implemented per-family, a callback is going
to be needed. Until then (if ever), do this in a simple way.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
net/netlink/genetlink.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 92ef5ed2e7b0..905c5a167f53 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -1699,12 +1699,18 @@ static int genl_bind(struct net *net, int group)
return ret;
}
+static void genl_release(struct sock *sk, unsigned long *groups)
+{
+ kfree(sk->sk_user_data);
+}
+
static int __net_init genl_pernet_init(struct net *net)
{
struct netlink_kernel_cfg cfg = {
.input = genl_rcv,
.flags = NL_CFG_F_NONROOT_RECV,
.bind = genl_bind,
+ .release = genl_release,
};
/* we'll bump the group number right afterwards */
--
2.41.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [patch net-next 6/8] genetlink: introduce helpers to do filtered multicast
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
` (4 preceding siblings ...)
2023-11-15 14:17 ` [patch net-next 5/8] genetlink: implement release callback and free sk_user_data there Jiri Pirko
@ 2023-11-15 14:17 ` Jiri Pirko
2023-11-15 14:53 ` Andy Shevchenko
2023-11-15 14:17 ` [patch net-next 7/8] devlink: add a command to set notification filter and use it for multicasts Jiri Pirko
` (2 subsequent siblings)
8 siblings, 1 reply; 20+ messages in thread
From: Jiri Pirko @ 2023-11-15 14:17 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
From: Jiri Pirko <jiri@nvidia.com>
Currently it is possible for netlink kernel user to pass custom
filter function to broadcast send function netlink_broadcast_filtered().
However, this is not exposed to multicast send and to generic
netlink users.
Extend the api and introduce a netlink helper nlmsg_multicast_filtered()
and a generic netlink helper genlmsg_multicast_netns_filtered()
to allow generic netlink families to specify filter function
while sending multicast messages.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
include/net/genetlink.h | 35 +++++++++++++++++++++++++++++++----
include/net/netlink.h | 31 +++++++++++++++++++++++++++----
2 files changed, 58 insertions(+), 8 deletions(-)
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index e18a4c0d69ee..ec93e73fd8f8 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -435,6 +435,35 @@ static inline void genlmsg_cancel(struct sk_buff *skb, void *hdr)
nlmsg_cancel(skb, hdr - GENL_HDRLEN - NLMSG_HDRLEN);
}
+/**
+ * genlmsg_multicast_netns_filtered - multicast a netlink message
+ * to a specific netns with filter
+ * function
+ * @family: the generic netlink family
+ * @net: the net namespace
+ * @skb: netlink message as socket buffer
+ * @portid: own netlink portid to avoid sending to yourself
+ * @group: offset of multicast group in groups array
+ * @flags: allocation flags
+ * @filter: filter function
+ * @filter_data: filter function private data
+ */
+static inline int
+genlmsg_multicast_netns_filtered(const struct genl_family *family,
+ struct net *net, struct sk_buff *skb,
+ u32 portid, unsigned int group, gfp_t flags,
+ int (*filter)(struct sock *dsk,
+ struct sk_buff *skb,
+ void *data),
+ void *filter_data)
+{
+ if (WARN_ON_ONCE(group >= family->n_mcgrps))
+ return -EINVAL;
+ group = family->mcgrp_offset + group;
+ return nlmsg_multicast_filtered(net->genl_sock, skb, portid, group,
+ flags, filter, filter_data);
+}
+
/**
* genlmsg_multicast_netns - multicast a netlink message to a specific netns
* @family: the generic netlink family
@@ -448,10 +477,8 @@ static inline int genlmsg_multicast_netns(const struct genl_family *family,
struct net *net, struct sk_buff *skb,
u32 portid, unsigned int group, gfp_t flags)
{
- if (WARN_ON_ONCE(group >= family->n_mcgrps))
- return -EINVAL;
- group = family->mcgrp_offset + group;
- return nlmsg_multicast(net->genl_sock, skb, portid, group, flags);
+ return genlmsg_multicast_netns_filtered(family, net, skb, portid,
+ group, flags, NULL, NULL);
}
/**
diff --git a/include/net/netlink.h b/include/net/netlink.h
index 83bdf787aeee..60f510e33964 100644
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
@@ -1073,27 +1073,50 @@ static inline void nlmsg_free(struct sk_buff *skb)
}
/**
- * nlmsg_multicast - multicast a netlink message
+ * nlmsg_multicast_filtered - multicast a netlink message with filter function
* @sk: netlink socket to spread messages to
* @skb: netlink message as socket buffer
* @portid: own netlink portid to avoid sending to yourself
* @group: multicast group id
* @flags: allocation flags
+ * @filter: filter function
+ * @filter_data: filter function private data
*/
-static inline int nlmsg_multicast(struct sock *sk, struct sk_buff *skb,
- u32 portid, unsigned int group, gfp_t flags)
+static inline int nlmsg_multicast_filtered(struct sock *sk, struct sk_buff *skb,
+ u32 portid, unsigned int group,
+ gfp_t flags,
+ int (*filter)(struct sock *dsk,
+ struct sk_buff *skb,
+ void *data),
+ void *filter_data)
{
int err;
NETLINK_CB(skb).dst_group = group;
- err = netlink_broadcast(sk, skb, portid, group, flags);
+ err = netlink_broadcast_filtered(sk, skb, portid, group, flags,
+ filter, filter_data);
if (err > 0)
err = 0;
return err;
}
+/**
+ * nlmsg_multicast - multicast a netlink message
+ * @sk: netlink socket to spread messages to
+ * @skb: netlink message as socket buffer
+ * @portid: own netlink portid to avoid sending to yourself
+ * @group: multicast group id
+ * @flags: allocation flags
+ */
+static inline int nlmsg_multicast(struct sock *sk, struct sk_buff *skb,
+ u32 portid, unsigned int group, gfp_t flags)
+{
+ return nlmsg_multicast_filtered(sk, skb, portid, group, flags,
+ NULL, NULL);
+}
+
/**
* nlmsg_unicast - unicast a netlink message
* @sk: netlink socket to spread message to
--
2.41.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [patch net-next 7/8] devlink: add a command to set notification filter and use it for multicasts
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
` (5 preceding siblings ...)
2023-11-15 14:17 ` [patch net-next 6/8] genetlink: introduce helpers to do filtered multicast Jiri Pirko
@ 2023-11-15 14:17 ` Jiri Pirko
2023-11-15 14:17 ` [patch net-next 8/8] devlink: extend multicast filtering by port index Jiri Pirko
2023-11-16 9:14 ` [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
8 siblings, 0 replies; 20+ messages in thread
From: Jiri Pirko @ 2023-11-15 14:17 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
From: Jiri Pirko <jiri@nvidia.com>
Currently the user listening on a socket for devlink notifications
gets always all messages for all existing instances, even if he is
interested only in one of those. That may cause unnecessary overhead
on setups with thousands of instances present.
User is currently able to narrow down the devlink objects replies
to dump commands by specifying select attributes.
Allow similar approach for notifications. Introduce a new devlink
NOTIFY_FILTER_SET which the user passes the select attributes. Store
these per-socket and use them for filtering messages
during multicast send.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
Documentation/netlink/specs/devlink.yaml | 10 ++++
include/uapi/linux/devlink.h | 2 +
net/devlink/devl_internal.h | 33 +++++++++++-
net/devlink/netlink.c | 69 ++++++++++++++++++++++++
net/devlink/netlink_gen.c | 15 +++++-
net/devlink/netlink_gen.h | 4 +-
tools/net/ynl/generated/devlink-user.c | 31 +++++++++++
tools/net/ynl/generated/devlink-user.h | 47 ++++++++++++++++
8 files changed, 207 insertions(+), 4 deletions(-)
diff --git a/Documentation/netlink/specs/devlink.yaml b/Documentation/netlink/specs/devlink.yaml
index 572d83a414d0..cc4991cbce83 100644
--- a/Documentation/netlink/specs/devlink.yaml
+++ b/Documentation/netlink/specs/devlink.yaml
@@ -2055,3 +2055,13 @@ operations:
- bus-name
- dev-name
- selftests
+
+ -
+ name: notify-filter-set
+ doc: Set notification messages socket filter.
+ attribute-set: devlink
+ do:
+ request:
+ attributes:
+ - bus-name
+ - dev-name
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index b3c8383d342d..130cae0d3e20 100644
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -139,6 +139,8 @@ enum devlink_command {
DEVLINK_CMD_SELFTESTS_GET, /* can dump */
DEVLINK_CMD_SELFTESTS_RUN,
+ DEVLINK_CMD_NOTIFY_FILTER_SET,
+
/* add new commands above here */
__DEVLINK_CMD_MAX,
DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index e19e8dd47092..0ee0bcdd4a7d 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -178,11 +178,40 @@ static inline bool devlink_nl_notify_need(struct devlink *devlink)
DEVLINK_MCGRP_CONFIG);
}
+struct devlink_obj_desc {
+ const char *bus_name;
+ const char *dev_name;
+ long data[];
+};
+
+static inline void devlink_nl_obj_desc_init(struct devlink_obj_desc *desc,
+ struct devlink *devlink)
+{
+ memset(desc, 0, sizeof(*desc));
+ desc->bus_name = devlink->dev->bus->name;
+ desc->dev_name = dev_name(devlink->dev);
+}
+
+int devlink_nl_notify_filter(struct sock *dsk, struct sk_buff *skb, void *data);
+
+static inline void devlink_nl_notify_send_desc(struct devlink *devlink,
+ struct sk_buff *msg,
+ struct devlink_obj_desc *desc)
+{
+ genlmsg_multicast_netns_filtered(&devlink_nl_family,
+ devlink_net(devlink),
+ msg, 0, DEVLINK_MCGRP_CONFIG,
+ GFP_KERNEL,
+ devlink_nl_notify_filter, desc);
+}
+
static inline void devlink_nl_notify_send(struct devlink *devlink,
struct sk_buff *msg)
{
- genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
- msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+ struct devlink_obj_desc desc;
+
+ devlink_nl_obj_desc_init(&desc, devlink);
+ devlink_nl_notify_send_desc(devlink, msg, &desc);
}
/* Notify */
diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index d0b90ebc8b15..738e2f340ab9 100644
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -13,6 +13,75 @@ static const struct genl_multicast_group devlink_nl_mcgrps[] = {
[DEVLINK_MCGRP_CONFIG] = { .name = DEVLINK_GENL_MCGRP_CONFIG_NAME },
};
+int devlink_nl_notify_filter_set_doit(struct sk_buff *skb,
+ struct genl_info *info)
+{
+ struct sock *sk = NETLINK_CB(skb).sk;
+ struct nlattr **attrs = info->attrs;
+ struct devlink_obj_desc *flt;
+ size_t data_offset = 0;
+ size_t data_size = 0;
+ char *pos;
+
+ if (attrs[DEVLINK_ATTR_BUS_NAME])
+ data_size += nla_len(attrs[DEVLINK_ATTR_BUS_NAME]) + 1;
+ if (attrs[DEVLINK_ATTR_DEV_NAME])
+ data_size += nla_len(attrs[DEVLINK_ATTR_DEV_NAME]) + 1;
+
+ flt = kzalloc(sizeof(*flt) + data_size, GFP_KERNEL);
+ if (!flt)
+ return -ENOMEM;
+
+ pos = (char *) flt->data;
+ if (attrs[DEVLINK_ATTR_BUS_NAME]) {
+ data_offset += nla_strscpy(pos,
+ attrs[DEVLINK_ATTR_BUS_NAME],
+ data_size) + 1;
+ flt->bus_name = pos;
+ pos += data_offset;
+ }
+ if (attrs[DEVLINK_ATTR_DEV_NAME]) {
+ nla_strscpy(pos, attrs[DEVLINK_ATTR_DEV_NAME],
+ data_size - data_offset);
+ flt->dev_name = pos;
+ }
+
+ /* Free the existing filter if any. */
+ kfree(sk->sk_user_data);
+
+ /* Don't attach empty filter. */
+ if (!flt->bus_name && !flt->dev_name) {
+ kfree(flt);
+ flt = NULL;
+ }
+
+ sk->sk_user_data = flt;
+ return 0;
+}
+
+static bool devlink_obj_desc_match(const struct devlink_obj_desc *desc,
+ const struct devlink_obj_desc *flt)
+{
+ if (desc->bus_name && flt->bus_name &&
+ strcmp(desc->bus_name, flt->bus_name))
+ return false;
+ if (desc->dev_name && flt->dev_name &&
+ strcmp(desc->dev_name, flt->dev_name))
+ return false;
+ return true;
+}
+
+int devlink_nl_notify_filter(struct sock *dsk, struct sk_buff *skb, void *data)
+{
+ struct devlink_obj_desc *flt = dsk->sk_user_data;
+ struct devlink_obj_desc *desc = data;
+
+ if (!flt)
+ return 0;
+
+ return !devlink_obj_desc_match(desc, flt);
+}
+
int devlink_nl_put_nested_handle(struct sk_buff *msg, struct net *net,
struct devlink *devlink, int attrtype)
{
diff --git a/net/devlink/netlink_gen.c b/net/devlink/netlink_gen.c
index 788dfdc498a9..f207f3fc7e20 100644
--- a/net/devlink/netlink_gen.c
+++ b/net/devlink/netlink_gen.c
@@ -560,8 +560,14 @@ static const struct nla_policy devlink_selftests_run_nl_policy[DEVLINK_ATTR_SELF
[DEVLINK_ATTR_SELFTESTS] = NLA_POLICY_NESTED(devlink_dl_selftest_id_nl_policy),
};
+/* DEVLINK_CMD_NOTIFY_FILTER_SET - do */
+static const struct nla_policy devlink_notify_filter_set_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {
+ [DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },
+ [DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },
+};
+
/* Ops table for devlink */
-const struct genl_split_ops devlink_nl_ops[73] = {
+const struct genl_split_ops devlink_nl_ops[74] = {
{
.cmd = DEVLINK_CMD_GET,
.validate = GENL_DONT_VALIDATE_STRICT,
@@ -1233,4 +1239,11 @@ const struct genl_split_ops devlink_nl_ops[73] = {
.maxattr = DEVLINK_ATTR_SELFTESTS,
.flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO,
},
+ {
+ .cmd = DEVLINK_CMD_NOTIFY_FILTER_SET,
+ .doit = devlink_nl_notify_filter_set_doit,
+ .policy = devlink_notify_filter_set_nl_policy,
+ .maxattr = DEVLINK_ATTR_DEV_NAME,
+ .flags = GENL_CMD_CAP_DO,
+ },
};
diff --git a/net/devlink/netlink_gen.h b/net/devlink/netlink_gen.h
index 0e9e89c31c31..71693d834ad2 100644
--- a/net/devlink/netlink_gen.h
+++ b/net/devlink/netlink_gen.h
@@ -16,7 +16,7 @@ extern const struct nla_policy devlink_dl_port_function_nl_policy[DEVLINK_PORT_F
extern const struct nla_policy devlink_dl_selftest_id_nl_policy[DEVLINK_ATTR_SELFTEST_ID_FLASH + 1];
/* Ops table for devlink */
-extern const struct genl_split_ops devlink_nl_ops[73];
+extern const struct genl_split_ops devlink_nl_ops[74];
int devlink_nl_pre_doit(const struct genl_split_ops *ops, struct sk_buff *skb,
struct genl_info *info);
@@ -137,5 +137,7 @@ int devlink_nl_selftests_get_doit(struct sk_buff *skb, struct genl_info *info);
int devlink_nl_selftests_get_dumpit(struct sk_buff *skb,
struct netlink_callback *cb);
int devlink_nl_selftests_run_doit(struct sk_buff *skb, struct genl_info *info);
+int devlink_nl_notify_filter_set_doit(struct sk_buff *skb,
+ struct genl_info *info);
#endif /* _LINUX_DEVLINK_GEN_H */
diff --git a/tools/net/ynl/generated/devlink-user.c b/tools/net/ynl/generated/devlink-user.c
index bc5065bd99b2..cd5f70eadf5b 100644
--- a/tools/net/ynl/generated/devlink-user.c
+++ b/tools/net/ynl/generated/devlink-user.c
@@ -6830,6 +6830,37 @@ int devlink_selftests_run(struct ynl_sock *ys,
return 0;
}
+/* ============== DEVLINK_CMD_NOTIFY_FILTER_SET ============== */
+/* DEVLINK_CMD_NOTIFY_FILTER_SET - do */
+void
+devlink_notify_filter_set_req_free(struct devlink_notify_filter_set_req *req)
+{
+ free(req->bus_name);
+ free(req->dev_name);
+ free(req);
+}
+
+int devlink_notify_filter_set(struct ynl_sock *ys,
+ struct devlink_notify_filter_set_req *req)
+{
+ struct nlmsghdr *nlh;
+ int err;
+
+ nlh = ynl_gemsg_start_req(ys, ys->family_id, DEVLINK_CMD_NOTIFY_FILTER_SET, 1);
+ ys->req_policy = &devlink_nest;
+
+ if (req->_present.bus_name_len)
+ mnl_attr_put_strz(nlh, DEVLINK_ATTR_BUS_NAME, req->bus_name);
+ if (req->_present.dev_name_len)
+ mnl_attr_put_strz(nlh, DEVLINK_ATTR_DEV_NAME, req->dev_name);
+
+ err = ynl_exec(ys, nlh, NULL);
+ if (err < 0)
+ return -1;
+
+ return 0;
+}
+
const struct ynl_family ynl_devlink_family = {
.name = "devlink",
};
diff --git a/tools/net/ynl/generated/devlink-user.h b/tools/net/ynl/generated/devlink-user.h
index 1db4edc36eaa..e5d79b824a67 100644
--- a/tools/net/ynl/generated/devlink-user.h
+++ b/tools/net/ynl/generated/devlink-user.h
@@ -5252,4 +5252,51 @@ devlink_selftests_run_req_set_selftests_flash(struct devlink_selftests_run_req *
int devlink_selftests_run(struct ynl_sock *ys,
struct devlink_selftests_run_req *req);
+/* ============== DEVLINK_CMD_NOTIFY_FILTER_SET ============== */
+/* DEVLINK_CMD_NOTIFY_FILTER_SET - do */
+struct devlink_notify_filter_set_req {
+ struct {
+ __u32 bus_name_len;
+ __u32 dev_name_len;
+ } _present;
+
+ char *bus_name;
+ char *dev_name;
+};
+
+static inline struct devlink_notify_filter_set_req *
+devlink_notify_filter_set_req_alloc(void)
+{
+ return calloc(1, sizeof(struct devlink_notify_filter_set_req));
+}
+void
+devlink_notify_filter_set_req_free(struct devlink_notify_filter_set_req *req);
+
+static inline void
+devlink_notify_filter_set_req_set_bus_name(struct devlink_notify_filter_set_req *req,
+ const char *bus_name)
+{
+ free(req->bus_name);
+ req->_present.bus_name_len = strlen(bus_name);
+ req->bus_name = malloc(req->_present.bus_name_len + 1);
+ memcpy(req->bus_name, bus_name, req->_present.bus_name_len);
+ req->bus_name[req->_present.bus_name_len] = 0;
+}
+static inline void
+devlink_notify_filter_set_req_set_dev_name(struct devlink_notify_filter_set_req *req,
+ const char *dev_name)
+{
+ free(req->dev_name);
+ req->_present.dev_name_len = strlen(dev_name);
+ req->dev_name = malloc(req->_present.dev_name_len + 1);
+ memcpy(req->dev_name, dev_name, req->_present.dev_name_len);
+ req->dev_name[req->_present.dev_name_len] = 0;
+}
+
+/*
+ * Set notification messages socket filter.
+ */
+int devlink_notify_filter_set(struct ynl_sock *ys,
+ struct devlink_notify_filter_set_req *req);
+
#endif /* _LINUX_DEVLINK_GEN_H */
--
2.41.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* [patch net-next 8/8] devlink: extend multicast filtering by port index
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
` (6 preceding siblings ...)
2023-11-15 14:17 ` [patch net-next 7/8] devlink: add a command to set notification filter and use it for multicasts Jiri Pirko
@ 2023-11-15 14:17 ` Jiri Pirko
2023-11-15 15:08 ` Andy Shevchenko
2023-11-16 9:14 ` [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
8 siblings, 1 reply; 20+ messages in thread
From: Jiri Pirko @ 2023-11-15 14:17 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
From: Jiri Pirko <jiri@nvidia.com>
Expose the previously introduced notification multicast messages
filtering infrastructure and allow the user to select messages using
port index.
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
---
Documentation/netlink/specs/devlink.yaml | 1 +
net/devlink/devl_internal.h | 9 +++++++++
net/devlink/health.c | 6 +++++-
net/devlink/netlink.c | 10 +++++++++-
net/devlink/netlink_gen.c | 5 +++--
net/devlink/port.c | 5 ++++-
tools/net/ynl/generated/devlink-user.c | 2 ++
tools/net/ynl/generated/devlink-user.h | 9 +++++++++
8 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/Documentation/netlink/specs/devlink.yaml b/Documentation/netlink/specs/devlink.yaml
index cc4991cbce83..49d4fbf3fe44 100644
--- a/Documentation/netlink/specs/devlink.yaml
+++ b/Documentation/netlink/specs/devlink.yaml
@@ -2065,3 +2065,4 @@ operations:
attributes:
- bus-name
- dev-name
+ - port-index
diff --git a/net/devlink/devl_internal.h b/net/devlink/devl_internal.h
index 0ee0bcdd4a7d..3ed7808013f1 100644
--- a/net/devlink/devl_internal.h
+++ b/net/devlink/devl_internal.h
@@ -181,6 +181,8 @@ static inline bool devlink_nl_notify_need(struct devlink *devlink)
struct devlink_obj_desc {
const char *bus_name;
const char *dev_name;
+ unsigned int port_index;
+ bool port_index_valid;
long data[];
};
@@ -192,6 +194,13 @@ static inline void devlink_nl_obj_desc_init(struct devlink_obj_desc *desc,
desc->dev_name = dev_name(devlink->dev);
}
+static inline void devlink_nl_obj_desc_port_set(struct devlink_obj_desc *desc,
+ struct devlink_port *devlink_port)
+{
+ desc->port_index = devlink_port->index;
+ desc->port_index_valid = true;
+}
+
int devlink_nl_notify_filter(struct sock *dsk, struct sk_buff *skb, void *data);
static inline void devlink_nl_notify_send_desc(struct devlink *devlink,
diff --git a/net/devlink/health.c b/net/devlink/health.c
index 2f06e4ddbf3b..0e96d26203f1 100644
--- a/net/devlink/health.c
+++ b/net/devlink/health.c
@@ -490,6 +490,7 @@ static void devlink_recover_notify(struct devlink_health_reporter *reporter,
enum devlink_command cmd)
{
struct devlink *devlink = reporter->devlink;
+ struct devlink_obj_desc desc;
struct sk_buff *msg;
int err;
@@ -509,7 +510,10 @@ static void devlink_recover_notify(struct devlink_health_reporter *reporter,
return;
}
- devlink_nl_notify_send(devlink, msg);
+ devlink_nl_obj_desc_init(&desc, devlink);
+ if (reporter->devlink_port)
+ devlink_nl_obj_desc_port_set(&desc, reporter->devlink_port);
+ devlink_nl_notify_send_desc(devlink, msg, &desc);
}
void
diff --git a/net/devlink/netlink.c b/net/devlink/netlink.c
index 738e2f340ab9..6c033d1f7e64 100644
--- a/net/devlink/netlink.c
+++ b/net/devlink/netlink.c
@@ -46,11 +46,16 @@ int devlink_nl_notify_filter_set_doit(struct sk_buff *skb,
flt->dev_name = pos;
}
+ if (attrs[DEVLINK_ATTR_PORT_INDEX]) {
+ flt->port_index = nla_get_u32(attrs[DEVLINK_ATTR_PORT_INDEX]);
+ flt->port_index_valid = true;
+ }
+
/* Free the existing filter if any. */
kfree(sk->sk_user_data);
/* Don't attach empty filter. */
- if (!flt->bus_name && !flt->dev_name) {
+ if (!flt->bus_name && !flt->dev_name && !flt->port_index_valid) {
kfree(flt);
flt = NULL;
}
@@ -68,6 +73,9 @@ static bool devlink_obj_desc_match(const struct devlink_obj_desc *desc,
if (desc->dev_name && flt->dev_name &&
strcmp(desc->dev_name, flt->dev_name))
return false;
+ if (desc->port_index_valid && flt->port_index_valid &&
+ desc->port_index != flt->port_index)
+ return false;
return true;
}
diff --git a/net/devlink/netlink_gen.c b/net/devlink/netlink_gen.c
index f207f3fc7e20..b3f37e3c1b64 100644
--- a/net/devlink/netlink_gen.c
+++ b/net/devlink/netlink_gen.c
@@ -561,9 +561,10 @@ static const struct nla_policy devlink_selftests_run_nl_policy[DEVLINK_ATTR_SELF
};
/* DEVLINK_CMD_NOTIFY_FILTER_SET - do */
-static const struct nla_policy devlink_notify_filter_set_nl_policy[DEVLINK_ATTR_DEV_NAME + 1] = {
+static const struct nla_policy devlink_notify_filter_set_nl_policy[DEVLINK_ATTR_PORT_INDEX + 1] = {
[DEVLINK_ATTR_BUS_NAME] = { .type = NLA_NUL_STRING, },
[DEVLINK_ATTR_DEV_NAME] = { .type = NLA_NUL_STRING, },
+ [DEVLINK_ATTR_PORT_INDEX] = { .type = NLA_U32, },
};
/* Ops table for devlink */
@@ -1243,7 +1244,7 @@ const struct genl_split_ops devlink_nl_ops[74] = {
.cmd = DEVLINK_CMD_NOTIFY_FILTER_SET,
.doit = devlink_nl_notify_filter_set_doit,
.policy = devlink_notify_filter_set_nl_policy,
- .maxattr = DEVLINK_ATTR_DEV_NAME,
+ .maxattr = DEVLINK_ATTR_PORT_INDEX,
.flags = GENL_CMD_CAP_DO,
},
};
diff --git a/net/devlink/port.c b/net/devlink/port.c
index 758df3000a1b..62e54e152ecf 100644
--- a/net/devlink/port.c
+++ b/net/devlink/port.c
@@ -507,6 +507,7 @@ static void devlink_port_notify(struct devlink_port *devlink_port,
enum devlink_command cmd)
{
struct devlink *devlink = devlink_port->devlink;
+ struct devlink_obj_desc desc;
struct sk_buff *msg;
int err;
@@ -525,7 +526,9 @@ static void devlink_port_notify(struct devlink_port *devlink_port,
return;
}
- devlink_nl_notify_send(devlink, msg);
+ devlink_nl_obj_desc_init(&desc, devlink);
+ devlink_nl_obj_desc_port_set(&desc, devlink_port);
+ devlink_nl_notify_send_desc(devlink, msg, &desc);
}
static void devlink_ports_notify(struct devlink *devlink,
diff --git a/tools/net/ynl/generated/devlink-user.c b/tools/net/ynl/generated/devlink-user.c
index cd5f70eadf5b..86392da0b52c 100644
--- a/tools/net/ynl/generated/devlink-user.c
+++ b/tools/net/ynl/generated/devlink-user.c
@@ -6853,6 +6853,8 @@ int devlink_notify_filter_set(struct ynl_sock *ys,
mnl_attr_put_strz(nlh, DEVLINK_ATTR_BUS_NAME, req->bus_name);
if (req->_present.dev_name_len)
mnl_attr_put_strz(nlh, DEVLINK_ATTR_DEV_NAME, req->dev_name);
+ if (req->_present.port_index)
+ mnl_attr_put_u32(nlh, DEVLINK_ATTR_PORT_INDEX, req->port_index);
err = ynl_exec(ys, nlh, NULL);
if (err < 0)
diff --git a/tools/net/ynl/generated/devlink-user.h b/tools/net/ynl/generated/devlink-user.h
index e5d79b824a67..b96837663e6e 100644
--- a/tools/net/ynl/generated/devlink-user.h
+++ b/tools/net/ynl/generated/devlink-user.h
@@ -5258,10 +5258,12 @@ struct devlink_notify_filter_set_req {
struct {
__u32 bus_name_len;
__u32 dev_name_len;
+ __u32 port_index:1;
} _present;
char *bus_name;
char *dev_name;
+ __u32 port_index;
};
static inline struct devlink_notify_filter_set_req *
@@ -5292,6 +5294,13 @@ devlink_notify_filter_set_req_set_dev_name(struct devlink_notify_filter_set_req
memcpy(req->dev_name, dev_name, req->_present.dev_name_len);
req->dev_name[req->_present.dev_name_len] = 0;
}
+static inline void
+devlink_notify_filter_set_req_set_port_index(struct devlink_notify_filter_set_req *req,
+ __u32 port_index)
+{
+ req->_present.port_index = 1;
+ req->port_index = port_index;
+}
/*
* Set notification messages socket filter.
--
2.41.0
^ permalink raw reply related [flat|nested] 20+ messages in thread
* Re: [patch net-next 6/8] genetlink: introduce helpers to do filtered multicast
2023-11-15 14:17 ` [patch net-next 6/8] genetlink: introduce helpers to do filtered multicast Jiri Pirko
@ 2023-11-15 14:53 ` Andy Shevchenko
2023-11-15 20:20 ` Jacob Keller
2023-11-16 7:15 ` Jiri Pirko
0 siblings, 2 replies; 20+ messages in thread
From: Andy Shevchenko @ 2023-11-15 14:53 UTC (permalink / raw)
To: Jiri Pirko
Cc: netdev, kuba, pabeni, davem, edumazet, jacob.e.keller, jhs,
johannes, amritha.nambiar, sdf
On Wed, Nov 15, 2023 at 03:17:22PM +0100, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> Currently it is possible for netlink kernel user to pass custom
> filter function to broadcast send function netlink_broadcast_filtered().
> However, this is not exposed to multicast send and to generic
> netlink users.
>
> Extend the api and introduce a netlink helper nlmsg_multicast_filtered()
> and a generic netlink helper genlmsg_multicast_netns_filtered()
> to allow generic netlink families to specify filter function
> while sending multicast messages.
...
> +/**
> + * genlmsg_multicast_netns_filtered - multicast a netlink message
> + * to a specific netns with filter
> + * function
> + * @family: the generic netlink family
> + * @net: the net namespace
> + * @skb: netlink message as socket buffer
> + * @portid: own netlink portid to avoid sending to yourself
> + * @group: offset of multicast group in groups array
> + * @flags: allocation flags
> + * @filter: filter function
> + * @filter_data: filter function private data
scripts/kernel-doc -v -none -Wall ...
will complain.
> + */
...
> + int (*filter)(struct sock *dsk,
> + struct sk_buff *skb,
> + void *data),
Since it occurs more than once, perhaps
typedef int (*genlmsg_filter_fn)(struct sock *, struct sk_buff *, void *);
?
...
> /**
> - * nlmsg_multicast - multicast a netlink message
> + * nlmsg_multicast_filtered - multicast a netlink message with filter function
> * @sk: netlink socket to spread messages to
> * @skb: netlink message as socket buffer
> * @portid: own netlink portid to avoid sending to yourself
> * @group: multicast group id
> * @flags: allocation flags
> + * @filter: filter function
> + * @filter_data: filter function private data
I believe same complain by kernel-doc here and in more places...
Can you at least make sure your patches do not add new ones and removes ones
where you touch the code?
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 8/8] devlink: extend multicast filtering by port index
2023-11-15 14:17 ` [patch net-next 8/8] devlink: extend multicast filtering by port index Jiri Pirko
@ 2023-11-15 15:08 ` Andy Shevchenko
2023-11-16 7:10 ` Jiri Pirko
0 siblings, 1 reply; 20+ messages in thread
From: Andy Shevchenko @ 2023-11-15 15:08 UTC (permalink / raw)
To: Jiri Pirko
Cc: netdev, kuba, pabeni, davem, edumazet, jacob.e.keller, jhs,
johannes, amritha.nambiar, sdf
On Wed, Nov 15, 2023 at 03:17:24PM +0100, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> Expose the previously introduced notification multicast messages
> filtering infrastructure and allow the user to select messages using
> port index.
...
> struct {
> __u32 bus_name_len;
> __u32 dev_name_len;
> + __u32 port_index:1;
From this context is not clear why others are not bitfields.
> } _present;
>
> char *bus_name;
> char *dev_name;
> + __u32 port_index;
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 1/8] devlink: use devl_is_registered() helper instead xa_get_mark()
2023-11-15 14:17 ` [patch net-next 1/8] devlink: use devl_is_registered() helper instead xa_get_mark() Jiri Pirko
@ 2023-11-15 20:11 ` Jacob Keller
0 siblings, 0 replies; 20+ messages in thread
From: Jacob Keller @ 2023-11-15 20:11 UTC (permalink / raw)
To: Jiri Pirko, netdev
Cc: kuba, pabeni, davem, edumazet, jhs, johannes, andriy.shevchenko,
amritha.nambiar, sdf
On 11/15/2023 6:17 AM, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> Instead of checking the xarray mark directly using xa_get_mark() helper
> use devl_is_registered() helper which wraps it up. Note that there are
> couple more users of xa_get_mark() left which are going to be handled
> by the next patch.
>
> Signed-off-by: Jiri Pirko <jiri@nvidia.com>
> ---
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 2/8] devlink: introduce __devl_is_registered() helper and use it instead of xa_get_mark()
2023-11-15 14:17 ` [patch net-next 2/8] devlink: introduce __devl_is_registered() helper and use it instead of xa_get_mark() Jiri Pirko
@ 2023-11-15 20:11 ` Jacob Keller
0 siblings, 0 replies; 20+ messages in thread
From: Jacob Keller @ 2023-11-15 20:11 UTC (permalink / raw)
To: Jiri Pirko, netdev
Cc: kuba, pabeni, davem, edumazet, jhs, johannes, andriy.shevchenko,
amritha.nambiar, sdf
On 11/15/2023 6:17 AM, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> Introduce __devl_is_registered() which does not assert on devlink
> instance lock and use it in notifications which may be called
> without devlink instance lock held.
>
> Signed-off-by: Jiri Pirko <jiri@nvidia.com>
> ---
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 3/8] devlink: send notifications only if there are listeners
2023-11-15 14:17 ` [patch net-next 3/8] devlink: send notifications only if there are listeners Jiri Pirko
@ 2023-11-15 20:17 ` Jacob Keller
2023-11-16 7:14 ` Jiri Pirko
0 siblings, 1 reply; 20+ messages in thread
From: Jacob Keller @ 2023-11-15 20:17 UTC (permalink / raw)
To: Jiri Pirko, netdev
Cc: kuba, pabeni, davem, edumazet, jhs, johannes, andriy.shevchenko,
amritha.nambiar, sdf
On 11/15/2023 6:17 AM, Jiri Pirko wrote:
> +static inline bool devlink_nl_notify_need(struct devlink *devlink)
> +{
> + return genl_has_listeners(&devlink_nl_family, devlink_net(devlink),
> + DEVLINK_MCGRP_CONFIG);
> +}
> +
I assume following changes will add more checks here to filter here so
it doesn't make sense to call this "devlink_has_listeners"? I feel like
the devlink_nl_notify_need is a bit weird of a way to phrase this.
I don't have a strong objection to the name overall, just found it a bit
odd.
> /* Notify */
> void devlink_notify_register(struct devlink *devlink);
> void devlink_notify_unregister(struct devlink *devlink);
> diff --git a/net/devlink/health.c b/net/devlink/health.c
> index 695df61f8ac2..93eae8b5d2d3 100644
> --- a/net/devlink/health.c
> +++ b/net/devlink/health.c
> @@ -496,6 +496,9 @@ static void devlink_recover_notify(struct devlink_health_reporter *reporter,
> WARN_ON(cmd != DEVLINK_CMD_HEALTH_REPORTER_RECOVER);
> ASSERT_DEVLINK_REGISTERED(devlink);
>
> + if (!devlink_nl_notify_need(devlink))
> + return;
> +
> msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
> if (!msg)
> return;
> diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
> index 9d080ac1734b..45b36975ee6f 100644
> --- a/net/devlink/linecard.c
> +++ b/net/devlink/linecard.c
> @@ -136,7 +136,7 @@ static void devlink_linecard_notify(struct devlink_linecard *linecard,
> WARN_ON(cmd != DEVLINK_CMD_LINECARD_NEW &&
> cmd != DEVLINK_CMD_LINECARD_DEL);
>
> - if (!__devl_is_registered(devlink))
> + if (!__devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
> return;
>
A bunch of callers are checking both if its registered and a
notification is needed, does it make sense to combine this? Or I guess
at least a few places are notifying of removal after its no longer
registered, so we can't inline the devl_is_registered into the
devlink_nl_notify_need. Probably more clear to keep it separate too.
Ok.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 4/8] devlink: introduce a helper for netlink multicast send
2023-11-15 14:17 ` [patch net-next 4/8] devlink: introduce a helper for netlink multicast send Jiri Pirko
@ 2023-11-15 20:18 ` Jacob Keller
0 siblings, 0 replies; 20+ messages in thread
From: Jacob Keller @ 2023-11-15 20:18 UTC (permalink / raw)
To: Jiri Pirko, netdev
Cc: kuba, pabeni, davem, edumazet, jhs, johannes, andriy.shevchenko,
amritha.nambiar, sdf
On 11/15/2023 6:17 AM, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@nvidia.com>
>
> Introduce a helper devlink_nl_notify_send() so each object notification
> function does not have to call genlmsg_multicast_netns() with the same
> arguments.
>
> Signed-off-by: Jiri Pirko <jiri@nvidia.com>
> ---
Nice.
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 6/8] genetlink: introduce helpers to do filtered multicast
2023-11-15 14:53 ` Andy Shevchenko
@ 2023-11-15 20:20 ` Jacob Keller
2023-11-16 7:15 ` Jiri Pirko
1 sibling, 0 replies; 20+ messages in thread
From: Jacob Keller @ 2023-11-15 20:20 UTC (permalink / raw)
To: Andy Shevchenko, Jiri Pirko
Cc: netdev, kuba, pabeni, davem, edumazet, jhs, johannes,
amritha.nambiar, sdf
On 11/15/2023 6:53 AM, Andy Shevchenko wrote:
> On Wed, Nov 15, 2023 at 03:17:22PM +0100, Jiri Pirko wrote:
>> + int (*filter)(struct sock *dsk,
>> + struct sk_buff *skb,
>> + void *data),
>
> Since it occurs more than once, perhaps
>
> typedef int (*genlmsg_filter_fn)(struct sock *, struct sk_buff *, void *);
>
> ?
>
I agree with having a typedef here.
Thanks,
Jake
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 8/8] devlink: extend multicast filtering by port index
2023-11-15 15:08 ` Andy Shevchenko
@ 2023-11-16 7:10 ` Jiri Pirko
0 siblings, 0 replies; 20+ messages in thread
From: Jiri Pirko @ 2023-11-16 7:10 UTC (permalink / raw)
To: Andy Shevchenko
Cc: netdev, kuba, pabeni, davem, edumazet, jacob.e.keller, jhs,
johannes, amritha.nambiar, sdf
Wed, Nov 15, 2023 at 04:08:46PM CET, andriy.shevchenko@linux.intel.com wrote:
>On Wed, Nov 15, 2023 at 03:17:24PM +0100, Jiri Pirko wrote:
>> From: Jiri Pirko <jiri@nvidia.com>
>>
>> Expose the previously introduced notification multicast messages
>> filtering infrastructure and allow the user to select messages using
>> port index.
>
>...
>
>> struct {
>> __u32 bus_name_len;
>> __u32 dev_name_len;
>> + __u32 port_index:1;
>
>From this context is not clear why others are not bitfields.
Tell it to the generator :)
>
>> } _present;
>>
>> char *bus_name;
>> char *dev_name;
>> + __u32 port_index;
>
>--
>With Best Regards,
>Andy Shevchenko
>
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 3/8] devlink: send notifications only if there are listeners
2023-11-15 20:17 ` Jacob Keller
@ 2023-11-16 7:14 ` Jiri Pirko
0 siblings, 0 replies; 20+ messages in thread
From: Jiri Pirko @ 2023-11-16 7:14 UTC (permalink / raw)
To: Jacob Keller
Cc: netdev, kuba, pabeni, davem, edumazet, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
Wed, Nov 15, 2023 at 09:17:17PM CET, jacob.e.keller@intel.com wrote:
>
>
>On 11/15/2023 6:17 AM, Jiri Pirko wrote:
>> +static inline bool devlink_nl_notify_need(struct devlink *devlink)
>> +{
>> + return genl_has_listeners(&devlink_nl_family, devlink_net(devlink),
>> + DEVLINK_MCGRP_CONFIG);
>> +}
>> +
>
>I assume following changes will add more checks here to filter here so
>it doesn't make sense to call this "devlink_has_listeners"? I feel like
>the devlink_nl_notify_need is a bit weird of a way to phrase this.
>
>I don't have a strong objection to the name overall, just found it a bit
>odd.
Right. I named it like this because eventually, this function is going
to check the filters as well return false if there is no msg passed to
any listening socket through any filter. That is the plan.
>
>> /* Notify */
>> void devlink_notify_register(struct devlink *devlink);
>> void devlink_notify_unregister(struct devlink *devlink);
>> diff --git a/net/devlink/health.c b/net/devlink/health.c
>> index 695df61f8ac2..93eae8b5d2d3 100644
>> --- a/net/devlink/health.c
>> +++ b/net/devlink/health.c
>> @@ -496,6 +496,9 @@ static void devlink_recover_notify(struct devlink_health_reporter *reporter,
>> WARN_ON(cmd != DEVLINK_CMD_HEALTH_REPORTER_RECOVER);
>> ASSERT_DEVLINK_REGISTERED(devlink);
>>
>> + if (!devlink_nl_notify_need(devlink))
>> + return;
>> +
>> msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
>> if (!msg)
>> return;
>> diff --git a/net/devlink/linecard.c b/net/devlink/linecard.c
>> index 9d080ac1734b..45b36975ee6f 100644
>> --- a/net/devlink/linecard.c
>> +++ b/net/devlink/linecard.c
>> @@ -136,7 +136,7 @@ static void devlink_linecard_notify(struct devlink_linecard *linecard,
>> WARN_ON(cmd != DEVLINK_CMD_LINECARD_NEW &&
>> cmd != DEVLINK_CMD_LINECARD_DEL);
>>
>> - if (!__devl_is_registered(devlink))
>> + if (!__devl_is_registered(devlink) || !devlink_nl_notify_need(devlink))
>> return;
>>
>
>A bunch of callers are checking both if its registered and a
>notification is needed, does it make sense to combine this? Or I guess
>at least a few places are notifying of removal after its no longer
>registered, so we can't inline the devl_is_registered into the
>devlink_nl_notify_need. Probably more clear to keep it separate too.
Yeah, it is more clear to have it separate. Plus there would have to be
2 locked and unlocked versions.
>
>Ok.
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 6/8] genetlink: introduce helpers to do filtered multicast
2023-11-15 14:53 ` Andy Shevchenko
2023-11-15 20:20 ` Jacob Keller
@ 2023-11-16 7:15 ` Jiri Pirko
1 sibling, 0 replies; 20+ messages in thread
From: Jiri Pirko @ 2023-11-16 7:15 UTC (permalink / raw)
To: Andy Shevchenko
Cc: netdev, kuba, pabeni, davem, edumazet, jacob.e.keller, jhs,
johannes, amritha.nambiar, sdf
Wed, Nov 15, 2023 at 03:53:37PM CET, andriy.shevchenko@linux.intel.com wrote:
>On Wed, Nov 15, 2023 at 03:17:22PM +0100, Jiri Pirko wrote:
>> From: Jiri Pirko <jiri@nvidia.com>
>>
>> Currently it is possible for netlink kernel user to pass custom
>> filter function to broadcast send function netlink_broadcast_filtered().
>> However, this is not exposed to multicast send and to generic
>> netlink users.
>>
>> Extend the api and introduce a netlink helper nlmsg_multicast_filtered()
>> and a generic netlink helper genlmsg_multicast_netns_filtered()
>> to allow generic netlink families to specify filter function
>> while sending multicast messages.
>
>...
>
>> +/**
>> + * genlmsg_multicast_netns_filtered - multicast a netlink message
>> + * to a specific netns with filter
>> + * function
>> + * @family: the generic netlink family
>> + * @net: the net namespace
>> + * @skb: netlink message as socket buffer
>> + * @portid: own netlink portid to avoid sending to yourself
>> + * @group: offset of multicast group in groups array
>> + * @flags: allocation flags
>> + * @filter: filter function
>> + * @filter_data: filter function private data
>
> scripts/kernel-doc -v -none -Wall ...
>
>will complain.
Will fix.
>
>> + */
>
>...
>
>> + int (*filter)(struct sock *dsk,
>> + struct sk_buff *skb,
>> + void *data),
>
>Since it occurs more than once, perhaps
>
>typedef int (*genlmsg_filter_fn)(struct sock *, struct sk_buff *, void *);
Makes sense. Will make that in a separate patch before this one.
>
>?
>
>...
>
>> /**
>> - * nlmsg_multicast - multicast a netlink message
>> + * nlmsg_multicast_filtered - multicast a netlink message with filter function
>> * @sk: netlink socket to spread messages to
>> * @skb: netlink message as socket buffer
>> * @portid: own netlink portid to avoid sending to yourself
>> * @group: multicast group id
>> * @flags: allocation flags
>> + * @filter: filter function
>> + * @filter_data: filter function private data
>
>I believe same complain by kernel-doc here and in more places...
>
>Can you at least make sure your patches do not add new ones and removes ones
>where you touch the code?
Okay.
>
>--
>With Best Regards,
>Andy Shevchenko
>
>
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [patch net-next 0/8] devlink: introduce notifications filtering
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
` (7 preceding siblings ...)
2023-11-15 14:17 ` [patch net-next 8/8] devlink: extend multicast filtering by port index Jiri Pirko
@ 2023-11-16 9:14 ` Jiri Pirko
8 siblings, 0 replies; 20+ messages in thread
From: Jiri Pirko @ 2023-11-16 9:14 UTC (permalink / raw)
To: netdev
Cc: kuba, pabeni, davem, edumazet, jacob.e.keller, jhs, johannes,
andriy.shevchenko, amritha.nambiar, sdf
Will send v2 soon
pw-bot: cr
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2023-11-16 9:14 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-15 14:17 [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
2023-11-15 14:17 ` [patch net-next 1/8] devlink: use devl_is_registered() helper instead xa_get_mark() Jiri Pirko
2023-11-15 20:11 ` Jacob Keller
2023-11-15 14:17 ` [patch net-next 2/8] devlink: introduce __devl_is_registered() helper and use it instead of xa_get_mark() Jiri Pirko
2023-11-15 20:11 ` Jacob Keller
2023-11-15 14:17 ` [patch net-next 3/8] devlink: send notifications only if there are listeners Jiri Pirko
2023-11-15 20:17 ` Jacob Keller
2023-11-16 7:14 ` Jiri Pirko
2023-11-15 14:17 ` [patch net-next 4/8] devlink: introduce a helper for netlink multicast send Jiri Pirko
2023-11-15 20:18 ` Jacob Keller
2023-11-15 14:17 ` [patch net-next 5/8] genetlink: implement release callback and free sk_user_data there Jiri Pirko
2023-11-15 14:17 ` [patch net-next 6/8] genetlink: introduce helpers to do filtered multicast Jiri Pirko
2023-11-15 14:53 ` Andy Shevchenko
2023-11-15 20:20 ` Jacob Keller
2023-11-16 7:15 ` Jiri Pirko
2023-11-15 14:17 ` [patch net-next 7/8] devlink: add a command to set notification filter and use it for multicasts Jiri Pirko
2023-11-15 14:17 ` [patch net-next 8/8] devlink: extend multicast filtering by port index Jiri Pirko
2023-11-15 15:08 ` Andy Shevchenko
2023-11-16 7:10 ` Jiri Pirko
2023-11-16 9:14 ` [patch net-next 0/8] devlink: introduce notifications filtering Jiri Pirko
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).