rt-tests: queuelat: Fix some warnings in determine_maximum_mpps.sh
PATCH 1/8 rt-tests: queuelat: Fix some warnings in determine_maximum_mpps.sh
Coverity advises to quote some values to prevent word splitting and to export variables separately after declaraing them to avoid masking errors.
Fix these warnings
--- src/queuelat/determine_maximum_mpps.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
src/queuelat/determine_maximum_mpps.sh +8 -7
@@ -18,7 +18,7 @@ for mpps in `seq 3 3 50`; do echo testing $mpps Mpps OUTFILE=`mktemp` - $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `sh get_cpuinfo_mhz.sh` -p $mpps -t 30 > $OUTFILE + $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `sh get_cpuinfo_mhz.sh` -p "$mpps" -t 30 > $OUTFILE exceeded=`grep exceeded $OUTFILE` if [ ! -z "$exceeded" ]; then
@@ -34,7 +34,7 @@ for mpps in `seq $first_mpps -1 3`; do echo testing $mpps Mpps OUTFILE=`mktemp` - $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `sh get_cpuinfo_mhz.sh` -p $mpps -t 30 > $OUTFILE + $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `sh get_cpuinfo_mhz.sh` -p "$mpps" -t 30 > $OUTFILE exceeded=`grep exceeded $OUTFILE` if [ -z "$exceeded" ]; then
@@ -51,7 +51,7 @@ for mpps in `seq $second_mpps 0.3 $first_mpps`; do echo testing $mpps Mpps OUTFILE=`mktemp` - $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `sh get_cpuinfo_mhz.sh` -p $mpps -t 30 > $OUTFILE + $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `sh get_cpuinfo_mhz.sh` -p "$mpps" -t 30 > $OUTFILE exceeded=`grep exceeded $OUTFILE` if [ ! -z "$exceeded" ]; then
@@ -68,7 +68,7 @@ for mpps in `seq $third_mpps -0.1 3`; do echo testing $mpps Mpps OUTFILE=`mktemp` - $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `sh get_cpuinfo_mhz.sh` -p $mpps -t 30 > $OUTFILE + $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `sh get_cpuinfo_mhz.sh` -p "$mpps" -t 30 > $OUTFILE exceeded=`grep exceeded $OUTFILE` if [ -z "$exceeded" ]; then
@@ -87,13 +87,14 @@ while [ $queuelat_failure == 1 ]; do echo "$mpps Mpps" for i in `seq 1 10`; do - $PREAMBLE ./queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `get_cpuinfo_mhz.sh` -p $mpps -t 30 > $OUTFILE + $PREAMBLE ./queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `get_cpuinfo_mhz.sh` -p "$mpps" -t 30 > $OUTFILE exceeded=`grep exceeded $OUTFILE` if [ ! -z "$exceeded" ]; then echo "mpps failure (run $i) $mpps" export queuelat_failure=1 - export mpps=`echo $mpps - 0.1 | bc` + mpps=`echo $mpps - 0.1 | bc` + export mpps break fi echo "run $i success"
@@ -109,7 +110,7 @@ while [ $queuelat_failure == 1 ]; do echo -n "Starting 10 minutes run with " echo "$mpps Mpps" - $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `get_cpuinfo_mhz.sh` -p $mpps -t 600 > $OUTFILE + $PREAMBLE queuelat -m $MAXLAT -c $CYCLES_PER_PACKET -f `get_cpuinfo_mhz.sh` -p "$mpps" -t 600 > $OUTFILE exceeded=`grep exceeded $OUTFILE` if [ ! -z "$exceeded" ]; then
Signature · 1 line
2.20.1
PATCH 2/8 rt-tests: ssdd: Add short and long functions as well as help
Add short and long functions as well as help to make ssdd consistent with the rest of the test suite. Add a help function as well
--- src/ssdd/ssdd.8 | 10 +++++++--- src/ssdd/ssdd.c | 45 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 46 insertions(+), 9 deletions(-)
src/ssdd/ssdd.8 +7 -3
@@ -3,7 +3,7 @@ ssdd \- have a tracer do a bunch of PTRACE_SINGLESTEPs .SH SYNOPSIS .B ssdd -.RI "[nforks] [niters]" +.RI "<options>" .SH DESCRIPTION Have a tracer do a bunch of PTRACE_SINGLESTEPs against a tracee as fast as possible. Create several of these
@@ -12,15 +12,19 @@ interfere with each other. The tracer waits on each PTRACE_SINGLESTEP with a waitpid(2) and checks that waitpid's return values for correctness. .SH OPTIONS -.B nforks +.B \-f, \-\-forks number of tracer/tracee pairs to fork off. Default is 10. .br .TP -.B niters +.B \-i, \-\-iters number of PTRACE_SINGLESTEP iterations to do before declaring success, for each tracer/ tracee pair set up. Default is 10,000. +.br +.TP +.B \-h, \-\-help +Display usage .SH AUTHOR ssdd was written by Joe Korty <[email protected]>
src/ssdd/ssdd.c +39 -6
64 lines not on this page · raw message
Signature · 1 line
2.20.1
PATCH 5/8 rt-tests: cyclictest: Get a snapshot of cyclictest without interuppting it
In reply to John KacurRight now if you are running cyclictest you can send it SIGUSR1 and it will spill out the data at a moment in time, and keep running.
However, this can be problematic if you are using another program such as rteval to consume the data.
This feature here lets you send SIGUSR2 to cyclictest and it dumps status to shared memory so you can read it without interrupting cyclictest and without interferring with the data it is outputing.
To use it, start cyclictest in one term, then in another term send it SIGUSR2, and then you can just cat the results like this:
[jkacur@planxty rt-tests]$ ps ax | tail
14083 ? I 0:00 [kworker/1:0-events]
14108 ? I 0:01 [kworker/u16:3-events_unbound]
14150 ? I 0:00 [kworker/7:0-mm_percpu_wq]
14287 pts/9 SLl+ 0:14 ./cyclictest -t
14324 ? I 0:00 [kworker/1:2]
14341 ? I 0:00 [kworker/0:2]
14342 ? I 0:00 [kworker/2:1]
14363 ? I 0:00 [kworker/u16:0-events_unbound]
14381 pts/2 R+ 0:00 ps ax
14382 pts/2 S+ 0:00 tail
[jkacur@planxty rt-tests]$ cat /dev/shm/cyclictest_shm
[jkacur@planxty rt-tests]$ kill -s USR2 14287
[jkacur@planxty rt-tests]$ cat /dev/shm/cyclictest_shm
#---------------------------
# cyclictest current status:
T: 0 (14288) P: 0 I:1000 C: 124852 Min: 20 Act: 65 Avg: 104 Max: 354
T: 1 (14289) P: 0 I:1500 C: 83235 Min: 6 Act: 77 Avg: 82 Max: 330
T: 2 (14290) P: 0 I:2000 C: 62426 Min: 9 Act: 71 Avg: 110 Max: 358
T: 3 (14291) P: 0 I:2500 C: 49940 Min: 9 Act: 77 Avg: 111 Max: 453
T: 4 (14292) P: 0 I:3000 C: 41617 Min: 14 Act: 68 Avg: 69 Max: 815
T: 5 (14293) P: 0 I:3500 C: 35672 Min: 15 Act: 68 Avg: 105 Max: 360
T: 6 (14294) P: 0 I:4000 C: 31212 Min: 15 Act: 64 Avg: 103 Max: 372
T: 7 (14295) P: 0 I:4500 C: 27744 Min: 20 Act: 118 Avg: 93 Max: 681
#------------------------------ src/cyclictest/cyclictest.c | 184 ++++++++++++++++++++++++++++++++++++ 1 file changed, 184 insertions(+)
src/cyclictest/cyclictest.c +184 -0
@@ -231,10 +231,14 @@ static struct thread_param **parameters;static struct thread_stat **statistics;static void print_stat (FILE *fp,struct thread_param *par,int index,int verbose,int quiet); +static void rstat_print_stat (struct thread_param *par,int index,int verbose,int quiet); +static void rstat_setup (void );static int latency_target_fd =-1 ;static int32_t latency_target_value =0 ; +static int rstat_fd =-1 ; +/* Latency trick * if the file /dev/cpu_dma_latency exists, * open it and write a zero into it. This will tell
@@ -1475,6 +1479,22 @@ static void sighand(int sig)fprintf (stderr,"#---------------------------\n" ); quiet = oldquiet;return ; + }else if (sig ==SIGUSR2 ) { +int i; +int oldquiet = quiet; + +if (rstat_fd ==-1 ) { +fprintf (stderr,"ERROR: rstat_fd not valid\n" ); +return ; + } + quiet =0 ; +dprintf (rstat_fd,"#---------------------------\n" ); +dprintf (rstat_fd,"# cyclictest current status:\n" ); +for (i =0 ; i < num_threads; i++) +rstat_print_stat (parameters[i], i,0 ,0 ); +dprintf (rstat_fd,"#---------------------------\n" ); + quiet = oldquiet; +return ; } shutdown =1 ;if (refresh_on_max)
@@ -1642,6 +1662,62 @@ static void print_stat(FILE *fp, struct thread_param *par, int index, int verbos } } +static void rstat_print_stat (struct thread_param *par,int index,int verbose,int quiet) +{ +struct thread_stat *stat = par->stats; +int fd = rstat_fd; + +if (!verbose) { +if (quiet !=1 ) { +char *fmt; +if (use_nsecs) + fmt ="T:%2d (%5d) P:%2d I:%ld C:%7lu " +"Min:%7ld Act:%8ld Avg:%8ld Max:%8ld" ; +else + fmt ="T:%2d (%5d) P:%2d I:%ld C:%7lu " +"Min:%7ld Act:%5ld Avg:%5ld Max:%8ld" ; + +dprintf (fd, fmt, index, stat->tid, par->prio, + par->interval, stat->cycles, stat->min, + stat->act, stat->cycles ? + (long )(stat->avg/stat->cycles) :0 , stat->max); + +if (smi) +dprintf (fd," SMI:%8ld" , stat->smi_count); + +dprintf (fd,"\n" ); + } + }else { +while (stat->cycles != stat->cyclesread) { +unsigned long diff_smi; +long diff = stat->values + [stat->cyclesread & par->bufmsk]; + +if (smi) + diff_smi = stat->smis + [stat->cyclesread & par->bufmsk]; + +if (diff > stat->redmax) { + stat->redmax = diff; + stat->cycleofmax = stat->cyclesread; + } +if (++stat->reduce == oscope_reduction) { +if (!smi) +dprintf (fd,"%8d:%8lu:%8ld\n" , index, + stat->cycleofmax, stat->redmax); +else +dprintf (fd,"%8d:%8lu:%8ld%8ld\n" , + index, stat->cycleofmax, + stat->redmax, diff_smi); + + stat->reduce =0 ; + stat->redmax =0 ; + } + stat->cyclesread++; + } + } +} +/* * thread that creates a named fifo and hands out run stats when someone
@@ -1729,6 +1805,105 @@ static void trigger_update(struct thread_param *par, int diff, int64_t ts)pthread_mutex_unlock (&trigger_lock); } +/* Running status shared memory open */ +static int rstat_shm_open (void ) +{ +int fd; + + errno =0 ; + fd =shm_unlink ("/cyclictest_shm" ); + +if ((fd ==-1 ) && (errno !=ENOENT )) { +fprintf (stderr,"ERROR: shm_unlink %s\n" ,strerror (errno)); +return fd; + } + + errno =9 ; + fd =shm_open ("/cyclictest_shm" ,O_RDWR |O_CREAT |O_EXCL ,S_IRUSR |S_IWUSR |S_IRGRP |S_IWGRP |S_IROTH |S_IWOTH ); +if (fd ==-1 ) { +fprintf (stderr,"ERROR: shm_open %s\n" ,strerror (errno)); + } + + rstat_fd = fd; + +return fd; +} + +static int rstat_ftruncate (int fd) +{ +int err; + + errno =0 ; + err =ftruncate (fd, _SC_PAGE_SIZE); +if (err) { +fprintf (stderr,"ftruncate error %s\n" ,strerror (errno)); + } + +return err; +} + +static void *rstat_mmap (int fd) +{ +void *mptr; + + errno =0 ; + mptr =mmap (0 , _SC_PAGE_SIZE,PROT_READ |PROT_WRITE ,MAP_SHARED , fd,0 ); + +if (mptr == (void *)-1 ) { +fprintf (stderr,"ERROR: mmap, %s\n" ,strerror (errno)); + } + +return mptr; +} + +static int rstat_mlock (void *mptr) +{ +int err; + + err =mlock (mptr, _SC_PAGE_SIZE); + + errno =0 ; +if (err ==-1 ) { +fprintf (stderr,"ERROR, mlock %s\n" ,strerror (errno)); + } + +return err; +} + +static void rstat_setup (void ) +{ +int res; +void *mptr =NULL ; + +int sfd =rstat_shm_open (); +if (sfd <0 ) + goto rstat_err; + + res =rstat_ftruncate (sfd); +if (res) + goto rstat_err1; + + mptr =rstat_mmap (sfd); +if (mptr ==MAP_FAILED ) + goto rstat_err1; + + res =rstat_mlock (mptr); +if (res) + goto rstat_err2; + +return ; + +rstat_err2: +munmap (mptr, _SC_PAGE_SIZE); +rstat_err1: +close (sfd); +shm_unlink ("/cyclictest_shm" ); +rstat_err: + rstat_fd =-1 ; +return ; +} + +int main (int argc,char **argv) {sigset_t sigset;
@@ -1869,6 +2044,7 @@ int main(int argc, char **argv) } + mode = use_nanosleep + use_system;sigemptyset (&sigset);
@@ -1878,6 +2054,10 @@ int main(int argc, char **argv)signal (SIGINT , sighand);signal (SIGTERM , sighand);signal (SIGUSR1 , sighand); +signal (SIGUSR2 , sighand); + +/* Set-up shm */ +rstat_setup (); parameters =calloc (num_threads,sizeof (struct thread_param *));if (!parameters)
@@ -2138,5 +2318,9 @@ int main(int argc, char **argv)if (affinity_mask)rt_bitmask_free (affinity_mask); +/* Remove running status shared memory file if it exists */ +if (rstat_fd >=0 ) +shm_unlink ("/cyclictest_shm" ); +exit (ret); }
Signature · 1 line
2.20.1
PATCH 6/8 cyclictest: Sync manpage with the help option
In reply to John KacurSync the manpage with the help option, as the manpage has not kept-up with changes to help
--- src/cyclictest/cyclictest.8 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
src/cyclictest/cyclictest.8 +6 -3
@@ -67,6 +67,9 @@ Specify a length for the test run. .br Append 'm', 'h', or 'd' to specify minutes, hours or days. .TP +.B \-\-latency=PM_Q0S +write PM_Q0S to /dev/cpu_dma_latency +.TP .B \-F, \-\-fifo=<path> Create a named pipe at path and write stats to it .TP
@@ -95,9 +98,6 @@ Lock current and future memory allocations to prevent being paged out Delay updating the screen until a new max latency is hit. (useful for running cyclictest on low-bandwidth connections) .TP -.B \-n, \-\-nanosleep -Use clock_nanosleep instead of posix interval timers. Setting this option runs the tests with clock_nanosleep instead of posix interval timers. -.TP .B \-N, \-\-nsecs Show results in nanoseconds instead of microseconds, which is the default unit. .TP
@@ -165,6 +165,9 @@ where n=task number c=count v=latency value in us. .TP .B \-\-dbg_cyclictest Print info userful for debugging cyclictest +.TP +.B \-x, \-\-posix_timers +Use POSIX timers instead of clock_nanosleep. .SH SEE ALSO .BR numa (3),
Signature · 1 line
2.20.1
PATCH 7/8 svsematest: Add -S, --smp option to manpage
In reply to John KacurThe -S, or --smp option is in the help but missing from the manpage.
We should really revisit these tests as these options have changed a bit in cyclictest and they are all modeled after cyclictest.
--- src/svsematest/svsematest.8 | 3 +++ 1 file changed, 3 insertions(+)
src/svsematest/svsematest.8 +3 -0
@@ -38,6 +38,9 @@ Set the number of loops. The default is 0 (endless). This option is useful for a .B \-p, \-\-prio=PRIO Set the priority of the process. .TP +.B \-S, \-\-smp +SMP testing: options -a -t and same priority of all threads +.TP .B \-t, \-\-threads[=NUM] Set the number of test threads (default is 1, if this option is not given). If NUM is specified, create NUM test threads. If NUM is not specified, NUM is set to the number of available CPUs. .SH "EXAMPLES"
Signature · 1 line
2.20.1
PATCH 8/8 rt-tests: Add SPDX tags
In reply to John KacurAdd SPDX tags instead of having out-of-date and incomplete licences at the top of files
--- src/backfire/backfire.c | 17 +-------------- src/cyclictest/cyclictest.c | 5 +---- src/cyclictest/rt_numa.h | 1 + src/hackbench/hackbench.c | 1 + src/hwlatdetect/hwlatdetect.py | 8 ++----- src/include/bionic.h | 1 + src/include/error.h | 1 + src/include/pip_stress.h | 1 + src/include/rt-get_cpu.h | 1 + src/include/rt-sched.h | 24 +++++---------------- src/include/rt-utils.h | 1 + src/lib/error.c | 1 + src/lib/rt-get_cpu.c | 1 + src/lib/rt-sched.c | 25 ++++++---------------- src/lib/rt-utils.c | 1 + src/pi_tests/classic_pi.c | 22 ++++--------------- src/pi_tests/pi_stress.c | 22 ++++--------------- src/pi_tests/pip_stress.c | 14 +----------- src/pi_tests/sigtest.c | 22 ++++--------------- src/pi_tests/tst-mutexpi10.c | 27 ++++++------------------ src/pmqtest/pmqtest.c | 16 +------------- src/ptsematest/ptsematest.c | 17 +-------------- src/queuelat/determine_maximum_mpps.sh | 3 +++ src/queuelat/get_cpuinfo_mhz.sh | 3 +++ src/queuelat/queuelat.c | 8 +++++++ src/queuelat/targeted-ipi/targeted-ipi.c | 7 ++++++ src/rt-migrate-test/rt-migrate-test.c | 19 +---------------- src/sched_deadline/cyclicdeadline.c | 8 +++++++ src/sched_deadline/deadline_test.c | 24 ++++++--------------- src/signaltest/signaltest.c | 2 ++ src/sigwaittest/sigwaittest.c | 2 ++ src/ssdd/ssdd.c | 12 +++++------ src/svsematest/svsematest.c | 16 ++------------ 33 files changed, 95 insertions(+), 238 deletions(-)
src/backfire/backfire.c +1 -16
@@ -1,22 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * backfire - send signal back to caller -* * Copyright (C) 2007 Carsten Emde <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, -* USA. */ #include <linux/module.h>
src/cyclictest/cyclictest.c +1 -4
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * High resolution timer test software *
@@ -6,10 +7,6 @@* (C) 2008-2012 Clark Williams <[email protected]> * (C) 2005-2007 Thomas Gleixner <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License Version -* 2 as published by the Free Software Foundation. -* */ #include <stdio.h> #include <stdlib.h>
src/cyclictest/rt_numa.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * A numa library for cyclictest. * The functions here are designed to work whether cyclictest has been
src/hackbench/hackbench.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This is the latest version of hackbench.c, that tests scheduler and * unix-socket (or pipe) performance.
src/hwlatdetect/hwlatdetect.py +2 -6
@@ -1,14 +1,10 @@ #!/usr/bin/python3 +# SPDX-License-Identifier: GPL-2.0-or-later + # (C) 2018,2019 Clark Williams <[email protected]> # (C) 2015,2016 Clark Williams <[email protected]> # (C) 2009 Clark Williams <[email protected]> -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License Version 2 -# as published by the Free Software Foundation. - - import sys import os
src/include/bionic.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef BIONIC_H #define BIONIC_H
src/include/error.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __ERROR_H#define __ERROR_H
src/include/pip_stress.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __PIP_STRESS_H#define __PIP_STRESS_H
src/include/rt-get_cpu.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __RT_GET_CPU_H#define __RT_GET_CPU_H#include <stdio.h>
src/include/rt-sched.h +5 -19
@@ -1,23 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -rt-sched.h - sched_setattr() and sched_getattr() API - -(C) Dario Faggioli <[email protected]>, 2009, 2010 -Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner <[email protected] - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -USA */ +* rt-sched.h - sched_setattr() and sched_getattr() API +* (C) Dario Faggioli <[email protected]>, 2009, 2010 +* Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner <[email protected] +*/ /* This file is based on Dario Faggioli's libdl. Eventually it will be replaced by a proper implemenation of this API. */
src/include/rt-utils.h +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #ifndef __RT_UTILS_H#define __RT_UTILS_H
src/lib/error.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 John Kacur <[email protected]> *
src/lib/rt-get_cpu.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 John Kacur <[email protected]> */
src/lib/rt-sched.c +6 -19
@@ -1,23 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -rt-sched.h - sched_setattr() and sched_getattr() API - -(C) Dario Faggioli <[email protected]>, 2009, 2010 -Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner <[email protected] - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -USA */ +* rt-sched.h - sched_setattr() and sched_getattr() API +* +* (C) Dario Faggioli <[email protected]>, 2009, 2010 +* Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner <[email protected] +*/ /* This file is based on Dario Faggioli's libdl. Eventually it will be replaced by a proper implemenation of this API. */
src/lib/rt-utils.c +1 -0
@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (C) 2009 Carsten Emde <[email protected]> * Copyright (C) 2010 Clark Williams <[email protected]>
src/pi_tests/classic_pi.c +4 -18
@@ -1,22 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -classic_pi - Classic Priority Inversion deadlock test case -- Copyright (C) 2006, 2007 Clark Williams <[email protected]> -- This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -USA */ +* classic_pi - Classic Priority Inversion deadlock test case +* Copyright (C) 2006, 2007 Clark Williams <[email protected]> +*/ /* This program tests Priority Inheritance mutexes and their ability to avoid Priority Inversion deadlocks
src/pi_tests/pi_stress.c +4 -18
@@ -1,22 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -pi_stress - Priority Inheritance stress test - -Copyright (C) 2006, 2007 Clark Williams <[email protected]> - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -USA */ +* pi_stress - Priority Inheritance stress test +* Copyright (C) 2006, 2007 Clark Williams <[email protected]> +*/ /* This program stress tests pthreads priority inheritance mutexes
src/pi_tests/pip_stress.c +1 -13
@@ -1,20 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* Pip stress - Priority Inheritance with processes Copyright (C) 2009, John Kacur <[email protected]> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. */ /*
src/pi_tests/sigtest.c +4 -18
@@ -1,22 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -sigtest - simple little program to verify signal behavior -- Copyright (C) 2006, 2007 Clark Williams <[email protected]> -- This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 -USA */ +* sigtest - simple little program to verify signal behavior +* Copyright (C) 2006, 2007 Clark Williams <[email protected]> +*/ #include <stdio.h> #include <signal.h>
src/pi_tests/tst-mutexpi10.c +6 -21
@@ -1,25 +1,10 @@ +// SPDX-License-Identifier: LGPL-2.1-or-later /* -Classic Priority Inversion deadlock test case -- Copyright (C) 2006 Free Software Foundation, Inc. -This file is part of the GNU C Library. -Contributed by Clark Williams<[email protected]>, 2006 -- The GNU C Library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation; either version 2.1 of the -License, or (at your option) any later version. -- The GNU C Library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. -- You should have received a copy of the GNU Lesser General Public -License along with the GNU C Library; see the file COPYING.LIB. If not, -write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - +* Classic Priority Inversion deadlock test case +* Copyright (C) 2006 Free Software Foundation, Inc. +* This file is part of the GNU C Library. +* Contributed by Clark Williams<[email protected]>, 2006 +*/ /* This program tests Priority Inheritance mutexes and their ability to avoid Priority Inversion deadlocks
src/pmqtest/pmqtest.c +1 -15
@@ -1,22 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * pmqtest.c * * Copyright (C) 2009 Carsten Emde <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, -* USA. */ #include <stdio.h>
src/ptsematest/ptsematest.c +1 -16
@@ -1,22 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ptsematest.c -* * Copyright (C) 2009 Carsten Emde <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, -* USA. */ #include <stdio.h>
src/queuelat/determine_maximum_mpps.sh +3 -0
@@ -1,5 +1,8 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2018 Marcelo Tosatti <[email protected]> + # A script to determine the maximum mpps. Logic: # Increase mpps in 0.5 units #
src/queuelat/get_cpuinfo_mhz.sh +3 -0
@@ -1,5 +1,8 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0-or-later +# Copyright (C) 2018 Marcelo Tosatti <[email protected]> + mhz=`cat /proc/cpuinfo | grep "cpu MHz" | uniq | cut -f 3 -d " "` echo $mhz
src/queuelat/queuelat.c +8 -0
@@ -1,3 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +/* +* Copyright (C) 2018 Marcelo Tosatti <[email protected]> +* Copyright (C) 2019 John Kacur <[email protected]> +* Copyright (C) 2019 Clark Williams <[email protected]> +*/ +#include <string.h> #include <stdlib.h> #include <sys/types.h>
src/queuelat/targeted-ipi/targeted-ipi.c +7 -0
@@ -1,3 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2018 Marcelo Tosatti <[email protected]> +* Copyright (C) 2019 John Kacur <[email protected]> +* Copyright (C) 2019 Clark Williams <[email protected]> +*/ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/module.h>
src/rt-migrate-test/rt-migrate-test.c +1 -18
@@ -1,24 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * rt-migrate-test.c -* * Copyright (C) 2007-2009 Steven Rostedt <[email protected]> -* -* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; version 2 of the License (not later!) -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -* -* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ #include <stdio.h> #ifndef __USE_XOPEN2K
src/sched_deadline/cyclicdeadline.c +8 -0
@@ -1,3 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/* +* Copyright (C) 2016 Red Hat Inc, Steven Rostedt <[email protected]> +* Copyright (C) 2019 John Kacur <[email protected]> +* Copyright (C) 2019 Clark Williams <[email protected]> +*/ +#include <pthread.h> #include <stdarg.h> #include <stdlib.h>
src/sched_deadline/deadline_test.c +7 -17
@@ -1,22 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* * Copyright (C) 2016 Red Hat Inc, Steven Rostedt <[email protected]> -* -* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; version 2 of the License (not later!) -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, see <http://www.gnu.org/licenses> -* -* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -* +* Copyright (C) 2019 John Kacur <[email protected]> +* Copyright (C) 2019 Clark Williams <[email protected]> +*/ + +/* * deadline_test.c * * This program is used to test the deadline scheduler (SCHED_DEADLINE tasks).
src/signaltest/signaltest.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* * RT signal roundtrip test software *
src/sigwaittest/sigwaittest.c +2 -0
@@ -1,3 +1,5 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* * sigwaittest.c *
src/ssdd/ssdd.c +6 -6
@@ -1,3 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +/* +* Copyright (C) 2019 Joe Korty <[email protected]> +*/ +/* * Have a tracer do a bunch of PTRACE_SINGLESTEPs against * a tracee as fast as possible. Create several of these
@@ -16,12 +22,6 @@* The tracer waits on each PTRACE_SINGLESTEP with a waitpid(2) * and checks that waitpid's return values for correctness. * -* This program was originally written by -* Joe Korty <[email protected]> -* This program is free software; you can redistribute it and / or modify -* it under the terms of the GNU General Public License Version 2 -* of the licence, or (at your option) any later version -* see COPYING for more information */ #include <stdio.h> #include <stdlib.h>
src/svsematest/svsematest.c +2 -14
@@ -1,22 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* * svsematest.c * * Copyright (C) 2009 Carsten Emde <[email protected]> * -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, -* USA. */ #include <stdio.h>
Signature · 1 line
2.20.1
Re: [PATCH 8/8] rt-tests: Add SPDX tags
Quoted 10 lines · John Kacur
src/cyclictest/cyclictest.c +1
-0@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * High resolution timer test software *
src/cyclictest/cyclictest.c line 10
Quoted 8 lines
src/cyclictest/cyclictest.c +0
-4@@ -6,10 +7,6 @@* (C) 2008-2012 Clark Williams <[email protected]> * (C) 2005-2007 Thomas Gleixner <[email protected]> * -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License Version -* 2 as published by the Free Software Foundation. -* */
The original text says v2 (only). You replace it with v2-or-later.
src/hackbench/hackbench.c line 4
Quoted 9 lines
src/hackbench/hackbench.c +1
-0@@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * This is the latest version of hackbench.c, that tests scheduler and * unix-socket (or pipe) performance.
The "original"
(https://web.archive.org/web/20090701000000*/http://devresources.linux-foundation.org/craiger/hackbench/src/hackbench.c)
was imported to rt-eval and then moved to rt-tests. I know at some point Ingo (and others) heavily modified it. But the license was never published/stated so I'm unsure if it can become GPLv2-or-later.
I'm not an expert but I don't think this is correct.
Sebastian