Commit c912dae6 authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

uprobes: Cleanup !CONFIG_UPROBES decls, unexport xol_area 



1. Don't include asm/uprobes.h unconditionally, we only need
   it if CONFIG_UPROBES.

2. Move the definition of "struct xol_area" into uprobes.c.

   Perhaps we should simply kill struct uprobes_state, it buys
   nothing.

3. Kill the dummy definition of uprobe_get_swbp_addr(), nobody
   except handle_swbp() needs it.

4. Purely cosmetic, but move the decl of uprobe_get_swbp_addr()
   up, close to other __weak helpers.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
parent 3d78e945

include/linux/uprobes.h

+4 −27
Original line number Diff line number Diff line
@@ -33,10 +33,6 @@ struct mm_struct; 
struct inode;

struct notifier_block;



#ifdef CONFIG_ARCH_SUPPORTS_UPROBES

# include <asm/uprobes.h>

#endif



#define UPROBE_HANDLER_REMOVE		1

#define UPROBE_HANDLER_MASK		1
@@ -61,6 +57,8 @@ struct uprobe_consumer { 
};



#ifdef CONFIG_UPROBES

#include <asm/uprobes.h>



enum uprobe_task_state {

	UTASK_RUNNING,

	UTASK_SSTEP,
@@ -93,24 +91,7 @@ struct uprobe_task { 
	unsigned int			depth;

};



/*

 * On a breakpoint hit, thread contests for a slot.  It frees the

 * slot after singlestep. Currently a fixed number of slots are

 * allocated.

 */

struct xol_area {

	wait_queue_head_t 	wq;		/* if all slots are busy */

	atomic_t 		slot_count;	/* number of in-use slots */

	unsigned long 		*bitmap;	/* 0 = free slot */

	struct page 		*page;



	/*

	 * We keep the vma's vm_start rather than a pointer to the vma

	 * itself.  The probed process or a naughty kernel module could make

	 * the vma go away, and we must handle that reasonably gracefully.

	 */

	unsigned long 		vaddr;		/* Page(s) of instruction slots */

};

struct xol_area;



struct uprobes_state {

	struct xol_area		*xol_area;
@@ -120,6 +101,7 @@ extern int __weak set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsign 
extern int __weak set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);

extern bool __weak is_swbp_insn(uprobe_opcode_t *insn);

extern bool __weak is_trap_insn(uprobe_opcode_t *insn);

extern unsigned long __weak uprobe_get_swbp_addr(struct pt_regs *regs);

extern int uprobe_write_opcode(struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_t);

extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);

extern int uprobe_apply(struct inode *inode, loff_t offset, struct uprobe_consumer *uc, bool);
@@ -131,7 +113,6 @@ extern void uprobe_end_dup_mmap(void); 
extern void uprobe_dup_mmap(struct mm_struct *oldmm, struct mm_struct *newmm);

extern void uprobe_free_utask(struct task_struct *t);

extern void uprobe_copy_process(struct task_struct *t, unsigned long flags);

extern unsigned long __weak uprobe_get_swbp_addr(struct pt_regs *regs);

extern int uprobe_post_sstep_notifier(struct pt_regs *regs);

extern int uprobe_pre_sstep_notifier(struct pt_regs *regs);

extern void uprobe_notify_resume(struct pt_regs *regs);
@@ -187,10 +168,6 @@ static inline bool uprobe_deny_signal(void) 
{

	return false;

}

static inline unsigned long uprobe_get_swbp_addr(struct pt_regs *regs)

{

	return 0;

}

static inline void uprobe_free_utask(struct task_struct *t)

{

}

kernel/events/uprobes.c

+19 −0
Original line number Diff line number Diff line
@@ -85,6 +85,25 @@ struct return_instance { 
	struct return_instance	*next;		/* keep as stack */

};



/*

 * On a breakpoint hit, thread contests for a slot.  It frees the

 * slot after singlestep. Currently a fixed number of slots are

 * allocated.

 */

struct xol_area {

	wait_queue_head_t 	wq;		/* if all slots are busy */

	atomic_t 		slot_count;	/* number of in-use slots */

	unsigned long 		*bitmap;	/* 0 = free slot */

	struct page 		*page;



	/*

	 * We keep the vma's vm_start rather than a pointer to the vma

	 * itself.  The probed process or a naughty kernel module could make

	 * the vma go away, and we must handle that reasonably gracefully.

	 */

	unsigned long 		vaddr;		/* Page(s) of instruction slots */

};



/*

 * valid_vma: Verify if the specified vma is an executable vma

 * Relax restrictions while unregistering: vm_flags might have

CRA Git | Maintained and supported by SUSTech CRA and CCSE