diff mbox series

[v5,7/7] Add fallback for RHEL9

Message ID 20240226135336.19733-7-xuyang2018.jy@fujitsu.com
State Accepted
Headers show
Series [v5,1/7] libltpswap: Add tst_max_swapfiles API | expand

Commit Message

Yang Xu Feb. 26, 2024, 1:53 p.m. UTC 
Since device number patch and pte number patch have been backported into
RHEL9,  we should add fallback for this distro.

Acked-by: Petr Vorel <pvorel@suse.cz>
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
 libs/libltpswap/libswap.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/libs/libltpswap/libswap.c b/libs/libltpswap/libswap.c
index 5e0c79b8f..c8cbb8ea1 100644
--- a/libs/libltpswap/libswap.c
+++ b/libs/libltpswap/libswap.c
@@ -18,6 +18,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 = TST_KCONFIG_INIT("CONFIG_MEMORY_FAILURE");
 	struct tst_kconfig_var device = TST_KCONFIG_INIT("CONFIG_DEVICE_PRIVATE");
 	struct tst_kconfig_var marker = 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, 1);
 	tst_kconfig_read(&memory, 1);
@@ -238,7 +244,7 @@  int tst_max_swapfiles(void)
 	tst_kconfig_read(&marker, 1);
 
 	if (migration.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;
@@ -254,7 +260,7 @@  int tst_max_swapfiles(void)
 			swp_device_num = 4;
 	}
 
-	if ((marker.choice == 'y' && tst_kvercmp(5, 19, 0) >= 0) ||
+	if ((marker.choice == 'y' && tst_kvercmp2(5, 19, 0, kvers) >= 0) ||
 		tst_kvercmp(6, 2, 0) >= 0) {
 		swp_pte_marker_num = 1;
 	}