Remove patches that disabled libcpupower functionality
Resolves: RHEL-116084 Signed-off-by: John B. Wyatt IV <jwyatt@redhat.com>
This commit is contained in:
John B. Wyatt IV
parent
6026788fa3
commit
5656c3563d
@ -1,45 +0,0 @@
|
||||
From 28f18534f131ed25d8fc2a568cf97e5122efe2a0 Mon Sep 17 00:00:00 2001
|
||||
From: "John B. Wyatt IV" <jwyatt@redhat.com>
|
||||
Date: Wed, 13 Aug 2025 11:41:57 -0400
|
||||
Subject: [PATCH] Revert "tuna: Update man page with cpu_power command" for
|
||||
RHEL10
|
||||
|
||||
This reverts commit 84baeed49a3d3e0b6b20138cbfe5ecbcfdbc0d67.
|
||||
|
||||
The cpu_power command was removed to reduce customer confusion.
|
||||
---
|
||||
docs/tuna.8 | 18 ------------------
|
||||
1 file changed, 18 deletions(-)
|
||||
|
||||
diff --git a/docs/tuna.8 b/docs/tuna.8
|
||||
index 6e30537..2423894 100644
|
||||
--- a/docs/tuna.8
|
||||
+++ b/docs/tuna.8
|
||||
@@ -24,24 +24,6 @@ Log application details to file for given LOG-LEVEL
|
||||
Print DEBUG level logging details to console
|
||||
.SH "COMMANDS"
|
||||
.TP
|
||||
-\fBtuna cpu_power\fR
|
||||
-usage: tuna-cmd.py cpu_power [-h] (-c CPU-LIST)
|
||||
-
|
||||
-Set or query the idle (power) states of all or a selection of cpus in the CPU-LIST. Modifiers \fB\-c\fR may be used to pass the CPU-LIST of cpus to perform the command on.
|
||||
-
|
||||
-optional arguments:
|
||||
- -h, --help show this help message and exit
|
||||
- -i, --idle-info Print general idle information for the selected CPUs, including
|
||||
- index values for IDLE-STATE.
|
||||
- -s, --status IDLE-STATE
|
||||
- Print whether IDLE-STATE is enabled on the selected CPUs.
|
||||
- -d, --disable IDLE-STATE
|
||||
- Disable IDLE-STATE on the selected CPUs.
|
||||
- -e, --enable IDLE-STATE
|
||||
- Enable IDLE-STATE on the selected CPUs.
|
||||
- -c CPU-LIST, --cpus CPU-LIST
|
||||
- CPU-LIST affected by commands
|
||||
-.TP
|
||||
\fBtuna isolate\fR
|
||||
usage: tuna-cmd.py isolate [-h] (-c CPU-LIST | -S CPU-SOCKET-LIST | -N)
|
||||
|
||||
--
|
||||
2.50.1
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
From 61b20a8a9323b59042f3cfc4421b3378dd96a1d4 Mon Sep 17 00:00:00 2001
|
||||
From: "John B. Wyatt IV" <jwyatt@redhat.com>
|
||||
Date: Tue, 29 Jul 2025 10:29:21 -0400
|
||||
Subject: [PATCH] tuna: disable cpu_power functionality for RHEL10 temporarily.
|
||||
|
||||
At the time libcpupower's bindings were not backported to Stream/RHEL10. This
|
||||
issue will be resolved in a future release. Disable cpu_power subcommand
|
||||
from showing.
|
||||
|
||||
Signed-off-by: John B. Wyatt IV <jwyatt@redhat.com>
|
||||
---
|
||||
tuna-cmd.py | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/tuna-cmd.py b/tuna-cmd.py
|
||||
index d0a3e6b..c8e1cbd 100755
|
||||
--- a/tuna-cmd.py
|
||||
+++ b/tuna-cmd.py
|
||||
@@ -91,7 +91,7 @@ def gen_parser():
|
||||
|
||||
|
||||
POS = {
|
||||
- "cpu_list": dict(metavar='CPU-LIST', type=tuna.cpustring_to_list, help="CPU-LIST affected by commands"),
|
||||
+ # "cpu_list": dict(metavar='CPU-LIST', type=tuna.cpustring_to_list, help="CPU-LIST affected by commands"), # disable currently in RHEL9; please use RHEL10 or later
|
||||
"thread_list": dict(metavar='THREAD-LIST', type=threadstring_to_list, help="THREAD-LIST affected by commands"),
|
||||
"filename": dict(metavar='FILENAME', type=str, help="Save kthreads sched tunables to this file"),
|
||||
"profilename": dict(type=str, help="Apply changes described in this file"),
|
||||
@@ -133,9 +133,9 @@ def gen_parser():
|
||||
|
||||
subparser = parser.add_subparsers(dest='command')
|
||||
|
||||
- idle_set = subparser.add_parser('cpu_power',
|
||||
- description='Manage CPU idle state disabling (requires libcpupower and it\'s Python bindings)',
|
||||
- help='Set all idle states on a given CPU-LIST.')
|
||||
+ # idle_set = subparser.add_parser('cpu_power',
|
||||
+ # description='Manage CPU idle state disabling (requires libcpupower and it\'s Python bindings)',
|
||||
+ # help='Set all idle states on a given CPU-LIST.')
|
||||
isolate = subparser.add_parser('isolate', description="Move all allowed threads and IRQs away from CPU-LIST",
|
||||
help="Move all allowed threads and IRQs away from CPU-LIST")
|
||||
include = subparser.add_parser('include', description="Allow all threads to run on CPU-LIST",
|
||||
@@ -228,12 +228,12 @@ def gen_parser():
|
||||
show_irqs_group.add_argument('-S', '--sockets', **MODS['sockets'])
|
||||
show_irqs.add_argument('-q', '--irqs', **MODS['irqs'])
|
||||
|
||||
- idle_set_group = idle_set.add_mutually_exclusive_group(required=True)
|
||||
- idle_set_group.add_argument('-i', '--idle-info', **MODS['idle_info'])
|
||||
- idle_set_group.add_argument('-s', '--status', **MODS['idle_state_disabled_status'])
|
||||
- idle_set_group.add_argument('-d', '--disable', **MODS['disable_idle_state'])
|
||||
- idle_set_group.add_argument('-e', '--enable', **MODS['enable_idle_state'])
|
||||
- idle_set.add_argument('-c', '--cpus', **MODS['cpus'])
|
||||
+ # idle_set_group = idle_set.add_mutually_exclusive_group(required=True)
|
||||
+ # idle_set_group.add_argument('-i', '--idle-info', **MODS['idle_info'])
|
||||
+ # idle_set_group.add_argument('-s', '--status', **MODS['idle_state_disabled_status'])
|
||||
+ # idle_set_group.add_argument('-d', '--disable', **MODS['disable_idle_state'])
|
||||
+ # idle_set_group.add_argument('-e', '--enable', **MODS['enable_idle_state'])
|
||||
+ # idle_set.add_argument('-c', '--cpus', **MODS['cpus'])
|
||||
|
||||
what_is.add_argument('thread_list', **POS['thread_list'])
|
||||
|
||||
--
|
||||
2.50.1
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: tuna
|
||||
Version: 0.19
|
||||
Release: 16%{?dist}
|
||||
Release: 17%{?dist}
|
||||
License: GPL-2.0-only AND LGPL-2.1-only
|
||||
Summary: Application tuning GUI & command line utility
|
||||
Source: https://www.kernel.org/pub/software/utils/%{name}/%{name}-%{version}.tar.xz
|
||||
@ -28,8 +28,6 @@ Patch10: tuna-Update-man-page-with-cpu_power-command.patch
|
||||
Patch11: tuna-Fix-show_threads-t-and-show_irqs-q.patch
|
||||
Patch12: tuna-Fix-run-command-failing-to-apply-BATCH-policy.patch
|
||||
Patch13: tuna-Add-U-and-K-to-the-move-command.patch
|
||||
Patch14: tuna-disable-cpu_power-functionality-for-RHEL10-temp.patch
|
||||
Patch15: Revert-tuna-Update-man-page-with-cpu_power-command-f.patch
|
||||
|
||||
%description
|
||||
Provides interface for changing scheduler and IRQ tunables, at whole CPU and at
|
||||
@ -83,6 +81,10 @@ done
|
||||
%{_datadir}/polkit-1/actions/org.tuna.policy
|
||||
|
||||
%changelog
|
||||
* Thu Sep 18 2025 John B. Wyatt IV <jwyatt@redhat.com> - 0.19-17
|
||||
- Remove patches that disabled libcpupower functionality
|
||||
Resolves: RHEL-116084
|
||||
|
||||
* Wed Aug 13 2025 John B. Wyatt IV <jwyatt@redhat.com> - 0.19-16
|
||||
- Revert tuna man page changes for cpu_power
|
||||
Resolves: RHEL-108936
|
||||
|
||||
Loading…
Reference in New Issue
Block a user