xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btf: rename /sys/kernel/btf/kernel into /sys/kernel/btf/vmlinux

Browse Source 
Expose kernel's BTF under the name vmlinux to be more uniform with using
kernel module names as file names in the future.

Fixes: 341dfcf8d7 ("btf: expose BTF info through sysfs")
Suggested-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Andrii Nakryiko
2019-08-13 11:54:42 -07:00
committed by Daniel Borkmann
parent 9840a4ffcf
commit 7fd785685e
3 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
kernel/bpf/sysfs_btf.c
View File

@@ -9,30 +9,30 @@
#include <linux/sysfs.h>
/* See scripts/link-vmlinux.sh, gen_btf() func for details */
extern char __weak _binary__btf_kernel_bin_start[];
extern char __weak _binary__btf_kernel_bin_end[];
extern char __weak _binary__btf_vmlinux_bin_start[];
extern char __weak _binary__btf_vmlinux_bin_end[];
static ssize_t
btf_kernel_read(struct file *file, struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t len)
btf_vmlinux_read(struct file *file, struct kobject *kobj,
struct bin_attribute *bin_attr,
char *buf, loff_t off, size_t len)
{
memcpy(buf, _binary__btf_kernel_bin_start + off, len);
memcpy(buf, _binary__btf_vmlinux_bin_start + off, len);
return len;
}
static struct bin_attribute bin_attr_btf_kernel __ro_after_init = {
.attr = { .name = "kernel", .mode = 0444, },
.read = btf_kernel_read,
static struct bin_attribute bin_attr_btf_vmlinux __ro_after_init = {
.attr = { .name = "vmlinux", .mode = 0444, },
.read = btf_vmlinux_read,
};
static struct kobject *btf_kobj;
static int __init btf_kernel_init(void)
static int __init btf_vmlinux_init(void)
{
int err;
if (!_binary__btf_kernel_bin_start)
if (!_binary__btf_vmlinux_bin_start)
return 0;
btf_kobj = kobject_create_and_add("btf", kernel_kobj);
@@ -42,10 +42,10 @@ static int __init btf_kernel_init(void)
return err;
}
bin_attr_btf_kernel.size = _binary__btf_kernel_bin_end -
_binary__btf_kernel_bin_start;
bin_attr_btf_vmlinux.size = _binary__btf_vmlinux_bin_end -
_binary__btf_vmlinux_bin_start;
return sysfs_create_bin_file(btf_kobj, &bin_attr_btf_kernel);
return sysfs_create_bin_file(btf_kobj, &bin_attr_btf_vmlinux);
}
subsys_initcall(btf_kernel_init);
subsys_initcall(btf_vmlinux_init);