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 94B83C0015E for ; Thu, 13 Jul 2023 13:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234264AbjGMNeq (ORCPT ); Thu, 13 Jul 2023 09:34:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234866AbjGMNeo (ORCPT ); Thu, 13 Jul 2023 09:34:44 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5EB52702; Thu, 13 Jul 2023 06:34:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 461936136A; Thu, 13 Jul 2023 13:34:39 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28DB0C433C7; Thu, 13 Jul 2023 13:34:38 +0000 (UTC) Date: Thu, 13 Jul 2023 09:34:36 -0400 From: Steven Rostedt To: "Masami Hiramatsu (Google)" Cc: Dan Carpenter , linux-trace-kernel@vger.kernel.org, LKML Subject: Re: [PATCH v5 3/5] tracing/probes: Fix to update dynamic data counter if fetcharg uses it Message-ID: <20230713093436.0241ed77@gandalf.local.home> In-Reply-To: <168908494781.123124.8160245359962103684.stgit@devnote2> References: <168908491977.123124.16583481716284477889.stgit@devnote2> <168908494781.123124.8160245359962103684.stgit@devnote2> X-Mailer: Claws Mail 3.19.1 (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-trace-kernel@vger.kernel.org On Tue, 11 Jul 2023 23:15:48 +0900 "Masami Hiramatsu (Google)" wrote: > From: Masami Hiramatsu (Google) > > Fix to update dynamic data counter ('dyndata') and max length ('maxlen') > only if the fetcharg uses the dynamic data. Also get out arg->dynamic > from unlikely(). This makes dynamic data address wrong if > process_fetch_insn() returns error on !arg->dynamic case. > > Suggested-by: Steven Rostedt > Link: https://lore.kernel.org/all/20230710233400.5aaf024e@gandalf.local.home/ > Fixes: 9178412ddf5a ("tracing: probeevent: Return consumed bytes of dynamic area") > Cc: stable@vger.kernel.org > Signed-off-by: Masami Hiramatsu (Google) Reviewed-by: Steven Rostedt (Google) -- Steve > --- > kernel/trace/trace_probe_tmpl.h | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/kernel/trace/trace_probe_tmpl.h b/kernel/trace/trace_probe_tmpl.h > index ed9d57c6b041..185da001f4c3 100644 > --- a/kernel/trace/trace_probe_tmpl.h > +++ b/kernel/trace/trace_probe_tmpl.h > @@ -267,11 +267,13 @@ store_trace_args(void *data, struct trace_probe *tp, void *rec, > if (unlikely(arg->dynamic)) > *dl = make_data_loc(maxlen, dyndata - base); > ret = process_fetch_insn(arg->code, rec, dl, base); > - if (unlikely(ret < 0 && arg->dynamic)) { > - *dl = make_data_loc(0, dyndata - base); > - } else { > - dyndata += ret; > - maxlen -= ret; > + if (arg->dynamic) { > + if (unlikely(ret < 0)) { > + *dl = make_data_loc(0, dyndata - base); > + } else { > + dyndata += ret; > + maxlen -= ret; > + } > } > } > }