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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CE860C4828D for ; Mon, 5 Feb 2024 18:45:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=VfUmZDgP6vhAH/JiB5tr/LmAKgXHeSEbCqe6p2AnEjA=; b=O0gAMAXyzfDQvH N3/AC4coBbF7e7kNxcKr+apX6eSGi+8sH7KDUDhQFWk7UfWLNH79q6U4nbacbZriCq/GOFw3FTHwQ nI09KepeMfZIMkMSkNvcOVI/rhubo5tmmmbEJF7uhNvxhy3QgqCipDWZH3ULKkAVIlPzfh89o85yL 9UXvY3W0ypUvYdFWrGsO0GrWsnhnVp5P2EwVsYC9IEHpxwOID0WGQA7BFZUBGNWjvFLYtgytynq/8 W/sxd6bdy9vQYXRBw781NEoO35jHh4C2GRoO7MFy1eMbf0t5awo6ykgD9rd0USPHLO1D1l6xW2xf1 8Ran8yJvVVNkMNmiXhkg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rX3xq-00000004QVY-44c2; Mon, 05 Feb 2024 18:45:06 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rX3xo-00000004QSw-3894 for linux-arm-kernel@lists.infradead.org; Mon, 05 Feb 2024 18:45:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1707158701; h=from:from:reply-to:subject:subject: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=LNq6oubwXmqe6ItjQ33y0Ud8zzbj1+GnKVYTNf0QWt4=; b=Jutn19xLIlwD+LK2fJjSbMU9mz2w4SgTP0mlDkOs9K5BTHe+4JvJponMzd1Y6tJyFJnQNf W872SGBtFxZiK/B2SfnZyuT9kQbkXyIdMWFmFxURECETHNP90XwmATFpd7fFSlAZZ1TeaI Vjj6TrSAnikiO3Pg1b489xPZH5p86OA= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-187-UoLtGHVuNk2oLiivf0QBdQ-1; Mon, 05 Feb 2024 13:43:05 -0500 X-MC-Unique: UoLtGHVuNk2oLiivf0QBdQ-1 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a26f2da3c7bso275923566b.0 for ; Mon, 05 Feb 2024 10:43:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707158584; x=1707763384; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=LNq6oubwXmqe6ItjQ33y0Ud8zzbj1+GnKVYTNf0QWt4=; b=LIfUi+ZKHxnVptNroK3T/ygakEmzGjyub8uF5WlSrbW0jnfJJDmfTigzfPVwKsPP7C HN2wnRoN0vozn0vZMpin/KquxNbY9cYUpKn7swN3SMRCuJi9xYCj1VRiqPFU31SD78EA tyGPWgcrYTG+e6zNnUR+keGgqhcBAHiNaH2JonuyxHn8ptyJ51CzlSm7XtY7ylY4ICDx UtyoK83Ll5mcR+I1kCD+eTuFdeheY0Q/CJeh7jIeh8RV/DDTnabzhcu5kECY05DPEoXS x30ounfqj6huEifA3JaxvST6+VdD2Ltts654lIumKBt/F1E90kK/4HB9qHKKe1S+hnvp cosw== X-Gm-Message-State: AOJu0Yw4/qVyXndI3lrYmnKbB+kEP3gQY/kua+0MppQMTBIlSshbT1eq /XTF5eExag7XCC4/iOdzdQtjwokLAZOlh1MXlDAnfKiJsFz25iAaynyxGDiMHDsPCeMufqH56hy fEv9WxJbRnpNl8jt1vPd/f7qGDjhzuBvpdZ6/jPeNkpOdoY4bkvAcSJbQWD/NKhpl+r3BF/U= X-Received: by 2002:a17:906:c291:b0:a32:b376:489d with SMTP id r17-20020a170906c29100b00a32b376489dmr228560ejz.21.1707158584050; Mon, 05 Feb 2024 10:43:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBJJqi+E8gTHS8rAQpA+gl5qKoCPXD/0rXi7vARpqh0DWv7P2ivFSjS3co7lz7OUOuk2D9Nw== X-Received: by 2002:a17:906:c291:b0:a32:b376:489d with SMTP id r17-20020a170906c29100b00a32b376489dmr228552ejz.21.1707158583686; Mon, 05 Feb 2024 10:43:03 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCW/539QzZ3CsCBd/dh6u4+Lu0RJ/lNp9RpJ+QdlVC2XRNNKX6VqeLJj50ZJA+N90OsJClBVsg5JNJx2ats/acge24t52SP1Khtr1Zb4g78xgsfghwaFLj1f6AJtfVo6O317uL1HzzNqXxmpy7ECqBJEptEIkKBxTFpYeMwuFd+BML/Xrojv2jMMXM9fitkLsKBmdYff02rTHIy1/9RYeW9KdA+vBiMMFajtXpJ9V3LInGlCjYjlUDdXOvBtO5I7hA45drv3aKenosx8u4UyB41Mz1PLz7aLENeuLx+D1O2uqJitQ5WY2/MWQsxC4hRsJLrtQSEiVEO//auoefGKYicIZXYmMBpZyobmMO+U5/AI7JRZNB4SrfhxFR3pafp6m1NPrmYlSeKc08AuIyTHk9ANC0tpyeniQJ3jCv+QnMgmLtM/kn+0P+/bRaYeDZ6d8IRlYLtr+o3sXelQ5sLfNPgIJKCnYmIVFOljcVjx7+ZUhFi0fAaUSSYmOH5KO46artcSjNhj82irK/HCSLEyg8UvWscGqbKXPwX22XgIsaFBiaZQJE98IoKW/FK5HPxvcKxRAW/5/iKxgZhKCM8KtX0dQCkHll57HIUiJSjrmPsVcn0ucLRS3jgg9lsPvnuDItmph5A4CJHwTnHeAe/8NIIZ8VBicJlP78Sc2dSEOj28GuudM2rMQLEK9T4bEzynKCV2zDJ0K6FcH+gAF302k7BBiiWiEivB Received: from [192.168.0.159] (185-219-167-205-static.vivo.cz. [185.219.167.205]) by smtp.gmail.com with ESMTPSA id t26-20020a1709066bda00b00a353d1a19a9sm121768ejs.191.2024.02.05.10.43.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Feb 2024 10:43:03 -0800 (PST) Message-ID: Date: Mon, 5 Feb 2024 19:43:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH bpf-next v4 0/3] Annotate kfuncs in .BTF_ids section To: Manu Bretelle , Jiri Olsa Cc: Daniel Xu , linux-trace-kernel@vger.kernel.org, coreteam@netfilter.org, bpf@vger.kernel.org, linux-input@vger.kernel.org, cgroups@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-kselftest@vger.kernel.org, linux-doc@vger.kernel.org, fsverity@lists.linux.dev, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, netfilter-devel@vger.kernel.org, alexei.starovoitov@gmail.com, quentin@isovalent.com, alan.maguire@oracle.com, memxor@gmail.com References: From: Viktor Malik In-Reply-To: X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240205_104504_885616_1F0BD0CE X-CRM114-Status: GOOD ( 26.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2/3/24 19:45, Manu Bretelle wrote: > On Sat, Feb 03, 2024 at 03:40:24PM +0100, Jiri Olsa wrote: >> On Fri, Feb 02, 2024 at 03:09:05PM -0800, Manu Bretelle wrote: >>> On Sun, Jan 28, 2024 at 06:24:05PM -0700, Daniel Xu wrote: >>>> === Description === >>>> >>>> This is a bpf-treewide change that annotates all kfuncs as such inside >>>> .BTF_ids. This annotation eventually allows us to automatically generate >>>> kfunc prototypes from bpftool. >>>> >>>> We store this metadata inside a yet-unused flags field inside struct >>>> btf_id_set8 (thanks Kumar!). pahole will be taught where to look. >>>> >>>> More details about the full chain of events are available in commit 3's >>>> description. >>>> >>>> The accompanying pahole and bpftool changes can be viewed >>>> here on these "frozen" branches [0][1]. >>>> >>>> [0]: https://github.com/danobi/pahole/tree/kfunc_btf-v3-mailed >>>> [1]: https://github.com/danobi/linux/tree/kfunc_bpftool-mailed >>> >>> >>> I hit a similar issue to [0] on master >>> 943b043aeecc ("selftests/bpf: Fix bench runner SIGSEGV") >>> when cross-compiling on x86_64 (LE) to s390x (BE). >>> I do have CONFIG_DEBUG_INFO_BTF enable and the issue would not trigger if >>> I disabled CONFIG_DEBUG_INFO_BTF (and with the fix mentioned in [0]). >>> >>> What seems to happen is that `tools/resolve_btfids` is ran in the context of the >>> host endianess and if I printk before the WARN_ON: >>> diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c >>> index ef380e546952..a9ed7a1a4936 100644 >>> --- a/kernel/bpf/btf.c >>> +++ b/kernel/bpf/btf.c >>> @@ -8128,6 +8128,7 @@ int register_btf_kfunc_id_set(enum bpf_prog_type prog_type, >>> * WARN() for initcall registrations that do not check errors. >>> */ >>> if (!(kset->set->flags & BTF_SET8_KFUNCS)) { >>> + printk("Flag 0x%08X, expected 0x%08X\n", kset->set->flags, BTF_SET8_KFUNCS); >>> WARN_ON(!kset->owner); >>> return -EINVAL; >>> } >>> >>> the boot logs would show: >>> Flag 0x01000000, expected 0x00000001 >>> >>> The issue did not happen prior to >>> 6f3189f38a3e ("bpf: treewide: Annotate BPF kfuncs in BTF") >>> has only 0 was written before. >>> >>> It seems [1] will be addressing cross-compilation, but it did not fix it as is >>> by just applying on top of master, so probably some of the changes will also need >>> to be ported to `tools/include/linux/btf_ids.h`? >> >> the fix in [1] is fixing flags in set8's pairs, but not the global flags >> >> it looks like Viktor's fix should now also swap that as well? like in the >> change below on top of Viktor's changes (untested) >> >> jirka >> >> >> --- >> diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c >> index d01603ef6283..c44d57fec390 100644 >> --- a/tools/bpf/resolve_btfids/main.c >> +++ b/tools/bpf/resolve_btfids/main.c >> @@ -706,6 +706,8 @@ static int sets_patch(struct object *obj) >> * correctly translate everything. >> */ >> if (need_bswap) { >> + set8->flags = bswap_32(set8->flags); >> + >> for (i = 0; i < cnt; i++) { >> set8->pairs[i].flags = >> bswap_32(set8->pairs[i].flags); >> > > That should work. Here are a few tests I ran: > > $ md5sum /tmp/kbuild-s390x/vmlinux.* > eb658e51e089f3c5b2c8909a29dc9997 /tmp/kbuild-s390x/vmlinux.a > # plain vmlinux before running resolv_btfids (all 0s) > ea907cd46a1a73b8276b5f2a82af00ca /tmp/kbuild-s390x/vmlinux.before_resolv > # x86_64 resolv_btfids on master without Viktor's patch > 980a40c3a3ff563d1c2d1ebdd5071a23 /tmp/kbuild-s390x/vmlinux.resolv_native > # x86_64 resolv_btfids on master with Viktor's patch > b986d19e242719ebea41c578235da662 /tmp/kbuild-s390x/vmlinux.resolv_native_patch_viktor > # x86_64 resolv_btfids on master with Viktor's patch and your suggested patch > 4edd8752ff01129945bd442689b1927b /tmp/kbuild-s390x/vmlinux.resolv_native_patch_viktor_patched > # s390x resolv_btfids run with qemu-s390x-static > 4edd8752ff01129945bd442689b1927b /tmp/kbuild-s390x/vmlinux.resolv_s390x > > > and some hexdiff of those binaries: > > > # difference between master's native build and s390x build.... has byte swapping for set8 and others > diff -ruN <(xxd /tmp/kbuild-s390x/vmlinux.resolv_s390x) <(xxd /tmp/kbuild-s390x/vmlinux.resolv_native) > diff_s390x_native.diff > https://gist.github.com/chantra/c3d58637a08a6f7340953dc155bb18cc > > # difference betwee Viktor's version and s390x build.... squinting my eyes I only see the global set8 is missing > diff -ruN <(xxd /tmp/kbuild-s390x/vmlinux.resolv_s390x) <(xxd /tmp/kbuild-s390x/vmlinux.resolv_native_patch_viktor) > diff_s390x_native_viktor.diff > https://gist.github.com/chantra/61cfff02b456ae72d3c0161ce1897097 Thanks for the testing Manu! Jiri's suggested fix is now a part of [1]. Viktor [1] https://lore.kernel.org/bpf/cover.1707157553.git.vmalik@redhat.com/ > > Have a good weekend all! > > Manu > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel