From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA0C8C433FE for ; Wed, 6 Oct 2021 17:20:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A23C161175 for ; Wed, 6 Oct 2021 17:20:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239219AbhJFRWm (ORCPT ); Wed, 6 Oct 2021 13:22:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:52195 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238946AbhJFRWk (ORCPT ); Wed, 6 Oct 2021 13:22:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633540848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PzG9OIYXJCMtn8MVm+VRimVQcNoscZauB71pUi/vJZY=; b=GBj6itvEL7NORcy2bDrA/KXhQ0zpnJQ6R2iXTU3l09FAgIQjCEcei/Uhx/HK/6ZlenIV5Y hNpFd66oMP9/JFmbzeF/c+Sggsk2cG/AqUdysZLDIwCAGRUFwV+xFYE/zcYRn7w8vY0+S7 6npwwR65Mb1TdOYr7kTEbqHYzeTWhBE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-440-Sw7xNHnaNUKfgSXa_wv3nw-1; Wed, 06 Oct 2021 13:20:47 -0400 X-MC-Unique: Sw7xNHnaNUKfgSXa_wv3nw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id ACA14A40C1; Wed, 6 Oct 2021 17:20:45 +0000 (UTC) Received: from bcodding.csb (ovpn-66-66.rdu2.redhat.com [10.10.66.66]) by smtp.corp.redhat.com (Postfix) with ESMTP id 758B8100164A; Wed, 6 Oct 2021 17:20:45 +0000 (UTC) Received: by bcodding.csb (Postfix, from userid 24008) id E82DB1043453; Wed, 6 Oct 2021 13:20:44 -0400 (EDT) From: Benjamin Coddington To: bfields@fieldses.org, chuck.lever@oracle.com Cc: linux-nfs@vger.kernel.org Subject: [PATCH v2] NFSD: Keep existing listeners on portlist error Date: Wed, 6 Oct 2021 13:20:44 -0400 Message-Id: <547ee3794ac9678bc20ccb6ec35ba0fca5fe92f2.1633540771.git.bcodding@redhat.com> In-Reply-To: <45b916f1aa3fb7c059a574f61188a8f2f615410e.1633529847.git.bcodding@redhat.com> References: <45b916f1aa3fb7c059a574f61188a8f2f615410e.1633529847.git.bcodding@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Why V2: further testing to verify INET6 handling, fix spelling mistakes 8<------------------------------------------------------------------------ If nfsd has existing listening sockets without any processes, then an error 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(). Signed-off-by: Benjamin Coddington --- fs/nfsd/nfsctl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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, struct 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; } -- 2.30.2