netlink: add nlmsg_consume() and use it in devlink compat
Subsystems (3)
Jakub Kicinski
maintainerPATCH 1/1 netlink: add nlmsg_consume() and use it in devlink compat
devlink_compat_running_version() sticks out when running netdevsim tests and watching dropped skbs. Add nlmsg_consume() for cases were we want to free a netlink skb but it is expected, rather than a drop. af_netlink code uses consume_skb() directly, which is fine, but some may prefer the symmetry of nlmsg_new() / nlmsg_consume().
---
CC: [email protected]
--- include/net/netlink.h | 14 ++++++++++++-- net/devlink/dev.c | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-)
include/net/netlink.h +12 -2
@@ -41,7 +41,8 @@* nlmsg_get_pos() return current position in message * nlmsg_trim() trim part of message * nlmsg_cancel() cancel message construction -* nlmsg_free() free a netlink message +* nlmsg_consume() free a netlink message (expected) +* nlmsg_free() free a netlink message (drop) * * Message Sending: * nlmsg_multicast() multicast message to several groups
@@ -1082,7 +1083,7 @@ static inline void nlmsg_cancel(struct sk_buff *skb, struct nlmsghdr *nlh) }/** -* nlmsg_free - free a netlink message +* nlmsg_free - drop a netlink message * @skb: socket buffer of netlink message */ static inline void nlmsg_free (struct sk_buff *skb)
@@ -1090,6 +1091,15 @@ static inline void nlmsg_free(struct sk_buff *skb)kfree_skb (skb); } +/** +* nlmsg_consume - free a netlink message +* @skb: socket buffer of netlink message +*/ +static inline void nlmsg_consume (struct sk_buff *skb) +{ +consume_skb (skb); +} +/** * nlmsg_multicast_filtered - multicast a netlink message with filter function * @sk: netlink socket to spread messages to
net/devlink/dev.c +1 -1
@@ -1214,7 +1214,7 @@ static void __devlink_compat_running_version(struct devlink *devlink, } } free_msg: -nlmsg_free (msg); +nlmsg_consume (msg); } void devlink_compat_running_version(struct devlink *devlink,
Signature · 1 line
2.44.0
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 8 lines · On Wed, 3 Apr 2024 13:22:59 -0700 you wrote:
devlink_compat_running_version()sticks out when running netdevsim tests and watching dropped skbs. Addnlmsg_consume()for cases were we want to free a netlink skb but it is expected, rather than a drop.af_netlinkcode usesconsume_skb()directly, which is fine, but some may prefer the symmetry ofnlmsg_new()/nlmsg_consume().[...]
Here is the summary with links:
- [net-next] netlink: add nlmsg_consume() and use it in devlink compat
https://git.kernel.org/netdev/net-next/c/8e69b3459ca1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html