From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8278AC7EE23 for ; Thu, 4 May 2023 08:26:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229874AbjEDI0v (ORCPT ); Thu, 4 May 2023 04:26:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230071AbjEDIZf (ORCPT ); Thu, 4 May 2023 04:25:35 -0400 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEE826188; Thu, 4 May 2023 01:19:01 -0700 (PDT) Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out1.suse.de (Postfix) with ESMTP id 6C3EE21A0A; Thu, 4 May 2023 08:19:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1683188340; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SE8kDKCZ+c7mbSXXTz1hB+Dc3q2ET+MJaBGMBHVPxuE=; b=qqz81J5rXY29diS8dUxT+DwNdzGK03QVBciwBhGWhqRQYup+b8Fx/Vd6kZw/QWsvcpzjXC fJOsyi2Qe6oCHu9GO8DwDv0sv5N6b2t/vZtpLQhAs4v5rZLc0qPE3AjvtOHgwdzWGaGBI3 gXOBWYAtmSv8bMK5QqT4LWdMBIdi/48= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1683188340; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SE8kDKCZ+c7mbSXXTz1hB+Dc3q2ET+MJaBGMBHVPxuE=; b=gUTCV9PWALmLrNF0TgfPTygIvQjiP/f738/GOu8YAausAc8/ewqmtapHC5ben6FjHaamr7 HUUa/uQHMaUZDmAQ== Received: from kitsune.suse.cz (kitsune.suse.cz [10.100.12.127]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id D2F132C141; Thu, 4 May 2023 08:18:59 +0000 (UTC) Date: Thu, 4 May 2023 10:18:58 +0200 From: Michal =?iso-8859-1?Q?Such=E1nek?= To: Quentin Monnet Cc: Andrii Nakryiko , Alexander Lobakin , Alexander Lobakin , Alexei Starovoitov , Shung-Hsi Yu , Daniel Borkmann , Andrii Nakryiko , Maciej Fijalkowski , Song Liu , Kumar Kartikeya Dwivedi , bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 bpf 02/11] bpftool: define a local bpf_perf_link to fix accessing its fields Message-ID: <20230504081858.GV15906@kitsune.suse.cz> References: <20220421003152.339542-1-alobakin@pm.me> <20220421003152.339542-3-alobakin@pm.me> <20230414095457.GG63923@kunlun.suse.cz> <9952dc32-f464-c85a-d812-946d6b0ac734@intel.com> <20230414162821.GK63923@kunlun.suse.cz> <20230421073904.GJ15906@kitsune.suse.cz> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Hello, On Thu, May 04, 2023 at 12:43:52AM +0100, Quentin Monnet wrote: > On Fri, 21 Apr 2023 at 08:39, Michal Suchánek wrote: > > > > On Thu, Apr 20, 2023 at 04:07:38PM -0700, Andrii Nakryiko wrote: > > > On Fri, Apr 14, 2023 at 9:28 AM Michal Suchánek wrote: > > > > > > > > On Fri, Apr 14, 2023 at 05:18:27PM +0200, Alexander Lobakin wrote: > > > > > From: Michal Suchánek > > > > > Date: Fri, 14 Apr 2023 11:54:57 +0200 > > > > > > > > > > > Hello, > > > > > > > > > > Hey-hey, > > > > > > > > > > > > > > > > > On Thu, Apr 21, 2022 at 12:38:58AM +0000, Alexander Lobakin wrote: > > > > > >> When building bpftool with !CONFIG_PERF_EVENTS: > > > > > >> > > > > > >> skeleton/pid_iter.bpf.c:47:14: error: incomplete definition of type 'struct bpf_perf_link' > > > > > >> perf_link = container_of(link, struct bpf_perf_link, link); > > > > > >> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > > >> tools/bpf/bpftool/bootstrap/libbpf/include/bpf/bpf_helpers.h:74:22: note: expanded from macro 'container_of' > > > > > >> ((type *)(__mptr - offsetof(type, member))); \ > > > > > >> ^~~~~~~~~~~~~~~~~~~~~~ > > > > > >> tools/bpf/bpftool/bootstrap/libbpf/include/bpf/bpf_helpers.h:68:60: note: expanded from macro 'offsetof' > > > > > >> #define offsetof(TYPE, MEMBER) ((unsigned long)&((TYPE *)0)->MEMBER) > > > > > >> ~~~~~~~~~~~^ > > > > > >> skeleton/pid_iter.bpf.c:44:9: note: forward declaration of 'struct bpf_perf_link' > > > > > >> struct bpf_perf_link *perf_link; > > > > > >> ^ > > > > > >> > > > > > >> &bpf_perf_link is being defined and used only under the ifdef. > > > > > >> Define struct bpf_perf_link___local with the `preserve_access_index` > > > > > >> attribute inside the pid_iter BPF prog to allow compiling on any > > > > > >> configs. CO-RE will substitute it with the real struct bpf_perf_link > > > > > >> accesses later on. > > > > > >> container_of() is not CO-REd, but it is a noop for > > > > > >> bpf_perf_link <-> bpf_link and the local copy is a full mirror of > > > > > >> the original structure. > > > > > >> > > > > > >> Fixes: cbdaf71f7e65 ("bpftool: Add bpf_cookie to link output") > > > > > > > > > > > > This does not solve the problem completely. Kernels that don't have > > > > > > CONFIG_PERF_EVENTS in the first place are also missing the enum value > > > > > > BPF_LINK_TYPE_PERF_EVENT which is used as the condition for handling the > > > > > > cookie. > > > > > > > > > > Sorry, I haven't been working with my home/private stuff for more than a > > > > > year already. I may get back to it some day when I'm tired of Lua (curse > > > > > words, sorry :D), but for now the series is "a bit" abandoned. > > > > > > > > This part still appllies and works for me with the caveat that > > > > BPF_LINK_TYPE_PERF_EVENT also needs to be defined. > > > > > > > > > I think there was alternative solution proposed there, which promised to > > > > > be more flexible. But IIRC it also doesn't touch the enum (was it added > > > > > recently? Because it was building just fine a year ago on config without > > > > > perf events). > > > > > > > > It was added in 5.15. Not sure there is a kernel.org LTS kernel usable > > > > for CO-RE that does not have it, technically 5.4 would work if it was > > > > built monolithic, it does not have module BTF, only kernel IIRC. > > > > > > > > Nonetheless, the approach to handling features completely missing in the > > > > running kernel should be figured out one way or another. I would be > > > > surprised if this was the last feature to be added that bpftool needs to > > > > know about. > > > > > > Are we talking about bpftool built from kernel sources or from Github? > > > Kernel source version should have access to latest UAPI headers and so > > > BPF_LINK_TYPE_PERF_EVENT should be available. Github version, if it > > > doesn't do that already, can use UAPI headers distributed (and used > > > for building) with libbpf through submodule. > > > > It does have a copy of the uapi headers but apparently does not use > > them. Using them directly might cause conflict with vmlinux.h, though. > > Indeed, using the UAPI header here conflicts with vmlinux.h. > > Looking again at some code I started last year but never finalised, I > used the following approach, redefining BPF_LINK_TYPE_PERF_EVENT with > CO-RE: > > enum bpf_link_type___local { > BPF_LINK_TYPE_PERF_EVENT___local = 7, > }; That's the same as I did except I used simple define instead of this fake enum. The enum only has value when it is complete and the compiler can check that a switch uses only known values, and can confuse things when values are missing. Thanks Michal