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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C9594C4332F for ; Thu, 29 Dec 2022 08:07:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232960AbiL2IHb (ORCPT ); Thu, 29 Dec 2022 03:07:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35342 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229483AbiL2IH2 (ORCPT ); Thu, 29 Dec 2022 03:07:28 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B7242F6; Thu, 29 Dec 2022 00:07:27 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 2455B61714; Thu, 29 Dec 2022 08:07:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4230DC433D2; Thu, 29 Dec 2022 08:07:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672301246; bh=GG+GiadwESuHg/69Z5HD1uL8GSlw2hawkZM2LhM8cBg=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=WzFX4nNqOZITHuEvwtC2OAhyWo7I5HBNPaPhqr6//tfnW7BbEgDi/pqvxoDsE1wde MMzABQUxexO6LAYkxFjkYV17ZWlwwV+oslIMyJiTT5jfDre6xTpWxRNqzHJcXXisZm FRz/4kRkI8ZyUq94tUK5Dcl7wbk2NtaU0eoPhsAClBJz0yiI56fdGVPNKa2IpOGa3q MR/muGgYkq7U7XRSHiK5G4xN3DGLCXXkt5mpPVup+1CMrEK5HRZGUh3o9Ilz1/zku7 hRBk16JYZfD+dFWpHBw+GfFDQjWrGoQ/7lbu7p8aBiE3JWrUgd31fNUnpSDmRK4unr lLFz7zv08Np8Q== Date: Thu, 29 Dec 2022 17:07:23 +0900 From: Masami Hiramatsu (Google) To: Song Chen Cc: rostedt@goodmis.org, arnd@arndb.de, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-arch@vger.kernel.org Subject: Re: [PATCH v4 1/2] kernel/trace: Introduce trace_probe_print_args and use it in *probes Message-Id: <20221229170723.d68c2c86a53ca27be539ce11@kernel.org> In-Reply-To: <1672211291-31439-1-git-send-email-chensong_2000@189.cn> References: <1672211291-31439-1-git-send-email-chensong_2000@189.cn> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 28 Dec 2022 15:08:11 +0800 Song Chen wrote: > print_probe_args is currently inplemented in trace_probe_tmpl.h and > included by *probes, as a result, each probe has an identical copy. > > This patch will move it to trace_probe.c as an new API, each probe > calls it to print their args in trace file. > OK, This looks good to me. Acked-by: Masami Hiramatsu (Google) Thank you! > Signed-off-by: Song Chen > --- > kernel/trace/trace_eprobe.c | 2 +- > kernel/trace/trace_kprobe.c | 4 ++-- > kernel/trace/trace_probe.c | 27 +++++++++++++++++++++++++++ > kernel/trace/trace_probe.h | 2 ++ > kernel/trace/trace_probe_tmpl.h | 28 ---------------------------- > kernel/trace/trace_uprobe.c | 2 +- > 6 files changed, 33 insertions(+), 32 deletions(-) > > diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c > index 5dd0617e5df6..bdb26eee7a0c 100644 > --- a/kernel/trace/trace_eprobe.c > +++ b/kernel/trace/trace_eprobe.c > @@ -310,7 +310,7 @@ print_eprobe_event(struct trace_iterator *iter, int flags, > > trace_seq_putc(s, ')'); > > - if (print_probe_args(s, tp->args, tp->nr_args, > + if (trace_probe_print_args(s, tp->args, tp->nr_args, > (u8 *)&field[1], field) < 0) > goto out; > > diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c > index 5a75b039e586..a4ffa864dbb7 100644 > --- a/kernel/trace/trace_kprobe.c > +++ b/kernel/trace/trace_kprobe.c > @@ -1426,7 +1426,7 @@ print_kprobe_event(struct trace_iterator *iter, int flags, > > trace_seq_putc(s, ')'); > > - if (print_probe_args(s, tp->args, tp->nr_args, > + if (trace_probe_print_args(s, tp->args, tp->nr_args, > (u8 *)&field[1], field) < 0) > goto out; > > @@ -1461,7 +1461,7 @@ print_kretprobe_event(struct trace_iterator *iter, int flags, > > trace_seq_putc(s, ')'); > > - if (print_probe_args(s, tp->args, tp->nr_args, > + if (trace_probe_print_args(s, tp->args, tp->nr_args, > (u8 *)&field[1], field) < 0) > goto out; > > diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c > index 36dff277de46..ae13b6b2d5da 100644 > --- a/kernel/trace/trace_probe.c > +++ b/kernel/trace/trace_probe.c > @@ -1218,3 +1218,30 @@ int trace_probe_create(const char *raw_command, int (*createfn)(int, const char > > return ret; > } > + > +int trace_probe_print_args(struct trace_seq *s, struct probe_arg *args, int nr_args, > + u8 *data, void *field) > +{ > + void *p; > + int i, j; > + > + for (i = 0; i < nr_args; i++) { > + struct probe_arg *a = args + i; > + > + trace_seq_printf(s, " %s=", a->name); > + if (likely(!a->count)) { > + if (!a->type->print(s, data + a->offset, field)) > + return -ENOMEM; > + continue; > + } > + trace_seq_putc(s, '{'); > + p = data + a->offset; > + for (j = 0; j < a->count; j++) { > + if (!a->type->print(s, p, field)) > + return -ENOMEM; > + trace_seq_putc(s, j == a->count - 1 ? '}' : ','); > + p += a->type->size; > + } > + } > + return 0; > +} > diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h > index de38f1c03776..cfef198013af 100644 > --- a/kernel/trace/trace_probe.h > +++ b/kernel/trace/trace_probe.h > @@ -343,6 +343,8 @@ int trace_probe_compare_arg_type(struct trace_probe *a, struct trace_probe *b); > bool trace_probe_match_command_args(struct trace_probe *tp, > int argc, const char **argv); > int trace_probe_create(const char *raw_command, int (*createfn)(int, const char **)); > +int trace_probe_print_args(struct trace_seq *s, struct probe_arg *args, int nr_args, > + u8 *data, void *field); > > #define trace_probe_for_each_link(pos, tp) \ > list_for_each_entry(pos, &(tp)->event->files, list) > diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h > index b3bdb8ddb862..1b57420857e1 100644 > --- a/kernel/trace/trace_probe_tmpl.h > +++ b/kernel/trace/trace_probe_tmpl.h > @@ -212,31 +212,3 @@ store_trace_args(void *data, struct trace_probe *tp, void *rec, > } > } > } > - > -static inline int > -print_probe_args(struct trace_seq *s, struct probe_arg *args, int nr_args, > - u8 *data, void *field) > -{ > - void *p; > - int i, j; > - > - for (i = 0; i < nr_args; i++) { > - struct probe_arg *a = args + i; > - > - trace_seq_printf(s, " %s=", a->name); > - if (likely(!a->count)) { > - if (!a->type->print(s, data + a->offset, field)) > - return -ENOMEM; > - continue; > - } > - trace_seq_putc(s, '{'); > - p = data + a->offset; > - for (j = 0; j < a->count; j++) { > - if (!a->type->print(s, p, field)) > - return -ENOMEM; > - trace_seq_putc(s, j == a->count - 1 ? '}' : ','); > - p += a->type->size; > - } > - } > - return 0; > -} > diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c > index fb58e86dd117..1ff8f87211a6 100644 > --- a/kernel/trace/trace_uprobe.c > +++ b/kernel/trace/trace_uprobe.c > @@ -1041,7 +1041,7 @@ print_uprobe_event(struct trace_iterator *iter, int flags, struct trace_event *e > data = DATAOF_TRACE_ENTRY(entry, false); > } > > - if (print_probe_args(s, tu->tp.args, tu->tp.nr_args, data, entry) < 0) > + if (trace_probe_print_args(s, tu->tp.args, tu->tp.nr_args, data, entry) < 0) > goto out; > > trace_seq_putc(s, '\n'); > -- > 2.25.1 > -- Masami Hiramatsu (Google)