mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-10-31 16:48:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cachefiles: Fix __cachefiles_prepare_write()

Browse source 
Fix __cachefiles_prepare_write() to correctly determine whether the
requested write will fit correctly with the DIO alignment.

Reported-by: Gao Xiang <hsiangkao@linux.alibaba.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Yiqun Leng <yqleng@linux.alibaba.com>
Tested-by: Jia Zhu <zhujia.zj@bytedance.com>
cc: Jeff Layton <jlayton@kernel.org>
cc: linux-cachefs@redhat.com
cc: linux-erofs@lists.ozlabs.org
cc: linux-fsdevel@vger.kernel.org
cc: linux-mm@kvack.org
This commit is contained in:
David Howells 2024-01-02 16:28:04 +00:00
parent 80105ed2fd
commit 7097c96411
1 changed files with 17 additions and 11 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

28
fs/cachefiles/io.c
View file

@ -522,16 +522,22 @@ int __cachefiles_prepare_write(struct cachefiles_object *object,
bool no_space_allocated_yet) bool no_space_allocated_yet)
{ {
struct cachefiles_cache *cache = object->volume->cache; struct cachefiles_cache *cache = object->volume->cache;
loff_t start = *_start, pos; unsigned long long start = *_start, pos;
size_t len = *_len, down; size_t len = *_len;
int ret; int ret;
/* Round to DIO size */ /* Round to DIO size */
down = start - round_down(start, PAGE_SIZE); start = round_down(*_start, PAGE_SIZE);
*_start = start - down; if (start != *_start) {
*_len = round_up(down + len, PAGE_SIZE); kleave(" = -ENOBUFS [down]");
if (down < start || *_len > upper_len)
return -ENOBUFS; return -ENOBUFS;
}
if (*_len > upper_len) {
kleave(" = -ENOBUFS [up]");
return -ENOBUFS;
}
*_len = round_up(len, PAGE_SIZE);
/* We need to work out whether there's sufficient disk space to perform /* We need to work out whether there's sufficient disk space to perform
* the write - but we can skip that check if we have space already * the write - but we can skip that check if we have space already
@ -542,7 +548,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object,
pos = cachefiles_inject_read_error(); pos = cachefiles_inject_read_error();
if (pos == 0) if (pos == 0)
pos = vfs_llseek(file, *_start, SEEK_DATA); pos = vfs_llseek(file, start, SEEK_DATA);
if (pos < 0 && pos >= (loff_t)-MAX_ERRNO) { if (pos < 0 && pos >= (loff_t)-MAX_ERRNO) {
if (pos == -ENXIO) if (pos == -ENXIO)
goto check_space; /* Unallocated tail */ goto check_space; /* Unallocated tail */
@ -550,7 +556,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object,
cachefiles_trace_seek_error); cachefiles_trace_seek_error);
return pos; return pos;
} }
if ((u64)pos >= (u64)*_start + *_len) if (pos >= start + *_len)
goto check_space; /* Unallocated region */ goto check_space; /* Unallocated region */
/* We have a block that's at least partially filled - if we're low on /* We have a block that's at least partially filled - if we're low on
@ -563,13 +569,13 @@ int __cachefiles_prepare_write(struct cachefiles_object *object,
pos = cachefiles_inject_read_error(); pos = cachefiles_inject_read_error();
if (pos == 0) if (pos == 0)
pos = vfs_llseek(file, *_start, SEEK_HOLE); pos = vfs_llseek(file, start, SEEK_HOLE);
if (pos < 0 && pos >= (loff_t)-MAX_ERRNO) { if (pos < 0 && pos >= (loff_t)-MAX_ERRNO) {
trace_cachefiles_io_error(object, file_inode(file), pos, trace_cachefiles_io_error(object, file_inode(file), pos,
cachefiles_trace_seek_error); cachefiles_trace_seek_error);
return pos; return pos;
} }
if ((u64)pos >= (u64)*_start + *_len) if (pos >= start + *_len)
return 0; /* Fully allocated */ return 0; /* Fully allocated */
/* Partially allocated, but insufficient space: cull. */ /* Partially allocated, but insufficient space: cull. */
@ -577,7 +583,7 @@ int __cachefiles_prepare_write(struct cachefiles_object *object,
ret = cachefiles_inject_remove_error(); ret = cachefiles_inject_remove_error();
if (ret == 0) if (ret == 0)
ret = vfs_fallocate(file, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, ret = vfs_fallocate(file, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
*_start, *_len); start, *_len);
if (ret < 0) { if (ret < 0) {
trace_cachefiles_io_error(object, file_inode(file), ret, trace_cachefiles_io_error(object, file_inode(file), ret,
cachefiles_trace_fallocate_error); cachefiles_trace_fallocate_error);