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 87E0CC4828F for ; Sat, 3 Feb 2024 18:46:00 +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:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=T25QnXdDrAL0UeYCLKaKWpebEaJGCyj8nb8LlXaHm3Q=; b=W1SRlYBdzCngVF Dq6+vzqyGpU/WHF/hEM/LQSLysleEdRke7O0l0nf++HE/CKTv1GnT+yCple7kuazyIezVCGOq9dHE yedyc7Czl6oGBNSlHsSRZf2WOsPD0iFD1kc8zphBMCI7d6mqbAWfyP12b2K243jftaNoNpNxXdgM5 YnO6m05Ff6sJkm4CZE9nMkuodJCPCOuRdSjBLCLFEqQALOy+xrCJ8K5m+ZVmgAATdCSGXz32gri9X qYD3W1h5AYDP6B4FOPdQ8EuG+3WhI52pxH55Dy0lFjpsyOkATekFVZ/IM5XeC92iTawTKrOJYO1f1 wvgCa+9YpGnJ5AhLx20w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rWL1N-0000000H31f-3kFe; Sat, 03 Feb 2024 18:45:45 +0000 Received: from mail-oa1-x35.google.com ([2001:4860:4864:20::35]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rWL1K-0000000H30g-1Mvn for linux-arm-kernel@lists.infradead.org; Sat, 03 Feb 2024 18:45:44 +0000 Received: by mail-oa1-x35.google.com with SMTP id 586e51a60fabf-21432e87455so1262662fac.1 for ; Sat, 03 Feb 2024 10:45:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1706985938; x=1707590738; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=y0N/TxnXN2qBHJ/dkfZVj0nsBZc+7pjCqkkafHOcTPY=; b=jro3lKlxA/0nKZoz/kpn7nJGd+GCHZIZw1+11ZLDPricsxO4OiET0aMKvEsKrBtLsG XfFfBroy8F3PEIO/C67Gk9o45k4BjO5nY/ZyhkCF5AhqadxDU5jENsaJ0CnOzcxXZW1D S6iX8z4ML7qxBRXf6UTAwQ0zokbgU8yI0E90RQf+wU+m0GT6QJT/zJeUY57f/90HKV7f AztuOJo+q+ZP/TfE5GKT/urvxJlnfkvjxqnBj06tXGb4J9H+F2LlmBaXYwD3NDK9Bpfe i6WCnsf7/pxSENjMuhZMdf24n5N29Wy3WQYidfh2Dg4EGdSzt2UEJHGV7LqI4VK3j/40 Cxdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706985938; x=1707590738; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=y0N/TxnXN2qBHJ/dkfZVj0nsBZc+7pjCqkkafHOcTPY=; b=gDTbgKThlo3nZhaO/n+ao1LIOSVFgqLX2aqiHx4owcPzhIfScKxhCCw00YiLsDhDNK 2U8jk/pCRA3PYwk0MF2S+UePEkT6XDXhHZ4LgMVsc4QYa7Vl+Z8f5hdWmUyZw2x7F91A y5rOFyV/OJbAXERuzG8g+AWNfyp96Z9zEX0RNNqoR5usZTjvcnDhkv+QQflapOZO7ff0 GikOXiWl6CaC6pSSS7D7HgOrQwtzTmHlhdFfIrrd3su2wOKHymPdxD2XDTkM/F3eFBSO 2EvUdSDZJvEu1cLPxRTpzoAOfa3Ctngb+9OjndECWidjmRz31HoJz0Jz/+G4RLpDi0+P qFVw== X-Gm-Message-State: AOJu0YzNJjcuKzfDciEveKCGBXM9vlfPX+wZYlkD4y2an0hUHscxmzT+ 3hE5z04ZNqe5XFock+x/GKlOii3NcD8MsjzexIuvaTZ5tbRXpwXV X-Google-Smtp-Source: AGHT+IE6cTsFsYxec6Cc2Nv8r8Wv7UwdJ2OkD0GT9fp4iaKTaMhjHiWk6mQDIasAcDiqRAsVsbikAg== X-Received: by 2002:a05:6870:4149:b0:214:ff12:3dda with SMTP id r9-20020a056870414900b00214ff123ddamr3816197oad.2.1706985938425; Sat, 03 Feb 2024 10:45:38 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCUQOTzlsO8lgt6pTwZLPw4119LfUrIfiaPa1wTTfdoxvsVTK1OcV2Dhbg5b2iobZcoC99Y+nA1mfBlqm8ccNuDEZ9ovSOSxF3dHJJoFa8pVW2wvNSbjP7RHN1nQlbwYiR+ZGUGPHsYbVIKUu/kExr3+mBS2LyoL7EMCy0RKTBCwZmgSJAnm8YjNjZATBXumi5rZ1guYYVe6tbB3apJ1FiMecZeZOLFGPHLSIm9lMMnedLrSL5LR+ITrAlKqzgfOzWbsLuUM4d0ufoM4ZdW8uS+lgajFrBnb5Unl8KMrPo5f7fVRDTzb+mpkXuSEfXp+VxBl9aBdT1X4Pu6RO2Vb+J9irkfLOt6ydfNho4jZIfhH5e7RejlM3xop2REcBU+7Ep2QxW6BfVclBjRvfADINXaS9e2RfWdRXu9F1/Yl7W4aoQMsEnydZd5izTj9tgYTVMJznLUUlABQlG1XUF+lALvWG6wGjF/JBqJwIeKsgiHWrSlTkPAQMEc11zIv9TBj/SgdR+1IGkyuC42IrbIYBRA6Lh1HyFcyKl9okR8mk02mHyKzcQcLfR3w3JL3Ur9d5SVkncclHqL1PxkDpGPOs3dE++/rIX2sEot24DS//9lxdPUpALKMpt4xa0iv27eylxppX5U6yH5xrfrThO7kAWWBey3QFiyYH1/6c0o0YhJJldRm9x6QOyyQUBjy8xYN3sw+NkNgjLDcwTs+DRby93OBGQ== Received: from surya ([70.134.61.176]) by smtp.gmail.com with ESMTPSA id g37-20020a635665000000b005d748902a01sm3945514pgm.43.2024.02.03.10.45.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Feb 2024 10:45:37 -0800 (PST) Date: Sat, 3 Feb 2024 10:45:11 -0800 From: Manu Bretelle To: Jiri Olsa Cc: vmalik@redhat.com, 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 Subject: Re: [PATCH bpf-next v4 0/3] Annotate kfuncs in .BTF_ids section Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240203_104542_393803_A234D327 X-CRM114-Status: GOOD ( 38.32 ) 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 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 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