libceph: init the cursor when preparing sparse read in msgr2
authorXiubo Li <xiubli@redhat.com>
Wed, 6 Mar 2024 01:05:44 +0000 (09:05 +0800)
committerIlya Dryomov <idryomov@gmail.com>
Wed, 6 Mar 2024 11:43:01 +0000 (12:43 +0100)
The cursor is no longer initialized in the OSD client, causing the
sparse read state machine to fall into an infinite loop.  The cursor
should be initialized in IN_S_PREPARE_SPARSE_DATA state.

[ idryomov: use msg instead of con->in_msg, changelog ]

Link: https://tracker.ceph.com/issues/64607
Fixes: 8e46a2d068c9 ("libceph: just wait for more data to be available on the socket")
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
Tested-by: Luis Henriques <lhenriques@suse.de>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
net/ceph/messenger_v2.c

index a0ca5414b333df92b3aa0085a95b928cdc0609a5..bd608ffa06279704b5f4f43e5e369035e3ff032c 100644 (file)
@@ -2034,6 +2034,9 @@ static int prepare_sparse_read_data(struct ceph_connection *con)
        if (!con_secure(con))
                con->in_data_crc = -1;
 
+       ceph_msg_data_cursor_init(&con->v2.in_cursor, msg,
+                                 msg->sparse_read_total);
+
        reset_in_kvecs(con);
        con->v2.in_state = IN_S_PREPARE_SPARSE_DATA_CONT;
        con->v2.data_len_remain = data_len(msg);