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

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

uprobes: Remove "verify" argument from set_orig_insn() 



Nobody does set_orig_insn(verify => false), and I think nobody will.
Remove this argument. IIUC set_orig_insn(verify => false) was needed
to single-step without xol area.

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

include/linux/uprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ struct uprobes_state { 
};



extern int __weak set_swbp(struct arch_uprobe *aup, struct mm_struct *mm, unsigned long vaddr);

extern int __weak set_orig_insn(struct arch_uprobe *aup, struct mm_struct *mm,  unsigned long vaddr, bool verify);

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 int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);

extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);

kernel/events/uprobes.c

+9 −11
Original line number Diff line number Diff line
@@ -345,15 +345,13 @@ int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned 
 * @mm: the probed process address space.

 * @auprobe: arch specific probepoint information.

 * @vaddr: the virtual address to insert the opcode.

 * @verify: if true, verify existance of breakpoint instruction.

 *

 * For mm @mm, restore the original opcode (opcode) at @vaddr.

 * Return 0 (success) or a negative errno.

 */

int __weak

set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr, bool verify)

set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr)

{

	if (verify) {

	int result;



	result = is_swbp_at_addr(mm, vaddr);
@@ -362,7 +360,7 @@ set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long v 


	if (result != 1)

		return result;

	}



	return write_opcode(auprobe, mm, vaddr, *(uprobe_opcode_t *)auprobe->insn);

}
@@ -697,7 +695,7 @@ install_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, 
static void

remove_breakpoint(struct uprobe *uprobe, struct mm_struct *mm, unsigned long vaddr)

{

	set_orig_insn(&uprobe->arch, mm, vaddr, true);

	set_orig_insn(&uprobe->arch, mm, vaddr);

}



/*