Skip to contentSkip to conversation

drivers: soc: ti: knav_qmss_queue: Pass lockdep expression to RCU lists

PATCH In review Amol Grover 2 participants 2 messages Jan 18, 2020 TI Keystone multicore navigator drivers

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drivers: soc: ti: knav_qmss_queue: Pass lockdep expression to RCU lists

inst->handles is traversed using list_for_each_entry_rcu outside an RCU read-side critical section but under the protection of knav_dev_lock.

Hence, add corresponding lockdep expression to silence false-positive lockdep warnings, and harden RCU lists.

Add macro for the corresponding lockdep expression.

---
v2:
- Remove rcu_read_lock_held() from lockdep expression since it is implicitly checked for.

 drivers/soc/ti/knav_qmss_queue.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/soc/ti/knav_qmss_queue.c +5 -2
index 1ccc9064e1eb..37f3db6c041c 100644
@@ -25,6 +25,8 @@
 
 static struct knav_device *kdev;
 static DEFINE_MUTEX(knav_dev_lock);
+#define knav_dev_lock_held() \
+	lockdep_is_held(&knav_dev_lock)
 
 /* Queue manager register indices in DTS */
 #define KNAV_QUEUE_PEEK_REG_INDEX	0
@@ -52,8 +54,9 @@ static DEFINE_MUTEX(knav_dev_lock);
 #define knav_queue_idx_to_inst(kdev, idx)			\
 	(kdev->instances + (idx << kdev->inst_shift))
 
-#define for_each_handle_rcu(qh, inst)			\
-	list_for_each_entry_rcu(qh, &inst->handles, list)
+#define for_each_handle_rcu(qh, inst)				\
+	list_for_each_entry_rcu(qh, &inst->handles, list,	\
+				knav_dev_lock_held())
 
 #define for_each_instance(idx, inst, kdev)		\
 	for (idx = 0, inst = kdev->instances;		\
Signature · 1 line
2.24.1
Acked-by Santosh Shilimkar on v2 1/1
#1 lore raw
Quoted 7 lines · Amol Grover

inst->handles is traversed using list_for_each_entry_rcu outside an RCU read-side critical section but under the protection of knav_dev_lock.

Hence, add corresponding lockdep expression to silence false-positive lockdep warnings, and harden RCU lists.

Quoted 8 lines

Add macro for the corresponding lockdep expression.

---
v2:
- Remove rcu_read_lock_held() from lockdep expression since it is implicitly checked for.

Thanks.

Quoted 19 lines
  drivers/soc/ti/knav_qmss_queue.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
drivers/soc/ti/knav_qmss_queue.c +2 -0
index 1ccc9064e1eb..37f3db6c041c 100644
@@ -25,6 +25,8 @@
 
  static struct knav_device *kdev;
  static DEFINE_MUTEX(knav_dev_lock);
+#define knav_dev_lock_held() \
+	lockdep_is_held(&knav_dev_lock)
 
  /* Queue manager register indices in DTS */
  #define KNAV_QUEUE_PEEK_REG_INDEX	0
@@ -52,8 +54,9 @@ static DEFINE_MUTEX(knav_dev_lock);
  #define knav_queue_idx_to_inst(kdev, idx)			\

drivers/soc/ti/knav_qmss_queue.c static DEFINE_MUTEX(knav_dev_lock); · line 62

Quoted 10 lines
drivers/soc/ti/knav_qmss_queue.c +3 -2
  	(kdev->instances + (idx << kdev->inst_shift))
 
-#define for_each_handle_rcu(qh, inst)			\
-	list_for_each_entry_rcu(qh, &inst->handles, list)
+#define for_each_handle_rcu(qh, inst)				\
+	list_for_each_entry_rcu(qh, &inst->handles, list,	\
+				knav_dev_lock_held())
 
  #define for_each_instance(idx, inst, kdev)		\
  	for (idx = 0, inst = kdev->instances;		\

_______________________________________________
Linux-kernel-mentees mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees