Update to the latest version of rt-tests upstream - v2.4
Update to the latest version of rt-tests upstream - v2.4 Signed-off-by: John Kacur <jkacur@redhat.com>
This commit is contained in:
parent
f9262dd997
commit
5d522a6c15
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
/rt-tests-1.9.tar.xz
|
||||
/rt-tests-2.1.tar.xz
|
||||
/rt-tests-2.3.tar.xz
|
||||
/rt-tests-2.4.tar.xz
|
||||
|
@ -5,8 +5,8 @@ Name: realtime-tests
|
||||
# BuildRequires: numactl-devel
|
||||
# Numa argument to make: NUMA=1
|
||||
#
|
||||
Version: 2.3
|
||||
Release: 3%{?dist}
|
||||
Version: 2.4
|
||||
Release: 1%{?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
|
||||
@ -20,10 +20,6 @@ Requires: bash
|
||||
Requires: 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
|
||||
realtime-tests is a set of programs that test and measure various components of
|
||||
@ -32,10 +28,6 @@ latency. It also tests the functioning of priority-inheritance mutexes.
|
||||
|
||||
%prep
|
||||
%setup -q -n rt-tests-%{version}
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
|
||||
%build
|
||||
%set_build_flags
|
||||
@ -86,6 +78,10 @@ latency. It also tests the functioning of priority-inheritance mutexes.
|
||||
%{_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#2068112
|
||||
|
||||
* Fri Feb 4 2022 John Kacur <jkacur@redhat.com> - 2.3-3
|
||||
- Don't build unsupported i686
|
||||
Resolves: rhbz#2050375
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (rt-tests-2.3.tar.xz) = 3bf6fe95c5ac9911fb51fba1d4a8e6ad3b96a6cdce464372917673862801353cbbb377c76d3a19325f0b5402f65daf5c605e496d7460949615069366a00a978a
|
||||
SHA512 (rt-tests-2.4.tar.xz) = ef72a55ed85c4d6717cef4573d684ea87f6e73f9189b2a2b8e9b69eaf6ea59933522769c9ba9c131ef9d0546645152e65f072427c53fcc0e386bd297fac3a6e1
|
||||
|
Loading…
Reference in New Issue
Block a user