From: Ian Rogers <irogers@google.com>
To: Leo Yan <leo.yan@linaro.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com>
Subject: [PATCH v1 6/7] perf trace: 5sec fix libbpf 1.0+ compatibility
Date: Wed, 2 Nov 2022 21:54:36 -0700 [thread overview]
Message-ID: <20221103045437.163510-7-irogers@google.com> (raw)
In-Reply-To: <20221103045437.163510-1-irogers@google.com>
Avoid use of tools/perf/include/bpf/bpf.h and use the more regular BPF
headers.
Note, on testing the probe was unable to attach and the program failed.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/examples/bpf/5sec.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tools/perf/examples/bpf/5sec.c b/tools/perf/examples/bpf/5sec.c
index e6b6181c6dc6..f22312c64713 100644
--- a/tools/perf/examples/bpf/5sec.c
+++ b/tools/perf/examples/bpf/5sec.c
@@ -39,13 +39,15 @@
Copyright (C) 2018 Red Hat, Inc., Arnaldo Carvalho de Melo <acme@redhat.com>
*/
-#include <bpf.h>
+#include <linux/bpf.h>
+#include <bpf/bpf_helpers.h>
#define NSEC_PER_SEC 1000000000L
-int probe(hrtimer_nanosleep, rqtp)(void *ctx, int err, long long sec)
+SEC("hrtimer_nanosleep=hrtimer_nanosleep rqtp")
+int hrtimer_nanosleep(void *ctx, int err, long long sec)
{
return sec / NSEC_PER_SEC == 5ULL;
}
+char _license[] SEC("license") = "GPL";
-license(GPL);
--
2.38.1.273.g43a17bfeac-goog
next prev parent reply other threads:[~2022-11-03 4:55 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-03 4:54 [PATCH v1 0/7] Fix perf trace libbpf 1.0+ compatibility Ian Rogers
2022-11-03 4:54 ` [PATCH v1 1/7] perf trace: Raw augmented syscalls fix " Ian Rogers
2022-11-03 4:54 ` [PATCH v1 2/7] perf trace: Etcsnoop " Ian Rogers
2022-11-03 4:54 ` [PATCH v1 3/7] perf trace: Augmented syscalls " Ian Rogers
2022-11-03 4:54 ` [PATCH v1 4/7] perf trace: hello " Ian Rogers
2022-11-03 4:54 ` [PATCH v1 5/7] perf trace: empty " Ian Rogers
2022-11-03 4:54 ` Ian Rogers [this message]
2022-11-03 15:36 ` [PATCH v1 6/7] perf trace: 5sec " Arnaldo Carvalho de Melo
2022-11-03 15:39 ` Arnaldo Carvalho de Melo
2022-11-03 15:52 ` Arnaldo Carvalho de Melo
2022-11-03 16:04 ` Ian Rogers
2022-11-03 19:54 ` Arnaldo Carvalho de Melo
2022-11-03 21:35 ` Arnaldo Carvalho de Melo
2022-11-03 22:01 ` Ian Rogers
2022-11-04 0:21 ` Arnaldo Carvalho de Melo
2022-11-04 1:04 ` Arnaldo Carvalho de Melo
2022-11-03 4:54 ` [PATCH v1 7/7] perf bpf: Remove now unused BPF headers Ian Rogers
2022-11-11 12:09 ` [PATCH v1 0/7] Fix perf trace libbpf 1.0+ compatibility Leo Yan
2022-11-15 19:12 ` 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=20221103045437.163510-7-irogers@google.com \
--to=irogers@google.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/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).