Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <23eddc9b078dd50f48d6bc7b0084f456dd4f1f9d.camel@kernel.org>
Subject: Re: [PATCH] NFS: Allow very small rsize & wsize again
From:   Jeff Layton <jlayton@kernel.org>
To:     Anna Schumaker <anna@kernel.org>, linux-nfs@vger.kernel.org,
        trond.myklebust@hammerspace.com
Cc:     tom@talpey.com
Date:   Thu, 01 Dec 2022 06:44:26 -0500
In-Reply-To: <20221130203047.1303804-1-anna@kernel.org>
References: <20221130203047.1303804-1-anna@kernel.org>
Content-Type: text/plain; charset="ISO-8859-15"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.46.1 (3.46.1-1.fc37) 
MIME-Version: 1.0
Precedence: bulk

On Wed, 2022-11-30 at 15:30 -0500, Anna Schumaker wrote:
> From: Anna Schumaker <Anna.Schumaker@Netapp.com>
>=20
> 940261a19508 introduced nfs_io_size() to clamp the iosize to a multiple
> of PAGE_SIZE. This had the unintended side effect of no longer allowing
> iosizes less than a page, which could be useful in some situations.
>=20
> UDP already has an exception that causes it to fall back on the
> power-of-two style sizes instead. This patch adds an additional
> exception for very small iosizes.
>=20
> Reported-by: Jeff Layton <jlayton@kernel.org>
> Fixes: 940261a19508 ("NFS: Allow setting rsize / wsize to a multiple of P=
AGE_SIZE")
> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
> ---
>  fs/nfs/internal.h | 6 ++----
>  1 file changed, 2 insertions(+), 4 deletions(-)
>=20
> diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
> index 647fc3f547cb..ae7d4a8c728c 100644
> --- a/fs/nfs/internal.h
> +++ b/fs/nfs/internal.h
> @@ -739,12 +739,10 @@ unsigned long nfs_io_size(unsigned long iosize, enu=
m xprt_transports proto)
>  		iosize =3D NFS_DEF_FILE_IO_SIZE;
>  	else if (iosize >=3D NFS_MAX_FILE_IO_SIZE)
>  		iosize =3D NFS_MAX_FILE_IO_SIZE;
> -	else
> -		iosize =3D iosize & PAGE_MASK;
> =20
> -	if (proto =3D=3D XPRT_TRANSPORT_UDP)
> +	if (proto =3D=3D XPRT_TRANSPORT_UDP || iosize < PAGE_SIZE)
>  		return nfs_block_bits(iosize, NULL);
> -	return iosize;
> +	return iosize & PAGE_MASK;
>  }
> =20
>  /*

Looks good. Thanks, Anna.

Reviewed-by: Jeff Layton <jlayton@kernel.org>