Skip to content

Commit

Permalink
perf_counter, x86: Improve interactions with fast-gup
Browse files Browse the repository at this point in the history
Improve a few details in perfcounter call-chain recording that
makes use of fast-GUP:

- Use ACCESS_ONCE() to observe the pte value. ptes are fundamentally
  racy and can be changed on another CPU, so we have to be careful
  about how we access them. The PAE branch is already careful with
  read-barriers - but the non-PAE and 64-bit side needs an
  ACCESS_ONCE() to make sure the pte value is observed only once.

- make the checks a bit stricter so that we can feed it any kind of
  cra^H^H^H user-space input ;-)

Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Ingo Molnar committed Jun 19, 2009
1 parent e5289d4 commit 0c87197
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion arch/x86/include/asm/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,12 @@
#define MAKE_MM_SEG(s) ((mm_segment_t) { (s) })

#define KERNEL_DS MAKE_MM_SEG(-1UL)
#define USER_DS MAKE_MM_SEG(PAGE_OFFSET)

#ifdef CONFIG_X86_32
# define USER_DS MAKE_MM_SEG(PAGE_OFFSET)
#else
# define USER_DS MAKE_MM_SEG(__VIRTUAL_MASK)
#endif

#define get_ds() (KERNEL_DS)
#define get_fs() (current_thread_info()->addr_limit)
Expand Down
2 changes: 1 addition & 1 deletion arch/x86/mm/gup.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
static inline pte_t gup_get_pte(pte_t *ptep)
{
#ifndef CONFIG_X86_PAE
return *ptep;
return ACCESS_ONCE(*ptep);
#else
/*
* With get_user_pages_fast, we walk down the pagetables without taking
Expand Down

0 comments on commit 0c87197

Please sign in to comment.