From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (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 67C1C20CCDE for ; Tue, 29 Oct 2024 22:44:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730241901; cv=none; b=ePhJ43tdPwBwoZ7rxZKcix2pOXQyg13sDcFkWu0MQRipeGAiiTab8nRXj6TMfmHXZT5CmD8q0KN6t83s1jtLDwOINuxthYux8sjAanDHZDjrOewbq8tt8w0LnCFlT/XMSkfPBzI5o/fkRpaHo1h5b4evNTEUS+vHQO5JDjc8cDI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730241901; c=relaxed/simple; bh=aO36UEaQorN0wJLMM37nAL3q1wmtiUXsxaeDEmj3NUw=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=roTDapoBsx1nubUrJw4vAwdpznDv0Lr7QHoZnJzy1zrxTbtAZBMvWPJn6puXfOccx84qnO+ZXAEVipmoHupjd94jHSwustPYlXup6cjFn1y3YSvOIezl22g3YWruchVQaz5Hk4MvoBRYcaKlHV/eBRqeC6OmVaGPflWL3Pu/k+E= 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=O2a3Dhgh; arc=none smtp.client-ip=209.85.219.202 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="O2a3Dhgh" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e1159159528so557159276.1 for ; Tue, 29 Oct 2024 15:44:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730241897; x=1730846697; 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=FvsfdXmE5fY3ABkdgbstYkDwSen4YCtrrcTKLwjDguU=; b=O2a3DhghehHUDvLgsOoqrIorjzgMkSp4ffMRxTJ2nbmXLBDODzOQUKRC1Qg9QP+8f9 Fakiu/rvL5Ko3OEt8mGon1plQp0yrvcdMdYz0AkY/xlXIrDnCJwyt+s5lkynNj0r3iFu 5t1IjguoiPN1EbREuM2gamIBFuT5PChKmmexuOId+kgt/0JkhyZRdun9IrjwC4Xn5J2K 6RboSO9yakumnl14Fylbp3fkjhJ7FjBmCkSlK6p73Tcubb2G5rOv3Ih2NkN0wZz/78tL Dcz10glCT5jOcPAfLjnGgLYFQxJ1eXOkn1JuAOKkk+wJGQbFrrzt9LqUSbkgIhf2Xr9Y NSCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730241897; x=1730846697; 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=FvsfdXmE5fY3ABkdgbstYkDwSen4YCtrrcTKLwjDguU=; b=OilO8eRnNM9J6Wz5FAWDr0hbuyYCqhcfEwLR4vqu2/Q8kHtW+8759v/eEDol7qBkXs R2qviKX13Vii3JWOqx0vYxwvbwaAn3U0NqJ6ftWdXX6FNEo23r6jmqWk7LL7bw1SgpVp HRsTyg4Q8R9lJOpVS4MFOSaHxUJQRfdROv8UQYXjrJlhSQ9yYaavw2P8xldIn9kSYf6T Tn5mTwa+nnh7FdOlMvrymlMC2rI63OaU8HuvSonfSUfSaJPhhi6RdDcyjFHHWPIufPXT VobsycND6oDg/zyV50N2jLvSVgspOHKEB7rAk2UdhiJUbKSrnLFOkk1GsQSMO1KcWBh7 LXQA== X-Forwarded-Encrypted: i=1; AJvYcCXe2LWhgB3wKRytITNmrg5YmyZ3CLDXceCWSZHmfFqSSZ4bqkX2h9OTnpXG4QtsFf0fked3R2ansJwCKSKCDNZf@vger.kernel.org X-Gm-Message-State: AOJu0YwHcirDba6PtHhbMHdqpRAbbDedbAyz0u8FHJ5kvQsMHdfYnC3p oKoEPqwJBulOjh4h3QK4GLS341A41uoCOmCejmF+4S/iXsfm1oFCTlYwGj5UdsW/GgRLalLtwc8 7FZXX2g== X-Google-Smtp-Source: AGHT+IGstHnLW42vEOqpPUHHb62KZ5zvU+TpLx+NqShj3UN3ugCJjQb7yQN51h7FfvP1Wb6/qwNtUOAB8GF8 X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:8991:d3fd:38a7:c282]) (user=irogers job=sendgmr) by 2002:a25:8241:0:b0:e2b:db24:905e with SMTP id 3f1490d57ef6-e30c1a27054mr33196276.5.1730241897313; Tue, 29 Oct 2024 15:44:57 -0700 (PDT) Date: Tue, 29 Oct 2024 15:44:21 -0700 In-Reply-To: <20241029224431.167623-1-irogers@google.com> Message-Id: <20241029224431.167623-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: <20241029224431.167623-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.163.g1226f6d8fa-goog Subject: [PATCH v4 09/19] 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 , 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. Switch the weak arch_fetch_insn to being guarded by ifdefs as weak functions are outside of the C specification. Signed-off-by: Ian Rogers --- tools/perf/builtin-script.c | 15 +-------------- .../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 | 16 ++++++++++++++++ tools/perf/util/trace-event.h | 2 +- 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 93caaad62be5..3311104afd0a 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..543e78b17e5f 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,18 @@ void setup_perl_scripting(void) } #endif #endif + +#if !defined(__i386__) && !defined(__x86_64__) +void arch_fetch_insn(struct perf_sample *sample __maybe_unused, + struct thread *thread __maybe_unused, + struct machine *machine __maybe_unused) +{ +} +#endif + +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