Commit 8bdafa39 authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt

powerpc: Fix deadlock in icswx code

The icswx code introduced an A-B B-A deadlock:

     CPU0                    CPU1
     ----                    ----
lock(&anon_vma->mutex);
                             lock(&mm->mmap_sem);
                             lock(&anon_vma->mutex);
lock(&mm->mmap_sem);

Instead of using the mmap_sem to keep mm_users constant, take the
page table spinlock.
Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Cc: <stable@kernel.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent a1194097
...@@ -136,8 +136,8 @@ int use_cop(unsigned long acop, struct mm_struct *mm) ...@@ -136,8 +136,8 @@ int use_cop(unsigned long acop, struct mm_struct *mm)
if (!mm || !acop) if (!mm || !acop)
return -EINVAL; return -EINVAL;
/* We need to make sure mm_users doesn't change */ /* The page_table_lock ensures mm_users won't change under us */
down_read(&mm->mmap_sem); spin_lock(&mm->page_table_lock);
spin_lock(mm->context.cop_lockp); spin_lock(mm->context.cop_lockp);
if (mm->context.cop_pid == COP_PID_NONE) { if (mm->context.cop_pid == COP_PID_NONE) {
...@@ -164,7 +164,7 @@ int use_cop(unsigned long acop, struct mm_struct *mm) ...@@ -164,7 +164,7 @@ int use_cop(unsigned long acop, struct mm_struct *mm)
out: out:
spin_unlock(mm->context.cop_lockp); spin_unlock(mm->context.cop_lockp);
up_read(&mm->mmap_sem); spin_unlock(&mm->page_table_lock);
return ret; return ret;
} }
...@@ -185,8 +185,8 @@ void drop_cop(unsigned long acop, struct mm_struct *mm) ...@@ -185,8 +185,8 @@ void drop_cop(unsigned long acop, struct mm_struct *mm)
if (WARN_ON_ONCE(!mm)) if (WARN_ON_ONCE(!mm))
return; return;
/* We need to make sure mm_users doesn't change */ /* The page_table_lock ensures mm_users won't change under us */
down_read(&mm->mmap_sem); spin_lock(&mm->page_table_lock);
spin_lock(mm->context.cop_lockp); spin_lock(mm->context.cop_lockp);
mm->context.acop &= ~acop; mm->context.acop &= ~acop;
...@@ -213,7 +213,7 @@ void drop_cop(unsigned long acop, struct mm_struct *mm) ...@@ -213,7 +213,7 @@ void drop_cop(unsigned long acop, struct mm_struct *mm)
} }
spin_unlock(mm->context.cop_lockp); spin_unlock(mm->context.cop_lockp);
up_read(&mm->mmap_sem); spin_unlock(&mm->page_table_lock);
} }
EXPORT_SYMBOL_GPL(drop_cop); EXPORT_SYMBOL_GPL(drop_cop);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment