695f9436f4
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
99 lines
2.5 KiB
Diff
99 lines
2.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Thu, 10 Jul 2025 14:10:46 -0400
|
|
Subject: [PATCH] multipathd: remove thread from mpath_pr_event_handle
|
|
|
|
mpath_pr_event_handle() creates a separate thread to do the persistent
|
|
reservation work, but it doesn't take any advantage of the work being
|
|
done in another thread. Merge mpath_pr_event_handle() and
|
|
mpath_pr_event_handler_fn() into a single function with no separate
|
|
thread.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
multipathd/main.c | 50 +++++++++++------------------------------------
|
|
1 file changed, 11 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/multipathd/main.c b/multipathd/main.c
|
|
index a565ade5..04ca47d1 100644
|
|
--- a/multipathd/main.c
|
|
+++ b/multipathd/main.c
|
|
@@ -89,8 +89,7 @@
|
|
#define CMDSIZE 160
|
|
#define MSG_SIZE 32
|
|
|
|
-int mpath_pr_event_handle(struct path *pp);
|
|
-void * mpath_pr_event_handler_fn (void * );
|
|
+static void mpath_pr_event_handle(struct path *pp);
|
|
|
|
#define LOG_MSG(lvl, pp) \
|
|
do { \
|
|
@@ -3945,17 +3944,24 @@ main (int argc, char *argv[])
|
|
return (child(NULL));
|
|
}
|
|
|
|
-void * mpath_pr_event_handler_fn (void * pathp )
|
|
+static void mpath_pr_event_handle(struct path *pp)
|
|
{
|
|
struct multipath * mpp;
|
|
unsigned int i;
|
|
int ret, isFound;
|
|
- struct path * pp = (struct path *)pathp;
|
|
struct prout_param_descriptor *param;
|
|
struct prin_resp *resp;
|
|
|
|
- rcu_register_thread();
|
|
mpp = pp->mpp;
|
|
+ if (pp->bus != SYSFS_BUS_SCSI) {
|
|
+ mpp->prflag = PRFLAG_UNSET;
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ if (!get_be64(mpp->reservation_key)) {
|
|
+ mpp->prflag = PRFLAG_UNSET;
|
|
+ return;
|
|
+ }
|
|
|
|
resp = mpath_alloc_prin_response(MPATH_PRIN_RKEY_SA);
|
|
if (!resp){
|
|
@@ -4022,38 +4028,4 @@ void * mpath_pr_event_handler_fn (void * pathp )
|
|
out:
|
|
if (resp)
|
|
free(resp);
|
|
- rcu_unregister_thread();
|
|
- return NULL;
|
|
-}
|
|
-
|
|
-int mpath_pr_event_handle(struct path *pp)
|
|
-{
|
|
- pthread_t thread;
|
|
- int rc;
|
|
- pthread_attr_t attr;
|
|
- struct multipath * mpp;
|
|
-
|
|
- if (pp->bus != SYSFS_BUS_SCSI)
|
|
- goto no_pr;
|
|
-
|
|
- mpp = pp->mpp;
|
|
-
|
|
- if (!get_be64(mpp->reservation_key))
|
|
- goto no_pr;
|
|
-
|
|
- pthread_attr_init(&attr);
|
|
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
|
|
-
|
|
- rc = pthread_create(&thread, NULL , mpath_pr_event_handler_fn, pp);
|
|
- if (rc) {
|
|
- condlog(0, "%s: ERROR; return code from pthread_create() is %d", pp->dev, rc);
|
|
- return -1;
|
|
- }
|
|
- pthread_attr_destroy(&attr);
|
|
- rc = pthread_join(thread, NULL);
|
|
- return 0;
|
|
-
|
|
-no_pr:
|
|
- pp->mpp->prflag = PRFLAG_UNSET;
|
|
- return 0;
|
|
}
|