6ee9ba5898
* Changelog from Linbit:
9.1.23 (api:genl2/proto:86-101,118-121/transport:18)
--------
* Fix a corner case that can happen when DRBD establishes multiple
connections in parallel, which could lead one connection to end up in
an inconsistent replication state of WFBitMapT/Established
* Fix a corner case in which a reconciliation resync ends up in
WFBitMapT/Established
* Restrict protocol compatibility to the most recent 8.4 and 9.0 releases
* Fix a corner case causing a module ref leak on drbd_transport_tcp;
if it hits, you can not rmmod it
* rate-limit resync progress while resync is paused
* resync-target inherits history UUIDs when resync finishes,
this can prevent unexpected "unrelared data" events later
* Updated compatibility code for Linux 6.11 and 6.12
* remove patches which already included in the new version:
0001-drbd-properly-rate-limit-resync-progress-reports.patch
0002-drbd-inherit-history-UUIDs-from-sync-source-when-res.patch
0003-build-compat-fix-line-offset-in-annotation-pragmas-p.patch
0004-drbd-fix-exposed_uuid-going-backward.patch
0005-drbd-Proper-locking-around-new_current_uuid-on-a-dis.patch
0006-build-CycloneDX-fix-bom-ref-add-purl.patch
0007-build-Another-update-to-the-spdx-files.patch
0008-build-generate-spdx.json-not-tag-value-format.patch
0009-compat-fix-gen_patch_names-for-bdev_file_open_by_pat.patch
0010-compat-fix-nla_nest_start_noflag-test.patch
0011-compat-fix-blk_alloc_disk-rule.patch
0012-drbd-remove-const-from-function-return-type.patch
0013-drbd-don-t-set-max_write_zeroes_sectors-in-decide_on.patch
0014-drbd-split-out-a-drbd_discard_supported-helper.patch
0015-drbd-atomically-update-queue-limits-in-drbd_reconsid.patch
0016-compat-test-and-patch-for-queue_limits_start_update.patch
0017-compat-specify-which-essential-change-was-not-made.patch
0018-gen_patch_names-reorder-blk_mode_t.patch
0019-compat-fix-blk_queue_update_readahead-patch.patch
0020-compat-test-and-patch-for-que_limits-max_hw_discard_.patch
0021-compat-fixup-write_zeroes__no_capable.patch
0022-compat-fixup-queue_flag_discard__yes_present.patch
0023-drbd-move-flags-to-queue_limits.patch
0024-compat-test-and-patch-for-queue_limits.features.patch
0025-drbd-Annotate-struct-fifo_buffer-with-__counted_by.patch
0026-compat-test-and-patch-for-__counted_by.patch
0027-drbd-fix-function-cast-warnings-in-state-machine.patch
0028-Add-missing-documentation-of-peer_device-parameter-t.patch
0030-drbd-kref_put-path-when-kernel_accept-fails.patch
0031-build-fix-typo-in-Makefile.spatch.patch
0032-drbd-open-do-not-delay-open-if-already-Primary.patch
* removed patch which is not needed anymore:
boo1231290_fix_drbd_build_error_against_kernel_v6.11.0.patch
boo1233222_fix_drbd_build_error_against_kernel_v6.11.6.patch
* update:
drbd_git_revision
drbd.spec
* add upstream patches to align commit d64ebe7eb7df:
0001-drbd-Fix-memory-leak.patch
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=155
68 lines
2.5 KiB
Diff
68 lines
2.5 KiB
Diff
From 88bf7f95dc359f4901f08ac8fb8ffc7dfceca9c1 Mon Sep 17 00:00:00 2001
|
|
From: Philipp Reisner <philipp.reisner@linbit.com>
|
|
Date: Wed, 13 Sep 2023 17:50:37 +0200
|
|
Subject: [PATCH 12/20] drbd: Restore DATA_CORKED and CONTROL_CORKED bits
|
|
|
|
They were removed with 9072e1d1b6b3 in January 2022.
|
|
|
|
Since then, the CONTROL_CORKED mapped onto C_UNREGISTERED.
|
|
|
|
I think that had a negligible impact because C_UNREGISTERED indicates
|
|
if a connection was deleted before. It is no longer connected when it
|
|
is time to delete a connection. Therefore, the corking code can not
|
|
set that double-used bit.
|
|
|
|
The other user of C_UNREGISTERED is when iterating over connections. A
|
|
wrongly set C_UNREGISTERED causes another iteration over the
|
|
connections list - no further harm.
|
|
|
|
Still, I am fixing this by allocating dedicated bits for corking in
|
|
the flags word.
|
|
---
|
|
drbd/drbd_debugfs.c | 2 ++
|
|
drbd/drbd_int.h | 2 ++
|
|
drbd/drbd_main.c | 1 +
|
|
3 files changed, 5 insertions(+)
|
|
|
|
diff --git a/drbd/drbd_debugfs.c b/drbd/drbd_debugfs.c
|
|
index 778a995018d7..b8e4f2cde426 100644
|
|
--- a/drbd/drbd_debugfs.c
|
|
+++ b/drbd/drbd_debugfs.c
|
|
@@ -839,6 +839,8 @@ static int connection_debug_show(struct seq_file *m, void *ignored)
|
|
pretty_print_bit(CONN_DRY_RUN);
|
|
pretty_print_bit(DISCONNECT_EXPECTED);
|
|
pretty_print_bit(BARRIER_ACK_PENDING);
|
|
+ pretty_print_bit(DATA_CORKED);
|
|
+ pretty_print_bit(CONTROL_CORKED);
|
|
pretty_print_bit(C_UNREGISTERED);
|
|
pretty_print_bit(RECONNECT);
|
|
pretty_print_bit(CONN_DISCARD_MY_DATA);
|
|
diff --git a/drbd/drbd_int.h b/drbd/drbd_int.h
|
|
index 17be90e7d8fa..4f3228d5a4d1 100644
|
|
--- a/drbd/drbd_int.h
|
|
+++ b/drbd/drbd_int.h
|
|
@@ -755,6 +755,8 @@ enum connection_flag {
|
|
DISCONNECT_EXPECTED,
|
|
BARRIER_ACK_PENDING,
|
|
CORKED,
|
|
+ DATA_CORKED = CORKED, /* used as computed value CORKED + DATA_STREAM */
|
|
+ CONTROL_CORKED, /* used as computed value CORKED + CONTROL_STREAM */
|
|
C_UNREGISTERED,
|
|
RECONNECT,
|
|
CONN_DISCARD_MY_DATA,
|
|
diff --git a/drbd/drbd_main.c b/drbd/drbd_main.c
|
|
index 53cb4c9e7db3..6bb618909aa0 100644
|
|
--- a/drbd/drbd_main.c
|
|
+++ b/drbd/drbd_main.c
|
|
@@ -1039,6 +1039,7 @@ int __send_command(struct drbd_connection *connection, int vnr,
|
|
struct drbd_send_buffer *sbuf = &connection->send_buffer[drbd_stream];
|
|
struct drbd_transport *transport = &connection->transport;
|
|
struct drbd_transport_ops *tr_ops = transport->ops;
|
|
+ /* CORKED + drbd_stream is either DATA_CORKED or CONTROL_CORKED */
|
|
bool corked = test_bit(CORKED + drbd_stream, &connection->flags);
|
|
bool flush = stream_and_flags & SFLAG_FLUSH;
|
|
int err;
|
|
--
|
|
2.35.3
|
|
|