[LTP] [PATCH v4 7/7] Add fallback for RHEL9
Yang Xu
xuyang2018.jy@fujitsu.com
Tue Feb 20 08:42:18 CET 2024
Since device number patch and pte number patch have been backported into
RHEL9, we should add fallback for this distro.
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
libs/libltpswap/libswap.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/libs/libltpswap/libswap.c b/libs/libltpswap/libswap.c
index 1f9235f17..94de4b4e2 100644
--- a/libs/libltpswap/libswap.c
+++ b/libs/libltpswap/libswap.c
@@ -17,6 +17,7 @@
#include "libswap.h"
#include "lapi/syscalls.h"
#include "tst_kconfig.h"
+#include "tst_kvercmp.h"
#include "tst_safe_stdio.h"
static const char *const swap_supported_fs[] = {
@@ -231,6 +232,11 @@ int tst_max_swapfiles(void)
struct tst_kconfig_var memory_kconfig = TST_KCONFIG_INIT("CONFIG_MEMORY_FAILURE");
struct tst_kconfig_var device_kconfig = TST_KCONFIG_INIT("CONFIG_DEVICE_PRIVATE");
struct tst_kconfig_var marker_kconfig = TST_KCONFIG_INIT("CONFIG_PTE_MARKER");
+ struct tst_kern_exv kvers[] = {
+ /* RHEL9 kernel has patch 6c287605f and 679d10331 since 5.14.0-179 */
+ { "RHEL9", "5.14.0-179" },
+ { NULL, NULL},
+ };
tst_kconfig_read(&migration_kconfig, 1);
tst_kconfig_read(&memory_kconfig, 1);
@@ -238,7 +244,7 @@ int tst_max_swapfiles(void)
tst_kconfig_read(&marker_kconfig, 1);
if (migration_kconfig.choice == 'y') {
- if (tst_kvercmp(5, 19, 0) < 0)
+ if (tst_kvercmp2(5, 19, 0, kvers) < 0)
swp_migration_num = 2;
else
swp_migration_num = 3;
@@ -258,7 +264,7 @@ int tst_max_swapfiles(void)
swp_pte_marker_num = 1;
} else {
if (marker_kconfig.choice == 'y') {
- if (tst_kvercmp(5, 19, 0) >= 0)
+ if (tst_kvercmp2(5, 19, 0, kvers) >= 0)
swp_pte_marker_num = 1;
}
}
--
2.27.0
More information about the ltp
mailing list