Migrating the libhugetlbfs/testcases/shm-gettest.c test
PATCH v3 1/1 Migrating the libhugetlbfs/testcases/shm-gettest.c test
Test Description: This testcase creates shared memory segments backed by hugepages, writes specific patterns to each segment, verifies pattern and detaches a shared memory segments in a loop.
This looping test was added to verify the functionality of large page backed shared memory segments. A segment is created, written, verified, and detached a specified number of times.
-Updated 'kernel/mem/.gitignore'
-Updated 'runtest/hugetlb' for number of iterations with -i 5
---
v3:
-Addressed v2 comments
-Updated 'runtest/hugetlb' for number of iterations with -i 5
v2:
-Fixed coding style errors as per 'make check' -Reporting TPASS moved inside do_shmtest() function -Moved testcase file from folder hugemmap to hugeshmget -Renamed testcase 'hugepage35.c' to hugeshmget06.c -Updated 'kernel/mem/.gitignore'
-Updated 'runtest/hugetlb' for number of iterations with -i 10
--- runtest/hugetlb | 1 + testcases/kernel/mem/.gitignore | 1 + .../mem/hugetlb/hugeshmget/hugeshmget06.c | 84 +++++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c
runtest/hugetlb +1 -0
@@ -44,6 +44,7 @@ hugeshmat02 hugeshmat02 -i 5 hugeshmat03 hugeshmat03 -i 5 hugeshmat04 hugeshmat04 -i 5 hugeshmat05 hugeshmat05 -i 5 +hugeshmat06 hugeshmat06 -i 5 hugeshmctl01 hugeshmctl01 -i 5 hugeshmctl02 hugeshmctl02 -i 5
testcases/kernel/mem/.gitignore +1 -0
@@ -47,6 +47,7 @@ /hugetlb/hugeshmget/hugeshmget02 /hugetlb/hugeshmget/hugeshmget03 /hugetlb/hugeshmget/hugeshmget05 +/hugetlb/hugeshmget/hugeshmget06 /ksm/ksm01 /ksm/ksm02 /ksm/ksm03
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +84 -0
84 lines not on this page · raw message
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi!
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c line 8
Quoted 11 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +8
-0@@ -0,0 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2005-2006, IBM Corporation. +* Author: David Gibson & Adam Litke +*/ + +/*\ +* DESCRIPTION
This should be [Description]
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c line 9
Quoted 1 line
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +1
-0+* hugeshmget06 -
This shouldn't be there.
Quoted 19 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +19
-0+* This testcase creates shared memory segments backed by hugepages, +* writes specific patterns to each segment, verifies pattern, +* and detaches a shared memory segments in a loop. +* It ensures that the hugepage backed shared memory functionalities +* works correctly by validating the data written to segment. +*/ + +#include "hugetlb.h" +#include "tst_safe_sysv_ipc.h" + +#define MNTPOINT "hugetlbfs/" +#define NR_HUGEPAGES 4 + +static long hpage_size; +static int shmid =-1 , key =-1 ; + +static void do_shmtest (void ) +{ +size_t i, j;
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c line 38
Quoted 10 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +10
-0+char pattern; +char *shmaddr; + + shmaddr =SAFE_SHMAT (shmid,0 ,SHM_RND ); +tst_res (TINFO ,"shmaddr: %p\n" , shmaddr); + +for (i =0 ; i <NR_HUGEPAGES ; i++) { + pattern =65 + (i %26 ); +tst_res (TINFO ,"Touching %p with %c\n" , + shmaddr + (i * hpage_size), pattern);
Please do not add newlines in the tst_res() format strings. Also this
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c line 44
Quoted 6 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +6
-0+memset (shmaddr + (i * hpage_size), pattern, hpage_size); + } + +for (i =0 ; i <NR_HUGEPAGES ; i++) { + pattern =65 + (i %26 ); +tst_res (TINFO ,"Verifying %p\n" , (shmaddr + (i * hpage_size)));
Here as well.
Quoted 5 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +5
-0+for (j =0 ; j < (size_t )hpage_size; j++) +if (*(shmaddr + (i * hpage_size) + j) != pattern) { +tst_res (TFAIL ,"Got wrong byte 0x%02x expected 0x%02x" , + *(shmaddr + (i * hpage_size) + j), + pattern);
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c line 59
Quoted 10 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +10
-0+return ; + } + } +SAFE_SHMDT ((const void *)shmaddr); +tst_res (TPASS ,"shm hugepages works correctly" ); +} + +static void run_test (void ) +{ +do_shmtest ();
What is the point of this indirection?
Just put the test code in the do_test() function instead.
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c line 65
Quoted 6 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +6
-0+} + +static void setup (void ) +{ + hpage_size =tst_get_hugepage_size (); +tst_res (TINFO ,"hugepage size is %ld" , hpage_size);
^
Just one space here.
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c line 67
Quoted 2 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +2
-0+ shmid =SAFE_SHMGET (key,NR_HUGEPAGES * hpage_size,SHM_HUGETLB |IPC_CREAT |SHM_R |SHM_W ); +tst_res (TINFO ,"shmid: 0x%x\n" , shmid);
^
Here as well, no newlines.
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c line 79
Quoted 12 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +12
-0+} + +static void cleanup (void ) +{ +if (shmid >=0 ) +SAFE_SHMCTL (shmid,IPC_RMID ,NULL ); +} + +static struct tst_test test = { + .needs_root =1 , + .mntpoint =MNTPOINT , + .needs_hugetlbfs =1 ,
The test does not use the hugetlbfs, no need to mount it at all.
Quoted 8 lines
testcases/kernel/mem/hugetlb/hugeshmget/hugeshmget06.c new file +5
-0+ .setup = setup, + .cleanup = cleanup, + .test_all = run_test, + .hugepages = {NR_HUGEPAGES, TST_NEEDS}, +};Signature · 1 line
2.43.0
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp