From: Ian Rogers <irogers@google.com>
To: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Namhyung Kim <namhyung@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Ian Rogers <irogers@google.com>,
Adrian Hunter <adrian.hunter@intel.com>,
Kan Liang <kan.liang@linux.intel.com>,
Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
Dominique Martinet <asmadeus@codewreck.org>,
Yang Jihong <yangjihong@bytedance.com>,
Colin Ian King <colin.i.king@gmail.com>,
Chaitanya S Prakash <chaitanyas.prakash@arm.com>,
"Masami Hiramatsu (Google)" <mhiramat@kernel.org>,
James Clark <james.clark@linaro.org>,
John Garry <john.g.garry@oracle.com>,
Junhao He <hejunhao3@huawei.com>,
David Ahern <dsa@cumulusnetworks.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 5/6] perf parse-events: Vary default_breakpoint_len on i386 and arm64
Date: Sat, 31 Aug 2024 00:04:14 -0700 [thread overview]
Message-ID: <20240831070415.506194-6-irogers@google.com> (raw)
In-Reply-To: <20240831070415.506194-1-irogers@google.com>
On arm64 the breakpoint length should be 4-bytes but 8-bytes is
tolerated as perf passes that as sizeof(long). Just pass the correct
value.
On i386 the sizeof(long) check in the kernel needs to match the
kernel's long size. Check using an environment (uname checks) whether
4 or 8 bytes needs to be passed. Cache the value in a static.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/parse-events.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index dfb951bb184b..c7fe8b4167d7 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -8,6 +8,7 @@
#include <sys/ioctl.h>
#include <sys/param.h>
#include "term.h"
+#include "env.h"
#include "evlist.h"
#include "evsel.h"
#include <subcmd/parse-options.h>
@@ -672,7 +673,22 @@ static int add_tracepoint_multi_sys(struct parse_events_state *parse_state,
int default_breakpoint_len(void)
{
+#if defined(__i386__)
+ static int len;
+
+ if (len == 0) {
+ struct perf_env env = {};
+
+ perf_env__init(&env);
+ len = perf_env__kernel_is_64_bit(&env) ? sizeof(u64) : sizeof(long);
+ perf_env__exit(&env);
+ }
+ return len;
+#elif defined(__aarch64__)
+ return 4;
+#else
return sizeof(long);
+#endif
}
static int
--
2.46.0.469.g59c65b2a67-goog
next prev parent reply other threads:[~2024-08-31 7:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-31 7:04 [PATCH v1 0/6] Various 32-bit and test fixes Ian Rogers
2024-08-31 7:04 ` [PATCH v1 1/6] perf pmus: Fix name comparisons on 32-bit systems Ian Rogers
2024-08-31 7:04 ` [PATCH v1 2/6] perf time-utils: Fix 32-bit nsec parsing Ian Rogers
2024-08-31 7:04 ` [PATCH v1 3/6] perf test: Skip uprobe test if probe command isn't present Ian Rogers
2024-08-31 7:04 ` [PATCH v1 4/6] perf parse-events: Add default_breakpoint_len helper Ian Rogers
2024-09-01 12:47 ` kernel test robot
2024-08-31 7:04 ` Ian Rogers [this message]
2024-09-03 14:24 ` [PATCH v1 5/6] perf parse-events: Vary default_breakpoint_len on i386 and arm64 Arnaldo Carvalho de Melo
2024-09-04 5:03 ` Ian Rogers
2024-08-31 7:04 ` [PATCH v1 6/6] perf test: Make watchpoint data 32-bits on i386 Ian Rogers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240831070415.506194-6-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=asmadeus@codewreck.org \
--cc=atrajeev@linux.vnet.ibm.com \
--cc=chaitanyas.prakash@arm.com \
--cc=colin.i.king@gmail.com \
--cc=dsa@cumulusnetworks.com \
--cc=hejunhao3@huawei.com \
--cc=james.clark@linaro.org \
--cc=john.g.garry@oracle.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=yangjihong@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).