nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

net: rtnetlink: add bulk delete support flag

Browse source 
Add a new rtnl flag (RTNL_FLAG_BULK_DEL_SUPPORTED) which is used to
verify that the delete operation allows bulk object deletion. Also emit
a warning if anyone tries to set it for non-delete kind.

Suggested-by: David Ahern <dsahern@kernel.org>
Signed-off-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Nikolay Aleksandrov 2022-04-13 13:51:55 +03:00 committed by David S. Miller
parent 545528d788
commit a6cec0bcd3
2 changed files with 10 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/rtnetlink.h
View file

@ -10,7 +10,8 @@ typedef int (*rtnl_doit_func)(struct sk_buff *, struct nlmsghdr *,
typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *); typedef int (*rtnl_dumpit_func)(struct sk_buff *, struct netlink_callback *);
enum rtnl_link_flags { enum rtnl_link_flags {
RTNL_FLAG_DOIT_UNLOCKED = BIT(0), RTNL_FLAG_DOIT_UNLOCKED = BIT(0),
RTNL_FLAG_BULK_DEL_SUPPORTED = BIT(1),
}; };
enum rtnl_kinds { enum rtnl_kinds {

8
net/core/rtnetlink.c
View file

@ -249,6 +249,8 @@ static int rtnl_register_internal(struct module *owner,
if (dumpit) if (dumpit)
link->dumpit = dumpit; link->dumpit = dumpit;
WARN_ON(rtnl_msgtype_kind(msgtype) != RTNL_KIND_DEL &&
(flags & RTNL_FLAG_BULK_DEL_SUPPORTED));
link->flags |= flags; link->flags |= flags;
/* publish protocol:msgtype */ /* publish protocol:msgtype */
@ -6009,6 +6011,12 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
} }
flags = link->flags; flags = link->flags;
if (kind == RTNL_KIND_DEL && (nlh->nlmsg_flags & NLM_F_BULK) &&
!(flags & RTNL_FLAG_BULK_DEL_SUPPORTED)) {
NL_SET_ERR_MSG(extack, "Bulk delete is not supported");
goto err_unlock;
}
if (flags & RTNL_FLAG_DOIT_UNLOCKED) { if (flags & RTNL_FLAG_DOIT_UNLOCKED) {
doit = link->doit; doit = link->doit;
rcu_read_unlock(); rcu_read_unlock();