system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-07-22 19:21:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

inet: allow ip_valid_fib_dump_req() to be called with RTNL or RCU

Browse source 
Add a new field into struct fib_dump_filter, to let callers
tell if they use RTNL locking or RCU.

This is used in the following patch, when inet_dump_fib()
no longer holds RTNL.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Reviewed-by: Donald Hunter <donald.hunter@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2024-02-22 10:50:17 +00:00 committed by David S. Miller
parent 69fdb7e411
commit 22e36ea9f5
6 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/net/ip_fib.h
View file

@ -264,6 +264,7 @@ struct fib_dump_filter {
bool filter_set; bool filter_set;
bool dump_routes; bool dump_routes;
bool dump_exceptions; bool dump_exceptions;
bool rtnl_held;
unsigned char protocol; unsigned char protocol;
unsigned char rt_type; unsigned char rt_type;
unsigned int flags; unsigned int flags;

15
net/ipv4/fib_frontend.c
View file

@ -916,7 +916,8 @@ int ip_valid_fib_dump_req(struct net *net, const struct nlmsghdr *nlh,
struct rtmsg *rtm; struct rtmsg *rtm;
int err, i; int err, i;
ASSERT_RTNL(); if (filter->rtnl_held)
ASSERT_RTNL();
if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) { if (nlh->nlmsg_len < nlmsg_msg_size(sizeof(*rtm))) {
NL_SET_ERR_MSG(extack, "Invalid header for FIB dump request"); NL_SET_ERR_MSG(extack, "Invalid header for FIB dump request");
@ -961,7 +962,10 @@ int ip_valid_fib_dump_req(struct net *net, const struct nlmsghdr *nlh,
break; break;
case RTA_OIF: case RTA_OIF:
ifindex = nla_get_u32(tb[i]); ifindex = nla_get_u32(tb[i]);
filter->dev = __dev_get_by_index(net, ifindex); if (filter->rtnl_held)
filter->dev = __dev_get_by_index(net, ifindex);
else
filter->dev = dev_get_by_index_rcu(net, ifindex);
if (!filter->dev) if (!filter->dev)
return -ENODEV; return -ENODEV;
break; break;
@ -983,8 +987,11 @@ EXPORT_SYMBOL_GPL(ip_valid_fib_dump_req);
static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) static int inet_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
{ {
struct fib_dump_filter filter = { .dump_routes = true, struct fib_dump_filter filter = {
.dump_exceptions = true }; .dump_routes = true,
.dump_exceptions = true,
.rtnl_held = true,
};
const struct nlmsghdr *nlh = cb->nlh; const struct nlmsghdr *nlh = cb->nlh;
struct net *net = sock_net(skb->sk); struct net *net = sock_net(skb->sk);
unsigned int h, s_h; unsigned int h, s_h;

4
net/ipv4/ipmr.c
View file

@ -2587,7 +2587,9 @@ static int ipmr_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
static int ipmr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb) static int ipmr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb)
{ {
struct fib_dump_filter filter = {}; struct fib_dump_filter filter = {
.rtnl_held = true,
};
int err; int err;
if (cb->strict_check) { if (cb->strict_check) {

7
net/ipv6/ip6_fib.c
View file

@ -620,8 +620,11 @@ static int fib6_dump_table(struct fib6_table *table, struct sk_buff *skb,
static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
{ {
struct rt6_rtnl_dump_arg arg = { .filter.dump_exceptions = true, struct rt6_rtnl_dump_arg arg = {
.filter.dump_routes = true }; .filter.dump_exceptions = true,
.filter.dump_routes = true,
.filter.rtnl_held = true,
};
const struct nlmsghdr *nlh = cb->nlh; const struct nlmsghdr *nlh = cb->nlh;
struct net *net = sock_net(skb->sk); struct net *net = sock_net(skb->sk);
unsigned int h, s_h; unsigned int h, s_h;

4
net/ipv6/ip6mr.c
View file

@ -2592,7 +2592,9 @@ static int ip6mr_rtm_getroute(struct sk_buff *in_skb, struct nlmsghdr *nlh,
static int ip6mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb) static int ip6mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb)
{ {
const struct nlmsghdr *nlh = cb->nlh; const struct nlmsghdr *nlh = cb->nlh;
struct fib_dump_filter filter = {}; struct fib_dump_filter filter = {
.rtnl_held = true,
};
int err; int err;
if (cb->strict_check) { if (cb->strict_check) {

4
net/mpls/af_mpls.c
View file

@ -2179,7 +2179,9 @@ static int mpls_dump_routes(struct sk_buff *skb, struct netlink_callback *cb)
const struct nlmsghdr *nlh = cb->nlh; const struct nlmsghdr *nlh = cb->nlh;
struct net *net = sock_net(skb->sk); struct net *net = sock_net(skb->sk);
struct mpls_route __rcu **platform_label; struct mpls_route __rcu **platform_label;
struct fib_dump_filter filter = {}; struct fib_dump_filter filter = {
.rtnl_held = true,
};
unsigned int flags = NLM_F_MULTI; unsigned int flags = NLM_F_MULTI;
size_t platform_labels; size_t platform_labels;
unsigned int index; unsigned int index;