Compare commits

...

No commits in common. 'c10-beta' and 'c9' have entirely different histories.
c10-beta ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/rt-tests-2.7.tar.xz
SOURCES/rt-tests-2.5.tar.xz

@ -1 +1 @@
6d64c51123fa798257459213a0b8788f898f1cb1 SOURCES/rt-tests-2.7.tar.xz
0b4143fef6905a83f68b2a53a007708a666a02ec SOURCES/rt-tests-2.5.tar.xz

@ -1,39 +0,0 @@
From 64c7f92979ded63ac5a19ea59e9b791e3da1fae4 Mon Sep 17 00:00:00 2001
From: Anubhav Shelat <ashelat@redhat.com>
Date: Wed, 22 May 2024 10:43:46 -0400
Subject: [PATCH 1/2] rt-tests: hackbench: removed extra use of optind
Currently, using the -s option displays the usage message, even if the
option is properly used.
This is because Commit 778a02b7c519 ("rt-tests: hackbench: drop incorrect
and unnecessary usage of optind") forgot to drop a use of optind when
processing option 's' which was fixed in this commit.
Now the -s option works correctly with the proper arguments.
Note: The next commit in this patchset fixes "ERROR: do not use
assignment in if condition" on line 459.
Signed-off-by: Anubhav Shelat <ashelat@redhat.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
---
src/hackbench/hackbench.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
index d4924b3cc129..fec8357bef81 100644
--- a/src/hackbench/hackbench.c
+++ b/src/hackbench/hackbench.c
@@ -456,7 +456,7 @@ static void process_options(int argc, char *argv[])
use_inet = 1;
break;
case 's':
- if (!(argv[optind] && (datasize = atoi(optarg)) > 0)) {
+ if ((datasize = atoi(optarg)) <= 0) {
fprintf(stderr, "%s: --datasize|-s requires an integer > 0\n", argv[0]);
print_usage_exit(1);
}
--
2.45.1

@ -1,70 +0,0 @@
From cadd661f984c0e6717e681fdaca1ce589b0ed964 Mon Sep 17 00:00:00 2001
From: Anubhav Shelat <ashelat@redhat.com>
Date: Wed, 22 May 2024 10:43:47 -0400
Subject: [PATCH 2/2] rt-tests: hackbench: properly recognize when integer
arguments are negative
hackbench is supposed to catch when the user passes
negative arguments to options -f, -g, -l, and -s.
Previously hackbench would allow options to accept
negative arguments, resulting in undefined behavior.
Now process_options() assigns variables outside of
the if considiton where they are used. hackbench will
output a usage message if the user inputs a negative
argument.
Signed-off-by: Anubhav Shelat <ashelat@redhat.com>
Signed-off-by: John Kacur <jkacur@redhat.com>
---
src/hackbench/hackbench.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
index fec8357bef81..55be325a38df 100644
--- a/src/hackbench/hackbench.c
+++ b/src/hackbench/hackbench.c
@@ -426,7 +426,8 @@ static void process_options(int argc, char *argv[])
}
switch (c) {
case 'f':
- if ((num_fds = atoi(optarg)) <= 0) {
+ num_fds = atoi(optarg);
+ if (atoi(optarg) <= 0) {
fprintf(stderr, "%s: --fds|-f requires an integer > 0\n", argv[0]);
print_usage_exit(1);
}
@@ -435,7 +436,8 @@ static void process_options(int argc, char *argv[])
fifo = 1;
break;
case 'g':
- if ((num_groups = atoi(optarg)) <= 0) {
+ num_groups = atoi(optarg);
+ if (atoi(optarg) <= 0) {
fprintf(stderr, "%s: --groups|-g requires an integer > 0\n", argv[0]);
print_usage_exit(1);
}
@@ -444,7 +446,8 @@ static void process_options(int argc, char *argv[])
print_usage_exit(0);
break;
case 'l':
- if ((loops = atoi(optarg)) <= 0) {
+ loops = atoi(optarg);
+ if (atoi(optarg) <= 0) {
fprintf(stderr, "%s: --loops|-l requires an integer > 0\n", argv[0]);
print_usage_exit(1);
}
@@ -456,7 +459,8 @@ static void process_options(int argc, char *argv[])
use_inet = 1;
break;
case 's':
- if ((datasize = atoi(optarg)) <= 0) {
+ datasize = atoi(optarg);
+ if (atoi(optarg) <= 0) {
fprintf(stderr, "%s: --datasize|-s requires an integer > 0\n", argv[0]);
print_usage_exit(1);
}
--
2.45.1

@ -1,12 +1,17 @@
Name: realtime-tests
Summary: Programs that test various rt-features
Version: 2.7
Release: 3%{?dist}
License: GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.1-or-later
Name: realtime-tests
# These will be setup by the "make rpm" logic
# Version: 1.0
# BuildRequires: numactl-devel
# Numa argument to make: NUMA=1
#
Version: 2.5
Release: 2%{?dist}
License: GPLv2
URL: https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git
Source0: https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-%{version}.tar.xz
ExcludeArch: %{arm}
ExcludeArch: s390 s390x armv7hl ppc64 ppc64le i686
BuildRequires: make
BuildRequires: gcc
BuildRequires: numactl-devel
@ -15,15 +20,14 @@ Requires: bash
Requires: bc
#Patches
Patch1: 0001-rt-tests-hackbench-removed-extra-use-of-optind.patch
Patch2: 0002-rt-tests-hackbench-properly-recognize-when-integer-a.patch
%description
realtime-tests is a set of programs that test and measure various components of
real-time kernel behavior. This package measures timer, signal, and hardware
latency. It also tests the functioning of priority-inheritance mutexes.
%prep
%autosetup -p1 -n rt-tests-%{version}
%setup -q -n rt-tests-%{version}
%build
%set_build_flags
@ -34,7 +38,7 @@ latency. It also tests the functioning of priority-inheritance mutexes.
%files
%pycached %{python3_sitelib}/hwlatdetect.py
%caps(cap_sys_rawio+ep) %attr(750,-,-) /usr/bin/cyclictest
%caps(cap_sys_rawio+ep) /usr/bin/cyclictest
%{_bindir}/pi_stress
%{_bindir}/signaltest
%{_bindir}/hwlatdetect
@ -74,88 +78,85 @@ latency. It also tests the functioning of priority-inheritance mutexes.
%{_mandir}/man8/determine_maximum_mpps.8.*
%changelog
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.7-3
- Bump release for June 2024 mass rebuild
* Thu May 23 2024 Anubhav Shelat <ashelat@redhat.com> - 2.7-2
- Added patch to fix -s option in hackbench
- Added patch to prevent user from erroneously passing negative numbers to hackbench.
Resolves: RHEL-36745
* Tue May 07 2024 John Kacur <jkacur@redhat.com> - 2.7-1
- Rebase to upstream rt-tests 2.7
Resolves: RHEL-30167
* Thu Apr 25 2024 Eder Zulian <ezulian@redhat.com> - 2.6-6
- Strip o+rx permissions from the cyclictest executable
Resolves: RHEL-34077
* Tue Mar 26 2024 John Kacur <jkacur@redhat.com> - 2.6-5
- Added the following upstream patches
rt-tests-Fix-warnings.patch
rt-tests-cyclictest-Remove-histogram-totals.patch
rt-tests-cyclictest-Replace-histogram-code-with-libr.patch
rt-tests-cyclicdeadline-Add-histogram-support.patch
rt-tests-cyclics-Fix-json-segfault-when-not-using-hi.patch
rt-tests-cyclicdeadline-Print-the-histogram-regardle.patch
rt-tests-cyclicdeadline-Remove-dead-verbose-code-in-.patch
rt-tests-oslat-should-use-MHz-not-Mhz.patch
rt-tests-oslat-convert-to-nanoseconds-correctly.patch
- Added gating.yaml
- Added tests dir
Resolves: RHEL-30184
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Dec 06 2023 John Kacur <jkacur@redhat.com> - 2.6-2
- Add an rpminspect.yaml file to disaable the badfuncs check
* Fri Dec 01 2023 John Kacur <jkacur@redhat.com> - 2.6-1
- Update to latest version upstream v2.6
- Include SPDX changes
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 2.5-2
- Rebuilt for Python 3.12
* Tue Feb 14 2023 John Kacur <jkacur@redhat.com> - 2.5-1
- Update to latest upstream
- Remove patch included in the update, and add three more
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Aug 18 2022 John Kacur <jkacur@redhat.com> - 2.4-1
- Update to latest version upstream
- Include upstream patch to fix affinity being set even when -a not set
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 2.3-3
- Rebuilt for Python 3.11
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Dec 10 2021 John Kacur <jkacur@redhat.com> - 2.3-1
- Update to 2.3
* Tue Oct 26 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.2-1
- Update to 2.2
- Build on all 64 bit arches
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 1.9-10
- Rebuilt for Python 3.10
* Wed Jul 12 2023 John Kacur <jkacur@redhat.com> - 2.5-2
- Remove aarch64 from ExcludeArch to allow internal arm builds
Resolves: rhbz#2222437
* Tue Jan 24 2023 John Kacur <jkacur@redhat.com> - 2.5-1
- Update to latest rt-tests upstream v2.5
Resolves: rhbz#2162779
* Wed Dec 14 2022 Crystal Wood <swood@redhat.com> - 2.4-6
- oslat: Add command line option for bucket width
Resolves: rhbz#2041637
* Mon Nov 14 2022 Leah Leshchinsky <lleshchi@redhat.com> - 2.4-5
- hwlatdetect: Convert to fstrings
- hwlatdetect: Update to integer division
- hwlatdetect: Fix incorrect comment about test duration
Resolves: rhbz#2121150
* Wed Nov 02 2022 John Kacur <jkacur@redhat.com> - 2.4-4
- Add error checking in hackbench to connect and getsockname
- Fix compile warnings in hackbench because of comparison of different signs
- Fix compile warnings in hackbench because of warnings about fall through
Resolves: rhbz#2115067
* Fri Oct 07 2022 John Kacur <jkacur@redhat.com> - 2.4-3
- Remove arbitrary limits on number of threads
Resolves: rhbz#2129891
* Tue Jul 12 2022 John Kacur <jkacur@redhat.com> - 2.4-2
- Add an rpminspect.yaml file
Resolves: rhbz#2106464
* Fri Jul 8 2022 John Kacur <jkacur@redhat.com> - 2.4-1
- Update to latest rt-tests upstream v2.4
Resolves: rhbz#2068112
* Fri Feb 4 2022 John Kacur <jkacur@redhat.com> - 2.3-3
- Don't build unsupported i686
Resolves: rhbz#2050375
* Thu Feb 3 2022 John Kacur <jkacur@redhat.com> - 2.3-2
- Fix parsing of affinity
- Ignore the runtime cpumask if a new cpumask is requested
Resolves: rhbz#2050244
* Thu Jan 13 2022 Leah Leshchinsky <lleshchi@redhat.com> - 2.3-1
- Update to latest upstream 2.3
- Correct the comment of numa_initialize()
- oslat.8: Remove the argument of --bias
Resolves: rhbz#2012297
* Thu Nov 18 2021 John Kacur <jkacur@redhat.com> - 2.1-6
- Fix potential double mount of cgroups for deadline_test
- Fix potential double mount of cgroups for cyclicdeadline_test
Resolves: rhbz#2011415
* Thu Nov 18 2021 John Kacur <jkacur@redhat.com> - 2.1-5
- Null check to prevent floating point exception in deadline test
Resolves: rhbz#2023501
* Tue Nov 02 2021 Leah Leshchinsky <lleshchi@redhat.com> - 2.1-4
- Add missing option -F to optstring
Resolved: rhbz#2007021
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.1-3
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Jul 23 2021 John Kacur <jkacur@redhat.com> - 2.1-2
- Take into account the rename of the sched_features file for HRTICK
- Use HRTICK_DL if available
Resolves: rhbz#1973083
* Wed Jun 30 2021 john Kacur <jkacur@redhat.com> - 2.1-1
- Update to latest upstream rt-tests-2.1
Resolves: rhbz#1890563
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.9-10
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Loading…
Cancel
Save