mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
mm: limit pagecache folio refcount when splicing into pipes
Similar to mapping pagecache folios into page tables, let's reject additional references when splicing folios into a pipe if the refcount is at its limit. This will prevent more cases of possible folio refcount overflows with large pagecache folios. Introduce folio_get_checked() for checked reference acquisition when the caller already holds a reference. It warns and fails on a non-positive refcount and rejects additional references at the limit. Add __folio_ref_count_over_limit() so folio_get_checked() can reuse the refcount instead of having to read it a second time. Use folio_get_checked() in splice_folio_into_pipe() and fuse_ref_folio(), returning -EFAULT on failure, like we already do for pipe-buffer duplication. Similarly, make try_get_page() use it instead. Likely try_get_page() should be renamed (or removed) later, as it doesn't match the folio_try_get() semantics and is confusing. If we hit the limit after splicing some data, return the number of bytes already spliced. Teach the callers to handle errors, and stop filemap_splice_read() if we only spliced part of a folio, so we don't skip ahead to the next folio: note that we wouldn't run into this scenario before as we always spliced the requested range. The check in try_get_page() also covers pipe-buffer duplication by tee() and partial pipe-to-pipe splicing. Note that we deliberately will not fall back to the slow path of copying the folio, particularly as the folio might have an invalid refcount. If it is ever really required, we can revisit. Fixes:800d8c63b2("shmem: add huge pages support") Fixes:99cb0dbd47("mm,thp: add read-only THP support for (non-shmem) FS") Fixes:793917d997("mm/readahead: Add large folio readahead") Cc: [email protected] Reviewed-by: Jose A. Perez de Azpillaga <[email protected]> Reviewed-by: Pedro Falcato <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: David Hildenbrand (Arm) <[email protected]>
This commit is contained in:
+3
-1
@@ -1230,7 +1230,9 @@ static int fuse_ref_folio(struct fuse_copy_state *cs, struct folio *folio,
|
||||
if (cs->nr_segs >= cs->pipe->max_usage)
|
||||
return -EIO;
|
||||
|
||||
folio_get(folio);
|
||||
if (!folio_get_checked(folio))
|
||||
return -EFAULT;
|
||||
|
||||
err = unlock_request(cs->req);
|
||||
if (err) {
|
||||
folio_put(folio);
|
||||
|
||||
+42
-9
@@ -2257,8 +2257,9 @@ bool folio_ref_count_over_limit_slowpath(const struct folio *folio,
|
||||
unsigned int ref_count);
|
||||
|
||||
/**
|
||||
* folio_ref_count_over_limit - Check whether to refuse more folio references.
|
||||
* __folio_ref_count_over_limit - Check whether to refuse more folio references.
|
||||
* @folio: The folio.
|
||||
* @ref_count: The sampled folio reference count.
|
||||
*
|
||||
* Check before adding page table mappings or other significant refcount users
|
||||
* to pagecache folios (!hugetlb), either before acquiring references or
|
||||
@@ -2272,15 +2273,27 @@ bool folio_ref_count_over_limit_slowpath(const struct folio *folio,
|
||||
*
|
||||
* Return: True if the caller should refuse the operation, false otherwise.
|
||||
*/
|
||||
static inline bool folio_ref_count_over_limit(const struct folio *folio)
|
||||
static inline bool __folio_ref_count_over_limit(const struct folio *folio,
|
||||
unsigned int ref_count)
|
||||
{
|
||||
const unsigned int ref_count = folio_ref_count(folio);
|
||||
|
||||
if (likely(ref_count < FOLIO_REF_COUNT_LIMIT))
|
||||
return false;
|
||||
return folio_ref_count_over_limit_slowpath(folio, ref_count);
|
||||
}
|
||||
|
||||
/**
|
||||
* folio_ref_count_over_limit - Check whether to refuse more folio references.
|
||||
* @folio: The folio.
|
||||
*
|
||||
* See __folio_ref_count_over_limit().
|
||||
*
|
||||
* Return: True if the caller should refuse the operation, false otherwise.
|
||||
*/
|
||||
static inline bool folio_ref_count_over_limit(const struct folio *folio)
|
||||
{
|
||||
return __folio_ref_count_over_limit(folio, folio_ref_count(folio));
|
||||
}
|
||||
|
||||
/**
|
||||
* folio_get - Increment the reference count on a folio.
|
||||
* @folio: The folio.
|
||||
@@ -2305,13 +2318,33 @@ static inline void get_page(struct page *page)
|
||||
folio_get(folio);
|
||||
}
|
||||
|
||||
/**
|
||||
* folio_get_checked - Try to acquire a reference to a live folio.
|
||||
* @folio: The folio.
|
||||
*
|
||||
* The caller must already hold a reference to @folio. Warn and fail on a
|
||||
* non-positive refcount, and refuse additional references at the limit.
|
||||
*
|
||||
* Use folio_try_get() for speculative reference acquisition where the
|
||||
* refcount can legitimately be zero.
|
||||
*
|
||||
* Return: True if the refcount was incremented, false otherwise.
|
||||
*/
|
||||
static inline __must_check bool folio_get_checked(struct folio *folio)
|
||||
{
|
||||
const int ref_count = folio_ref_count(folio);
|
||||
|
||||
if (WARN_ON_ONCE(ref_count <= 0))
|
||||
return false;
|
||||
if (unlikely(__folio_ref_count_over_limit(folio, ref_count)))
|
||||
return false;
|
||||
folio_ref_inc(folio);
|
||||
return true;
|
||||
}
|
||||
|
||||
static inline __must_check bool try_get_page(struct page *page)
|
||||
{
|
||||
page = compound_head(page);
|
||||
if (WARN_ON_ONCE(page_ref_count(page) <= 0))
|
||||
return false;
|
||||
page_ref_inc(page);
|
||||
return true;
|
||||
return folio_get_checked(page_folio(page));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+16
-10
@@ -3047,10 +3047,11 @@ generic_file_read_iter(struct kiocb *iocb, struct iov_iter *iter)
|
||||
EXPORT_SYMBOL(generic_file_read_iter);
|
||||
|
||||
/*
|
||||
* Splice subpages from a folio into a pipe.
|
||||
* Splice subpages from a folio into a pipe. Return the number of bytes spliced,
|
||||
* or -EFAULT if we cannot splice from the folio.
|
||||
*/
|
||||
size_t splice_folio_into_pipe(struct pipe_inode_info *pipe,
|
||||
struct folio *folio, loff_t fpos, size_t size)
|
||||
ssize_t splice_folio_into_pipe(struct pipe_inode_info *pipe,
|
||||
struct folio *folio, loff_t fpos, size_t size)
|
||||
{
|
||||
struct page *page;
|
||||
size_t spliced = 0, offset = offset_in_folio(folio, fpos);
|
||||
@@ -3063,13 +3064,15 @@ size_t splice_folio_into_pipe(struct pipe_inode_info *pipe,
|
||||
struct pipe_buffer *buf = pipe_head_buf(pipe);
|
||||
size_t part = min_t(size_t, PAGE_SIZE - offset, size - spliced);
|
||||
|
||||
if (!folio_get_checked(folio))
|
||||
return spliced ? spliced : -EFAULT;
|
||||
|
||||
*buf = (struct pipe_buffer) {
|
||||
.ops = &page_cache_pipe_buf_ops,
|
||||
.page = page,
|
||||
.offset = offset,
|
||||
.len = part,
|
||||
};
|
||||
folio_get(folio);
|
||||
pipe->head++;
|
||||
page++;
|
||||
spliced += part;
|
||||
@@ -3094,9 +3097,10 @@ size_t splice_folio_into_pipe(struct pipe_inode_info *pipe,
|
||||
* Return: On success, the number of bytes read will be returned and *@ppos
|
||||
* will be updated if appropriate; 0 will be returned if there is no more data
|
||||
* to be read; -EAGAIN will be returned if the pipe had no space, and some
|
||||
* other negative error code will be returned on error. A short read may occur
|
||||
* if the pipe has insufficient space, we reach the end of the data or we hit a
|
||||
* hole.
|
||||
* other negative error code will be returned on error; -EFAULT will be returned
|
||||
* if acquiring a folio reference fails and no data has been spliced.
|
||||
* A short read may occur if the pipe has insufficient space, we reach the
|
||||
* end of the data, hit a hole or hit a folio refcount limit.
|
||||
*/
|
||||
ssize_t filemap_splice_read(struct file *in, loff_t *ppos,
|
||||
struct pipe_inode_info *pipe,
|
||||
@@ -3154,7 +3158,7 @@ ssize_t filemap_splice_read(struct file *in, loff_t *ppos,
|
||||
|
||||
for (i = 0; i < folio_batch_count(&fbatch); i++) {
|
||||
struct folio *folio = fbatch.folios[i];
|
||||
size_t n;
|
||||
ssize_t n;
|
||||
|
||||
if (folio_pos(folio) >= end_offset)
|
||||
goto out;
|
||||
@@ -3170,13 +3174,15 @@ ssize_t filemap_splice_read(struct file *in, loff_t *ppos,
|
||||
|
||||
n = min_t(loff_t, len, isize - *ppos);
|
||||
n = splice_folio_into_pipe(pipe, folio, *ppos, n);
|
||||
if (!n)
|
||||
if (n <= 0) {
|
||||
error = n;
|
||||
goto out;
|
||||
}
|
||||
len -= n;
|
||||
total_spliced += n;
|
||||
*ppos += n;
|
||||
in->f_ra.prev_pos = *ppos;
|
||||
if (pipe_is_full(pipe))
|
||||
if (pipe_is_full(pipe) || *ppos < folio_next_pos(folio))
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -1274,8 +1274,8 @@ struct migration_target_control {
|
||||
/*
|
||||
* mm/filemap.c
|
||||
*/
|
||||
size_t splice_folio_into_pipe(struct pipe_inode_info *pipe,
|
||||
struct folio *folio, loff_t fpos, size_t size);
|
||||
ssize_t splice_folio_into_pipe(struct pipe_inode_info *pipe,
|
||||
struct folio *folio, loff_t fpos, size_t size);
|
||||
|
||||
static inline bool vma_is_single_threaded_private(struct vm_area_struct *vma)
|
||||
{
|
||||
|
||||
+5
-2
@@ -3744,7 +3744,8 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,
|
||||
struct inode *inode = file_inode(in);
|
||||
struct address_space *mapping = inode->i_mapping;
|
||||
struct folio *folio = NULL;
|
||||
size_t total_spliced = 0, used, npages, n, part;
|
||||
size_t total_spliced = 0, used, npages, part;
|
||||
ssize_t n;
|
||||
loff_t isize;
|
||||
int error = 0;
|
||||
|
||||
@@ -3830,8 +3831,10 @@ static ssize_t shmem_file_splice_read(struct file *in, loff_t *ppos,
|
||||
n = splice_zeropage_into_pipe(pipe, *ppos, part);
|
||||
}
|
||||
|
||||
if (!n)
|
||||
if (n <= 0) {
|
||||
error = n;
|
||||
break;
|
||||
}
|
||||
len -= n;
|
||||
total_spliced += n;
|
||||
*ppos += n;
|
||||
|
||||
Reference in New Issue
Block a user