NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: fuse-bpf: Ignore readaheads unless they go to the daemon

Browse source 
readpages will be triggered on the fuse fs in passthrough mode though
system calls like fadvise. If the daemon isn't aware of the file, this
will likely cause a hang.

For the moment, simply ignore fadvise in this situation

Bug: 301201239
Test: fuse_test, atest ScopedStorageDeviceTest both pass
Signed-off-by: Paul Lawrence <paullawrence@google.com>
Change-Id: I524a84aeeb1b1593e51264fcc37f7cfa66757168
This commit is contained in:
Paul Lawrence 2023-11-15 14:29:23 -08:00 • committed by Treehugger Robot
parent 354b1b716c
commit cfdfc17a46
2 changed files with 46 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fs/fuse/file.c
View file

@ -1026,6 +1026,16 @@ static void fuse_readahead(struct readahead_control *rac)
struct fuse_conn *fc = get_fuse_conn(inode); struct fuse_conn *fc = get_fuse_conn(inode);
unsigned int i, max_pages, nr_pages = 0; unsigned int i, max_pages, nr_pages = 0;
#ifdef CONFIG_FUSE_BPF
/*
* Currently no meaningful readahead is possible with fuse-bpf within
* the kernel, so unless the daemon is aware of this file, ignore this
* call.
*/
if (!get_fuse_inode(inode)->nodeid)
return;
#endif
if (fuse_is_bad(inode)) if (fuse_is_bad(inode))
return; return;

36
tools/testing/selftests/filesystems/fuse/fuse_test.c
View file

@ -2079,6 +2079,41 @@ out:
return result; return result;
} }
static int bpf_test_readahead(const char *mount_dir)
{
const char *file_name = "file";
int result = TEST_FAILURE;
int file_fd = -1;
int src_fd = -1;
int fuse_dev = -1;
TEST(file_fd = s_creat(s_path(s(ft_src), s(file_name)), 0777),
file_fd != -1);
TESTSYSCALL(fallocate(file_fd, 0, 0, 4096));
TESTSYSCALL(close(file_fd));
file_fd = -1;
TEST(src_fd = open(ft_src, O_DIRECTORY | O_RDONLY | O_CLOEXEC),
src_fd != -1);
TEST(fuse_dev = open("/dev/fuse", O_RDWR | O_CLOEXEC), fuse_dev != -1);
TESTEQUAL(mount_fuse(mount_dir, -1, src_fd, &fuse_dev), 0);
TEST(file_fd = s_open(s_path(s(mount_dir), s(file_name)), O_RDONLY),
file_fd != -1);
TESTSYSCALL(posix_fadvise(file_fd, 0, 4096, POSIX_FADV_WILLNEED));
usleep(1000);
TESTSYSCALL(close(file_fd));
file_fd = -1;
result = TEST_SUCCESS;
out:
umount(mount_dir);
close(fuse_dev);
close(src_fd);
close(file_fd);
return result;
}
static void parse_range(const char *ranges, bool *run_test, size_t tests) static void parse_range(const char *ranges, bool *run_test, size_t tests)
{ {
size_t i; size_t i;
@ -2208,6 +2243,7 @@ int main(int argc, char *argv[])
MAKE_TEST(flock_test), MAKE_TEST(flock_test),
MAKE_TEST(bpf_test_create_and_remove_bpf), MAKE_TEST(bpf_test_create_and_remove_bpf),
MAKE_TEST(bpf_test_mkdir_and_remove_bpf), MAKE_TEST(bpf_test_mkdir_and_remove_bpf),
MAKE_TEST(bpf_test_readahead),
}; };
#undef MAKE_TEST #undef MAKE_TEST