Received: by 2002:a05:6622:f08:0:0:0:0 with SMTP id l8csp4482460ivc; Tue, 3 Nov 2020 13:12:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJxbshZ1T5Mc/FLqa08OQQ30Ld6l+WZ+NAJOwSu9HtNramZIi48KdaNkczcARCKZqOHmO6xq X-Received: by 2002:a17:906:31cb:: with SMTP id f11mr21680161ejf.142.1604437921248; Tue, 03 Nov 2020 13:12:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604437921; cv=none; d=google.com; s=arc-20160816; b=zrsucn25DeMXfIO4RUJ4iOJJdAXtttD82VuCE8V4gghWqlPkrX7Nd2OiWGsAy2jeyV ACZfmigy5trkXEI8TgqFXWhN0omuaa9SbXI0pyj9FVUQSb7LVVoLQUG3FYZ3qBtGkiuc lediQkuIXymdQ3LqroPEqv9nYGz7DbtBy2ITbZQzqcp6l+S63GAJZN1cqxUAU59N80Hx xxP0skkrTJ4bc/rJmFpcsWmVkfLqET4lS4R5J+8V8U3gPNqkQBSK3+GZK/EF9zezOcJa C0KBfFy11K5UjZOTFxEkvX+vCFES0yHcLDtwlJ5KjYJmPafVNTCZzQ/o+1eheOTuhl+d 4cuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Gy2ZmRG2MkLzHSCvzHUDwL59+Y2EQAOlrosAOMY2fH4=; b=SoFV7iSXL6w1dboBlAwHPAOHqlFwzofzmgPfT1WwLDQ9EY6B39DGhvterpmzFqtvRT 5YPgeL/JtHZn5AqxCNXYRauWeDg8N0dx1ZrLFw1v3DB+pGNG/uNnpS4Opx3HEBof/eEk aGOLeTvweY7fHRBwzxamLWkFR1B3/mxtdcoBqVamxAZgOjndGrY2Zr4BycgBtyo8372g loYs4BGrXV25bnpxJ72MaYvuExr7OLdbhyXV3GKmaW/Mrs6ZRST88DaFF1OmAyuauMOZ D86WsMVnN+Pi6O0ThDmoRHU81uNhholWvmLD2ftlAnvWzm+1UtfRDu8tdPvSzaxki/wT Svjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LeWeA3hF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a2si7694303edn.504.2020.11.03.13.11.38; Tue, 03 Nov 2020 13:12:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=LeWeA3hF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388404AbgKCVIU (ORCPT + 99 others); Tue, 3 Nov 2020 16:08:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:47662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388634AbgKCVIR (ORCPT ); Tue, 3 Nov 2020 16:08:17 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ED721205ED; Tue, 3 Nov 2020 21:08:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437696; bh=WXnwcP7Bcio0dnXTYHPwq1XoktMR5Z472nQ6F5xjFHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LeWeA3hFQQxqqcpijnXTyd5hSguQ8iFxTXCMtJmYPNYxwAxzoWwCUiL3L0h8vGQNj 9etxlG3Cj+Rp0UTbTKvBO6dYSFeB2lWLK3K8DHPuyJuYdpVGdQ1jzO8wJ1+1h/uLaH HC6ETLGQ5ErBXDdgDOr0FwvYKQKDz3X5Iefe5S68= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Dryomov , Jeff Layton Subject: [PATCH 4.19 169/191] libceph: clear con->out_msg on Policy::stateful_server faults Date: Tue, 3 Nov 2020 21:37:41 +0100 Message-Id: <20201103203248.330753844@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203232.656475008@linuxfoundation.org> References: <20201103203232.656475008@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ilya Dryomov commit 28e1581c3b4ea5f98530064a103c6217bedeea73 upstream. con->out_msg must be cleared on Policy::stateful_server (!CEPH_MSG_CONNECT_LOSSY) faults. Not doing so botches the reconnection attempt, because after writing the banner the messenger moves on to writing the data section of that message (either from where it got interrupted by the connection reset or from the beginning) instead of writing struct ceph_msg_connect. This results in a bizarre error message because the server sends CEPH_MSGR_TAG_BADPROTOVER but we think we wrote struct ceph_msg_connect: libceph: mds0 (1)172.21.15.45:6828 socket error on write ceph: mds0 reconnect start libceph: mds0 (1)172.21.15.45:6829 socket closed (con state OPEN) libceph: mds0 (1)172.21.15.45:6829 protocol version mismatch, my 32 != server's 32 libceph: mds0 (1)172.21.15.45:6829 protocol version mismatch AFAICT this bug goes back to the dawn of the kernel client. The reason it survived for so long is that only MDS sessions are stateful and only two MDS messages have a data section: CEPH_MSG_CLIENT_RECONNECT (always, but reconnecting is rare) and CEPH_MSG_CLIENT_REQUEST (only when xattrs are involved). The connection has to get reset precisely when such message is being sent -- in this case it was the former. Cc: stable@vger.kernel.org Link: https://tracker.ceph.com/issues/47723 Signed-off-by: Ilya Dryomov Reviewed-by: Jeff Layton Signed-off-by: Greg Kroah-Hartman --- net/ceph/messenger.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -3037,6 +3037,11 @@ static void con_fault(struct ceph_connec ceph_msg_put(con->in_msg); con->in_msg = NULL; } + if (con->out_msg) { + BUG_ON(con->out_msg->con != con); + ceph_msg_put(con->out_msg); + con->out_msg = NULL; + } /* Requeue anything that hasn't been acked */ list_splice_init(&con->out_sent, &con->out_queue);