sched/sched_stress:Modify sched driver param to run long term testcases
PATCH 1/1 sched/sched_stress:Modify sched driver param to run long term testcases
From: luofenglin <[email protected]>
Add sched_driver process slots param to 10, then long term testcases can run. Additionally, add sched_driver run time 0.05 hour, long term testcases run 1/5 of total time.
--- testcases/kernel/sched/sched_stress/sched_driver.c | 6 +++++- testcases/kernel/sched/sched_stress/sched_stress.sh | 3 ++- 2 files changed, 7 insertions(+), 2 deletions(-)
testcases/kernel/sched/sched_stress/sched_driver.c +5 -1
@@ -202,8 +202,12 @@ int main(int argc, char **argv)/* * Start the long-term testcases running +* Run time set 1/5 of total */ -start_long_term_testcases (long_term_slot_total, argv[2 ]); +char run_long_term_time[20 ]; +int runlongtime = runseconds /5 ; +sprintf (run_long_term_time,"%d" , runlongtime); +start_long_term_testcases (long_term_slot_total, run_long_term_time); short_term_slot_total = workslots /2 ;fflush (stdout);
testcases/kernel/sched/sched_stress/sched_stress.sh +2 -1
@@ -30,6 +30,7 @@ export KERNEL=./sched_datafile touch $KERNEL echo 0.000000 > sch.measure export RAWDEV=`df / | grep dev | awk {'print $1'}` -sched_driver -s 0.9 -t 0.02 -p 2 > /tmp/tmp$$ +echo "Result file: /tmp/tmp$$" +sched_driver -s 0.9 -t 0.05 -p 10 -d > /tmp/tmp$$ tail -n 5 /tmp/tmp$$ rm -rf /tmp/tmp$$ ./sched_datafile sch.measure
--
2.17.1
PATCH v2 1/1 sched/sched_stress:Fixed param of sched_tc
From: luofenglin <[email protected]>
Rt flag of sched_tc must like "-pfixed" or "-pvariable"
--- .../kernel/sched/sched_stress/sched_driver.c | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-)
testcases/kernel/sched/sched_stress/sched_driver.c +27 -24
@@ -621,25 +621,28 @@ char *execution_time; /* runtime hours to pass to each testcase */printf ("long-term slots available: %d\n" , long_term_slot_total); +char timeparam[30 ]; +sprintf (timeparam,"-t%s" , execution_time); +for (i =0 ; i < (long_term_slot_total /4 ); i++) {#if defined(_IA64) && !defined(__64BIT__) -start_testcase ("./sched_tc0.32" ,"sched_tc0 -t" , execution_time, -" -p1" ,NULL ,NULL ); -start_testcase ("./sched_tc2.32" ,"sched_tc2" , execution_time, -"1" ,NULL ,NULL ); -start_testcase ("./sched_tc0.32" ,"sched_tc0 -t" , execution_time, -" -p0" ,NULL ,NULL ); -start_testcase ("./sched_tc2.32" ,"sched_tc2" , execution_time, -"0" ,NULL ,NULL ); +start_testcase ("./sched_tc0.32" ,"sched_tc0" , timeparam, +"-pfixed" ,"-d" ,NULL ); +start_testcase ("./sched_tc2.32" ,"sched_tc2" , timeparam, +"-pfixed" ,"-d" ,NULL ); +start_testcase ("./sched_tc0.32" ,"sched_tc0" , timeparam, +"-pvariable" ,"-d" ,NULL ); +start_testcase ("./sched_tc2.32" ,"sched_tc2" , timeparam, +"-pvariable" ,"-d" ,NULL );#else -start_testcase ("./sched_tc0" ,"sched_tc0 -t" , execution_time, -" -p1" ,NULL ,NULL ); -start_testcase ("./sched_tc2" ,"sched_tc2" , execution_time,"1" , -NULL ,NULL ); -start_testcase ("./sched_tc0" ,"sched_tc0 -t" , execution_time, -" -p0" ,NULL ,NULL ); -start_testcase ("./sched_tc2" ,"sched_tc2" , execution_time,"0" , -NULL ,NULL ); +start_testcase ("./sched_tc0" ,"sched_tc0" , timeparam, +"-pfixed" ,"-d" ,NULL ); +start_testcase ("./sched_tc2" ,"sched_tc2" , timeparam,"-pfixed" , +"-d" ,NULL ); +start_testcase ("./sched_tc0" ,"sched_tc0" , timeparam, +"-pvariable" ,"-d" ,NULL ); +start_testcase ("./sched_tc2" ,"sched_tc2" , timeparam,"-pvariable" , +"-d" ,NULL );#endif } }
@@ -674,22 +677,22 @@ void start_short_term_testcases(int short_term_slot_total,for (i =0 ; i < (short_term_slots /4 ); i++) {#if defined(_IA64) && !defined(__64BIT__) -start_testcase ("./sched_tc1.32" ,"sched_tc1" ,"1" ,NULL ,NULL , +start_testcase ("./sched_tc1.32" ,"sched_tc1" ,"-pfixed" ,"-d" ,NULL ,NULL ); -start_testcase ("./sched_tc3.32" ,"sched_tc3" ,"1" ,NULL ,NULL , +start_testcase ("./sched_tc3.32" ,"sched_tc3" ,"-pfixed" ,"-d" ,NULL ,NULL ); -start_testcase ("./sched_tc1.32" ,"sched_tc1" ,"0" ,NULL ,NULL , +start_testcase ("./sched_tc1.32" ,"sched_tc1" ,"-pvariable" ,"-d" ,NULL ,NULL ); -start_testcase ("./sched_tc3.32" ,"sched_tc3" ,"0" ,NULL ,NULL , +start_testcase ("./sched_tc3.32" ,"sched_tc3" ,"-pvariable" ,"-d" ,NULL ,NULL );#else -start_testcase ("./sched_tc1" ,"sched_tc1" ,"1" ,NULL ,NULL , +start_testcase ("./sched_tc1" ,"sched_tc1" ,"-pfixed" ,"-d" ,NULL ,NULL ); -start_testcase ("./sched_tc3" ,"sched_tc3" ,"1" ,NULL ,NULL , +start_testcase ("./sched_tc3" ,"sched_tc3" ,"-pfixed" ,"-d" ,NULL ,NULL ); -start_testcase ("./sched_tc1" ,"sched_tc1" ,"0" ,NULL ,NULL , +start_testcase ("./sched_tc1" ,"sched_tc1" ,"-pvariable" ,"-d" ,NULL ,NULL ); -start_testcase ("./sched_tc3" ,"sched_tc3" ,"0" ,NULL ,NULL , +start_testcase ("./sched_tc3" ,"sched_tc3" ,"-pvariable" ,"-d" ,NULL ,NULL );#endif #if 0
Signature · 1 line
2.17.1
PATCH v2 1/1 sched/sched_stress:Fixed param of sched_tc
Hi!
Quoted 12 lines
Rt flag of
sched_tcmust like "-pfixed" or "-pvariable"Signed-off-by luofenglin <[email protected]>--- .../kernel/sched/sched_stress/sched_driver.c | 51 ++++++++++--------- 1 file changed, 27 insertions(+), 24 deletions(-)testcases/kernel/sched/sched_stress/sched_driver.c +0
-0
testcases/kernel/sched/sched_stress/sched_driver.c char *execution_time; /* runtime hours to pass to each testcase */ · line 625
Quoted 5 lines
testcases/kernel/sched/sched_stress/sched_driver.c +2
-0@@ -621,25 +621,28 @@ char *execution_time; /* runtime hours to pass to each testcase */printf ("long-term slots available: %d\n" , long_term_slot_total); +char timeparam[30 ]; +sprintf (timeparam,"-t%s" , execution_time);
Why do we need this? It's not explained in the commit message at all.
The other change looks obviously fine.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v3 1/1 sched/sched_stress:Bugfix for setting real time priority
In reply to Luo FenglinFrom: luofenglin <[email protected]>
When real time flag is set, setpriority function is used for user-time policy setting, here use sched_setscheduler to set real time policy RR instead
--------
Upxxxx
--- testcases/kernel/sched/sched_stress/sched.h | 2 ++ testcases/kernel/sched/sched_stress/sched_tc0.c | 10 ++++++---- testcases/kernel/sched/sched_stress/sched_tc1.c | 10 ++++++---- testcases/kernel/sched/sched_stress/sched_tc2.c | 10 ++++++---- testcases/kernel/sched/sched_stress/sched_tc3.c | 10 ++++++---- testcases/kernel/sched/sched_stress/sched_tc4.c | 9 +++++---- testcases/kernel/sched/sched_stress/sched_tc5.c | 9 +++++---- testcases/kernel/sched/sched_stress/sched_tc6.c | 8 +++++--- 8 files changed, 41 insertions(+), 27 deletions(-)
testcases/kernel/sched/sched_stress/sched.h +2 -0
@@ -46,8 +46,10 @@#include <time.h> #include <errno.h> #include <stdio.h> +#include <sched.h> #define DEFAULT_PRIORITY 70 +#define SET_RT_SCHEDULER (paraA, paraB, paraC) sched_setscheduler(paraA, paraB, paraC)#if 0 int openlog (char *);
testcases/kernel/sched/sched_stress/sched_tc0.c +6 -4
@@ -90,7 +90,9 @@ int verbose = 0;int debug =0 ;long execution_time =DEFAULT_EXECUTION_TIME ;char *priority =DEFAULT_PRIORITY_TYPE ; - +struct sched_param param = { + .sched_priority =DEFAULT_PRIORITY +};/*---------------------------------------------------------------------+ | main | | ==================================================================== |
@@ -127,10 +129,10 @@ int main(int argc, char **argv)if (!strcmp (priority,"fixed" )) {#ifndef __linux__if (setpri (0 ,DEFAULT_PRIORITY ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +sys_error ("set rt pri failed" , __FILE__, __LINE__);#else -if (setpriority (PRIO_PROCESS ,0 ,0 ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +if (SET_RT_SCHEDULER (0 ,SCHED_RR , ¶m) <0 ) +sys_error ("set rt pri failed" , __FILE__, __LINE__);#endif }
testcases/kernel/sched/sched_stress/sched_tc1.c +6 -4
@@ -72,7 +72,9 @@void process_file (char *);void parse_args (int ,char **);void signal_handler (); - +struct sched_param param = { + .sched_priority =DEFAULT_PRIORITY +};/* * Global variables: *
@@ -128,10 +130,10 @@ int main(int argc, char **argv)if (!strcmp (priority,"fixed" )) {#ifndef __linux__if (setpri (0 ,DEFAULT_PRIORITY ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +sys_error ("set rt pri failed" , __FILE__, __LINE__);#else -if (setpriority (PRIO_PROCESS ,0 ,0 ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +if (SET_RT_SCHEDULER (0 ,SCHED_RR , ¶m) <0 ) +sys_error ("set rt pri failed" , __FILE__, __LINE__);#endif }
testcases/kernel/sched/sched_stress/sched_tc2.c +6 -4
@@ -47,7 +47,9 @@#include <sys/time.h> #include <sys/resource.h> #include "sched.h" - +struct sched_param param = { + .sched_priority =DEFAULT_PRIORITY +};/* * Defines: *
@@ -129,10 +131,10 @@ int main(int argc, char **argv)if (!strcmp (priority,"fixed" )) {#ifndef __linux__if (setpri (0 ,DEFAULT_PRIORITY ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +sys_error ("set rt pri failed" , __FILE__, __LINE__);#else -if (setpriority (PRIO_PROCESS ,0 ,0 ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +if (SET_RT_SCHEDULER (0 ,SCHED_RR , ¶m) <0 ) +sys_error ("set rt pri failed" , __FILE__, __LINE__);#endif }
testcases/kernel/sched/sched_stress/sched_tc3.c +6 -4
@@ -95,7 +95,9 @@ int verbose = 0;int debug =0 ;int signaled =0 ;char *priority =DEFAULT_PRIORITY_TYPE ; - +struct sched_param param = { + .sched_priority =DEFAULT_PRIORITY +};/*---------------------------------------------------------------------+ | main | | ==================================================================== |
@@ -131,10 +133,10 @@ int main(int argc, char **argv)if (!strcmp (priority,"fixed" )) {#ifndef __linux__if (setpri (0 ,DEFAULT_PRIORITY ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +sys_error ("set rt pri failed" , __FILE__, __LINE__);#else -if (setpriority (PRIO_PROCESS ,0 ,0 ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +if (SET_RT_SCHEDULER (0 ,SCHED_RR , ¶m) <0 ) +sys_error ("set rt pri failed" , __FILE__, __LINE__);#endif }
testcases/kernel/sched/sched_stress/sched_tc4.c +5 -4
@@ -99,7 +99,7 @@ int debug = 0;int priority =DEFAULT_PRIORITY ;char *logfile =DEFAULT_LOGFILE ;char *priority_type =DEFAULT_PRIORITY_TYPE ; - +struct sched_param param;/*---------------------------------------------------------------------+ | main | | ==================================================================== |
@@ -133,10 +133,11 @@ int main(int argc, char **argv)if (!strcmp (priority_type,"fixed" )) {#ifndef __linux__if (setpri (0 ,DEFAULT_PRIORITY ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +sys_error ("set rt pri failed" , __FILE__, __LINE__);#else -if (setpriority (PRIO_PROCESS ,0 ,0 ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); + param.sched_priority = priority; +if (SET_RT_SCHEDULER (0 ,SCHED_RR , ¶m) <0 ) +sys_error ("set rt pri failed" , __FILE__, __LINE__);#endif }else {if (nice ((priority -50 ) - (nice (0 ) +20 )) <0 && errno !=0 )
testcases/kernel/sched/sched_stress/sched_tc5.c +5 -4
@@ -95,7 +95,7 @@ int debug = 0;int priority =DEFAULT_PRIORITY ;char *logfile =DEFAULT_LOGFILE ;char *priority_type =DEFAULT_PRIORITY_TYPE ; - +struct sched_param param;/*---------------------------------------------------------------------+ | main | | ==================================================================== |
@@ -130,10 +130,11 @@ int main(int argc, char **argv)if (!strcmp (priority_type,"fixed" )) {#ifndef __linux__if (setpri (0 ,DEFAULT_PRIORITY ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +sys_error ("set rt pri failed" , __FILE__, __LINE__);#else -if (setpriority (PRIO_PROCESS ,0 ,0 ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); + param.sched_priority = priority; +if (SET_RT_SCHEDULER (0 ,SCHED_RR , ¶m) <0 ) +sys_error ("set rt pri failed" , __FILE__, __LINE__);#endif }else {if (nice ((priority -50 ) - (nice (0 ) +20 )) <0 && errno !=0 )
testcases/kernel/sched/sched_stress/sched_tc6.c +5 -3
@@ -117,6 +117,7 @@ char *logfile = DEFAULT_LOGFILE;char *priority_type =DEFAULT_PRIORITY_TYPE ;struct flock flock_struct;struct flock *flock_ptr = &flock_struct; +struct sched_param param;int open_file (char *,int );
@@ -163,10 +164,11 @@ int main(int argc, char **argv)if (!strcmp (priority_type,"fixed" )) {#ifndef __linux__if (setpri (0 ,DEFAULT_PRIORITY ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); +sys_error ("set rt pri failed" , __FILE__, __LINE__);#else -if (setpriority (PRIO_PROCESS ,0 ,0 ) <0 ) -sys_error ("setpri failed" , __FILE__, __LINE__); + param.sched_priority = priority; +if (SET_RT_SCHEDULER (0 ,SCHED_RR , ¶m) <0 ) +sys_error ("set rt pri failed" , __FILE__, __LINE__);#endif }else {if (nice ((priority -50 ) - (nice (0 ) +20 )) <0 && errno !=0 )
Signature · 1 line
2.17.1
PATCH v3 1/1 sched/sched_stress:Bugfix for setting real time priority
Hi!
Quoted 3 lines
When real time flag is set, setpriority function is used for user-time policy setting, here use
sched_setschedulerto set real time policy RR instead
This explains what has been changed, which is not useful, everyone can see read the code diff.
What is missing here is why this has been changed, as when you change the testcases to run with realtime priority the test behavior changes and we do end up testing something different that the test originally did.
The main problem with the testsuite is that it's missing high level description what exactly is being tested and why. The README just says run sched_stress.sh, that's not useful at all.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH 1/1 sched/sched_stress:Modify sched driver param to run long term testcases
In reply to Luo FenglinHi!
Quoted 3 lines
Add
sched_driverprocess slots param to 10, then long term testcases can run. Additionally, addsched_driverrun time 0.05 hour, long term testcases run 1/5 of total time.
This does not say why should we run the long term testcases for 1/5 of total time. As far as I can tell the code looks like the long term tests are supposed to run on background while we execute the short term tests in a loop while changing their priority.
Also each logical change should be in a separate patch.
The change to to increase the slots looks good, but should really go in as a separate patch that explains the change.
Signature · 2 lines
Cyril Hrubis [email protected]