evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uprobes: Fold xol_alloc_area() into get_xol_area()

Browse source 
Currently only xol_get_insn_slot() does get_xol_area() + xol_alloc_area(),
but this will have more users and we do not want to copy-and-paste this
code. This patch simply moves xol_alloc_area() into get_xol_area() to
simplify the current and future code.

Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Anton Arapov <anton@redhat.com>
Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
This commit is contained in:
Oleg Nesterov 2012-12-31 16:39:49 +01:00
parent c8a8253800
commit 9b545df809
1 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
kernel/events/uprobes.c
View file

@ -1070,27 +1070,21 @@ static int xol_add_vma(struct xol_area *area)
return ret; return ret;
} }
static struct xol_area *get_xol_area(struct mm_struct *mm)
{
struct xol_area *area;
area = mm->uprobes_state.xol_area;
smp_read_barrier_depends(); /* pairs with wmb in xol_add_vma() */
return area;
}
/* /*
* xol_alloc_area - Allocate process's xol_area. * get_xol_area - Allocate process's xol_area if necessary.
* This area will be used for storing instructions for execution out of * This area will be used for storing instructions for execution out of line.
* line.
* *
* Returns the allocated area or NULL. * Returns the allocated area or NULL.
*/ */
static struct xol_area *xol_alloc_area(void) static struct xol_area *get_xol_area(void)
{ {
struct mm_struct *mm = current->mm;
struct xol_area *area; struct xol_area *area;
area = mm->uprobes_state.xol_area;
if (area)
goto ret;
area = kzalloc(sizeof(*area), GFP_KERNEL); area = kzalloc(sizeof(*area), GFP_KERNEL);
if (unlikely(!area)) if (unlikely(!area))
goto out; goto out;
@ -1113,7 +1107,10 @@ static struct xol_area *xol_alloc_area(void)
free_area: free_area:
kfree(area); kfree(area);
out: out:
return get_xol_area(current->mm); area = mm->uprobes_state.xol_area;
ret:
smp_read_barrier_depends(); /* pairs with wmb in xol_add_vma() */
return area;
} }
/* /*
@ -1189,14 +1186,11 @@ static unsigned long xol_get_insn_slot(struct uprobe *uprobe, unsigned long slot
unsigned long offset; unsigned long offset;
void *vaddr; void *vaddr;
area = get_xol_area(current->mm); area = get_xol_area();
if (!area) { if (!area)
area = xol_alloc_area(); return 0;
if (!area)
return 0;
}
current->utask->xol_vaddr = xol_take_insn_slot(area);
current->utask->xol_vaddr = xol_take_insn_slot(area);
/* /*
* Initialize the slot if xol_vaddr points to valid * Initialize the slot if xol_vaddr points to valid
* instruction slot. * instruction slot.