From patchwork Fri Dec 22 05:00:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yang Xu \\(Fujitsu\\)" X-Patchwork-Id: 1879541 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=patchwork.ozlabs.org) Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SxJ5937H7z1ySd for ; Fri, 22 Dec 2023 17:57:17 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 2CF7D3CEEFE for ; Fri, 22 Dec 2023 07:57:15 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [IPv6:2001:4b78:1:20::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id B65FC3C81C6 for ; Fri, 22 Dec 2023 07:57:12 +0100 (CET) Received: from esa9.hc1455-7.c3s2.iphmx.com (esa9.hc1455-7.c3s2.iphmx.com [139.138.36.223]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id D158E1A001C9 for ; Fri, 22 Dec 2023 07:57:10 +0100 (CET) X-IronPort-AV: E=McAfee;i="6600,9927,10931"; a="132679192" X-IronPort-AV: E=Sophos;i="6.04,294,1695654000"; d="scan'208";a="132679192" Received: from unknown (HELO oym-r2.gw.nic.fujitsu.com) ([210.162.30.90]) by esa9.hc1455-7.c3s2.iphmx.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Dec 2023 15:57:09 +0900 Received: from oym-m4.gw.nic.fujitsu.com (oym-nat-oym-m4.gw.nic.fujitsu.com [192.168.87.61]) by oym-r2.gw.nic.fujitsu.com (Postfix) with ESMTP id 1156CD7AC6 for ; Fri, 22 Dec 2023 15:57:07 +0900 (JST) Received: from kws-ab3.gw.nic.fujitsu.com (kws-ab3.gw.nic.fujitsu.com [192.51.206.21]) by oym-m4.gw.nic.fujitsu.com (Postfix) with ESMTP id 39A34D601A for ; Fri, 22 Dec 2023 15:57:06 +0900 (JST) Received: from edo.cn.fujitsu.com (edo.cn.fujitsu.com [10.167.33.5]) by kws-ab3.gw.nic.fujitsu.com (Postfix) with ESMTP id CB350202C9741 for ; Fri, 22 Dec 2023 15:57:05 +0900 (JST) Received: from rhel93GA.g08.fujitsu.local (unknown [10.167.221.71]) by edo.cn.fujitsu.com (Postfix) with ESMTP id 7DED91A006F; Fri, 22 Dec 2023 14:57:05 +0800 (CST) From: Yang Xu To: ltp@lists.linux.it Date: Fri, 22 Dec 2023 00:00:06 -0500 Message-Id: <20231222050006.148845-7-xuyang2018.jy@fujitsu.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20231222050006.148845-1-xuyang2018.jy@fujitsu.com> References: <20231205061639.68656-3-xuyang2018.jy@fujitsu.com> <20231222050006.148845-1-xuyang2018.jy@fujitsu.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-TM-AS-Product-Ver: IMSS-9.1.0.1417-9.0.0.1002-28072.005 X-TM-AS-User-Approved-Sender: Yes X-TMASE-Version: IMSS-9.1.0.1417-9.0.1002-28072.005 X-TMASE-Result: 10--5.234500-10.000000 X-TMASE-MatchedRID: NuUGwdOZh4b5S+IvXI7mDQA+Y0oNaxbQ1QQ6Jx/fflbEWhdVdXNnv4nO /I/i7S2AIvrftAIhWmLy9zcRSkKatWk5Fql3Faa7Y1fUkIWBImr0swHSFcVJ6Ls3Yh2IOCYzBv9 +XtincoPi8zVgXoAltsIJ+4gwXrEtIAcCikR3vq/SIqa+Qv0wq59PtedMEG6K/I4pDH9aHX/YfS qYjlK0eBLynu0CNWG7 X-TMASE-SNAP-Result: 1.821001.0001-0-1-22:0,33:0,34:0-0 X-Virus-Scanned: clamav-milter 1.0.3 at in-3.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-0.0 required=7.0 tests=SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=disabled version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-13) on in-3.smtp.seeweb.it Subject: [LTP] [PATCH v2 7/7] Add fallback for RHEL9 X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" 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 --- 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 e10a6f5b2..8c7729b8b 100644 --- a/libs/libltpswap/libswap.c +++ b/libs/libltpswap/libswap.c @@ -12,6 +12,7 @@ #include "libswap.h" #include "lapi/syscalls.h" #include "tst_kconfig.h" +#include "tst_kvercmp.h" #include "tst_safe_stdio.h" #define BUFSIZE 1024 @@ -81,6 +82,11 @@ unsigned int get_maxswapfiles(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); @@ -88,7 +94,7 @@ unsigned int get_maxswapfiles(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; @@ -105,7 +111,7 @@ unsigned int get_maxswapfiles(void) } 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; }