From nobody Mon Jun 8 18:57:48 2026 Received: from mail-ej1-f74.google.com (mail-ej1-f74.google.com [209.85.218.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 ABE4C274B23 for ; Wed, 27 May 2026 12:53:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779886387; cv=none; b=u+XkndqGJk9TZlnn/fdOog/I0O99QoBtcTKo7SGBXfb+oMSk3oWgw2Cv2k2/hXcLTT+mCgdJkqSd+Nk19DjULxpHvHDa41WSd6h7+cSRgSwT4bUSuUV0VqMNICQhjpFOrU+A/8IMNvKS1lALyaTBshc2lNFLG9Egr0dVNmHCmvA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779886387; c=relaxed/simple; bh=rKh7yFwfbu/igasiSX3RCH2Oso9JbKo1Z4xZmpDBbM0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=CQp6KrKRoL/pyNOTJXkHUtWgMP5TZJeNSMY0XkZVAuERaH75W0Ziqq+KX/XM6iZnOWsja+MJxcKILznQ3O36QWkwR4cjEVpXA/GAKKD+Qe/tImpRwbiF5ZkWjLTr4d/8apdn6D4/QXbAPeyV8+0n8CC99NirVobBlVffbEvXSfg= 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=S5CAe03h; arc=none smtp.client-ip=209.85.218.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="S5CAe03h" Received: by mail-ej1-f74.google.com with SMTP id a640c23a62f3a-bcc22a042b1so1232185266b.2 for ; Wed, 27 May 2026 05:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779886384; x=1780491184; 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=mwM7tLigXa4SmZ+iBmv8/N7XkWuoA8HVKgKI0pJrdIE=; b=S5CAe03hG2Szfk5Jqs1lIdtY5a8gjiEG2ZQ20UCEfvmSeFArWVHlyGNBp4VWdl6c1A 05ujmZKAi1FKk0SlQMtBOgmLLiHAcsJ1L5zsVMDz5ya6MWiSdikZXPnwi931muGqgFdU QdQaUMHK/dKTKTdZuJz7oybzm+MGOjtu+iDyc2U7lBAkTmWxP+I32+YeE4WZQWyt92Ik ZGwZWfl40kIA/uFAzI6YOdC+lRBoZ+h7VtYodv7NKWRMliZCigisH7BftuDCeXPNR5Rv Q9iLfqp2gRBA432QbsW2S4CeQRbLtz6Km5Cqd7SxKgy7EyMa0oobZJhpgp0zqcagfx3j PQYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779886384; x=1780491184; 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=mwM7tLigXa4SmZ+iBmv8/N7XkWuoA8HVKgKI0pJrdIE=; b=KSr/n7YqQQkb2uBSkj9qTkWGeOZGOB0puwcpiWV1jO+CiEPYETggX/cp0Ylvc7mhcR CDyMhwh3zhnLBipNfU/pfpoW8K41jjMtJQhn9CDg9RcBKR7z3p0q66u5go/uKxkrhTVs SA3k1d4HTK36RAH6EnB7gAtT4lxSENS0nn/prmq9I51bOws3O+b+NY5Uzvo3noueClzc 6vatX8fgqaJuVj3eIjXCvcGPHDkk+bdbB78cznnc9+7zGNBLSzHinpjDUXi9967Ad2bw fnUEZDb8UDsKxR1d4uC+6a003DUA1TfKo8f6x+OqiVce/BQJZbBnWNTMypvat3ig1M8z Pp2A== X-Forwarded-Encrypted: i=1; AFNElJ+FeyHuXg/+wIXonVamv09E8qAzDqEwj11KWMg5ruhN+84xV5fwC6baUQZ7mPigae5DiHvGw1SlkpztyBM=@vger.kernel.org X-Gm-Message-State: AOJu0YySemAByq3dDyZsq47jqUNS1o4O1hygPkaz8X4mPP84njojrgFD mbp7es9IUW6rH8It9V2MLpKum1XWRokvJIme4v2RQVS3+l2g/zYDNEGuXKMwdSp7r+XUAi2te2E TLcZJTcP360g6rWGhQw== X-Received: from ejcag17.prod.google.com ([2002:a17:906:9a91:b0:bcb:8fd3:7db5]) (user=sidnayyar job=prod-delivery.src-stubby-dispatcher) by 2002:a17:907:9813:b0:bd4:9a55:18e2 with SMTP id a640c23a62f3a-bdd267c685cmr1405394266b.45.1779886383718; Wed, 27 May 2026 05:53:03 -0700 (PDT) Date: Wed, 27 May 2026 12:52:57 +0000 In-Reply-To: <20260527-libbpf-load-vmlinux-btf-in-gen_loader-mode-v4-0-27daa15487a9@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260527-libbpf-load-vmlinux-btf-in-gen_loader-mode-v4-0-27daa15487a9@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260527-libbpf-load-vmlinux-btf-in-gen_loader-mode-v4-1-27daa15487a9@google.com> Subject: [PATCH v4 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 contains `struct_ops` maps. Signed-off-by: Siddharth Nayyar --- tools/lib/bpf/libbpf.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 3a80a018fc7d..b159faae7f9c 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -3544,15 +3544,20 @@ static bool prog_needs_vmlinux_btf(struct bpf_progr= am *prog) return false; } =20 -static bool map_needs_vmlinux_btf(struct bpf_map *map) +static bool obj_maps_need_vmlinux_btf(const struct bpf_object *obj) { - return bpf_map__is_struct_ops(map); + struct bpf_map *map; + + bpf_object__for_each_map(map, obj) { + if (bpf_map__is_struct_ops(map)) + return true; + } + return false; } =20 static bool obj_needs_vmlinux_btf(const struct bpf_object *obj) { struct bpf_program *prog; - struct bpf_map *map; int i; =20 /* CO-RE relocations need kernel BTF, only when btf_custom_path @@ -3577,12 +3582,7 @@ static bool obj_needs_vmlinux_btf(const struct bpf_o= bject *obj) return true; } =20 - bpf_object__for_each_map(map, obj) { - if (map_needs_vmlinux_btf(map)) - return true; - } - - return false; + return obj_maps_need_vmlinux_btf(obj); } =20 static int bpf_object__load_vmlinux_btf(struct bpf_object *obj, bool force) @@ -3590,7 +3590,11 @@ 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; + + /* only struct_ops maps need btf_vmlinux in gen_loader */ + if (obj->gen_loader && !obj_maps_need_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 18:57:48 2026 Received: from mail-wr1-f73.google.com (mail-wr1-f73.google.com [209.85.221.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 7A33440488E for ; Wed, 27 May 2026 12:53:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779886389; cv=none; b=WgGB1xywQ3rDXfTbBqt/n96Ov4GKuxPnFw3m8zmXSf41YpuR8K59MDBMUlVLR0VvhXf1i8ok1DUpVPVWSwVaO6k8AMdtDEHghquQxDXzicqRG0N6W304JwA0sjfOfAomku2VGJZ+NqcYV37nCYdyce7SWGsLug4gbah2w4OJpOs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779886389; c=relaxed/simple; bh=pa9xHpIMy4cwaB68Gz/882zX24JlvRwx90PkqPToS4E=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=IG4dz2NcggDGYrb25JxanROabMrGKjFMGnik8KRXAqMdHKjbc8YqyeVNui37O9k6Nr9KQpLYXrsEQLbpHzKifUGiJkTvPhX5ovCP0VFSg0jyoKU9XWCy4MgEhfnWsflOvI+ouZwaFd1Y/kt1vSkjgCkNVLx9+KokXcGrWgbVlLc= 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=qFEL6QG/; arc=none smtp.client-ip=209.85.221.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="qFEL6QG/" Received: by mail-wr1-f73.google.com with SMTP id ffacd0b85a97d-43d7730e9e3so7123798f8f.2 for ; Wed, 27 May 2026 05:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779886386; x=1780491186; 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=bq3wICohzMAvkHD0Qy5vcKjARM6gmOVOBkurJ/O1FNc=; b=qFEL6QG/FGJ/nAUZVjaKD85YS+tYcIsDbB9g2oUskdzqsdrWqjuKP8K3Ms/Sg7YYmM WvrnwVRY6REPskttIKB3qXlMb6Ia0MblAx62WPiFpb8VMPYyLJLr2d3jVd3XET1wVlX2 9bnNU3nA4+EMlv2XhyRsz7cIRGeXq6o+9iUxuduhohtfIc73qUSgDWW/kVKhR7KjHOmJ 16rgcmqoil9dGrBvxJzLB9eCFprVv1N6JOVlEK0/v63ZrKa2ITeK3Ndah9T2frGCaVXq k0IMA0rhUliuTZrVQilxrrT2yMJZDeh9HqBmyndCeK/Lp3A5XSIjS6gL//IDAo84jFWD a7wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779886386; x=1780491186; 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=bq3wICohzMAvkHD0Qy5vcKjARM6gmOVOBkurJ/O1FNc=; b=njtWDKPGLgiwki1ZaljLdHfzQYJiHW3bh0ba/Hf8p4JMpcx9AXH1bafwXwEqCSnKlB zKGzpGy+OIgWrHsVdYBHiRCssAMqdEogYmDWFhTJgBgsnTXl+GdsNyG8DlrmSXAqv5o0 7RCURwnhuVR5scsMcRi/2ySe6P5Zrz3SWpMmQquLrMGARjmqXyoCPvNhTtWU1FhNgK7I hucEtrq5+fgc8G6SJvkttKPGQfYlIB8Zo7U8dKhYtA6y+1hoH9tVIXY+Cb2HtKkYW0wc t1DbTqUaPFZKQSTUy3/aXBxDfG/DChiwBO0uikT1s/hRCeiEnEQA/MnaB/FuNrxoPdpb P5Bw== X-Forwarded-Encrypted: i=1; AFNElJ8cqSatI2YfatQKdJx3aXcKTmFNq/ZY9ngtStFAJ2agFKLfeRz+wHZ1eUnFcn9O0ZWu3NryA15Ouej4f2w=@vger.kernel.org X-Gm-Message-State: AOJu0YyHyIcGxG+Y29g38emVtBvNiN8GrEKWfWxXARcFf/rkHrI742gT LTthlI90AEB60PZQEcS7KOyqT1H9tjb5vE05+jyeFefJA3LECGOtkthC+cL16nv2k8jwHWjN98b 0oF0t+IijTHFxO7KkWg== X-Received: from wrim3.prod.google.com ([2002:adf:e0c3:0:b0:43d:733a:c37e]) (user=sidnayyar job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:470a:b0:43d:3004:5fef with SMTP id ffacd0b85a97d-45eb367fb4dmr30997013f8f.7.1779886384889; Wed, 27 May 2026 05:53:04 -0700 (PDT) Date: Wed, 27 May 2026 12:52:58 +0000 In-Reply-To: <20260527-libbpf-load-vmlinux-btf-in-gen_loader-mode-v4-0-27daa15487a9@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260527-libbpf-load-vmlinux-btf-in-gen_loader-mode-v4-0-27daa15487a9@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260527-libbpf-load-vmlinux-btf-in-gen_loader-mode-v4-2-27daa15487a9@google.com> Subject: [PATCH v4 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 b159faae7f9c..f9c653541005 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -5440,6 +5440,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 18:57:48 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 59DD0405C3D for ; Wed, 27 May 2026 12:53:08 +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=1779886390; cv=none; b=D75gtB066zHvVWCenf8r/4YLobEsPQZJM+fTca1MlnRiU8PzpySXcfeh8kSsGviysTE9vrZUEs/nYRLA97miWrFryDgyIwqNTR2xE5+IwYj0UmRNXhHcIpxGqmbFdxYjcXDNCDz6A8tuisasqTPtGifCGqZitAAgLRDudM2p2Zg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779886390; c=relaxed/simple; bh=SrP6SKRKlEW+kzm6E5gyWOnirxv86MAAGseQB9sR5b0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mRwUoCCgiMKm16sydVmMJQAFyT0YhwLncsnBVe/fzcdpJtPxN99s0IiSzpidr2Hoa75iyJknKMtmlMTZgswm7zI8Dbc2RJAVNOCsnkgyV7/xa9GXZF8dWCvqz7h74pTUwISPtIPgSDLR2HrWGsrwixCXKx06EMXtDp2n08V0Ofo= 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=eMligWWh; 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="eMligWWh" Received: by mail-wm1-f73.google.com with SMTP id 5b1f17b1804b1-48fe6894f3fso71652635e9.2 for ; Wed, 27 May 2026 05:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779886387; x=1780491187; 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=eMligWWhWOdbjC9lpqGFwEz+x0Kjgt4eu/d9Mka3PQeG1gTr4z67g2MsehVEeRkUx7 NEHTApkLfrCouD4EOzaB48khadO7Zi9YlpNn8Ub7rvHtBM2qK/cSfRmU2zFEynykfih6 aX6J65UvKxVRMemoKDaFiHtK9bA8Y9S+uDEviPDhAl3fhzAWAME6SNg1BlS8zxzMrOsc N/+icIHwN+9jz1yghchoOSojiCfXOcmsjBrwL80pCXTN3Eyubv6XITtLELOSgwb9erUU hzmfHwt382R/Lw1+i51EJ+Jvt26wE7yQ0Jk4DHBRjiDrPuKmt0fdH3yVl3eyQKuOXQsK 6kqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779886387; x=1780491187; 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=NQq84i5Wk1K46J0uVPv0AlvkV0BGB5KOmXG4NUHdo9w6js/RPv6hCUp4rxDnqYU05G UQGiPkVBTX2TOPR9EzEAFpMTvTD4+ocnk3iM/bJzDp1hstWUDS4DrSoY2TSY6UIJU9XI rlWg2RV4Ojo6M639CJfSa3mERNFMv3O8SUgt3JLFfoUp8SiWbd1Lzva9eFbj6N9KB8/V JJQ/6+RBIbVMkqDsluEijbgaboDJjnQePVWrSitdHNqldtnlG5/Scs49NF2AslYPZ/JF D76IwPfktnRBd9Bbd+FyU9wME3kMUApN5ngKD8YP+OLKFZfJjN06c8sKfUHHDxNTfxwm kf3g== X-Forwarded-Encrypted: i=1; AFNElJ/rUO9uMrXbHvXIHRrnSufQ5K2ZMY7gWLG88SIZ8T8lBXa+bKudq314Rgb/oCu1qtJcPMB/4gFSzdsqodM=@vger.kernel.org X-Gm-Message-State: AOJu0YxPAzXsd0J41ihPLx+MMJA2k6Sftdr0C6gm671ES5S34YC5u60z XhI3PlDA84xqvCzimdZhcS4u4U84hUu9KCrxbejTm6COa40+e+B/pqVwaJYJHhjjda86gDtYYEm F9RE5em+HBVMDUAxyvQ== X-Received: from wmbjr17.prod.google.com ([2002:a05:600c:5611:b0:488:9407:fee8]) (user=sidnayyar job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:45c9:b0:490:5cb3:e94a with SMTP id 5b1f17b1804b1-4905cb3eb81mr247328625e9.2.1779886386321; Wed, 27 May 2026 05:53:06 -0700 (PDT) Date: Wed, 27 May 2026 12:52:59 +0000 In-Reply-To: <20260527-libbpf-load-vmlinux-btf-in-gen_loader-mode-v4-0-27daa15487a9@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260527-libbpf-load-vmlinux-btf-in-gen_loader-mode-v4-0-27daa15487a9@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260527-libbpf-load-vmlinux-btf-in-gen_loader-mode-v4-3-27daa15487a9@google.com> Subject: [PATCH v4 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