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;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Jeff Layton <jlayton@kernel.org>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v2 2/2] nfsd: allow disabling NFSv2 at compile time
Thread-Topic: [PATCH v2 2/2] nfsd: allow disabling NFSv2 at compile time
Thread-Index: AQHY4mUY7jHiOJ42ikuh5Uvd4y0Rpa4TCHAA
Date:   Mon, 17 Oct 2022 20:25:36 +0000
Message-ID: <0A1BE7DD-070F-4427-823A-92866DC7C9A9@oracle.com>
References: <20221017201436.487627-1-jlayton@kernel.org>
 <20221017201436.487627-2-jlayton@kernel.org>
In-Reply-To: <20221017201436.487627-2-jlayton@kernel.org>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?WMb1RDBFxFRx8epGvRCKR8w4MTf4NwLW3gATjvR4E4zaOsefmunGKHQ5qYOa?=
 =?us-ascii?Q?Y6ED4CVn/HZzZseEti1j94CVRhr5d0Ezhxnske1wS/DVSX/1a2j9nFqzpQ72?=
 =?us-ascii?Q?6tbSNWT/Ow81gtRYMCpWOd/acEoNy2aQSm6tgqN0fKQ9Evv11JOfsU35oKrM?=
 =?us-ascii?Q?28dNRmtbOXJgfibQVBEeVC5OvM9x4WQg/s6116dofua+xF31GRUdgp+Bexz1?=
 =?us-ascii?Q?z5F2RyFQCD4APs9C/vfdYE3EU5feIA2qCBEoDcDAXWLZmhg5q2eNit9EDq0a?=
 =?us-ascii?Q?VUmfcixQ5sizeR+wguPSzjQZem2nTFRDKDMejruS9tBf8zbrib6HDSQ3ZuQT?=
 =?us-ascii?Q?UFUOW4NjttQQvOyNSlzX0dscUd6KT/3mPTMWB7naC+PrwHxs8Eztwi8uGTqW?=
 =?us-ascii?Q?nh+vWS8tG/E8DoSTJOYrCasUzTOYzFoHHdg4T2CDv0mfNUvYCmOkITbuzDlw?=
 =?us-ascii?Q?zThjWlNSM9mGtBcN3Vev/h84+P2AK/fyz54D1owNlPr0NcL7aXenRmYfC99R?=
 =?us-ascii?Q?/rRbvq1RwjDBZIr2TbLku9DQfBJRbU/zSmOQ16wRWf287r7dNw88m9FUd3NT?=
 =?us-ascii?Q?fcszywcDyC5d4LqfgaH17vBxnY7CZb3bYXriurqTizEOSp/ebqWCw1cLwQxT?=
 =?us-ascii?Q?A4QXIQ7+pvWkHWtceePbZVDCpK+XPHq1xuxtdLc4r6Uf9Yx1tFFXYioxA0sA?=
 =?us-ascii?Q?Sw60O08gP1eNvZPFyi023RvfMMgXoawoM4mL0fWoYb13WOh5zaMFgwmK76vw?=
 =?us-ascii?Q?zW0bsOG/HJeabmvi/OQYyvTsRFs8q+Df69j7DVM45aNVmoyx0JzDWQx7xDxK?=
 =?us-ascii?Q?YW+DekUkosSc54IgPfY+qRDKXrgDxSBv8F62hIIwrrdPQ8MCycNK/VoctVLn?=
 =?us-ascii?Q?2SW2umwe64iIRQqkPnHqMmwZKA/7dKfRKlrTbCufjVYVyfGDTbncoFpQsD3N?=
 =?us-ascii?Q?dDcFjd4RSUILfz9z0macw+OuaQVpnHs4QR62mqdcd6wAi3rokqzYdN7F246l?=
 =?us-ascii?Q?rPpda5mDFPAPy/vrLN2721yxG4aTXhk5t4mpxHjSM0IEICajN+PaKTeKvgsr?=
 =?us-ascii?Q?837EVUK1UURh5vxlWJfHbBsD02yFYcSQOIA40gRBBsnpRqWknevrQWqoKEH6?=
 =?us-ascii?Q?jof9m2GOH/Ub/+6Xgu6YUVxzqyMT/307fFyLXoDg6dgYthLwcmz1QArPTV+/?=
 =?us-ascii?Q?uOU8uC//gPPvWV0QlxlH7qFh9yHkJkH+zxuryb8X4pCk6d8H3JveZvIprqvw?=
 =?us-ascii?Q?mozAIRWXQqkDagfPmzny3INihWAWXdx+l9Q2r8FIJ8kN/KvhOFbTK6OSPO7V?=
 =?us-ascii?Q?MoZQ4T+3dZki+cZ4sn29b8qycHN6SrcWfYXKqr6+/LvIz8zHrQRa44s0LtPM?=
 =?us-ascii?Q?aRBCYkkd6NU0HdwBahniXeYDmQVcVCvwe7i5am+xK3TbDusBEyD2ljsmE/Xt?=
 =?us-ascii?Q?2J19w8K81cCD/fzZkC8P5nWNzGpX8XS6aBRc/3SjSR+J4LyegvmDUaOPzBOi?=
 =?us-ascii?Q?04UpoH0gqIk2N+Xdy3Oywd7lH8x2Ne2ZlIka0yZIxX2zHYRhu7BokMA+Rlon?=
 =?us-ascii?Q?N/VUdF2o2m23QiFQhwnWlQKgUiZPP6qxccJUy5qbxYNTjZWkVFzfECTH133G?=
 =?us-ascii?Q?VA=3D=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-ID: <E717787DF4AEEE46AC71658811E2CA47@namprd10.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0c1eb709-05bc-43a8-5948-08dab07dbff9
X-MS-Exchange-CrossTenant-originalarrivaltime: 17 Oct 2022 20:25:36.4223
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: hpcrM7YqSvSj5OnO3VezsJ8l/Y52EWgIhevkZYr/rnkenKP70mUTiXV/oUGiaO3hphtdggfhG+NA3p5cIg7vJQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4921
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1
 definitions=2022-10-17_13,2022-10-17_02,2022-06-22_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 adultscore=0 mlxscore=0
 spamscore=0 bulkscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2209130000
 definitions=main-2210170117
X-Proofpoint-GUID: SASceCFdpp_ZgbNh8ZB-4OAvtYsRPbMU
X-Proofpoint-ORIG-GUID: SASceCFdpp_ZgbNh8ZB-4OAvtYsRPbMU
X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Oct 17, 2022, at 4:14 PM, Jeff Layton <jlayton@kernel.org> wrote:
>=20
> rpc.nfsd stopped supporting NFSv2 a year ago. Take the next logical
> step toward deprecating it and allow NFSv2 support to be compiled out.
>=20
> Add a new CONFIG_NFSD_V2 option that can be turned off and rework the
> CONFIG_NFSD_V?_ACL option dependencies. Add a description that
> discourages enabling it.
>=20
> Also, change the description of CONFIG_NFSD to state that the always-on
> version is now 3 instead of 2.

This works for me. I'll wait for more comments, but I plan
to pull this into for-next soon.


> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
> fs/nfsd/Kconfig  | 19 +++++++++++++++----
> fs/nfsd/Makefile |  5 +++--
> fs/nfsd/nfsd.h   |  3 +--
> fs/nfsd/nfssvc.c |  6 ++++++
> 4 files changed, 25 insertions(+), 8 deletions(-)
>=20
> v2: split out nfserrno move into separate patch
>    add help text to CONFIG_NFSD_V2 Kconfig option
>    don't error out in __write_versions
>=20
> diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
> index f6a2fd3015e7..7c441f2bd444 100644
> --- a/fs/nfsd/Kconfig
> +++ b/fs/nfsd/Kconfig
> @@ -8,6 +8,7 @@ config NFSD
> 	select SUNRPC
> 	select EXPORTFS
> 	select NFS_ACL_SUPPORT if NFSD_V2_ACL
> +	select NFS_ACL_SUPPORT if NFSD_V3_ACL
> 	depends on MULTIUSER
> 	help
> 	  Choose Y here if you want to allow other computers to access
> @@ -26,19 +27,29 @@ config NFSD
>=20
> 	  Below you can choose which versions of the NFS protocol are
> 	  available to clients mounting the NFS server on this system.
> -	  Support for NFS version 2 (RFC 1094) is always available when
> +	  Support for NFS version 3 (RFC 1813) is always available when
> 	  CONFIG_NFSD is selected.
>=20
> 	  If unsure, say N.
>=20
> -config NFSD_V2_ACL
> -	bool
> +config NFSD_V2
> +	bool "NFS server support for NFS version 2 (DEPRECATED)"
> 	depends on NFSD
> +	default n
> +	help
> +	  NFSv2 (RFC 1094) was the first publicly-released version of NFS.
> +	  Unless you are hosting ancient (1990's era) NFS clients, you don't
> +	  need this.
> +
> +	  If unsure, say N.
> +
> +config NFSD_V2_ACL
> +	bool "NFS server support for the NFSv2 ACL protocol extension"
> +	depends on NFSD_V2
>=20
> config NFSD_V3_ACL
> 	bool "NFS server support for the NFSv3 ACL protocol extension"
> 	depends on NFSD
> -	select NFSD_V2_ACL
> 	help
> 	  Solaris NFS servers support an auxiliary NFSv3 ACL protocol that
> 	  never became an official part of the NFS version 3 protocol.
> diff --git a/fs/nfsd/Makefile b/fs/nfsd/Makefile
> index 805c06d5f1b4..6fffc8f03f74 100644
> --- a/fs/nfsd/Makefile
> +++ b/fs/nfsd/Makefile
> @@ -10,9 +10,10 @@ obj-$(CONFIG_NFSD)	+=3D nfsd.o
> # this one should be compiled first, as the tracing macros can easily blo=
w up
> nfsd-y			+=3D trace.o
>=20
> -nfsd-y 			+=3D nfssvc.o nfsctl.o nfsproc.o nfsfh.o vfs.o \
> -			   export.o auth.o lockd.o nfscache.o nfsxdr.o \
> +nfsd-y 			+=3D nfssvc.o nfsctl.o nfsfh.o vfs.o \
> +			   export.o auth.o lockd.o nfscache.o \
> 			   stats.o filecache.o nfs3proc.o nfs3xdr.o
> +nfsd-$(CONFIG_NFSD_V2) +=3D nfsproc.o nfsxdr.o
> nfsd-$(CONFIG_NFSD_V2_ACL) +=3D nfs2acl.o
> nfsd-$(CONFIG_NFSD_V3_ACL) +=3D nfs3acl.o
> nfsd-$(CONFIG_NFSD_V4)	+=3D nfs4proc.o nfs4xdr.o nfs4state.o nfs4idmap.o =
\
> diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h
> index 09726c5b9a31..93b42ef9ed91 100644
> --- a/fs/nfsd/nfsd.h
> +++ b/fs/nfsd/nfsd.h
> @@ -64,8 +64,7 @@ struct readdir_cd {
>=20
>=20
> extern struct svc_program	nfsd_program;
> -extern const struct svc_version	nfsd_version2, nfsd_version3,
> -				nfsd_version4;
> +extern const struct svc_version	nfsd_version2, nfsd_version3, nfsd_versi=
on4;
> extern struct mutex		nfsd_mutex;
> extern spinlock_t		nfsd_drc_lock;
> extern unsigned long		nfsd_drc_max_mem;
> diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
> index bfbd9f672f59..62e473b0ca52 100644
> --- a/fs/nfsd/nfssvc.c
> +++ b/fs/nfsd/nfssvc.c
> @@ -91,8 +91,12 @@ unsigned long	nfsd_drc_mem_used;
> #if defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL)
> static struct svc_stat	nfsd_acl_svcstats;
> static const struct svc_version *nfsd_acl_version[] =3D {
> +# if defined(CONFIG_NFSD_V2_ACL)
> 	[2] =3D &nfsd_acl_version2,
> +# endif
> +# if defined(CONFIG_NFSD_V3_ACL)
> 	[3] =3D &nfsd_acl_version3,
> +# endif
> };
>=20
> #define NFSD_ACL_MINVERS            2
> @@ -116,7 +120,9 @@ static struct svc_stat	nfsd_acl_svcstats =3D {
> #endif /* defined(CONFIG_NFSD_V2_ACL) || defined(CONFIG_NFSD_V3_ACL) */
>=20
> static const struct svc_version *nfsd_version[] =3D {
> +#if defined(CONFIG_NFSD_V2)
> 	[2] =3D &nfsd_version2,
> +#endif
> 	[3] =3D &nfsd_version3,
> #if defined(CONFIG_NFSD_V4)
> 	[4] =3D &nfsd_version4,
> --=20
> 2.37.3
>=20

--
Chuck Lever