Skip to content

Commit 63886ba

Browse files
Qian Caitorvalds
authored andcommitted
mm/mmu_notifier: silence PROVE_RCU_LIST warnings
It is safe to traverse mm->notifier_subscriptions->list either under SRCU read lock or mm->notifier_subscriptions->lock using hlist_for_each_entry_rcu(). Silence the PROVE_RCU_LIST false positives, for example, WARNING: suspicious RCU usage ----------------------------- mm/mmu_notifier.c:484 RCU-list traversed in non-reader section!! other info that might help us debug this: rcu_scheduler_active = 2, debug_locks = 1 3 locks held by libvirtd/802: #0: ffff9321e3f58148 (&mm->mmap_sem#2){++++}, at: do_mprotect_pkey+0xe1/0x3e0 #1: ffffffff91ae6160 (mmu_notifier_invalidate_range_start){+.+.}, at: change_p4d_range+0x5fa/0x800 #2: ffffffff91ae6e08 (srcu){....}, at: __mmu_notifier_invalidate_range_start+0x178/0x460 stack backtrace: CPU: 7 PID: 802 Comm: libvirtd Tainted: G I 5.6.0-rc6-next-20200317+ #2 Hardware name: HP ProLiant BL460c Gen8, BIOS I31 11/02/2014 Call Trace: dump_stack+0xa4/0xfe lockdep_rcu_suspicious+0xeb/0xf5 __mmu_notifier_invalidate_range_start+0x3ff/0x460 change_p4d_range+0x746/0x800 change_protection+0x1df/0x300 mprotect_fixup+0x245/0x3e0 do_mprotect_pkey+0x23b/0x3e0 __x64_sys_mprotect+0x51/0x70 do_syscall_64+0x91/0xae8 entry_SYSCALL_64_after_hwframe+0x49/0xb3 Signed-off-by: Qian Cai <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Reviewed-by: Paul E. McKenney <[email protected]> Reviewed-by: Jason Gunthorpe <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 1b53734 commit 63886ba

File tree

1 file changed

+18
-9
lines changed

1 file changed

+18
-9
lines changed

mm/mmu_notifier.c

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,8 @@ static void mn_hlist_release(struct mmu_notifier_subscriptions *subscriptions,
307307
* ->release returns.
308308
*/
309309
id = srcu_read_lock(&srcu);
310-
hlist_for_each_entry_rcu(subscription, &subscriptions->list, hlist)
310+
hlist_for_each_entry_rcu(subscription, &subscriptions->list, hlist,
311+
srcu_read_lock_held(&srcu))
311312
/*
312313
* If ->release runs before mmu_notifier_unregister it must be
313314
* handled, as it's the only way for the driver to flush all
@@ -370,7 +371,8 @@ int __mmu_notifier_clear_flush_young(struct mm_struct *mm,
370371

371372
id = srcu_read_lock(&srcu);
372373
hlist_for_each_entry_rcu(subscription,
373-
&mm->notifier_subscriptions->list, hlist) {
374+
&mm->notifier_subscriptions->list, hlist,
375+
srcu_read_lock_held(&srcu)) {
374376
if (subscription->ops->clear_flush_young)
375377
young |= subscription->ops->clear_flush_young(
376378
subscription, mm, start, end);
@@ -389,7 +391,8 @@ int __mmu_notifier_clear_young(struct mm_struct *mm,
389391

390392
id = srcu_read_lock(&srcu);
391393
hlist_for_each_entry_rcu(subscription,
392-
&mm->notifier_subscriptions->list, hlist) {
394+
&mm->notifier_subscriptions->list, hlist,
395+
srcu_read_lock_held(&srcu)) {
393396
if (subscription->ops->clear_young)
394397
young |= subscription->ops->clear_young(subscription,
395398
mm, start, end);
@@ -407,7 +410,8 @@ int __mmu_notifier_test_young(struct mm_struct *mm,
407410

408411
id = srcu_read_lock(&srcu);
409412
hlist_for_each_entry_rcu(subscription,
410-
&mm->notifier_subscriptions->list, hlist) {
413+
&mm->notifier_subscriptions->list, hlist,
414+
srcu_read_lock_held(&srcu)) {
411415
if (subscription->ops->test_young) {
412416
young = subscription->ops->test_young(subscription, mm,
413417
address);
@@ -428,7 +432,8 @@ void __mmu_notifier_change_pte(struct mm_struct *mm, unsigned long address,
428432

429433
id = srcu_read_lock(&srcu);
430434
hlist_for_each_entry_rcu(subscription,
431-
&mm->notifier_subscriptions->list, hlist) {
435+
&mm->notifier_subscriptions->list, hlist,
436+
srcu_read_lock_held(&srcu)) {
432437
if (subscription->ops->change_pte)
433438
subscription->ops->change_pte(subscription, mm, address,
434439
pte);
@@ -476,7 +481,8 @@ static int mn_hlist_invalidate_range_start(
476481
int id;
477482

478483
id = srcu_read_lock(&srcu);
479-
hlist_for_each_entry_rcu(subscription, &subscriptions->list, hlist) {
484+
hlist_for_each_entry_rcu(subscription, &subscriptions->list, hlist,
485+
srcu_read_lock_held(&srcu)) {
480486
const struct mmu_notifier_ops *ops = subscription->ops;
481487

482488
if (ops->invalidate_range_start) {
@@ -528,7 +534,8 @@ mn_hlist_invalidate_end(struct mmu_notifier_subscriptions *subscriptions,
528534
int id;
529535

530536
id = srcu_read_lock(&srcu);
531-
hlist_for_each_entry_rcu(subscription, &subscriptions->list, hlist) {
537+
hlist_for_each_entry_rcu(subscription, &subscriptions->list, hlist,
538+
srcu_read_lock_held(&srcu)) {
532539
/*
533540
* Call invalidate_range here too to avoid the need for the
534541
* subsystem of having to register an invalidate_range_end
@@ -582,7 +589,8 @@ void __mmu_notifier_invalidate_range(struct mm_struct *mm,
582589

583590
id = srcu_read_lock(&srcu);
584591
hlist_for_each_entry_rcu(subscription,
585-
&mm->notifier_subscriptions->list, hlist) {
592+
&mm->notifier_subscriptions->list, hlist,
593+
srcu_read_lock_held(&srcu)) {
586594
if (subscription->ops->invalidate_range)
587595
subscription->ops->invalidate_range(subscription, mm,
588596
start, end);
@@ -714,7 +722,8 @@ find_get_mmu_notifier(struct mm_struct *mm, const struct mmu_notifier_ops *ops)
714722

715723
spin_lock(&mm->notifier_subscriptions->lock);
716724
hlist_for_each_entry_rcu(subscription,
717-
&mm->notifier_subscriptions->list, hlist) {
725+
&mm->notifier_subscriptions->list, hlist,
726+
lockdep_is_held(&mm->notifier_subscriptions->lock)) {
718727
if (subscription->ops != ops)
719728
continue;
720729

0 commit comments

Comments
 (0)