From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D4C0A13B5B7 for ; Thu, 31 Oct 2024 01:43:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730339021; cv=none; b=RjgDJ+WJaAqqlyacHszpigc5ewkw6MAhJf0f52ClKfPrNSg3VbIo3qNNdh0u0ZFin0nkbIX580hoMyjQmhLjp5N7PsQd+rUaX+iKm2DayZ6BCsFTasAaRN804/2PHFys2NBnFxjn2yRztbGwJeJH5W3aqEJ08AkfQ7t9DBbw3VI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730339021; c=relaxed/simple; bh=K8MBywRM9VYie83K/Ge+IX+DJ5KQde66JpktMNcoH1U=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=ewyr6jr96b8aS2Brl8JmvfSEutIglwrA/kYqOKr1hpGi0zweizLElqMlc/YMSWIzNRvyUXCHmNOTUVp+0EKB66zADCXrdpd1BJLxwKf0vdbbNKtVbgPyJXw4jJobBbapP+5pU8SGIhmiThtBLOAHercQ0iBokmDJs5NmovdfyrY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=YiKwCkra; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="YiKwCkra" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6e32e8436adso6420517b3.0 for ; Wed, 30 Oct 2024 18:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730339018; x=1730943818; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=R0Dg3ZC4eOFcXD0FKfDkQR9jWSBdCYfi1JBGipnV6Sk=; b=YiKwCkrazEkPHk8+2C4h6asLcccUCivPoTiT5guHdGMPfZNIWLgnVJEBAGxtbin1Vo qdAbKFE6bziR1umpvfJQOwkSZjd0ICnfTvkrcfRxeBnUv65gPqPMOOEeMS8zy5Oh7dBh nxK309cRnlc/9wdvJaadrlEkQRDpTKS4X7dCdLH0ZTjM0tZRzeog5r5+d7zlp15AiBZ4 R7zQdLGfJ+X84ap608R11WPYoV+maBoPsC7qNB4JoL8jABCx9hhKecgRlX6p/iDJlui5 RBhQ3I/QCErnHXTwVUqCnaUojtMJPETcIReuz+xarqo2c5GGNy640gz1+/5v3DtewJK9 fkyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730339018; x=1730943818; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R0Dg3ZC4eOFcXD0FKfDkQR9jWSBdCYfi1JBGipnV6Sk=; b=QJYLdzitC3hG613X1OEIRFeTqF9B3SMEFAP1Bq3JwzGKQZ5dGa20Tn+SrkXJ9SNjeF m9U0jibxWCn5hVRWMPjMeXg0Uf1qdafI4sf4TvdDoHLv88BZTqDi9n5mAHyp6q5Ktz0N npkczCxCfEmesMuG0Z5T6E1K1hpcDwEvohLiCzsDIvIxyjALzbo5WAZGojB2+R8qbnPj qt1nG1h4smLpd5LX+TvwYfhkRsUBp3ZJllw3n/ECm85ZjYh6m8f70iiHyhqJGrv/Aff9 XQ+4+71SYrLDn6Jk3o6abcZceb0nXDNiW+c0wBR+ibqe0lg/GyeIx4plLQPInhlX8A2r 8+oQ== X-Forwarded-Encrypted: i=1; AJvYcCV1glzE7ctMW4p6+eTdcyMqjWQn1kja5ucQObK+YByNP2e44Rl2JNm/M+V7yacIMBXfSff+2uO5wfCXgIqNEdIv@vger.kernel.org X-Gm-Message-State: AOJu0YzC9E2FNV7vfZ/BD4Mx2RB8BFjlPcO6tRzyPM2gHQVrnoNEgUC0 xJ7FNN7+kzUeGDobJ2aLbHoHt9gC/2F0koJsIlTDCCYbTbKNWgrVcOpLnrYxjeuo9drxfQmAdqE 053Xt/g== X-Google-Smtp-Source: AGHT+IF1rP5Msd1P6O0UYnEIUmpAMH6Jbste9JWLyi8Wl1w59KncQO0H7ERpr3LZu+N//L79UZ/6voNz4uwo X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:ad0f:67e7:f1a6:84c4]) (user=irogers job=sendgmr) by 2002:a25:4b85:0:b0:e29:68a9:8612 with SMTP id 3f1490d57ef6-e3087a54ccemr76572276.4.1730339017743; Wed, 30 Oct 2024 18:43:37 -0700 (PDT) Date: Wed, 30 Oct 2024 18:42:40 -0700 In-Reply-To: <20241031014252.753588-1-irogers@google.com> Message-Id: <20241031014252.753588-10-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241031014252.753588-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Subject: [PATCH v5 09/21] perf script: Move script_fetch_insn to trace-event-scripting.c From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , James Clark , Howard Chu , Athira Jajeev , Michael Petlan , Veronika Molnarova , Dapeng Mi , Thomas Richter , Ilya Leoshkevich , Colin Ian King , Weilin Wang , Andi Kleen , Josh Poimboeuf , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Add native_arch as a parameter to script_fetch_insn rather than relying on the builtin-script value that won't be initialized for the dlfilter and python Context use cases. Assume both of those cases are running natively. Signed-off-by: Ian Rogers --- tools/perf/builtin-script.c | 15 +-------------- .../perf/scripts/python/Perf-Trace-Util/Context.c | 2 +- tools/perf/util/dlfilter.c | 3 ++- tools/perf/util/python.c | 6 ------ tools/perf/util/trace-event-scripting.c | 14 ++++++++++++++ tools/perf/util/trace-event.h | 2 +- 6 files changed, 19 insertions(+), 23 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 11c0ee8c1afc..22d78a9d8f27 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -1586,19 +1586,6 @@ static int perf_sample__fprintf_callindent(struct perf_sample *sample, return len + dlen; } -__weak void arch_fetch_insn(struct perf_sample *sample __maybe_unused, - struct thread *thread __maybe_unused, - struct machine *machine __maybe_unused) -{ -} - -void script_fetch_insn(struct perf_sample *sample, struct thread *thread, - struct machine *machine) -{ - if (sample->insn_len == 0 && native_arch) - arch_fetch_insn(sample, thread, machine); -} - static int perf_sample__fprintf_insn(struct perf_sample *sample, struct evsel *evsel, struct perf_event_attr *attr, @@ -1608,7 +1595,7 @@ static int perf_sample__fprintf_insn(struct perf_sample *sample, { int printed = 0; - script_fetch_insn(sample, thread, machine); + script_fetch_insn(sample, thread, machine, native_arch); if (PRINT_FIELD(INSNLEN)) printed += fprintf(fp, " ilen: %d", sample->insn_len); diff --git a/tools/perf/scripts/python/Perf-Trace-Util/Context.c b/tools/perf/scripts/python/Perf-Trace-Util/Context.c index d742daaa5d5a..60dcfe56d4d9 100644 --- a/tools/perf/scripts/python/Perf-Trace-Util/Context.c +++ b/tools/perf/scripts/python/Perf-Trace-Util/Context.c @@ -93,7 +93,7 @@ static PyObject *perf_sample_insn(PyObject *obj, PyObject *args) if (c->sample->ip && !c->sample->insn_len && thread__maps(c->al->thread)) { struct machine *machine = maps__machine(thread__maps(c->al->thread)); - script_fetch_insn(c->sample, c->al->thread, machine); + script_fetch_insn(c->sample, c->al->thread, machine, /*native_arch=*/true); } if (!c->sample->insn_len) Py_RETURN_NONE; /* N.B. This is a return statement */ diff --git a/tools/perf/util/dlfilter.c b/tools/perf/util/dlfilter.c index 7d180bdaedbc..ddacef881af2 100644 --- a/tools/perf/util/dlfilter.c +++ b/tools/perf/util/dlfilter.c @@ -234,7 +234,8 @@ static const __u8 *dlfilter__insn(void *ctx, __u32 *len) struct machine *machine = maps__machine(thread__maps(al->thread)); if (machine) - script_fetch_insn(d->sample, al->thread, machine); + script_fetch_insn(d->sample, al->thread, machine, + /*native_arch=*/true); } } diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 3d938fe2de6a..22edadd64e5f 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -1317,12 +1317,6 @@ struct kwork_work *perf_kwork_add_work(struct perf_kwork *kwork __maybe_unused, return NULL; } -void script_fetch_insn(struct perf_sample *sample __maybe_unused, - struct thread *thread __maybe_unused, - struct machine *machine __maybe_unused) -{ -} - int perf_sample__sprintf_flags(u32 flags __maybe_unused, char *str __maybe_unused, size_t sz __maybe_unused) { diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trace-event-scripting.c index ad62d8e5a368..beac456260ae 100644 --- a/tools/perf/util/trace-event-scripting.c +++ b/tools/perf/util/trace-event-scripting.c @@ -13,6 +13,7 @@ #include #endif +#include "archinsn.h" #include "debug.h" #include "trace-event.h" #include "evsel.h" @@ -269,3 +270,16 @@ void setup_perl_scripting(void) } #endif #endif + +__weak void arch_fetch_insn(struct perf_sample *sample __maybe_unused, + struct thread *thread __maybe_unused, + struct machine *machine __maybe_unused) +{ +} + +void script_fetch_insn(struct perf_sample *sample, struct thread *thread, + struct machine *machine, bool native_arch) +{ + if (sample->insn_len == 0 && native_arch) + arch_fetch_insn(sample, thread, machine); +} diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index 81fceaf297ba..e0bb42e6509e 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h @@ -120,7 +120,7 @@ struct scripting_ops *script_spec__lookup(const char *spec); int script_spec__for_each(int (*cb)(struct scripting_ops *ops, const char *spec)); void script_fetch_insn(struct perf_sample *sample, struct thread *thread, - struct machine *machine); + struct machine *machine, bool native_arch); void setup_perl_scripting(void); void setup_python_scripting(void); -- 2.47.0.163.g1226f6d8fa-goog