From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F6401F76D2; Tue, 3 Dec 2024 15:32:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733239943; cv=none; b=XNuGl3S/ShuDZ1Qv1sKVbkH+B0fdLdmO98VAzuk8IqfjX4pE22ouNswydJVp92g+DreVsoSaStmI6XBRVirgzaoz4NWzliHEF5Fwd+2QCmonatOjjRa92wkaeiFb1JlylB1XAn2jeJGCzwpqA6y6Xn8edDj8Z+kJlOYnuINw+0s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733239943; c=relaxed/simple; bh=9Hize2eSJnfn/d46YI+fxUcc148VadctsKOheqWIRTc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ne1cg1Usfj035nEKQTWvgi+TZEHYi9Gtj1aoML63UakXiQT1I5+swrUp/yZwJYxWFe/mHfRj3ajmzKkGhSTRxkPSSQDJYkuR6mORKzLnl/Eb16I+oEOxnR/PR22Nb/x1zbDeMHToOQ5QS87APl9Cf0/4yYxtNPRp28avPaPCMzI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VYlKil8l; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="VYlKil8l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89C68C4CED8; Tue, 3 Dec 2024 15:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733239942; bh=9Hize2eSJnfn/d46YI+fxUcc148VadctsKOheqWIRTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VYlKil8le02o8XcvNn/JxcXD8nBW7RHnNwYY6aLYCodhOXdKirjmjGW9smQ70PERY uUjkWYAfNHLtUVaeTO/RaGopfRS7pwMSMGtvCmYqYQkhnjiPAX77ZJWoCATSfsPYPF J/+QJcn4en6AKa0lIwsYDZsv/6b8jblF9aWpjaQ8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Alex Zenla , Alexander Merritt , Ariadne Conill , Juergen Gross , Dominique Martinet , Sasha Levin Subject: [PATCH 6.11 788/817] 9p/xen: fix init sequence Date: Tue, 3 Dec 2024 15:46:00 +0100 Message-ID: <20241203144026.771450313@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alex Zenla [ Upstream commit 7ef3ae82a6ebbf4750967d1ce43bcdb7e44ff74b ] Large amount of mount hangs observed during hotplugging of 9pfs devices. The 9pfs Xen driver attempts to initialize itself more than once, causing the frontend and backend to disagree: the backend listens on a channel that the frontend does not send on, resulting in stalled processing. Only allow initialization of 9p frontend once. Fixes: c15fe55d14b3b ("9p/xen: fix connection sequence") Signed-off-by: Alex Zenla Signed-off-by: Alexander Merritt Signed-off-by: Ariadne Conill Reviewed-by: Juergen Gross Message-ID: <20241119211633.38321-1-alexander@edera.dev> Signed-off-by: Dominique Martinet Signed-off-by: Sasha Levin --- net/9p/trans_xen.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c index dfdbe1ca53387..0304e8a1616d8 100644 --- a/net/9p/trans_xen.c +++ b/net/9p/trans_xen.c @@ -465,6 +465,7 @@ static int xen_9pfs_front_init(struct xenbus_device *dev) goto error; } + xenbus_switch_state(dev, XenbusStateInitialised); return 0; error_xenbus: @@ -512,8 +513,10 @@ static void xen_9pfs_front_changed(struct xenbus_device *dev, break; case XenbusStateInitWait: - if (!xen_9pfs_front_init(dev)) - xenbus_switch_state(dev, XenbusStateInitialised); + if (dev->state != XenbusStateInitialising) + break; + + xen_9pfs_front_init(dev); break; case XenbusStateConnected: -- 2.43.0