From mboxrd@z Thu Jan 1 00:00:00 1970 From: Punit Agrawal Date: Tue, 14 Nov 2017 15:59:17 +0000 Subject: [LTP] [PATCH v2 01/13] Move check_hugepage() helper to mem/lib In-Reply-To: <20171114155929.24237-1-punit.agrawal@arm.com> References: <20171114155929.24237-1-punit.agrawal@arm.com> Message-ID: <20171114155929.24237-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 | 6 ------ testcases/kernel/mem/hugetlb/lib/hugetlb.h | 3 --- testcases/kernel/mem/include/mem.h | 2 ++ testcases/kernel/mem/lib/mem.c | 6 ++++++ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/testcases/kernel/mem/hugetlb/lib/hugetlb.c b/testcases/kernel/mem/hugetlb/lib/hugetlb.c index 7afc7d4b4..2f86e3558 100644 --- a/testcases/kernel/mem/hugetlb/lib/hugetlb.c +++ b/testcases/kernel/mem/hugetlb/lib/hugetlb.c @@ -40,12 +40,6 @@ #include #include "hugetlb.h" -void check_hugepage(void) -{ - if (access(PATH_HUGEPAGES, F_OK)) - tst_brk(TCONF, "Huge page is not supported."); -} - /* * getipckey() - generates and returns a message key used by the "get" * calls to create an IPC resource. diff --git a/testcases/kernel/mem/hugetlb/lib/hugetlb.h b/testcases/kernel/mem/hugetlb/lib/hugetlb.h index c6d2016b7..76c1e8f30 100644 --- a/testcases/kernel/mem/hugetlb/lib/hugetlb.h +++ b/testcases/kernel/mem/hugetlb/lib/hugetlb.h @@ -45,12 +45,9 @@ * 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() */ -void check_hugepage(void); - int getipckey(void); int getuserid(char *user); void rm_shm(int shm_id); 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.14.2