Add 0035-libmpathpersist-fix-memory-leak-in-mpath_prout_rel.patch Add 0036-libmpathpersist-retry-commands-on-other-paths-in-mpa.patch Add 0037-libmpathpersist-check-released-key-against-the-reser.patch Add 0038-multipathd-remove-thread-from-mpath_pr_event_handle.patch Add 0039-libmpathpersist-remove-uneeded-wrapper-function.patch Add 0040-libmpathpersist-reduce-log-level-for-persistent-rese.patch Add 0041-libmpathpersist-remove-pointless-update_map_pr-ret-v.patch Add 0042-multipathd-use-update_map_pr-in-mpath_pr_event_handl.patch Add 0043-libmpathpersist-limit-changing-prflag-in-update_map_.patch Add 0044-multipathd-Don-t-call-update_map_pr-unnecessarily.patch Add 0045-libmpathpersist-remove-useless-function-send_prout_a.patch Add 0046-libmpathpersist-redesign-failed-release-workaround.patch Add 0047-libmpathpersist-fail-the-release-if-all-threads-fail.patch Add 0048-libmpathpersist-Handle-changing-key-corner-case.patch Add 0049-libmpathpersist-Handle-REGISTER-AND-IGNORE-changing-.patch Add 0050-libmultipath-rename-prflag_value-enums.patch Add 0051-libmpathpersist-use-a-switch-statement-for-prout-com.patch Add 0052-libmpathpersist-Add-safety-check-for-preempting-on-k.patch Add 0053-libmpathpersist-remove-update_map_pr-code-for-NULL-p.patch Add 0054-libmpathpersist-move-update_map_pr-to-multipathd.patch Add 0055-multipathd-clean-up-update_map_pr-and-mpath_pr_event.patch Add 0056-libmpathpersist-clean-up-duplicate-function-declarat.patch Add 0057-multipathd-wrap-setting-and-unsetting-prflag.patch Add 0058-multipathd-unregister-PR-key-when-path-is-restored-i.patch Add 0059-libmpathpersist-Fix-up-reservation_key-checking.patch Add 0060-libmpathpersist-change-how-reservation-conflicts-are.patch Add 0061-libmpathpersist-Clear-prkey-in-multipathd-before-unr.patch Add 0062-libmpathpersist-only-clear-the-key-if-we-are-using-t.patch Add 0063-libmpathpersist-Restore-old-reservation-key-on-failu.patch Add 0064-libmpathpersist-update-reservation-key-before-checki.patch Add 0065-libmpathpersist-retry-on-conflicts-in-mpath_prout_co.patch Add 0066-libmpathpersist-Don-t-always-fail-registrations-for-.patch Add 0067-libmpathpersist-Don-t-try-release-workaround-for-inv.patch Add 0068-libmpathpersist-Don-t-fail-RESERVE-commands-unnecess.patch Add 0069-libmpathpersist-reregister-keys-when-self-preempting.patch Add 0070-libmpathpersist-handle-updating-key-race-condition.patch Add 0071-libmpathpersist-handle-preempting-all-registrants-re.patch Add 0072-libmpathpersist-Fix-REGISTER-AND-IGNORE-while-holdin.patch Add 0073-libmpathpersist-Handle-RESERVE-with-reservation-held.patch Add 0074-libmpathpersist-use-check_holding_reservation-in-mpa.patch Add 0075-libmpathpersist-Fix-unregistering-while-holding-the-.patch Add 0076-libmpathpersist-Fix-race-between-restoring-a-path-an.patch Add 0077-multipathd-Fix-tracking-of-old-PR-key.patch * Fixes RHEL-118720 ("There are many bugs in multipath's persistent reservation handling [rhel-10]") Resolves: RHEL-118720
83 lines
3.3 KiB
Diff
83 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Wed, 10 Sep 2025 17:52:12 -0400
|
|
Subject: [PATCH] libmpathpersist: handle preempting all registrants
|
|
reservations
|
|
|
|
All Registrants reservations (types 7 and 8) are held by key 0x0. When
|
|
preempting one, all registrations are cleared, except for the one on the
|
|
path that issued the PREEMPT. libmpathpersist needs to handle this just
|
|
like the other cases of self-preemption, so that all the paths of the
|
|
preempting multipath device have their registrations restored while the
|
|
device is suspended.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
---
|
|
libmpathpersist/mpath_persist_int.c | 31 +++++++++++++++++++++++++----
|
|
1 file changed, 27 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libmpathpersist/mpath_persist_int.c b/libmpathpersist/mpath_persist_int.c
|
|
index da8a0d04..87d7cb6b 100644
|
|
--- a/libmpathpersist/mpath_persist_int.c
|
|
+++ b/libmpathpersist/mpath_persist_int.c
|
|
@@ -579,8 +579,9 @@ static int mpath_prout_reg(struct multipath *mpp,int rq_servact, int rq_scope,
|
|
* is suspended before issuing the preemption, and the keys are reregistered
|
|
* before resuming it.
|
|
*/
|
|
-static int preempt_self(struct multipath *mpp, int rq_servact, int rq_scope,
|
|
- unsigned int rq_type, int noisy, bool do_release)
|
|
+static int do_preempt_self(struct multipath *mpp, struct be64 sa_key,
|
|
+ int rq_servact, int rq_scope, unsigned int rq_type,
|
|
+ int noisy, bool do_release)
|
|
{
|
|
int status, rel_status = MPATH_PR_SUCCESS;
|
|
struct path *pp = NULL;
|
|
@@ -593,7 +594,7 @@ static int preempt_self(struct multipath *mpp, int rq_servact, int rq_scope,
|
|
}
|
|
|
|
memcpy(paramp.key, &mpp->reservation_key, 8);
|
|
- memcpy(paramp.sa_key, &mpp->reservation_key, 8);
|
|
+ memcpy(paramp.sa_key, &sa_key, 8);
|
|
status = mpath_prout_common(mpp, rq_servact, rq_scope, rq_type,
|
|
¶mp, noisy, &pp);
|
|
if (status != MPATH_PR_SUCCESS) {
|
|
@@ -629,6 +630,21 @@ fail_resume:
|
|
return (rel_status != MPATH_PR_SUCCESS) ? rel_status : status;
|
|
}
|
|
|
|
+static int preempt_self(struct multipath *mpp, int rq_servact, int rq_scope,
|
|
+ unsigned int rq_type, int noisy, bool do_release)
|
|
+{
|
|
+ return do_preempt_self(mpp, mpp->reservation_key, rq_servact, rq_scope,
|
|
+ rq_type, noisy, do_release);
|
|
+}
|
|
+
|
|
+static int preempt_all(struct multipath *mpp, int rq_servact, int rq_scope,
|
|
+ unsigned int rq_type, int noisy)
|
|
+{
|
|
+ struct be64 zerokey = {0};
|
|
+ return do_preempt_self(mpp, zerokey, rq_servact, rq_scope, rq_type,
|
|
+ noisy, false);
|
|
+}
|
|
+
|
|
static int mpath_prout_rel(struct multipath *mpp,int rq_servact, int rq_scope,
|
|
unsigned int rq_type,
|
|
struct prout_param_descriptor * paramp, int noisy)
|
|
@@ -904,8 +920,15 @@ int do_mpath_persistent_reserve_out(vector curmp, vector pathvec, int fd,
|
|
break;
|
|
case MPATH_PROUT_PREE_SA:
|
|
case MPATH_PROUT_PREE_AB_SA:
|
|
- if (reservation_key_matches(mpp, paramp->sa_key, noisy) == YNU_YES)
|
|
+ if (reservation_key_matches(mpp, paramp->sa_key, noisy) == YNU_YES) {
|
|
preempting_reservation = true;
|
|
+ if (memcmp(paramp->sa_key, &zerokey, 8) == 0) {
|
|
+ /* all registrants case */
|
|
+ ret = preempt_all(mpp, rq_servact, rq_scope,
|
|
+ rq_type, noisy);
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
/* if we are preempting ourself */
|
|
if (memcmp(paramp->sa_key, paramp->key, 8) == 0) {
|
|
ret = preempt_self(mpp, rq_servact, rq_scope, rq_type,
|