3 files changed, 4 insertions, 3 deletions

diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index fcaed98b2c0d..0727aaa2c825 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -701,8 +701,7 @@ static int ovs_flow_cmd_fill_info(struct sw_flow *flow, struct datapath *dp,
         if (start) {
                 const struct sw_flow_actions *sf_acts;
 
-                sf_acts = rcu_dereference_check(flow->sf_acts,
-                                                lockdep_ovsl_is_held());
+                sf_acts = rcu_dereference_ovsl(flow->sf_acts);
 
                 err = ovs_nla_put_actions(sf_acts->actions,
                                           sf_acts->actions_len, skb);
diff --git a/net/openvswitch/datapath.h b/net/openvswitch/datapath.h
index 4067ea41be28..ba13be4a680f 100644
--- a/net/openvswitch/datapath.h
+++ b/net/openvswitch/datapath.h
@@ -145,6 +145,8 @@ int lockdep_ovsl_is_held(void);
 #define ASSERT_OVSL()           WARN_ON(unlikely(!lockdep_ovsl_is_held()))
 #define ovsl_dereference(p)                                     \
         rcu_dereference_protected(p, lockdep_ovsl_is_held())
+#define rcu_dereference_ovsl(p)                                 \
+        rcu_dereference_check(p, lockdep_ovsl_is_held())
 
 static inline struct net *ovs_dp_get_net(struct datapath *dp)
 {
diff --git a/net/openvswitch/flow_table.c b/net/openvswitch/flow_table.c
index 261a54e77503..7b9cf2c43813 100644
--- a/net/openvswitch/flow_table.c
+++ b/net/openvswitch/flow_table.c
@@ -433,7 +433,7 @@ struct sw_flow *ovs_flow_tbl_lookup_stats(struct flow_table *tbl,
                                     const struct sw_flow_key *key,
                                     u32 *n_mask_hit)
 {
-        struct table_instance *ti = rcu_dereference(tbl->ti);
+        struct table_instance *ti = rcu_dereference_ovsl(tbl->ti);
         struct sw_flow_mask *mask;
         struct sw_flow *flow;