Revert OL modifications

SOURCES/1001-mdmon-imsm-fix-metadata-corruption-when-managing-new.patch

@@ -1,124 +0,0 @@
-From 371604603dd6d5da0465df968039737287cd7ab4 Mon Sep 17 00:00:00 2001
-From: Junxiao Bi <junxiao.bi@oracle.com>
-Date: Thu, 27 Feb 2025 17:52:05 +0000
-Subject: [PATCH] mdmon: imsm: fix metadata corruption when managing new array
-
-When manager thread detects new array, it will invoke manage_new().
-For imsm array, it will further invoke imsm_open_new(). Since
-commit bbab0940fa75("imsm: write bad block log on metadata sync"),
-it preallocates bad block log when opening the array, that requires
-increasing the mpb buffer size.
-For that, imsm_open_new() invokes function imsm_update_metadata_locally(),
-which first uses imsm_prepare_update() to allocate a larger mpb buffer
-and store it at "mpb->next_buf", and then invoke imsm_process_update()
-to copy the content from current mpb buffer "mpb->buf" to "mpb->next_buf",
-and then free the current mpb buffer and set the new buffer as current.
-
-There is a small race window, when monitor thread is syncing metadata,
-it gets current buffer pointer in imsm_sync_metadata()->write_super_imsm(),
-but before flushing the buffer to disk, manager thread does above switching
-buffer which frees current buffer, then monitor thread will run into
-use-after-free issue and could cause on-disk metadata corruption.
-If system keeps running, further metadata update could fix the corruption,
-because after switching buffer, the new buffer will contain good metadata,
-but if panic/power cycle happens while disk metadata is corrupted,
-the system will run into bootup failure if array is used as root,
-otherwise the array can not be assembled after boot if not used as root.
-
-This issue will not happen for imsm array with only one member array,
-because the memory array has not be opened yet, monitor thread will not
-do any metadata updates.
-This can happen for imsm array with at lease two member array, in the
-following two scenarios:
-1. Restarting mdmon process with at least two member array
-This will happen during system boot up or user restart mdmon after mdadm
-upgrade
-2. Adding new member array to exist imsm array with at least one member
-array.
-
-To fix this, delay the switching buffer operation to monitor thread.
-
-Orabug: 37635990
-
-Fixes: bbab0940fa75 ("imsm: write bad block log on metadata sync")
-Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
-Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
----
- managemon.c   | 10 ++++++++--
- super-intel.c | 14 +++++++++++---
- 2 files changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/managemon.c b/managemon.c
-index 358459e79435..f5e42662dffd 100644
---- a/managemon.c
-+++ b/managemon.c
-@@ -660,11 +660,12 @@ static void manage_new(struct mdstat_ent *mdstat,
- 	 * the monitor.
- 	 */
- 
-+	struct metadata_update *update = NULL;
- 	struct active_array *new = NULL;
- 	struct mdinfo *mdi = NULL, *di;
--	int i, inst;
--	int failed = 0;
- 	char buf[SYSFS_MAX_BUF_SIZE];
-+	int failed = 0;
-+	int i, inst;
- 
- 	/* check if array is ready to be monitored */
- 	if (!mdstat->active || !mdstat->level)
-@@ -763,9 +764,14 @@ static void manage_new(struct mdstat_ent *mdstat,
- 	/* if everything checks out tell the metadata handler we want to
- 	 * manage this instance
- 	 */
-+	container->update_tail = &update;
- 	if (!aa_ready(new) || container->ss->open_new(container, new, inst) < 0) {
-+		container->update_tail = NULL;
- 		goto error;
- 	} else {
-+		if (update)
-+			queue_metadata_update(update);
-+		container->update_tail = NULL;
- 		replace_array(container, victim, new);
- 		if (failed) {
- 			new->check_degraded = 1;
-diff --git a/super-intel.c b/super-intel.c
-index 2b8b6fda976c..2363b50a174c 100644
---- a/super-intel.c
-+++ b/super-intel.c
-@@ -8396,12 +8396,15 @@ static int imsm_count_failed(struct intel_super *super, struct imsm_dev *dev,
- 	return failed;
- }
- 
-+static int imsm_prepare_update(struct supertype *st,
-+			       struct metadata_update *update);
- static int imsm_open_new(struct supertype *c, struct active_array *a,
- 			 int inst)
- {
- 	struct intel_super *super = c->sb;
- 	struct imsm_super *mpb = super->anchor;
--	struct imsm_update_prealloc_bb_mem u;
-+	struct imsm_update_prealloc_bb_mem *u;
-+	struct metadata_update mu;
- 
- 	if (inst >= mpb->num_raid_devs) {
- 		pr_err("subarry index %d, out of range\n", inst);
-@@ -8411,8 +8414,13 @@ static int imsm_open_new(struct supertype *c, struct active_array *a,
- 	dprintf("imsm: open_new %d\n", inst);
- 	a->info.container_member = inst;
- 
--	u.type = update_prealloc_badblocks_mem;
--	imsm_update_metadata_locally(c, &u, sizeof(u));
-+	u = xmalloc(sizeof(*u));
-+	u->type = update_prealloc_badblocks_mem;
-+	mu.len = sizeof(*u);
-+	mu.buf = (char *)u;
-+	imsm_prepare_update(c, &mu);
-+	if (c->update_tail)
-+		append_metadata_update(c, u, sizeof(*u));
- 
- 	return 0;
- }
--- 
-2.39.3
-

SPECS/mdadm.spec

@@ -2,7 +2,7 @@ Name:        mdadm
 Version:     4.3
 # extraversion is used to define rhel internal version
 %define extraversion 5
-Release:     %{extraversion}.0.1%{?dist}
+Release:     %{extraversion}%{?dist}
 Summary:     The mdadm program controls Linux md devices (software RAID arrays)
 URL:         http://www.kernel.org/pub/linux/utils/raid/mdadm/
 License:     GPLv2+
@@ -220,9 +220,6 @@ Patch200:    mdadm-udev.patch
 Patch201:    mdadm-2.5.2-static.patch
 Patch202:    mdadm-check-posix-name-before-setting-name-and-devna.patch
 
-# Oracle Patch
-Patch1001: 1001-mdmon-imsm-fix-metadata-corruption-when-managing-new.patch
-
 BuildRequires: make
 BuildRequires: systemd-rpm-macros binutils-devel gcc systemd-devel
 Requires: libreport-filesystem
@@ -295,9 +292,6 @@ install -m644 %{SOURCE5} %{buildroot}/etc/libreport/events.d
 /usr/share/mdadm/mdcheck
 
 %changelog
-* Mon Nov 03 2025 EL Errata <el-errata_ww@oracle.com> - 4.3-5.0.1
-- mdmon: imsm: fix metadata corruption when managing new array. [Orabug: 37635990]
-
 * Sat Oct 25 2025 Xiao Ni <xni@redhat.com> 4.3-5
 - allow assemble with name which has :
 - Resolves RHEL-109231