On Tue, Feb 07, 2017 at 08:09:53PM +0900, takafumi-sslab wrote:
>
> On 2017/02/07 1:34, Liu Bo wrote:
>
> >
> > One thing to add, we still need to check whether page has writeback bit before
> > end_page_writeback.
>
> Ok, I add PageWriteback check before end_page_writeback.
>
> > > > > > > > > > > > Looks like commit 55e3bd2e0c2e1 also has the same problem although I
> > > > > > > > > > > > gave it my reviewed-by.
>
> I also add PageWriteback check in write_one_eb.
>
> Finally, the diff becomes like below.
> Is it Ok ?
>
> ---
>
> diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> index 4ac383a..aa1908a 100644
> --- a/fs/btrfs/extent_io.c
> +++ b/fs/btrfs/extent_io.c
> @@ -3445,8 +3445,11 @@ static noinline_for_stack int
> __extent_writepage_io(struct inode *inode,
> bdev, &epd->bio, max_nr,
> end_bio_extent_writepage,
> 0, 0, 0, false);
> - if (ret)
> + if (ret) {
> SetPageError(page);
> + if (PageWriteback(page))
> + end_page_writeback(page);
> + }
>
> cur = cur + iosize;
> pg_offset += iosize;
> @@ -3767,7 +3770,8 @@ static noinline_for_stack int write_one_eb(struct
> extent_buffer *eb,
> epd->bio_flags = bio_flags;
> if (ret) {
> set_btree_ioerr(p);
> - end_page_writeback(p);
> + if (PageWriteback(p))
> + end_page_writeback(p);
> if (atomic_sub_and_test(num_pages - i, &eb->io_pages))
> end_extent_buffer_writeback(eb);
> ret = -EIO;
>
> ---
>
Looks good, could you please make a comment for the if statement in your
commit log so that others could know why we put it?
Since you've got a reproducer, baking it into a fstests case is also
welcome.
Thanks,
-liubo
>
> Sincerely,
>
> -takafumi
>
>
> >
> > Thanks,
> >
> > -liubo
> >
> > >
> > > Reviewed-by: Liu Bo <bo.li.liu@xxxxxxxxxx>
> > >
> > > Thanks,
> > >
> > > -liubo
> > > >
> > > > Sincerely,
> > > >
> > > > -takafumi
> > > > >
> > > > > So I don't think the patch is necessary for now.
> > > > >
> > > > > But as I said, the fact (nr == 0 or 1) would be changed if the
> > > > > subpagesize blocksize is supported.
> > > > >
> > > > > Thanks,
> > > > >
> > > > > -liubo
> > > > >
> > > > > > Sincerely,
> > > > > >
> > > > > > -takafumi
> > > > > > > Thanks,
> > > > > > >
> > > > > > > -liubo
> > > > > > > > Sincerely,
> > > > > > > >
> > > > > > > > On 2017/01/31 5:09, Liu Bo wrote:
> > > > > > > > > On Fri, Jan 13, 2017 at 03:12:31PM +0900, takafumi-sslab wrote:
> > > > > > > > > > Thanks for your replying.
> > > > > > > > > >
> > > > > > > > > > I understand this bug is more complicated than I expected.
> > > > > > > > > > I classify error cases under submit_extent_page() below
> > > > > > > > > >
> > > > > > > > > > A: ENOMEM error at btrfs_bio_alloc() in submit_extent_page()
> > > > > > > > > > I first assumed this case and sent the mail.
> > > > > > > > > > When bio_ret is NULL, submit_extent_page() calls btrfs_bio_alloc().
> > > > > > > > > > Then, btrfs_bio_alloc() may fail and submit_extent_page() returns -ENOMEM.
> > > > > > > > > > In this case, bio_endio() is not called and the page's writeback bit
> > > > > > > > > > remains.
> > > > > > > > > > So, there is a need to call end_page_writeback() in the error handling.
> > > > > > > > > >
> > > > > > > > > > B: errors under submit_one_bio() of submit_extent_page()
> > > > > > > > > > Errors that occur under submit_one_bio() handles at bio_endio(), and
> > > > > > > > > > bio_endio() would call end_page_writeback().
> > > > > > > > > >
> > > > > > > > > > Therefore, as you mentioned in the last mail, simply adding
> > > > > > > > > > end_page_writeback() like my last email and commit 55e3bd2e0c2e1 can
> > > > > > > > > > conflict in the case of B.
> > > > > > > > > > To avoid such conflict, one easy solution is adding PageWriteback() check
> > > > > > > > > > too.
> > > > > > > > > >
> > > > > > > > > > How do you think of this solution?
> > > > > > > > > (sorry for the late reply.)
> > > > > > > > >
> > > > > > > > > I think its caller, "__extent_writepage", has covered the above case
> > > > > > > > > by setting page writeback again.
> > > > > > > > >
> > > > > > > > > Thanks,
> > > > > > > > >
> > > > > > > > > -liubo
> > > > > > > > > > Sincerely,
> > > > > > > > > >
> > > > > > > > > > On 2016/12/22 15:20, Liu Bo wrote:
> > > > > > > > > > > On Fri, Dec 16, 2016 at 03:41:50PM +0900, Takafumi Kubota wrote:
> > > > > > > > > > > > This is actually inspired by Filipe's patch(55e3bd2e0c2e1).
> > > > > > > > > > > >
> > > > > > > > > > > > When submit_extent_page() in __extent_writepage_io() fails,
> > > > > > > > > > > > Btrfs misses clearing a writeback bit of the failed page.
> > > > > > > > > > > > This causes the false under-writeback page.
> > > > > > > > > > > > Then, another sync task hangs in filemap_fdatawait_range(),
> > > > > > > > > > > > because it waits the false under-writeback page.
> > > > > > > > > > > >
> > > > > > > > > > > > CPU0 CPU1
> > > > > > > > > > > >
> > > > > > > > > > > > __extent_writepage_io()
> > > > > > > > > > > > ret = submit_extent_page() // fail
> > > > > > > > > > > >
> > > > > > > > > > > > if (ret)
> > > > > > > > > > > > SetPageError(page)
> > > > > > > > > > > > // miss clearing the writeback bit
> > > > > > > > > > > >
> > > > > > > > > > > > sync()
> > > > > > > > > > > > ...
> > > > > > > > > > > > filemap_fdatawait_range()
> > > > > > > > > > > > wait_on_page_writeback(page);
> > > > > > > > > > > > // wait the false under-writeback page
> > > > > > > > > > > >
> > > > > > > > > > > > Signed-off-by: Takafumi Kubota <takafumi.kubota1012@xxxxxxxxxxxxxxxxxxxx>
> > > > > > > > > > > > ---
> > > > > > > > > > > > fs/btrfs/extent_io.c | 4 +++-
> > > > > > > > > > > > 1 file changed, 3 insertions(+), 1 deletion(-)
> > > > > > > > > > > >
> > > > > > > > > > > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
> > > > > > > > > > > > index 1e67723..ef9793b 100644
> > > > > > > > > > > > --- a/fs/btrfs/extent_io.c
> > > > > > > > > > > > +++ b/fs/btrfs/extent_io.c
> > > > > > > > > > > > @@ -3443,8 +3443,10 @@ static noinline_for_stack int __extent_writepage_io(struct inode *inode,
> > > > > > > > > > > > bdev->bio, max_nr,
> > > > > > > > > > > > end_bio_extent_writepage,
> > > > > > > > > > > > 0, 0, 0, false);
> > > > > > > > > > > > - if (ret)
> > > > > > > > > > > > + if (ret) {
> > > > > > > > > > > > SetPageError(page);
> > > > > > > > > > > > + end_page_writeback(page);
> > > > > > > > > > > > + }
> > > > > > > > > > > OK...this could be complex as we don't know which part in
> > > > > > > > > > > submit_extent_page gets the error, if the page has been added into bio
> > > > > > > > > > > and bio_end would call end_page_writepage(page) as well, so whichever
> > > > > > > > > > > comes later, the BUG() in end_page_writeback() would complain.
> > > > > > > > > > >
> > > > > > > > > > > Looks like commit 55e3bd2e0c2e1 also has the same problem although I
> > > > > > > > > > > gave it my reviewed-by.
> > > > > > > > > > >
> > > > > > > > > > > Thanks,
> > > > > > > > > > >
> > > > > > > > > > > -liubo
> > > > > > > > > > >
> > > > > > > > > > > > cur = cur + iosize;
> > > > > > > > > > > > pg_offset += iosize;
> > > > > > > > > > > > --
> > > > > > > > > > > > 1.9.3
> > > > > > > > > > > >
> > > > > > > > > > > > --
> > > > > > > > > > > > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> > > > > > > > > > > > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > > > > > > > > > > > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > > > > > > > > > --
> > > > > > > > > > Keio University
> > > > > > > > > > System Software Laboratory
> > > > > > > > > > Takafumi Kubota
> > > > > > > > > > takafumi.kubota1012@xxxxxxxxxxxxxxxxx
> > > > > > > > > >
> > > > > > > > --
> > > > > > > > Keio University
> > > > > > > > System Software Laboratory
> > > > > > > > Takafumi Kubota
> > > > > > > > takafumi.kubota1012@xxxxxxxxxxxxxxxxx
> > > > > > > >
> > > > > > --
> > > > > > Keio University
> > > > > > System Software Laboratory
> > > > > > Takafumi Kubota
> > > > > > takafumi.kubota1012@xxxxxxxxxxxxxxxxx
> > > > > >
> > > >
> > > > --
> > > > Keio University
> > > > System Software Laboratory
> > > > Takafumi Kubota
> > > > takafumi.kubota1012@xxxxxxxxxxxxxxxxx
> > > >
> > > --
> > > To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
> > > the body of a message to majordomo@xxxxxxxxxxxxxxx
> > > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
> --
> Keio University
> System Software Laboratory
> Takafumi Kubota
> takafumi.kubota1012@xxxxxxxxxxxxxxxxx
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
