From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D92F0C4320D for ; Tue, 24 Sep 2019 16:57:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A2B47217D9 for ; Tue, 24 Sep 2019 16:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569344263; bh=ukvkbUWPZgKT8DM481/hafI6yceN2bLg0AIJm/fKvsg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=J9TVLV/gPE7PFsaWCMVikO0XlSxWCia4miaW7hUho4wl3keftcTdaiy+LxXqLoRpJ jqdMiZbWGqTsvm53qzA0J7nMGZc5hI4j6XgGsBfY3CZ4uA+lL3Xo9r/Linsq115o6/ ox1JRt+3VP9A4kOH54Bi2QYcj+Nx/ndAj6vq54j0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404760AbfIXQ5m (ORCPT ); Tue, 24 Sep 2019 12:57:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:51968 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730534AbfIXQ5j (ORCPT ); Tue, 24 Sep 2019 12:57:39 -0400 Received: from devnote2 (unknown [12.206.46.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A7E8420673; Tue, 24 Sep 2019 16:57:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569344259; bh=ukvkbUWPZgKT8DM481/hafI6yceN2bLg0AIJm/fKvsg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=ZAisG4Tv4lkpwx383sYq1aSCBklYWwnPhZHN9aUU9f+Z8AVTtPDKspA1s/LtAsQVC anIOtwdjverTGILBUnuxs2shjV0pq0O6ip2EmzPpBXxM2if8EJdzX+VL3slt/RKlyr 6bAnHEeyvsJUg9JVxWsu6Qi96Fj+V+tLRwR4HUPY= Date: Tue, 24 Sep 2019 09:57:37 -0700 From: Masami Hiramatsu To: Srikar Dronamraju Cc: Steven Rostedt , Ingo Molnar , Andrew Morton , Naveen Rao , Ravi Bangoria , LKML Subject: Re: [PATCH] tracing/probe: Fix same probe event argument matching Message-Id: <20190924095737.571b71594c25dc4b246e5377@kernel.org> In-Reply-To: <20190924114906.14038-1-srikar@linux.vnet.ibm.com> References: <20190924114906.14038-1-srikar@linux.vnet.ibm.com> X-Mailer: Sylpheed 3.5.1 (GTK+ 2.24.32; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Srikar, On Tue, 24 Sep 2019 17:19:06 +0530 Srikar Dronamraju wrote: > Commit fe60b0ce8e73 ("tracing/probe: Reject exactly same probe event") > tries to reject a event which matches an already existing probe. > > However it currently continues to match arguments and rejects adding a > probe even when the arguments don't match. Fix this by only rejecting a > probe if and only if all the arguments match. Thank you for fixing! This looks good to me. Acked-by: Masami Hiramatsu > > Fixes: fe60b0ce8e73 ("tracing/probe: Reject exactly same probe event") > Signed-off-by: Srikar Dronamraju > --- > kernel/trace/trace_kprobe.c | 5 +++-- > kernel/trace/trace_uprobe.c | 5 +++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c > index a6697e28ddda..402dc3ce88d3 100644 > --- a/kernel/trace/trace_kprobe.c > +++ b/kernel/trace/trace_kprobe.c > @@ -549,10 +549,11 @@ static bool trace_kprobe_has_same_kprobe(struct trace_kprobe *orig, > for (i = 0; i < orig->tp.nr_args; i++) { > if (strcmp(orig->tp.args[i].comm, > comp->tp.args[i].comm)) > - continue; > + break; > } > > - return true; > + if (i == orig->tp.nr_args) > + return true; > } > > return false; > diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c > index 34dd6d0016a3..dd884341f5c5 100644 > --- a/kernel/trace/trace_uprobe.c > +++ b/kernel/trace/trace_uprobe.c > @@ -431,10 +431,11 @@ static bool trace_uprobe_has_same_uprobe(struct trace_uprobe *orig, > for (i = 0; i < orig->tp.nr_args; i++) { > if (strcmp(orig->tp.args[i].comm, > comp->tp.args[i].comm)) > - continue; > + break; > } > > - return true; > + if (i == orig->tp.nr_args) > + return true; > } > > return false; > -- > 2.18.1 > -- Masami Hiramatsu