From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ian Rogers <irogers@google.com>
Cc: Mike Leach <mike.leach@linaro.org>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
bpf@vger.kernel.org, peterz@infradead.org, mingo@redhat.com,
mark.rutland@arm.com, alexander.shishkin@linux.intel.com,
jolsa@kernel.org, namhyung@kernel.org
Subject: Re: [PATCH v2 1/2] perf build: Properly guard libbpf includes
Date: Fri, 6 Jan 2023 11:55:29 -0300 [thread overview]
Message-ID: <Y7g2YXNaP0VM+F1o@kernel.org> (raw)
In-Reply-To: <20230106142537.607399-1-irogers@google.com>
Em Fri, Jan 06, 2023 at 06:25:36AM -0800, Ian Rogers escreveu:
> Including libbpf header files should be guarded by
> HAVE_LIBBPF_SUPPORT. In bpf_counter.h, move the skeleton utilities
> under HAVE_BPF_SKEL.
>
> Fixes: d6a735ef3277 ("perf bpf_counter: Move common functions to bpf_counter.h")
> Reported-by: Mike Leach <mike.leach@linaro.org>
> Signed-off-by: Ian Rogers <irogers@google.com>
Can this be done in a way that reduces patch size?
- Arnaldo
> ---
> tools/perf/builtin-trace.c | 2 +
> tools/perf/util/bpf_counter.h | 85 ++++++++++++++++++-----------------
> 2 files changed, 46 insertions(+), 41 deletions(-)
>
> diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
> index 86e06f136f40..d21fe0f32a6d 100644
> --- a/tools/perf/builtin-trace.c
> +++ b/tools/perf/builtin-trace.c
> @@ -16,7 +16,9 @@
>
> #include "util/record.h"
> #include <api/fs/tracing_path.h>
> +#ifdef HAVE_LIBBPF_SUPPORT
> #include <bpf/bpf.h>
> +#endif
> #include "util/bpf_map.h"
> #include "util/rlimit.h"
> #include "builtin.h"
> diff --git a/tools/perf/util/bpf_counter.h b/tools/perf/util/bpf_counter.h
> index 4dbf26408b69..9113c8bf5cb0 100644
> --- a/tools/perf/util/bpf_counter.h
> +++ b/tools/perf/util/bpf_counter.h
> @@ -4,9 +4,12 @@
>
> #include <linux/list.h>
> #include <sys/resource.h>
> +
> +#ifdef HAVE_LIBBPF_SUPPORT
> #include <bpf/bpf.h>
> #include <bpf/btf.h>
> #include <bpf/libbpf.h>
> +#endif
>
> struct evsel;
> struct target;
> @@ -42,6 +45,47 @@ int bpf_counter__read(struct evsel *evsel);
> void bpf_counter__destroy(struct evsel *evsel);
> int bpf_counter__install_pe(struct evsel *evsel, int cpu_map_idx, int fd);
>
> +static inline __u32 bpf_link_get_id(int fd)
> +{
> + struct bpf_link_info link_info = { .id = 0, };
> + __u32 link_info_len = sizeof(link_info);
> +
> + bpf_obj_get_info_by_fd(fd, &link_info, &link_info_len);
> + return link_info.id;
> +}
> +
> +static inline __u32 bpf_link_get_prog_id(int fd)
> +{
> + struct bpf_link_info link_info = { .id = 0, };
> + __u32 link_info_len = sizeof(link_info);
> +
> + bpf_obj_get_info_by_fd(fd, &link_info, &link_info_len);
> + return link_info.prog_id;
> +}
> +
> +static inline __u32 bpf_map_get_id(int fd)
> +{
> + struct bpf_map_info map_info = { .id = 0, };
> + __u32 map_info_len = sizeof(map_info);
> +
> + bpf_obj_get_info_by_fd(fd, &map_info, &map_info_len);
> + return map_info.id;
> +}
> +
> +/* trigger the leader program on a cpu */
> +static inline int bperf_trigger_reading(int prog_fd, int cpu)
> +{
> + DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,
> + .ctx_in = NULL,
> + .ctx_size_in = 0,
> + .flags = BPF_F_TEST_RUN_ON_CPU,
> + .cpu = cpu,
> + .retval = 0,
> + );
> +
> + return bpf_prog_test_run_opts(prog_fd, &opts);
> +}
> +
> #else /* HAVE_BPF_SKEL */
>
> #include <linux/err.h>
> @@ -87,45 +131,4 @@ static inline void set_max_rlimit(void)
> setrlimit(RLIMIT_MEMLOCK, &rinf);
> }
>
> -static inline __u32 bpf_link_get_id(int fd)
> -{
> - struct bpf_link_info link_info = { .id = 0, };
> - __u32 link_info_len = sizeof(link_info);
> -
> - bpf_obj_get_info_by_fd(fd, &link_info, &link_info_len);
> - return link_info.id;
> -}
> -
> -static inline __u32 bpf_link_get_prog_id(int fd)
> -{
> - struct bpf_link_info link_info = { .id = 0, };
> - __u32 link_info_len = sizeof(link_info);
> -
> - bpf_obj_get_info_by_fd(fd, &link_info, &link_info_len);
> - return link_info.prog_id;
> -}
> -
> -static inline __u32 bpf_map_get_id(int fd)
> -{
> - struct bpf_map_info map_info = { .id = 0, };
> - __u32 map_info_len = sizeof(map_info);
> -
> - bpf_obj_get_info_by_fd(fd, &map_info, &map_info_len);
> - return map_info.id;
> -}
> -
> -/* trigger the leader program on a cpu */
> -static inline int bperf_trigger_reading(int prog_fd, int cpu)
> -{
> - DECLARE_LIBBPF_OPTS(bpf_test_run_opts, opts,
> - .ctx_in = NULL,
> - .ctx_size_in = 0,
> - .flags = BPF_F_TEST_RUN_ON_CPU,
> - .cpu = cpu,
> - .retval = 0,
> - );
> -
> - return bpf_prog_test_run_opts(prog_fd, &opts);
> -}
> -
> #endif /* __PERF_BPF_COUNTER_H */
> --
> 2.39.0.314.g84b9a713c41-goog
--
- Arnaldo
next prev parent reply other threads:[~2023-01-06 14:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-06 14:25 [PATCH v2 1/2] perf build: Properly guard libbpf includes Ian Rogers
2023-01-06 14:25 ` [PATCH v2 2/2] perf build: Fix build error when NO_LIBBPF=1 Ian Rogers
2023-01-06 15:12 ` Mike Leach
2023-01-06 14:55 ` Arnaldo Carvalho de Melo [this message]
2023-01-06 15:12 ` [PATCH v2 1/2] perf build: Properly guard libbpf includes Mike Leach
2023-01-06 15:14 ` 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=Y7g2YXNaP0VM+F1o@kernel.org \
--to=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=bpf@vger.kernel.org \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mike.leach@linaro.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.