From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.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 4E4EE3F8712 for ; Tue, 26 May 2026 12:13:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779797587; cv=none; b=COTQ1Atm3KrgTuW7zFPC/A87gXeqC6fRKT5rjpxxWGee7eBmRjRIzftwDsS5UAFqbrxNqHkXwo8RRpP7LoFrEDLR6rmWLEPx+NxrbdR7uk4F2OrvRRRf+0m/oVZeDQPd9V4xjEE0jai2DgFju3nRJv/duYaAcCQflTjIvJ3Lfds= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779797587; c=relaxed/simple; bh=/QREukzmkE+tXyTCwaLqTcmUTEKcIpO3WmpithpQ8Hc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mjVHS86yEERIRMouv6rE7so7FieR8Zj8pVgCWwQgvvytGxDgcgu2GyAbfxargUd0AUbNRJa6yDGmU0e9tjnrDkSEqtbuHWm+6ljMtAazoFcqglPA00OKblDBbRLQQjJDgZJeRVPs7tL7F45b4hA+7wQTnarYKtRaXgKmAn1C+f8= 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=WfTxLdC8; arc=none smtp.client-ip=209.85.221.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="WfTxLdC8" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-43d7b7bacddso7217172f8f.0 for ; Tue, 26 May 2026 05:13:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1779797583; x=1780402383; 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=WfTxLdC8CSB8fHTaa1pb18DzCxa5LF0NxJOnMEil4IBBw182PqlSisipHrobaP0Ojj D1F5q49dhB6PEkGNOyF1xgXM6v48BPYV4ov6okK62yPtm1ZUDprDtXLTp3saVWY116uN K3R4ElHCWDzmyaqqupk3z4ZMBYxDXVqcwWvUc6h4vs2+KYPFEADTg3CfdOVYucdzsBDP oLxOdRmy/NvoPUYT/KlZ1+zcVruoixBE4MkmW4fTt/8TyYCF/bVgtQF0vW29bwluHos2 C4uUPMeqnbH5CX0or8kn2BAoaMcYKYGLyLR0NDOP007UsYl+hKuatLBUPMsM2R1Misz7 flfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779797583; x=1780402383; 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=cDgL4GVYeN96IuMiKNV3w3Mcm2imPyQoyJ3lw2HNxgrwOsLzGUSMaPgc8eYHJ09NDj bAAOm07oeG10O8g7mjcvoq23gtrah7Q0Gvz3bxK6rksBSxw82Qo4CBC5wVokZNp5bfjN UKHfEN9F0M+vKaGuRGoHgiQ/dz3NAjiRowmOlMJzSB5Bueni6hflYm/QRjA1YVvW2Siv j9vPsKYLCNBYy5Y1awB4sE7eNugw3PURQfmq5hQxpfC2WEPpyVxtavqEKwk0KE1LfsmS 7ZU6Y6G9txIFiyipEBI2CsGAvrwhNMAgthlR9gHBPBJeHYpSFG+OIf112AaAx0Ofs7Ay M8qw== X-Forwarded-Encrypted: i=1; AFNElJ97k6MOHi5yMgL8a0srIT3u7Lh2iCeJUB1PQt9JLZMFyMssnGIPTXTH1avBE2uGw0DypZs3tlRVNUrOtA4=@vger.kernel.org X-Gm-Message-State: AOJu0YwKI4jkdnewHiNyjTwFziXQ/DugedAOXShG9KrneBcsK7STC0RW yuD7L1p1Z164ruh/6NNFS/tQMUlJJT1v4JHNXu4qH6UtzVLcep49uMzNa2Tmao/QfHrwRUBbOKx Jhg4kZmcia46XuIRQmg== X-Received: from wrun4.prod.google.com ([2002:a5d:6604:0:b0:45a:e20e:d6ef]) (user=sidnayyar job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:4812:b0:45e:73b6:d107 with SMTP id ffacd0b85a97d-45eb38bbfc1mr30217434f8f.41.1779797583340; Tue, 26 May 2026 05:13:03 -0700 (PDT) Date: Tue, 26 May 2026 12:12:57 +0000 In-Reply-To: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v2-0-6750f5859bc6@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-v2-0-6750f5859bc6@google.com> X-Mailer: b4 0.14.3 Message-ID: <20260526-libbpf-load-vmlinux-btf-in-gen_loader-mode-v2-2-6750f5859bc6@google.com> Subject: [PATCH v2 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" 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 = 0; break; case BPF_MAP_TYPE_STRUCT_OPS: + create_attr.btf_key_type_id = 0; create_attr.btf_value_type_id = 0; break; default: -- 2.54.0.746.g67dd491aae-goog