From: Wanlong G. <gao...@cn...> - 2012-04-02 08:44:27
|
check shm_size to make sure that it's not bigger that shmmax. Signed-off-by: Wanlong Gao <gao...@cn...> --- testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c | 1 + testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c | 1 + testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c | 1 + 3 files changed, 3 insertions(+) diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c index 573a060..b4c02ab 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c +++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c @@ -416,6 +416,7 @@ void setup(void) hpage_size = read_meminfo("Hugepagesize:") * 1024; shm_size = hpage_size * hugepages / 2; + check_shmmax(&shm_size); shmkey = getipckey(); TEST_PAUSE; diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c index 14370ff..791c9f2 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c +++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl02.c @@ -140,6 +140,7 @@ void setup(void) hpage_size = read_meminfo("Hugepagesize:") * 1024; shm_size = hpage_size * hugepages / 2; + check_shmmax(&shm_size); shmkey = getipckey(); /* create a shared memory segment without read or write permissions */ diff --git a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c index 1859552..cc6088c 100644 --- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c +++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl03.c @@ -166,6 +166,7 @@ void setup(void) hpage_size = read_meminfo("Hugepagesize:") * 1024; shm_size = hpage_size * hugepages / 2; + check_shmmax(&shm_size); shmkey = getipckey(); shm_id_1 = shmget(shmkey, shm_size, SHM_HUGETLB|IPC_CREAT|IPC_EXCL|SHM_RW); -- 1.7.10.rc3 |