mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 23:27:06 +00:00
mm: make the page fault mmap locking killable
commit eda0047296
upstream.
This is done as a separate patch from introducing the new
lock_mm_and_find_vma() helper, because while it's an obvious change,
it's not what x86 used to do in this area.
We already abort the page fault on fatal signals anyway, so why should
we wait for the mmap lock only to then abort later? With the new helper
function that returns without the lock held on failure anyway, this is
particularly easy and straightforward.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
b11fa3d22a
commit
d939d8c154
1 changed files with 2 additions and 4 deletions
|
@ -5279,8 +5279,7 @@ static inline bool get_mmap_lock_carefully(struct mm_struct *mm, struct pt_regs
|
|||
return false;
|
||||
}
|
||||
|
||||
mmap_read_lock(mm);
|
||||
return true;
|
||||
return !mmap_read_lock_killable(mm);
|
||||
}
|
||||
|
||||
static inline bool mmap_upgrade_trylock(struct mm_struct *mm)
|
||||
|
@ -5304,8 +5303,7 @@ static inline bool upgrade_mmap_lock_carefully(struct mm_struct *mm, struct pt_r
|
|||
if (!search_exception_tables(ip))
|
||||
return false;
|
||||
}
|
||||
mmap_write_lock(mm);
|
||||
return true;
|
||||
return !mmap_write_lock_killable(mm);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
Loading…
Reference in a new issue