Skip to content

Commit 662bbcb

Browse files
mstsirkinIngo Molnar
authored andcommitted
mm, sched: Allow uaccess in atomic with pagefault_disable()
This changes might_fault() so that it does not trigger a false positive diagnostic for e.g. the following sequence: spin_lock_irqsave() pagefault_disable() copy_to_user() pagefault_enable() spin_unlock_irqrestore() In particular vhost wants to do this, to call socket ops from under a lock. There are 3 cases to consider: - CONFIG_PROVE_LOCKING - might_fault is non-inline so it's easy to move the in_atomic test to fix up the false positive warning. - CONFIG_DEBUG_ATOMIC_SLEEP - might_fault is currently inline, but we are calling a non-inline __might_sleep anyway, so let's use the non-line version of might_fault that does the right thing. - !CONFIG_DEBUG_ATOMIC_SLEEP && !CONFIG_PROVE_LOCKING __might_sleep is a nop so might_fault is a nop. Make this explicit. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1369577426-26721-11-git-send-email-mst@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 114276a commit 662bbcb

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

include/linux/kernel.h

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,10 @@ extern int _cond_resched(void);
193193
(__x < 0) ? -__x : __x; \
194194
})
195195

196-
#ifdef CONFIG_PROVE_LOCKING
196+
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)
197197
void might_fault(void);
198198
#else
199-
static inline void might_fault(void)
200-
{
201-
__might_sleep(__FILE__, __LINE__, 0);
202-
}
199+
static inline void might_fault(void) { }
203200
#endif
204201

205202
extern struct atomic_notifier_head panic_notifier_list;

mm/memory.c

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4210,7 +4210,7 @@ void print_vma_addr(char *prefix, unsigned long ip)
42104210
up_read(&mm->mmap_sem);
42114211
}
42124212

4213-
#ifdef CONFIG_PROVE_LOCKING
4213+
#if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)
42144214
void might_fault(void)
42154215
{
42164216
/*
@@ -4222,14 +4222,17 @@ void might_fault(void)
42224222
if (segment_eq(get_fs(), KERNEL_DS))
42234223
return;
42244224

4225-
__might_sleep(__FILE__, __LINE__, 0);
4226-
42274225
/*
42284226
* it would be nicer only to annotate paths which are not under
42294227
* pagefault_disable, however that requires a larger audit and
42304228
* providing helpers like get_user_atomic.
42314229
*/
4232-
if (!in_atomic() && current->mm)
4230+
if (in_atomic())
4231+
return;
4232+
4233+
__might_sleep(__FILE__, __LINE__, 0);
4234+
4235+
if (current->mm)
42334236
might_lock_read(&current->mm->mmap_sem);
42344237
}
42354238
EXPORT_SYMBOL(might_fault);

0 commit comments

Comments
 (0)