syscalls/nice05: Add testcase for nice() syscall
Hi Cyril,
Thanks for your review!
Best wishes,
Gongyi
Quoted 81 lines
Hi!
Quoted 79 lines
runtest/syscalls index renamed from runtest/syscalls +0
-0
88c31db06..a1f741d6a100644runtest/syscalls +1
-0@@ -901,6 +901,7 @@ nice01 nice01 nice02 nice02 nice03 nice03 nice04 nice04 +nice05 nice05 open01 open01 open01A symlink01 -T open01testcases/kernel/syscalls/nice/.gitignore +1
-0@@ -2,3 +2,4 @@ /nice02 /nice03 /nice04 +/nice05testcases/kernel/syscalls/nice/Makefile +5
-0@@ -3,6 +3,11 @@ top_srcdir ?= ../../../.. +LTPLIBS = ltpnewipc + +nice05: CFLAGS += -pthread +nice05: LTPLDLIBS += -lltpnewipc + include $(top_srcdir)/include/mk/testcases.mk include $(top_srcdir)/include/mk/generic_leaf_target.mktestcases/kernel/syscalls/nice/nice05.c new file +33
-0@@ -0,0 +1,196 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright(c) 2022 Huawei Technologies Co., Ltd +* Author: Li Mengfei <[email protected]> +* Zhao Gongyi <[email protected]> +*/ + +/*\ +* [Description] +* +* 1. Create a high nice thread and a low nice thread, the main +* thread wake them at the same time +* 2. Both threads run on the same CPU +* 3. Verify that the low nice thread executes more time than +* the high nice thread +*/ + +#define _GNU_SOURCE +#include <pthread.h> +#include <sys/types.h> +#include <stdio.h> +#include "tst_test.h" +#include "tst_safe_pthread.h" +#include "tst_safe_sysv_ipc.h" +#include "lapi/syscalls.h" +#include "libnewipc.h" + +static pthread_barrier_t barrier; +static int some_cpu; +static cpu_set_t *set; +static pid_t *child_tid; +static key_t shm_key; +static int shm_id;
Quoted 8 lines
testcases/kernel/syscalls/nice/nice05.c line 39
Quoted 6 lines
testcases/kernel/syscalls/nice/nice05.c new file +6
-0+ +static void set_nice (int nice_inc) +{ +int orig_nice; + + orig_nice =SAFE_GETPRIORITY (PRIO_PROCESS ,0 );Why not just nice(0) ?
Nice(0) is ok, but there are no safe API for nice() now, so we need to add it?
Quoted 11 lines
testcases/kernel/syscalls/nice/nice05.c line 44
Quoted 6 lines
testcases/kernel/syscalls/nice/nice05.c new file +5
-0+TEST (nice (nice_inc)); + +if (TST_RET != (orig_nice + nice_inc)) { +tst_brk (TFAIL |TTERRNO ,"nice(%d) returned %li, expected %i" , + nice_inc,TST_RET , orig_nice + nice_inc);You cannot use
tst_brk()with TFAIL unfortunatelly.
Quoted 13 lines
testcases/kernel/syscalls/nice/nice05.c line 53
Quoted 9 lines
testcases/kernel/syscalls/nice/nice05.c new file +9
-0+ } + +if (TST_ERR ) +tst_brk (TFAIL |TTERRNO ,"nice(%d) failed" , nice_inc); + +} + +static void *nice_low_thread (void *arg) { +int number =0 ;We may need to change the number to volatile in order to avoid for compiler being too smart about it's value.
LGTM
Quoted 47 lines
Quoted 47 lines
testcases/kernel/syscalls/nice/nice05.c new file +47
-0+int ret =0 ; + + child_tid[0 ] =tst_syscall (__NR_gettid); +set_nice (*(int *)arg); + ret =pthread_barrier_wait (&barrier); +if (ret !=0 && ret !=PTHREAD_BARRIER_SERIAL_THREAD ) { +tst_brk (TBROK ,"pthread_barrier_wait() returned %s" , +tst_strerrno (-ret)); + } + +while (1 ) + number++; + +return NULL ; +} + +static void *nice_high_thread (void *arg) { +int number =0 ; +int ret =0 ; + + child_tid[1 ] =tst_syscall (__NR_gettid); +set_nice (*(int *)arg); + ret =pthread_barrier_wait (&barrier); +if (ret !=0 && ret !=PTHREAD_BARRIER_SERIAL_THREAD ) { +tst_brk (TBROK ,"pthread_barrier_wait() returned %s" , +tst_strerrno (-ret)); + } + +while (1 ) + number++; + +return NULL ; +} + +static void setup (void ) +{ +size_t size; +int index; +int nrcpus =1024 ; + + set =CPU_ALLOC (nrcpus); +if (!set) +tst_brk (TBROK |TERRNO ,"CPU_ALLOC()" ); + + size =CPU_ALLOC_SIZE (nrcpus); +CPU_ZERO_S (size, set); +if (sched_getaffinity (0 , size, set) <0 )
Quoted 9 lines
testcases/kernel/syscalls/nice/nice05.c line 105
Quoted 5 lines
testcases/kernel/syscalls/nice/nice05.c new file +5
-0+tst_brk (TBROK |TERRNO ,"sched_getaffinity()" ); + +for (index =0 ; index < (int )size *8 ; index++) +if (CPU_ISSET_S (index, size, set)) + some_cpu = index;Can we just use i instead of index? Also if you define the loop variable as
size_tthere would be no need for the cast.
It seems more better.
Quoted 5 lines
Quoted 5 lines
testcases/kernel/syscalls/nice/nice05.c new file +5
-0+CPU_ZERO_S (size, set); +CPU_SET_S (some_cpu, size, set); +if (sched_setaffinity (0 , size, set) <0 ) +tst_brk (TBROK |TERRNO ,"sched_setaffinity()" ); +
Quoted 9 lines
testcases/kernel/syscalls/nice/nice05.c line 113
Quoted 3 lines
testcases/kernel/syscalls/nice/nice05.c new file +3
-0+ shm_key =GETIPCKEY (); + shm_id =SAFE_SHMGET (shm_key,getpagesize (),0666 |IPC_CREAT ); + child_tid =SAFE_SHMAT (shm_id,0 ,0 );We can jdust do a single
mmap()instead all of this. There is no need to bother with the IPC complexity since the forked child will simply have access to the shared memory mmaped bymmap(). Not to mention there are systems that does not have support for SysV IPC compiled in.
It seems more better.
Quoted 40 lines
Quoted 26 lines
testcases/kernel/syscalls/nice/nice05.c new file +26
-0+} + +static void cleanup (void ) +{ +if (set) +CPU_FREE (set); + +if (child_tid) +SAFE_SHMDT (child_tid); + +if (shm_id) +SAFE_SHMCTL (shm_id,IPC_RMID ,0 ); +} + +static void verify_nice (void ) +{ +int ret; +int nice_inc_high =-1 ; +int nice_inc_low =-2 ; +char buf[4096 ] = {0 }; +float sum_exec_runtime[2 ]; +pthread_t nice_low, nice_high; +pid_t pid; + + pid =SAFE_FORK (); +if (!pid) {testcases/kernel/syscalls/nice/nice05.c line 149
Quoted 10 lines
testcases/kernel/syscalls/nice/nice05.c new file +10
-0+ ret =pthread_barrier_init (&barrier,NULL ,3 ); +if (ret !=0 ) { +tst_brk (TBROK ,"pthread_barrier_init() returned %s" , +tst_strerrno (-ret)); + } + +SAFE_PTHREAD_CREATE (&nice_high,NULL , nice_high_thread, + (void *)&nice_inc_high); +SAFE_PTHREAD_CREATE (&nice_low,NULL , nice_low_thread, + (void *)&nice_inc_low);The usuall way how to pass an integer to a thread is to pass it by a value create with/casted to a correct size, we can for instance do:
Quoted 10 lines
intptr_t nice_inc_high = -1; pthread_create(...., (void*)nice_inc_high); And then cast it back to intptr_t int he thread function as: set_nice((intptr_t)arg);
It seems more better.
Quoted 24 lines
testcases/kernel/syscalls/nice/nice05.c line 157
Quoted 8 lines
testcases/kernel/syscalls/nice/nice05.c new file +8
-0+ ret =pthread_barrier_wait (&barrier); +if (ret !=0 && ret !=PTHREAD_BARRIER_SERIAL_THREAD ) { +tst_brk (TBROK ,"pthread_barrier_wait() returned %s" , +tst_strerrno (-ret)); + } + +while (1 ) +sleep (1 );Maybe even better:
while (1) pause();As that would not wake up every second unnecessarily.
testcases/kernel/syscalls/nice/nice05.c line 158
Quoted 1 line
testcases/kernel/syscalls/nice/nice05.c new file +1
-0+ }else {There is no need for the else branch, the child process does not return from the if branch at all.
testcases/kernel/syscalls/nice/nice05.c line 159
Quoted 1 line
testcases/kernel/syscalls/nice/nice05.c new file +1
-0+sleep (3 );This has to be tied to runtime now, so the test has to:
Quoted 6 lines
- set .max_runtime = 3, in the
tst_teststructure
- do sleep(tst_remaining_runtime()) here.The bonus point is that you can then change for how long the sampling runs with the -I commandline parameter.
Thanks for your suggestiones, it seems more better.
Quoted 43 lines
Quoted 37 lines
testcases/kernel/syscalls/nice/nice05.c new file +33
-1+SAFE_KILL (pid,SIGSTOP ); + +sprintf (buf,"/proc/%d/sched" , child_tid[0 ]); +SAFE_FILE_SCANF (buf,"%*s %*s %*s %*s %*s" +"%*s %*s %*f %*s %*s %*f %*s %*s %f" , + &sum_exec_runtime[0 ]); + +sprintf (buf,"/proc/%d/sched" , child_tid[1 ]); +SAFE_FILE_SCANF (buf,"%*s %*s %*s %*s %*s" +"%*s %*s %*f %*s %*s %*f %*s %*s %f" , + &sum_exec_runtime[1 ]); + +if (sum_exec_runtime[0 ] < sum_exec_runtime[1 ]) { +tst_brk (TFAIL ,"nice_low_thread sum_exec_runtime: %f " +"nice_high_thread sum_exec_runtime: %f" , + sum_exec_runtime[0 ], sum_exec_runtime[1 ]); + }else { +tst_res (TPASS ,"executes more cycles " +"than the high nice thread" ); + } + +SAFE_KILL (pid,SIGKILL ); +SAFE_WAIT (NULL ); + } +} + +static struct tst_test test = { + .setup = setup, + .cleanup = cleanup, + .test_all = verify_nice, + .needs_root =1 , + .forks_child =1 , +}; --2.17.1
Quoted 2 lines
--
Mailing list info: https://lists.linux.it/listinfo/ltp--
Cyril Hrubis
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp