Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Chuck Lever III <chuck.lever@oracle.com>
To:     Benjamin Coddington <bcodding@redhat.com>
CC:     Bruce Fields <bfields@fieldses.org>,
        Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v2] NFSD: Keep existing listeners on portlist error
Thread-Topic: [PATCH v2] NFSD: Keep existing listeners on portlist error
Thread-Index: AQHXutaGygzc3bPaZEC+huYHtIMXaKvGORwA
Date:   Wed, 6 Oct 2021 17:27:10 +0000
Message-ID: <D6AB2AA2-CBED-45EE-90C3-7D4F4FFD8540@oracle.com>
References: <45b916f1aa3fb7c059a574f61188a8f2f615410e.1633529847.git.bcodding@redhat.com>
 <547ee3794ac9678bc20ccb6ec35ba0fca5fe92f2.1633540771.git.bcodding@redhat.com>
In-Reply-To: <547ee3794ac9678bc20ccb6ec35ba0fca5fe92f2.1633540771.git.bcodding@redhat.com>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?IuYTbKdYqDgETmV1iuJiQTVDOIfUkzyNjmpOEL/D2gUOloEm15HM1q/DLU4E?=
 =?us-ascii?Q?MLscQ4ZOinjn6xR3OcJsNMrrJtsmhlUAwnFOwKuti2HgtJAKRz974wcDT8KX?=
 =?us-ascii?Q?0vBy+IsATiDeKJeO9opnmrWT4WA1jIJ2j3L7w9QSAybtIyIxMoGoeqgukIU5?=
 =?us-ascii?Q?9Zt1N9PKGKyct/KKV5A/466FJpwtdP83untzbeQq7PEOE+KTSJ7pPnpzjQGs?=
 =?us-ascii?Q?6r5WsRCzBmvMoyaZZzLyIKthHGHEio8qHTSfsLX0CiT81XcGGapna92Kjv8A?=
 =?us-ascii?Q?NdEEbfUopi5tB0BOAs6WzSrWO/J1rUhdqLlCSg8BAHB84byBcneJdFrtpJun?=
 =?us-ascii?Q?K7STzg9SCRFBLxLbIgA2dvVjk04TQvhqdkWdmAPs6d4bl56cCzWXHOJstJfV?=
 =?us-ascii?Q?jUv2jCwNKjO5rYShUslg7H0CcsgbUOo0gGOGeCl7E4ywHBp5DIbCZPkwVCe5?=
 =?us-ascii?Q?gNLs9zV7dWtcfFZsxXjbv+m4L1+ecIPdjQop0ttD/mFM4jgNr/nrO7H/jduN?=
 =?us-ascii?Q?5roSM0WSGDqtBUGBHXfTGOeSxe3G/I8KBh8PV42PC4a04X97OUU8VWmNpvcM?=
 =?us-ascii?Q?Wir+x3Zg4t10P2jI215Oo8+B146Ffd2etYiOEpHcA9nfl0GsC4i0NlR1KMFX?=
 =?us-ascii?Q?Zz+SCDPy3nJ6g6XJW76V7i1YDNMQnB18Bfaqh+GsvP2OL40FljtlVVlztHvm?=
 =?us-ascii?Q?IdOO1md9aHLaaZjW1zGNJKry4xp5Cxlpb8uW/WJGmaikTR0ZsU8xKEJsUlAg?=
 =?us-ascii?Q?YyqZiVcMzyLSxrCxdozbaJ636OM+nkz9YMdW9DtQtzt88fy9AgaAXm6azIl3?=
 =?us-ascii?Q?kxC/A3558HNgtk5Mm+Bly8wHJ4GU5JqRjsdimY6Uf2hv3gF0VWO0M2tg//5a?=
 =?us-ascii?Q?DiQs8pKC4tDRic0GPtH92DYfN3R55uc2bq4rgGWATP1lUzIRGJ2TcK4zabwB?=
 =?us-ascii?Q?CyYzjzLAr/sbVKEQJI6j7Zqed45Ji5MQKCgF2IBzDxe+Gb29D2UVgoaXdhBu?=
 =?us-ascii?Q?ztjygroemg9vcCh4wQioxisNNIuYXHwqAm3RQqaAJyqjDVg+MEBv2PBt1nWz?=
 =?us-ascii?Q?N/Ev5yfYJI3olZEMeAtu3CbMM47/7cDHJIgbuE9iyFBDbVcvxA3+U1gDIced?=
 =?us-ascii?Q?iIp506oE/czQEJHTvnCjJFEx3F3rpOJ/el/7TO1w/Mw+7GiTlkgXvRSXUANx?=
 =?us-ascii?Q?6CHe9PzAFI6BaZ1p+VK1UoPOX+mTI9yJC8ZlvhFAt2g6xIom/pjCJ7qtLMcN?=
 =?us-ascii?Q?gSLY5GcUlyA6ldYxrkewyChCyuLyQKUda12tJo2cUJu2eAyVXngJsJuPc22q?=
 =?us-ascii?Q?FCk+i7Bxr4MzZ4JuoHRT783m?=
x-ms-exchange-transport-forked: True
Content-Type: text/plain; charset="us-ascii"
Content-ID: <E3426C989561D842A8896CF134DEEBDC@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: SJ0PR10MB4688.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8b3b5069-8fca-47f6-4d34-08d988ee87b6
X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 17:27:10.9095
 (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: Qjfc9+D4d3cjo4Ez4XVtR5bq1PEu3Z7EgkjXWbxQwckUvLXO3vzP/SmuXGdB+NASlqWAd7oa+e8PzIAydZWzLw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4525
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10129 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 adultscore=0
 phishscore=0 malwarescore=0 bulkscore=0 mlxlogscore=999 mlxscore=0
 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2109230001 definitions=main-2110060109
X-Proofpoint-GUID: fXLzHICWbxaRzWkFCMTkovA-eCyX0P7m
X-Proofpoint-ORIG-GUID: fXLzHICWbxaRzWkFCMTkovA-eCyX0P7m
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org


> On Oct 6, 2021, at 1:20 PM, Benjamin Coddington <bcodding@redhat.com> wro=
te:
>=20
> Why V2: further testing to verify INET6 handling, fix spelling mistakes
>=20
> 8<-----------------------------------------------------------------------=
-
>=20
> If nfsd has existing listening sockets without any processes, then an err=
or
> returned from svc_create_xprt() for an additional transport will remove
> those existing listeners.  We're seeing this in practice when userspace
> attempts to create rpcrdma transports without having the rpcrdma modules
> present before creating nfsd kernel processes.  Fix this by checking for
> existing sockets before calling nfsd_destroy().
>=20
> Signed-off-by: Benjamin Coddington <bcodding@redhat.com>

Thanks, applied to the for-next topic branch at

git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux.git


> ---
> fs/nfsd/nfsctl.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>=20
> diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
> index c2c3d9077dc5..696a217255fc 100644
> --- a/fs/nfsd/nfsctl.c
> +++ b/fs/nfsd/nfsctl.c
> @@ -793,7 +793,10 @@ static ssize_t __write_ports_addxprt(char *buf, stru=
ct net *net, const struct cr
> 		svc_xprt_put(xprt);
> 	}
> out_err:
> -	nfsd_destroy(net);
> +	if (!list_empty(&nn->nfsd_serv->sv_permsocks))
> +		nn->nfsd_serv->sv_nrthreads--;
> +	 else
> +		nfsd_destroy(net);
> 	return err;
> }
>=20
> --=20
> 2.30.2
>=20

--
Chuck Lever