From 7b2d0241a65d023d00487e6dc9e4e1b0290ec974 Mon Sep 17 00:00:00 2001 From: Gavin Shan Date: Thu, 25 Oct 2012 12:13:56 +1100 Subject: [PATCH] mm/mmu_notifier: allocate mmu_notifier in advance While allocating mmu_notifier with parameter GFP_KERNEL, swap would start to work in case of tight available memory. Eventually, that would lead to a deadlock while the swap deamon swaps anonymous pages. It was caused by commit e0f3c3f78da29b ("mm/mmu_notifier: init notifier if necessary"). : [49048.262912] ================================= : [49048.262913] [ INFO: inconsistent lock state ] : [49048.262916] 3.7.0-rc1+ #518 Not tainted : [49048.262918] --------------------------------- : [49048.262919] inconsistent {RECLAIM_FS-ON-W} -> {IN-RECLAIM_FS-W} usage. : [49048.262922] kswapd0/35 [HC0[0]:SC0[0]:HE1:SE1] takes: : [49048.262924] (&mapping->i_mmap_mutex){+.+.?.}, at: [] page_referenced+0x9c/0x2e0 : [49048.262933] {RECLAIM_FS-ON-W} state was registered at: : [49048.262935] [] mark_held_locks+0x86/0x150 : [49048.262938] [] lockdep_trace_alloc+0x67/0xc0 : [49048.262942] [] kmem_cache_alloc_trace+0x33/0x230 : [49048.262945] [] do_mmu_notifier_register+0x87/0x180 : [49048.262948] [] mmu_notifier_register+0x13/0x20 : [49048.262951] [] kvm_dev_ioctl+0x428/0x510 : [49048.262955] [] do_vfs_ioctl+0x98/0x570 : [49048.262959] [] sys_ioctl+0x91/0xb0 : [49048.262962] [] system_call_fastpath+0x16/0x1b : [49048.262966] irq event stamp: 825 : [49048.262968] hardirqs last enabled at (825): [] _raw_spin_unlock_irq+0x30/0x60 : [49048.262971] hardirqs last disabled at (824): [] _raw_spin_lock_irq+0x19/0x80 : [49048.262975] softirqs last enabled at (0): [] copy_process+0x630/0x17c0 : [49048.262979] softirqs last disabled at (0): [< (null)>] (null) : ... Simply back out the above commit, which was a small performance optimization. Signed-off-by: Gavin Shan Reported-by: Andrea Righi Tested-by: Andrea Righi Cc: Wanpeng Li Cc: Andrea Arcangeli Cc: Avi Kivity Cc: Hugh Dickins Cc: Marcelo Tosatti Cc: Xiao Guangrong Cc: Sagi Grimberg Cc: Haggai Eran Signed-off-by: Andrew Morton --- mm/mmu_notifier.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c index 479a1e751a73..8a5ac8c686b0 100644 --- a/mm/mmu_notifier.c +++ b/mm/mmu_notifier.c @@ -196,28 +196,28 @@ static int do_mmu_notifier_register(struct mmu_notifier *mn, BUG_ON(atomic_read(&mm->mm_users) <= 0); /* - * Verify that mmu_notifier_init() already run and the global srcu is - * initialized. - */ + * Verify that mmu_notifier_init() already run and the global srcu is + * initialized. + */ BUG_ON(!srcu.per_cpu_ref); + ret = -ENOMEM; + mmu_notifier_mm = kmalloc(sizeof(struct mmu_notifier_mm), GFP_KERNEL); + if (unlikely(!mmu_notifier_mm)) + goto out; + if (take_mmap_sem) down_write(&mm->mmap_sem); ret = mm_take_all_locks(mm); if (unlikely(ret)) - goto out; + goto out_clean; if (!mm_has_notifiers(mm)) { - mmu_notifier_mm = kmalloc(sizeof(struct mmu_notifier_mm), - GFP_KERNEL); - if (unlikely(!mmu_notifier_mm)) { - ret = -ENOMEM; - goto out_of_mem; - } INIT_HLIST_HEAD(&mmu_notifier_mm->list); spin_lock_init(&mmu_notifier_mm->lock); mm->mmu_notifier_mm = mmu_notifier_mm; + mmu_notifier_mm = NULL; } atomic_inc(&mm->mm_count); @@ -233,12 +233,12 @@ static int do_mmu_notifier_register(struct mmu_notifier *mn, hlist_add_head(&mn->hlist, &mm->mmu_notifier_mm->list); spin_unlock(&mm->mmu_notifier_mm->lock); -out_of_mem: mm_drop_all_locks(mm); -out: +out_clean: if (take_mmap_sem) up_write(&mm->mmap_sem); - + kfree(mmu_notifier_mm); +out: BUG_ON(atomic_read(&mm->mm_users) <= 0); return ret; } -- 2.39.5