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:     Bruce Fields <bfields@fieldses.org>
CC:     Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
        Benjamin Coddington <bcodding@redhat.com>
Subject: Re: [PATCH] NFSD: Keep existing listners on portlist error
Thread-Topic: [PATCH] NFSD: Keep existing listners on portlist error
Thread-Index: AQHXur0BoBZXTWQOvUety6Va3DckV6vGBaoA
Date:   Wed, 6 Oct 2021 14:22:21 +0000
Message-ID: <4D02F6E6-3BA3-4000-9254-FFD565946F99@oracle.com>
References: <45b916f1aa3fb7c059a574f61188a8f2f615410e.1633529847.git.bcodding@redhat.com>
In-Reply-To: <45b916f1aa3fb7c059a574f61188a8f2f615410e.1633529847.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?Tv+WhUA3iwISFs04dX3qVK6HBtQdf+Canv3qk9M9LiVFKoQPeQJ97EG8bVDv?=
 =?us-ascii?Q?bWcCI6q2Z3oW8NVbPYf6LU6Jxz/6CFD169VoR6w/9T4eCajxVSinVZ/vOmFx?=
 =?us-ascii?Q?K5wTOyKDplYcdVbmX0+M57OOaP0oZFgeUMkZkKCpGDEOjRZwE0HfzjYkm3V4?=
 =?us-ascii?Q?zsBeX6SBU50aU/KoXgWyvEY6Jg48yRL08kNeXaXb8ipn/++QbyDrcxpfuWd7?=
 =?us-ascii?Q?3XFUKIcBTCHQt1os60AJUWcqbfo5E+0/1PKrBJ2w2zgVySpUcdGFH5qywJTv?=
 =?us-ascii?Q?OC2kq4wr9mGXbRjlji9gdGfvrfGwChYQQtGiueTwpGLBZBvj9T3gOzw/rn9j?=
 =?us-ascii?Q?6zw1yV8+lWwRl9h6C/JtmQV7sEAICSb1CMMxKf4WbBwZIyTSbA/4XVDK3hIs?=
 =?us-ascii?Q?N7LPhEbTgPSU7MYPVqutdUIgbYiyr5GkEVYYx3fIP/GEb0xhjfD9NrmmrQVF?=
 =?us-ascii?Q?7LXm6fkKTO6i7/2XNrFuhcwwQr+lZ5OsLmWnfxWlbEfUAG2yiWm5YFViyI3o?=
 =?us-ascii?Q?6AnvwAvn9GcD3FOV8wl0m6h/fo1CczLMsvJdDRyHAzKr1rZZlyHzMRNqx0kM?=
 =?us-ascii?Q?zThVIf2PzxKtDXy5IHWXmZNmoBXwnR+RKTwq9bbAbFT7rU3f+ZUSJJHdFpyi?=
 =?us-ascii?Q?OLVmNQHAT/a7iFBwkKnRHljmmbq+hgC4u/cxETBKUrH1GRd7im0B79JEh9HX?=
 =?us-ascii?Q?6jZwPsiuSkQ7/qRV1+G8fqPgMrigz4GBLTqQkF2Gopl9QDJRiU15s7A4ch+P?=
 =?us-ascii?Q?DeO1b+WeTbBcZOhZndt6csPAZ3y52GLFs01NoaYKv8bNeZH4A8kgvL6ixM+Y?=
 =?us-ascii?Q?lJQdKtfAdDZRzAyPLS0pHgjwiptq5hvvVAt4r33l/2bqZlvIM694kdlnzP21?=
 =?us-ascii?Q?ArW2gR1UAFvRv58rlsnsWYba4Wk6sgv2yAuEQg5BxiwZu3o9mologjF9FTFe?=
 =?us-ascii?Q?id9Jz9y+xL/jFYv4SgJEJxm9XldKQH/oOMJcp+/nQltjtdGd80/C2QU7kziy?=
 =?us-ascii?Q?TtPmFq9NcdTXSyxVIyaLr3hzRhMZGPTox3Uh1Xa4uY6m9drE/h6QCkS6oVp2?=
 =?us-ascii?Q?vLFyJNuRCWXZLYnGCUIrWcY0XJ8ryKPO9sdrmRIWQsAQkHvGF9HHVqgo9dFD?=
 =?us-ascii?Q?28Hoi8MoElBdYTO/xnjnecAjkRMsn4C3xswwmJz3CziBDV/5p3K9pNen3KPy?=
 =?us-ascii?Q?bNztaOrnTal8TGegs6BotjOOQsFa22v+Ta0fKHZPo87U8lbYHaOE9IDOUiso?=
 =?us-ascii?Q?iA8bTi2hVCeSMdZQG7nB6z76ZNwyNL8L2eZlxwgmtUSG4K9eSgDLJYrIMAiW?=
 =?us-ascii?Q?1YFpm49jFzIOVmqc3KSFSU/V?=
x-ms-exchange-transport-forked: True
Content-Type: text/plain; charset="us-ascii"
Content-ID: <079B9918B1AF3C4FA1646D634276D47F@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: 0218769f-d4ed-4354-3d57-08d988d4b61b
X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Oct 2021 14:22:21.8452
 (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: pEjThKMSehfifb8RCYM6t6CFpy2Mylou66ian7VJdXqZPWZYtlXUbpsA/p5dszG0AeJmPiZOOF7NugeooBsCEQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR10MB4624
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10128 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 adultscore=0 phishscore=0
 spamscore=0 mlxscore=0 mlxlogscore=999 suspectscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001
 definitions=main-2110060090
X-Proofpoint-GUID: ryqLsc_X3AH1NcGxF2Z_AtGT79VN7WJj
X-Proofpoint-ORIG-GUID: ryqLsc_X3AH1NcGxF2Z_AtGT79VN7WJj
Precedence: bulk
List-ID: <linux-nfs.vger.kernel.org>
X-Mailing-List: linux-nfs@vger.kernel.org

Bruce, if this looks OK to you I can push it via 5.15-rc


> On Oct 6, 2021, at 10:18 AM, Benjamin Coddington <bcodding@redhat.com> wr=
ote:
>=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 callingn nfsd_destroy().
>=20
> Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
> ---
> 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..df4613a4924c 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))
> +		nfsd_destroy(net);
> +	else
> +		nn->nfsd_serv->sv_nrthreads--;
> 	return err;
> }
>=20
> --=20
> 2.30.2
>=20

--
Chuck Lever