From patchwork Mon May 5 18:38:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenz Bauer X-Patchwork-Id: 888352 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 20D7F26D4CD for ; Mon, 5 May 2025 18:39:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746470385; cv=none; b=cVFCWdKaPK/teqZrZVFD6Wq+lZGxP+8mLjy6MALkxvVYAzABmmXTCTzOLSH/S7CHN+6536fL5TQ7sslPnPFETD0alwr7DCvz9sSDkTVunckwuNh1SvYp2FIlxbHmvFC96ODJ9eztICMUBYuijOe24EV++AimLbY9kyLrskxraWs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746470385; c=relaxed/simple; bh=ZClhDwB5pKTOs2/ZgKiqPI5f9N+Z5HIqj+FZtgA9DiM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UaMr3PpCSmQoVeiRao87qqnV3scbiDQWLnhNURlkvlRf+WvqMc6vRPmNbiEHGmbW2xKQy0QsOMjPwyVLEgwBB8t89PWc+0HSNnME5Xt1Gg4035/jnb8kW/2YhlhJ57uTEQ0DL0MjeJojkjdwgaMnhSVy0jCpFZprVJh48PV4xRk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=isovalent.com; spf=pass smtp.mailfrom=isovalent.com; dkim=pass (2048-bit key) header.d=isovalent.com header.i=@isovalent.com header.b=Pw6op1kV; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=isovalent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isovalent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=isovalent.com header.i=@isovalent.com header.b="Pw6op1kV" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-39c0e0bc733so4560124f8f.1 for ; Mon, 05 May 2025 11:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent.com; s=google; t=1746470381; x=1747075181; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=eRFMs6tsARxEnBbmhIs7BbWLHMkMmA06v2O0FY8OvzE=; b=Pw6op1kV2XvmGZ2CtyJAhTuDnhbYOhJgX9LsTlZoNtM+k/mcewNs17ywS5+U9MxLZb nexq0UP/jHUjRgwtXx0tr5VsK8hPp53njSQRJNlnD3s+qnTJqEfJ4zzAoPlLQMzUZNcV jIUIEhfE+xe7LwwkyN0mMXFHz+roSSzir72nvuQorU2vOuqXDAHwXiXbcezzkq6/vfSh LAkWJ6C3AXASplBwHo0yeIR0uJxHh/g2a1V2WShS9dijBY7pr7LY5Q6DOdi+upFz39D4 68dFho3ebUD8NQHow1LHAS+79LCUIcNQ3ESEYRTnjOkgKWc9wyolOisOH1yZY0j3Dp4G SyUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746470381; x=1747075181; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eRFMs6tsARxEnBbmhIs7BbWLHMkMmA06v2O0FY8OvzE=; b=H8lpeZcEn7X6oVkvFjjE79Vx0cQaXbByErEKxmcN1j7GTgy/Ir1wMQxVPSaNtiHtqU OQgEaxBTwJgcL2x1jgnc7Pg+bfj+AoU8zDWeOaYzA/KILp+qcd5rCYN3/KJ4X3Uylbf/ 57A+rShgO2BKusBcshZVcLJkrG6N6X4UpU/HaCx+bw91GKiSozsaeRq4Eb3GNCnetSkG QSW3v+CxYeDDBsOJ7hrfmsIzqGUKmX+CWd2Me1ENTI/R3dUrWu1woS2AOuQadrFqmggb GZ5n3ti1vBfbbexQwKyt8ohuqo0YPQDOVpC3vGoQynE1W6mOf2dVNNxqrfu1AbuloNgM L6rQ== X-Forwarded-Encrypted: i=1; AJvYcCUAnQ5mjNCkTzozLy69RhnW93WLtpMT7NCqPpz3iZ0metnyW1vukqgYncFEnExBO3wku16anVFNbXpwgl7fUqw=@vger.kernel.org X-Gm-Message-State: AOJu0YwxwWmdVF0C33M+mVylG0Tucd/LCnu1zLCy/Z4LItA6oMkJD3+v WBTcuDEJMQaSz5JG4RHMfQiQH/+tjnqJXn4dEQbUU0LymmBIgM76Je1pjP1gBYU= X-Gm-Gg: ASbGncv4S0vWQiVjWNXSzML5MO+LlyiQEZB750Xs+wbq+N1dzacLj4TWJwdJFX+DFki 1qnjt2mB6xpauRVQ7cYYdURyy/QXDNrh7Gbja4g4M+lFrXPQ5qW/owyo5KWttcL86bJEWB5bcp3 gmvAJUA+i2KmnGvm+p4IC3vZmdYJNX/MSTIhkt2hV8iyVpXYYPZNun9Sguxp+JRzXX7rnrbiiJf oNOEowMLNZHXIuXZNegyFCcEiP4nfI60oI2gxzsuOMM4dG7d4RUJIru5zNl4Vu4RRySAhFc6CM2 RIHB64lAD3mzFWHcbOxb04/Hm/MsNhtwMTxDAHBM7GqjnV7CHh2j8xAw1+BUxJBaHLEyFBswald P2jq/sc+SSOnROWHlb7zLIQMULc14vyaF55Vj X-Google-Smtp-Source: AGHT+IETFDMIX2vSVQRWaZR0sw5Q/4vDACHJukED/hYw/JW8aw+9tSZ25bM1BT52bl+76K67jrDsNQ== X-Received: by 2002:a05:6000:2204:b0:39c:2665:2c13 with SMTP id ffacd0b85a97d-3a0ac3eb32cmr60486f8f.54.1746470380849; Mon, 05 May 2025 11:39:40 -0700 (PDT) Received: from [192.168.1.240] (0.0.6.0.0.0.0.0.0.0.0.0.0.0.0.0.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff::600]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099ae8117sm11328877f8f.56.2025.05.05.11.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 11:39:40 -0700 (PDT) From: Lorenz Bauer Date: Mon, 05 May 2025 19:38:43 +0100 Subject: [PATCH bpf-next v3 1/3] btf: allow mmap of vmlinux btf Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250505-vmlinux-mmap-v3-1-5d53afa060e8@isovalent.com> References: <20250505-vmlinux-mmap-v3-0-5d53afa060e8@isovalent.com> In-Reply-To: <20250505-vmlinux-mmap-v3-0-5d53afa060e8@isovalent.com> To: Arnd Bergmann , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Lorenz Bauer X-Mailer: b4 0.14.2 User space needs access to kernel BTF for many modern features of BPF. Right now each process needs to read the BTF blob either in pieces or as a whole. Allow mmaping the sysfs file so that processes can directly access the memory allocated for it in the kernel. Signed-off-by: Lorenz Bauer --- include/asm-generic/vmlinux.lds.h | 3 ++- kernel/bpf/sysfs_btf.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 58a635a6d5bdf0c53c267c2a3d21a5ed8678ce73..1750390735fac7637cc4d2fa05f96cb2a36aa448 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -667,10 +667,11 @@ defined(CONFIG_AUTOFDO_CLANG) || defined(CONFIG_PROPELLER_CLANG) */ #ifdef CONFIG_DEBUG_INFO_BTF #define BTF \ + . = ALIGN(PAGE_SIZE); \ .BTF : AT(ADDR(.BTF) - LOAD_OFFSET) { \ BOUNDED_SECTION_BY(.BTF, _BTF) \ } \ - . = ALIGN(4); \ + . = ALIGN(PAGE_SIZE); \ .BTF_ids : AT(ADDR(.BTF_ids) - LOAD_OFFSET) { \ *(.BTF_ids) \ } diff --git a/kernel/bpf/sysfs_btf.c b/kernel/bpf/sysfs_btf.c index 81d6cf90584a7157929c50f62a5c6862e7a3d081..37278d7f38ae72f2d7efcfa859e86aaf12e39a25 100644 --- a/kernel/bpf/sysfs_btf.c +++ b/kernel/bpf/sysfs_btf.c @@ -7,14 +7,51 @@ #include #include #include +#include +#include +#include /* See scripts/link-vmlinux.sh, gen_btf() func for details */ extern char __start_BTF[]; extern char __stop_BTF[]; +static int btf_sysfs_vmlinux_mmap(struct file *filp, struct kobject *kobj, + const struct bin_attribute *attr, + struct vm_area_struct *vma) +{ + unsigned long pages = PAGE_ALIGN(attr->size) >> PAGE_SHIFT; + size_t vm_size = vma->vm_end - vma->vm_start; + unsigned long addr = (unsigned long)attr->private; + int i, err = 0; + + if (addr != (unsigned long)__start_BTF || !PAGE_ALIGNED(addr)) + return -EINVAL; + + if (vma->vm_pgoff) + return -EINVAL; + + if (vma->vm_flags & (VM_WRITE | VM_EXEC | VM_MAYSHARE)) + return -EACCES; + + if (vm_size >> PAGE_SHIFT > pages) + return -EINVAL; + + vm_flags_mod(vma, VM_DONTDUMP, VM_MAYEXEC | VM_MAYWRITE); + + for (i = 0; i < pages && !err; i++, addr += PAGE_SIZE) + err = vm_insert_page(vma, vma->vm_start + i * PAGE_SIZE, + virt_to_page(addr)); + + if (err) + zap_vma_pages(vma); + + return err; +} + static struct bin_attribute bin_attr_btf_vmlinux __ro_after_init = { .attr = { .name = "vmlinux", .mode = 0444, }, .read_new = sysfs_bin_attr_simple_read, + .mmap = btf_sysfs_vmlinux_mmap, }; struct kobject *btf_kobj; From patchwork Mon May 5 18:38:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenz Bauer X-Patchwork-Id: 888351 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 38A6626F452 for ; Mon, 5 May 2025 18:39:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746470386; cv=none; b=osUWXiig7UBNJT1cr/8n2iU8RXzmFTnC1KRZX/UijI1mI6tqYT3uHHmCUQXFK70ss4hA4uJez5Wmz4vC57HS00hxFh+LSGQeGDCjPXl+usw2Sp9G7+vJGMyHSjDk8ya1HcTS60LLCipmJYNx91aOWD4aGLU9Q07OuhFF/EZKGtE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746470386; c=relaxed/simple; bh=CztS+KUwtw99mOFMGWop7TTlPlQPx0Dh4oY50Ajoq88=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=beGGBMOcylZdUG0ZOfCLyPwLToYAXO9tm4pqN4GW9QORmw3mvsD2Z9bWCdyB1RhIY7gckZEL9zYh/HRu2JFBeWNCTBlTESrAkkFl51CUkEXDP7uBQSHmYqGQft9WD7FMHbnpt4UTysVHusa3Qbm9ibpPXYcq5U5FQojP5So3bQQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=isovalent.com; spf=pass smtp.mailfrom=isovalent.com; dkim=pass (2048-bit key) header.d=isovalent.com header.i=@isovalent.com header.b=iiTwDxYY; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=isovalent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isovalent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=isovalent.com header.i=@isovalent.com header.b="iiTwDxYY" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43cf3192f3bso45446425e9.1 for ; Mon, 05 May 2025 11:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent.com; s=google; t=1746470381; x=1747075181; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=OzNe6C0edsjyIWPceeV4C4p+25KcQZ/7bKBRPqQnHyY=; b=iiTwDxYY4ymP7BQOSu5mxaqnasgJaQdF3cqryvZ/dRTGG5nDgk6AAEgZ1FHEbw46J6 HicIP7thkUanFXMxBkFdMajvwBFtV5+0PY5QEAMw3q6ELKBoKj1hqSfWsVYY4pRRJ4ga dIRv/n0TP0YTJfDJN6CglfVNLO9Z53H60+o5hQE0UiIoOHlMrGwsF5qOdsBRS0HpXEgt vb5LRK+3+Iak5+t3Rz576OdRUfvqao2SRbqwDot0x6mzS0bx+AjVeHcA6Me6DEF5iquA K4io8QAaGH1TljgXNermtvZVbcmFBzagwN3AuwPhowHlU7Z80A4DyPv1swdyuT341r9n 7X9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746470381; x=1747075181; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OzNe6C0edsjyIWPceeV4C4p+25KcQZ/7bKBRPqQnHyY=; b=Q4NPpEJBCUh0IYzGPzeBQYJWxgGHRIvyQ3h0xrhCLu5XIAyvZY6+iXmqxHKfyOtp0a fCA6HC2kl6p0nUdNjDVyJ/3RUjb/td+wx63uV6FZtPRIb8jz+6nIl4MPZRNvyeDIf3pn pDrl9ojh6bSW4VBe7r6TFfrvKkDueWYhlohbYj6W+PXv7Uqw5L97PT8bHMB9tl9Wd9gI 66zC5oYrNgVoEC8mKrLxuf9w+cGDpd49wFHEJ0uTgmSUgsUyxVbc72ekc8jcT3AIKhIM WHQHdTZ1oUob7jJwndk0ALzwNSXpAqFN2CAU8aXQ6Q9STirSNgYor9X2DqwaCeFHqitH Rkmg== X-Forwarded-Encrypted: i=1; AJvYcCXoAG+cA4BgODtglfgtw2xesjq1ZxLkf8m7PW5bFMcAkPd6OoDXrtENWwubMr+BQYe47GsWujKTW/IgZikiz9s=@vger.kernel.org X-Gm-Message-State: AOJu0Ywxlcy2+Wko8SwGvOA1+cW6qmYmbLpTVuk4S4oaUDK6sIB59oFv Uf6yT01j7E2C7u6BbfkS90TcXnEKFbnJSgFtURLmCIani2iH/sYs8lJ8M5G2O5M= X-Gm-Gg: ASbGncsajnjTBk8xhz1Z2+Z6/7J6e9mkFKB3/PhciQQ6/9lpPXYP+JefNbIIW59u4kh qHTSAYnSkLyI99tQv2Q1KpRKD8uU+zw/2LstMLt0zQWoi5TuQ8Yjpz+XpXjkFZ1AEggTi2qDqG+ cyby0uktSD2WB+kWvppSaCHjtGxIIfDtK7dPhZkSfnubHfiZAGXazJ8/bDpwCI7MjaD7w22cHA0 KYPFxf9NgUt839dnJM8S1ebpCPDZJMAiET6mrftu7Zmt/H8v5MeOJIl7d7J81cKK4mZQ6rpB+yW 4hzZfL4yl+igwXEA3ymSRrqBmPWE6yHKmSQyMBUcxeEg6GKwOL3l6tnXyQd0O3pDL1IZ/5lhSOx y1mttA3m82hy1DWTylcFVFrPzfREDMS7/70+c X-Google-Smtp-Source: AGHT+IGwUA9SurKLxWLh45mHH6adoDU7MQ2Biah9osWdbgtkUBvKKSZQdOCU6OvgAcD3Wg09VVAOEA== X-Received: by 2002:a05:6000:18ae:b0:3a0:aa06:1d8d with SMTP id ffacd0b85a97d-3a0aa061dafmr1084271f8f.46.1746470381511; Mon, 05 May 2025 11:39:41 -0700 (PDT) Received: from [192.168.1.240] (0.0.6.0.0.0.0.0.0.0.0.0.0.0.0.0.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff::600]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099ae8117sm11328877f8f.56.2025.05.05.11.39.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 11:39:41 -0700 (PDT) From: Lorenz Bauer Date: Mon, 05 May 2025 19:38:44 +0100 Subject: [PATCH bpf-next v3 2/3] selftests: bpf: add a test for mmapable vmlinux BTF Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250505-vmlinux-mmap-v3-2-5d53afa060e8@isovalent.com> References: <20250505-vmlinux-mmap-v3-0-5d53afa060e8@isovalent.com> In-Reply-To: <20250505-vmlinux-mmap-v3-0-5d53afa060e8@isovalent.com> To: Arnd Bergmann , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Lorenz Bauer X-Mailer: b4 0.14.2 Add a basic test for the ability to mmap /sys/kernel/btf/vmlinux. Since libbpf doesn't have an API to parse BTF from memory we do some basic sanity checks ourselves. Signed-off-by: Lorenz Bauer --- tools/testing/selftests/bpf/prog_tests/btf_sysfs.c | 83 ++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/btf_sysfs.c b/tools/testing/selftests/bpf/prog_tests/btf_sysfs.c new file mode 100644 index 0000000000000000000000000000000000000000..3319cf758897d46cefa8ca25e16acb162f4e9889 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/btf_sysfs.c @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause +/* Copyright (c) 2025 Isovalent */ + +#include +#include +#include +#include +#include +#include + +static void test_btf_mmap_sysfs(const char *path, struct btf *base) +{ + struct stat st; + __u64 btf_size, end; + void *raw_data = NULL; + int fd = -1; + long page_size; + struct btf *btf = NULL; + + page_size = sysconf(_SC_PAGESIZE); + if (!ASSERT_GE(page_size, 0, "get_page_size")) + goto cleanup; + + if (!ASSERT_OK(stat(path, &st), "stat_btf")) + goto cleanup; + + btf_size = st.st_size; + end = (btf_size + page_size - 1) / page_size * page_size; + + fd = open(path, O_RDONLY); + if (!ASSERT_GE(fd, 0, "open_btf")) + goto cleanup; + + raw_data = mmap(NULL, btf_size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + if (!ASSERT_EQ(raw_data, MAP_FAILED, "mmap_btf_writable")) + goto cleanup; + + raw_data = mmap(NULL, btf_size, PROT_READ, MAP_SHARED, fd, 0); + if (!ASSERT_EQ(raw_data, MAP_FAILED, "mmap_btf_shared")) + goto cleanup; + + raw_data = mmap(NULL, end + 1, PROT_READ, MAP_PRIVATE, fd, 0); + if (!ASSERT_EQ(raw_data, MAP_FAILED, "mmap_btf_invalid_size")) + goto cleanup; + + raw_data = mmap(NULL, end, PROT_READ, MAP_PRIVATE, fd, 0); + if (!ASSERT_NEQ(raw_data, MAP_FAILED, "mmap_btf")) + goto cleanup; + + if (!ASSERT_EQ(mprotect(raw_data, btf_size, PROT_READ | PROT_WRITE), -1, + "mprotect_writable")) + goto cleanup; + + if (!ASSERT_EQ(mprotect(raw_data, btf_size, PROT_READ | PROT_EXEC), -1, + "mprotect_executable")) + goto cleanup; + + /* Check padding is zeroed */ + for (int i = btf_size; i < end; i++) { + if (((__u8 *)raw_data)[i] != 0) { + PRINT_FAIL("tail of BTF is not zero at page offset %d\n", i); + goto cleanup; + } + } + + btf = btf__new_split(raw_data, btf_size, base); + if (!ASSERT_NEQ(btf, NULL, "parse_btf")) + goto cleanup; + +cleanup: + if (raw_data && raw_data != MAP_FAILED) + munmap(raw_data, btf_size); + if (btf) + btf__free(btf); + if (fd >= 0) + close(fd); +} + +void test_btf_sysfs(void) +{ + if (test__start_subtest("vmlinux")) + test_btf_mmap_sysfs("/sys/kernel/btf/vmlinux", NULL); +} From patchwork Mon May 5 18:38:45 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenz Bauer X-Patchwork-Id: 887649 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 339FE26F463 for ; Mon, 5 May 2025 18:39:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746470386; cv=none; b=Ul/gluHI8QIFBtcN1FbZ2YKrRRPkxJ+rE9/vcaHDvKq5YSinPZth8jZDe+raViDcmCtbJbQbUIOnTAaCdOGFtQK5VuRnIRSmu4moPQlu36uD08DdOjIORtHCGqal4M9sDFL9/7ydW2F2U/9S+MIvf5qKTOt4SNeQ3iEF56oT510= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746470386; c=relaxed/simple; bh=up9a1YM4tArFppHFNdrFADc8/CKFM14Jqw3tI56B5t0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cIhEhisYDUabL/AQ/nd+E6n3EsKqw0oxqyj5bq1wmefaHdt6vSEC/yHZf9aj6jkbmE6Y7S73cGq9NVoL1bXmhkgv+Ic/jPpwmnMekAmMlkOZ9Q9R1Ab+wLdymLhSLVsje3ZTyifJ8N5YnOUH/X1RkLt87hs+S7fn70CzOcinck0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=isovalent.com; spf=pass smtp.mailfrom=isovalent.com; dkim=pass (2048-bit key) header.d=isovalent.com header.i=@isovalent.com header.b=Ez5ZNQhB; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=isovalent.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=isovalent.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=isovalent.com header.i=@isovalent.com header.b="Ez5ZNQhB" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-39129fc51f8so3044342f8f.0 for ; Mon, 05 May 2025 11:39:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=isovalent.com; s=google; t=1746470382; x=1747075182; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=qvnaQmeST1mheRYMccMqZNEEW84cIcZjY0Sub0+nVyg=; b=Ez5ZNQhB2DPtSJ/ev1UVhohZo9QZBU6MvtM5gk7cYrJ55DfwwTb3fa7h1ulvav6xsD 2hJ3Bb85POmNr2B1OmJz03iY6iOA+w6aHUHwG734N2TpRTuvKMPyBq4QXQN5Q5yWxavb Odzg0h5CmFR/qMdNtSfZ0Y7rG/Tcl0sHRMXnE/OXemN+EQq+GpZsN198oOBDxUJguWHO K9jekQtMIVjIYCi1zcSOVRJGoXCGgCPszScJWyklfV5bzxMOPmnNvHiTnOAMicltDlCl xLJieyIHaP3U9UlTgmV0fu7Cq0wwSZj2GxOCK/AC/6RrYanfVr2uOQevurx8qDr5o+H9 9PFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746470382; x=1747075182; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qvnaQmeST1mheRYMccMqZNEEW84cIcZjY0Sub0+nVyg=; b=fjRflfWVBuaQL/pldVKnOn7KzJ1GRHdiLj0dqVA8MQkuT9Lq6YsrcE0Y0J92V/VVV1 v50/wHSTPhWzqHMNezbDYafbZS3NTfL5L02o93PiFBLl+eZHG8QKn0wximsVEjYFjwtd 0xfrIwwuvZF9Ic3CQrtiMPOPT4uph2zs/MXDxahMh3rwHDT0/9nExMBfjeeebv2IJlKR 5EQyExs0fyrQ/k/JBmAF2kpasVC47jWYqA5/mpXT/tVjm0EIYqEinl/6NpPqHtyumsQi 9jF4LkkmT9kizgnWWte6DGkqYEHJ5V4k8KEr1JVF3JDYbJ8aNKQ80qeRo0QDOnALO/ct cc3w== X-Forwarded-Encrypted: i=1; AJvYcCXseDEO7YqB9ZxkbqX1ZMTa+39nqPBTHx2Zqa5l5UE8tKe/95GeHwb9I3blfVKrq1ADEncsVyi2YYq12XutzEU=@vger.kernel.org X-Gm-Message-State: AOJu0YxJQYrxWj5vlEEdVm9vEdLtBNL+sL/tlJHJptie1tbOH9HQRMJP wgKHNmpH5QKQ4BVn57y+rNxDKFxuc5IW1qNPcC1hV4qf12GunL/to1ANf5VlATw= X-Gm-Gg: ASbGnct60+ITRAmB/3RE54JlSAl7od1dyXiz1oa2px+SL/8GhIN3EhLjrLH9yZpnkmS qcfdQ8wYOjuSvM1RO5eowwY342uqiwiaTl8Ml2YV0pYIKtwQlfIws2RJ5zM6YYW6VPcG+s4RZLj /dE9HaqDVzVW2B+ccOR2QRHfd0LrH/3OMyNwlckTyz4iCk/nM34x5EK9boibhbg4I4oAww8EN/C wTnY4uCI4OAjk/sHgtAsh7cyNhZ/tU4WyhmeShIDnLKFG1Jr1Wbm42wBjZApTrziifqayo6+g4q GT2c8WbETLJOQVqHFabNB2Ae/d6L051bjs0rl2ECadKGcsJjqYXRdxnPI8PU3WSlDWabx1MDOQ4 sajtnNd681+UMepfqg1d3PYmZoIFJ4KXSIdqp X-Google-Smtp-Source: AGHT+IGaP9tNm2c0RziJEdBKRZpIsFJ5xqDJC0msO6dFV0yZufxPJ59rvap8ssGSpPlqeWLjv0NnQA== X-Received: by 2002:a05:6000:1887:b0:38f:4acd:975c with SMTP id ffacd0b85a97d-3a09fd96325mr7274351f8f.27.1746470382270; Mon, 05 May 2025 11:39:42 -0700 (PDT) Received: from [192.168.1.240] (0.0.6.0.0.0.0.0.0.0.0.0.0.0.0.0.f.f.6.2.a.5.a.7.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:7a5a:26ff::600]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a099ae8117sm11328877f8f.56.2025.05.05.11.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 May 2025 11:39:42 -0700 (PDT) From: Lorenz Bauer Date: Mon, 05 May 2025 19:38:45 +0100 Subject: [PATCH bpf-next v3 3/3] libbpf: Use mmap to parse vmlinux BTF from sysfs Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250505-vmlinux-mmap-v3-3-5d53afa060e8@isovalent.com> References: <20250505-vmlinux-mmap-v3-0-5d53afa060e8@isovalent.com> In-Reply-To: <20250505-vmlinux-mmap-v3-0-5d53afa060e8@isovalent.com> To: Arnd Bergmann , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan Cc: linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, Lorenz Bauer X-Mailer: b4 0.14.2 Teach libbpf to use mmap when parsing vmlinux BTF from /sys. We don't apply this to fall-back paths on the regular file system because there is no way to ensure that modifications underlying the MAP_PRIVATE mapping are not visible to the process. Signed-off-by: Lorenz Bauer --- tools/lib/bpf/btf.c | 83 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 72 insertions(+), 11 deletions(-) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index b7513d4cce55b263310c341bc254df6364e829d9..3006c1ebb97ed899eb519b10927491d87ccdaca5 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -120,6 +121,9 @@ struct btf { /* whether base_btf should be freed in btf_free for this instance */ bool owns_base; + /* whether raw_data is a (read-only) mmap */ + bool raw_data_is_mmap; + /* BTF object FD, if loaded into kernel */ int fd; @@ -951,6 +955,17 @@ static bool btf_is_modifiable(const struct btf *btf) return (void *)btf->hdr != btf->raw_data; } +static void btf_free_raw_data(struct btf *btf) +{ + if (btf->raw_data_is_mmap) { + munmap(btf->raw_data, btf->raw_size); + btf->raw_data_is_mmap = false; + } else { + free(btf->raw_data); + } + btf->raw_data = NULL; +} + void btf__free(struct btf *btf) { if (IS_ERR_OR_NULL(btf)) @@ -970,7 +985,7 @@ void btf__free(struct btf *btf) free(btf->types_data); strset__free(btf->strs_set); } - free(btf->raw_data); + btf_free_raw_data(btf); free(btf->raw_data_swapped); free(btf->type_offs); if (btf->owns_base) @@ -1030,7 +1045,7 @@ struct btf *btf__new_empty_split(struct btf *base_btf) return libbpf_ptr(btf_new_empty(base_btf)); } -static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf) +static struct btf *btf_new_no_copy(void *data, __u32 size, struct btf *base_btf) { struct btf *btf; int err; @@ -1050,12 +1065,7 @@ static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf) btf->start_str_off = base_btf->hdr->str_len; } - btf->raw_data = malloc(size); - if (!btf->raw_data) { - err = -ENOMEM; - goto done; - } - memcpy(btf->raw_data, data, size); + btf->raw_data = data; btf->raw_size = size; btf->hdr = btf->raw_data; @@ -1081,6 +1091,24 @@ static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf) return btf; } +static struct btf *btf_new(const void *data, __u32 size, struct btf *base_btf) +{ + struct btf *btf; + void *raw_data; + + raw_data = malloc(size); + if (!raw_data) + return ERR_PTR(-ENOMEM); + + memcpy(raw_data, data, size); + + btf = btf_new_no_copy(raw_data, size, base_btf); + if (IS_ERR(btf)) + free(raw_data); + + return btf; +} + struct btf *btf__new(const void *data, __u32 size) { return libbpf_ptr(btf_new(data, size, NULL)); @@ -1354,6 +1382,37 @@ struct btf *btf__parse_raw_split(const char *path, struct btf *base_btf) return libbpf_ptr(btf_parse_raw(path, base_btf)); } +static struct btf *btf_parse_raw_mmap(const char *path, struct btf *base_btf) +{ + struct stat st; + void *data; + struct btf *btf; + int fd; + + fd = open(path, O_RDONLY); + if (fd < 0) + return libbpf_err_ptr(-errno); + + if (fstat(fd, &st) < 0) { + close(fd); + return libbpf_err_ptr(-errno); + } + + data = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); + close(fd); + + if (data == MAP_FAILED) + return NULL; + + btf = btf_new_no_copy(data, st.st_size, base_btf); + if (!btf) + munmap(data, st.st_size); + else + btf->raw_data_is_mmap = true; + + return btf; +} + static struct btf *btf_parse(const char *path, struct btf *base_btf, struct btf_ext **btf_ext) { struct btf *btf; @@ -1659,8 +1718,7 @@ struct btf *btf__load_from_kernel_by_id(__u32 id) static void btf_invalidate_raw_data(struct btf *btf) { if (btf->raw_data) { - free(btf->raw_data); - btf->raw_data = NULL; + btf_free_raw_data(btf); } if (btf->raw_data_swapped) { free(btf->raw_data_swapped); @@ -5290,7 +5348,10 @@ struct btf *btf__load_vmlinux_btf(void) pr_warn("kernel BTF is missing at '%s', was CONFIG_DEBUG_INFO_BTF enabled?\n", sysfs_btf_path); } else { - btf = btf__parse(sysfs_btf_path, NULL); + btf = btf_parse_raw_mmap(sysfs_btf_path, NULL); + if (IS_ERR_OR_NULL(btf)) + btf = btf__parse(sysfs_btf_path, NULL); + if (!btf) { err = -errno; pr_warn("failed to read kernel BTF from '%s': %s\n",