Andrew Lukoshko
5c58271075
Drop the 687.5.3/687.5.4 security-ahead patches superseded by the RHEL 687.6.1..687.10.1 backports (1100-1104), and add those backports (1100-1196) sourced from centos-stream-9 and upstream stable. Keep the AlmaLinux-ahead smb cifs.spnego fix (retained as 1197). Bump to 5.14.0-687.10.1.
49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
From 11194b416ef95012c2cfe5f546d71af07b639e93 Mon Sep 17 00:00:00 2001
|
|
From: Sam Edwards <cfsworks@gmail.com>
|
|
Date: Tue, 30 Dec 2025 20:05:06 -0800
|
|
Subject: [PATCH] libceph: reset sparse-read state in osd_fault()
|
|
|
|
When a fault occurs, the connection is abandoned, reestablished, and any
|
|
pending operations are retried. The OSD client tracks the progress of a
|
|
sparse-read reply using a separate state machine, largely independent of
|
|
the messenger's state.
|
|
|
|
If a connection is lost mid-payload or the sparse-read state machine
|
|
returns an error, the sparse-read state is not reset. The OSD client
|
|
will then interpret the beginning of a new reply as the continuation of
|
|
the old one. If this makes the sparse-read machinery enter a failure
|
|
state, it may never recover, producing loops like:
|
|
|
|
libceph: [0] got 0 extents
|
|
libceph: data len 142248331 != extent len 0
|
|
libceph: osd0 (1)...:6801 socket error on read
|
|
libceph: data len 142248331 != extent len 0
|
|
libceph: osd0 (1)...:6801 socket error on read
|
|
|
|
Therefore, reset the sparse-read state in osd_fault(), ensuring retries
|
|
start from a clean state.
|
|
|
|
Cc: stable@vger.kernel.org
|
|
Fixes: f628d7999727 ("libceph: add sparse read support to OSD client")
|
|
Signed-off-by: Sam Edwards <CFSworks@gmail.com>
|
|
Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
|
|
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
|
|
|
|
diff --git a/net/ceph/osd_client.c b/net/ceph/osd_client.c
|
|
index 3667319b949d..1a7be2f615dc 100644
|
|
--- a/net/ceph/osd_client.c
|
|
+++ b/net/ceph/osd_client.c
|
|
@@ -4281,6 +4281,9 @@ static void osd_fault(struct ceph_connection *con)
|
|
goto out_unlock;
|
|
}
|
|
|
|
+ osd->o_sparse_op_idx = -1;
|
|
+ ceph_init_sparse_read(&osd->o_sparse_read);
|
|
+
|
|
if (!reopen_osd(osd))
|
|
kick_osd_requests(osd);
|
|
maybe_request_map(osdc);
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|