Re: [PATCH 7/7] uprobes: remove "verify" argument fromset_orig_insn()

[Srikar Dronamraju]

* Oleg Nesterov <oleg@xxxxxxxxxx> [2012-08-08 19:37:52]:

> 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: Oleg Nesterov <oleg@xxxxxxxxxx>

Acked-by: Srikar Dronamraju <srikar@xxxxxxxxxxxxxxxxxx>

> ---
>  include/linux/uprobes.h |    2 +-
>  kernel/events/uprobes.c |   20 +++++++++-----------
>  2 files changed, 10 insertions(+), 12 deletions(-)
> 
> diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
> index 30297f9..6d4fe79 100644
> --- a/include/linux/uprobes.h
> +++ b/include/linux/uprobes.h
> @@ -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);
> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
> index 81fb2d8..25c0d74 100644
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@ -347,24 +347,22 @@ 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;
> +	int result;
> +
> +	result = is_swbp_at_addr(mm, vaddr);
> +	if (!result)
> +		return -EINVAL;
> 
> -		result = is_swbp_at_addr(mm, vaddr);
> -		if (!result)
> -			return -EINVAL;
> +	if (result != 1)
> +		return result;
> 
> -		if (result != 1)
> -			return result;
> -	}
>  	return write_opcode(auprobe, mm, vaddr, *(uprobe_opcode_t *)auprobe->insn);
>  }
> 
> @@ -699,7 +697,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);
>  }
> 
>  /*
> -- 
> 1.5.5.1
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/