Commit 85328240 authored Nov 26, 2013 by John Fastabend Committed by Jeff Kirsher Dec 17, 2013

net: allow netdev_all_upper_get_next_dev_rcu with rtnl lock held



It is useful to be able to walk all upper devices when bringing
a device online where the RTNL lock is held. In this case it
is safe to walk the all_adj_list because the RTNL lock is used
to protect the write side as well.

This patch adds a check to see if the rtnl lock is held before
throwing a warning in netdev_all_upper_get_next_dev_rcu().

Also because we now have a call site for lockdep_rtnl_is_held()
outside COFIG_LOCK_PROVING an inline definition returning 1 is
needed. Similar to the rcu_read_lock_is_held().

Fixes: 2a47fa45 ("ixgbe: enable l2 forwarding acceleration for macvlans")
CC: Veaceslav Falico <vfalico@redhat.com>
Reported-by: Yuanhan Liu <yuanhan.liu@linux.intel.com>
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 78106927

include/linux/rtnetlink.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,11 @@ extern int rtnl_trylock(void);
		extern int rtnl_is_locked(void);
		#ifdef CONFIG_PROVE_LOCKING
		extern int lockdep_rtnl_is_held(void);
		#else
		static inline int lockdep_rtnl_is_held(void)
		{
		return 1;
		}
		#endif /* #ifdef CONFIG_PROVE_LOCKING */

		/**

net/core/dev.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4500,7 +4500,7 @@ struct net_device netdev_all_upper_get_next_dev_rcu(struct net_device dev,
		{
		struct netdev_adjacent *upper;

		WARN_ON_ONCE(!rcu_read_lock_held());
		WARN_ON_ONCE(!rcu_read_lock_held() && !lockdep_rtnl_is_held());

		upper = list_entry_rcu((*iter)->next, struct netdev_adjacent, list);

Admin message