Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb113b47 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Ingo Molnar
Browse files

uprobes: Introduce vaddr_to_offset(vma, vaddr) 



Add the new helper, vaddr_to_offset(vma, vaddr) which returns
the offset in vma->vm_file this vaddr is mapped at.

Change build_probe_list() and find_active_uprobe() to use the
new helper, the next patch adds another user.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar.vnet.ibm.com>
Cc: Anton Arapov <anton@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20120729182242.GA20355@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 891c3970

kernel/events/uprobes.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -122,6 +122,11 @@ static loff_t vma_address(struct vm_area_struct *vma, loff_t offset) 
	return vaddr;

	return vaddr;

}

}





static loff_t vaddr_to_offset(struct vm_area_struct *vma, unsigned long vaddr)

{

	return ((loff_t)vma->vm_pgoff << PAGE_SHIFT) + (vaddr - vma->vm_start);

}



/**

/**

 * __replace_page - replace page in vma by new page.

 * __replace_page - replace page in vma by new page.

 * based on replace_page in mm/ksm.c

 * based on replace_page in mm/ksm.c
@@ -978,7 +983,7 @@ static void build_probe_list(struct inode *inode, 
	struct uprobe *u;

	struct uprobe *u;





	INIT_LIST_HEAD(head);

	INIT_LIST_HEAD(head);

	min = ((loff_t)vma->vm_pgoff << PAGE_SHIFT) + start - vma->vm_start;

	min = vaddr_to_offset(vma, start);

	max = min + (end - start) - 1;

	max = min + (end - start) - 1;





	spin_lock_irqsave(&uprobes_treelock, flags);

	spin_lock_irqsave(&uprobes_treelock, flags);
@@ -1442,12 +1447,9 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) 
	vma = find_vma(mm, bp_vaddr);

	vma = find_vma(mm, bp_vaddr);

	if (vma && vma->vm_start <= bp_vaddr) {

	if (vma && vma->vm_start <= bp_vaddr) {

		if (valid_vma(vma, false)) {

		if (valid_vma(vma, false)) {

			struct inode *inode;

			struct inode *inode = vma->vm_file->f_mapping->host;

			loff_t offset;

			loff_t offset = vaddr_to_offset(vma, bp_vaddr);





			inode = vma->vm_file->f_mapping->host;

			offset = bp_vaddr - vma->vm_start;

			offset += (loff_t)vma->vm_pgoff << PAGE_SHIFT;

			uprobe = find_uprobe(inode, offset);

			uprobe = find_uprobe(inode, offset);

		}

		}