Commit 443bfb4a authored by David S. Miller's avatar David S. Miller

Merge branch 'flow_offload-action-fixes'

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 2b0dfc17 67cbf7de
...@@ -54,7 +54,7 @@ static inline u64 tcf_police_rate_bytes_ps(const struct tc_action *act) ...@@ -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) ...@@ -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;
} }
......
...@@ -44,7 +44,7 @@ static inline int tcf_sample_trunc_size(const struct tc_action *a) ...@@ -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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment