mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Alexander Lobakin <alobakin@pm.me>
To: Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>,
	Andrii Nakryiko <andrii@kernel.org>
Cc: "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>,
	"Martin KaFai Lau" <kafai@fb.com>,
	"Song Liu" <songliubraving@fb.com>, "Yonghong Song" <yhs@fb.com>,
	"John Fastabend" <john.fastabend@gmail.com>,
	"KP Singh" <kpsingh@kernel.org>,
	"David S. Miller" <davem@davemloft.net>,
	"Jakub Kicinski" <kuba@kernel.org>,
	"Jesper Dangaard Brouer" <hawk@kernel.org>,
	"Björn Töpel" <bjorn@kernel.org>,
	"Magnus Karlsson" <magnus.karlsson@intel.com>,
	"Jonathan Lemon" <jonathan.lemon@gmail.com>,
	"Nathan Chancellor" <nathan@kernel.org>,
	"Nick Desaulniers" <ndesaulniers@google.com>,
	"Alexander Lobakin" <alobakin@pm.me>,
	"Dmitrii Dolgov" <9erthalion6@gmail.com>,
	"Quentin Monnet" <quentin@isovalent.com>,
	"Tiezhu Yang" <yangtiezhu@loongson.cn>,
	"Kumar Kartikeya Dwivedi" <memxor@gmail.com>,
	"Chenbo Feng" <fengc@google.com>,
	"Willem de Bruijn" <willemb@google.com>,
	"Daniel Wagner" <daniel.wagner@bmw-carit.de>,
	"Thomas Graf" <tgraf@suug.ch>,
	"Ong Boon Leong" <boon.leong.ong@intel.com>,
	linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org,
	netdev@vger.kernel.org, bpf@vger.kernel.org,
	llvm@lists.linux.dev
Subject: [PATCH bpf-next 01/11] bpf, perf: fix bpftool compilation with !CONFIG_PERF_EVENTS
Date: Thu, 14 Apr 2022 22:44:48 +0000	[thread overview]
Message-ID: <20220414223704.341028-2-alobakin@pm.me> (raw)
In-Reply-To: <20220414223704.341028-1-alobakin@pm.me>

When CONFIG_PERF_EVENTS is not set, struct perf_event remains empty.
However, the structure is being used by bpftool indirectly via BTF.
This leads to:

skeleton/pid_iter.bpf.c:49:30: error: no member named 'bpf_cookie' in 'struct perf_event'
        return BPF_CORE_READ(event, bpf_cookie);
               ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~

...

skeleton/pid_iter.bpf.c:49:9: error: returning 'void' from a function with incompatible result type '__u64' (aka 'unsigned long long')
        return BPF_CORE_READ(event, bpf_cookie);
               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Tools and samples can't use any CONFIG_ definitions, so the fields
used there should always be present.
Move CONFIG_BPF_SYSCALL block out of the CONFIG_PERF_EVENTS block
to make it available unconditionally.

Fixes: cbdaf71f7e65 ("bpftool: Add bpf_cookie to link output")
Signed-off-by: Alexander Lobakin <alobakin@pm.me>
---
 include/linux/perf_event.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index af97dd427501..b1d5715b8b34 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -762,12 +762,14 @@ struct perf_event {
 	u64				(*clock)(void);
 	perf_overflow_handler_t		overflow_handler;
 	void				*overflow_handler_context;
+#endif /* CONFIG_PERF_EVENTS */
 #ifdef CONFIG_BPF_SYSCALL
 	perf_overflow_handler_t		orig_overflow_handler;
 	struct bpf_prog			*prog;
 	u64				bpf_cookie;
 #endif

+#ifdef CONFIG_PERF_EVENTS
 #ifdef CONFIG_EVENT_TRACING
 	struct trace_event_call		*tp_event;
 	struct event_filter		*filter;
--
2.35.2



  reply	other threads:[~2022-04-14 22:45 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-14 22:44 [PATCH bpf-next 00/11] bpf: random unpopular userspace fixes (32 bit et al.) Alexander Lobakin
2022-04-14 22:44 ` Alexander Lobakin [this message]
2022-04-15 23:07   ` [PATCH bpf-next 01/11] bpf, perf: fix bpftool compilation with !CONFIG_PERF_EVENTS Song Liu
2022-04-15 23:20     ` Song Liu
2022-04-19  9:03   ` Peter Zijlstra
2022-04-20  5:30     ` Andrii Nakryiko
2022-04-14 22:45 ` [PATCH bpf-next 02/11] bpf: always emit struct bpf_perf_link BTF Alexander Lobakin
2022-04-15 23:24   ` Song Liu
2022-04-16 17:50     ` Alexander Lobakin
2022-04-14 22:45 ` [PATCH bpf-next 03/11] tools, bpf: fix bpftool build with !CONFIG_BPF_EVENTS Alexander Lobakin
2022-04-15 23:34   ` Song Liu
2022-04-20 17:12   ` Andrii Nakryiko
2022-04-14 22:45 ` [PATCH bpf-next 04/11] samples: bpf: add 'asm/mach-generic' include path for every MIPS Alexander Lobakin
2022-04-15 23:35   ` Song Liu
2022-04-14 22:45 ` [PATCH bpf-next 05/11] samples: bpf: use host bpftool to generate vmlinux.h, not target Alexander Lobakin
2022-04-15 13:38   ` Kumar Kartikeya Dwivedi
2022-04-15 23:44     ` Song Liu
2022-04-14 22:46 ` [PATCH bpf-next 06/11] tools, bpf: fix fcntl.h include in bpftool Alexander Lobakin
2022-04-15 23:46   ` Song Liu
2022-04-14 22:46 ` [PATCH bpf-next 07/11] samples: bpf: fix uin64_t format literals Alexander Lobakin
2022-04-15 23:52   ` Song Liu
2022-04-16 17:55     ` Alexander Lobakin
2022-04-19  8:07       ` David Laight
2022-04-20 17:14   ` Andrii Nakryiko
2022-04-14 22:46 ` [PATCH bpf-next 08/11] samples: bpf: fix shifting unsigned long by 32 positions Alexander Lobakin
2022-04-15 23:54   ` Song Liu
2022-04-20 17:18   ` Andrii Nakryiko
2022-04-27 15:54     ` Yonghong Song
2022-04-27 18:53       ` Andrii Nakryiko
2022-04-14 22:46 ` [PATCH bpf-next 09/11] samples: bpf: fix include order for non-Glibc environments Alexander Lobakin
2022-04-15 23:55   ` Song Liu
2022-04-14 22:47 ` [PATCH bpf-next 10/11] samples: bpf: fix -Wsequence-point Alexander Lobakin
2022-04-15 23:56   ` Song Liu
2022-04-14 22:47 ` [PATCH bpf-next 11/11] samples: bpf: xdpsock: fix -Wmaybe-uninitialized Alexander Lobakin
2022-04-15 12:15   ` Maciej Fijalkowski
2022-04-15 23:57   ` Song Liu
2022-04-20 17:20 ` [PATCH bpf-next 00/11] bpf: random unpopular userspace fixes (32 bit et al.) Andrii Nakryiko

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=20220414223704.341028-2-alobakin@pm.me \
    --to=alobakin@pm.me \
    --cc=9erthalion6@gmail.com \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bjorn@kernel.org \
    --cc=boon.leong.ong@intel.com \
    --cc=bpf@vger.kernel.org \
    --cc=daniel.wagner@bmw-carit.de \
    --cc=daniel@iogearbox.net \
    --cc=davem@davemloft.net \
    --cc=fengc@google.com \
    --cc=hawk@kernel.org \
    --cc=john.fastabend@gmail.com \
    --cc=jolsa@kernel.org \
    --cc=jonathan.lemon@gmail.com \
    --cc=kafai@fb.com \
    --cc=kpsingh@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-perf-users@vger.kernel.org \
    --cc=llvm@lists.linux.dev \
    --cc=magnus.karlsson@intel.com \
    --cc=mark.rutland@arm.com \
    --cc=memxor@gmail.com \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=nathan@kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=peterz@infradead.org \
    --cc=quentin@isovalent.com \
    --cc=songliubraving@fb.com \
    --cc=tgraf@suug.ch \
    --cc=willemb@google.com \
    --cc=yangtiezhu@loongson.cn \
    --cc=yhs@fb.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

all inboxes | Powered by JetHome®