GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 16:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'flow_offload-action-fixes'

Browse source 
Vlad Buslov says:

====================
action fixes for flow_offload infra compatibility

Fix rcu warnings due to usage of action helpers that expect rcu read lock
protection from rtnl-protected context of flow_offload infra.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2019-08-06 14:15:39 -07:00
commit 443bfb4acb
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/net/tc_act/tc_police.h
View file

@ -54,7 +54,7 @@ static inline u64 tcf_police_rate_bytes_ps(const struct tc_action *act)
struct tcf_police *police = to_police(act); struct tcf_police *police = to_police(act);
struct tcf_police_params *params; struct tcf_police_params *params;
params = rcu_dereference_bh(police->params); params = rcu_dereference_bh_rtnl(police->params);
return params->rate.rate_bytes_ps; return params->rate.rate_bytes_ps;
} }
@ -63,7 +63,7 @@ static inline s64 tcf_police_tcfp_burst(const struct tc_action *act)
struct tcf_police *police = to_police(act); struct tcf_police *police = to_police(act);
struct tcf_police_params *params; struct tcf_police_params *params;
params = rcu_dereference_bh(police->params); params = rcu_dereference_bh_rtnl(police->params);
return params->tcfp_burst; return params->tcfp_burst;
} }

2
include/net/tc_act/tc_sample.h
View file

@ -44,7 +44,7 @@ static inline int tcf_sample_trunc_size(const struct tc_action *a)
static inline struct psample_group * static inline struct psample_group *
tcf_sample_psample_group(const struct tc_action *a) tcf_sample_psample_group(const struct tc_action *a)
{ {
return rcu_dereference(to_sample(a)->psample_group); return rcu_dereference_rtnl(to_sample(a)->psample_group);
} }
#endif /* __NET_TC_SAMPLE_H */ #endif /* __NET_TC_SAMPLE_H */