a61fd9f4ae
Upstream broke backwards compatibility for configuration files. In this update, I also fixed that up by continuing to install monitor.conf in /etc/ndctl and continuing to look in that location first for the configuration. Upstream also added a dependency on libiniparser. We do not ship that library in RHEL. The easiest course of action was to vendor the library, which is what this update does. Resolves: RHEL-8204 Resolves: RHEL-29151 Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
42 lines
1.6 KiB
Diff
42 lines
1.6 KiB
Diff
From 95e837700d0229c2a75ca6b77e7ed0f74ae2f433 Mon Sep 17 00:00:00 2001
|
|
From: Jeff Moyer <jmoyer@redhat.com>
|
|
Date: Tue, 12 Dec 2023 16:59:54 -0500
|
|
Subject: [PATCH 1/3] test/daxctl-devices.sh: increase the namespace size
|
|
|
|
Memory hotplug requires the namespace to be aligned to a boundary that
|
|
depends on several factors. Upstream kernel commit fe124c95df9e
|
|
("x86/mm: use max memory block size on bare metal") increased the
|
|
typical size/alignment to 2GiB from 256MiB. As a result, this test no
|
|
longer passes on our bare metal test systems.
|
|
|
|
This patch fixes the test failure by bumping the namespace size to
|
|
4GiB, which leaves room for aligning the start and end to 2GiB.
|
|
|
|
Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
|
|
|
|
Related: RHEL-10382diff --git a/test/daxctl-devices.sh b/test/daxctl-devices.sh
|
|
index 56c9691..dfce74b 100755
|
|
---
|
|
test/daxctl-devices.sh | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/test/daxctl-devices.sh b/test/daxctl-devices.sh
|
|
index 56c9691..dfce74b 100755
|
|
--- a/test/daxctl-devices.sh
|
|
+++ b/test/daxctl-devices.sh
|
|
@@ -44,7 +44,10 @@ setup_dev()
|
|
test -n "$testdev"
|
|
|
|
"$NDCTL" destroy-namespace -f -b "$testbus" "$testdev"
|
|
- testdev=$("$NDCTL" create-namespace -b "$testbus" -m devdax -fe "$testdev" -s 256M | \
|
|
+ # x86_64 memory hotplug can require up to a 2GiB-aligned chunk
|
|
+ # of memory. Create a 4GiB namespace, so that we will still have
|
|
+ # enough room left after aligning the start and end.
|
|
+ testdev=$("$NDCTL" create-namespace -b "$testbus" -m devdax -fe "$testdev" -s 4G | \
|
|
jq -er '.dev')
|
|
test -n "$testdev"
|
|
}
|
|
--
|
|
2.39.3
|
|
|