From patchwork Tue Nov 6 14:02:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kirill Tkhai X-Patchwork-Id: 10670555 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0EDAB15A6 for ; Tue, 6 Nov 2018 14:03:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F302229BFC for ; Tue, 6 Nov 2018 14:03:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E6D5C29C3E; Tue, 6 Nov 2018 14:03:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DA57629BFC for ; Tue, 6 Nov 2018 14:03:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388542AbeKFX2X (ORCPT ); Tue, 6 Nov 2018 18:28:23 -0500 Received: from relay.sw.ru ([185.231.240.75]:41724 "EHLO relay.sw.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388509AbeKFX2X (ORCPT ); Tue, 6 Nov 2018 18:28:23 -0500 Received: from [172.16.25.169] (helo=localhost.localdomain) by relay.sw.ru with esmtp (Exim 4.90_1) (envelope-from ) id 1gK1wY-00053v-3B; Tue, 06 Nov 2018 17:02:58 +0300 Subject: [PATCH RFC] fuse: Prevent background write requests increase inode size From: Kirill Tkhai To: miklos@szeredi.hu, ktkhai@virtuozzo.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Date: Tue, 06 Nov 2018 17:02:57 +0300 Message-ID: <154151286725.17550.12307253489084032792.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi, Miklos, this is not a well-tested patch, this is a concept, showing the places, where it looks we have a problem. Commit 7879c4e58b7c made io->async careless about inode size, and this is wrong. Asyncronuos background requests may be sent to userspace after inode becomes unlocked, when background queue is throttled. In this case we execute a write request extending inode size without any protection, and this ruines everything. Fix that. Also, some write background requests do not increment fi->writectr, e.g.: fuse_direct_IO() fuse_direct_io() fuse_send_write() fuse_async_req_send() fuse_request_send_background() This is a reason fuse_sync_writes() does not work as expected. Fix that too. Signed-off-by: Kirill Tkhai --- fs/fuse/file.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index cc2121b37bf5..0b71a3c96168 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -610,6 +610,9 @@ static void fuse_aio_complete(struct fuse_io_priv *io, int err, ssize_t pos) static void fuse_aio_complete_req(struct fuse_conn *fc, struct fuse_req *req) { struct fuse_io_priv *io = req->io; + struct kiocb *iocb = io->iocb; + struct file *file = iocb->ki_filp; + struct fuse_inode *fi = get_fuse_inode(file_inode(file)); ssize_t pos = -1; fuse_release_user_pages(req, io->should_dirty); @@ -625,6 +628,12 @@ static void fuse_aio_complete_req(struct fuse_conn *fc, struct fuse_req *req) } fuse_aio_complete(io, req->out.h.error, pos); + + if (io->write) { + spin_lock(&fc->lock); + fi->writectr--; + spin_unlock(&fc->lock); + } } static size_t fuse_async_req_send(struct fuse_conn *fc, struct fuse_req *req, @@ -966,6 +975,7 @@ static size_t fuse_send_write(struct fuse_req *req, struct fuse_io_priv *io, { struct kiocb *iocb = io->iocb; struct file *file = iocb->ki_filp; + struct fuse_inode *fi = get_fuse_inode(file_inode(file)); struct fuse_file *ff = file->private_data; struct fuse_conn *fc = ff->fc; struct fuse_write_in *inarg = &req->misc.write.in; @@ -981,8 +991,12 @@ static size_t fuse_send_write(struct fuse_req *req, struct fuse_io_priv *io, inarg->lock_owner = fuse_lock_owner_id(fc, owner); } - if (io->async) + if (io->async) { + spin_lock(&fc->lock); + fi->writectr++; + spin_unlock(&fc->lock); return fuse_async_req_send(fc, req, count, io); + } fuse_request_send(fc, req); return req->misc.write.out.size; @@ -2904,8 +2918,10 @@ fuse_direct_IO(struct kiocb *iocb, struct iov_iter *iter) * We cannot asynchronously extend the size of a file. * In such case the aio will behave exactly like sync io. */ - if ((offset + count > i_size) && iov_iter_rw(iter) == WRITE) + if ((offset + count > i_size) && iov_iter_rw(iter) == WRITE) { io->blocking = true; + io->async = false; + } if (io->async && io->blocking) { /*