From nobody Mon Jun 8 20:42:21 2026 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A8C093B9935 for ; Tue, 26 May 2026 14:15:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779804940; cv=none; b=ETBh3iOTqg/S1xgIQKlryhlFi0hPI5EM3//DnK/7HxXHZmZ/Vo0KXo6Vnai0olOwyGFaFKDtpUM7hgwdZOR1o1vmVkVeHRxiQpGjOPibJdwwc8A7QcRFErU/XgFrvsVWlL/39YWSUh/Y1QmRH56J0cNbqtWupSjBbnFK7vpyi9g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779804940; c=relaxed/simple; bh=r7zcdF8qutzChq8XLk+oXcsBhNew8W4i+fhDiWfimoc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BIiOmThpGuSE1uqG8IlA5+sjqqwocv5o4yohV0v804/0BgPkNqfpC8m7Nr4xhCORZqBfE9TZdMjhg6XDfeHcfS32MHY/dXlTcfQRUhnNt7G75b6tgZnW5LlWwkJQ0WsSV3IdDevGgurSKFdmaI352s/OgC/YAH2d3JB9u4Bf/i0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sidnayyar.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=iteVPtF3; arc=none smtp.client-ip=209.85.208.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sidnayyar.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="iteVPtF3" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-6852c63bd1aso1383516a12.0 for ; Tue, 26 May 2026 07:15:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779804937; x=1780409737; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=4Ev6aA3Xe6T1Sew1C3oAjJbhgzPbzt+OHYmVBfkfyNE=; b=iteVPtF3xk7Ykwf3qZcSj32wywLJxB4dVFfRcmAf3qSilkwNIgq1HUQrw6KWKMY8z7 7tA0rz5Xcq+uQdEZizE6qLbUZ3vAXg7nZCu7iMlmur/4pAHN3X0jKXE9GOPZqlF3MYm4 62UCsEHMguB+3KGhiDCuFDtyoQL7MSuuwkWAl9sya5anOe1ez+zcdA0SHR8Ku2rgCRpG qSsKg4nRTxMPQ181DIinvajfdOogb+TJURR5z81piKwmxvoi/K9Pa9KmzBRypPGKUrA2 0YDZeWFyvuunCf0gZP7V88kmkT7CW2BOTtkJ3wOhR+MhDw/rbuIAVU2CAvUE2QhOF4tA 81Xg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779804937; x=1780409737; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4Ev6aA3Xe6T1Sew1C3oAjJbhgzPbzt+OHYmVBfkfyNE=; b=BKXtvjiB0zLn7mN8qzSTh1WOC9233dWZ80LlwUiRmjfNRYuLJ20tQP1XZDOD5M2mLd qRCwCPiGn+4Ewb2WS9+IrKZhtMRbMNO3yoKIJo+MD3+wdmOnL9gkp2pU6Ks07UmWvIkH 01r8J4LM6NY3hqUHIC50V2LZ2lTy//thOcfH3qSUauVR80q2K84kVfD2z7+hrywceEzX iL2DstkfoYuLEVUmm9XgzQkWXfYSzX8L2grzLAc3ZQhr0Deqf7dAQeJZJ+oV+stlI4At I+l30YOWQLMnDeycLEWKPVpJSWNWnipbg7HVkX6grMJOVFJtQMJCddPL8YeBNw8Oc8RP Vycw== X-Forwarded-Encrypted: i=1; AFNElJ/bPlbWEnpE3g0wQdjMl/KqoHIiQLUgWiSej+w/ulDme6v7XZsOUep+lCYqqvQ3d48tB+lm2QVv2Du0Xj8=@vger.kernel.org X-Gm-Message-State: AOJu0YzqY4Alc/nSdertcZ2/p/a5S+gbJNO6YmjgD0HAt7Vcva0+e36l KYo7qebdast5hJYkCCu9sz+PVOgL/9fDtEXdRUyh3ATiLHpX9RuAF2Bn4gkCO+DhKs9HmUwlhOq Eq14f/YFSVH/3/x0pyA== X-Received: from edk1-n2.prod.google.com ([2002:a05:6402:4041:20b0:688:fdf7:74b0]) (user=sidnayyar job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:5293:b0:67f:97eb:b0ef with SMTP id 4fb4d7f45d1cf-6889c476e4cmr9916226a12.15.1779804936629; Tue, 26 May 2026 07:15:36 -0700 (PDT) Date: Tue, 26 May 2026 14:15:34 +0000 In-Reply-To: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v3-0-5b4fa2a5e1a4@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v3-0-5b4fa2a5e1a4@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v3-1-5b4fa2a5e1a4@google.com> Subject: [PATCH v3 1/3] libbpf: load vmlinux BTF in gen_loader mode for struct_ops From: Siddharth Nayyar To: Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, gprocida@google.com, maennich@google.com, Siddharth Nayyar Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable During light skeleton generation (`bpftool gen skeleton -L`), libbpf runs in gen_loader mode. Previously, `bpf_object__load_vmlinux_btf()` completely bypassed loading the kernel vmlinux BTF (`obj->btf_vmlinux`) if `gen_loader` was active. However, BPF `struct_ops` maps (such as `sched_ext_ops` maps) require resolving the kernel-side struct type IDs and member sizes at compile/skeleton generation time. Without loading `btf_vmlinux`, libbpf cannot query the kernel BTF types, causing light skeleton generation for `struct_ops` to fail or omit crucial type information. Fix this by modifying the check to load `btf_vmlinux` even in `gen_loader` mode if the BPF object actually requires kernel vmlinux BTF (e.g. contains `struct_ops` maps). Signed-off-by: Siddharth Nayyar --- tools/lib/bpf/libbpf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 3a80a018fc7d..cb1b7ea884a7 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -3590,7 +3590,10 @@ static int bpf_object__load_vmlinux_btf(struct bpf_o= bject *obj, bool force) int err; =20 /* btf_vmlinux could be loaded earlier */ - if (obj->btf_vmlinux || obj->gen_loader) + if (obj->btf_vmlinux) + return 0; + + if (obj->gen_loader && !obj_needs_vmlinux_btf(obj)) return 0; =20 if (!force && !obj_needs_vmlinux_btf(obj)) --=20 2.54.0.746.g67dd491aae-goog From nobody Mon Jun 8 20:42:21 2026 Received: from mail-wm1-f73.google.com (mail-wm1-f73.google.com [209.85.128.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4DC673FFAA0 for ; Tue, 26 May 2026 14:15:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779804945; cv=none; b=Yjty0589Iap4sFcoyiemTg9b51YQ2DHOAqKpDZZcsbh2KtNI7M5obN+93Ea7sGiRdfLKq32AqEoDAXBMuDZB4iSAs4NtTMUyuHXeiC4CWEUFx1Dx/+t+6BSdkRZc96ff5hy/8+A/knZ180KLwgBAgUQC9S5M/blFzLV/sintWOQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779804945; c=relaxed/simple; bh=/QREukzmkE+tXyTCwaLqTcmUTEKcIpO3WmpithpQ8Hc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BBPOw9Kt7sVMih1X0NgdgZySt+C4MSB0ViqIUzyC6XGxHaxRvZaECRIFoJNaoXeYPOoFfMQxtQ3MJhAzEt0WYj/jOGB3ntMy78iMkZlysWCg/jYGtERFZ/mQiIqyPibUXBaZkTUuO4Cn22THPsT2TVStQ7OWQq3PmMFVwjHIfYY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sidnayyar.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=o8e92Rak; arc=none smtp.client-ip=209.85.128.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sidnayyar.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="o8e92Rak" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-4904bbc6094so25962235e9.3 for ; Tue, 26 May 2026 07:15:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779804941; x=1780409741; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=VOEIbZxHQvqfLsgmTIwg9+R/3mRTQ8/fMiowXJT30hg=; b=o8e92RaklRbtgdl2THaDuVNil792tg21F9T7CTdwu2F6aXs3y7vhDq8wr94TUPASYD /dLRl3ksu8+PkCpy5zwk+PxM2gRL2ARAgXzdOoV2nOkCGyJgd1N5S9+ad+sZlAmH8dQo /+UESyThVqEtoX9iUGZHZ/aLQVzDvJtql45veNcAbLcfD7ryRcdcPr72hZ+BmpCunaEF +4kkYOYVwVzpUVi5podScBrCHwXX5WLsuGCvia76NUN+4g4ErFYnjip99ipJ0p+w1u9p to2aDSaDnFw6+oBhlCWRTq7b0dJeb/yPBvDJW+cTZ4wKYqWrFJRCjwMlFM9U0EVxOkDY GApA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779804941; x=1780409741; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=VOEIbZxHQvqfLsgmTIwg9+R/3mRTQ8/fMiowXJT30hg=; b=Qq3wpWQiyARbmE95gve9OOi+oFyWyR54q5+1aweVA8H7OhASnguQITncBLVbk/1uqY w/LtqwsoIPG/kqQOnCOnuPdEiR34YA/wgBf+IK7o2gy0NsXyA2hs4wCeHYgLkYQDXWWk CsXqDFXhxgkxQ+Qny+CvMGFGFejVDJJba3vO1DrKe2a73rN1lKswTsYpcMhAra5rhGA7 JOubPUFEPGtMCT49zAsXFJzcIvd6LczX9FJgS2YgSVNbF3Xi1GIR+IXV3kqQf78xlEfP Xn96eNKKtg0zP7zzCZTfWY5k3S4PzPxQEgAn4ONcYDdA2HPUSxEl37+M0J9l93Xodfrx amzA== X-Forwarded-Encrypted: i=1; AFNElJ9BXNDVVj9EDtr1yLWci+rF0SpLpvMNVpBBrpTis431xODKOR58MHmlYPTWt3KhYB92JsE7DxEIHaL7Flo=@vger.kernel.org X-Gm-Message-State: AOJu0YxQ0UH8Npu2EnCFM8CawiXXBvpxUaU8hhmlR/edG9xdMVzMc+Vw 12Iwm+Tr2H6ZHYVnfpGzQxvhFgfxGpwTgkSgvWoOPjVwPFoKMqBfiI1cBaumeOn+mf4ztKmMSaA zyZ+9rPOUN51amoNInQ== X-Received: from wmaq2.prod.google.com ([2002:a05:600c:6c82:b0:489:1f08:926]) (user=sidnayyar job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:4652:b0:490:3b84:c106 with SMTP id 5b1f17b1804b1-490428d3b7fmr201488655e9.26.1779804937868; Tue, 26 May 2026 07:15:37 -0700 (PDT) Date: Tue, 26 May 2026 14:15:35 +0000 In-Reply-To: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v3-0-5b4fa2a5e1a4@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v3-0-5b4fa2a5e1a4@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v3-2-5b4fa2a5e1a4@google.com> Subject: [PATCH v3 2/3] libbpf: zero out btf_key_type_id for STRUCT_OPS maps From: Siddharth Nayyar To: Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, gprocida@google.com, maennich@google.com, Siddharth Nayyar Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable For BPF `STRUCT_OPS` maps (such as `sched_ext_ops` maps), the kernel BPF subsystem enforces strict map-creation safety validations inside `map_create()`. That is, if `btf_vmlinux_value_type_id` is set, the kernel forbids passing any userspace `btf_key_type_id` or `btf_value_type_id` (they must both be `0`). However, inside libbpf's map-creation options initialization (`bpf_object__create_map()`), libbpf zeroed out `create_attr.btf_value_type_id` but does not zero out `create_attr.btf_key_type_id`. Fix this by explicitly zeroing out `create_attr.btf_key_type_id`. Signed-off-by: Siddharth Nayyar --- tools/lib/bpf/libbpf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index cb1b7ea884a7..9969de42da41 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -5439,6 +5439,7 @@ static int bpf_object__create_map(struct bpf_object *= obj, struct bpf_map *map, b map->btf_value_type_id =3D 0; break; case BPF_MAP_TYPE_STRUCT_OPS: + create_attr.btf_key_type_id =3D 0; create_attr.btf_value_type_id =3D 0; break; default: --=20 2.54.0.746.g67dd491aae-goog From nobody Mon Jun 8 20:42:21 2026 Received: from mail-ed1-f74.google.com (mail-ed1-f74.google.com [209.85.208.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CEDA3FF8A9 for ; Tue, 26 May 2026 14:15:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779804945; cv=none; b=s7FuFKMDDg8TA4dCHRAVguNZrsTK0BQRuayXmFpjJz2Tc94vf/g2aVzAWV8h0/IgcmoX2QVBT7qcYnnkEK49AP6t7wzuzb/fvOoAWxPFxt4dR8K/8LEZ3KOv2wlrn9HfiQ+kPozuPFj6MKY8NmE2eSy2Fpbi+t4z2Djvwjsijjw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779804945; c=relaxed/simple; bh=SrP6SKRKlEW+kzm6E5gyWOnirxv86MAAGseQB9sR5b0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nR0ylYJ5pCEu210VaPPPnfZnom64Tvxp4cIjomy7MKEkI2SupgHBIPOvsvgyItS9btGZyH/bq4d6xwMXr1UdvHINofQgDooXd2WkSYWx97kJK1r+ipPZ+Peg9jzXQzUDICj6iFr29flIy11XUMU+yrdrwpZ3vd1Yw9b1Ljen//Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--sidnayyar.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=BITSzV+1; arc=none smtp.client-ip=209.85.208.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--sidnayyar.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="BITSzV+1" Received: by mail-ed1-f74.google.com with SMTP id 4fb4d7f45d1cf-67fd8b6631dso391945a12.2 for ; Tue, 26 May 2026 07:15:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779804940; x=1780409740; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=BNY8rXPMnN6yvu32biXhw7JSMAJZadKBrhVosmLObKM=; b=BITSzV+1ZjbzjpZu5/Otr6JwbJNMpT0G1TOVnPZSqujH440tjqjjO9ultIeOevD751 K2DJY4JMX7lZWyj7vxDlxUXBtEz3+kJjRZjTCQQfCv2ro/SgBG332zX5i4ODQCVDTUUr BfFeLE6MXNHeCVJIhYLMxbtwe6PWWnZ8TwGFKo82uYI6pFbZcsPxhluHzmaf4rCGP7Ak MRpJv0yMfaf6IlBmDGc3z77gXewZxgeXNk+J84seASBP/+yEEU5GMevZgXtU9GZ3aP+T 3G5Wl3ws/EEie/p/sAocmDo/8RqLpQVR9jNvvEZuK+e38yO6FG1E/JeQ8WLDyfVCcGS7 EEsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779804940; x=1780409740; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BNY8rXPMnN6yvu32biXhw7JSMAJZadKBrhVosmLObKM=; b=YPDKRCOF0nvqZlLl8rBkGJqds7BbRnQuHzncIfyLqzmBmCpJR6y//t62t/IkeCHH4T S4BMS8U65POl55lB6zoCCPrR/97KZms8VPmdpYP4vmiTEbO1KXvd324JH0UYNafw8KQH /BdnIx2pZMoAa50oHbFef6sZ2pzgOUYF0qbctsJi1aYGR8hVA9HcdZYRhPtrr38wAqJp rZuNPJ0hmELLKokoeHdvF0ofTlz+4LKMLn3rRFX2pFIFdke7WI7exXuR71mhhtebvkCy aYxPcep/3jDXmIWvNEODI1RnKjAT5baEFDqgABwVUEf9ha2f34ChIMk26Xey9jTrmBhM OtMg== X-Forwarded-Encrypted: i=1; AFNElJ8kauEkULgmmQVLRu3zoWbLg3RxOQ+O0vKP1f0GRToa7kcKmn8SyaY0ubDAX9fjLRZvoKTO0n4L+uwOFfQ=@vger.kernel.org X-Gm-Message-State: AOJu0Ywm3ylfAeMuRBExQ+mRj0sfFbc17WBbPEMoO6J/3dHCfUX2w/nt +G/L6EQvg6kpvY3x72B1zoPx7pOS89Y6OnmuFr1JaQmvoZhqWNcQ7IESq9fsMEFxMyZAC8ODWV6 Yb7no8t+2fRj56SR9gw== X-Received: from edvt5.prod.google.com ([2002:a05:6402:205:b0:672:b7c7:1edd]) (user=sidnayyar job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6402:458e:b0:683:e55a:d165 with SMTP id 4fb4d7f45d1cf-6889c422dc0mr10289653a12.2.1779804940058; Tue, 26 May 2026 07:15:40 -0700 (PDT) Date: Tue, 26 May 2026 14:15:36 +0000 In-Reply-To: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v3-0-5b4fa2a5e1a4@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v3-0-5b4fa2a5e1a4@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v3-3-5b4fa2a5e1a4@google.com> Subject: [PATCH v3 3/3] libbpf: plumb btf_vmlinux_value_type_id and btf_fd in gen_loader From: Siddharth Nayyar To: Andrii Nakryiko , Eduard Zingerman , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa Cc: bpf@vger.kernel.org, linux-kernel@vger.kernel.org, gprocida@google.com, maennich@google.com, Siddharth Nayyar Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable BPF `STRUCT_OPS` maps (such as `sched_ext_ops` maps) require resolving and plumbing the kernel-side structure value type ID (`btf_vmlinux_value_type_id`) into the BPF map creation system call attributes. Additionally, when `btf_vmlinux_value_type_id` is supplied, the kernel requires a valid userspace BTF file descriptor (`btf_fd`) to be supplied to verify types. Previously, the `gen_loader` map creation generator (`bpf_gen__map_create()`) omitted plumbing `btf_vmlinux_value_type_id`. Furthermore, `gen_loader.c` only copied the loaded `btf_fd` from the stack to the attributes blob if `btf_value_type_id` was non-zero. Because `STRUCT_OPS` maps explicitly zero out `btf_value_type_id`, the loader program skipped copying `btf_fd`, leaving it as `0` (standard input), which caused the kernel's `btf_get_by_fd(0)` check to fail. Fix this by: 1. Copying `btf_vmlinux_value_type_id` from the options inside `bpf_gen__map_create()`. 2. Modifying the `btf_fd` copying condition to populate `btf_fd` if either `btf_value_type_id` OR `btf_vmlinux_value_type_id` is set. Signed-off-by: Siddharth Nayyar --- tools/lib/bpf/gen_loader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/gen_loader.c b/tools/lib/bpf/gen_loader.c index cd5c2543f54d..a9be0c241025 100644 --- a/tools/lib/bpf/gen_loader.c +++ b/tools/lib/bpf/gen_loader.c @@ -525,13 +525,14 @@ void bpf_gen__map_create(struct bpf_gen *gen, attr.max_entries =3D tgt_endian(max_entries); attr.btf_key_type_id =3D tgt_endian(map_attr->btf_key_type_id); attr.btf_value_type_id =3D tgt_endian(map_attr->btf_value_type_id); + attr.btf_vmlinux_value_type_id =3D tgt_endian(map_attr->btf_vmlinux_value= _type_id); =20 map_create_attr =3D add_data(gen, &attr, attr_size); pr_debug("gen: map_create: %s idx %d type %d value_type_id %d, attr: off = %d size %d\n", map_name, map_idx, map_type, map_attr->btf_value_type_id, map_create_attr, attr_size); =20 - if (map_attr->btf_value_type_id) + if (map_attr->btf_value_type_id || map_attr->btf_vmlinux_value_type_id) /* populate union bpf_attr with btf_fd saved in the stack earlier */ move_stack2blob(gen, attr_field(map_create_attr, btf_fd), 4, stack_off(btf_fd)); --=20 2.54.0.746.g67dd491aae-goog