rpms/rt-tests
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import rt-tests-2.4-1.el8

Browse Source
This commit is contained in:
CentOS Sources 2022-11-08 01:47:30 -05:00 committed by Stepan Oksanichenko
parent a6c4cab801
commit 7c8728b6a9
7 changed files with 8 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/rt-tests-2.3.tar.xz
SOURCES/rt-tests-2.4.tar.xz

2
.rt-tests.metadata
View File

@ -1 +1 @@
8be587f02ceb1f28f91174ad19df1dc4da48f92c SOURCES/rt-tests-2.3.tar.xz
f4ac5f7b7fe633ab1eaa50f4296a2f4540e90f9f SOURCES/rt-tests-2.4.tar.xz

30
SOURCES/rt-numa-Correct-the-comment-of-numa_initialize.patch
View File

@ -1,30 +0,0 @@
From d83bc06e1fca7250dbc3c5e7be0f55a4ea6e7ef0 Mon Sep 17 00:00:00 2001
From: Oscar Shiang <oscar0225@livemail.tw>
Date: Thu, 23 Dec 2021 22:01:07 +0800
Subject: [PATCH 1/2] rt-numa: Correct the comment of numa_initialize()
numa_initialize() returns 0 only when numa_available() returns -1,
which means that libnuma is unavailable.
The return values in the comment should be corrected to 1 if all
functions are available and 0 when the functions are unavailable.
Signed-off-by: Oscar Shiang <oscar0225@livemail.tw>
Signed-off-by: John Kacur <jkacur@redhat.com>
diff --git a/src/lib/rt-numa.c b/src/lib/rt-numa.c
index bb0121a65eca..ee5ab99684d8 100644
--- a/src/lib/rt-numa.c
+++ b/src/lib/rt-numa.c
@@ -15,7 +15,7 @@
/*
* numa_available() must be called before any other calls to the numa library
- * returns 0 if numa is available, or 1 if numa is not available
+ * returns 1 if numa is available, or 0 if numa is not available
*/
int numa_initialize(void)
{
--
2.27.0

48
SOURCES/rt-numa-ignore-runtime-cpumask-if-a-CPULIST-is-speci.patch
View File

@ -1,48 +0,0 @@
From 795433f50f20ef7598db5cfe991b5386e4080d41 Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Fri, 28 Jan 2022 15:39:59 -0300
Subject: [PATCH 2/2] rt-numa: ignore runtime cpumask if -a CPULIST is
specified
When using isolcpus kernel command line option, the CPUs
specified at isolcpus= are not part of the run time environment
cpumask.
This causes "cyclictest -a isolatedcpus" to fail with:
WARN: Couldn't setaffinity in main thread: Invalid argument
FATAL: No allowable cpus to run on
# /dev/cpu_dma_latency set to 0us
To fix this, ignore the runtime cpumask if neither "+", "!"
are specified in the cpu list string.
Suggested by Sebastian Andrzej Siewior.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
v2: fix changelog typo
v3: simplified version (John Kacur)
Signed-off-by: John Kacur <jkacur@redhat.com>
---
src/lib/rt-numa.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/rt-numa.c b/src/lib/rt-numa.c
index ee5ab99684d8..3eead80c3b2b 100644
--- a/src/lib/rt-numa.c
+++ b/src/lib/rt-numa.c
@@ -131,7 +131,8 @@ int parse_cpumask(char *str, int max_cpus, struct bitmask **cpumask)
return 0;
}
- use_current_cpuset(max_cpus, mask);
+ if (strchr(str, '!') != NULL || strchr(str, '+') != NULL)
+ use_current_cpuset(max_cpus, mask);
*cpumask = mask;
return 0;
--
2.34.1

65
SOURCES/rt-tests-Fix-parsing-of-affinity-when-there-is-a-spa.patch
View File

@ -1,65 +0,0 @@
From 4fac6f28af3aec1c88f19bf96ef73541c1ae5858 Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Fri, 28 Jan 2022 12:50:22 -0500
Subject: [PATCH 1/2] rt-tests: Fix parsing of affinity when there is a space.
Make sure that -a all and -a '+' are passed to parse_cpumask().
Currently this doesn't work correctly if there is a space after -a and the
string.
While we are at it, fix the message in oslat which calls
numa_parse_cpustring_all directly to say that.
Signed-off-by: John Kacur <jkacur@redhat.com>
---
src/cyclictest/cyclictest.c | 4 +++-
src/oslat/oslat.c | 2 +-
src/signaltest/signaltest.c | 4 +++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
index 490aedb54c03..c9ed9e08f6e1 100644
--- a/src/cyclictest/cyclictest.c
+++ b/src/cyclictest/cyclictest.c
@@ -1035,7 +1035,9 @@ static void process_options(int argc, char *argv[], int max_cpus)
} else if (optind < argc &&
(atoi(argv[optind]) ||
argv[optind][0] == '0' ||
- argv[optind][0] == '!')) {
+ argv[optind][0] == '!' ||
+ argv[optind][0] == '+' ||
+ argv[optind][0] == 'a')) {
parse_cpumask(argv[optind], max_cpus, &affinity_mask);
setaffinity = AFFINITY_SPECIFIED;
} else {
diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c
index 50ddc81463ea..aa0e9a79e3b4 100644
--- a/src/oslat/oslat.c
+++ b/src/oslat/oslat.c
@@ -850,7 +850,7 @@ int main(int argc, char *argv[])
cpu_set = numa_parse_cpustring_all(g.cpu_list);
if (!cpu_set)
- fatal("oslat: parse_cpumask failed.\n");
+ fatal("oslat: numa_parse_cpustring_all failed.\n");
n_cores = numa_bitmask_weight(cpu_set);
TEST(threads = calloc(1, n_cores * sizeof(threads[0])));
diff --git a/src/signaltest/signaltest.c b/src/signaltest/signaltest.c
index 4d89a1aba9d9..1cf03931b5bf 100644
--- a/src/signaltest/signaltest.c
+++ b/src/signaltest/signaltest.c
@@ -261,7 +261,9 @@ static void process_options(int argc, char *argv[], unsigned int max_cpus)
} else if (optind < argc &&
(atoi(argv[optind]) ||
argv[optind][0] == '0' ||
- argv[optind][0] == '!')) {
+ argv[optind][0] == '!' ||
+ argv[optind][0] == '+' ||
+ argv[optind][0] == 'a')) {
parse_cpumask(argv[optind], max_cpus, &affinity_mask);
setaffinity = AFFINITY_SPECIFIED;
} else {
--
2.34.1

29
SOURCES/rt-tests-oslat.8-Remove-the-argument-of-bias.patch
View File

@ -1,29 +0,0 @@
From d2ded8b1e863d3c7fd47e3f9a875fb9e6968ff61 Mon Sep 17 00:00:00 2001
From: Oscar Shiang <oscar0225@livemail.tw>
Date: Thu, 30 Dec 2021 21:41:58 +0800
Subject: [PATCH 2/2] rt-tests: oslat.8: Remove the argument of --bias
The option --bias does not require an argument and the bias should
be estimated later.
There is no need to provide USEC to --bias option.
Signed-off-by: Oscar Shiang <oscar0225@livemail.tw>
Signed-off-by: John Kacur <jkacur@redhat.com>
diff --git a/src/oslat/oslat.8 b/src/oslat/oslat.8
index 4b28abd24425..39b36df0db3f 100644
--- a/src/oslat/oslat.8
+++ b/src/oslat/oslat.8
@@ -18,7 +18,7 @@ TSC information and measuring the time frequently during the process.
.B \-b, \-\-bucket-size=N
Specify the number of the buckets (4-1024).
.TP
-.B \-B, \-\-bias=USEC
+.B \-B, \-\-bias
Add a bias to all the buckets using the estimated mininum.
.TP
.B \-c, \-\-cpu-list=CPULIST
--
2.27.0

16
SPECS/rt-tests.spec
View File

@ -5,8 +5,8 @@ Name: rt-tests
# BuildRequires: numactl-devel
# Numa argument to make: NUMA=1
#
Version: 2.3
Release: 2%{?dist}
Version: 2.4
Release: 1%{?dist}
License: GPLv2
Group: Development/Tools
URL: git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git
@ -21,10 +21,6 @@ BuildRequires: python3-devel
Requires: bash bc
#Patches
Patch1: rt-numa-Correct-the-comment-of-numa_initialize.patch
Patch2: rt-tests-oslat.8-Remove-the-argument-of-bias.patch
Patch3: rt-tests-Fix-parsing-of-affinity-when-there-is-a-spa.patch
Patch4: rt-numa-ignore-runtime-cpumask-if-a-CPULIST-is-speci.patch
%description
rt-tests is a set of programs that test and measure various components of
@ -33,10 +29,6 @@ latency. It also tests the functioning of priority-inheritance mutexes.
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%set_build_flags
@ -91,6 +83,10 @@ rm -rf ${build_root}
%{_mandir}/man8/determine_maximum_mpps.8.*
%changelog
* Fri Jul 8 2022 John Kacur <jkacur@redhat.com> - 2.4-1
- Update to latest rt-tests upstream v2.4
Resolves: rhbz#2068114
* 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