From mboxrd@z Thu Jan 1 00:00:00 1970 From: Punit Agrawal Date: Mon, 4 Dec 2017 16:36:44 +0000 Subject: [LTP] [PATCH v3 01/12] Move check_hugepage() helper to mem/lib In-Reply-To: <20171204163655.8838-1-punit.agrawal@arm.com> References: <20171204163655.8838-1-punit.agrawal@arm.com> Message-ID: <20171204163655.8838-2-punit.agrawal@arm.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: ltp@lists.linux.it Move the check_hugepage() helper to mem/lib to be more widely available to testcases. Specifically, it will be used in a subsequent commit to check for the presence of hugepage support when running the thp tests. Signed-off-by: Punit Agrawal --- testcases/kernel/mem/hugetlb/lib/hugetlb.c | 7 ------- testcases/kernel/mem/hugetlb/lib/hugetlb.h | 1 - testcases/kernel/mem/include/mem.h | 2 ++ testcases/kernel/mem/lib/mem.c | 6 ++++++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testcases/kernel/mem/hugetlb/lib/hugetlb.c b/testcases/kernel/mem/hugetlb/lib/hugetlb.c index f6a909a21..1ea47ebb5 100644 --- a/testcases/kernel/mem/hugetlb/lib/hugetlb.c +++ b/testcases/kernel/mem/hugetlb/lib/hugetlb.c @@ -26,7 +26,6 @@ * * The library contains the following routines: * - * check_hugepage() * getipckey() * getuserid() * rm_shm() @@ -42,12 +41,6 @@ static long orig_hugepages = -1; -void check_hugepage(void) -{ - if (access(PATH_HUGEPAGES, F_OK)) - tst_brk(TCONF, "Huge page is not supported."); -} - long save_nr_hugepages(void) { check_hugepage(); diff --git a/testcases/kernel/mem/hugetlb/lib/hugetlb.h b/testcases/kernel/mem/hugetlb/lib/hugetlb.h index 53da45d8c..2843f0a8e 100644 --- a/testcases/kernel/mem/hugetlb/lib/hugetlb.h +++ b/testcases/kernel/mem/hugetlb/lib/hugetlb.h @@ -46,7 +46,6 @@ * from shmid_ds.ipc_perm.mode */ #define MODE_MASK 0x01FF -#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/" key_t shmkey; /* an IPC key generated by ftok() */ diff --git a/testcases/kernel/mem/include/mem.h b/testcases/kernel/mem/include/mem.h index 287f8b3f6..95d0bda72 100644 --- a/testcases/kernel/mem/include/mem.h +++ b/testcases/kernel/mem/include/mem.h @@ -56,8 +56,10 @@ void test_ksm_merge_across_nodes(unsigned long nr_pages); /* HUGETLB */ +#define PATH_HUGEPAGES "/sys/kernel/mm/hugepages/" #define PATH_SHMMAX "/proc/sys/kernel/shmmax" +void check_hugepage(void); void write_memcg(void); /* cpuset/memcg */ diff --git a/testcases/kernel/mem/lib/mem.c b/testcases/kernel/mem/lib/mem.c index fc2f130f4..7f2099b9e 100644 --- a/testcases/kernel/mem/lib/mem.c +++ b/testcases/kernel/mem/lib/mem.c @@ -347,6 +347,12 @@ static void verify(char **memory, char value, int proc, free(s); } +void check_hugepage(void) +{ + if (access(PATH_HUGEPAGES, F_OK)) + tst_brk(TCONF, "Huge page is not supported."); +} + void write_memcg(void) { SAFE_FILE_PRINTF(MEMCG_LIMIT, "%ld", TESTMEM); -- 2.15.0