xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv4: convert fib_num_tclassid_users to atomic_t

Browse Source 
commit 213f5f8f31f10aa1e83187ae20fb7fa4e626b724 upstream.

Before commit faa041a40b ("ipv4: Create cleanup helper for fib_nh")
changes to net->ipv4.fib_num_tclassid_users were protected by RTNL.

After the change, this is no longer the case, as free_fib_info_rcu()
runs after rcu grace period, without rtnl being held.

Fixes: faa041a40b ("ipv4: Create cleanup helper for fib_nh")
Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: David Ahern <dsahern@kernel.org>
Reviewed-by: David Ahern <dsahern@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Eric Dumazet
2021-12-01 18:26:35 -08:00
committed by Greg Kroah-Hartman
parent fa973bf5fd
commit 9a40a1e0eb
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/ip_fib.h
View File

@@ -437,7 +437,7 @@ int fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst,
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
static inline int fib_num_tclassid_users(struct net *net) static inline int fib_num_tclassid_users(struct net *net)
{ {
return net->ipv4.fib_num_tclassid_users; return atomic_read(&net->ipv4.fib_num_tclassid_users);
} }
#else #else
static inline int fib_num_tclassid_users(struct net *net) static inline int fib_num_tclassid_users(struct net *net)

2
include/net/netns/ipv4.h
View File

@@ -61,7 +61,7 @@ struct netns_ipv4 {
#endif #endif
bool fib_has_custom_local_routes; bool fib_has_custom_local_routes;
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
int fib_num_tclassid_users; atomic_t fib_num_tclassid_users;
#endif #endif
struct hlist_head *fib_table_hash; struct hlist_head *fib_table_hash;
bool fib_offload_disabled; bool fib_offload_disabled;

2
net/ipv4/fib_frontend.c
View File

@@ -1578,7 +1578,7 @@ static int __net_init fib_net_init(struct net *net)
int error; int error;
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
net->ipv4.fib_num_tclassid_users = 0; atomic_set(&net->ipv4.fib_num_tclassid_users, 0);
#endif #endif
error = ip_fib_net_init(net); error = ip_fib_net_init(net);
if (error < 0) if (error < 0)

4
net/ipv4/fib_rules.c
View File

@@ -264,7 +264,7 @@ static int fib4_rule_configure(struct fib_rule *rule, struct sk_buff *skb,
if (tb[FRA_FLOW]) { if (tb[FRA_FLOW]) {
rule4->tclassid = nla_get_u32(tb[FRA_FLOW]); rule4->tclassid = nla_get_u32(tb[FRA_FLOW]);
if (rule4->tclassid) if (rule4->tclassid)
net->ipv4.fib_num_tclassid_users++; atomic_inc(&net->ipv4.fib_num_tclassid_users);
} }
#endif #endif
@@ -296,7 +296,7 @@ static int fib4_rule_delete(struct fib_rule *rule)
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
if (((struct fib4_rule *)rule)->tclassid) if (((struct fib4_rule *)rule)->tclassid)
net->ipv4.fib_num_tclassid_users--; atomic_dec(&net->ipv4.fib_num_tclassid_users);
#endif #endif
net->ipv4.fib_has_custom_rules = true; net->ipv4.fib_has_custom_rules = true;

4
net/ipv4/fib_semantics.c
View File

@@ -222,7 +222,7 @@ void fib_nh_release(struct net *net, struct fib_nh *fib_nh)
{ {
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
if (fib_nh->nh_tclassid) if (fib_nh->nh_tclassid)
net->ipv4.fib_num_tclassid_users--; atomic_dec(&net->ipv4.fib_num_tclassid_users);
#endif #endif
fib_nh_common_release(&fib_nh->nh_common); fib_nh_common_release(&fib_nh->nh_common);
} }
@@ -633,7 +633,7 @@ int fib_nh_init(struct net *net, struct fib_nh *nh,
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
nh->nh_tclassid = cfg->fc_flow; nh->nh_tclassid = cfg->fc_flow;
if (nh->nh_tclassid) if (nh->nh_tclassid)
net->ipv4.fib_num_tclassid_users++; atomic_inc(&net->ipv4.fib_num_tclassid_users);
#endif #endif
#ifdef CONFIG_IP_ROUTE_MULTIPATH #ifdef CONFIG_IP_ROUTE_MULTIPATH
nh->fib_nh_weight = nh_weight; nh->fib_nh_weight = nh_weight;