linux-cifs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Namjae Jeon" <namjae.jeon@samsung.com>
To: "'Ronnie Sahlberg'" <lsahlber@redhat.com>
Cc: <linux-cifs@vger.kernel.org>
Subject: RE: [PATCH] cifs: only write 64kb at a time when fallocating a small region of a file
Date: Wed, 21 Jul 2021 16:21:16 +0900	[thread overview]
Message-ID: <016b01d77e00$fe61efd0$fb25cf70$@samsung.com> (raw)
In-Reply-To: <014c01d77dd3$57add320$07097960$@samsung.com>

Hi Ronnie,

> We only allow sending single credit writes through the SMB2_write() synchronous api so split this into
> smaller chunks.
> 
> Fixes: 966a3cb7c7db ("cifs: improve fallocate emulation")
> 
> Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
> ---
>  fs/cifs/smb2ops.c | 31 +++++++++++++++++++------------
>  1 file changed, 19 insertions(+), 12 deletions(-)
> 
> diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index ba3c58e1f725..7fefa100887b 100644
> --- a/fs/cifs/smb2ops.c
> +++ b/fs/cifs/smb2ops.c
> @@ -3617,7 +3617,7 @@ static int smb3_simple_fallocate_write_range(unsigned int xid,
>                                              char *buf)  {
>         struct cifs_io_parms io_parms = {0};
> -       int nbytes;
> +       int rc, nbytes;
>         struct kvec iov[2];
> 
>         io_parms.netfid = cfile->fid.netfid; @@ -3625,13 +3625,25 @@ static int
> smb3_simple_fallocate_write_range(unsigned int xid,
>         io_parms.tcon = tcon;
>         io_parms.persistent_fid = cfile->fid.persistent_fid;
>         io_parms.volatile_fid = cfile->fid.volatile_fid;
> -       io_parms.offset = off;
> -       io_parms.length = len;
> 
> -       /* iov[0] is reserved for smb header */
> -       iov[1].iov_base = buf;
> -       iov[1].iov_len = io_parms.length;
> -       return SMB2_write(xid, &io_parms, &nbytes, iov, 1);
> +       while (len) {
> +               io_parms.offset = off;
> +               io_parms.length = len;
> +               if (io_parms.length > 65536)
> +                       io_parms.length = 65536;
Minor nit, We can probably use a defined macro, SMB2_MAX_BUFFER_SIZE.

> +               /* iov[0] is reserved for smb header */
> +               iov[1].iov_base = buf;
> +               iov[1].iov_len = io_parms.length;
> +               rc = SMB2_write(xid, &io_parms, &nbytes, iov, 1);
> +               if (rc)
> +                       break;
> +               if (nbytes > len)
> +                       return -EINVAL;
> +               buf += nbytes;
> +               off += nbytes;
> +               len -= nbytes;
> +       }
> +       return rc;
>  }
> 
>  static int smb3_simple_fallocate_range(unsigned int xid, @@ -3655,11 +3667,6 @@ static int
> smb3_simple_fallocate_range(unsigned int xid,
>                         (char **)&out_data, &out_data_len);
>         if (rc)
>                 goto out;
> -       /*
> -        * It is already all allocated
> -        */
> -       if (out_data_len == 0)
> -               goto out;
Is there any reason to remove this code ?
Because xfstests generic/071 test failed against ksmbd without this code.

generic/071 files ... - output mismatch (see /home/linkinjeon/xfstests-ksmbd/results//generic/071.out.bad)
    --- tests/generic/071.out   2020-02-05 09:07:30.000000000 +0900
    +++ /home/linkinjeon/xfstests/xfstests-ksmbd/results//generic/071.out.bad 2021-07-21 15:32:18.001170684 +0900
    @@ -6,4 +6,4 @@
     *
     1000000 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
     *
    -2000000
    +4000000
    ...
    (Run 'diff -u /home/linkinjeon/xfstests-ksmbd/tests/generic/071.out /home/linkinjeon/xfstests-ksmbd/results//generic/071.out.bad'  to see the entire diff)
Ran: generic/071
Failures: generic/071
Failed 1 of 1 tests

Thanks!
> 
>         buf = kzalloc(1024 * 1024, GFP_KERNEL);
>         if (buf == NULL) {
> --
> 2.30.2



       reply	other threads:[~2021-07-21  7:27 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20210721015429epcas1p4654c2b9348101aa7967bfe60d1d8da71@epcas1p4.samsung.com>
     [not found] ` <014c01d77dd3$57add320$07097960$@samsung.com>
2021-07-21  7:21   ` Namjae Jeon [this message]
     [not found]     ` <CAGvGhF55Tq-sLUtKBn+QX6kWrL9dDzKkXFKdQ==gz3s=RkySKQ@mail.gmail.com>
2021-07-22  6:54       ` Namjae Jeon
2021-07-22  7:17         ` ronnie sahlberg
2021-07-22  7:22           ` Namjae Jeon
2021-07-22 16:44           ` Steve French
2021-07-22  4:53 Ronnie Sahlberg
  -- strict thread matches above, loose matches on Subject: below --
2021-07-21  0:50 Ronnie Sahlberg
2021-07-21  0:49 Ronnie Sahlberg

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='016b01d77e00$fe61efd0$fb25cf70$@samsung.com' \
    --to=namjae.jeon@samsung.com \
    --cc=linux-cifs@vger.kernel.org \
    --cc=lsahlber@redhat.com \
    --subject='RE: [PATCH] cifs: only write 64kb at a time when fallocating a small region of a file' \
    /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

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).