Skip to content

Commit 8ff240c

Browse files
idryomovgregkh
authored andcommitted
libceph: clear con->out_msg on Policy::stateful_server faults
commit 28e1581 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 <idryomov@gmail.com> Reviewed-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 89b9cad commit 8ff240c

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

net/ceph/messenger.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2998,6 +2998,11 @@ static void con_fault(struct ceph_connection *con)
29982998
ceph_msg_put(con->in_msg);
29992999
con->in_msg = NULL;
30003000
}
3001+
if (con->out_msg) {
3002+
BUG_ON(con->out_msg->con != con);
3003+
ceph_msg_put(con->out_msg);
3004+
con->out_msg = NULL;
3005+
}
30013006

30023007
/* Requeue anything that hasn't been acked */
30033008
list_splice_init(&con->out_sent, &con->out_queue);

0 commit comments

Comments
 (0)