From: Dave Chinner <david@fromorbit.com>
To: Matthew Wilcox <willy@infradead.org>
Cc: linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, linux-erofs@lists.ozlabs.org
Subject: Re: [PATCH 07/12] erofs: Convert uncompressed files from readpages to readahead
Date: Wed, 29 Jan 2020 11:57:41 +1100 [thread overview]
Message-ID: <20200129005741.GJ18610@dread.disaster.area> (raw)
In-Reply-To: <20200125013553.24899-8-willy@infradead.org>
On Fri, Jan 24, 2020 at 05:35:48PM -0800, Matthew Wilcox wrote:
> From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
>
> Use the new readahead operation in erofs. Fix what I believe to be
> a refcounting bug in the error case.
>
> Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
> Cc: linux-erofs@lists.ozlabs.org
> ---
> fs/erofs/data.c | 34 ++++++++++++++--------------------
> fs/erofs/zdata.c | 2 +-
> include/trace/events/erofs.h | 6 +++---
> 3 files changed, 18 insertions(+), 24 deletions(-)
>
> diff --git a/fs/erofs/data.c b/fs/erofs/data.c
> index fc3a8d8064f8..335c1ab05312 100644
> --- a/fs/erofs/data.c
> +++ b/fs/erofs/data.c
> @@ -280,42 +280,36 @@ static int erofs_raw_access_readpage(struct file *file, struct page *page)
> return 0;
> }
>
> -static int erofs_raw_access_readpages(struct file *filp,
> +static unsigned erofs_raw_access_readahead(struct file *file,
> struct address_space *mapping,
> - struct list_head *pages,
> + pgoff_t start,
> unsigned int nr_pages)
> {
> erofs_off_t last_block;
> struct bio *bio = NULL;
> - gfp_t gfp = readahead_gfp_mask(mapping);
> - struct page *page = list_last_entry(pages, struct page, lru);
>
> - trace_erofs_readpages(mapping->host, page, nr_pages, true);
> + trace_erofs_readpages(mapping->host, start, nr_pages, true);
>
> for (; nr_pages; --nr_pages) {
> - page = list_entry(pages->prev, struct page, lru);
> + struct page *page = readahead_page(mapping, start++);
>
> prefetchw(&page->flags);
> - list_del(&page->lru);
>
> - if (!add_to_page_cache_lru(page, mapping, page->index, gfp)) {
> - bio = erofs_read_raw_page(bio, mapping, page,
> - &last_block, nr_pages, true);
> + bio = erofs_read_raw_page(bio, mapping, page, &last_block,
> + nr_pages, true);
>
> - /* all the page errors are ignored when readahead */
> - if (IS_ERR(bio)) {
> - pr_err("%s, readahead error at page %lu of nid %llu\n",
> - __func__, page->index,
> - EROFS_I(mapping->host)->nid);
> + /* all the page errors are ignored when readahead */
> + if (IS_ERR(bio)) {
> + pr_err("%s, readahead error at page %lu of nid %llu\n",
> + __func__, page->index,
> + EROFS_I(mapping->host)->nid);
>
> - bio = NULL;
> - }
> + bio = NULL;
> + put_page(page);
> }
>
> - /* pages could still be locked */
> put_page(page);
A double put_page() on error?
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
next prev parent reply other threads:[~2020-01-29 0:57 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-25 1:35 [PATCH 00/12] Change readahead API Matthew Wilcox
2020-01-25 1:35 ` [PATCH 01/12] mm: Fix the return type of __do_page_cache_readahead Matthew Wilcox
2020-01-25 1:35 ` [PATCH 02/12] readahead: Ignore return value of ->readpages Matthew Wilcox
2020-01-25 1:35 ` [PATCH 03/12] readahead: Put pages in cache earlier Matthew Wilcox
2020-01-25 19:44 ` Matthew Wilcox
2020-01-25 1:35 ` [PATCH 04/12] mm: Add readahead address space operation Matthew Wilcox
2020-01-25 3:57 ` Randy Dunlap
2020-02-01 0:25 ` Matthew Wilcox
2020-01-29 0:24 ` Dave Chinner
2020-01-30 8:00 ` Matthew Wilcox
2020-01-25 1:35 ` [PATCH 05/12] fs: Convert mpage_readpages to mpage_readahead Matthew Wilcox
2020-01-25 1:35 ` [PATCH 06/12] btrfs: Convert from readpages to readahead Matthew Wilcox
2020-01-29 0:46 ` Dave Chinner
2020-01-30 8:09 ` Matthew Wilcox
2020-01-31 2:17 ` Dave Chinner
2020-01-25 1:35 ` [PATCH 07/12] erofs: Convert uncompressed files " Matthew Wilcox
2020-01-25 1:53 ` Gao Xiang
2020-01-25 19:09 ` Matthew Wilcox
2020-01-29 0:57 ` Dave Chinner [this message]
2020-01-30 8:10 ` Matthew Wilcox
2020-01-25 1:35 ` [PATCH 08/12] erofs: Convert compressed " Matthew Wilcox
2020-01-25 1:35 ` [PATCH 09/12] ext4: Convert " Matthew Wilcox
2020-01-25 1:35 ` [PATCH 10/12] f2fs: " Matthew Wilcox
2020-01-25 1:35 ` [PATCH 11/12] fuse: " Matthew Wilcox
2020-01-29 1:08 ` Dave Chinner
2020-01-30 21:35 ` Matthew Wilcox
2020-01-31 2:19 ` Dave Chinner
2020-01-29 10:50 ` Miklos Szeredi
2020-01-30 7:26 ` Matthew Wilcox
2020-01-25 1:35 ` [PATCH 12/12] iomap: " Matthew Wilcox
2020-01-29 1:38 ` Dave Chinner
2020-01-31 9:44 ` Matthew Wilcox
2020-02-13 4:38 ` [PATCH 00/12] Change readahead API Andrew Morton
2020-02-13 13:43 ` 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=20200129005741.GJ18610@dread.disaster.area \
--to=david@fromorbit.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@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).