Commit c2fa1e1b authored by Joel Fernandes (Google)'s avatar Joel Fernandes (Google) Committed by Paul E. McKenney
Browse files

driver/core: Convert to use built-in RCU list checking 



This commit applies the consolidated hlist_for_each_entry_rcu() support
for lockdep conditions.

Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJoel Fernandes (Google) <joel@joelfernandes.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.ibm.com>
parent 7fd69b0b

drivers/base/base.h

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ static inline int devtmpfs_init(void) { return 0; } 
/* Device links support */

extern int device_links_read_lock(void);

extern void device_links_read_unlock(int idx);

extern int device_links_read_lock_held(void);

extern int device_links_check_suppliers(struct device *dev);

extern void device_links_driver_bound(struct device *dev);

extern void device_links_driver_cleanup(struct device *dev);

drivers/base/core.c

+12 −0
Original line number Diff line number Diff line
@@ -68,6 +68,11 @@ void device_links_read_unlock(int idx) 
{

	srcu_read_unlock(&device_links_srcu, idx);

}



int device_links_read_lock_held(void)

{

	return srcu_read_lock_held(&device_links_srcu);

}

#else /* !CONFIG_SRCU */

static DECLARE_RWSEM(device_links_lock);
@@ -91,6 +96,13 @@ void device_links_read_unlock(int not_used) 
{

	up_read(&device_links_lock);

}



#ifdef CONFIG_DEBUG_LOCK_ALLOC

int device_links_read_lock_held(void)

{

	return lockdep_is_held(&device_links_lock);

}

#endif

#endif /* !CONFIG_SRCU */



/**

drivers/base/power/runtime.c

+10 −5
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ static int rpm_get_suppliers(struct device *dev) 
{

	struct device_link *link;



	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node) {

	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node,

				device_links_read_lock_held()) {

		int retval;



		if (!(link->flags & DL_FLAG_PM_RUNTIME) ||
@@ -309,7 +310,8 @@ static void rpm_put_suppliers(struct device *dev) 
{

	struct device_link *link;



	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node) {

	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node,

				device_links_read_lock_held()) {

		if (READ_ONCE(link->status) == DL_STATE_SUPPLIER_UNBIND)

			continue;
@@ -1640,7 +1642,8 @@ void pm_runtime_clean_up_links(struct device *dev) 


	idx = device_links_read_lock();



	list_for_each_entry_rcu(link, &dev->links.consumers, s_node) {

	list_for_each_entry_rcu(link, &dev->links.consumers, s_node,

				device_links_read_lock_held()) {

		if (link->flags & DL_FLAG_STATELESS)

			continue;
@@ -1662,7 +1665,8 @@ void pm_runtime_get_suppliers(struct device *dev) 


	idx = device_links_read_lock();



	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node)

	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node,

				device_links_read_lock_held())

		if (link->flags & DL_FLAG_PM_RUNTIME) {

			link->supplier_preactivated = true;

			refcount_inc(&link->rpm_active);
@@ -1683,7 +1687,8 @@ void pm_runtime_put_suppliers(struct device *dev) 


	idx = device_links_read_lock();



	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node)

	list_for_each_entry_rcu(link, &dev->links.suppliers, c_node,

				device_links_read_lock_held())

		if (link->supplier_preactivated) {

			link->supplier_preactivated = false;

			if (refcount_dec_not_one(&link->rpm_active))