44 lines
1.8 KiB
Diff
44 lines
1.8 KiB
Diff
From 434b4b64d17e16ed23f90c99c26dbd0e4ce6cd88 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 24 Nov 2021 15:58:50 +0100
|
|
Subject: [PATCH] test: make test-execute pass on Linux 5.15
|
|
|
|
Linux 5.15 broke kernel API:
|
|
|
|
https://github.com/torvalds/linux/commit/e70344c05995a190a56bbd1a23dc2218bcc8c924
|
|
|
|
Previously setting IOPRIO_CLASS_NONE for a process would then report
|
|
IOPRIO_CLASS_NONE back. But since 5.15 it reports IOPRIO_CLASS_BE
|
|
instead. Since IOPRIO_CLASS_NONE is an alias for a special setting of
|
|
IOPRIO_CLASS_BE this makes some sense, but it's also a kernel API
|
|
breakage that our testsuite trips up on.
|
|
|
|
(I made some minimal effort to inform the kernel people about this API
|
|
breakage during the 5.15 rc phase, but noone was interested.)
|
|
|
|
Either way let's hadle this gracefully in our test suite and accept
|
|
"best-effort" too when "none" was set.
|
|
|
|
(This is only triggable if the tests are run on 5.15 with full privs)
|
|
|
|
(cherry picked from commit d9b8771108cf2955efc3852b477391017d2c599a)
|
|
|
|
Related: #2087152
|
|
---
|
|
test/test-execute/exec-ioschedulingclass-none.service | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/test/test-execute/exec-ioschedulingclass-none.service b/test/test-execute/exec-ioschedulingclass-none.service
|
|
index b6af122a1e..8f917d345d 100644
|
|
--- a/test/test-execute/exec-ioschedulingclass-none.service
|
|
+++ b/test/test-execute/exec-ioschedulingclass-none.service
|
|
@@ -2,6 +2,7 @@
|
|
Description=Test for IOSchedulingClass=none
|
|
|
|
[Service]
|
|
-ExecStart=/bin/sh -x -c 'c=$$(LC_ALL=C ionice); test "$${c%%:*}" = "none"'
|
|
+# Old kernels might report "none" here, new kernels "best-effort".
|
|
+ExecStart=/bin/sh -x -c 'c=$$(LC_ALL=C ionice); test "$${c%%:*}" = "none" -o "$${c%%:*}" = "best-effort"'
|
|
Type=oneshot
|
|
IOSchedulingClass=none
|