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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6B0B0C54EBE for ; Mon, 16 Jan 2023 16:29:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233230AbjAPQ3k (ORCPT ); Mon, 16 Jan 2023 11:29:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233237AbjAPQ3L (ORCPT ); Mon, 16 Jan 2023 11:29:11 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAB4E2CFC5 for ; Mon, 16 Jan 2023 08:17:23 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 674BC61031 for ; Mon, 16 Jan 2023 16:17:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7A0F4C433F2; Mon, 16 Jan 2023 16:17:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1673885842; bh=iJrSFCoscfLs78iBUZ5kGzTPyKriwc2qqI5wV1UNaKI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eC5f/AR3Dg8BEui39KeHOkfh87aiau3MtsCFAFV3dCz1SSdZV86ZztCFHOTFL6Ve6 EflyNRKcr1vKsC0jd6zUMtZVjnFe/VGkW82GCm+HmWeom6CawfPWOmkLuIJCDnRzeS AHZGpUNpLumjqs8TFszyIJKDmMwjxYrRzUnq5ACk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, ChenXiaoSong , Trond Myklebust , Sasha Levin Subject: [PATCH 5.4 187/658] NFSv4.x: Fail client initialisation if state manager thread cant run Date: Mon, 16 Jan 2023 16:44:35 +0100 Message-Id: <20230116154918.018088964@linuxfoundation.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230116154909.645460653@linuxfoundation.org> References: <20230116154909.645460653@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Trond Myklebust [ Upstream commit b4e4f66901658fae0614dea5bf91062a5387eda7 ] If the state manager thread fails to start, then we should just mark the client initialisation as failed so that other processes or threads don't get stuck in nfs_wait_client_init_complete(). Reported-by: ChenXiaoSong Fixes: 4697bd5e9419 ("NFSv4: Fix a race in the net namespace mount notification") Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/nfs4state.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index c60b3a1f6d2b..2ee30ffeb6b9 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c @@ -1224,6 +1224,8 @@ void nfs4_schedule_state_manager(struct nfs_client *clp) if (IS_ERR(task)) { printk(KERN_ERR "%s: kthread_run: %ld\n", __func__, PTR_ERR(task)); + if (!nfs_client_init_is_complete(clp)) + nfs_mark_client_ready(clp, PTR_ERR(task)); nfs4_clear_state_manager_bit(clp); nfs_put_client(clp); module_put(THIS_MODULE); -- 2.35.1