Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795062097; b=E6zEF2Nr61H9co+C8erm24uk9Y4nnS12JLHFMEOckjmFeZJ5dy0lPv5UQKRWfbwL5W0C lqNrQoTr8VMFMIpvL94faBMPgrl8IeR/G9tpOn25ir2SHa9Of4a92X5NuvLSW/NL8iLog L8kAW88PzZDgd+nC18DoPcZ5vS+n9VitidQbe3SDOwS08Rukt56gcoJCZ41Wio5/bBAQk 2beeP0YixShUdRsd5yXc1cS3LyTA7x8GWhrxSo3mx14hfPf+BDvbp5boa8CYxpId0aWTC g2RENB3eX0sUFf+qeMoqU9K3NuahraLhTE+xAizq/sX4ix4RNMdXsQrNFLaO85etS/g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795062097; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=zoOe7AWKJwb1MSi1LOXROq3PsdeTcWhT5STJ+idu83g=; b=ettPNR9sBdfiwCyjKVb2uPmuBxoAohRM8XayDFAo9zoC4QEX3AUbwBUNGQvbYzbb1U7q 0B9JTuc3Uzq7wx21YkDSXakby0B9M4nTrHXdsSy7IJZ9yd+Dw9u7iUWaqxVBoBILvDBFE 90xvK44wpgE01NmilkEyptqoEJFsVvKOW8z+b5jkvHDCWe53eGeb9dPw0Ie/VLsw+BN02 gydPhIVYFduHtHx95xM+V/xh7MHCC6mpTEu0TQGcHbTpIYSRDAVIARidlyQ+wn1U3XLuP AgizwO4XKNIalQbdVjHKngIq1bF8xtJZMLaqDnVMrDMc2RhXqtC3kDoCiVkwsSM/KFw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=HM1Yark1; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F34A6606A320; Thu, 19 Nov 2026 04:21:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=HM1Yark1 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4E99F1F000C4; Thu, 19 Nov 2026 04:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795062096; bh=zoOe7AWKJwb1MSi1LOXROq3PsdeTcWhT5STJ+idu83g=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HM1Yark1/p+QxypYkZGuaj7PeqNE6u6RVYy71xf60jhuq4sPZKE8sZEMqW+Dm/vEa K7rJZQuBDOiThZhwhqUWTfETONUpgjogIYNuetuZOgTxgM3FiPAEMAwEZcvfOSx8X5 SiThwCPRs+u/dKj/iMPRwEBUhZg0b6vm5zWcq7y8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Oleg Nesterov , Allison Henderson , Paolo Abeni , Sasha Levin Subject: [PATCH 5.10 1789/1848] net/rds: do not initialize transports after rds_init() failed Date: Wed, 18 Nov 2026 16:03:47 +0100 Message-ID: <20261118150034.200250579@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Allison Henderson [ Upstream commit ffbbc315b8b883a1c0e131fb3186b9428d2812aa ] rds, rds_rdma and rds_tcp each have their own module_init(). When they are built in, those run in link order, so rds_init() goes first, but do_initcalls() does not stop when it fails. The transports then initialize against a core that has already been torn down: rds_wq has been destroyed, yet rds_ib_dev_put(), rds_ib_unregister_client() and rds_tcp_accept_work() still queue onto or flush it, and rds_trans_register() hands the transports to a core whose socket family may never have been registered. This was seen with CONFIG_SYSCTL=n, where rds_sysctl_init() failed and rds_ib_init()'s error path then flushed the freed rds_wq [1], but any rds_init() failure after rds_threads_init() has the same effect. Record whether rds_init() succeeded and have rds_rdma_init() and rds_tcp_init() bail out with -ENODEV otherwise. Modular builds are unaffected: the transports need symbols exported by rds.ko, so they cannot be loaded unless rds_init() succeeded. [1] https://lore.kernel.org/oe-lkp/202610190310.9737b2e3-lkp@intel.com Fixes: 55b7ed0b582f ("RDS: Common RDMA transport code") Fixes: 70041088e3b9 ("RDS: Add TCP transport to RDS") Suggested-by: Oleg Nesterov Signed-off-by: Allison Henderson Link: https://patch.msgid.link/20261021195837.142802-3-achender@kernel.org Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/rds/af_rds.c | 14 ++++++++++++++ net/rds/rdma_transport.c | 3 +++ net/rds/rds.h | 1 + net/rds/tcp.c | 3 +++ 4 files changed, 21 insertions(+) diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c index 00f6d3d6e242f..fdb153e61bdb5 100644 --- a/net/rds/af_rds.c +++ b/net/rds/af_rds.c @@ -922,8 +922,11 @@ static void rds6_sock_info(struct socket *sock, unsigned int len, } #endif +static bool rds_initialized; + static void rds_exit(void) { + rds_initialized = false; sock_unregister(rds_family_ops.family); proto_unregister(&rds_proto); rds_conn_exit(); @@ -944,6 +947,16 @@ module_exit(rds_exit); u32 rds_gen_num; +/* When RDS is built in, a failed rds_init() does not stop the rds_rdma + * and rds_tcp initcalls from running against a core that has already + * been torn down (rds_wq in particular). Let them bail out early. + */ +bool rds_is_initialized(void) +{ + return rds_initialized; +} +EXPORT_SYMBOL_GPL(rds_is_initialized); + static int __init rds_init(void) { int ret; @@ -980,6 +993,7 @@ static int __init rds_init(void) rds_info_register_func(RDS6_INFO_SOCKETS, rds6_sock_info); rds_info_register_func(RDS6_INFO_RECV_MESSAGES, rds6_sock_inc_info); #endif + rds_initialized = true; goto out; diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c index 17231a109240b..bf041ab978c1e 100644 --- a/net/rds/rdma_transport.c +++ b/net/rds/rdma_transport.c @@ -314,6 +314,9 @@ static int __init rds_rdma_init(void) { int ret; + if (!rds_is_initialized()) + return -ENODEV; + ret = rds_ib_init(); if (ret) goto out; diff --git a/net/rds/rds.h b/net/rds/rds.h index ce5af872e2b1c..97ff5073491a7 100644 --- a/net/rds/rds.h +++ b/net/rds/rds.h @@ -1009,6 +1009,7 @@ extern unsigned int rds_sysctl_trace_level; int rds_threads_init(void); void rds_threads_exit(void); extern struct workqueue_struct *rds_wq; +bool rds_is_initialized(void); void rds_queue_reconnect(struct rds_conn_path *cp); void rds_connect_worker(struct work_struct *); void rds_shutdown_worker(struct work_struct *); diff --git a/net/rds/tcp.c b/net/rds/tcp.c index 4f5d2e8a90c34..d59259bb79363 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c @@ -775,6 +775,9 @@ static int __init rds_tcp_init(void) { int ret; + if (!rds_is_initialized()) + return -ENODEV; + rds_tcp_conn_slab = KMEM_CACHE(rds_tcp_connection, 0); if (!rds_tcp_conn_slab) { ret = -ENOMEM; -- 2.53.0