Skip to content

Commit

Permalink
gfs2: buffered write prefaulting
Browse files Browse the repository at this point in the history
In gfs2_file_buffered_write, to increase the likelihood that all the
user memory we're trying to write will be resident in memory, carry out
the write in chunks and fault in each chunk of user memory before trying
to write it.  Otherwise, some workloads will trigger frequent short
"internal" writes, causing filesystem blocks to be allocated and then
partially deallocated again when writing into holes, which is wasteful
and breaks reservations.

Neither the chunked writes nor any of the short "internal" writes are
user visible.

Signed-off-by: Andreas Gruenbacher <[email protected]>
  • Loading branch information
Andreas Gruenbacher committed May 13, 2022
1 parent 324d116 commit fa5dfa6
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions fs/gfs2/file.c
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ static inline bool should_fault_in_pages(struct iov_iter *i,
size_t count = iov_iter_count(i);
size_t size, offs;

if (likely(!count))
if (!count)
return false;
if (!iter_is_iovec(i))
return false;
Expand Down Expand Up @@ -1033,7 +1033,20 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb,
ret = gfs2_glock_nq(gh);
if (ret)
goto out_uninit;
if (should_fault_in_pages(from, iocb, &prev_count, &window_size)) {
retry_under_glock:
gfs2_holder_allow_demote(gh);
window_size -= fault_in_iov_iter_readable(from, window_size);
gfs2_holder_disallow_demote(gh);
if (!window_size) {
ret = -EFAULT;
goto out_unlock;
}
if (!gfs2_holder_queued(gh))
goto retry;
from->count = min(from->count, window_size);
}

if (inode == sdp->sd_rindex) {
struct gfs2_inode *m_ip = GFS2_I(sdp->sd_statfs_inode);

Expand All @@ -1060,17 +1073,8 @@ static ssize_t gfs2_file_buffered_write(struct kiocb *iocb,
goto out_unlock;

from->count = orig_count - written;
if (should_fault_in_pages(from, iocb, &prev_count, &window_size)) {
gfs2_holder_allow_demote(gh);
window_size -= fault_in_iov_iter_readable(from, window_size);
gfs2_holder_disallow_demote(gh);
if (window_size) {
from->count = min(from->count, window_size);
if (gfs2_holder_queued(gh))
goto retry_under_glock;
goto retry;
}
}
if (should_fault_in_pages(from, iocb, &prev_count, &window_size))
goto retry_under_glock;
out_unlock:
if (gfs2_holder_queued(gh))
gfs2_glock_dq(gh);
Expand Down

0 comments on commit fa5dfa6

Please sign in to comment.