On Tue, Feb 09, 2021 at 11:01:15AM +0100, Miklos Szeredi wrote: > Hi Vivek, > > Here's an updated patch with a header comment containing all the gory details. > It's basically your patch, but it's missing your S-o-b. If you are fine with > it, can you please provide one? > > The only change I made was to clear PG_uptodate on write error, otherwise I > think the patch is fine. Hi Miklos, In general I am fine with the patch. I am still little concerned with how to handle error scenario and how to handle it best. Whether to clear Pageuptodate on error or leave it alone. Leaving it alone will more like be writeback failure scenario where many filesystems don't set dirty flag on page again if writeback fails. Can't decide whether to leave it alone is better or not. So for now, I will just go along with clearing PageUptodate on error. Can you please also put Link to this mail thread in the commit id. There are quite a few good details in this mail thread. Will be good to be able to track it back from commit. Link: https://lore.kernel.org/linux-fsdevel/4794a3fa3742a5e84fb0f934944204b55730829b.camel@xxxxxx/ With that. Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx> > > Splitting the request might cause a performance regression in some cases (lots > of unaligned writes that spill over a page boundary) but I don't have a better > idea at this moment. > > Thanks, > Miklos > ---- > > Date: Wed, 21 Oct 2020 16:12:49 -0400 > From: Vivek Goyal <vgoyal@xxxxxxxxxx> > Subject: fuse: fix write deadlock > > There are two modes for write(2) and friends in fuse: > > a) write through (update page cache, send sync WRITE request to userspace) > > b) buffered write (update page cache, async writeout later) > > The write through method kept all the page cache pages locked that were > used for the request. Keeping more than one page locked is deadlock prone > and Qian Cai demonstrated this with trinity fuzzing. > > The reason for keeping the pages locked is that concurrent mapped reads > shouldn't try to pull possibly stale data into the page cache. > > For full page writes, the easy way to fix this is to make the cached page > be the authoritative source by marking the page PG_uptodate immediately. > After this the page can be safely unlocked, since mapped/cached reads will > take the written data from the cache. > > Concurrent mapped writes will now cause data in the original WRITE request > to be updated; this however doesn't cause any data inconsistency and this > scenario should be exceedingly rare anyway. > > If the WRITE request returns with an error in the above case, currently the > page is not marked uptodate; this means that a concurrent read will always > read consistent data. After this patch the page is uptodate between > writing to the cache and receiving the error: there's window where a cached > read will read the wrong data. While theoretically this could be a > regression, it is unlikely to be one in practice, since this is normal for > buffered writes. > > In case of a partial page write to an already uptodate page the locking is > also unnecessary, with the above caveats. > > Partial write of a not uptodate page still needs to be handled. One way > would be to read the complete page before doing the write. This is not > possible, since it might break filesystems that don't expect any READ > requests when the file was opened O_WRONLY. > > The other solution is to serialize the synchronous write with reads from > the partial pages. The easiest way to do this is to keep the partial pages > locked. The problem is that a write() may involve two such pages (one head > and one tail). This patch fixes it by only locking the partial tail page. > If there's a partial head page as well, then split that off as a separate > WRITE request. > > Reported-by: Qian Cai <cai@xxxxxx> > Fixes: ea9b9907b82a ("fuse: implement perform_write") > Cc: <stable@xxxxxxxxxxxxxxx> # v2.6.26 > Signed-off-by: Miklos Szeredi <mszeredi@xxxxxxxxxx> > --- > fs/fuse/file.c | 25 +++++++++++++++---------- > fs/fuse/fuse_i.h | 1 + > 2 files changed, 16 insertions(+), 10 deletions(-) > > --- a/fs/fuse/file.c > +++ b/fs/fuse/file.c > @@ -1117,17 +1117,12 @@ static ssize_t fuse_send_write_pages(str > count = ia->write.out.size; > for (i = 0; i < ap->num_pages; i++) { > struct page *page = ap->pages[i]; > + bool page_locked = ap->page_locked && (i == ap->num_pages - 1); > > - if (!err && !offset && count >= PAGE_SIZE) > - SetPageUptodate(page); > - > - if (count > PAGE_SIZE - offset) > - count -= PAGE_SIZE - offset; > - else > - count = 0; > - offset = 0; > - > - unlock_page(page); > + if (err) > + ClearPageUptodate(page); > + if (page_locked) > + unlock_page(page); > put_page(page); > } > > @@ -1191,6 +1186,16 @@ static ssize_t fuse_fill_write_pages(str > if (offset == PAGE_SIZE) > offset = 0; > > + /* If we copied full page, mark it uptodate */ > + if (tmp == PAGE_SIZE) > + SetPageUptodate(page); > + > + if (PageUptodate(page)) { > + unlock_page(page); > + } else { > + ap->page_locked = true; > + break; > + } > if (!fc->big_writes) > break; > } while (iov_iter_count(ii) && count < fc->max_write && > --- a/fs/fuse/fuse_i.h > +++ b/fs/fuse/fuse_i.h > @@ -277,6 +277,7 @@ struct fuse_args_pages { > struct page **pages; > struct fuse_page_desc *descs; > unsigned int num_pages; > + bool page_locked; > }; > > #define FUSE_ARGS(args) struct fuse_args args = {} >
