From: Christoph Hellwig <hch@lst.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Kent Overstreet <kent.overstreet@gmail.com>,
Matthew Wilcox <willy@infradead.org>,
linux-mm@kvack.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 06/13] mm: factor out a filemap_find_get_pages helper
Date: Sat, 31 Oct 2020 09:59:57 +0100 [thread overview]
Message-ID: <20201031090004.452516-7-hch@lst.de> (raw)
In-Reply-To: <20201031090004.452516-1-hch@lst.de>
Factor out a helper to lookup a range of contiguous pages from
generic_file_buffered_read_get_pages.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
mm/filemap.c | 47 +++++++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 20 deletions(-)
diff --git a/mm/filemap.c b/mm/filemap.c
index 9e1cc18afe1134..0af7ddaa0fe7ba 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2323,39 +2323,46 @@ static int filemap_new_page(struct kiocb *iocb, struct iov_iter *iter,
return filemap_readpage(iocb, *page);
}
+static int filemap_find_get_pages(struct kiocb *iocb, struct iov_iter *iter,
+ struct page **pages, unsigned int nr)
+{
+ struct address_space *mapping = iocb->ki_filp->f_mapping;
+ pgoff_t index = iocb->ki_pos >> PAGE_SHIFT;
+ pgoff_t last_index = (iocb->ki_pos + iter->count + PAGE_SIZE - 1) >>
+ PAGE_SHIFT;
+ int nr_pages;
+
+ nr = min_t(unsigned long, last_index - index, nr);
+ nr_pages = find_get_pages_contig(mapping, index, nr, pages);
+ if (nr_pages)
+ return nr_pages;
+
+ if (iocb->ki_flags & IOCB_NOIO)
+ return -EAGAIN;
+ page_cache_sync_readahead(mapping, &iocb->ki_filp->f_ra, iocb->ki_filp,
+ index, last_index - index);
+ return find_get_pages_contig(mapping, index, nr, pages);
+}
+
static int generic_file_buffered_read_get_pages(struct kiocb *iocb,
struct iov_iter *iter,
struct page **pages,
unsigned int nr)
{
- struct file *filp = iocb->ki_filp;
- struct address_space *mapping = filp->f_mapping;
- struct file_ra_state *ra = &filp->f_ra;
pgoff_t index = iocb->ki_pos >> PAGE_SHIFT;
- pgoff_t last_index = (iocb->ki_pos + iter->count + PAGE_SIZE-1) >> PAGE_SHIFT;
int i, j, nr_got, err = 0;
- nr = min_t(unsigned long, last_index - index, nr);
find_page:
if (fatal_signal_pending(current))
return -EINTR;
- nr_got = find_get_pages_contig(mapping, index, nr, pages);
- if (nr_got)
- goto got_pages;
-
- if (iocb->ki_flags & IOCB_NOIO)
- return -EAGAIN;
-
- page_cache_sync_readahead(mapping, ra, filp, index, last_index - index);
+ nr_got = filemap_find_get_pages(iocb, iter, pages, nr);
+ if (!nr_got) {
+ err = filemap_new_page(iocb, iter, &pages[0]);
+ if (!err)
+ nr_got = 1;
+ }
- nr_got = find_get_pages_contig(mapping, index, nr, pages);
- if (nr_got)
- goto got_pages;
- err = filemap_new_page(iocb, iter, &pages[0]);
- if (!err)
- nr_got = 1;
-got_pages:
for (i = 0; i < nr_got; i++) {
err = filemap_make_page_uptodate(iocb, iter, pages[i],
index + i, i == 0);
--
2.28.0
next prev parent reply other threads:[~2020-10-31 9:15 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-31 8:59 clean up the generic pagecache read helpers Christoph Hellwig
2020-10-31 8:59 ` [PATCH 01/13] mm: simplify generic_file_buffered_read_readpage Christoph Hellwig
2020-10-31 8:59 ` [PATCH 02/13] mm: simplify generic_file_buffered_read_pagenotuptodate Christoph Hellwig
2020-10-31 8:59 ` [PATCH 03/13] mm: lift the nowait checks into generic_file_buffered_read_pagenotuptodate Christoph Hellwig
2020-10-31 8:59 ` [PATCH 04/13] mm: handle readahead in generic_file_buffered_read_pagenotuptodate Christoph Hellwig
2020-10-31 17:06 ` Matthew Wilcox
2020-11-01 10:31 ` Christoph Hellwig
2020-11-01 10:49 ` Matthew Wilcox
2020-11-01 10:51 ` Christoph Hellwig
2020-11-01 10:51 ` Christoph Hellwig
2020-11-01 11:04 ` Matthew Wilcox
2020-11-01 11:52 ` Christoph Hellwig
2020-11-01 14:55 ` Matthew Wilcox
2020-11-02 8:18 ` Christoph Hellwig
2020-10-31 8:59 ` [PATCH 05/13] mm: simplify generic_file_buffered_read_no_cached_page Christoph Hellwig
2020-10-31 16:20 ` Matthew Wilcox
2020-10-31 16:28 ` Matthew Wilcox
2020-11-01 10:29 ` Christoph Hellwig
2020-10-31 8:59 ` Christoph Hellwig [this message]
2020-10-31 8:59 ` [PATCH 07/13] mm: refactor generic_file_buffered_read_get_pages Christoph Hellwig
2020-11-01 11:18 ` Matthew Wilcox
2020-10-31 8:59 ` [PATCH 08/13] mm: move putting the page on error out of filemap_readpage Christoph Hellwig
2020-10-31 9:00 ` [PATCH 09/13] mm: move putting the page on error out of filemap_make_page_uptodate Christoph Hellwig
2020-10-31 9:00 ` [PATCH 10/13] mm: open code readahead in filemap_new_page Christoph Hellwig
2020-11-01 11:20 ` Matthew Wilcox
2020-10-31 9:00 ` [PATCH 11/13] mm: streamline the partially uptodate checks in filemap_make_page_uptodate Christoph Hellwig
2020-11-01 11:23 ` Matthew Wilcox
2020-10-31 9:00 ` [PATCH 12/13] mm: rename generic_file_buffered_read to filemap_read Christoph Hellwig
2020-10-31 9:00 ` [PATCH 13/13] mm: simplify generic_file_read_iter Christoph Hellwig
2020-10-31 15:42 ` clean up the generic pagecache read helpers Matthew Wilcox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201031090004.452516-7-hch@lst.de \
--to=hch@lst.de \
--cc=akpm@linux-foundation.org \
--cc=kent.overstreet@gmail.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).