Commit 53742e69 authored by Madhuparna Bhowmik's avatar Madhuparna Bhowmik Committed by David S. Miller
Browse files

datapath.c: Use built-in RCU list checking 



hlist_for_each_entry_rcu() has built-in RCU and lock checking.

Pass cond argument to list_for_each_entry_rcu() to silence
false lockdep warning when CONFIG_PROVE_RCU_LIST is enabled
by default.

Signed-off-by: default avatarMadhuparna Bhowmik <madhuparnabhowmik10@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fed48423

net/openvswitch/datapath.c

+6 −3
Original line number Diff line number Diff line
@@ -179,7 +179,8 @@ struct vport *ovs_lookup_vport(const struct datapath *dp, u16 port_no) 
	struct hlist_head *head;



	head = vport_hash_bucket(dp, port_no);

	hlist_for_each_entry_rcu(vport, head, dp_hash_node) {

	hlist_for_each_entry_rcu(vport, head, dp_hash_node,

				lockdep_ovsl_is_held()) {

		if (vport->port_no == port_no)

			return vport;

	}
@@ -2042,7 +2043,8 @@ static unsigned int ovs_get_max_headroom(struct datapath *dp) 
	int i;



	for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++) {

		hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node) {

		hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node,

					lockdep_ovsl_is_held()) {

			dev = vport->dev;

			dev_headroom = netdev_get_fwd_headroom(dev);

			if (dev_headroom > max_headroom)
@@ -2061,7 +2063,8 @@ static void ovs_update_headroom(struct datapath *dp, unsigned int new_headroom) 


	dp->max_headroom = new_headroom;

	for (i = 0; i < DP_VPORT_HASH_BUCKETS; i++)

		hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node)

		hlist_for_each_entry_rcu(vport, &dp->ports[i], dp_hash_node,

					lockdep_ovsl_is_held())

			netdev_set_rx_headroom(vport->dev, new_headroom);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE