moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: fuse-bpf: Add /sys/fs flags for fuse-bpf version

Browse Source 
Note that this is specific for the non-upstreamed version

Bug: 202785178
Test: cat /sys/fs/fuse/fuse_bpf_major_version
Change-Id: If23f7be3c39ca1237efc44fa7971383e8d23b075
Signed-off-by: Paul Lawrence <paullawrence@google.com>
This commit is contained in:
Paul Lawrence
2022-12-05 15:22:09 -08:00
parent 60df295c9e
commit 2b6da462a1
2 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
fs/fuse/inode.c
View File

@@ -2027,17 +2027,45 @@ static void fuse_fs_cleanup(void)
static struct kobject *fuse_kobj; static struct kobject *fuse_kobj;
/* TODO Remove this once BPF_PROG_TYPE_FUSE is upstreamed */ /*
* TODO Remove this once fuse-bpf is upstreamed
*
* The version numbers give us the ability to tune user mode behavior to the
* specific non-upstreamed version of fuse-bpf
*
* bpf_prog_type_fuse exports the bpf_prog_type_fuse 'constant', which cannot be
* constant until the code is upstreamed
*/
static ssize_t fuse_bpf_major_version_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff)
{
return sysfs_emit(buff, "%d\n", FUSE_BPF_MAJOR_VERSION);
}
static ssize_t fuse_bpf_minor_version_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff)
{
return sysfs_emit(buff, "%d\n", FUSE_BPF_MINOR_VERSION);
}
static ssize_t bpf_prog_type_fuse_show(struct kobject *kobj, static ssize_t bpf_prog_type_fuse_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buff) struct kobj_attribute *attr, char *buff)
{ {
return sysfs_emit(buff, "%d\n", BPF_PROG_TYPE_FUSE); return sysfs_emit(buff, "%d\n", BPF_PROG_TYPE_FUSE);
} }
static struct kobj_attribute fuse_bpf_major_version_attr =
__ATTR_RO(fuse_bpf_major_version);
static struct kobj_attribute fuse_bpf_minor_version_attr =
__ATTR_RO(fuse_bpf_minor_version);
static struct kobj_attribute bpf_prog_type_fuse_attr = static struct kobj_attribute bpf_prog_type_fuse_attr =
__ATTR_RO(bpf_prog_type_fuse); __ATTR_RO(bpf_prog_type_fuse);
static struct attribute *bpf_attributes[] = { static struct attribute *bpf_attributes[] = {
&fuse_bpf_major_version_attr.attr,
&fuse_bpf_minor_version_attr.attr,
&bpf_prog_type_fuse_attr.attr, &bpf_prog_type_fuse_attr.attr,
NULL, NULL,
}; };

3
include/uapi/linux/android_fuse.h
View File

@@ -10,6 +10,9 @@
#include <stdint.h> #include <stdint.h>
#endif #endif
#define FUSE_BPF_MAJOR_VERSION 1
#define FUSE_BPF_MINOR_VERSION 0
#define FUSE_ACTION_KEEP 0 #define FUSE_ACTION_KEEP 0
#define FUSE_ACTION_REMOVE 1 #define FUSE_ACTION_REMOVE 1
#define FUSE_ACTION_REPLACE 2 #define FUSE_ACTION_REPLACE 2