Re: [PATCH 4/7] uprobes: Kill uprobe_consumer->filter()

[Srikar Dronamraju <srikar@linux.vnet.ibm.com>]

* Oleg Nesterov <oleg@redhat.com> [2012-11-23 21:28:10]:

> uprobe_consumer->filter() is pointless in its current form, kill it.
> 
> We will add it back, but with the different signature/semantics. Perhaps
> we will even re-introduce the callsite in handler_chain(), but not to
> just skip uc->handler().
> 
> Signed-off-by: Oleg Nesterov <oleg@redhat.com>

Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com>

> ---
>  include/linux/uprobes.h     |    5 -----
>  kernel/events/uprobes.c     |    6 ++----
>  kernel/trace/trace_uprobe.c |    1 -
>  3 files changed, 2 insertions(+), 10 deletions(-)
> 
> diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
> index 4f628a6..83742b9 100644
> --- a/include/linux/uprobes.h
> +++ b/include/linux/uprobes.h
> @@ -37,11 +37,6 @@ struct inode;
> 
>  struct uprobe_consumer {
>  	int (*handler)(struct uprobe_consumer *self, struct pt_regs *regs);
> -	/*
> -	 * filter is optional; If a filter exists, handler is run
> -	 * if and only if filter returns true.
> -	 */
> -	bool (*filter)(struct uprobe_consumer *self, struct task_struct *task);
> 
>  	struct uprobe_consumer *next;
>  };
> diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
> index d8e930a..e761974 100644
> --- a/kernel/events/uprobes.c
> +++ b/kernel/events/uprobes.c
> @@ -477,10 +477,8 @@ static void handler_chain(struct uprobe *uprobe, struct pt_regs *regs)
>  		return;
> 
>  	down_read(&uprobe->consumer_rwsem);
> -	for (uc = uprobe->consumers; uc; uc = uc->next) {
> -		if (!uc->filter || uc->filter(uc, current))
> -			uc->handler(uc, regs);
> -	}
> +	for (uc = uprobe->consumers; uc; uc = uc->next)
> +		uc->handler(uc, regs);
>  	up_read(&uprobe->consumer_rwsem);
>  }
> 
> diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
> index 03003cd..38eee92 100644
> --- a/kernel/trace/trace_uprobe.c
> +++ b/kernel/trace/trace_uprobe.c
> @@ -546,7 +546,6 @@ static int probe_event_enable(struct trace_uprobe *tu, int flag)
>  		return -EINTR;
> 
>  	utc->cons.handler = uprobe_dispatcher;
> -	utc->cons.filter = NULL;
>  	ret = uprobe_register(tu->inode, tu->offset, &utc->cons);
>  	if (ret) {
>  		kfree(utc);
> -- 
> 1.5.5.1
>