linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marc Dionne <marc.dionne@auristor.com>
To: David Howells <dhowells@redhat.com>
Cc: linux-afs@lists.infradead.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH] afs: Fix accidental truncation when storing data
Date: Thu, 29 Jun 2023 08:27:56 -0300	[thread overview]
Message-ID: <CAB9dFdtvDuOGD5wyWMtqtgPv85QHgxvCqYac3pLi3JiAnvCSLg@mail.gmail.com> (raw)
In-Reply-To: <3526895.1687960024@warthog.procyon.org.uk>

On Wed, Jun 28, 2023 at 10:47 AM David Howells <dhowells@redhat.com> wrote:
>
>
> When an AFS FS.StoreData RPC call is made, amongst other things it is given
> the resultant file size to be.  On the server, this is processed by
> truncating the file to new size and then writing the data.
>
> Now, kafs has a lock (vnode->io_lock) that serves to serialise operations
> against a specific vnode (ie. inode), but the parameters for the op are set
> before the lock is taken.  This allows two writebacks (say sync and kswapd)
> to race - and if writes are ongoing the writeback for a later write could
> occur before the writeback for an earlier one if the latter gets
> interrupted.
>
> Note that afs_writepages() cannot take i_mutex and only takes a shared lock
> on vnode->validate_lock.
>
> Also note that the server does the truncation and the write inside a lock,
> so there's no problem at that end.
>
> Fix this by moving the calculation for the proposed new i_size inside the
> vnode->io_lock.  Also reset the iterator (which we might have read from)
> and update the mtime setting there.
>
> Fixes: bd80d8a80e12 ("afs: Use ITER_XARRAY for writing")
> Reported-by: Marc Dionne <marc.dionne@auristor.com>
> Signed-off-by: David Howells <dhowells@redhat.com>
> cc: linux-afs@lists.infradead.org
> cc: linux-fsdevel@vger.kernel.org
> ---
>  fs/afs/write.c |    8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/fs/afs/write.c b/fs/afs/write.c
> index 8750b99c3f56..c1f4391ccd7c 100644
> --- a/fs/afs/write.c
> +++ b/fs/afs/write.c
> @@ -413,17 +413,19 @@ static int afs_store_data(struct afs_vnode *vnode, struct iov_iter *iter, loff_t
>         afs_op_set_vnode(op, 0, vnode);
>         op->file[0].dv_delta = 1;
>         op->file[0].modification = true;
> -       op->store.write_iter = iter;
>         op->store.pos = pos;
>         op->store.size = size;
> -       op->store.i_size = max(pos + size, vnode->netfs.remote_i_size);
>         op->store.laundering = laundering;
> -       op->mtime = vnode->netfs.inode.i_mtime;
>         op->flags |= AFS_OPERATION_UNINTR;
>         op->ops = &afs_store_data_operation;
>
>  try_next_key:
>         afs_begin_vnode_operation(op);
> +
> +       op->store.write_iter = iter;
> +       op->store.i_size = max(pos + size, vnode->netfs.remote_i_size);
> +       op->mtime = vnode->netfs.inode.i_mtime;
> +
>         afs_wait_for_operation(op);
>
>         switch (op->error) {

Looks good to me; the traces where I got a failure indicate that an
extending store occurred in a different thread while waiting for the
io lock, so this looks like the right fix.

Reviewed-by: Marc Dionne <marc.dionne@auristor.com>

Marc

  parent reply	other threads:[~2023-06-29 11:28 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-28 13:47 [PATCH] afs: Fix accidental truncation when storing data David Howells
2023-06-28 20:15 ` Jeffrey E Altman
2023-06-29 11:27 ` Marc Dionne [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-07-04 19:22 David Howells

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=CAB9dFdtvDuOGD5wyWMtqtgPv85QHgxvCqYac3pLi3JiAnvCSLg@mail.gmail.com \
    --to=marc.dionne@auristor.com \
    --cc=dhowells@redhat.com \
    --cc=linux-afs@lists.infradead.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.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).