Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
MIME-Version: 1.0
References: <8762e91a210f4cc5713fce05fe5906c18513bd0a.1697617238.git.jstancek@redhat.com>
 <20231018122220.GB10751@lst.de>
In-Reply-To: <20231018122220.GB10751@lst.de>
From:   Jan Stancek <jstancek@redhat.com>
Date:   Wed, 18 Oct 2023 16:32:19 +0200
Message-ID: <CAASaF6xHTv6iZd5ttHOJ_M=hpjaGZOnUCGSHkbGy_yLbe2G8nw@mail.gmail.com>
Subject: Re: [PATCH] iomap: fix short copy in iomap_write_iter()
To:     Christoph Hellwig <hch@lst.de>
Cc:     djwong@kernel.org, willy@infradead.org, linux-xfs@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
        viro@zeniv.linux.org.uk
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Wed, Oct 18, 2023 at 2:22=E2=80=AFPM Christoph Hellwig <hch@lst.de> wrot=
e:
>
> On Wed, Oct 18, 2023 at 10:24:20AM +0200, Jan Stancek wrote:
> > Make next iteration retry with amount of bytes we managed to copy.
>
> The observation and logic fix look good.  But I wonder if simply
> using a goto instead of the extra variable would be a tad cleaner?
> Something like this?

Looks good to me. Would you be OK if I re-posted it as v2 with your
Signed-off-by added?


>
> ---
> diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
> index 061f3d14c12001..2d491590795aa4 100644
> --- a/fs/iomap/buffered-io.c
> +++ b/fs/iomap/buffered-io.c
> @@ -881,8 +881,10 @@ static loff_t iomap_write_iter(struct iomap_iter *it=
er, struct iov_iter *i)
>                 size_t bytes;           /* Bytes to write to folio */
>                 size_t copied;          /* Bytes copied from user */
>
> +               bytes =3D iov_iter_count(i);
> +retry:
>                 offset =3D pos & (chunk - 1);
> -               bytes =3D min(chunk - offset, iov_iter_count(i));
> +               bytes =3D min(chunk - offset, bytes);
>                 status =3D balance_dirty_pages_ratelimited_flags(mapping,
>                                                                bdp_flags)=
;
>                 if (unlikely(status))
> @@ -933,10 +935,12 @@ static loff_t iomap_write_iter(struct iomap_iter *i=
ter, struct iov_iter *i)
>                          * halfway through, might be a race with munmap,
>                          * might be severe memory pressure.
>                          */
> -                       if (copied)
> -                               bytes =3D copied;
>                         if (chunk > PAGE_SIZE)
>                                 chunk /=3D 2;
> +                       if (copied) {
> +                               bytes =3D copied;
> +                               goto retry;
> +                       }
>                 } else {
>                         pos +=3D status;
>                         written +=3D status;
>