From 5ed23a65429591aa8291643f86a335e3ad5d9efa Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 31 May 2024 17:07:13 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .gitignore | 2 +- .rt-tests.metadata | 1 - .../rt-tests-Add-missing-SPDX-licenses.patch | 306 ++++++++++++++++++ ...e-Restore-support-for-Exuberant-Ctag.patch | 37 +++ ...s-Remove-remaining-unnecessary-texts.patch | 57 ++++ ...lat-convert-to-nanoseconds-correctly.patch | 42 +++ ...t-tests-oslat-should-use-MHz-not-Mhz.patch | 34 ++ SPECS/rt-tests.spec | 27 +- 8 files changed, 502 insertions(+), 4 deletions(-) delete mode 100644 .rt-tests.metadata create mode 100644 SOURCES/rt-tests-Add-missing-SPDX-licenses.patch create mode 100644 SOURCES/rt-tests-Makefile-Restore-support-for-Exuberant-Ctag.patch create mode 100644 SOURCES/rt-tests-Remove-remaining-unnecessary-texts.patch create mode 100644 SOURCES/rt-tests-oslat-convert-to-nanoseconds-correctly.patch create mode 100644 SOURCES/rt-tests-oslat-should-use-MHz-not-Mhz.patch diff --git a/.gitignore b/.gitignore index c96da4b..411600b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/rt-tests-2.5.tar.xz +SOURCES/rt-tests-2.6.tar.xz diff --git a/.rt-tests.metadata b/.rt-tests.metadata deleted file mode 100644 index ee4e6c9..0000000 --- a/.rt-tests.metadata +++ /dev/null @@ -1 +0,0 @@ -0b4143fef6905a83f68b2a53a007708a666a02ec SOURCES/rt-tests-2.5.tar.xz diff --git a/SOURCES/rt-tests-Add-missing-SPDX-licenses.patch b/SOURCES/rt-tests-Add-missing-SPDX-licenses.patch new file mode 100644 index 0000000..0d77122 --- /dev/null +++ b/SOURCES/rt-tests-Add-missing-SPDX-licenses.patch @@ -0,0 +1,306 @@ +From cf75a53807ae85cca05f08efc00c28b44beeff9a Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Fri, 27 Oct 2023 14:57:46 -0400 +Subject: [PATCH 2/3] rt-tests: Add missing SPDX licenses + +Add missing SPDX licenses + +Signed-off-by: John Kacur +--- + Makefile | 1 + + src/backfire/backfire.4 | 1 + + src/backfire/sendme.8 | 1 + + src/backfire/sendme.c | 15 +-------------- + src/cyclictest/cyclictest.8 | 1 + + src/cyclictest/get_cyclictest_snapshot.8 | 1 + + src/hackbench/hackbench.8 | 1 + + src/hwlatdetect/hwlatdetect.8 | 1 + + src/oslat/oslat.8 | 1 + + src/pi_tests/pi_stress.8 | 1 + + src/pi_tests/pip_stress.8 | 1 + + src/pmqtest/pmqtest.8 | 1 + + src/ptsematest/ptsematest.8 | 1 + + src/queuelat/determine_maximum_mpps.8 | 1 + + src/queuelat/queuelat.8 | 1 + + src/queuelat/targeted-ipi/Kbuild | 1 + + src/queuelat/targeted-ipi/Makefile | 1 + + src/rt-migrate-test/rt-migrate-test.8 | 1 + + src/sched_deadline/cyclicdeadline.8 | 1 + + src/sched_deadline/deadline_test.8 | 1 + + src/signaltest/signaltest.8 | 1 + + src/sigwaittest/sigwaittest.8 | 1 + + src/ssdd/ssdd.8 | 1 + + src/svsematest/svsematest.8 | 1 + + 25 files changed, 25 insertions(+), 14 deletions(-) + ++# SPDX-License-Identifier: GPL-2.0-or-later + *~ + .* + *.o +diff --git a/Makefile b/Makefile +index 8d3268d19901..2808c212058a 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,3 +1,4 @@ ++# SPDX-License-Identifier: GPL-2.0-or-later + VERSION = 2.6 + CC = $(CROSS_COMPILE)gcc + AR = $(CROSS_COMPILE)ar +diff --git a/src/backfire/backfire.4 b/src/backfire/backfire.4 +index 66dccd1dd1f0..1057a432eefb 100644 +--- a/src/backfire/backfire.4 ++++ b/src/backfire/backfire.4 +@@ -1,4 +1,5 @@ + .TH "backfire" "4" "0.1" "" "Driver" ++# SPDX-License-Identifier: GPL-2.0-or-later + .SH "NAME" + .LP + backfire \- send a signal from driver to user +diff --git a/src/backfire/sendme.8 b/src/backfire/sendme.8 +index 05f3a1c14d8b..9c973607f859 100644 +--- a/src/backfire/sendme.8 ++++ b/src/backfire/sendme.8 +@@ -1,4 +1,5 @@ + .TH "sendme" "8" "0.2" "" "" ++# SPDX-License-Identifier: GPL-2.0-only + .SH "NAME" + .LP + \fBsendme\fR \- Send a signal from driver to user and measure time intervals +diff --git a/src/backfire/sendme.c b/src/backfire/sendme.c +index d963723b1c93..da10397846f7 100644 +--- a/src/backfire/sendme.c ++++ b/src/backfire/sendme.c +@@ -1,22 +1,9 @@ ++// SPDX-License-Identifier: GPL-2.0-only + /* + * sendme.c + * + * Copyright (C) 2009 Carsten Emde + * +- * 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 + #include +diff --git a/src/cyclictest/cyclictest.8 b/src/cyclictest/cyclictest.8 +index 1cc72e64effc..2ccdfc1ff5fa 100644 +--- a/src/cyclictest/cyclictest.8 ++++ b/src/cyclictest/cyclictest.8 +@@ -1,5 +1,6 @@ + .\" Hey, EMACS: -*- nroff -*- + .TH CYCLICTEST 8 "April 22, 2016" ++# SPDX-License-Identifier: GPL-2.0-only + .\" Please adjust this date whenever revising the manpage. + .\" + .\" Some roff macros, for reference: +diff --git a/src/cyclictest/get_cyclictest_snapshot.8 b/src/cyclictest/get_cyclictest_snapshot.8 +index e9251a8e821f..45eb90da070c 100644 +--- a/src/cyclictest/get_cyclictest_snapshot.8 ++++ b/src/cyclictest/get_cyclictest_snapshot.8 +@@ -1,5 +1,6 @@ + .\" Hey, EMACS: -*- nroff -*- + .TH GET_CYCLICTEST_SNAPSHOT 8 "July 6, 2020" ++# SPDX-License-Identifier: GPL-2.0-or-later + .\" Please adjust this date whenever revising the manpage. + .\" + .\" Some roff macros, for reference: +diff --git a/src/hackbench/hackbench.8 b/src/hackbench/hackbench.8 +index 4c2c8ad9cb1a..1f3ecd51cc07 100644 +--- a/src/hackbench/hackbench.8 ++++ b/src/hackbench/hackbench.8 +@@ -1,4 +1,5 @@ + .TH "hackbench" "8" "September 19, 2020" "" "" ++# SPDX-License-Identifier: GPL-2.0-or-later + .SH "NAME" + hackbench \- scheduler benchmark/stress test + .SH "SYNOPSIS" +diff --git a/src/hwlatdetect/hwlatdetect.8 b/src/hwlatdetect/hwlatdetect.8 +index 21d0fe4aaca2..560ff7cc0cc9 100644 +--- a/src/hwlatdetect/hwlatdetect.8 ++++ b/src/hwlatdetect/hwlatdetect.8 +@@ -1,5 +1,6 @@ + .\" Hey, EMACS: -*- nroff -*- + .TH HWLATDETECT 8 "May 12, 2009" ++# SPDX-License-Identifier: GPL-2.0-only + .\" Please adjust this date whenever revising the manpage. + .\" + .\" Some roff macros, for reference: +diff --git a/src/oslat/oslat.8 b/src/oslat/oslat.8 +index eb96448bfff1..fba10ab4944d 100644 +--- a/src/oslat/oslat.8 ++++ b/src/oslat/oslat.8 +@@ -1,4 +1,5 @@ + .TH OSLAT 8 "August 17, 2020" ++# SPDX-License-Identifier: GPL-3.0-only + .\" for manpage-specific macros, see man(7) + .SH NAME + oslat \- OS Latency Detector +diff --git a/src/pi_tests/pi_stress.8 b/src/pi_tests/pi_stress.8 +index 8c43a1ccf676..6ae28c178d75 100644 +--- a/src/pi_tests/pi_stress.8 ++++ b/src/pi_tests/pi_stress.8 +@@ -4,6 +4,7 @@ + .\"{{{}}} + .\"{{{ Title + .TH pi_stress 8 "Nov 27, 2006" "" "Linux System Administrator's Manual" ++# SPDX-License-Identifier: GPL-2.0-or-later + .\"}}} + .\"{{{ Name + .SH NAME +diff --git a/src/pi_tests/pip_stress.8 b/src/pi_tests/pip_stress.8 +index 1808330b2e17..0d06dd2215f8 100644 +--- a/src/pi_tests/pip_stress.8 ++++ b/src/pi_tests/pip_stress.8 +@@ -1,5 +1,6 @@ + .\" + .TH PIP\ STRESS 8 "September 17, 2018" ++# SPDX-License-Identifier: GPL-2.0-or-later + .SH NAME + .B pip_stress \- Priority Inheritance with processes + .SH SYNOPSIS +diff --git a/src/pmqtest/pmqtest.8 b/src/pmqtest/pmqtest.8 +index 4fbcc5c27ce2..cce43d9b5ee5 100644 +--- a/src/pmqtest/pmqtest.8 ++++ b/src/pmqtest/pmqtest.8 +@@ -1,4 +1,5 @@ + .TH "pmqtest" "8" "0.1" "" "" ++# SPDX-License-Identifier: GPL-2.0-or-later + .SH "NAME" + .LP + \fBpmqtest\fR \- Start pairs of threads and measure the latency of interprocess communication with POSIX messages queues +diff --git a/src/ptsematest/ptsematest.8 b/src/ptsematest/ptsematest.8 +index 57e1658612c0..5e944d353ec0 100644 +--- a/src/ptsematest/ptsematest.8 ++++ b/src/ptsematest/ptsematest.8 +@@ -1,4 +1,5 @@ + .TH "ptsematest" "8" "0.1" "" "" ++# SPDX-License-Identifier: GPL-2.0-or-later + .SH "NAME" + .LP + \fBptsematest\fR \- Start two threads and measure the latency of interprocess communication with POSIX mutex. +diff --git a/src/queuelat/determine_maximum_mpps.8 b/src/queuelat/determine_maximum_mpps.8 +index c48a651160d3..ba2cc2ad9c2a 100644 +--- a/src/queuelat/determine_maximum_mpps.8 ++++ b/src/queuelat/determine_maximum_mpps.8 +@@ -1,5 +1,6 @@ + .\" Hey, EMACS: -*- nroff -*- + .TH DETERMINE_MAXIMUM_MPPS 8 "Dec 4, 2020" ++# SPDX-License-Identifier: GPL-2.0-or-later + .\" Please adjust this date whenever revising the manpage. + .\" + .\" Some roff macros, for reference: +diff --git a/src/queuelat/queuelat.8 b/src/queuelat/queuelat.8 +index 2f99e703c990..aa497e93f738 100644 +--- a/src/queuelat/queuelat.8 ++++ b/src/queuelat/queuelat.8 +@@ -1,5 +1,6 @@ + .\" Hey, EMACS: -*- nroff -*- + .TH QUEUELAT 8 "Sept 3, 2018" ++# SPDX-License-Identifier: GPL-2.0-or-later + .\" Please adjust this date whenever revising the manpage. + .\" + .\" Some roff macros, for reference: +diff --git a/src/queuelat/targeted-ipi/Kbuild b/src/queuelat/targeted-ipi/Kbuild +index 9bdd5c63a00a..6d569c38aab8 100644 +--- a/src/queuelat/targeted-ipi/Kbuild ++++ b/src/queuelat/targeted-ipi/Kbuild +@@ -1,2 +1,3 @@ ++# SPDX-License-Identifier: GPL-2.0-or-later + obj-m := targeted-ipi.o + +diff --git a/src/queuelat/targeted-ipi/Makefile b/src/queuelat/targeted-ipi/Makefile +index ee5591fe45c0..9dabd7c22fe0 100644 +--- a/src/queuelat/targeted-ipi/Makefile ++++ b/src/queuelat/targeted-ipi/Makefile +@@ -1 +1,2 @@ ++# SPDX-License-Identifier: GPL-2.0-or-later + obj-$(CONFIG_TARGETED_IPI) += targeted-ipi.o +diff --git a/src/rt-migrate-test/rt-migrate-test.8 b/src/rt-migrate-test/rt-migrate-test.8 +index 53670e3757fa..88daec50138c 100644 +--- a/src/rt-migrate-test/rt-migrate-test.8 ++++ b/src/rt-migrate-test/rt-migrate-test.8 +@@ -1,5 +1,6 @@ + .\" + .TH RT-MIGRATE-TEST 8 "September 18, 2020" ++# SPDX-License-Identifier: GPL-2.0-only + .\" Please adjust this date whenever editing this manpage + .SH NAME + rt-migrate-test \- real-time task migration program +diff --git a/src/sched_deadline/cyclicdeadline.8 b/src/sched_deadline/cyclicdeadline.8 +index fab301edc86a..bfc6327c51da 100644 +--- a/src/sched_deadline/cyclicdeadline.8 ++++ b/src/sched_deadline/cyclicdeadline.8 +@@ -1,5 +1,6 @@ + .\" Hey, EMACS: -*- nroff -*- + .TH CYCLICDEADLINE 8 "January 16, 2020" ++# SPDX-License-Identifier: GPL-2.0-only + .\" Please adjust this date whenever revising the manpage. + .\" + .\" Some roff macros, for reference: +diff --git a/src/sched_deadline/deadline_test.8 b/src/sched_deadline/deadline_test.8 +index 8f32c5b6feb6..0d7932250e23 100644 +--- a/src/sched_deadline/deadline_test.8 ++++ b/src/sched_deadline/deadline_test.8 +@@ -1,5 +1,6 @@ + .\" Hey, EMACS: -*- nroff -*- + .TH DEADLINE_TEST 8 "November 1, 2018" ++# SPDX-License-Identifier: GPL-2.0-only + .\" Please adjust this date whenever revising the manpage. + .\" + .\" Some roff macros, for reference: +diff --git a/src/signaltest/signaltest.8 b/src/signaltest/signaltest.8 +index da818ecdef67..a8c9a6e91c68 100644 +--- a/src/signaltest/signaltest.8 ++++ b/src/signaltest/signaltest.8 +@@ -1,5 +1,6 @@ + .\" + .TH SIGNALTEST 8 "November 15, 2020" ++# SPDX-License-Identifier: GPL-2.0-only + .\" Please adjust this date whenever updating this manpage + .SH NAME + signaltest \- signal roundtrip test software +diff --git a/src/sigwaittest/sigwaittest.8 b/src/sigwaittest/sigwaittest.8 +index 26ad333e2841..f0ecbb6448b1 100644 +--- a/src/sigwaittest/sigwaittest.8 ++++ b/src/sigwaittest/sigwaittest.8 +@@ -1,4 +1,5 @@ + .TH "sigwaittest" "8" "0.1" "" "" ++# SPDX-License-Identifier: GPL-2.0-only + .SH "NAME" + .LP + \fBsigwaittest\fR \- Start two threads or fork two processes and measure the latency between sending and receiving a signal +diff --git a/src/ssdd/ssdd.8 b/src/ssdd/ssdd.8 +index a3b9d790dec4..e6be5ef6a27d 100644 +--- a/src/ssdd/ssdd.8 ++++ b/src/ssdd/ssdd.8 +@@ -1,4 +1,5 @@ + .TH SSDD 8 "September 19, 2020" ++# SPDX-License-Identifier: GPL-2.0-or-later + .SH NAME + ssdd \- have a tracer do a bunch of PTRACE_SINGLESTEPs + .SH SYNOPSIS +diff --git a/src/svsematest/svsematest.8 b/src/svsematest/svsematest.8 +index 93abf55f3d4d..7865ed0550e9 100644 +--- a/src/svsematest/svsematest.8 ++++ b/src/svsematest/svsematest.8 +@@ -1,4 +1,5 @@ + .TH "svsematest" "8" "0.1" "" "" ++# SPDX-License-Identifier: GPL-2.0-or-later + .SH "NAME" + .LP + \fBsvsematest\fR \- Start two threads or fork two processes and measure the latency of SYSV semaphores +-- +2.41.0 + diff --git a/SOURCES/rt-tests-Makefile-Restore-support-for-Exuberant-Ctag.patch b/SOURCES/rt-tests-Makefile-Restore-support-for-Exuberant-Ctag.patch new file mode 100644 index 0000000..39500af --- /dev/null +++ b/SOURCES/rt-tests-Makefile-Restore-support-for-Exuberant-Ctag.patch @@ -0,0 +1,37 @@ +From 57f8f11fbab520b5cb239451c841f951a994328a Mon Sep 17 00:00:00 2001 +From: Mathias Krause +Date: Thu, 19 Oct 2023 08:53:28 +0200 +Subject: [PATCH 1/3] rt-tests: Makefile: Restore support for Exuberant Ctags + +Commit 974241c78a6f ("rt-tests: Makefile: ctags: Change obsolete extra +to extras") is Universal Ctags specific and broke Exuberant Ctags. + +Restore support for Exuberant Ctags by automatically detecting which +variant to use. + +Signed-off-by: Mathias Krause +Signed-off-by: John Kacur +--- + Makefile | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 223a839151ec..8d3268d19901 100644 +--- a/Makefile ++++ b/Makefile +@@ -251,6 +251,11 @@ help: + @echo " tarball : make a rt-tests tarball suitable for release" + @echo " help : print this message" + ++# Universal Ctags warns about the backward compatible option '--extra' and ++# wants it to be called '--extras'. ++CTAGS_BIN = ctags ++CTAGS_EXTRA := $(shell $(CTAGS_BIN) --version 2>&1 | grep -iq universal && echo extras || echo extra) ++ + .PHONY: tags + tags: +- ctags -R --extras=+f --c-kinds=+p --exclude=tmp --exclude=BUILD * ++ $(CTAGS_BIN) -R --$(CTAGS_EXTRA)=+f --c-kinds=+p --exclude=tmp --exclude=BUILD * +-- +2.41.0 + diff --git a/SOURCES/rt-tests-Remove-remaining-unnecessary-texts.patch b/SOURCES/rt-tests-Remove-remaining-unnecessary-texts.patch new file mode 100644 index 0000000..30770f3 --- /dev/null +++ b/SOURCES/rt-tests-Remove-remaining-unnecessary-texts.patch @@ -0,0 +1,57 @@ +From 3cbd2fc69160f5c21b66445279fcb31c22e29915 Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Fri, 27 Oct 2023 15:22:30 -0400 +Subject: [PATCH 3/3] rt-tests: Remove remaining unnecessary texts after adding + SPDX licenses + +Remove remaining unnecessary texts after adding SPDX licenses + +Signed-off-by: John Kacur +--- + src/signaltest/signaltest.c | 4 ---- + src/sigwaittest/sigwaittest.c | 14 -------------- + 2 files changed, 18 deletions(-) + +diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c +index 4737c253b1af..5412c50f7e17 100644 +--- a/src/signaltest/signaltest.c ++++ b/src/signaltest/signaltest.c +@@ -5,10 +5,6 @@ + * + * (C) 2007 Thomas Gleixner + * +- * 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 +diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c +index 818e3a8e680a..55855769c63b 100644 +--- a/src/sigwaittest/sigwaittest.c ++++ b/src/sigwaittest/sigwaittest.c +@@ -5,20 +5,6 @@ + * + * Copyright (C) 2009 Carsten Emde + * +- * 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 +-- +2.41.0 + diff --git a/SOURCES/rt-tests-oslat-convert-to-nanoseconds-correctly.patch b/SOURCES/rt-tests-oslat-convert-to-nanoseconds-correctly.patch new file mode 100644 index 0000000..cff3ed0 --- /dev/null +++ b/SOURCES/rt-tests-oslat-convert-to-nanoseconds-correctly.patch @@ -0,0 +1,42 @@ +From 4aeacf722cee26a3f88ab7f631c9ab9ba6ecdb49 Mon Sep 17 00:00:00 2001 +From: Marcelo Tosatti +Date: Thu, 1 Feb 2024 14:50:54 -0300 +Subject: [PATCH 2/2] rt-tests: oslat: convert to nanoseconds correctly + +With buckets of size 1us, accounting for measurements in the +[1ns, 999ns] range are done to the 2us bucket (while they +should be accounted in the 1us bucket): + + 001 (us): 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + 002 (us): 41916187 41937649 41938461 42029055 ... + 003 (us): 969 985 958 972 964 986 970 961 973 ... + +Fix this by doing a plain cycles -> nanoseconds convertion: + + 001 (us): 43287555 43086678 43087427 43109974 ... + 002 (us): 983 987 985 975 982 960 993 961 992 ... + 003 (us): 9 6 7 13 9 22 3 21 3 3 8 8 10 11 3 55 + +Signed-off-by: Marcelo Tosatti +Reported-by: Chuck Newman +Signed-off-by: John Kacur +--- + src/oslat/oslat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c +index e398f205b40a..0863297f2cf1 100644 +--- a/src/oslat/oslat.c ++++ b/src/oslat/oslat.c +@@ -334,7 +334,7 @@ static void insert_bucket(struct thread *t, stamp_t value) + uint64_t extra; + double us; + +- lat = (value * g.unit_per_us + t->counter_mhz - 1) / t->counter_mhz; ++ lat = (value * g.unit_per_us) / t->counter_mhz; + us = (double)lat / g.unit_per_us; + if (!g.preheat && g.trace_threshold && us >= g.trace_threshold) { + char *line = "%s: Trace threshold (%d us) triggered on cpu %d with %.*f us!\n"; +-- +2.43.0 + diff --git a/SOURCES/rt-tests-oslat-should-use-MHz-not-Mhz.patch b/SOURCES/rt-tests-oslat-should-use-MHz-not-Mhz.patch new file mode 100644 index 0000000..354baa5 --- /dev/null +++ b/SOURCES/rt-tests-oslat-should-use-MHz-not-Mhz.patch @@ -0,0 +1,34 @@ +From 251d082403b371098c8420c01d1b058b12a9cc78 Mon Sep 17 00:00:00 2001 +From: Marcelo Tosatti +Date: Thu, 1 Feb 2024 13:05:38 -0300 +Subject: [PATCH 1/2] rt-tests: oslat should use MHz, not Mhz + +Usage of Mhz, in oslat, is incorrect: + +From https://www.nist.gov/pml/owm/writing-si-metric-system-units#:~:text=NOT%20250%20mms.-,Capitalization,the%20beginning%20of%20the%20sentence: + +"When the unit is derived from the name of a person, the symbol or the first letter of the symbol is an uppercase letter (W for the unit "watt" or Pa for the unit "pascal")." + +Signed-off-by: Marcelo Tosatti +Reported-by: Chuck Newman +Signed-off-by: John Kacur +--- + src/oslat/oslat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c +index 4bdca643da72..e398f205b40a 100644 +--- a/src/oslat/oslat.c ++++ b/src/oslat/oslat.c +@@ -501,7 +501,7 @@ static void write_summary(struct thread *t) + calculate(t); + + putfield("Core", t[i].core_i, "d", ""); +- putfield("Counter Freq", t[i].counter_mhz, "u", " (Mhz)"); ++ putfield("Counter Freq", t[i].counter_mhz, "u", " (MHz)"); + + for (j = 0; j < g.bucket_size; j++) { + if (j < g.bucket_size-1 && g.output_omit_zero_buckets) { +-- +2.43.0 + diff --git a/SPECS/rt-tests.spec b/SPECS/rt-tests.spec index 1c6feeb..74c83c4 100644 --- a/SPECS/rt-tests.spec +++ b/SPECS/rt-tests.spec @@ -5,8 +5,8 @@ Name: rt-tests # BuildRequires: numactl-devel # Numa argument to make: NUMA=1 # -Version: 2.5 -Release: 1%{?dist} +Version: 2.6 +Release: 3%{?dist} License: GPLv2 Group: Development/Tools URL: git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git @@ -21,6 +21,11 @@ BuildRequires: python3-devel Requires: bash bc #Patches +Patch1: rt-tests-Makefile-Restore-support-for-Exuberant-Ctag.patch +Patch2: rt-tests-Add-missing-SPDX-licenses.patch +Patch3: rt-tests-Remove-remaining-unnecessary-texts.patch +Patch4: rt-tests-oslat-should-use-MHz-not-Mhz.patch +Patch5: rt-tests-oslat-convert-to-nanoseconds-correctly.patch %description rt-tests is a set of programs that test and measure various components of @@ -29,6 +34,11 @@ latency. It also tests the functioning of priority-inheritance mutexes. %prep %setup -q -n %{name}-%{version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build %set_build_flags @@ -83,6 +93,19 @@ rm -rf ${build_root} %{_mandir}/man8/determine_maximum_mpps.8.* %changelog +* Mon Feb 05 2024 John Kacur - 2.6-3 +- Fix specfile to apply all patches +Resolves: RHEL-23908 + +* Mon Feb 05 2024 John Kacur - 2.6-2 +- oslat: Fix conversion to nanoseconds for 1us bucket +- oslat: correct spelling of Mhz to MHz +Resolves: RHEL-23908 + +* Fri Oct 27 2023 John Kacur - 2.6-1 +- Update to latest upstream rt-tests v2.6 +Resolves: RHEL-7861 + * Tue Jan 24 2023 John Kacur - 2.5-1 - Update to latest upstream rt-tests v2.5 Resolves: rhbz#2162780