Skip to content

Commit 70b369c

Browse files
committed
lockdep/mm: Fix might_fault() lockdep check of current->mm->mmap_lock
commit a1b65f3 Author: Peter Zijlstra <[email protected]> Date: Mon Nov 4 14:39:10 2024 +0100 lockdep/mm: Fix might_fault() lockdep check of current->mm->mmap_lock Turns out that this commit, about 10 years ago: 9ec2353 ("sched/preempt, mm/fault: Trigger might_sleep() in might_fault() with disabled pagefaults") ... accidentally (and unnessecarily) put the lockdep part of __might_fault() under CONFIG_DEBUG_ATOMIC_SLEEP=y. This is potentially notable because large distributions such as Ubuntu are running with !CONFIG_DEBUG_ATOMIC_SLEEP. Restore the debug check. [ mingo: Update changelog. ] Fixes: 9ec2353 ("sched/preempt, mm/fault: Trigger might_sleep() in might_fault() with disabled pagefaults") Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Andrew Morton <[email protected]> Link: https://lore.kernel.org/r/[email protected] JIRA: https://issues.redhat.com/browse/RHEL-77742 Signed-off-by: Nico Pache <[email protected]>
1 parent 68d3f57 commit 70b369c

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

mm/memory.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6747,10 +6747,8 @@ void __might_fault(const char *file, int line)
67476747
if (pagefault_disabled())
67486748
return;
67496749
__might_sleep(file, line);
6750-
#if defined(CONFIG_DEBUG_ATOMIC_SLEEP)
67516750
if (current->mm)
67526751
might_lock_read(&current->mm->mmap_lock);
6753-
#endif
67546752
}
67556753
EXPORT_SYMBOL(__might_fault);
67566754
#endif

0 commit comments

Comments
 (0)