Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp804556pxb; Tue, 3 Nov 2020 13:01:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJy2j9uz+7SonfdT4w8j3M9T2W53DwOTx83INR1jCwzaeVc0wbq3CyVdCDsqI3RXSpOM6zss X-Received: by 2002:a05:6402:54d:: with SMTP id i13mr18997348edx.3.1604437303144; Tue, 03 Nov 2020 13:01:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604437303; cv=none; d=google.com; s=arc-20160816; b=EupPQrg2NBtWaB/gK5ywnoLcAMJMgs9PW0m05p0b38jE7cCT0Z1lbUxFmmbzt/7mmD XzucyhjqfjMmjlo0e6W7JznGS+Ua+zkRc8S5AhgqwucpmoLQFYxSz8buR6yFOErXv6xc lBKvbME9Vh61kuZ0QpH/vmC94Yjt+ITRqw6LZOiLcP+QdU41J3KXJsy2t+IpDqchSaFX 45YA5O+ZcnmuWfsm9ewM/d0B9duznRaWVxmm/iKNkexG2V38+68tpreUCONCvvBrWLYz A+kF6SDXfTa4axpQZ+v3XvJC0tqofGOYnayvZeoJ3z8xF9WnQddiwVpkppiZfMvrOXlO UTZw== 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=rkB7vypkXsG5hTxrvEavskRl45rd5v4YVspewkTktf4=; b=hgOxytA2JQiN75ctofdCYVYvniq27rljzZKztX9XtOxWf4Tv+cracNLWvF4+26F6gd 9qTgcF70isHJGiqwzt6Tk1CXm5g6ZmI1qOYy7nBS7CRSKDHy6oD9aMETgUJ9iJtyVFyA 9QUcTbBCJmuvuIUznE9CcMoGSxnlqz6ibG3vrPFvSj2XAj3ARV5kybu5hvEMfifUgVoL 1sP9cyENrefserkKBNabWb6SolZxnFlzbGnBT0i0KGBxrIMjR5RqydcdTyXZKBvOyrY9 JXzykWZXxJL76//UfqxTLYgj2n7P40FV29ylLswLPR6oBGbgAl/lai+w5jl8jSvNgwSj n6hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0sTcJ7rA; 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 o60si14116016eda.61.2020.11.03.13.01.19; Tue, 03 Nov 2020 13:01:43 -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=0sTcJ7rA; 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 S1733176AbgKCVAA (ORCPT + 99 others); Tue, 3 Nov 2020 16:00:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:35486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730777AbgKCU77 (ORCPT ); Tue, 3 Nov 2020 15:59:59 -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 F08EB223AC; Tue, 3 Nov 2020 20:59:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604437199; bh=JXPGxJRDp7PlOYH8alET6KGPLUiaU+blm6Ne4oIWc5w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0sTcJ7rAaQcCGLVDI8W68GTuJEnusuxJ1Jcc4WeqLrrhJ692Jtmf+F2P2YjkBqWKF wX75ZoVdZ/bWxWLDiLy9VNy0HqktGttU9nKqd6peHKlRRf7haEYueQURB3O8qNMZ/z RN1havc74IBpqGSj02ZLg6N0s/FYSWvvaxQD0NQw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ilya Dryomov , Jeff Layton Subject: [PATCH 5.4 188/214] libceph: clear con->out_msg on Policy::stateful_server faults Date: Tue, 3 Nov 2020 21:37:16 +0100 Message-Id: <20201103203308.300937789@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203249.448706377@linuxfoundation.org> References: <20201103203249.448706377@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 @@ -3007,6 +3007,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);