From c27f5edee01e33f17db972b811c2aaadf8246317 Mon Sep 17 00:00:00 2001 From: Pingfan Liu Date: Thu, 11 Dec 2025 09:22:04 +0800 Subject: [PATCH] Release 2.4-9 Resolves: https://issues.redhat.com/browse/RHEL-129172 Signed-off-by: Pingfan Liu --- 0048-Avoid-deadlock-on-quitting.patch | 29 +++++++++++++++++++++++++++ numatop.spec | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0048-Avoid-deadlock-on-quitting.patch diff --git a/0048-Avoid-deadlock-on-quitting.patch b/0048-Avoid-deadlock-on-quitting.patch new file mode 100644 index 0000000..86158d2 --- /dev/null +++ b/0048-Avoid-deadlock-on-quitting.patch @@ -0,0 +1,29 @@ +From 1550c9925f98754c7af99d01df460eb6dabb4b0e Mon Sep 17 00:00:00 2001 +From: Andi Kleen +Date: Tue, 2 Dec 2025 22:06:32 -0800 +Subject: [PATCH] Avoid deadlock on quitting + +by resetting the display command mailbox when the display thread exits. + +Originally introduced with 8dfa30ea0311 + +Fixes #98 +--- + common/disp.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/common/disp.c b/common/disp.c +index c542b77..75eda9d 100644 +--- a/common/disp.c ++++ b/common/disp.c +@@ -640,6 +640,7 @@ L_EXIT: + perf_fini(); + + debug_print(NULL, 2, "disp thread is exiting\n"); ++ s_disp_ctl.flag = DISP_FLAG_NONE; + return (NULL); + } + +-- +2.49.0 + diff --git a/numatop.spec b/numatop.spec index 293bb2e..b833d9a 100644 --- a/numatop.spec +++ b/numatop.spec @@ -3,7 +3,7 @@ Name: numatop Version: 2.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Memory access locality characterization and analysis License: BSD-3-Clause @@ -55,6 +55,7 @@ Patch44: 0044-common-Resolve-max-count-of-nodes-at-runtime.patch Patch45: 0045-common-Resolve-max-count-of-CPUs-at-runtime.patch Patch46: 0046-common-Resolve-max-count-of-CPUs-per-node-at-runtime.patch Patch47: 0047-common-Remove-unused-NPROCS_NAX.patch +Patch48: 0048-Avoid-deadlock-on-quitting.patch BuildRequires: autoconf