<div dir="ltr"><div dir="ltr"><div class="gmail_default" style="font-size:small">Hi XuYang,</div><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small">Thanks for the quick work on refactoring. I'd suggest using the new '.request_hugepages'  in the testcase, would mind having a try?</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr"><div class="gmail_default" style="font-size:small">--- a/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c</div>+++ b/testcases/kernel/mem/hugetlb/hugeshmctl/hugeshmctl01.c<br>@@ -53,8 +53,6 @@ static void func_set(void);<br> static void func_rmid(void);<br> static void *set_shmat(void);<br> <br>-static long hugepages = 128;<br>-<br> static struct tst_option options[] = {<br>        {"s:", &nr_opt, "-s   num  Set the number of the been allocated hugepages"},<br>        {NULL, NULL, NULL}<br>@@ -290,15 +288,16 @@ void setup(void)<br> {<br>        long hpage_size;<br> <br>-       save_nr_hugepages();<br>-       if (nr_opt)<br>-               hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);<br>+       if (nr_opt) {<br>+               tst_hugepages = SAFE_STRTOL(nr_opt, 0, LONG_MAX);<br>+               tst_request_hugepages(tst_hugepages);<br>+       }<br>+<br>+       if (tst_hugepages == 0)<br>+               tst_brk(TCONF, "No enough hugepages for testing");<br> <br>-       limit_hugepages(&hugepages);<br>-       set_sys_tune("nr_hugepages", hugepages, 1);<br>        hpage_size = SAFE_READ_MEMINFO("Hugepagesize:") * 1024;<br>-<br>-       shm_size = hpage_size * hugepages / 2;<br>+       shm_size = hpage_size * tst_hugepages / 2;<br>        update_shm_size(&shm_size);<br>        shmkey = getipckey();<br> }<br>@@ -306,7 +305,6 @@ void setup(void)<br> void cleanup(void)<br> {<br>        rm_shm(shm_id_1);<br>-       restore_nr_hugepages();<br> }<br> <br> static struct tst_test test = {<br>@@ -318,4 +316,5 @@ static struct tst_test test = {<br>        .cleanup = cleanup,<br>        .test = test_hugeshmctl,<br>        .needs_checkpoints = 1,<br>+       .request_hugepages = 128,<br> };<br><div class="gmail_default" style="font-size:small"><br></div><div class="gmail_default" style="font-size:small"></div><br></div></div>-- <br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div>Regards,<br></div><div>Li Wang<br></div></div></div></div>