Commit ca07fb07 authored Apr 21, 2014 by Ying Xue Committed by David S. Miller Apr 22, 2014

tipc: adjust locking policy of protecting tipc_ptr pointer of net_device



Currently the 'tipc_ptr' pointer is protected by tipc_net_lock
write lock on write side, and RCU read lock is applied to read
side. In addition, there have two paths on write side where we
may change variables pointed by the 'tipc_ptr' pointer: one is
to configure bearer by tipc-config tool and another one is that
bearer status is changed by notification events of its attached
interface. But on the latter path, we improperly deem that
accessing 'tipc_ptr' pointer happens on read side with
rcu_read_lock() although some variables pointed by the 'tipc_ptr'
pointer are changed possibly.

Moreover, as now the both paths are guarded by RTNL lock, it's
better to adjust the locking policy of 'tipc_ptr' pointer
protection, allowing RTNL instead of tipc_net_lock write lock to
protect it on write side, which will help us purge tipc_net_lock
in the future.

Signed-off-by: Ying Xue <ying.xue@windriver.com>
Reviewed-by: Jon Maloy <jon.maloy@ericsson.com>
Reviewed-by: Erik Hugne <erik.hugne@ericsson.com>
Tested-by: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent ef13a262

net/tipc/bearer.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -535,7 +535,7 @@ static int tipc_l2_rcv_msg(struct sk_buff buf, struct net_device dev,
		}

		rcu_read_lock();
		b_ptr = rcu_dereference(dev->tipc_ptr);
		b_ptr = rcu_dereference_rtnl(dev->tipc_ptr);
		if (likely(b_ptr)) {
		if (likely(buf->pkt_type <= PACKET_BROADCAST)) {
		buf->next = NULL;
		@@ -568,12 +568,9 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt,
		if (!net_eq(dev_net(dev), &init_net))
		return NOTIFY_DONE;

		rcu_read_lock();
		b_ptr = rcu_dereference(dev->tipc_ptr);
		if (!b_ptr) {
		rcu_read_unlock();
		b_ptr = rtnl_dereference(dev->tipc_ptr);
		if (!b_ptr)
		return NOTIFY_DONE;
		}

		b_ptr->mtu = dev->mtu;

		@@ -595,8 +592,6 @@ static int tipc_l2_device_event(struct notifier_block *nb, unsigned long evt,
		tipc_disable_bearer(b_ptr->name);
		break;
		}
		rcu_read_unlock();

		return NOTIFY_OK;
		}

Admin message