Patch "libceph: init the cursor when preparing sparse read in msgr2" has been added to the 6.7-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    libceph: init the cursor when preparing sparse read in msgr2

to the 6.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     libceph-init-the-cursor-when-preparing-sparse-read-i.patch
and it can be found in the queue-6.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 3028a50d45acf45d047a971d2162d7b470f61537
Author: Xiubo Li <xiubli@xxxxxxxxxx>
Date:   Wed Mar 6 09:05:44 2024 +0800

    libceph: init the cursor when preparing sparse read in msgr2
    
    [ Upstream commit 321e3c3de53c7530cd518219d01f04e7e32a9d23 ]
    
    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@xxxxxxxxxx>
    Reviewed-by: Ilya Dryomov <idryomov@xxxxxxxxx>
    Tested-by: Luis Henriques <lhenriques@xxxxxxx>
    Signed-off-by: Ilya Dryomov <idryomov@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/net/ceph/messenger_v2.c b/net/ceph/messenger_v2.c
index a0ca5414b333d..bd608ffa06279 100644
--- a/net/ceph/messenger_v2.c
+++ b/net/ceph/messenger_v2.c
@@ -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);




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux