samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ANDROID: fuse-bpf: fix wrong logic in read backing"

Browse Source 
This reverts commit cc59263d5d.

Reason for revert: Possible cause of PCMark regression (b/412837079).

Bug: 412837079
Bug: 409455146
Change-Id: Id30d88b7a7e123fb3e38cf4fea5ab5183e62f8a7
Signed-off-by: Will McVicker <willmcvicker@google.com>
This commit is contained in:
William McVicker
2025-05-29 10:36:00 -07:00
committed by Treehugger Robot
parent c1488e58c3
commit 8b5d78fb5c
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fs/fuse/backing.c
View File

@@ -799,6 +799,10 @@ int fuse_file_read_iter_initialize(
.size = to->count, .size = to->count,
}; };
fri->frio = (struct fuse_read_iter_out) {
.ret = fri->fri.size,
};
/* TODO we can't assume 'to' is a kvec */ /* TODO we can't assume 'to' is a kvec */
/* TODO we also can't assume the vector has only one component */ /* TODO we also can't assume the vector has only one component */
*fa = (struct fuse_bpf_args) { *fa = (struct fuse_bpf_args) {
@@ -833,6 +837,11 @@ int fuse_file_read_iter_backing(struct fuse_bpf_args *fa,
if (!iov_iter_count(to)) if (!iov_iter_count(to))
return 0; return 0;
if ((iocb->ki_flags & IOCB_DIRECT) &&
(!ff->backing_file->f_mapping->a_ops ||
!ff->backing_file->f_mapping->a_ops->direct_IO))
return -EINVAL;
/* TODO This just plain ignores any change to fuse_read_in */ /* TODO This just plain ignores any change to fuse_read_in */
if (is_sync_kiocb(iocb)) { if (is_sync_kiocb(iocb)) {
ret = vfs_iter_read(ff->backing_file, to, &iocb->ki_pos, ret = vfs_iter_read(ff->backing_file, to, &iocb->ki_pos,
@@ -855,13 +864,14 @@ int fuse_file_read_iter_backing(struct fuse_bpf_args *fa,
fuse_bpf_aio_cleanup_handler(aio_req); fuse_bpf_aio_cleanup_handler(aio_req);
} }
frio->ret = ret;
/* TODO Need to point value at the buffer for post-modification */ /* TODO Need to point value at the buffer for post-modification */
out: out:
fuse_file_accessed(file, ff->backing_file); fuse_file_accessed(file, ff->backing_file);
frio->ret = ret; return ret;
return ret < 0 ? ret : 0;
} }
void *fuse_file_read_iter_finalize(struct fuse_bpf_args *fa, void *fuse_file_read_iter_finalize(struct fuse_bpf_args *fa,