From 4453528ae0d052a59c4c46df398018a25ab7561f Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 30 Aug 2024 16:04:39 +0200 Subject: [PATCH] systemd-256-14 Resolves: RHEL-52634 --- ...il-Don-t-try-to-open-pidfd-for-kerne.patch | 33 +++++++++++++++++++ ...p-test-on-architectures-without-UEFI.patch | 30 +++++++++++++++++ systemd.spec | 8 ++++- 3 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 0089-Revert-cgroup-util-Don-t-try-to-open-pidfd-for-kerne.patch create mode 100644 0090-ukify-Skip-test-on-architectures-without-UEFI.patch diff --git a/0089-Revert-cgroup-util-Don-t-try-to-open-pidfd-for-kerne.patch b/0089-Revert-cgroup-util-Don-t-try-to-open-pidfd-for-kerne.patch new file mode 100644 index 0000000..2b96897 --- /dev/null +++ b/0089-Revert-cgroup-util-Don-t-try-to-open-pidfd-for-kerne.patch @@ -0,0 +1,33 @@ +From 38623336fb84eb0df1f72ef8d472a36bb5d60822 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Wed, 21 Aug 2024 11:25:46 +0200 +Subject: [PATCH] Revert "cgroup-util: Don't try to open pidfd for kernel + threads" + +The kernel patch was reverted so let's try again to open pidfds +for kernel threads. + +This reverts commit ead48ec35c863650944352a3455f26ce3b393058. + +(cherry picked from commit 1ce69e06615e69692a6d02d447acfd77f5d44631) + +Related: RHEL-52634 +--- + src/basic/cgroup-util.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c +index 2c64a54906..a6ad711ac0 100644 +--- a/src/basic/cgroup-util.c ++++ b/src/basic/cgroup-util.c +@@ -149,9 +149,7 @@ int cg_read_pidref(FILE *f, PidRef *ret, CGroupFlags flags) { + if (pid == 0) + return -EREMOTE; + +- /* We might read kernel thread pids from cgroup.procs for which we cannot create a pidfd so +- * catch those and don't try to create a pidfd for them. */ +- if (FLAGS_SET(flags, CGROUP_NO_PIDFD) || pid_is_kernel_thread(pid) > 0) { ++ if (FLAGS_SET(flags, CGROUP_NO_PIDFD)) { + *ret = PIDREF_MAKE_FROM_PID(pid); + return 1; + } diff --git a/0090-ukify-Skip-test-on-architectures-without-UEFI.patch b/0090-ukify-Skip-test-on-architectures-without-UEFI.patch new file mode 100644 index 0000000..e502a96 --- /dev/null +++ b/0090-ukify-Skip-test-on-architectures-without-UEFI.patch @@ -0,0 +1,30 @@ +From 65dbacdb67ae94f7481a413dfea651b2d8a74d13 Mon Sep 17 00:00:00 2001 +From: Daan De Meyer +Date: Wed, 28 Aug 2024 14:08:30 +0200 +Subject: [PATCH] ukify: Skip test on architectures without UEFI + +(cherry picked from commit 5121f7c45b37afca53c89f42123b1dd6a04fa80f) + +Related: RHEL-52634 +--- + src/ukify/test/test_ukify.py | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py +index 0e3f932890..15d1578695 100755 +--- a/src/ukify/test/test_ukify.py ++++ b/src/ukify/test/test_ukify.py +@@ -35,6 +35,13 @@ except ImportError as e: + sys.path.append(os.path.dirname(__file__) + '/..') + import ukify + ++# Skip if we're running on an architecture that does not use UEFI. ++try: ++ ukify.guess_efi_arch() ++except ValueError as e: ++ print(str(e), file=sys.stderr) ++ sys.exit(77) ++ + build_root = os.getenv('PROJECT_BUILD_ROOT') + try: + slow_tests = bool(int(os.getenv('SYSTEMD_SLOW_TESTS', '1'))) diff --git a/systemd.spec b/systemd.spec index 825de54..7619540 100644 --- a/systemd.spec +++ b/systemd.spec @@ -48,7 +48,7 @@ Url: https://systemd.io # Allow users to specify the version and release when building the rpm by # setting the %%version_override and %%release_override macros. Version: %{?version_override}%{!?version_override:256} -Release: 13%{?dist} +Release: 14%{?dist} %global stable %(c="%version"; [ "$c" = "${c#*.*}" ]; echo $?) @@ -194,6 +194,8 @@ Patch0085: 0085-cgroup-util-fix-typo.patch Patch0086: 0086-netif-naming-scheme-rename-rhel-10.0-to-rhel-10.0.be.patch Patch0087: 0087-net-naming-scheme-disable-NAMING_FIRMWARE_NODE_SUN.patch Patch0088: 0088-net-naming-scheme-remove-NAMING_FIRMWARE_NODE_SUN-fr.patch +Patch0089: 0089-Revert-cgroup-util-Don-t-try-to-open-pidfd-for-kerne.patch +Patch0090: 0090-ukify-Skip-test-on-architectures-without-UEFI.patch # Downstream-only patches (9000–9999) @@ -1123,6 +1125,10 @@ rm -f .file-list-* rm -f %{name}.lang %changelog +* Fri Aug 30 2024 systemd maintenance team - 256-14 +- Revert "cgroup-util: Don't try to open pidfd for kernel threads" (RHEL-52634) +- ukify: Skip test on architectures without UEFI (RHEL-52634) + * Thu Aug 22 2024 systemd maintenance team - 256-13 - systemctl: do not try to acquire triggering units for template units (RHEL-55132) - core/unit: add one assertion for u->manager (RHEL-55734)