forked from QubesOS/qubes-vmm-xen
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0639-xen-Add-SET_CPUFREQ_HWP-xen_sysctl_pm_op.patch
255 lines (242 loc) · 9.18 KB
/
0639-xen-Add-SET_CPUFREQ_HWP-xen_sysctl_pm_op.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
From a2e17e712dd51a8d7d83875181ef55ff21b97aca Mon Sep 17 00:00:00 2001
From: Jason Andryuk <[email protected]>
Date: Wed, 10 Aug 2022 15:29:40 -0400
Subject: [PATCH 09/13] xen: Add SET_CPUFREQ_HWP xen_sysctl_pm_op
Add SET_CPUFREQ_HWP xen_sysctl_pm_op to set HWP parameters. The sysctl
supports setting multiple values simultaneously as indicated by the
set_params bits. This allows atomically applying new HWP configuration
via a single wrmsr.
XEN_SYSCTL_HWP_SET_PRESET_BALANCE/PERFORMANCE/POWERSAVE provide three
common presets. Setting them depends on hardware limits which the
hypervisor is already caching. So using them allows skipping a
hypercall to query the limits (lowest/highest) to then set those same
values. The code is organized to allow a preset to be refined with
additional stuff if desired.
"most_efficient" and "guaranteed" could be additional presets in the
future, but the are not added now. Those levels can change at runtime,
but we don't have code in place to monitor and update for those events.
Signed-off-by: Jason Andryuk <[email protected]>
---
xen/arch/x86/acpi/cpufreq/hwp.c | 96 ++++++++++++++++++++++++++++++
xen/drivers/acpi/pmstat.c | 23 +++++++
xen/include/acpi/cpufreq/cpufreq.h | 2 +
xen/include/public/sysctl.h | 30 ++++++++++
4 files changed, 151 insertions(+)
diff --git a/xen/arch/x86/acpi/cpufreq/hwp.c b/xen/arch/x86/acpi/cpufreq/hwp.c
index bba83d76db24..ef640ef5eaf0 100644
--- a/xen/arch/x86/acpi/cpufreq/hwp.c
+++ b/xen/arch/x86/acpi/cpufreq/hwp.c
@@ -25,7 +25,9 @@ static bool feature_hdc;
__initdata bool opt_cpufreq_hwp = false;
__initdata bool opt_cpufreq_hdc = true;
+#define HWP_ENERGY_PERF_MAX_PERFORMANCE 0
#define HWP_ENERGY_PERF_BALANCE 0x80
+#define HWP_ENERGY_PERF_MAX_POWERSAVE 0xff
#define IA32_ENERGY_BIAS_BALANCE 0x7
#define IA32_ENERGY_BIAS_MAX_POWERSAVE 0xf
#define IA32_ENERGY_BIAS_MASK 0xf
@@ -525,6 +527,100 @@ int get_hwp_para(const struct cpufreq_policy *policy,
return 0;
}
+int set_hwp_para(struct cpufreq_policy *policy,
+ struct xen_set_hwp_para *set_hwp)
+{
+ unsigned int cpu = policy->cpu;
+ struct hwp_drv_data *data = per_cpu(hwp_drv_data, cpu);
+
+ if ( data == NULL )
+ return -EINVAL;
+
+ /* Validate all parameters first */
+ if ( set_hwp->set_params & ~XEN_SYSCTL_HWP_SET_PARAM_MASK )
+ return -EINVAL;
+
+ if ( set_hwp->activity_window & ~XEN_SYSCTL_HWP_ACT_WINDOW_MASK )
+ return -EINVAL;
+
+ if ( !feature_hwp_energy_perf &&
+ (set_hwp->set_params & XEN_SYSCTL_HWP_SET_ENERGY_PERF) &&
+ set_hwp->energy_perf > IA32_ENERGY_BIAS_MAX_POWERSAVE )
+ return -EINVAL;
+
+ if ( (set_hwp->set_params & XEN_SYSCTL_HWP_SET_DESIRED) &&
+ set_hwp->desired != 0 &&
+ (set_hwp->desired < data->hw.lowest ||
+ set_hwp->desired > data->hw.highest) )
+ return -EINVAL;
+
+ /*
+ * minimum & maximum are not validated as hardware doesn't seem to care
+ * and the SDM says CPUs will clip internally.
+ */
+
+ /* Apply presets */
+ switch ( set_hwp->set_params & XEN_SYSCTL_HWP_SET_PRESET_MASK )
+ {
+ case XEN_SYSCTL_HWP_SET_PRESET_POWERSAVE:
+ data->minimum = data->hw.lowest;
+ data->maximum = data->hw.lowest;
+ data->activity_window = 0;
+ if ( feature_hwp_energy_perf )
+ data->energy_perf = HWP_ENERGY_PERF_MAX_POWERSAVE;
+ else
+ data->energy_perf = IA32_ENERGY_BIAS_MAX_POWERSAVE;
+ data->desired = 0;
+ break;
+
+ case XEN_SYSCTL_HWP_SET_PRESET_PERFORMANCE:
+ data->minimum = data->hw.highest;
+ data->maximum = data->hw.highest;
+ data->activity_window = 0;
+ data->energy_perf = HWP_ENERGY_PERF_MAX_PERFORMANCE;
+ data->desired = 0;
+ break;
+
+ case XEN_SYSCTL_HWP_SET_PRESET_BALANCE:
+ data->minimum = data->hw.lowest;
+ data->maximum = data->hw.highest;
+ data->activity_window = 0;
+ if ( feature_hwp_energy_perf )
+ data->energy_perf = HWP_ENERGY_PERF_BALANCE;
+ else
+ data->energy_perf = IA32_ENERGY_BIAS_BALANCE;
+ data->desired = 0;
+ break;
+
+ case XEN_SYSCTL_HWP_SET_PRESET_NONE:
+ break;
+
+ default:
+ return -EINVAL;
+ }
+
+ /* Further customize presets if needed */
+ if ( set_hwp->set_params & XEN_SYSCTL_HWP_SET_MINIMUM )
+ data->minimum = set_hwp->minimum;
+
+ if ( set_hwp->set_params & XEN_SYSCTL_HWP_SET_MAXIMUM )
+ data->maximum = set_hwp->maximum;
+
+ if ( set_hwp->set_params & XEN_SYSCTL_HWP_SET_ENERGY_PERF )
+ data->energy_perf = set_hwp->energy_perf;
+
+ if ( set_hwp->set_params & XEN_SYSCTL_HWP_SET_DESIRED )
+ data->desired = set_hwp->desired;
+
+ if ( set_hwp->set_params & XEN_SYSCTL_HWP_SET_ACT_WINDOW )
+ data->activity_window = set_hwp->activity_window &
+ XEN_SYSCTL_HWP_ACT_WINDOW_MASK;
+
+ hwp_cpufreq_target(policy, 0, 0);
+
+ return 0;
+}
+
int __init hwp_register_driver(void)
{
return cpufreq_register_driver(&hwp_cpufreq_driver);
diff --git a/xen/drivers/acpi/pmstat.c b/xen/drivers/acpi/pmstat.c
index 67fd9dabd47e..55e2b285b56e 100644
--- a/xen/drivers/acpi/pmstat.c
+++ b/xen/drivers/acpi/pmstat.c
@@ -398,6 +398,25 @@ static int set_cpufreq_para(struct xen_sysctl_pm_op *op)
return ret;
}
+static int set_cpufreq_hwp(struct xen_sysctl_pm_op *op)
+{
+ struct cpufreq_policy *policy;
+
+ if ( !cpufreq_governor_internal )
+ return -EINVAL;
+
+ policy = per_cpu(cpufreq_cpu_policy, op->cpuid);
+
+ if ( !policy || !policy->governor )
+ return -EINVAL;
+
+ if ( strncasecmp(policy->governor->name, XEN_HWP_GOVERNOR,
+ CPUFREQ_NAME_LEN) )
+ return -EINVAL;
+
+ return set_hwp_para(policy, &op->u.set_hwp);
+}
+
int do_pm_op(struct xen_sysctl_pm_op *op)
{
int ret = 0;
@@ -470,6 +489,10 @@ int do_pm_op(struct xen_sysctl_pm_op *op)
break;
}
+ case SET_CPUFREQ_HWP:
+ ret = set_cpufreq_hwp(op);
+ break;
+
case GET_CPUFREQ_AVGFREQ:
{
op->u.get_avgfreq = cpufreq_driver_getavg(op->cpuid, USR_GETAVG);
diff --git a/xen/include/acpi/cpufreq/cpufreq.h b/xen/include/acpi/cpufreq/cpufreq.h
index 92b4c7e79c5c..b8831b2cd390 100644
--- a/xen/include/acpi/cpufreq/cpufreq.h
+++ b/xen/include/acpi/cpufreq/cpufreq.h
@@ -249,5 +249,7 @@ extern bool opt_cpufreq_hwp;
extern bool opt_cpufreq_hdc;
int get_hwp_para(const struct cpufreq_policy *policy,
struct xen_hwp_para *hwp_para);
+int set_hwp_para(struct cpufreq_policy *policy,
+ struct xen_set_hwp_para *set_hwp);
#endif /* __XEN_CPUFREQ_PM_H__ */
diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h
index b69bfdaa2a68..83a6ea5a047b 100644
--- a/xen/include/public/sysctl.h
+++ b/xen/include/public/sysctl.h
@@ -317,6 +317,34 @@ struct xen_hwp_para {
uint8_t energy_perf;
};
+/* set multiple values simultaneously when set_args bit is set */
+struct xen_set_hwp_para {
+#define XEN_SYSCTL_HWP_SET_DESIRED (1U << 0)
+#define XEN_SYSCTL_HWP_SET_ENERGY_PERF (1U << 1)
+#define XEN_SYSCTL_HWP_SET_ACT_WINDOW (1U << 2)
+#define XEN_SYSCTL_HWP_SET_MINIMUM (1U << 3)
+#define XEN_SYSCTL_HWP_SET_MAXIMUM (1U << 4)
+#define XEN_SYSCTL_HWP_SET_PRESET_MASK 0xf000
+#define XEN_SYSCTL_HWP_SET_PRESET_NONE 0x0000
+#define XEN_SYSCTL_HWP_SET_PRESET_BALANCE 0x1000
+#define XEN_SYSCTL_HWP_SET_PRESET_POWERSAVE 0x2000
+#define XEN_SYSCTL_HWP_SET_PRESET_PERFORMANCE 0x3000
+#define XEN_SYSCTL_HWP_SET_PARAM_MASK ( \
+ XEN_SYSCTL_HWP_SET_PRESET_MASK | \
+ XEN_SYSCTL_HWP_SET_DESIRED | \
+ XEN_SYSCTL_HWP_SET_ENERGY_PERF | \
+ XEN_SYSCTL_HWP_SET_ACT_WINDOW | \
+ XEN_SYSCTL_HWP_SET_MINIMUM | \
+ XEN_SYSCTL_HWP_SET_MAXIMUM )
+ uint16_t set_params; /* bitflags for valid values */
+#define XEN_SYSCTL_HWP_ACT_WINDOW_MASK 0x03ff
+ uint16_t activity_window; /* See comment in struct xen_hwp_para */
+ uint8_t minimum;
+ uint8_t maximum;
+ uint8_t desired;
+ uint8_t energy_perf; /* 0-255 or 0-15 depending on HW support */
+};
+
#define XEN_HWP_GOVERNOR "hwp-internal"
/*
* cpufreq para name of this structure named
@@ -379,6 +407,7 @@ struct xen_sysctl_pm_op {
#define SET_CPUFREQ_GOV (CPUFREQ_PARA | 0x02)
#define SET_CPUFREQ_PARA (CPUFREQ_PARA | 0x03)
#define GET_CPUFREQ_AVGFREQ (CPUFREQ_PARA | 0x04)
+ #define SET_CPUFREQ_HWP (CPUFREQ_PARA | 0x05)
/* set/reset scheduler power saving option */
#define XEN_SYSCTL_pm_op_set_sched_opt_smt 0x21
@@ -405,6 +434,7 @@ struct xen_sysctl_pm_op {
struct xen_get_cpufreq_para get_para;
struct xen_set_cpufreq_gov set_gov;
struct xen_set_cpufreq_para set_para;
+ struct xen_set_hwp_para set_hwp;
uint64_aligned_t get_avgfreq;
uint32_t set_sched_opt_smt;
#define XEN_SYSCTL_CX_UNLIMITED 0xffffffff
--
2.37.3