2023-10-09 02:50:57

by Meng, Li (Jassmine)

Subject: [PATCH V8 0/7] amd-pstate preferred core

Hi all:

The core frequency is subjected to the process variation in semiconductors.
Not all cores are able to reach the maximum frequency respecting the
infrastructure limits. Consequently, AMD has redefined the concept of
maximum frequency of a part. This means that a fraction of cores can reach
maximum frequency. To find the best process scheduling policy for a given
scenario, OS needs to know the core ordering informed by the platform through
highest performance capability register of the CPPC interface.

Earlier implementations of amd-pstate preferred core only support a static
core ranking and targeted performance. Now it has the ability to dynamically
change the preferred core based on the workload and platform conditions and
accounting for thermals and aging.

Amd-pstate driver utilizes the functions and data structures provided by
the ITMT architecture to enable the scheduler to favor scheduling on cores
which can be get a higher frequency with lower voltage.
We call it amd-pstate preferred core.

Here sched_set_itmt_core_prio() is called to set priorities and
sched_set_itmt_support() is called to enable ITMT feature.
Amd-pstate driver uses the highest performance value to indicate
the priority of CPU. The higher value has a higher priority.

Amd-pstate driver will provide an initial core ordering at boot time.
It relies on the CPPC interface to communicate the core ranking to the
operating system and scheduler to make sure that OS is choosing the cores
with highest performance firstly for scheduling the process. When amd-pstate
driver receives a message with the highest performance change, it will
update the core ranking.

Changes form V7->V8:
- all:
- - pick up Review-By flag added by Mario and Ray.
- cpufreq: amd-pstate:
- - use hw_prefcore embeds into cpudata structure.
- - delete preferred core init from cpu online/off.

Changes form V6->V7:
- x86:
- - Modify kconfig about X86_AMD_PSTATE.
- cpufreq: amd-pstate:
- - modify incorrect comments about scheduler_work().
- - convert highest_perf data type.
- - modify preferred core init when cpu init and online.
- acpi: cppc:
- - modify link of CPPC highest performance.
- cpufreq:
- - modify link of CPPC highest performance changed.

Changes form V5->V6:
- cpufreq: amd-pstate:
- - modify the wrong tag order.
- - modify warning about hw_prefcore sysfs attribute.
- - delete duplicate comments.
- - modify the variable name cppc_highest_perf to prefcore_ranking.
- - modify judgment conditions for setting highest_perf.
- - modify sysfs attribute for CPPC highest perf to pr_debug message.
- Documentation: amd-pstate:
- - modify warning: title underline too short.

Changes form V4->V5:
- cpufreq: amd-pstate:
- - modify sysfs attribute for CPPC highest perf.
- - modify warning about comments
- - rebase linux-next
- cpufreq:
- - Moidfy warning about function declarations.
- Documentation: amd-pstate:
- - align with ``amd-pstat``

Changes form V3->V4:
- Documentation: amd-pstate:
- - Modify inappropriate descriptions.

Changes form V2->V3:
- x86:
- - Modify kconfig and description.
- cpufreq: amd-pstate:
- - Add Co-developed-by tag in commit message.
- cpufreq:
- - Modify commit message.
- Documentation: amd-pstate:
- - Modify inappropriate descriptions.

Changes form V1->V2:
- acpi: cppc:
- - Add reference link.
- cpufreq:
- - Moidfy link error.
- cpufreq: amd-pstate:
- - Init the priorities of all online CPUs
- - Use a single variable to represent the status of preferred core.
- Documentation:
- - Default enabled preferred core.
- Documentation: amd-pstate:
- - Modify inappropriate descriptions.
- - Default enabled preferred core.
- - Use a single variable to represent the status of preferred core.

Meng Li (7):
x86: Drop CPU_SUP_INTEL from SCHED_MC_PRIO for the expansion.
acpi: cppc: Add get the highest performance cppc control
cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.
cpufreq: Add a notification message that the highest perf has changed
cpufreq: amd-pstate: Update amd-pstate preferred core ranking
dynamically
Documentation: amd-pstate: introduce amd-pstate preferred core
Documentation: introduce amd-pstate preferrd core mode kernel command
line options

.../admin-guide/kernel-parameters.txt | 5 +
Documentation/admin-guide/pm/amd-pstate.rst | 59 +++++-
arch/x86/Kconfig | 5 +-
drivers/acpi/cppc_acpi.c | 13 ++
drivers/acpi/processor_driver.c | 6 +
drivers/cpufreq/amd-pstate.c | 186 ++++++++++++++++--
drivers/cpufreq/cpufreq.c | 13 ++
include/acpi/cppc_acpi.h | 5 +
include/linux/amd-pstate.h | 10 +
include/linux/cpufreq.h | 5 +
10 files changed, 285 insertions(+), 22 deletions(-)

--
2.34.1

2023-10-09 02:51:06

by Meng, Li (Jassmine)

Subject: [PATCH V8 2/7] acpi: cppc: Add get the highest performance cppc control

Add support for getting the highest performance to the
generic CPPC driver. This enables downstream drivers
such as amd-pstate to discover and use these values.

Please refer to the ACPI_Spec for details on continuous
performance control of CPPC.

Reviewed-by: Mario Limonciello <[email protected]>
Reviewed-by: Wyes Karny <[email protected]>
Acked-by: Huang Rui <[email protected]>
Signed-off-by: Meng Li <[email protected]>
Link: https://uefi.org/specs/ACPI/6.5/08_Processor_Configuration_and_Control.html?highlight=cppc#highest-performance
---
drivers/acpi/cppc_acpi.c | 13 +++++++++++++
include/acpi/cppc_acpi.h | 5 +++++
2 files changed, 18 insertions(+)

diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c
index 7ff269a78c20..ad388a0e8484 100644
--- a/drivers/acpi/cppc_acpi.c
+++ b/drivers/acpi/cppc_acpi.c
@@ -1154,6 +1154,19 @@ int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf)
return cppc_get_perf(cpunum, NOMINAL_PERF, nominal_perf);
}

+/**
+ * cppc_get_highest_perf - Get the highest performance register value.
+ * @cpunum: CPU from which to get highest performance.
+ * @highest_perf: Return address.
+ *
+ * Return: 0 for success, -EIO otherwise.
+ */
+int cppc_get_highest_perf(int cpunum, u64 *highest_perf)
+{
+ return cppc_get_perf(cpunum, HIGHEST_PERF, highest_perf);
+}
+EXPORT_SYMBOL_GPL(cppc_get_highest_perf);
+
/**
* cppc_get_epp_perf - Get the epp register value.
* @cpunum: CPU from which to get epp preference value.
diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h
index 6126c977ece0..c0b69ffe7bdb 100644
--- a/include/acpi/cppc_acpi.h
+++ b/include/acpi/cppc_acpi.h
@@ -139,6 +139,7 @@ struct cppc_cpudata {
#ifdef CONFIG_ACPI_CPPC_LIB
extern int cppc_get_desired_perf(int cpunum, u64 *desired_perf);
extern int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf);
+extern int cppc_get_highest_perf(int cpunum, u64 *highest_perf);
extern int cppc_get_perf_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_ctrs);
extern int cppc_set_perf(int cpu, struct cppc_perf_ctrls *perf_ctrls);
extern int cppc_set_enable(int cpu, bool enable);
@@ -165,6 +166,10 @@ static inline int cppc_get_nominal_perf(int cpunum, u64 *nominal_perf)
{
return -ENOTSUPP;
}
+static inline int cppc_get_highest_perf(int cpunum, u64 *highest_perf)
+{
+ return -ENOTSUPP;
+}
static inline int cppc_get_perf_ctrs(int cpu, struct cppc_perf_fb_ctrs *perf_fb_ctrs)
{
return -ENOTSUPP;
--
2.34.1

2023-10-09 02:51:13

by Meng, Li (Jassmine)

Subject: [PATCH V8 6/7] Documentation: amd-pstate: introduce amd-pstate preferred core

Introduce amd-pstate preferred core.

check preferred core state set by the kernel parameter:
$ cat /sys/devices/system/cpu/amd-pstate/prefcore

Reviewed-by: Mario Limonciello <[email protected]>
Reviewed-by: Huang Rui <[email protected]>
Signed-off-by: Meng Li <[email protected]>
---
Documentation/admin-guide/pm/amd-pstate.rst | 59 ++++++++++++++++++++-
1 file changed, 57 insertions(+), 2 deletions(-)

diff --git a/Documentation/admin-guide/pm/amd-pstate.rst b/Documentation/admin-guide/pm/amd-pstate.rst
index 1cf40f69278c..0b832ff529db 100644
--- a/Documentation/admin-guide/pm/amd-pstate.rst
+++ b/Documentation/admin-guide/pm/amd-pstate.rst
@@ -300,8 +300,8 @@ platforms. The AMD P-States mechanism is the more performance and energy
efficiency frequency management method on AMD processors.


-AMD Pstate Driver Operation Modes
-=================================
+``amd-pstate`` Driver Operation Modes
+======================================

``amd_pstate`` CPPC has 3 operation modes: autonomous (active) mode,
non-autonomous (passive) mode and guided autonomous (guided) mode.
@@ -353,6 +353,48 @@ is activated. In this mode, driver requests minimum and maximum performance
level and the platform autonomously selects a performance level in this range
and appropriate to the current workload.

+``amd-pstate`` Preferred Core
+=================================
+
+The core frequency is subjected to the process variation in semiconductors.
+Not all cores are able to reach the maximum frequency respecting the
+infrastructure limits. Consequently, AMD has redefined the concept of
+maximum frequency of a part. This means that a fraction of cores can reach
+maximum frequency. To find the best process scheduling policy for a given
+scenario, OS needs to know the core ordering informed by the platform through
+highest performance capability register of the CPPC interface.
+
+``amd-pstate`` preferred core enables the scheduler to prefer scheduling on
+cores that can achieve a higher frequency with lower voltage. The preferred
+core rankings can dynamically change based on the workload, platform conditions,
+thermals and ageing.
+
+The priority metric will be initialized by the ``amd-pstate`` driver. The ``amd-pstate``
+driver will also determine whether or not ``amd-pstate`` preferred core is
+supported by the platform.
+
+``amd-pstate`` driver will provide an initial core ordering when the system boots.
+The platform uses the CPPC interfaces to communicate the core ranking to the
+operating system and scheduler to make sure that OS is choosing the cores
+with highest performance firstly for scheduling the process. When ``amd-pstate``
+driver receives a message with the highest performance change, it will
+update the core ranking and set the cpu's priority.
+
+``amd-pstate`` Preferred Core Switch
+=================================
+Kernel Parameters
+-----------------
+
+``amd-pstate`` peferred core`` has two states: enable and disable.
+Enable/disable states can be chosen by different kernel parameters.
+Default enable ``amd-pstate`` preferred core.
+
+``amd_prefcore=disable``
+
+For systems that support ``amd-pstate`` preferred core, the core rankings will
+always be advertised by the platform. But OS can choose to ignore that via the
+kernel parameter ``amd_prefcore=disable``.
+
User Space Interface in ``sysfs`` - General
===========================================

@@ -385,6 +427,19 @@ control its functionality at the system level. They are located in the
to the operation mode represented by that string - or to be
unregistered in the "disable" case.

+``prefcore``
+ Preferred core state of the driver: "enabled" or "disabled".
+
+ "enabled"
+ Enable the ``amd-pstate`` preferred core.
+
+ "disabled"
+ Disable the ``amd-pstate`` preferred core
+
+
+ This attribute is read-only to check the state of preferred core set
+ by the kernel parameter.
+
``cpupower`` tool support for ``amd-pstate``
===============================================

--
2.34.1

2023-10-09 02:51:28

by Meng, Li (Jassmine)

Subject: [PATCH V8 4/7] cpufreq: Add a notification message that the highest perf has changed

ACPI 6.5 section 8.4.6.1.1.1 specifies that Notify event 0x85 can be
emmitted to cause the the OSPM to re-evaluate the highest performance
register. Add support for this event.

Reviewed-by: Mario Limonciello <[email protected]>
Reviewed-by: Huang Rui <[email protected]>
Signed-off-by: Meng Li <[email protected]>
Link: https://uefi.org/specs/ACPI/6.5/05_ACPI_Software_Programming_Model.html#processor-device-notification-values
---
drivers/acpi/processor_driver.c | 6 ++++++
drivers/cpufreq/cpufreq.c | 13 +++++++++++++
include/linux/cpufreq.h | 5 +++++
3 files changed, 24 insertions(+)

diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 4bd16b3f0781..29b2fb68a35d 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -27,6 +27,7 @@
#define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80
#define ACPI_PROCESSOR_NOTIFY_POWER 0x81
#define ACPI_PROCESSOR_NOTIFY_THROTTLING 0x82
+#define ACPI_PROCESSOR_NOTIFY_HIGEST_PERF_CHANGED 0x85

MODULE_AUTHOR("Paul Diefenbaugh");
MODULE_DESCRIPTION("ACPI Processor Driver");
@@ -83,6 +84,11 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
acpi_bus_generate_netlink_event(device->pnp.device_class,
dev_name(&device->dev), event, 0);
break;
+ case ACPI_PROCESSOR_NOTIFY_HIGEST_PERF_CHANGED:
+ cpufreq_update_highest_perf(pr->id);
+ acpi_bus_generate_netlink_event(device->pnp.device_class,
+ dev_name(&device->dev), event, 0);
+ break;
default:
acpi_handle_debug(handle, "Unsupported event [0x%x]\n", event);
break;
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 60ed89000e82..4ada787ff105 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2718,6 +2718,19 @@ void cpufreq_update_limits(unsigned int cpu)
}
EXPORT_SYMBOL_GPL(cpufreq_update_limits);

+/**
+ * cpufreq_update_highest_perf - Update highest performance for a given CPU.
+ * @cpu: CPU to update the highest performance for.
+ *
+ * Invoke the driver's ->update_highest_perf callback if present
+ */
+void cpufreq_update_highest_perf(unsigned int cpu)
+{
+ if (cpufreq_driver->update_highest_perf)
+ cpufreq_driver->update_highest_perf(cpu);
+}
+EXPORT_SYMBOL_GPL(cpufreq_update_highest_perf);
+
/*********************************************************************
* BOOST *
*********************************************************************/
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
index 71d186d6933a..1cc1241fb698 100644
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
@@ -235,6 +235,7 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
void refresh_frequency_limits(struct cpufreq_policy *policy);
void cpufreq_update_policy(unsigned int cpu);
void cpufreq_update_limits(unsigned int cpu);
+void cpufreq_update_highest_perf(unsigned int cpu);
bool have_governor_per_policy(void);
bool cpufreq_supports_freq_invariance(void);
struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy);
@@ -263,6 +264,7 @@ static inline bool cpufreq_supports_freq_invariance(void)
return false;
}
static inline void disable_cpufreq(void) { }
+static inline void cpufreq_update_highest_perf(unsigned int cpu) { }
#endif

#ifdef CONFIG_CPU_FREQ_STAT
@@ -380,6 +382,9 @@ struct cpufreq_driver {
/* Called to update policy limits on firmware notifications. */
void (*update_limits)(unsigned int cpu);

+ /* Called to update highest performance on firmware notifications. */
+ void (*update_highest_perf)(unsigned int cpu);
+
/* optional */
int (*bios_limit)(int cpu, unsigned int *limit);

--
2.34.1

2023-10-09 02:51:39

by Meng, Li (Jassmine)

Subject: [PATCH V8 3/7] cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.

amd-pstate driver utilizes the functions and data structures
provided by the ITMT architecture to enable the scheduler to
favor scheduling on cores which can be get a higher frequency
with lower voltage. We call it amd-pstate preferrred core.

Here sched_set_itmt_core_prio() is called to set priorities and
sched_set_itmt_support() is called to enable ITMT feature.
amd-pstate driver uses the highest performance value to indicate
the priority of CPU. The higher value has a higher priority.

The initial core rankings are set up by amd-pstate when the
system boots.

Add a variable hw_prefcore in cpudata structure. It will check
if the processor and power firmware support preferred core
feature.

Add one new early parameter `disable` to allow user to disable
the preferred core.

Only when hardware supports preferred core and user set `enabled`
in early parameter, amd pstate driver supports preferred core featue.

Reviewed-by: Mario Limonciello <[email protected]>
Co-developed-by: Perry Yuan <[email protected]>
Signed-off-by: Perry Yuan <[email protected]>
Signed-off-by: Meng Li <[email protected]>
---
drivers/cpufreq/amd-pstate.c | 152 +++++++++++++++++++++++++++++++----
include/linux/amd-pstate.h | 4 +
2 files changed, 140 insertions(+), 16 deletions(-)

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 9a1e194d5cf8..6ac8939fce5a 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -37,6 +37,7 @@
#include <linux/uaccess.h>
#include <linux/static_call.h>
#include <linux/amd-pstate.h>
+#include <linux/topology.h>

#include <acpi/processor.h>
#include <acpi/cppc_acpi.h>
@@ -49,6 +50,8 @@

#define AMD_PSTATE_TRANSITION_LATENCY 20000
#define AMD_PSTATE_TRANSITION_DELAY 1000
+#define AMD_PSTATE_PREFCORE_THRESHOLD 166
+#define AMD_PSTATE_MAX_CPPC_PERF 255

/*
* TODO: We need more time to fine tune processors with shared memory solution
@@ -64,6 +67,7 @@ static struct cpufreq_driver amd_pstate_driver;
static struct cpufreq_driver amd_pstate_epp_driver;
static int cppc_state = AMD_PSTATE_UNDEFINED;
static bool cppc_enabled;
+static bool amd_pstate_prefcore = true;

/*
* AMD Energy Preference Performance (EPP)
@@ -290,23 +294,21 @@ static inline int amd_pstate_enable(bool enable)
static int pstate_init_perf(struct amd_cpudata *cpudata)
{
u64 cap1;
- u32 highest_perf;

int ret = rdmsrl_safe_on_cpu(cpudata->cpu, MSR_AMD_CPPC_CAP1,
&cap1);
if (ret)
return ret;

- /*
- * TODO: Introduce AMD specific power feature.
- *
- * CPPC entry doesn't indicate the highest performance in some ASICs.
+ /* For platforms that do not support the preferred core feature, the
+ * highest_pef may be configured with 166 or 255, to avoid max frequency
+ * calculated wrongly. we take the AMD_CPPC_HIGHEST_PERF(cap1) value as
+ * the default max perf.
*/
- highest_perf = amd_get_highest_perf();
- if (highest_perf > AMD_CPPC_HIGHEST_PERF(cap1))
- highest_perf = AMD_CPPC_HIGHEST_PERF(cap1);
-
- WRITE_ONCE(cpudata->highest_perf, highest_perf);
+ if (cpudata->hw_prefcore)
+ WRITE_ONCE(cpudata->highest_perf, AMD_PSTATE_PREFCORE_THRESHOLD);
+ else
+ WRITE_ONCE(cpudata->highest_perf, AMD_CPPC_HIGHEST_PERF(cap1));

WRITE_ONCE(cpudata->nominal_perf, AMD_CPPC_NOMINAL_PERF(cap1));
WRITE_ONCE(cpudata->lowest_nonlinear_perf, AMD_CPPC_LOWNONLIN_PERF(cap1));
@@ -318,17 +320,15 @@ static int pstate_init_perf(struct amd_cpudata *cpudata)
static int cppc_init_perf(struct amd_cpudata *cpudata)
{
struct cppc_perf_caps cppc_perf;
- u32 highest_perf;

int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
if (ret)
return ret;

- highest_perf = amd_get_highest_perf();
- if (highest_perf > cppc_perf.highest_perf)
- highest_perf = cppc_perf.highest_perf;
-
- WRITE_ONCE(cpudata->highest_perf, highest_perf);
+ if (cpudata->hw_prefcore)
+ WRITE_ONCE(cpudata->highest_perf, AMD_PSTATE_PREFCORE_THRESHOLD);
+ else
+ WRITE_ONCE(cpudata->highest_perf, cppc_perf.highest_perf);

WRITE_ONCE(cpudata->nominal_perf, cppc_perf.nominal_perf);
WRITE_ONCE(cpudata->lowest_nonlinear_perf,
@@ -676,6 +676,90 @@ static void amd_perf_ctl_reset(unsigned int cpu)
wrmsrl_on_cpu(cpu, MSR_AMD_PERF_CTL, 0);
}

+/*
+ * Set amd-pstate preferred core enable can't be done directly from cpufreq callbacks
+ * due to locking, so queue the work for later.
+ */
+static void amd_pstste_sched_prefcore_workfn(struct work_struct *work)
+{
+ sched_set_itmt_support();
+}
+static DECLARE_WORK(sched_prefcore_work, amd_pstste_sched_prefcore_workfn);
+
+/*
+ * Get the highest performance register value.
+ * @cpu: CPU from which to get highest performance.
+ * @highest_perf: Return address.
+ *
+ * Return: 0 for success, -EIO otherwise.
+ */
+static int amd_pstate_get_highest_perf(int cpu, u32 *highest_perf)
+{
+ int ret;
+ u64 cppc_highest_perf;
+
+ if (boot_cpu_has(X86_FEATURE_CPPC)) {
+ u64 cap1;
+
+ ret = rdmsrl_safe_on_cpu(cpu, MSR_AMD_CPPC_CAP1, &cap1);
+ if (ret)
+ return ret;
+ WRITE_ONCE(*highest_perf, AMD_CPPC_HIGHEST_PERF(cap1));
+ } else {
+ ret = cppc_get_highest_perf(cpu, &cppc_highest_perf);
+ *highest_perf = (u32)(cppc_highest_perf & 0xFFFF);
+ }
+
+ return (ret);
+}
+
+static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)
+{
+ int ret;
+ u32 highest_perf;
+ static u32 max_highest_perf = 0, min_highest_perf = U32_MAX;
+
+ ret = amd_pstate_get_highest_perf(cpudata->cpu, &highest_perf);
+ if (ret)
+ return;
+
+ cpudata->hw_prefcore = true;
+ /* check if CPPC preferred core feature is enabled*/
+ if (highest_perf == AMD_PSTATE_MAX_CPPC_PERF) {
+ pr_debug("AMD CPPC preferred core is unsupported!\n");
+ cpudata->hw_prefcore = false;
+ return;
+ }
+
+ if (!amd_pstate_prefcore)
+ return;
+
+ /*
+ * The priorities can be set regardless of whether or not
+ * sched_set_itmt_support(true) has been called and it is valid to
+ * update them at any time after it has been called.
+ */
+ sched_set_itmt_core_prio(highest_perf, cpudata->cpu);
+
+ if (max_highest_perf <= min_highest_perf) {
+ if (highest_perf > max_highest_perf)
+ max_highest_perf = highest_perf;
+
+ if (highest_perf < min_highest_perf)
+ min_highest_perf = highest_perf;
+
+ if (max_highest_perf > min_highest_perf) {
+ /*
+ * This code can be run during CPU online under the
+ * CPU hotplug locks, so sched_set_itmt_support()
+ * cannot be called from here. Queue up a work item
+ * to invoke it.
+ */
+ schedule_work(&sched_prefcore_work);
+ }
+ }
+}
+
static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
{
int min_freq, max_freq, nominal_freq, lowest_nonlinear_freq, ret;
@@ -697,6 +781,8 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)

cpudata->cpu = policy->cpu;

+ amd_pstate_init_prefcore(cpudata);
+
ret = amd_pstate_init_perf(cpudata);
if (ret)
goto free_cpudata1;
@@ -845,6 +931,17 @@ static ssize_t show_amd_pstate_highest_perf(struct cpufreq_policy *policy,
return sysfs_emit(buf, "%u\n", perf);
}

+static ssize_t show_amd_pstate_hw_prefcore(struct cpufreq_policy *policy,
+ char *buf)
+{
+ bool hw_prefcore;
+ struct amd_cpudata *cpudata = policy->driver_data;
+
+ hw_prefcore = READ_ONCE(cpudata->hw_prefcore);
+
+ return sysfs_emit(buf, "%s\n", hw_prefcore ? "supported" : "unsupported");
+}
+
static ssize_t show_energy_performance_available_preferences(
struct cpufreq_policy *policy, char *buf)
{
@@ -1037,18 +1134,27 @@ static ssize_t status_store(struct device *a, struct device_attribute *b,
return ret < 0 ? ret : count;
}

+static ssize_t prefcore_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ return sysfs_emit(buf, "%s\n", amd_pstate_prefcore ? "enabled" : "disabled");
+}
+
cpufreq_freq_attr_ro(amd_pstate_max_freq);
cpufreq_freq_attr_ro(amd_pstate_lowest_nonlinear_freq);

cpufreq_freq_attr_ro(amd_pstate_highest_perf);
+cpufreq_freq_attr_ro(amd_pstate_hw_prefcore);
cpufreq_freq_attr_rw(energy_performance_preference);
cpufreq_freq_attr_ro(energy_performance_available_preferences);
static DEVICE_ATTR_RW(status);
+static DEVICE_ATTR_RO(prefcore);

static struct freq_attr *amd_pstate_attr[] = {
&amd_pstate_max_freq,
&amd_pstate_lowest_nonlinear_freq,
&amd_pstate_highest_perf,
+ &amd_pstate_hw_prefcore,
NULL,
};

@@ -1056,6 +1162,7 @@ static struct freq_attr *amd_pstate_epp_attr[] = {
&amd_pstate_max_freq,
&amd_pstate_lowest_nonlinear_freq,
&amd_pstate_highest_perf,
+ &amd_pstate_hw_prefcore,
&energy_performance_preference,
&energy_performance_available_preferences,
NULL,
@@ -1063,6 +1170,7 @@ static struct freq_attr *amd_pstate_epp_attr[] = {

static struct attribute *pstate_global_attributes[] = {
&dev_attr_status.attr,
+ &dev_attr_prefcore.attr,
NULL
};

@@ -1114,6 +1222,8 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
cpudata->cpu = policy->cpu;
cpudata->epp_policy = 0;

+ amd_pstate_init_prefcore(cpudata);
+
ret = amd_pstate_init_perf(cpudata);
if (ret)
goto free_cpudata1;
@@ -1527,7 +1637,17 @@ static int __init amd_pstate_param(char *str)

return amd_pstate_set_driver(mode_idx);
}
+
+static int __init amd_prefcore_param(char *str)
+{
+ if (!strcmp(str, "disable"))
+ amd_pstate_prefcore = false;
+
+ return 0;
+}
+
early_param("amd_pstate", amd_pstate_param);
+early_param("amd_prefcore", amd_prefcore_param);

MODULE_AUTHOR("Huang Rui <[email protected]>");
MODULE_DESCRIPTION("AMD Processor P-state Frequency Driver");
diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
index 446394f84606..87e140e9e6db 100644
--- a/include/linux/amd-pstate.h
+++ b/include/linux/amd-pstate.h
@@ -52,6 +52,9 @@ struct amd_aperf_mperf {
* @prev: Last Aperf/Mperf/tsc count value read from register
* @freq: current cpu frequency value
* @boost_supported: check whether the Processor or SBIOS supports boost mode
+ * @hw_prefcore: check whether HW supports preferred core featue.
+ * Only when hw_prefcore and early prefcore param are true,
+ * AMD P-State driver supports preferred core featue.
* @epp_policy: Last saved policy used to set energy-performance preference
* @epp_cached: Cached CPPC energy-performance preference value
* @policy: Cpufreq policy value
@@ -81,6 +84,7 @@ struct amd_cpudata {

u64 freq;
bool boost_supported;
+ bool hw_prefcore;

/* EPP feature related attributes*/
s16 epp_policy;
--
2.34.1

2023-10-09 02:51:45

by Meng, Li (Jassmine)

Subject: [PATCH V8 5/7] cpufreq: amd-pstate: Update amd-pstate preferred core ranking dynamically

Preferred core rankings can be changed dynamically by the
platform based on the workload and platform conditions and
accounting for thermals and aging.
When this occurs, cpu priority need to be set.

Reviewed-by: Mario Limonciello <[email protected]>
Reviewed-by: Wyes Karny <[email protected]>
Reviewed-by: Huang Rui <[email protected]>
Signed-off-by: Meng Li <[email protected]>
---
drivers/cpufreq/amd-pstate.c | 34 ++++++++++++++++++++++++++++++++--
include/linux/amd-pstate.h | 6 ++++++
2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 6ac8939fce5a..d3369247c6c9 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -313,6 +313,7 @@ static int pstate_init_perf(struct amd_cpudata *cpudata)
WRITE_ONCE(cpudata->nominal_perf, AMD_CPPC_NOMINAL_PERF(cap1));
WRITE_ONCE(cpudata->lowest_nonlinear_perf, AMD_CPPC_LOWNONLIN_PERF(cap1));
WRITE_ONCE(cpudata->lowest_perf, AMD_CPPC_LOWEST_PERF(cap1));
+ WRITE_ONCE(cpudata->prefcore_ranking, AMD_CPPC_HIGHEST_PERF(cap1));

return 0;
}
@@ -334,6 +335,7 @@ static int cppc_init_perf(struct amd_cpudata *cpudata)
WRITE_ONCE(cpudata->lowest_nonlinear_perf,
cppc_perf.lowest_nonlinear_perf);
WRITE_ONCE(cpudata->lowest_perf, cppc_perf.lowest_perf);
+ WRITE_ONCE(cpudata->prefcore_ranking, cppc_perf.highest_perf);

if (cppc_state == AMD_PSTATE_ACTIVE)
return 0;
@@ -540,7 +542,7 @@ static void amd_pstate_adjust_perf(unsigned int cpu,
if (target_perf < capacity)
des_perf = DIV_ROUND_UP(cap_perf * target_perf, capacity);

- min_perf = READ_ONCE(cpudata->highest_perf);
+ min_perf = READ_ONCE(cpudata->lowest_perf);
if (_min_perf < capacity)
min_perf = DIV_ROUND_UP(cap_perf * _min_perf, capacity);

@@ -760,6 +762,32 @@ static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)
}
}

+static void amd_pstate_update_highest_perf(unsigned int cpu)
+{
+ struct cpufreq_policy *policy;
+ struct amd_cpudata *cpudata;
+ u32 prev_high = 0, cur_high = 0;
+ int ret;
+
+ if ((!amd_pstate_prefcore) || (!cpudata->hw_prefcore))
+ return;
+
+ ret = amd_pstate_get_highest_perf(cpu, &cur_high);
+ if (ret)
+ return;
+
+ policy = cpufreq_cpu_get(cpu);
+ cpudata = policy->driver_data;
+ prev_high = READ_ONCE(cpudata->prefcore_ranking);
+
+ if (prev_high != cur_high) {
+ WRITE_ONCE(cpudata->prefcore_ranking, cur_high);
+ sched_set_itmt_core_prio(cur_high, cpu);
+ }
+
+ cpufreq_cpu_put(policy);
+}
+
static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
{
int min_freq, max_freq, nominal_freq, lowest_nonlinear_freq, ret;
@@ -926,7 +954,7 @@ static ssize_t show_amd_pstate_highest_perf(struct cpufreq_policy *policy,
u32 perf;
struct amd_cpudata *cpudata = policy->driver_data;

- perf = READ_ONCE(cpudata->highest_perf);
+ perf = READ_ONCE(cpudata->prefcore_ranking);

return sysfs_emit(buf, "%u\n", perf);
}
@@ -1502,6 +1530,7 @@ static struct cpufreq_driver amd_pstate_driver = {
.suspend = amd_pstate_cpu_suspend,
.resume = amd_pstate_cpu_resume,
.set_boost = amd_pstate_set_boost,
+ .update_highest_perf = amd_pstate_update_highest_perf,
.name = "amd-pstate",
.attr = amd_pstate_attr,
};
@@ -1516,6 +1545,7 @@ static struct cpufreq_driver amd_pstate_epp_driver = {
.online = amd_pstate_epp_cpu_online,
.suspend = amd_pstate_epp_suspend,
.resume = amd_pstate_epp_resume,
+ .update_highest_perf = amd_pstate_update_highest_perf,
.name = "amd-pstate-epp",
.attr = amd_pstate_epp_attr,
};
diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
index 87e140e9e6db..426822612373 100644
--- a/include/linux/amd-pstate.h
+++ b/include/linux/amd-pstate.h
@@ -39,11 +39,16 @@ struct amd_aperf_mperf {
* @cppc_req_cached: cached performance request hints
* @highest_perf: the maximum performance an individual processor may reach,
* assuming ideal conditions
+ * For platforms that do not support the preferred core feature, the
+ * highest_pef may be configured with 166 or 255, to avoid max frequency
+ * calculated wrongly. we take the fixed value as the highest_perf.
* @nominal_perf: the maximum sustained performance level of the processor,
* assuming ideal operating conditions
* @lowest_nonlinear_perf: the lowest performance level at which nonlinear power
* savings are achieved
* @lowest_perf: the absolute lowest performance level of the processor
+ * @prefcore_ranking: the preferred core ranking, the higher value indicates a higher
+ * priority.
* @max_freq: the frequency that mapped to highest_perf
* @min_freq: the frequency that mapped to lowest_perf
* @nominal_freq: the frequency that mapped to nominal_perf
@@ -73,6 +78,7 @@ struct amd_cpudata {
u32 nominal_perf;
u32 lowest_nonlinear_perf;
u32 lowest_perf;
+ u32 prefcore_ranking;

u32 max_freq;
u32 min_freq;
--
2.34.1

2023-10-09 02:51:48

by Meng, Li (Jassmine)

Subject: [PATCH V8 7/7] Documentation: introduce amd-pstate preferrd core mode kernel command line options

amd-pstate driver support enable/disable preferred core.
Default enabled on platforms supporting amd-pstate preferred core.
Disable amd-pstate preferred core with
"amd_prefcore=disable" added to the kernel command line.

Signed-off-by: Meng Li <[email protected]>
Reviewed-by: Mario Limonciello <[email protected]>
Reviewed-by: Wyes Karny <[email protected]>
Reviewed-by: Huang Rui <[email protected]>
---
Documentation/admin-guide/kernel-parameters.txt | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 0a1731a0f0ef..e35b795aa8aa 100644
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -363,6 +363,11 @@
selects a performance level in this range and appropriate
to the current workload.

+ amd_prefcore=
+ [X86]
+ disable
+ Disable amd-pstate preferred core.
+
amijoy.map= [HW,JOY] Amiga joystick support
Map of devices attached to JOY0DAT and JOY1DAT
Format: <a>,<b>
--
2.34.1

2023-10-09 06:20:36

by Wyes Karny

Subject: Re: [PATCH V8 5/7] cpufreq: amd-pstate: Update amd-pstate preferred core ranking dynamically

Hi Meng Li,

On 09 Oct 10:49, Meng Li wrote:
> Preferred core rankings can be changed dynamically by the
> platform based on the workload and platform conditions and
> accounting for thermals and aging.
> When this occurs, cpu priority need to be set.
>
> Reviewed-by: Mario Limonciello <[email protected]>
> Reviewed-by: Wyes Karny <[email protected]>
> Reviewed-by: Huang Rui <[email protected]>
> Signed-off-by: Meng Li <[email protected]>
> ---
> drivers/cpufreq/amd-pstate.c | 34 ++++++++++++++++++++++++++++++++--
> include/linux/amd-pstate.h | 6 ++++++
> 2 files changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 6ac8939fce5a..d3369247c6c9 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -313,6 +313,7 @@ static int pstate_init_perf(struct amd_cpudata *cpudata)
> WRITE_ONCE(cpudata->nominal_perf, AMD_CPPC_NOMINAL_PERF(cap1));
> WRITE_ONCE(cpudata->lowest_nonlinear_perf, AMD_CPPC_LOWNONLIN_PERF(cap1));
> WRITE_ONCE(cpudata->lowest_perf, AMD_CPPC_LOWEST_PERF(cap1));
> + WRITE_ONCE(cpudata->prefcore_ranking, AMD_CPPC_HIGHEST_PERF(cap1));
>
> return 0;
> }
> @@ -334,6 +335,7 @@ static int cppc_init_perf(struct amd_cpudata *cpudata)
> WRITE_ONCE(cpudata->lowest_nonlinear_perf,
> cppc_perf.lowest_nonlinear_perf);
> WRITE_ONCE(cpudata->lowest_perf, cppc_perf.lowest_perf);
> + WRITE_ONCE(cpudata->prefcore_ranking, cppc_perf.highest_perf);
>
> if (cppc_state == AMD_PSTATE_ACTIVE)
> return 0;
> @@ -540,7 +542,7 @@ static void amd_pstate_adjust_perf(unsigned int cpu,
> if (target_perf < capacity)
> des_perf = DIV_ROUND_UP(cap_perf * target_perf, capacity);
>
> - min_perf = READ_ONCE(cpudata->highest_perf);
> + min_perf = READ_ONCE(cpudata->lowest_perf);

This seems to be a fix. So, this could be a separate patch.

> if (_min_perf < capacity)
> min_perf = DIV_ROUND_UP(cap_perf * _min_perf, capacity);
>
> @@ -760,6 +762,32 @@ static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)
> }
> }
>
> +static void amd_pstate_update_highest_perf(unsigned int cpu)
> +{
> + struct cpufreq_policy *policy;
> + struct amd_cpudata *cpudata;
> + u32 prev_high = 0, cur_high = 0;
> + int ret;
> +
> + if ((!amd_pstate_prefcore) || (!cpudata->hw_prefcore))
> + return;
> +
> + ret = amd_pstate_get_highest_perf(cpu, &cur_high);
> + if (ret)
> + return;
> +
> + policy = cpufreq_cpu_get(cpu);
> + cpudata = policy->driver_data;
> + prev_high = READ_ONCE(cpudata->prefcore_ranking);
> +
> + if (prev_high != cur_high) {
> + WRITE_ONCE(cpudata->prefcore_ranking, cur_high);
> + sched_set_itmt_core_prio(cur_high, cpu);
> + }
> +
> + cpufreq_cpu_put(policy);
> +}
> +
> static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
> {
> int min_freq, max_freq, nominal_freq, lowest_nonlinear_freq, ret;
> @@ -926,7 +954,7 @@ static ssize_t show_amd_pstate_highest_perf(struct cpufreq_policy *policy,
> u32 perf;
> struct amd_cpudata *cpudata = policy->driver_data;
>
> - perf = READ_ONCE(cpudata->highest_perf);
> + perf = READ_ONCE(cpudata->prefcore_ranking);

I think this should show cpudata->highest_perf.

Thanks,
Wyes
>
> return sysfs_emit(buf, "%u\n", perf);
> }
> @@ -1502,6 +1530,7 @@ static struct cpufreq_driver amd_pstate_driver = {
> .suspend = amd_pstate_cpu_suspend,
> .resume = amd_pstate_cpu_resume,
> .set_boost = amd_pstate_set_boost,
> + .update_highest_perf = amd_pstate_update_highest_perf,
> .name = "amd-pstate",
> .attr = amd_pstate_attr,
> };
> @@ -1516,6 +1545,7 @@ static struct cpufreq_driver amd_pstate_epp_driver = {
> .online = amd_pstate_epp_cpu_online,
> .suspend = amd_pstate_epp_suspend,
> .resume = amd_pstate_epp_resume,
> + .update_highest_perf = amd_pstate_update_highest_perf,
> .name = "amd-pstate-epp",
> .attr = amd_pstate_epp_attr,
> };
> diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
> index 87e140e9e6db..426822612373 100644
> --- a/include/linux/amd-pstate.h
> +++ b/include/linux/amd-pstate.h
> @@ -39,11 +39,16 @@ struct amd_aperf_mperf {
> * @cppc_req_cached: cached performance request hints
> * @highest_perf: the maximum performance an individual processor may reach,
> * assuming ideal conditions
> + * For platforms that do not support the preferred core feature, the
> + * highest_pef may be configured with 166 or 255, to avoid max frequency
> + * calculated wrongly. we take the fixed value as the highest_perf.
> * @nominal_perf: the maximum sustained performance level of the processor,
> * assuming ideal operating conditions
> * @lowest_nonlinear_perf: the lowest performance level at which nonlinear power
> * savings are achieved
> * @lowest_perf: the absolute lowest performance level of the processor
> + * @prefcore_ranking: the preferred core ranking, the higher value indicates a higher
> + * priority.
> * @max_freq: the frequency that mapped to highest_perf
> * @min_freq: the frequency that mapped to lowest_perf
> * @nominal_freq: the frequency that mapped to nominal_perf
> @@ -73,6 +78,7 @@ struct amd_cpudata {
> u32 nominal_perf;
> u32 lowest_nonlinear_perf;
> u32 lowest_perf;
> + u32 prefcore_ranking;
>
> u32 max_freq;
> u32 min_freq;
> --
> 2.34.1
>

2023-10-09 06:21:48

by Wyes Karny

Subject: Re: [PATCH V8 3/7] cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.

On 09 Oct 10:49, Meng Li wrote:
> amd-pstate driver utilizes the functions and data structures
> provided by the ITMT architecture to enable the scheduler to
> favor scheduling on cores which can be get a higher frequency
> with lower voltage. We call it amd-pstate preferrred core.
>
> Here sched_set_itmt_core_prio() is called to set priorities and
> sched_set_itmt_support() is called to enable ITMT feature.
> amd-pstate driver uses the highest performance value to indicate
> the priority of CPU. The higher value has a higher priority.
>
> The initial core rankings are set up by amd-pstate when the
> system boots.
>
> Add a variable hw_prefcore in cpudata structure. It will check
> if the processor and power firmware support preferred core
> feature.
>
> Add one new early parameter `disable` to allow user to disable
> the preferred core.
>
> Only when hardware supports preferred core and user set `enabled`
> in early parameter, amd pstate driver supports preferred core featue.
>
> Reviewed-by: Mario Limonciello <[email protected]>
Reviewed-by: Wyes Karny <[email protected]>
> Co-developed-by: Perry Yuan <[email protected]>
> Signed-off-by: Perry Yuan <[email protected]>
> Signed-off-by: Meng Li <[email protected]>
> ---
> drivers/cpufreq/amd-pstate.c | 152 +++++++++++++++++++++++++++++++----
> include/linux/amd-pstate.h | 4 +
> 2 files changed, 140 insertions(+), 16 deletions(-)
>
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 9a1e194d5cf8..6ac8939fce5a 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -37,6 +37,7 @@
> #include <linux/uaccess.h>
> #include <linux/static_call.h>
> #include <linux/amd-pstate.h>
> +#include <linux/topology.h>
>
> #include <acpi/processor.h>
> #include <acpi/cppc_acpi.h>
> @@ -49,6 +50,8 @@
>
> #define AMD_PSTATE_TRANSITION_LATENCY 20000
> #define AMD_PSTATE_TRANSITION_DELAY 1000
> +#define AMD_PSTATE_PREFCORE_THRESHOLD 166
> +#define AMD_PSTATE_MAX_CPPC_PERF 255
>
> /*
> * TODO: We need more time to fine tune processors with shared memory solution
> @@ -64,6 +67,7 @@ static struct cpufreq_driver amd_pstate_driver;
> static struct cpufreq_driver amd_pstate_epp_driver;
> static int cppc_state = AMD_PSTATE_UNDEFINED;
> static bool cppc_enabled;
> +static bool amd_pstate_prefcore = true;
>
> /*
> * AMD Energy Preference Performance (EPP)
> @@ -290,23 +294,21 @@ static inline int amd_pstate_enable(bool enable)
> static int pstate_init_perf(struct amd_cpudata *cpudata)
> {
> u64 cap1;
> - u32 highest_perf;
>
> int ret = rdmsrl_safe_on_cpu(cpudata->cpu, MSR_AMD_CPPC_CAP1,
> &cap1);
> if (ret)
> return ret;
>
> - /*
> - * TODO: Introduce AMD specific power feature.
> - *
> - * CPPC entry doesn't indicate the highest performance in some ASICs.
> + /* For platforms that do not support the preferred core feature, the
> + * highest_pef may be configured with 166 or 255, to avoid max frequency
> + * calculated wrongly. we take the AMD_CPPC_HIGHEST_PERF(cap1) value as
> + * the default max perf.
> */
> - highest_perf = amd_get_highest_perf();
> - if (highest_perf > AMD_CPPC_HIGHEST_PERF(cap1))
> - highest_perf = AMD_CPPC_HIGHEST_PERF(cap1);
> -
> - WRITE_ONCE(cpudata->highest_perf, highest_perf);
> + if (cpudata->hw_prefcore)
> + WRITE_ONCE(cpudata->highest_perf, AMD_PSTATE_PREFCORE_THRESHOLD);
> + else
> + WRITE_ONCE(cpudata->highest_perf, AMD_CPPC_HIGHEST_PERF(cap1));
>
> WRITE_ONCE(cpudata->nominal_perf, AMD_CPPC_NOMINAL_PERF(cap1));
> WRITE_ONCE(cpudata->lowest_nonlinear_perf, AMD_CPPC_LOWNONLIN_PERF(cap1));
> @@ -318,17 +320,15 @@ static int pstate_init_perf(struct amd_cpudata *cpudata)
> static int cppc_init_perf(struct amd_cpudata *cpudata)
> {
> struct cppc_perf_caps cppc_perf;
> - u32 highest_perf;
>
> int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
> if (ret)
> return ret;
>
> - highest_perf = amd_get_highest_perf();
> - if (highest_perf > cppc_perf.highest_perf)
> - highest_perf = cppc_perf.highest_perf;
> -
> - WRITE_ONCE(cpudata->highest_perf, highest_perf);
> + if (cpudata->hw_prefcore)
> + WRITE_ONCE(cpudata->highest_perf, AMD_PSTATE_PREFCORE_THRESHOLD);
> + else
> + WRITE_ONCE(cpudata->highest_perf, cppc_perf.highest_perf);
>
> WRITE_ONCE(cpudata->nominal_perf, cppc_perf.nominal_perf);
> WRITE_ONCE(cpudata->lowest_nonlinear_perf,
> @@ -676,6 +676,90 @@ static void amd_perf_ctl_reset(unsigned int cpu)
> wrmsrl_on_cpu(cpu, MSR_AMD_PERF_CTL, 0);
> }
>
> +/*
> + * Set amd-pstate preferred core enable can't be done directly from cpufreq callbacks
> + * due to locking, so queue the work for later.
> + */
> +static void amd_pstste_sched_prefcore_workfn(struct work_struct *work)
> +{
> + sched_set_itmt_support();
> +}
> +static DECLARE_WORK(sched_prefcore_work, amd_pstste_sched_prefcore_workfn);
> +
> +/*
> + * Get the highest performance register value.
> + * @cpu: CPU from which to get highest performance.
> + * @highest_perf: Return address.
> + *
> + * Return: 0 for success, -EIO otherwise.
> + */
> +static int amd_pstate_get_highest_perf(int cpu, u32 *highest_perf)
> +{
> + int ret;
> + u64 cppc_highest_perf;
> +
> + if (boot_cpu_has(X86_FEATURE_CPPC)) {
> + u64 cap1;
> +
> + ret = rdmsrl_safe_on_cpu(cpu, MSR_AMD_CPPC_CAP1, &cap1);
> + if (ret)
> + return ret;
> + WRITE_ONCE(*highest_perf, AMD_CPPC_HIGHEST_PERF(cap1));
> + } else {
> + ret = cppc_get_highest_perf(cpu, &cppc_highest_perf);
> + *highest_perf = (u32)(cppc_highest_perf & 0xFFFF);
> + }
> +
> + return (ret);
> +}
> +
> +static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)
> +{
> + int ret;
> + u32 highest_perf;
> + static u32 max_highest_perf = 0, min_highest_perf = U32_MAX;
> +
> + ret = amd_pstate_get_highest_perf(cpudata->cpu, &highest_perf);
> + if (ret)
> + return;
> +
> + cpudata->hw_prefcore = true;
> + /* check if CPPC preferred core feature is enabled*/
> + if (highest_perf == AMD_PSTATE_MAX_CPPC_PERF) {
> + pr_debug("AMD CPPC preferred core is unsupported!\n");
> + cpudata->hw_prefcore = false;
> + return;
> + }
> +
> + if (!amd_pstate_prefcore)
> + return;
> +
> + /*
> + * The priorities can be set regardless of whether or not
> + * sched_set_itmt_support(true) has been called and it is valid to
> + * update them at any time after it has been called.
> + */
> + sched_set_itmt_core_prio(highest_perf, cpudata->cpu);
> +
> + if (max_highest_perf <= min_highest_perf) {
> + if (highest_perf > max_highest_perf)
> + max_highest_perf = highest_perf;
> +
> + if (highest_perf < min_highest_perf)
> + min_highest_perf = highest_perf;
> +
> + if (max_highest_perf > min_highest_perf) {
> + /*
> + * This code can be run during CPU online under the
> + * CPU hotplug locks, so sched_set_itmt_support()
> + * cannot be called from here. Queue up a work item
> + * to invoke it.
> + */
> + schedule_work(&sched_prefcore_work);
> + }
> + }
> +}
> +
> static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
> {
> int min_freq, max_freq, nominal_freq, lowest_nonlinear_freq, ret;
> @@ -697,6 +781,8 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
>
> cpudata->cpu = policy->cpu;
>
> + amd_pstate_init_prefcore(cpudata);
> +
> ret = amd_pstate_init_perf(cpudata);
> if (ret)
> goto free_cpudata1;
> @@ -845,6 +931,17 @@ static ssize_t show_amd_pstate_highest_perf(struct cpufreq_policy *policy,
> return sysfs_emit(buf, "%u\n", perf);
> }
>
> +static ssize_t show_amd_pstate_hw_prefcore(struct cpufreq_policy *policy,
> + char *buf)
> +{
> + bool hw_prefcore;
> + struct amd_cpudata *cpudata = policy->driver_data;
> +
> + hw_prefcore = READ_ONCE(cpudata->hw_prefcore);
> +
> + return sysfs_emit(buf, "%s\n", hw_prefcore ? "supported" : "unsupported");
> +}
> +
> static ssize_t show_energy_performance_available_preferences(
> struct cpufreq_policy *policy, char *buf)
> {
> @@ -1037,18 +1134,27 @@ static ssize_t status_store(struct device *a, struct device_attribute *b,
> return ret < 0 ? ret : count;
> }
>
> +static ssize_t prefcore_show(struct device *dev,
> + struct device_attribute *attr, char *buf)
> +{
> + return sysfs_emit(buf, "%s\n", amd_pstate_prefcore ? "enabled" : "disabled");
> +}
> +
> cpufreq_freq_attr_ro(amd_pstate_max_freq);
> cpufreq_freq_attr_ro(amd_pstate_lowest_nonlinear_freq);
>
> cpufreq_freq_attr_ro(amd_pstate_highest_perf);
> +cpufreq_freq_attr_ro(amd_pstate_hw_prefcore);
> cpufreq_freq_attr_rw(energy_performance_preference);
> cpufreq_freq_attr_ro(energy_performance_available_preferences);
> static DEVICE_ATTR_RW(status);
> +static DEVICE_ATTR_RO(prefcore);
>
> static struct freq_attr *amd_pstate_attr[] = {
> &amd_pstate_max_freq,
> &amd_pstate_lowest_nonlinear_freq,
> &amd_pstate_highest_perf,
> + &amd_pstate_hw_prefcore,
> NULL,
> };
>
> @@ -1056,6 +1162,7 @@ static struct freq_attr *amd_pstate_epp_attr[] = {
> &amd_pstate_max_freq,
> &amd_pstate_lowest_nonlinear_freq,
> &amd_pstate_highest_perf,
> + &amd_pstate_hw_prefcore,
> &energy_performance_preference,
> &energy_performance_available_preferences,
> NULL,
> @@ -1063,6 +1170,7 @@ static struct freq_attr *amd_pstate_epp_attr[] = {
>
> static struct attribute *pstate_global_attributes[] = {
> &dev_attr_status.attr,
> + &dev_attr_prefcore.attr,
> NULL
> };
>
> @@ -1114,6 +1222,8 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
> cpudata->cpu = policy->cpu;
> cpudata->epp_policy = 0;
>
> + amd_pstate_init_prefcore(cpudata);
> +
> ret = amd_pstate_init_perf(cpudata);
> if (ret)
> goto free_cpudata1;
> @@ -1527,7 +1637,17 @@ static int __init amd_pstate_param(char *str)
>
> return amd_pstate_set_driver(mode_idx);
> }
> +
> +static int __init amd_prefcore_param(char *str)
> +{
> + if (!strcmp(str, "disable"))
> + amd_pstate_prefcore = false;
> +
> + return 0;
> +}
> +
> early_param("amd_pstate", amd_pstate_param);
> +early_param("amd_prefcore", amd_prefcore_param);
>
> MODULE_AUTHOR("Huang Rui <[email protected]>");
> MODULE_DESCRIPTION("AMD Processor P-state Frequency Driver");
> diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
> index 446394f84606..87e140e9e6db 100644
> --- a/include/linux/amd-pstate.h
> +++ b/include/linux/amd-pstate.h
> @@ -52,6 +52,9 @@ struct amd_aperf_mperf {
> * @prev: Last Aperf/Mperf/tsc count value read from register
> * @freq: current cpu frequency value
> * @boost_supported: check whether the Processor or SBIOS supports boost mode
> + * @hw_prefcore: check whether HW supports preferred core featue.
> + * Only when hw_prefcore and early prefcore param are true,
> + * AMD P-State driver supports preferred core featue.
> * @epp_policy: Last saved policy used to set energy-performance preference
> * @epp_cached: Cached CPPC energy-performance preference value
> * @policy: Cpufreq policy value
> @@ -81,6 +84,7 @@ struct amd_cpudata {
>
> u64 freq;
> bool boost_supported;
> + bool hw_prefcore;
>
> /* EPP feature related attributes*/
> s16 epp_policy;
> --
> 2.34.1
>

2023-10-09 06:22:14

by Wyes Karny

Subject: Re: [PATCH V8 4/7] cpufreq: Add a notification message that the highest perf has changed

On 09 Oct 10:49, Meng Li wrote:
> ACPI 6.5 section 8.4.6.1.1.1 specifies that Notify event 0x85 can be
> emmitted to cause the the OSPM to re-evaluate the highest performance
> register. Add support for this event.
>
> Reviewed-by: Mario Limonciello <[email protected]>
> Reviewed-by: Huang Rui <[email protected]>
Reviewed-by: Wyes Karny <[email protected]>
> Signed-off-by: Meng Li <[email protected]>
> Link: https://uefi.org/specs/ACPI/6.5/05_ACPI_Software_Programming_Model.html#processor-device-notification-values
> ---
> drivers/acpi/processor_driver.c | 6 ++++++
> drivers/cpufreq/cpufreq.c | 13 +++++++++++++
> include/linux/cpufreq.h | 5 +++++
> 3 files changed, 24 insertions(+)
>
> diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
> index 4bd16b3f0781..29b2fb68a35d 100644
> --- a/drivers/acpi/processor_driver.c
> +++ b/drivers/acpi/processor_driver.c
> @@ -27,6 +27,7 @@
> #define ACPI_PROCESSOR_NOTIFY_PERFORMANCE 0x80
> #define ACPI_PROCESSOR_NOTIFY_POWER 0x81
> #define ACPI_PROCESSOR_NOTIFY_THROTTLING 0x82
> +#define ACPI_PROCESSOR_NOTIFY_HIGEST_PERF_CHANGED 0x85
>
> MODULE_AUTHOR("Paul Diefenbaugh");
> MODULE_DESCRIPTION("ACPI Processor Driver");
> @@ -83,6 +84,11 @@ static void acpi_processor_notify(acpi_handle handle, u32 event, void *data)
> acpi_bus_generate_netlink_event(device->pnp.device_class,
> dev_name(&device->dev), event, 0);
> break;
> + case ACPI_PROCESSOR_NOTIFY_HIGEST_PERF_CHANGED:
> + cpufreq_update_highest_perf(pr->id);
> + acpi_bus_generate_netlink_event(device->pnp.device_class,
> + dev_name(&device->dev), event, 0);
> + break;
> default:
> acpi_handle_debug(handle, "Unsupported event [0x%x]\n", event);
> break;
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index 60ed89000e82..4ada787ff105 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -2718,6 +2718,19 @@ void cpufreq_update_limits(unsigned int cpu)
> }
> EXPORT_SYMBOL_GPL(cpufreq_update_limits);
>
> +/**
> + * cpufreq_update_highest_perf - Update highest performance for a given CPU.
> + * @cpu: CPU to update the highest performance for.
> + *
> + * Invoke the driver's ->update_highest_perf callback if present
> + */
> +void cpufreq_update_highest_perf(unsigned int cpu)
> +{
> + if (cpufreq_driver->update_highest_perf)
> + cpufreq_driver->update_highest_perf(cpu);
> +}
> +EXPORT_SYMBOL_GPL(cpufreq_update_highest_perf);
> +
> /*********************************************************************
> * BOOST *
> *********************************************************************/
> diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
> index 71d186d6933a..1cc1241fb698 100644
> --- a/include/linux/cpufreq.h
> +++ b/include/linux/cpufreq.h
> @@ -235,6 +235,7 @@ int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu);
> void refresh_frequency_limits(struct cpufreq_policy *policy);
> void cpufreq_update_policy(unsigned int cpu);
> void cpufreq_update_limits(unsigned int cpu);
> +void cpufreq_update_highest_perf(unsigned int cpu);
> bool have_governor_per_policy(void);
> bool cpufreq_supports_freq_invariance(void);
> struct kobject *get_governor_parent_kobj(struct cpufreq_policy *policy);
> @@ -263,6 +264,7 @@ static inline bool cpufreq_supports_freq_invariance(void)
> return false;
> }
> static inline void disable_cpufreq(void) { }
> +static inline void cpufreq_update_highest_perf(unsigned int cpu) { }
> #endif
>
> #ifdef CONFIG_CPU_FREQ_STAT
> @@ -380,6 +382,9 @@ struct cpufreq_driver {
> /* Called to update policy limits on firmware notifications. */
> void (*update_limits)(unsigned int cpu);
>
> + /* Called to update highest performance on firmware notifications. */
> + void (*update_highest_perf)(unsigned int cpu);
> +
> /* optional */
> int (*bios_limit)(int cpu, unsigned int *limit);
>
> --
> 2.34.1
>

2023-10-09 06:24:29

by Wyes Karny

Subject: Re: [PATCH V8 6/7] Documentation: amd-pstate: introduce amd-pstate preferred core

On 09 Oct 10:49, Meng Li wrote:
> Introduce amd-pstate preferred core.
>
> check preferred core state set by the kernel parameter:
> $ cat /sys/devices/system/cpu/amd-pstate/prefcore
>
> Reviewed-by: Mario Limonciello <[email protected]>
> Reviewed-by: Huang Rui <[email protected]>
Reviewed-by: Wyes Karny <[email protected]>
> Signed-off-by: Meng Li <[email protected]>
> ---
> Documentation/admin-guide/pm/amd-pstate.rst | 59 ++++++++++++++++++++-
> 1 file changed, 57 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/admin-guide/pm/amd-pstate.rst b/Documentation/admin-guide/pm/amd-pstate.rst
> index 1cf40f69278c..0b832ff529db 100644
> --- a/Documentation/admin-guide/pm/amd-pstate.rst
> +++ b/Documentation/admin-guide/pm/amd-pstate.rst
> @@ -300,8 +300,8 @@ platforms. The AMD P-States mechanism is the more performance and energy
> efficiency frequency management method on AMD processors.
>
>
> -AMD Pstate Driver Operation Modes
> -=================================
> +``amd-pstate`` Driver Operation Modes
> +======================================
>
> ``amd_pstate`` CPPC has 3 operation modes: autonomous (active) mode,
> non-autonomous (passive) mode and guided autonomous (guided) mode.
> @@ -353,6 +353,48 @@ is activated. In this mode, driver requests minimum and maximum performance
> level and the platform autonomously selects a performance level in this range
> and appropriate to the current workload.
>
> +``amd-pstate`` Preferred Core
> +=================================
> +
> +The core frequency is subjected to the process variation in semiconductors.
> +Not all cores are able to reach the maximum frequency respecting the
> +infrastructure limits. Consequently, AMD has redefined the concept of
> +maximum frequency of a part. This means that a fraction of cores can reach
> +maximum frequency. To find the best process scheduling policy for a given
> +scenario, OS needs to know the core ordering informed by the platform through
> +highest performance capability register of the CPPC interface.
> +
> +``amd-pstate`` preferred core enables the scheduler to prefer scheduling on
> +cores that can achieve a higher frequency with lower voltage. The preferred
> +core rankings can dynamically change based on the workload, platform conditions,
> +thermals and ageing.
> +
> +The priority metric will be initialized by the ``amd-pstate`` driver. The ``amd-pstate``
> +driver will also determine whether or not ``amd-pstate`` preferred core is
> +supported by the platform.
> +
> +``amd-pstate`` driver will provide an initial core ordering when the system boots.
> +The platform uses the CPPC interfaces to communicate the core ranking to the
> +operating system and scheduler to make sure that OS is choosing the cores
> +with highest performance firstly for scheduling the process. When ``amd-pstate``
> +driver receives a message with the highest performance change, it will
> +update the core ranking and set the cpu's priority.
> +
> +``amd-pstate`` Preferred Core Switch
> +=================================
> +Kernel Parameters
> +-----------------
> +
> +``amd-pstate`` peferred core`` has two states: enable and disable.
> +Enable/disable states can be chosen by different kernel parameters.
> +Default enable ``amd-pstate`` preferred core.
> +
> +``amd_prefcore=disable``
> +
> +For systems that support ``amd-pstate`` preferred core, the core rankings will
> +always be advertised by the platform. But OS can choose to ignore that via the
> +kernel parameter ``amd_prefcore=disable``.
> +
> User Space Interface in ``sysfs`` - General
> ===========================================
>
> @@ -385,6 +427,19 @@ control its functionality at the system level. They are located in the
> to the operation mode represented by that string - or to be
> unregistered in the "disable" case.
>
> +``prefcore``
> + Preferred core state of the driver: "enabled" or "disabled".
> +
> + "enabled"
> + Enable the ``amd-pstate`` preferred core.
> +
> + "disabled"
> + Disable the ``amd-pstate`` preferred core
> +
> +
> + This attribute is read-only to check the state of preferred core set
> + by the kernel parameter.
> +
> ``cpupower`` tool support for ``amd-pstate``
> ===============================================
>
> --
> 2.34.1
>

2023-10-09 06:55:08

by Oleksandr Natalenko

Subject: Re: [PATCH V8 0/7] amd-pstate preferred core

Hello.

On pondělí 9. října 2023 4:49:25 CEST Meng Li wrote:
> Hi all:
>
> The core frequency is subjected to the process variation in semiconductors.
> Not all cores are able to reach the maximum frequency respecting the
> infrastructure limits. Consequently, AMD has redefined the concept of
> maximum frequency of a part. This means that a fraction of cores can reach
> maximum frequency. To find the best process scheduling policy for a given
> scenario, OS needs to know the core ordering informed by the platform through
> highest performance capability register of the CPPC interface.
>
> Earlier implementations of amd-pstate preferred core only support a static
> core ranking and targeted performance. Now it has the ability to dynamically
> change the preferred core based on the workload and platform conditions and
> accounting for thermals and aging.
>
> Amd-pstate driver utilizes the functions and data structures provided by
> the ITMT architecture to enable the scheduler to favor scheduling on cores
> which can be get a higher frequency with lower voltage.
> We call it amd-pstate preferred core.
>
> Here sched_set_itmt_core_prio() is called to set priorities and
> sched_set_itmt_support() is called to enable ITMT feature.
> Amd-pstate driver uses the highest performance value to indicate
> the priority of CPU. The higher value has a higher priority.
>
> Amd-pstate driver will provide an initial core ordering at boot time.
> It relies on the CPPC interface to communicate the core ranking to the
> operating system and scheduler to make sure that OS is choosing the cores
> with highest performance firstly for scheduling the process. When amd-pstate
> driver receives a message with the highest performance change, it will
> update the core ranking.
>
> Changes form V7->V8:
> - all:
> - - pick up Review-By flag added by Mario and Ray.
> - cpufreq: amd-pstate:
> - - use hw_prefcore embeds into cpudata structure.
> - - delete preferred core init from cpu online/off.

Could you please let me know if this change means a fix for the report I've sent previously? [1]

Would you also be able to Cc me on the next iteration of this patchset?

Thank you!

[1] https://lore.kernel.org/lkml/[email protected]/

>
> Changes form V6->V7:
> - x86:
> - - Modify kconfig about X86_AMD_PSTATE.
> - cpufreq: amd-pstate:
> - - modify incorrect comments about scheduler_work().
> - - convert highest_perf data type.
> - - modify preferred core init when cpu init and online.
> - acpi: cppc:
> - - modify link of CPPC highest performance.
> - cpufreq:
> - - modify link of CPPC highest performance changed.
>
> Changes form V5->V6:
> - cpufreq: amd-pstate:
> - - modify the wrong tag order.
> - - modify warning about hw_prefcore sysfs attribute.
> - - delete duplicate comments.
> - - modify the variable name cppc_highest_perf to prefcore_ranking.
> - - modify judgment conditions for setting highest_perf.
> - - modify sysfs attribute for CPPC highest perf to pr_debug message.
> - Documentation: amd-pstate:
> - - modify warning: title underline too short.
>
> Changes form V4->V5:
> - cpufreq: amd-pstate:
> - - modify sysfs attribute for CPPC highest perf.
> - - modify warning about comments
> - - rebase linux-next
> - cpufreq:
> - - Moidfy warning about function declarations.
> - Documentation: amd-pstate:
> - - align with ``amd-pstat``
>
> Changes form V3->V4:
> - Documentation: amd-pstate:
> - - Modify inappropriate descriptions.
>
> Changes form V2->V3:
> - x86:
> - - Modify kconfig and description.
> - cpufreq: amd-pstate:
> - - Add Co-developed-by tag in commit message.
> - cpufreq:
> - - Modify commit message.
> - Documentation: amd-pstate:
> - - Modify inappropriate descriptions.
>
> Changes form V1->V2:
> - acpi: cppc:
> - - Add reference link.
> - cpufreq:
> - - Moidfy link error.
> - cpufreq: amd-pstate:
> - - Init the priorities of all online CPUs
> - - Use a single variable to represent the status of preferred core.
> - Documentation:
> - - Default enabled preferred core.
> - Documentation: amd-pstate:
> - - Modify inappropriate descriptions.
> - - Default enabled preferred core.
> - - Use a single variable to represent the status of preferred core.
>
> Meng Li (7):
> x86: Drop CPU_SUP_INTEL from SCHED_MC_PRIO for the expansion.
> acpi: cppc: Add get the highest performance cppc control
> cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.
> cpufreq: Add a notification message that the highest perf has changed
> cpufreq: amd-pstate: Update amd-pstate preferred core ranking
> dynamically
> Documentation: amd-pstate: introduce amd-pstate preferred core
> Documentation: introduce amd-pstate preferrd core mode kernel command
> line options
>
> .../admin-guide/kernel-parameters.txt | 5 +
> Documentation/admin-guide/pm/amd-pstate.rst | 59 +++++-
> arch/x86/Kconfig | 5 +-
> drivers/acpi/cppc_acpi.c | 13 ++
> drivers/acpi/processor_driver.c | 6 +
> drivers/cpufreq/amd-pstate.c | 186 ++++++++++++++++--
> drivers/cpufreq/cpufreq.c | 13 ++
> include/acpi/cppc_acpi.h | 5 +
> include/linux/amd-pstate.h | 10 +
> include/linux/cpufreq.h | 5 +
> 10 files changed, 285 insertions(+), 22 deletions(-)
>
>


--
Oleksandr Natalenko (post-factum)

Attachments:

2023-10-09 07:24:02

by Meng, Li (Jassmine)

Subject: RE: [PATCH V8 0/7] amd-pstate preferred core

[AMD Official Use Only - General]

Hi Oleksandr:

> -----Original Message-----
> From: Oleksandr Natalenko <[email protected]>
> Sent: Monday, October 9, 2023 2:55 PM
> To: Rafael J . Wysocki <[email protected]>; Huang, Ray
> <[email protected]>; Meng, Li (Jassmine) <[email protected]>
> Cc: [email protected]; [email protected];
> [email protected]; [email protected]; Shuah Khan
> <[email protected]>; [email protected]; Fontenot,
> Nathan <[email protected]>; Sharma, Deepak
> <[email protected]>; Deucher, Alexander
> <[email protected]>; Limonciello, Mario
> <[email protected]>; Huang, Shimmer
> <[email protected]>; Yuan, Perry <[email protected]>; Du,
> Xiaojian <[email protected]>; Viresh Kumar <[email protected]>;
> Borislav Petkov <[email protected]>; Meng, Li (Jassmine) <[email protected]>
> Subject: Re: [PATCH V8 0/7] amd-pstate preferred core
>
> Hello.
>
> On pondělí 9. října 2023 4:49:25 CEST Meng Li wrote:
> > Hi all:
> >
> > The core frequency is subjected to the process variation in semiconductors.
> > Not all cores are able to reach the maximum frequency respecting the
> > infrastructure limits. Consequently, AMD has redefined the concept of
> > maximum frequency of a part. This means that a fraction of cores can
> > reach maximum frequency. To find the best process scheduling policy
> > for a given scenario, OS needs to know the core ordering informed by
> > the platform through highest performance capability register of the CPPC
> interface.
> >
> > Earlier implementations of amd-pstate preferred core only support a
> > static core ranking and targeted performance. Now it has the ability
> > to dynamically change the preferred core based on the workload and
> > platform conditions and accounting for thermals and aging.
> >
> > Amd-pstate driver utilizes the functions and data structures provided
> > by the ITMT architecture to enable the scheduler to favor scheduling
> > on cores which can be get a higher frequency with lower voltage.
> > We call it amd-pstate preferred core.
> >
> > Here sched_set_itmt_core_prio() is called to set priorities and
> > sched_set_itmt_support() is called to enable ITMT feature.
> > Amd-pstate driver uses the highest performance value to indicate the
> > priority of CPU. The higher value has a higher priority.
> >
> > Amd-pstate driver will provide an initial core ordering at boot time.
> > It relies on the CPPC interface to communicate the core ranking to the
> > operating system and scheduler to make sure that OS is choosing the
> > cores with highest performance firstly for scheduling the process.
> > When amd-pstate driver receives a message with the highest performance
> > change, it will update the core ranking.
> >
> > Changes form V7->V8:
> > - all:
> > - - pick up Review-By flag added by Mario and Ray.
> > - cpufreq: amd-pstate:
> > - - use hw_prefcore embeds into cpudata structure.
> > - - delete preferred core init from cpu online/off.
>
> Could you please let me know if this change means a fix for the report I've
> sent previously? [1]
>
[Meng, Li (Jassmine)] Yes.
I have deleted online handle function of amd pstate driver.
It doesn't re-initialize preferred core.
This online function will set incorrect des perf value.

> Would you also be able to Cc me on the next iteration of this patchset?
[Meng, Li (Jassmine)] OK.
>
> Thank you!
>
> [1] https://lore.kernel.org/lkml/[email protected]/
>
> >
> > Changes form V6->V7:
> > - x86:
> > - - Modify kconfig about X86_AMD_PSTATE.
> > - cpufreq: amd-pstate:
> > - - modify incorrect comments about scheduler_work().
> > - - convert highest_perf data type.
> > - - modify preferred core init when cpu init and online.
> > - acpi: cppc:
> > - - modify link of CPPC highest performance.
> > - cpufreq:
> > - - modify link of CPPC highest performance changed.
> >
> > Changes form V5->V6:
> > - cpufreq: amd-pstate:
> > - - modify the wrong tag order.
> > - - modify warning about hw_prefcore sysfs attribute.
> > - - delete duplicate comments.
> > - - modify the variable name cppc_highest_perf to prefcore_ranking.
> > - - modify judgment conditions for setting highest_perf.
> > - - modify sysfs attribute for CPPC highest perf to pr_debug message.
> > - Documentation: amd-pstate:
> > - - modify warning: title underline too short.
> >
> > Changes form V4->V5:
> > - cpufreq: amd-pstate:
> > - - modify sysfs attribute for CPPC highest perf.
> > - - modify warning about comments
> > - - rebase linux-next
> > - cpufreq:
> > - - Moidfy warning about function declarations.
> > - Documentation: amd-pstate:
> > - - align with ``amd-pstat``
> >
> > Changes form V3->V4:
> > - Documentation: amd-pstate:
> > - - Modify inappropriate descriptions.
> >
> > Changes form V2->V3:
> > - x86:
> > - - Modify kconfig and description.
> > - cpufreq: amd-pstate:
> > - - Add Co-developed-by tag in commit message.
> > - cpufreq:
> > - - Modify commit message.
> > - Documentation: amd-pstate:
> > - - Modify inappropriate descriptions.
> >
> > Changes form V1->V2:
> > - acpi: cppc:
> > - - Add reference link.
> > - cpufreq:
> > - - Moidfy link error.
> > - cpufreq: amd-pstate:
> > - - Init the priorities of all online CPUs
> > - - Use a single variable to represent the status of preferred core.
> > - Documentation:
> > - - Default enabled preferred core.
> > - Documentation: amd-pstate:
> > - - Modify inappropriate descriptions.
> > - - Default enabled preferred core.
> > - - Use a single variable to represent the status of preferred core.
> >
> > Meng Li (7):
> > x86: Drop CPU_SUP_INTEL from SCHED_MC_PRIO for the expansion.
> > acpi: cppc: Add get the highest performance cppc control
> > cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.
> > cpufreq: Add a notification message that the highest perf has changed
> > cpufreq: amd-pstate: Update amd-pstate preferred core ranking
> > dynamically
> > Documentation: amd-pstate: introduce amd-pstate preferred core
> > Documentation: introduce amd-pstate preferrd core mode kernel
> command
> > line options
> >
> > .../admin-guide/kernel-parameters.txt | 5 +
> > Documentation/admin-guide/pm/amd-pstate.rst | 59 +++++-
> > arch/x86/Kconfig | 5 +-
> > drivers/acpi/cppc_acpi.c | 13 ++
> > drivers/acpi/processor_driver.c | 6 +
> > drivers/cpufreq/amd-pstate.c | 186 ++++++++++++++++--
> > drivers/cpufreq/cpufreq.c | 13 ++
> > include/acpi/cppc_acpi.h | 5 +
> > include/linux/amd-pstate.h | 10 +
> > include/linux/cpufreq.h | 5 +
> > 10 files changed, 285 insertions(+), 22 deletions(-)
> >
> >
>
>
> --
> Oleksandr Natalenko (post-factum)

2023-10-09 08:09:15

by Meng, Li (Jassmine)

Subject: RE: [PATCH V8 5/7] cpufreq: amd-pstate: Update amd-pstate preferred core ranking dynamically

[AMD Official Use Only - General]

Hi Wyes:

> -----Original Message-----
> From: Karny, Wyes <[email protected]>
> Sent: Monday, October 9, 2023 2:19 PM
> To: Meng, Li (Jassmine) <[email protected]>
> Cc: Karny, Wyes <[email protected]>; Rafael J . Wysocki
> <[email protected]>; Huang, Ray <[email protected]>; linux-
> [email protected]; [email protected]; [email protected]; linux-
> [email protected]; Shuah Khan <[email protected]>; linux-
> [email protected]; Fontenot, Nathan
> <[email protected]>; Sharma, Deepak
> <[email protected]>; Deucher, Alexander
> <[email protected]>; Limonciello, Mario
> <[email protected]>; Huang, Shimmer
> <[email protected]>; Yuan, Perry <[email protected]>; Du,
> Xiaojian <[email protected]>; Viresh Kumar <[email protected]>;
> Borislav Petkov <[email protected]>
> Subject: Re: [PATCH V8 5/7] cpufreq: amd-pstate: Update amd-pstate
> preferred core ranking dynamically
>
> Hi Meng Li,
>
> On 09 Oct 10:49, Meng Li wrote:
> > Preferred core rankings can be changed dynamically by the platform
> > based on the workload and platform conditions and accounting for
> > thermals and aging.
> > When this occurs, cpu priority need to be set.
> >
> > Reviewed-by: Mario Limonciello <[email protected]>
> > Reviewed-by: Wyes Karny <[email protected]>
> > Reviewed-by: Huang Rui <[email protected]>
> > Signed-off-by: Meng Li <[email protected]>
> > ---
> > drivers/cpufreq/amd-pstate.c | 34
> ++++++++++++++++++++++++++++++++--
> > include/linux/amd-pstate.h | 6 ++++++
> > 2 files changed, 38 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/cpufreq/amd-pstate.c
> > b/drivers/cpufreq/amd-pstate.c index 6ac8939fce5a..d3369247c6c9 100644
> > --- a/drivers/cpufreq/amd-pstate.c
> > +++ b/drivers/cpufreq/amd-pstate.c
> > @@ -313,6 +313,7 @@ static int pstate_init_perf(struct amd_cpudata
> *cpudata)
> > WRITE_ONCE(cpudata->nominal_perf,
> AMD_CPPC_NOMINAL_PERF(cap1));
> > WRITE_ONCE(cpudata->lowest_nonlinear_perf,
> AMD_CPPC_LOWNONLIN_PERF(cap1));
> > WRITE_ONCE(cpudata->lowest_perf,
> AMD_CPPC_LOWEST_PERF(cap1));
> > + WRITE_ONCE(cpudata->prefcore_ranking,
> AMD_CPPC_HIGHEST_PERF(cap1));
> >
> > return 0;
> > }
> > @@ -334,6 +335,7 @@ static int cppc_init_perf(struct amd_cpudata
> *cpudata)
> > WRITE_ONCE(cpudata->lowest_nonlinear_perf,
> > cppc_perf.lowest_nonlinear_perf);
> > WRITE_ONCE(cpudata->lowest_perf, cppc_perf.lowest_perf);
> > + WRITE_ONCE(cpudata->prefcore_ranking, cppc_perf.highest_perf);
> >
> > if (cppc_state == AMD_PSTATE_ACTIVE)
> > return 0;
> > @@ -540,7 +542,7 @@ static void amd_pstate_adjust_perf(unsigned int
> cpu,
> > if (target_perf < capacity)
> > des_perf = DIV_ROUND_UP(cap_perf * target_perf,
> capacity);
> >
> > - min_perf = READ_ONCE(cpudata->highest_perf);
> > + min_perf = READ_ONCE(cpudata->lowest_perf);
>
> This seems to be a fix. So, this could be a separate patch.
[Meng, Li (Jassmine)] Thanks, I will modify it.
>
> > if (_min_perf < capacity)
> > min_perf = DIV_ROUND_UP(cap_perf * _min_perf, capacity);
> >
> > @@ -760,6 +762,32 @@ static void amd_pstate_init_prefcore(struct
> amd_cpudata *cpudata)
> > }
> > }
> >
> > +static void amd_pstate_update_highest_perf(unsigned int cpu) {
> > + struct cpufreq_policy *policy;
> > + struct amd_cpudata *cpudata;
> > + u32 prev_high = 0, cur_high = 0;
> > + int ret;
> > +
> > + if ((!amd_pstate_prefcore) || (!cpudata->hw_prefcore))
> > + return;
> > +
> > + ret = amd_pstate_get_highest_perf(cpu, &cur_high);
> > + if (ret)
> > + return;
> > +
> > + policy = cpufreq_cpu_get(cpu);
> > + cpudata = policy->driver_data;
> > + prev_high = READ_ONCE(cpudata->prefcore_ranking);
> > +
> > + if (prev_high != cur_high) {
> > + WRITE_ONCE(cpudata->prefcore_ranking, cur_high);
> > + sched_set_itmt_core_prio(cur_high, cpu);
> > + }
> > +
> > + cpufreq_cpu_put(policy);
> > +}
> > +
> > static int amd_pstate_cpu_init(struct cpufreq_policy *policy) {
> > int min_freq, max_freq, nominal_freq, lowest_nonlinear_freq, ret;
> @@
> > -926,7 +954,7 @@ static ssize_t show_amd_pstate_highest_perf(struct
> cpufreq_policy *policy,
> > u32 perf;
> > struct amd_cpudata *cpudata = policy->driver_data;
> >
> > - perf = READ_ONCE(cpudata->highest_perf);
> > + perf = READ_ONCE(cpudata->prefcore_ranking);
>
> I think this should show cpudata->highest_perf.
[Meng, Li (Jassmine)] Thanks, I will modify it.
Add a new function for prefcore_ranking.
>
> Thanks,
> Wyes
> >
> > return sysfs_emit(buf, "%u\n", perf); } @@ -1502,6 +1530,7 @@
> > static struct cpufreq_driver amd_pstate_driver = {
> > .suspend = amd_pstate_cpu_suspend,
> > .resume = amd_pstate_cpu_resume,
> > .set_boost = amd_pstate_set_boost,
> > + .update_highest_perf = amd_pstate_update_highest_perf,
> > .name = "amd-pstate",
> > .attr = amd_pstate_attr,
> > };
> > @@ -1516,6 +1545,7 @@ static struct cpufreq_driver
> amd_pstate_epp_driver = {
> > .online = amd_pstate_epp_cpu_online,
> > .suspend = amd_pstate_epp_suspend,
> > .resume = amd_pstate_epp_resume,
> > + .update_highest_perf = amd_pstate_update_highest_perf,
> > .name = "amd-pstate-epp",
> > .attr = amd_pstate_epp_attr,
> > };
> > diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
> > index 87e140e9e6db..426822612373 100644
> > --- a/include/linux/amd-pstate.h
> > +++ b/include/linux/amd-pstate.h
> > @@ -39,11 +39,16 @@ struct amd_aperf_mperf {
> > * @cppc_req_cached: cached performance request hints
> > * @highest_perf: the maximum performance an individual processor may
> reach,
> > * assuming ideal conditions
> > + * For platforms that do not support the preferred core
> feature, the
> > + * highest_pef may be configured with 166 or 255, to avoid
> max frequency
> > + * calculated wrongly. we take the fixed value as the
> highest_perf.
> > * @nominal_perf: the maximum sustained performance level of the
> processor,
> > * assuming ideal operating conditions
> > * @lowest_nonlinear_perf: the lowest performance level at which
> nonlinear power
> > * savings are achieved
> > * @lowest_perf: the absolute lowest performance level of the
> > processor
> > + * @prefcore_ranking: the preferred core ranking, the higher value
> indicates a higher
> > + * priority.
> > * @max_freq: the frequency that mapped to highest_perf
> > * @min_freq: the frequency that mapped to lowest_perf
> > * @nominal_freq: the frequency that mapped to nominal_perf @@ -73,6
> > +78,7 @@ struct amd_cpudata {
> > u32 nominal_perf;
> > u32 lowest_nonlinear_perf;
> > u32 lowest_perf;
> > + u32 prefcore_ranking;
> >
> > u32 max_freq;
> > u32 min_freq;
> > --
> > 2.34.1
> >

2023-10-09 13:00:50

by Oleksandr Natalenko

Subject: Re: [PATCH V8 0/7] amd-pstate preferred core

Hello.

On pondělí 9. října 2023 9:23:29 CEST Meng, Li (Jassmine) wrote:
> [AMD Official Use Only - General]
>
> Hi Oleksandr:
>
> > -----Original Message-----
> > From: Oleksandr Natalenko <[email protected]>
> > Sent: Monday, October 9, 2023 2:55 PM
> > To: Rafael J . Wysocki <[email protected]>; Huang, Ray
> > <[email protected]>; Meng, Li (Jassmine) <[email protected]>
> > Cc: [email protected]; [email protected];
> > [email protected]; [email protected]; Shuah Khan
> > <[email protected]>; [email protected]; Fontenot,
> > Nathan <[email protected]>; Sharma, Deepak
> > <[email protected]>; Deucher, Alexander
> > <[email protected]>; Limonciello, Mario
> > <[email protected]>; Huang, Shimmer
> > <[email protected]>; Yuan, Perry <[email protected]>; Du,
> > Xiaojian <[email protected]>; Viresh Kumar <[email protected]>;
> > Borislav Petkov <[email protected]>; Meng, Li (Jassmine) <[email protected]>
> > Subject: Re: [PATCH V8 0/7] amd-pstate preferred core
> >
> > Hello.
> >
> > On pondělí 9. října 2023 4:49:25 CEST Meng Li wrote:
> > > Hi all:
> > >
> > > The core frequency is subjected to the process variation in semiconductors.
> > > Not all cores are able to reach the maximum frequency respecting the
> > > infrastructure limits. Consequently, AMD has redefined the concept of
> > > maximum frequency of a part. This means that a fraction of cores can
> > > reach maximum frequency. To find the best process scheduling policy
> > > for a given scenario, OS needs to know the core ordering informed by
> > > the platform through highest performance capability register of the CPPC
> > interface.
> > >
> > > Earlier implementations of amd-pstate preferred core only support a
> > > static core ranking and targeted performance. Now it has the ability
> > > to dynamically change the preferred core based on the workload and
> > > platform conditions and accounting for thermals and aging.
> > >
> > > Amd-pstate driver utilizes the functions and data structures provided
> > > by the ITMT architecture to enable the scheduler to favor scheduling
> > > on cores which can be get a higher frequency with lower voltage.
> > > We call it amd-pstate preferred core.
> > >
> > > Here sched_set_itmt_core_prio() is called to set priorities and
> > > sched_set_itmt_support() is called to enable ITMT feature.
> > > Amd-pstate driver uses the highest performance value to indicate the
> > > priority of CPU. The higher value has a higher priority.
> > >
> > > Amd-pstate driver will provide an initial core ordering at boot time.
> > > It relies on the CPPC interface to communicate the core ranking to the
> > > operating system and scheduler to make sure that OS is choosing the
> > > cores with highest performance firstly for scheduling the process.
> > > When amd-pstate driver receives a message with the highest performance
> > > change, it will update the core ranking.
> > >
> > > Changes form V7->V8:
> > > - all:
> > > - - pick up Review-By flag added by Mario and Ray.
> > > - cpufreq: amd-pstate:
> > > - - use hw_prefcore embeds into cpudata structure.
> > > - - delete preferred core init from cpu online/off.
> >
> > Could you please let me know if this change means a fix for the report I've
> > sent previously? [1]
> >
> [Meng, Li (Jassmine)] Yes.
> I have deleted online handle function of amd pstate driver.
> It doesn't re-initialize preferred core.
> This online function will set incorrect des perf value.

Thank you for the confirmation. I've built v6.5.5 with this patchset applied, and now the frequency is as expected after the suspend-resume cycle.

I've also added the following modification to accommodate recent feedback:

```
commit 1450ac395434c532f995521e1a2497d09ddf106c
Author: Oleksandr Natalenko <[email protected]>
Date: Mon Oct 9 11:19:50 2023 +0200

cpufreq/amd-pstate: show prefcore_ranking separately

Signed-off-by: Oleksandr Natalenko <[email protected]>

diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index d3369247c6c9c..86999d861e87b 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -954,6 +954,17 @@ static ssize_t show_amd_pstate_highest_perf(struct cpufreq_policy *policy,
u32 perf;
struct amd_cpudata *cpudata = policy->driver_data;

+ perf = READ_ONCE(cpudata->highest_perf);
+
+ return sysfs_emit(buf, "%u\n", perf);
+}
+
+static ssize_t show_amd_pstate_prefcore_ranking(struct cpufreq_policy *policy,
+ char *buf)
+{
+ u32 perf;
+ struct amd_cpudata *cpudata = policy->driver_data;
+
perf = READ_ONCE(cpudata->prefcore_ranking);

return sysfs_emit(buf, "%u\n", perf);
@@ -1172,6 +1183,7 @@ cpufreq_freq_attr_ro(amd_pstate_max_freq);
cpufreq_freq_attr_ro(amd_pstate_lowest_nonlinear_freq);

cpufreq_freq_attr_ro(amd_pstate_highest_perf);
+cpufreq_freq_attr_ro(amd_pstate_prefcore_ranking);
cpufreq_freq_attr_ro(amd_pstate_hw_prefcore);
cpufreq_freq_attr_rw(energy_performance_preference);
cpufreq_freq_attr_ro(energy_performance_available_preferences);
@@ -1182,6 +1194,7 @@ static struct freq_attr *amd_pstate_attr[] = {
&amd_pstate_max_freq,
&amd_pstate_lowest_nonlinear_freq,
&amd_pstate_highest_perf,
+ &amd_pstate_prefcore_ranking,
&amd_pstate_hw_prefcore,
NULL,
};
@@ -1190,6 +1203,7 @@ static struct freq_attr *amd_pstate_epp_attr[] = {
&amd_pstate_max_freq,
&amd_pstate_lowest_nonlinear_freq,
&amd_pstate_highest_perf,
+ &amd_pstate_prefcore_ranking,
&amd_pstate_hw_prefcore,
&energy_performance_preference,
&energy_performance_available_preferences,
```

with the following output as a result:

```
[~]> grep . /sys/devices/system/cpu*/cpufreq/policy*/amd_pstate_highest_perf
/sys/devices/system/cpu/cpufreq/policy0/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy1/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy2/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy3/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy4/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy5/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy6/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy7/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy8/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy9/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy10/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy11/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy12/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy13/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy14/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy15/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy16/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy17/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy18/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy19/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy20/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy21/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy22/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy23/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy24/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy25/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy26/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy27/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy28/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy29/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy30/amd_pstate_highest_perf:166
/sys/devices/system/cpu/cpufreq/policy31/amd_pstate_highest_perf:166

[~]> grep . /sys/devices/system/cpu*/cpufreq/policy*/amd_pstate_hw_prefcore
/sys/devices/system/cpu/cpufreq/policy0/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy1/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy2/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy3/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy4/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy5/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy6/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy7/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy8/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy9/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy10/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy11/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy12/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy13/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy14/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy15/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy16/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy17/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy18/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy19/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy20/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy21/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy22/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy23/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy24/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy25/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy26/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy27/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy28/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy29/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy30/amd_pstate_hw_prefcore:supported
/sys/devices/system/cpu/cpufreq/policy31/amd_pstate_hw_prefcore:supported

[~]> grep . /sys/devices/system/cpu*/cpufreq/policy*/amd_pstate_prefcore_ranking
/sys/devices/system/cpu/cpufreq/policy0/amd_pstate_prefcore_ranking:226
/sys/devices/system/cpu/cpufreq/policy1/amd_pstate_prefcore_ranking:231
/sys/devices/system/cpu/cpufreq/policy2/amd_pstate_prefcore_ranking:211
/sys/devices/system/cpu/cpufreq/policy3/amd_pstate_prefcore_ranking:236
/sys/devices/system/cpu/cpufreq/policy4/amd_pstate_prefcore_ranking:216
/sys/devices/system/cpu/cpufreq/policy5/amd_pstate_prefcore_ranking:236
/sys/devices/system/cpu/cpufreq/policy6/amd_pstate_prefcore_ranking:206
/sys/devices/system/cpu/cpufreq/policy7/amd_pstate_prefcore_ranking:221
/sys/devices/system/cpu/cpufreq/policy8/amd_pstate_prefcore_ranking:191
/sys/devices/system/cpu/cpufreq/policy9/amd_pstate_prefcore_ranking:201
/sys/devices/system/cpu/cpufreq/policy10/amd_pstate_prefcore_ranking:186
/sys/devices/system/cpu/cpufreq/policy11/amd_pstate_prefcore_ranking:196
/sys/devices/system/cpu/cpufreq/policy12/amd_pstate_prefcore_ranking:171
/sys/devices/system/cpu/cpufreq/policy13/amd_pstate_prefcore_ranking:166
/sys/devices/system/cpu/cpufreq/policy14/amd_pstate_prefcore_ranking:176
/sys/devices/system/cpu/cpufreq/policy15/amd_pstate_prefcore_ranking:181
/sys/devices/system/cpu/cpufreq/policy16/amd_pstate_prefcore_ranking:226
/sys/devices/system/cpu/cpufreq/policy17/amd_pstate_prefcore_ranking:231
/sys/devices/system/cpu/cpufreq/policy18/amd_pstate_prefcore_ranking:211
/sys/devices/system/cpu/cpufreq/policy19/amd_pstate_prefcore_ranking:236
/sys/devices/system/cpu/cpufreq/policy20/amd_pstate_prefcore_ranking:216
/sys/devices/system/cpu/cpufreq/policy21/amd_pstate_prefcore_ranking:236
/sys/devices/system/cpu/cpufreq/policy22/amd_pstate_prefcore_ranking:206
/sys/devices/system/cpu/cpufreq/policy23/amd_pstate_prefcore_ranking:221
/sys/devices/system/cpu/cpufreq/policy24/amd_pstate_prefcore_ranking:191
/sys/devices/system/cpu/cpufreq/policy25/amd_pstate_prefcore_ranking:201
/sys/devices/system/cpu/cpufreq/policy26/amd_pstate_prefcore_ranking:186
/sys/devices/system/cpu/cpufreq/policy27/amd_pstate_prefcore_ranking:196
/sys/devices/system/cpu/cpufreq/policy28/amd_pstate_prefcore_ranking:171
/sys/devices/system/cpu/cpufreq/policy29/amd_pstate_prefcore_ranking:166
/sys/devices/system/cpu/cpufreq/policy30/amd_pstate_prefcore_ranking:176
/sys/devices/system/cpu/cpufreq/policy31/amd_pstate_prefcore_ranking:181
```

When I run `dd if=/dev/zero of=/dev/null`, the load lands onto cores 3, 5, 19 or 21, IOW, those that have the highest `amd_pstate_prefcore_ranking` value given `schedutil` is in use.

If all of the above is as expected, please add:

Tested-by: Oleksandr Natalenko <[email protected]>

> > Would you also be able to Cc me on the next iteration of this patchset?
> [Meng, Li (Jassmine)] OK.

Thanks.

> >
> > Thank you!
> >
> > [1] https://lore.kernel.org/lkml/[email protected]/
> >
> > >
> > > Changes form V6->V7:
> > > - x86:
> > > - - Modify kconfig about X86_AMD_PSTATE.
> > > - cpufreq: amd-pstate:
> > > - - modify incorrect comments about scheduler_work().
> > > - - convert highest_perf data type.
> > > - - modify preferred core init when cpu init and online.
> > > - acpi: cppc:
> > > - - modify link of CPPC highest performance.
> > > - cpufreq:
> > > - - modify link of CPPC highest performance changed.
> > >
> > > Changes form V5->V6:
> > > - cpufreq: amd-pstate:
> > > - - modify the wrong tag order.
> > > - - modify warning about hw_prefcore sysfs attribute.
> > > - - delete duplicate comments.
> > > - - modify the variable name cppc_highest_perf to prefcore_ranking.
> > > - - modify judgment conditions for setting highest_perf.
> > > - - modify sysfs attribute for CPPC highest perf to pr_debug message.
> > > - Documentation: amd-pstate:
> > > - - modify warning: title underline too short.
> > >
> > > Changes form V4->V5:
> > > - cpufreq: amd-pstate:
> > > - - modify sysfs attribute for CPPC highest perf.
> > > - - modify warning about comments
> > > - - rebase linux-next
> > > - cpufreq:
> > > - - Moidfy warning about function declarations.
> > > - Documentation: amd-pstate:
> > > - - align with ``amd-pstat``
> > >
> > > Changes form V3->V4:
> > > - Documentation: amd-pstate:
> > > - - Modify inappropriate descriptions.
> > >
> > > Changes form V2->V3:
> > > - x86:
> > > - - Modify kconfig and description.
> > > - cpufreq: amd-pstate:
> > > - - Add Co-developed-by tag in commit message.
> > > - cpufreq:
> > > - - Modify commit message.
> > > - Documentation: amd-pstate:
> > > - - Modify inappropriate descriptions.
> > >
> > > Changes form V1->V2:
> > > - acpi: cppc:
> > > - - Add reference link.
> > > - cpufreq:
> > > - - Moidfy link error.
> > > - cpufreq: amd-pstate:
> > > - - Init the priorities of all online CPUs
> > > - - Use a single variable to represent the status of preferred core.
> > > - Documentation:
> > > - - Default enabled preferred core.
> > > - Documentation: amd-pstate:
> > > - - Modify inappropriate descriptions.
> > > - - Default enabled preferred core.
> > > - - Use a single variable to represent the status of preferred core.
> > >
> > > Meng Li (7):
> > > x86: Drop CPU_SUP_INTEL from SCHED_MC_PRIO for the expansion.
> > > acpi: cppc: Add get the highest performance cppc control
> > > cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.
> > > cpufreq: Add a notification message that the highest perf has changed
> > > cpufreq: amd-pstate: Update amd-pstate preferred core ranking
> > > dynamically
> > > Documentation: amd-pstate: introduce amd-pstate preferred core
> > > Documentation: introduce amd-pstate preferrd core mode kernel
> > command
> > > line options
> > >
> > > .../admin-guide/kernel-parameters.txt | 5 +
> > > Documentation/admin-guide/pm/amd-pstate.rst | 59 +++++-
> > > arch/x86/Kconfig | 5 +-
> > > drivers/acpi/cppc_acpi.c | 13 ++
> > > drivers/acpi/processor_driver.c | 6 +
> > > drivers/cpufreq/amd-pstate.c | 186 ++++++++++++++++--
> > > drivers/cpufreq/cpufreq.c | 13 ++
> > > include/acpi/cppc_acpi.h | 5 +
> > > include/linux/amd-pstate.h | 10 +
> > > include/linux/cpufreq.h | 5 +
> > > 10 files changed, 285 insertions(+), 22 deletions(-)
> > >
> > >
> >
> >
> > --
> > Oleksandr Natalenko (post-factum)
>


--
Oleksandr Natalenko (post-factum)

Attachments:

2023-10-10 02:15:59

by Meng, Li (Jassmine)

Subject: RE: [PATCH V8 0/7] amd-pstate preferred core

[AMD Official Use Only - General]

Hi Oleksandr:

> -----Original Message-----
> From: Oleksandr Natalenko <[email protected]>
> Sent: Monday, October 9, 2023 9:00 PM
> To: Rafael J . Wysocki <[email protected]>; Huang, Ray
> <[email protected]>; Meng, Li (Jassmine) <[email protected]>
> Cc: [email protected]; [email protected];
> [email protected]; [email protected]; Shuah Khan
> <[email protected]>; [email protected]; Fontenot,
> Nathan <[email protected]>; Sharma, Deepak
> <[email protected]>; Deucher, Alexander
> <[email protected]>; Limonciello, Mario
> <[email protected]>; Huang, Shimmer
> <[email protected]>; Yuan, Perry <[email protected]>; Du,
> Xiaojian <[email protected]>; Viresh Kumar <[email protected]>;
> Borislav Petkov <[email protected]>
> Subject: Re: [PATCH V8 0/7] amd-pstate preferred core
>
> Hello.
>
> On pondělí 9. října 2023 9:23:29 CEST Meng, Li (Jassmine) wrote:
> > [AMD Official Use Only - General]
> >
> > Hi Oleksandr:
> >
> > > -----Original Message-----
> > > From: Oleksandr Natalenko <[email protected]>
> > > Sent: Monday, October 9, 2023 2:55 PM
> > > To: Rafael J . Wysocki <[email protected]>; Huang, Ray
> > > <[email protected]>; Meng, Li (Jassmine) <[email protected]>
> > > Cc: [email protected]; [email protected];
> > > [email protected]; [email protected]; Shuah Khan
> > > <[email protected]>; [email protected];
> > > Fontenot, Nathan <[email protected]>; Sharma, Deepak
> > > <[email protected]>; Deucher, Alexander
> > > <[email protected]>; Limonciello, Mario
> > > <[email protected]>; Huang, Shimmer
> <[email protected]>;
> > > Yuan, Perry <[email protected]>; Du, Xiaojian
> > > <[email protected]>; Viresh Kumar <[email protected]>;
> > > Borislav Petkov <[email protected]>; Meng, Li (Jassmine)
> > > <[email protected]>
> > > Subject: Re: [PATCH V8 0/7] amd-pstate preferred core
> > >
> > > Hello.
> > >
> > > On pondělí 9. října 2023 4:49:25 CEST Meng Li wrote:
> > > > Hi all:
> > > >
> > > > The core frequency is subjected to the process variation in
> semiconductors.
> > > > Not all cores are able to reach the maximum frequency respecting
> > > > the infrastructure limits. Consequently, AMD has redefined the
> > > > concept of maximum frequency of a part. This means that a fraction
> > > > of cores can reach maximum frequency. To find the best process
> > > > scheduling policy for a given scenario, OS needs to know the core
> > > > ordering informed by the platform through highest performance
> > > > capability register of the CPPC
> > > interface.
> > > >
> > > > Earlier implementations of amd-pstate preferred core only support
> > > > a static core ranking and targeted performance. Now it has the
> > > > ability to dynamically change the preferred core based on the
> > > > workload and platform conditions and accounting for thermals and
> aging.
> > > >
> > > > Amd-pstate driver utilizes the functions and data structures
> > > > provided by the ITMT architecture to enable the scheduler to favor
> > > > scheduling on cores which can be get a higher frequency with lower
> voltage.
> > > > We call it amd-pstate preferred core.
> > > >
> > > > Here sched_set_itmt_core_prio() is called to set priorities and
> > > > sched_set_itmt_support() is called to enable ITMT feature.
> > > > Amd-pstate driver uses the highest performance value to indicate
> > > > the priority of CPU. The higher value has a higher priority.
> > > >
> > > > Amd-pstate driver will provide an initial core ordering at boot time.
> > > > It relies on the CPPC interface to communicate the core ranking to
> > > > the operating system and scheduler to make sure that OS is
> > > > choosing the cores with highest performance firstly for scheduling the
> process.
> > > > When amd-pstate driver receives a message with the highest
> > > > performance change, it will update the core ranking.
> > > >
> > > > Changes form V7->V8:
> > > > - all:
> > > > - - pick up Review-By flag added by Mario and Ray.
> > > > - cpufreq: amd-pstate:
> > > > - - use hw_prefcore embeds into cpudata structure.
> > > > - - delete preferred core init from cpu online/off.
> > >
> > > Could you please let me know if this change means a fix for the
> > > report I've sent previously? [1]
> > >
> > [Meng, Li (Jassmine)] Yes.
> > I have deleted online handle function of amd pstate driver.
> > It doesn't re-initialize preferred core.
> > This online function will set incorrect des perf value.
>
> Thank you for the confirmation. I've built v6.5.5 with this patchset applied,
> and now the frequency is as expected after the suspend-resume cycle.
>
> I've also added the following modification to accommodate recent feedback:
>
> ```
> commit 1450ac395434c532f995521e1a2497d09ddf106c
> Author: Oleksandr Natalenko <[email protected]>
> Date: Mon Oct 9 11:19:50 2023 +0200
>
> cpufreq/amd-pstate: show prefcore_ranking separately
>
> Signed-off-by: Oleksandr Natalenko <[email protected]>
>
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index d3369247c6c9c..86999d861e87b 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -954,6 +954,17 @@ static ssize_t show_amd_pstate_highest_perf(struct
> cpufreq_policy *policy,
> u32 perf;
> struct amd_cpudata *cpudata = policy->driver_data;
>
> + perf = READ_ONCE(cpudata->highest_perf);
> +
> + return sysfs_emit(buf, "%u\n", perf);
> +}
> +
> +static ssize_t show_amd_pstate_prefcore_ranking(struct cpufreq_policy
> *policy,
> + char *buf)
> +{
> + u32 perf;
> + struct amd_cpudata *cpudata = policy->driver_data;
> +
> perf = READ_ONCE(cpudata->prefcore_ranking);
>
> return sysfs_emit(buf, "%u\n", perf);
> @@ -1172,6 +1183,7 @@ cpufreq_freq_attr_ro(amd_pstate_max_freq);
> cpufreq_freq_attr_ro(amd_pstate_lowest_nonlinear_freq);
>
> cpufreq_freq_attr_ro(amd_pstate_highest_perf);
> +cpufreq_freq_attr_ro(amd_pstate_prefcore_ranking);
> cpufreq_freq_attr_ro(amd_pstate_hw_prefcore);
> cpufreq_freq_attr_rw(energy_performance_preference);
> cpufreq_freq_attr_ro(energy_performance_available_preferences);
> @@ -1182,6 +1194,7 @@ static struct freq_attr *amd_pstate_attr[] = {
> &amd_pstate_max_freq,
> &amd_pstate_lowest_nonlinear_freq,
> &amd_pstate_highest_perf,
> + &amd_pstate_prefcore_ranking,
> &amd_pstate_hw_prefcore,
> NULL,
> };
> @@ -1190,6 +1203,7 @@ static struct freq_attr *amd_pstate_epp_attr[] = {
> &amd_pstate_max_freq,
> &amd_pstate_lowest_nonlinear_freq,
> &amd_pstate_highest_perf,
> + &amd_pstate_prefcore_ranking,
> &amd_pstate_hw_prefcore,
> &energy_performance_preference,
> &energy_performance_available_preferences,
> ```
>
> with the following output as a result:
>
> ```
> [~]> grep .
> /sys/devices/system/cpu*/cpufreq/policy*/amd_pstate_highest_perf
> /sys/devices/system/cpu/cpufreq/policy0/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy1/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy2/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy3/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy4/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy5/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy6/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy7/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy8/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy9/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy10/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy11/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy12/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy13/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy14/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy15/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy16/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy17/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy18/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy19/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy20/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy21/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy22/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy23/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy24/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy25/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy26/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy27/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy28/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy29/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy30/amd_pstate_highest_perf:166
> /sys/devices/system/cpu/cpufreq/policy31/amd_pstate_highest_perf:166
>
> [~]> grep .
> /sys/devices/system/cpu*/cpufreq/policy*/amd_pstate_hw_prefcore
> /sys/devices/system/cpu/cpufreq/policy0/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy1/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy2/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy3/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy4/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy5/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy6/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy7/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy8/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy9/amd_pstate_hw_prefcore:suppo
> rted
> /sys/devices/system/cpu/cpufreq/policy10/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy11/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy12/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy13/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy14/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy15/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy16/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy17/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy18/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy19/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy20/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy21/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy22/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy23/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy24/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy25/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy26/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy27/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy28/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy29/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy30/amd_pstate_hw_prefcore:supp
> orted
> /sys/devices/system/cpu/cpufreq/policy31/amd_pstate_hw_prefcore:supp
> orted
>
> [~]> grep .
> /sys/devices/system/cpu*/cpufreq/policy*/amd_pstate_prefcore_ranking
> /sys/devices/system/cpu/cpufreq/policy0/amd_pstate_prefcore_ranking:22
> 6
> /sys/devices/system/cpu/cpufreq/policy1/amd_pstate_prefcore_ranking:23
> 1
> /sys/devices/system/cpu/cpufreq/policy2/amd_pstate_prefcore_ranking:21
> 1
> /sys/devices/system/cpu/cpufreq/policy3/amd_pstate_prefcore_ranking:23
> 6
> /sys/devices/system/cpu/cpufreq/policy4/amd_pstate_prefcore_ranking:21
> 6
> /sys/devices/system/cpu/cpufreq/policy5/amd_pstate_prefcore_ranking:23
> 6
> /sys/devices/system/cpu/cpufreq/policy6/amd_pstate_prefcore_ranking:20
> 6
> /sys/devices/system/cpu/cpufreq/policy7/amd_pstate_prefcore_ranking:22
> 1
> /sys/devices/system/cpu/cpufreq/policy8/amd_pstate_prefcore_ranking:19
> 1
> /sys/devices/system/cpu/cpufreq/policy9/amd_pstate_prefcore_ranking:20
> 1
> /sys/devices/system/cpu/cpufreq/policy10/amd_pstate_prefcore_ranking:1
> 86
> /sys/devices/system/cpu/cpufreq/policy11/amd_pstate_prefcore_ranking:1
> 96
> /sys/devices/system/cpu/cpufreq/policy12/amd_pstate_prefcore_ranking:1
> 71
> /sys/devices/system/cpu/cpufreq/policy13/amd_pstate_prefcore_ranking:1
> 66
> /sys/devices/system/cpu/cpufreq/policy14/amd_pstate_prefcore_ranking:1
> 76
> /sys/devices/system/cpu/cpufreq/policy15/amd_pstate_prefcore_ranking:1
> 81
> /sys/devices/system/cpu/cpufreq/policy16/amd_pstate_prefcore_ranking:2
> 26
> /sys/devices/system/cpu/cpufreq/policy17/amd_pstate_prefcore_ranking:2
> 31
> /sys/devices/system/cpu/cpufreq/policy18/amd_pstate_prefcore_ranking:2
> 11
> /sys/devices/system/cpu/cpufreq/policy19/amd_pstate_prefcore_ranking:2
> 36
> /sys/devices/system/cpu/cpufreq/policy20/amd_pstate_prefcore_ranking:2
> 16
> /sys/devices/system/cpu/cpufreq/policy21/amd_pstate_prefcore_ranking:2
> 36
> /sys/devices/system/cpu/cpufreq/policy22/amd_pstate_prefcore_ranking:2
> 06
> /sys/devices/system/cpu/cpufreq/policy23/amd_pstate_prefcore_ranking:2
> 21
> /sys/devices/system/cpu/cpufreq/policy24/amd_pstate_prefcore_ranking:1
> 91
> /sys/devices/system/cpu/cpufreq/policy25/amd_pstate_prefcore_ranking:2
> 01
> /sys/devices/system/cpu/cpufreq/policy26/amd_pstate_prefcore_ranking:1
> 86
> /sys/devices/system/cpu/cpufreq/policy27/amd_pstate_prefcore_ranking:1
> 96
> /sys/devices/system/cpu/cpufreq/policy28/amd_pstate_prefcore_ranking:1
> 71
> /sys/devices/system/cpu/cpufreq/policy29/amd_pstate_prefcore_ranking:1
> 66
> /sys/devices/system/cpu/cpufreq/policy30/amd_pstate_prefcore_ranking:1
> 76
> /sys/devices/system/cpu/cpufreq/policy31/amd_pstate_prefcore_ranking:1
> 81
> ```
>
> When I run `dd if=/dev/zero of=/dev/null`, the load lands onto cores 3, 5, 19
> or 21, IOW, those that have the highest `amd_pstate_prefcore_ranking`
> value given `schedutil` is in use.
>
> If all of the above is as expected, please add:
>
> Tested-by: Oleksandr Natalenko <[email protected]>
>
> > > Would you also be able to Cc me on the next iteration of this patchset?
> > [Meng, Li (Jassmine)] OK.
>
> Thanks.
>
[Meng, Li (Jassmine)]
Thanks a lot.
Based on Wyes's suggestion, I also made similar modifications in the next patches.
All the log information above is in line with expectations.

> > >
> > > Thank you!
> > >
> > > [1] https://lore.kernel.org/lkml/[email protected]/
> > >
> > > >
> > > > Changes form V6->V7:
> > > > - x86:
> > > > - - Modify kconfig about X86_AMD_PSTATE.
> > > > - cpufreq: amd-pstate:
> > > > - - modify incorrect comments about scheduler_work().
> > > > - - convert highest_perf data type.
> > > > - - modify preferred core init when cpu init and online.
> > > > - acpi: cppc:
> > > > - - modify link of CPPC highest performance.
> > > > - cpufreq:
> > > > - - modify link of CPPC highest performance changed.
> > > >
> > > > Changes form V5->V6:
> > > > - cpufreq: amd-pstate:
> > > > - - modify the wrong tag order.
> > > > - - modify warning about hw_prefcore sysfs attribute.
> > > > - - delete duplicate comments.
> > > > - - modify the variable name cppc_highest_perf to prefcore_ranking.
> > > > - - modify judgment conditions for setting highest_perf.
> > > > - - modify sysfs attribute for CPPC highest perf to pr_debug message.
> > > > - Documentation: amd-pstate:
> > > > - - modify warning: title underline too short.
> > > >
> > > > Changes form V4->V5:
> > > > - cpufreq: amd-pstate:
> > > > - - modify sysfs attribute for CPPC highest perf.
> > > > - - modify warning about comments
> > > > - - rebase linux-next
> > > > - cpufreq:
> > > > - - Moidfy warning about function declarations.
> > > > - Documentation: amd-pstate:
> > > > - - align with ``amd-pstat``
> > > >
> > > > Changes form V3->V4:
> > > > - Documentation: amd-pstate:
> > > > - - Modify inappropriate descriptions.
> > > >
> > > > Changes form V2->V3:
> > > > - x86:
> > > > - - Modify kconfig and description.
> > > > - cpufreq: amd-pstate:
> > > > - - Add Co-developed-by tag in commit message.
> > > > - cpufreq:
> > > > - - Modify commit message.
> > > > - Documentation: amd-pstate:
> > > > - - Modify inappropriate descriptions.
> > > >
> > > > Changes form V1->V2:
> > > > - acpi: cppc:
> > > > - - Add reference link.
> > > > - cpufreq:
> > > > - - Moidfy link error.
> > > > - cpufreq: amd-pstate:
> > > > - - Init the priorities of all online CPUs
> > > > - - Use a single variable to represent the status of preferred core.
> > > > - Documentation:
> > > > - - Default enabled preferred core.
> > > > - Documentation: amd-pstate:
> > > > - - Modify inappropriate descriptions.
> > > > - - Default enabled preferred core.
> > > > - - Use a single variable to represent the status of preferred core.
> > > >
> > > > Meng Li (7):
> > > > x86: Drop CPU_SUP_INTEL from SCHED_MC_PRIO for the expansion.
> > > > acpi: cppc: Add get the highest performance cppc control
> > > > cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.
> > > > cpufreq: Add a notification message that the highest perf has changed
> > > > cpufreq: amd-pstate: Update amd-pstate preferred core ranking
> > > > dynamically
> > > > Documentation: amd-pstate: introduce amd-pstate preferred core
> > > > Documentation: introduce amd-pstate preferrd core mode kernel
> > > command
> > > > line options
> > > >
> > > > .../admin-guide/kernel-parameters.txt | 5 +
> > > > Documentation/admin-guide/pm/amd-pstate.rst | 59 +++++-
> > > > arch/x86/Kconfig | 5 +-
> > > > drivers/acpi/cppc_acpi.c | 13 ++
> > > > drivers/acpi/processor_driver.c | 6 +
> > > > drivers/cpufreq/amd-pstate.c | 186 ++++++++++++++++--
> > > > drivers/cpufreq/cpufreq.c | 13 ++
> > > > include/acpi/cppc_acpi.h | 5 +
> > > > include/linux/amd-pstate.h | 10 +
> > > > include/linux/cpufreq.h | 5 +
> > > > 10 files changed, 285 insertions(+), 22 deletions(-)
> > > >
> > > >
> > >
> > >
> > > --
> > > Oleksandr Natalenko (post-factum)
> >
>
>
> --
> Oleksandr Natalenko (post-factum)

2023-10-10 03:02:08

by Huang Rui

Subject: Re: [PATCH V8 0/7] amd-pstate preferred core

On Mon, Oct 09, 2023 at 10:49:25AM +0800, Meng Li wrote:
> Hi all:
>
> The core frequency is subjected to the process variation in semiconductors.
> Not all cores are able to reach the maximum frequency respecting the
> infrastructure limits. Consequently, AMD has redefined the concept of
> maximum frequency of a part. This means that a fraction of cores can reach
> maximum frequency. To find the best process scheduling policy for a given
> scenario, OS needs to know the core ordering informed by the platform through
> highest performance capability register of the CPPC interface.
>
> Earlier implementations of amd-pstate preferred core only support a static
> core ranking and targeted performance. Now it has the ability to dynamically
> change the preferred core based on the workload and platform conditions and
> accounting for thermals and aging.
>
> Amd-pstate driver utilizes the functions and data structures provided by
> the ITMT architecture to enable the scheduler to favor scheduling on cores
> which can be get a higher frequency with lower voltage.
> We call it amd-pstate preferred core.
>
> Here sched_set_itmt_core_prio() is called to set priorities and
> sched_set_itmt_support() is called to enable ITMT feature.
> Amd-pstate driver uses the highest performance value to indicate
> the priority of CPU. The higher value has a higher priority.
>
> Amd-pstate driver will provide an initial core ordering at boot time.
> It relies on the CPPC interface to communicate the core ranking to the
> operating system and scheduler to make sure that OS is choosing the cores
> with highest performance firstly for scheduling the process. When amd-pstate
> driver receives a message with the highest performance change, it will
> update the core ranking.
>
> Changes form V7->V8:
> - all:
> - - pick up Review-By flag added by Mario and Ray.
> - cpufreq: amd-pstate:
> - - use hw_prefcore embeds into cpudata structure.
> - - delete preferred core init from cpu online/off.

Thanks!

Series are Reviewed-by: Huang Rui <[email protected]>

>
> Changes form V6->V7:
> - x86:
> - - Modify kconfig about X86_AMD_PSTATE.
> - cpufreq: amd-pstate:
> - - modify incorrect comments about scheduler_work().
> - - convert highest_perf data type.
> - - modify preferred core init when cpu init and online.
> - acpi: cppc:
> - - modify link of CPPC highest performance.
> - cpufreq:
> - - modify link of CPPC highest performance changed.
>
> Changes form V5->V6:
> - cpufreq: amd-pstate:
> - - modify the wrong tag order.
> - - modify warning about hw_prefcore sysfs attribute.
> - - delete duplicate comments.
> - - modify the variable name cppc_highest_perf to prefcore_ranking.
> - - modify judgment conditions for setting highest_perf.
> - - modify sysfs attribute for CPPC highest perf to pr_debug message.
> - Documentation: amd-pstate:
> - - modify warning: title underline too short.
>
> Changes form V4->V5:
> - cpufreq: amd-pstate:
> - - modify sysfs attribute for CPPC highest perf.
> - - modify warning about comments
> - - rebase linux-next
> - cpufreq:
> - - Moidfy warning about function declarations.
> - Documentation: amd-pstate:
> - - align with ``amd-pstat``
>
> Changes form V3->V4:
> - Documentation: amd-pstate:
> - - Modify inappropriate descriptions.
>
> Changes form V2->V3:
> - x86:
> - - Modify kconfig and description.
> - cpufreq: amd-pstate:
> - - Add Co-developed-by tag in commit message.
> - cpufreq:
> - - Modify commit message.
> - Documentation: amd-pstate:
> - - Modify inappropriate descriptions.
>
> Changes form V1->V2:
> - acpi: cppc:
> - - Add reference link.
> - cpufreq:
> - - Moidfy link error.
> - cpufreq: amd-pstate:
> - - Init the priorities of all online CPUs
> - - Use a single variable to represent the status of preferred core.
> - Documentation:
> - - Default enabled preferred core.
> - Documentation: amd-pstate:
> - - Modify inappropriate descriptions.
> - - Default enabled preferred core.
> - - Use a single variable to represent the status of preferred core.
>
> Meng Li (7):
> x86: Drop CPU_SUP_INTEL from SCHED_MC_PRIO for the expansion.
> acpi: cppc: Add get the highest performance cppc control
> cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.
> cpufreq: Add a notification message that the highest perf has changed
> cpufreq: amd-pstate: Update amd-pstate preferred core ranking
> dynamically
> Documentation: amd-pstate: introduce amd-pstate preferred core
> Documentation: introduce amd-pstate preferrd core mode kernel command
> line options
>
> .../admin-guide/kernel-parameters.txt | 5 +
> Documentation/admin-guide/pm/amd-pstate.rst | 59 +++++-
> arch/x86/Kconfig | 5 +-
> drivers/acpi/cppc_acpi.c | 13 ++
> drivers/acpi/processor_driver.c | 6 +
> drivers/cpufreq/amd-pstate.c | 186 ++++++++++++++++--
> drivers/cpufreq/cpufreq.c | 13 ++
> include/acpi/cppc_acpi.h | 5 +
> include/linux/amd-pstate.h | 10 +
> include/linux/cpufreq.h | 5 +
> 10 files changed, 285 insertions(+), 22 deletions(-)
>
> --
> 2.34.1
>

2023-10-10 10:36:58

by Peter Zijlstra

Subject: Re: [PATCH V8 3/7] cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.

On Mon, Oct 09, 2023 at 10:49:28AM +0800, Meng Li wrote:

> +static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata)
> +{
> + int ret;
> + u32 highest_perf;
> + static u32 max_highest_perf = 0, min_highest_perf = U32_MAX;
> +
> + ret = amd_pstate_get_highest_perf(cpudata->cpu, &highest_perf);
> + if (ret)
> + return;
> +
> + cpudata->hw_prefcore = true;
> + /* check if CPPC preferred core feature is enabled*/
> + if (highest_perf == AMD_PSTATE_MAX_CPPC_PERF) {
> + pr_debug("AMD CPPC preferred core is unsupported!\n");
> + cpudata->hw_prefcore = false;
> + return;
> + }
> +
> + if (!amd_pstate_prefcore)
> + return;
> +
> + /*
> + * The priorities can be set regardless of whether or not
> + * sched_set_itmt_support(true) has been called and it is valid to
> + * update them at any time after it has been called.
> + */
> + sched_set_itmt_core_prio(highest_perf, cpudata->cpu);

You still got the whole u32 vs int thing confused, I've only pointed
that out *TWICE* before.

Boris, can you pull out the clue hammer please?

> +
> + if (max_highest_perf <= min_highest_perf) {
> + if (highest_perf > max_highest_perf)
> + max_highest_perf = highest_perf;
> +
> + if (highest_perf < min_highest_perf)
> + min_highest_perf = highest_perf;
> +
> + if (max_highest_perf > min_highest_perf) {
> + /*
> + * This code can be run during CPU online under the
> + * CPU hotplug locks, so sched_set_itmt_support()
> + * cannot be called from here. Queue up a work item
> + * to invoke it.
> + */
> + schedule_work(&sched_prefcore_work);
> + }
> + }
> +}

2023-10-11 01:02:33

by Meng, Li (Jassmine)

Subject: RE: [PATCH V8 3/7] cpufreq: amd-pstate: Enable amd-pstate preferred core supporting.

[AMD Official Use Only - General]

Hi Peter:

> -----Original Message-----
> From: Peter Zijlstra <[email protected]>
> Sent: Tuesday, October 10, 2023 6:36 PM
> To: Meng, Li (Jassmine) <[email protected]>
> Cc: Rafael J . Wysocki <[email protected]>; Huang, Ray
> <[email protected]>; [email protected]; linux-
> [email protected]; [email protected]; [email protected]; Shuah
> Khan <[email protected]>; [email protected];
> Fontenot, Nathan <[email protected]>; Sharma, Deepak
> <[email protected]>; Deucher, Alexander
> <[email protected]>; Limonciello, Mario
> <[email protected]>; Huang, Shimmer
> <[email protected]>; Yuan, Perry <[email protected]>; Du,
> Xiaojian <[email protected]>; Viresh Kumar <[email protected]>;
> Borislav Petkov <[email protected]>
> Subject: Re: [PATCH V8 3/7] cpufreq: amd-pstate: Enable amd-pstate
> preferred core supporting.
>
> Caution: This message originated from an External Source. Use proper
> caution when opening attachments, clicking links, or responding.
>
>
> On Mon, Oct 09, 2023 at 10:49:28AM +0800, Meng Li wrote:
>
> > +static void amd_pstate_init_prefcore(struct amd_cpudata *cpudata) {
> > + int ret;
> > + u32 highest_perf;
> > + static u32 max_highest_perf = 0, min_highest_perf = U32_MAX;
> > +
> > + ret = amd_pstate_get_highest_perf(cpudata->cpu, &highest_perf);
> > + if (ret)
> > + return;
> > +
> > + cpudata->hw_prefcore = true;
> > + /* check if CPPC preferred core feature is enabled*/
> > + if (highest_perf == AMD_PSTATE_MAX_CPPC_PERF) {
> > + pr_debug("AMD CPPC preferred core is unsupported!\n");
> > + cpudata->hw_prefcore = false;
> > + return;
> > + }
> > +
> > + if (!amd_pstate_prefcore)
> > + return;
> > +
> > + /*
> > + * The priorities can be set regardless of whether or not
> > + * sched_set_itmt_support(true) has been called and it is valid to
> > + * update them at any time after it has been called.
> > + */
> > + sched_set_itmt_core_prio(highest_perf, cpudata->cpu);
>
> You still got the whole u32 vs int thing confused, I've only pointed that out
> *TWICE* before.
>
> Boris, can you pull out the clue hammer please?
>
[Meng, Li (Jassmine)]
I feel very sorry, I will immediately double check and correct all modified data type.
Thanks a lot.

> > +
> > + if (max_highest_perf <= min_highest_perf) {
> > + if (highest_perf > max_highest_perf)
> > + max_highest_perf = highest_perf;
> > +
> > + if (highest_perf < min_highest_perf)
> > + min_highest_perf = highest_perf;
> > +
> > + if (max_highest_perf > min_highest_perf) {
> > + /*
> > + * This code can be run during CPU online under the
> > + * CPU hotplug locks, so sched_set_itmt_support()
> > + * cannot be called from here. Queue up a work item
> > + * to invoke it.
> > + */
> > + schedule_work(&sched_prefcore_work);
> > + }
> > + }
> > +}