* [RESEND PATCH 1/4] cpufreq: amd-pstate: Expose struct amd_cpudata
2022-08-17 3:46 [RESEND PATCH 0/4] Add unit test module for AMD P-State driver Meng Li
@ 2022-08-17 3:46 ` Meng Li
2022-08-17 3:46 ` [RESEND PATCH 2/4] cpufreq: amd-pstate: Add test module for amd-pstate driver Meng Li
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Meng Li @ 2022-08-17 3:46 UTC (permalink / raw)
To: Shuah Khan, Huang Rui, linux-pm
Cc: Rafael J . Wysocki, Nathan Fontenot, Deepak Sharma, Alex Deucher,
Mario Limonciello, Jinzhou Su, Perry Yuan, Xiaojian Du,
Viresh Kumar, Borislav Petkov, linux-kernel, Meng Li
Expose struct amd_cpudata to AMD P-State unit test module.
This data struct will be used on the following AMD P-State unit test
(amd-pstate-ut) module. The amd-pstate-ut module can get some
AMD infomations by this data struct. For example: highest perf,
nominal perf, boost supported etc.
Signed-off-by: Meng Li <li.meng@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Acked-by: Shuah Khan <skhan@linuxfoundation.org>
---
MAINTAINERS | 1 +
drivers/cpufreq/amd-pstate.c | 60 +---------------------------
include/linux/amd-pstate.h | 77 ++++++++++++++++++++++++++++++++++++
3 files changed, 79 insertions(+), 59 deletions(-)
create mode 100644 include/linux/amd-pstate.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 8a5012ba6ff9..5c404d2686d1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1045,6 +1045,7 @@ L: linux-pm@vger.kernel.org
S: Supported
F: Documentation/admin-guide/pm/amd-pstate.rst
F: drivers/cpufreq/amd-pstate*
+F: include/linux/amd-pstate.h
F: tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py
AMD PTDMA DRIVER
diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
index 9ac75c1cde9c..218f777a5915 100644
--- a/drivers/cpufreq/amd-pstate.c
+++ b/drivers/cpufreq/amd-pstate.c
@@ -36,6 +36,7 @@
#include <linux/delay.h>
#include <linux/uaccess.h>
#include <linux/static_call.h>
+#include <linux/amd-pstate.h>
#include <acpi/processor.h>
#include <acpi/cppc_acpi.h>
@@ -65,65 +66,6 @@ MODULE_PARM_DESC(shared_mem,
static struct cpufreq_driver amd_pstate_driver;
-/**
- * struct amd_aperf_mperf
- * @aperf: actual performance frequency clock count
- * @mperf: maximum performance frequency clock count
- * @tsc: time stamp counter
- */
-struct amd_aperf_mperf {
- u64 aperf;
- u64 mperf;
- u64 tsc;
-};
-
-/**
- * struct amd_cpudata - private CPU data for AMD P-State
- * @cpu: CPU number
- * @req: constraint request to apply
- * @cppc_req_cached: cached performance request hints
- * @highest_perf: the maximum performance an individual processor may reach,
- * assuming ideal conditions
- * @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
- * @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
- * @lowest_nonlinear_freq: the frequency that mapped to lowest_nonlinear_perf
- * @cur: Difference of Aperf/Mperf/tsc count between last and current sample
- * @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
- *
- * The amd_cpudata is key private data for each CPU thread in AMD P-State, and
- * represents all the attributes and goals that AMD P-State requests at runtime.
- */
-struct amd_cpudata {
- int cpu;
-
- struct freq_qos_request req[2];
- u64 cppc_req_cached;
-
- u32 highest_perf;
- u32 nominal_perf;
- u32 lowest_nonlinear_perf;
- u32 lowest_perf;
-
- u32 max_freq;
- u32 min_freq;
- u32 nominal_freq;
- u32 lowest_nonlinear_freq;
-
- struct amd_aperf_mperf cur;
- struct amd_aperf_mperf prev;
-
- u64 freq;
- bool boost_supported;
-};
-
static inline int pstate_enable(bool enable)
{
return wrmsrl_safe(MSR_AMD_CPPC_ENABLE, enable);
diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
new file mode 100644
index 000000000000..1c4b8659f171
--- /dev/null
+++ b/include/linux/amd-pstate.h
@@ -0,0 +1,77 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+/*
+ * linux/include/linux/amd-pstate.h
+ *
+ * Copyright (C) 2022 Advanced Micro Devices, Inc.
+ *
+ * Author: Meng Li <li.meng@amd.com>
+ */
+
+#ifndef _LINUX_AMD_PSTATE_H
+#define _LINUX_AMD_PSTATE_H
+
+#include <linux/pm_qos.h>
+
+/*********************************************************************
+ * AMD P-state INTERFACE *
+ *********************************************************************/
+/**
+ * struct amd_aperf_mperf
+ * @aperf: actual performance frequency clock count
+ * @mperf: maximum performance frequency clock count
+ * @tsc: time stamp counter
+ */
+struct amd_aperf_mperf {
+ u64 aperf;
+ u64 mperf;
+ u64 tsc;
+};
+
+/**
+ * struct amd_cpudata - private CPU data for AMD P-State
+ * @cpu: CPU number
+ * @req: constraint request to apply
+ * @cppc_req_cached: cached performance request hints
+ * @highest_perf: the maximum performance an individual processor may reach,
+ * assuming ideal conditions
+ * @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
+ * @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
+ * @lowest_nonlinear_freq: the frequency that mapped to lowest_nonlinear_perf
+ * @cur: Difference of Aperf/Mperf/tsc count between last and current sample
+ * @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
+ *
+ * The amd_cpudata is key private data for each CPU thread in AMD P-State, and
+ * represents all the attributes and goals that AMD P-State requests at runtime.
+ */
+struct amd_cpudata {
+ int cpu;
+
+ struct freq_qos_request req[2];
+ u64 cppc_req_cached;
+
+ u32 highest_perf;
+ u32 nominal_perf;
+ u32 lowest_nonlinear_perf;
+ u32 lowest_perf;
+
+ u32 max_freq;
+ u32 min_freq;
+ u32 nominal_freq;
+ u32 lowest_nonlinear_freq;
+
+ struct amd_aperf_mperf cur;
+ struct amd_aperf_mperf prev;
+
+ u64 freq;
+ bool boost_supported;
+};
+
+#endif /* _LINUX_AMD_PSTATE_H */
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [RESEND PATCH 2/4] cpufreq: amd-pstate: Add test module for amd-pstate driver
2022-08-17 3:46 [RESEND PATCH 0/4] Add unit test module for AMD P-State driver Meng Li
2022-08-17 3:46 ` [RESEND PATCH 1/4] cpufreq: amd-pstate: Expose struct amd_cpudata Meng Li
@ 2022-08-17 3:46 ` Meng Li
2022-08-26 21:47 ` Shuah Khan
2022-08-17 3:46 ` [RESEND PATCH 3/4] selftests: amd-pstate: Add test trigger " Meng Li
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Meng Li @ 2022-08-17 3:46 UTC (permalink / raw)
To: Shuah Khan, Huang Rui, linux-pm
Cc: Rafael J . Wysocki, Nathan Fontenot, Deepak Sharma, Alex Deucher,
Mario Limonciello, Jinzhou Su, Perry Yuan, Xiaojian Du,
Viresh Kumar, Borislav Petkov, linux-kernel, Meng Li
Add amd-pstate-ut test module, this module is used by kselftest
to unit test amd-pstate functionality. This module will be
expected by some of selftests to be present and loaded.
Signed-off-by: Meng Li <li.meng@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
---
drivers/cpufreq/Kconfig.x86 | 7 +
drivers/cpufreq/Makefile | 1 +
drivers/cpufreq/amd-pstate-ut.c | 293 ++++++++++++++++++++++++++++++++
3 files changed, 301 insertions(+)
create mode 100644 drivers/cpufreq/amd-pstate-ut.c
diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
index 55516043b656..fdd819069d72 100644
--- a/drivers/cpufreq/Kconfig.x86
+++ b/drivers/cpufreq/Kconfig.x86
@@ -51,6 +51,13 @@ config X86_AMD_PSTATE
If in doubt, say N.
+config X86_AMD_PSTATE_UT
+ tristate "selftest for AMD Processor P-State driver"
+ depends on X86 && ACPI_PROCESSOR
+ default n
+ help
+ This kernel module is used for testing. It's safe to say M here.
+
config X86_ACPI_CPUFREQ
tristate "ACPI Processor P-States driver"
depends on ACPI_PROCESSOR
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 285de70af877..49b98c62c5af 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -30,6 +30,7 @@ amd_pstate-y := amd-pstate.o amd-pstate-trace.o
obj-$(CONFIG_X86_ACPI_CPUFREQ) += acpi-cpufreq.o
obj-$(CONFIG_X86_AMD_PSTATE) += amd_pstate.o
+obj-$(CONFIG_X86_AMD_PSTATE_UT) += amd-pstate-ut.o
obj-$(CONFIG_X86_POWERNOW_K8) += powernow-k8.o
obj-$(CONFIG_X86_PCC_CPUFREQ) += pcc-cpufreq.o
obj-$(CONFIG_X86_POWERNOW_K6) += powernow-k6.o
diff --git a/drivers/cpufreq/amd-pstate-ut.c b/drivers/cpufreq/amd-pstate-ut.c
new file mode 100644
index 000000000000..3947b7138184
--- /dev/null
+++ b/drivers/cpufreq/amd-pstate-ut.c
@@ -0,0 +1,293 @@
+// SPDX-License-Identifier: GPL-1.0-or-later
+/*
+ * AMD Processor P-state Frequency Driver Unit Test
+ *
+ * Copyright (C) 2022 Advanced Micro Devices, Inc. All Rights Reserved.
+ *
+ * Author: Meng Li <li.meng@amd.com>
+ *
+ * The AMD P-State Unit Test is a test module for testing the amd-pstate
+ * driver. 1) It can help all users to verify their processor support
+ * (SBIOS/Firmware or Hardware). 2) Kernel can have a basic function
+ * test to avoid the kernel regression during the update. 3) We can
+ * introduce more functional or performance tests to align the result
+ * together, it will benefit power and performance scale optimization.
+ *
+ * This driver implements basic framework with plans to enhance it with
+ * additional test cases to improve the depth and coverage of the test.
+ *
+ * See Documentation/admin-guide/pm/amd-pstate.rst Unit Tests for
+ * amd-pstate to get more detail.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/fs.h>
+#include <linux/amd-pstate.h>
+
+#include <acpi/cppc_acpi.h>
+
+/*
+ * Abbreviations:
+ * amd_pstate_ut: used as a shortform for AMD P-State unit test.
+ * It helps to keep variable names smaller, simpler
+ */
+enum amd_pstate_ut_result {
+ AMD_PSTATE_UT_RESULT_PASS,
+ AMD_PSTATE_UT_RESULT_FAIL,
+};
+
+struct amd_pstate_ut_struct {
+ const char *name;
+ void (*func)(u32 index);
+ enum amd_pstate_ut_result result;
+};
+
+/*
+ * Kernel module for testing the AMD P-State unit test
+ */
+static void amd_pstate_ut_acpi_cpc_valid(u32 index);
+static void amd_pstate_ut_check_enabled(u32 index);
+static void amd_pstate_ut_check_perf(u32 index);
+static void amd_pstate_ut_check_freq(u32 index);
+
+static struct amd_pstate_ut_struct amd_pstate_ut_cases[] = {
+ {"amd_pstate_ut_acpi_cpc_valid", amd_pstate_ut_acpi_cpc_valid },
+ {"amd_pstate_ut_check_enabled", amd_pstate_ut_check_enabled },
+ {"amd_pstate_ut_check_perf", amd_pstate_ut_check_perf },
+ {"amd_pstate_ut_check_freq", amd_pstate_ut_check_freq }
+};
+
+static bool get_shared_mem(void)
+{
+ bool result = false;
+ char path[] = "/sys/module/amd_pstate/parameters/shared_mem";
+ char buf[5] = {0};
+ struct file *filp = NULL;
+ loff_t pos = 0;
+ ssize_t ret;
+
+ if (!boot_cpu_has(X86_FEATURE_CPPC)) {
+ filp = filp_open(path, FMODE_PREAD, 0);
+ if (IS_ERR(filp))
+ pr_err("%s unable to open %s file!\n", __func__, path);
+ else {
+ ret = kernel_read(filp, &buf, sizeof(buf), &pos);
+ if (ret < 0)
+ pr_err("%s read %s file fail ret=%ld!\n",
+ __func__, path, (long)ret);
+ filp_close(filp, NULL);
+ }
+
+ if ('Y' == *buf)
+ result = true;
+ }
+
+ return result;
+}
+
+/*
+ * check the _CPC object is present in SBIOS.
+ */
+static void amd_pstate_ut_acpi_cpc_valid(u32 index)
+{
+ if (acpi_cpc_valid())
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
+ else {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s the _CPC object is not present in SBIOS!\n", __func__);
+ }
+}
+
+static void amd_pstate_ut_pstate_enable(u32 index)
+{
+ int ret = 0;
+ u64 cppc_enable = 0;
+
+ ret = rdmsrl_safe(MSR_AMD_CPPC_ENABLE, &cppc_enable);
+ if (ret) {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s rdmsrl_safe MSR_AMD_CPPC_ENABLE ret=%d error!\n", __func__, ret);
+ return;
+ }
+ if (cppc_enable)
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
+ else {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s amd pstate must be enabled!\n", __func__);
+ }
+}
+
+/*
+ * check if amd pstate is enabled
+ */
+static void amd_pstate_ut_check_enabled(u32 index)
+{
+ if (get_shared_mem())
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
+ else
+ amd_pstate_ut_pstate_enable(index);
+}
+
+/*
+ * check if performance values are reasonable.
+ * highest_perf >= nominal_perf > lowest_nonlinear_perf > lowest_perf > 0
+ */
+static void amd_pstate_ut_check_perf(u32 index)
+{
+ int cpu = 0, ret = 0;
+ u32 highest_perf = 0, nominal_perf = 0, lowest_nonlinear_perf = 0, lowest_perf = 0;
+ u64 cap1 = 0;
+ struct cppc_perf_caps cppc_perf;
+ struct cpufreq_policy *policy = NULL;
+ struct amd_cpudata *cpudata = NULL;
+
+ highest_perf = amd_get_highest_perf();
+
+ for_each_possible_cpu(cpu) {
+ policy = cpufreq_cpu_get(cpu);
+ if (!policy)
+ break;
+ cpudata = policy->driver_data;
+
+ if (get_shared_mem()) {
+ ret = cppc_get_perf_caps(cpu, &cppc_perf);
+ if (ret) {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s cppc_get_perf_caps ret=%d error!\n", __func__, ret);
+ return;
+ }
+
+ nominal_perf = cppc_perf.nominal_perf;
+ lowest_nonlinear_perf = cppc_perf.lowest_nonlinear_perf;
+ lowest_perf = cppc_perf.lowest_perf;
+ } else {
+ ret = rdmsrl_safe_on_cpu(cpu, MSR_AMD_CPPC_CAP1, &cap1);
+ if (ret) {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s read CPPC_CAP1 ret=%d error!\n", __func__, ret);
+ return;
+ }
+
+ nominal_perf = AMD_CPPC_NOMINAL_PERF(cap1);
+ lowest_nonlinear_perf = AMD_CPPC_LOWNONLIN_PERF(cap1);
+ lowest_perf = AMD_CPPC_LOWEST_PERF(cap1);
+ }
+
+ if ((highest_perf != READ_ONCE(cpudata->highest_perf)) ||
+ (nominal_perf != READ_ONCE(cpudata->nominal_perf)) ||
+ (lowest_nonlinear_perf != READ_ONCE(cpudata->lowest_nonlinear_perf)) ||
+ (lowest_perf != READ_ONCE(cpudata->lowest_perf))) {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s cpu%d highest=%d %d nominal=%d %d lowest_nonlinear=%d %d lowest=%d %d, they should be equal!\n",
+ __func__, cpu, highest_perf, cpudata->highest_perf,
+ nominal_perf, cpudata->nominal_perf,
+ lowest_nonlinear_perf, cpudata->lowest_nonlinear_perf,
+ lowest_perf, cpudata->lowest_perf);
+ return;
+ }
+
+ if (!((highest_perf >= nominal_perf) &&
+ (nominal_perf > lowest_nonlinear_perf) &&
+ (lowest_nonlinear_perf > lowest_perf) &&
+ (lowest_perf > 0))) {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s cpu%d highest=%d >= nominal=%d > lowest_nonlinear=%d > lowest=%d > 0, the formula is incorrect!\n",
+ __func__, cpu, highest_perf, nominal_perf,
+ lowest_nonlinear_perf, lowest_perf);
+ return;
+ }
+ }
+
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
+}
+
+/*
+ * Check if frequency values are reasonable.
+ * max_freq >= nominal_freq > lowest_nonlinear_freq > min_freq > 0
+ * check max freq when set support boost mode.
+ */
+static void amd_pstate_ut_check_freq(u32 index)
+{
+ int cpu = 0;
+ struct cpufreq_policy *policy = NULL;
+ struct amd_cpudata *cpudata = NULL;
+
+ for_each_possible_cpu(cpu) {
+ policy = cpufreq_cpu_get(cpu);
+ if (!policy)
+ break;
+ cpudata = policy->driver_data;
+
+ if (!((cpudata->max_freq >= cpudata->nominal_freq) &&
+ (cpudata->nominal_freq > cpudata->lowest_nonlinear_freq) &&
+ (cpudata->lowest_nonlinear_freq > cpudata->min_freq) &&
+ (cpudata->min_freq > 0))) {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s cpu%d max=%d >= nominal=%d > lowest_nonlinear=%d > min=%d > 0, the formula is incorrect!\n",
+ __func__, cpu, cpudata->max_freq, cpudata->nominal_freq,
+ cpudata->lowest_nonlinear_freq, cpudata->min_freq);
+ return;
+ }
+
+ if (cpudata->min_freq != policy->min) {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s cpu%d cpudata_min_freq=%d policy_min=%d, they should be equal!\n",
+ __func__, cpu, cpudata->min_freq, policy->min);
+ return;
+ }
+
+ if (cpudata->boost_supported) {
+ if ((policy->max == cpudata->max_freq) ||
+ (policy->max == cpudata->nominal_freq))
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
+ else {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s cpu%d policy_max=%d should be equal cpu_max=%d or cpu_nominal=%d !\n",
+ __func__, cpu, policy->max, cpudata->max_freq,
+ cpudata->nominal_freq);
+ return;
+ }
+ } else {
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_FAIL;
+ pr_err("%s cpu%d must support boost!\n", __func__, cpu);
+ return;
+ }
+ }
+
+ amd_pstate_ut_cases[index].result = AMD_PSTATE_UT_RESULT_PASS;
+}
+
+static int __init amd_pstate_ut_init(void)
+{
+ u32 i = 0, arr_size = ARRAY_SIZE(amd_pstate_ut_cases);
+
+ for (i = 0; i < arr_size; i++) {
+ amd_pstate_ut_cases[i].func(i);
+ switch (amd_pstate_ut_cases[i].result) {
+ case AMD_PSTATE_UT_RESULT_PASS:
+ pr_info("%-4d %-20s\t success!\n", i+1, amd_pstate_ut_cases[i].name);
+ break;
+ case AMD_PSTATE_UT_RESULT_FAIL:
+ default:
+ pr_info("%-4d %-20s\t fail!\n", i+1, amd_pstate_ut_cases[i].name);
+ break;
+ }
+ }
+
+ return 0;
+}
+
+static void __exit amd_pstate_ut_exit(void)
+{
+}
+
+module_init(amd_pstate_ut_init);
+module_exit(amd_pstate_ut_exit);
+
+MODULE_AUTHOR("Meng Li <li.meng@amd.com>");
+MODULE_DESCRIPTION("AMD P-state driver Test module");
+MODULE_LICENSE("GPL");
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [RESEND PATCH 2/4] cpufreq: amd-pstate: Add test module for amd-pstate driver
2022-08-17 3:46 ` [RESEND PATCH 2/4] cpufreq: amd-pstate: Add test module for amd-pstate driver Meng Li
@ 2022-08-26 21:47 ` Shuah Khan
2022-08-26 22:36 ` Shuah Khan
0 siblings, 1 reply; 10+ messages in thread
From: Shuah Khan @ 2022-08-26 21:47 UTC (permalink / raw)
To: Meng Li, Huang Rui, linux-pm
Cc: Rafael J . Wysocki, Nathan Fontenot, Deepak Sharma, Alex Deucher,
Mario Limonciello, Jinzhou Su, Perry Yuan, Xiaojian Du,
Viresh Kumar, Borislav Petkov, linux-kernel, Shuah Khan
On 8/16/22 9:46 PM, Meng Li wrote:
> Add amd-pstate-ut test module, this module is used by kselftest
> to unit test amd-pstate functionality. This module will be
> expected by some of selftests to be present and loaded.
>
> Signed-off-by: Meng Li <li.meng@amd.com>
> Acked-by: Huang Rui <ray.huang@amd.com>
> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
> ---
> drivers/cpufreq/Kconfig.x86 | 7 +
> drivers/cpufreq/Makefile | 1 +
> drivers/cpufreq/amd-pstate-ut.c | 293 ++++++++++++++++++++++++++++++++
> 3 files changed, 301 insertions(+)
> create mode 100644 drivers/cpufreq/amd-pstate-ut.c
>
> diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
> index 55516043b656..fdd819069d72 100644
> --- a/drivers/cpufreq/Kconfig.x86
> +++ b/drivers/cpufreq/Kconfig.x86
> @@ -51,6 +51,13 @@ config X86_AMD_PSTATE
>
> If in doubt, say N.
>
> +config X86_AMD_PSTATE_UT
> + tristate "selftest for AMD Processor P-State driver"
> + depends on X86 && ACPI_PROCESSOR
> + default n
> + help
> + This kernel module is used for testing. It's safe to say M here.
> +
Shouldn't this X86_AMD_PSTATE_UT depend on X86_AMD_PSTATE?
I am running a few tests and when I have X86_AMD_PSTATE_UT
enabled as built-in and X86_AMD_PSTATE is disabled, test
fails saying incorrect cpufreq driver?
Skipped: Test can only run on amd-pstate driver.
So it sounds like X86_AMD_PSTATE_UT depends on X86_AMD_PSTATE.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RESEND PATCH 2/4] cpufreq: amd-pstate: Add test module for amd-pstate driver
2022-08-26 21:47 ` Shuah Khan
@ 2022-08-26 22:36 ` Shuah Khan
2022-08-29 0:09 ` Huang Rui
0 siblings, 1 reply; 10+ messages in thread
From: Shuah Khan @ 2022-08-26 22:36 UTC (permalink / raw)
To: Meng Li, Huang Rui, linux-pm
Cc: Rafael J . Wysocki, Nathan Fontenot, Deepak Sharma, Alex Deucher,
Mario Limonciello, Jinzhou Su, Perry Yuan, Xiaojian Du,
Viresh Kumar, Borislav Petkov, linux-kernel, Shuah Khan
On 8/26/22 3:47 PM, Shuah Khan wrote:
> On 8/16/22 9:46 PM, Meng Li wrote:
>> Add amd-pstate-ut test module, this module is used by kselftest
>> to unit test amd-pstate functionality. This module will be
>> expected by some of selftests to be present and loaded.
>>
>> Signed-off-by: Meng Li <li.meng@amd.com>
>> Acked-by: Huang Rui <ray.huang@amd.com>
>> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
>> ---
>> drivers/cpufreq/Kconfig.x86 | 7 +
>> drivers/cpufreq/Makefile | 1 +
>> drivers/cpufreq/amd-pstate-ut.c | 293 ++++++++++++++++++++++++++++++++
>> 3 files changed, 301 insertions(+)
>> create mode 100644 drivers/cpufreq/amd-pstate-ut.c
>>
>> diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
>> index 55516043b656..fdd819069d72 100644
>> --- a/drivers/cpufreq/Kconfig.x86
>> +++ b/drivers/cpufreq/Kconfig.x86
>> @@ -51,6 +51,13 @@ config X86_AMD_PSTATE
>> If in doubt, say N.
>> +config X86_AMD_PSTATE_UT
>> + tristate "selftest for AMD Processor P-State driver"
>> + depends on X86 && ACPI_PROCESSOR
This has to specify dependency on X86_AMD_PSTATE
>> + default n
>> + help
>> + This kernel module is used for testing. It's safe to say M here.
>> +
>
> Shouldn't this X86_AMD_PSTATE_UT depend on X86_AMD_PSTATE?
> I am running a few tests and when I have X86_AMD_PSTATE_UT
> enabled as built-in and X86_AMD_PSTATE is disabled, test
> fails saying incorrect cpufreq driver?
>
> Skipped: Test can only run on amd-pstate driver.
>
> So it sounds like X86_AMD_PSTATE_UT depends on X86_AMD_PSTATE.
>
Once I enabled X86_AMD_PSTATE and X86_AMD_PSTATE_UT=m, the test
ran correctly.
Please fix the dependencies and send me a new version. Send all
the patches so it is easier to apply them all at once.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RESEND PATCH 2/4] cpufreq: amd-pstate: Add test module for amd-pstate driver
2022-08-26 22:36 ` Shuah Khan
@ 2022-08-29 0:09 ` Huang Rui
2022-08-29 22:40 ` Shuah Khan
0 siblings, 1 reply; 10+ messages in thread
From: Huang Rui @ 2022-08-29 0:09 UTC (permalink / raw)
To: Shuah Khan
Cc: Meng, Li (Jassmine), linux-pm@vger.kernel.org, Rafael J . Wysocki,
Fontenot, Nathan, Sharma, Deepak, Deucher, Alexander,
Limonciello, Mario, Su, Jinzhou (Joe), Yuan, Perry, Du, Xiaojian,
Viresh Kumar, Borislav Petkov, linux-kernel@vger.kernel.org
On Sat, Aug 27, 2022 at 06:36:30AM +0800, Shuah Khan wrote:
> On 8/26/22 3:47 PM, Shuah Khan wrote:
> > On 8/16/22 9:46 PM, Meng Li wrote:
> >> Add amd-pstate-ut test module, this module is used by kselftest
> >> to unit test amd-pstate functionality. This module will be
> >> expected by some of selftests to be present and loaded.
> >>
> >> Signed-off-by: Meng Li <li.meng@amd.com>
> >> Acked-by: Huang Rui <ray.huang@amd.com>
> >> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
> >> ---
> >> drivers/cpufreq/Kconfig.x86 | 7 +
> >> drivers/cpufreq/Makefile | 1 +
> >> drivers/cpufreq/amd-pstate-ut.c | 293 ++++++++++++++++++++++++++++++++
> >> 3 files changed, 301 insertions(+)
> >> create mode 100644 drivers/cpufreq/amd-pstate-ut.c
> >>
> >> diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
> >> index 55516043b656..fdd819069d72 100644
> >> --- a/drivers/cpufreq/Kconfig.x86
> >> +++ b/drivers/cpufreq/Kconfig.x86
> >> @@ -51,6 +51,13 @@ config X86_AMD_PSTATE
> >> If in doubt, say N.
> >> +config X86_AMD_PSTATE_UT
> >> + tristate "selftest for AMD Processor P-State driver"
> >> + depends on X86 && ACPI_PROCESSOR
>
> This has to specify dependency on X86_AMD_PSTATE
>
> >> + default n
> >> + help
> >> + This kernel module is used for testing. It's safe to say M here.
> >> +
> >
> > Shouldn't this X86_AMD_PSTATE_UT depend on X86_AMD_PSTATE?
> > I am running a few tests and when I have X86_AMD_PSTATE_UT
> > enabled as built-in and X86_AMD_PSTATE is disabled, test
> > fails saying incorrect cpufreq driver?
> >
> > Skipped: Test can only run on amd-pstate driver.
> >
> > So it sounds like X86_AMD_PSTATE_UT depends on X86_AMD_PSTATE.
> >
>
> Once I enabled X86_AMD_PSTATE and X86_AMD_PSTATE_UT=m, the test
> ran correctly.
>
> Please fix the dependencies and send me a new version. Send all
> the patches so it is easier to apply them all at once.
>
Hi Shuah,
Thanks to accept the patch series. Actually, we want amd-pstate-ut can be
modprobed even without amd-pstate module, because it can tell the users
they loaded a wrong module like "acpi-cpufreq" and needs to replace it with
amd-pstate. :-)
Thanks,
Ray
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [RESEND PATCH 2/4] cpufreq: amd-pstate: Add test module for amd-pstate driver
2022-08-29 0:09 ` Huang Rui
@ 2022-08-29 22:40 ` Shuah Khan
0 siblings, 0 replies; 10+ messages in thread
From: Shuah Khan @ 2022-08-29 22:40 UTC (permalink / raw)
To: Huang Rui
Cc: Meng, Li (Jassmine), linux-pm@vger.kernel.org, Rafael J . Wysocki,
Fontenot, Nathan, Sharma, Deepak, Deucher, Alexander,
Limonciello, Mario, Su, Jinzhou (Joe), Yuan, Perry, Du, Xiaojian,
Viresh Kumar, Borislav Petkov, linux-kernel@vger.kernel.org,
Shuah Khan
On 8/28/22 18:09, Huang Rui wrote:
> On Sat, Aug 27, 2022 at 06:36:30AM +0800, Shuah Khan wrote:
>> On 8/26/22 3:47 PM, Shuah Khan wrote:
>>> On 8/16/22 9:46 PM, Meng Li wrote:
>>>> Add amd-pstate-ut test module, this module is used by kselftest
>>>> to unit test amd-pstate functionality. This module will be
>>>> expected by some of selftests to be present and loaded.
>>>>
>>>> Signed-off-by: Meng Li <li.meng@amd.com>
>>>> Acked-by: Huang Rui <ray.huang@amd.com>
>>>> Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
>>>> ---
>>>> drivers/cpufreq/Kconfig.x86 | 7 +
>>>> drivers/cpufreq/Makefile | 1 +
>>>> drivers/cpufreq/amd-pstate-ut.c | 293 ++++++++++++++++++++++++++++++++
>>>> 3 files changed, 301 insertions(+)
>>>> create mode 100644 drivers/cpufreq/amd-pstate-ut.c
>>>>
>>>> diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
>>>> index 55516043b656..fdd819069d72 100644
>>>> --- a/drivers/cpufreq/Kconfig.x86
>>>> +++ b/drivers/cpufreq/Kconfig.x86
>>>> @@ -51,6 +51,13 @@ config X86_AMD_PSTATE
>>>> If in doubt, say N.
>>>> +config X86_AMD_PSTATE_UT
>>>> + tristate "selftest for AMD Processor P-State driver"
>>>> + depends on X86 && ACPI_PROCESSOR
>>
>> This has to specify dependency on X86_AMD_PSTATE
>>
>>>> + default n
>>>> + help
>>>> + This kernel module is used for testing. It's safe to say M here.
>>>> +
>>>
>>> Shouldn't this X86_AMD_PSTATE_UT depend on X86_AMD_PSTATE?
>>> I am running a few tests and when I have X86_AMD_PSTATE_UT
>>> enabled as built-in and X86_AMD_PSTATE is disabled, test
>>> fails saying incorrect cpufreq driver?
>>>
>>> Skipped: Test can only run on amd-pstate driver.
>>>
>>> So it sounds like X86_AMD_PSTATE_UT depends on X86_AMD_PSTATE.
>>>
>>
>> Once I enabled X86_AMD_PSTATE and X86_AMD_PSTATE_UT=m, the test
>> ran correctly.
>>
>> Please fix the dependencies and send me a new version. Send all
>> the patches so it is easier to apply them all at once.
>>
>
> Hi Shuah,
>
> Thanks to accept the patch series. Actually, we want amd-pstate-ut can be
> modprobed even without amd-pstate module, because it can tell the users
> they loaded a wrong module like "acpi-cpufreq" and needs to replace it with
> amd-pstate. :-)
>
I see. The message could be expanded to let the user know which
config option needs to be enabled to run the test.
You can send this change as a separate patch. I will apply this series
as is.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 10+ messages in thread
* [RESEND PATCH 3/4] selftests: amd-pstate: Add test trigger for amd-pstate driver
2022-08-17 3:46 [RESEND PATCH 0/4] Add unit test module for AMD P-State driver Meng Li
2022-08-17 3:46 ` [RESEND PATCH 1/4] cpufreq: amd-pstate: Expose struct amd_cpudata Meng Li
2022-08-17 3:46 ` [RESEND PATCH 2/4] cpufreq: amd-pstate: Add test module for amd-pstate driver Meng Li
@ 2022-08-17 3:46 ` Meng Li
2022-08-17 3:46 ` [RESEND PATCH 4/4] Documentation: amd-pstate: Add unit test introduction Meng Li
2022-08-24 21:58 ` [RESEND PATCH 0/4] Add unit test module for AMD P-State driver Shuah Khan
4 siblings, 0 replies; 10+ messages in thread
From: Meng Li @ 2022-08-17 3:46 UTC (permalink / raw)
To: Shuah Khan, Huang Rui, linux-pm
Cc: Rafael J . Wysocki, Nathan Fontenot, Deepak Sharma, Alex Deucher,
Mario Limonciello, Jinzhou Su, Perry Yuan, Xiaojian Du,
Viresh Kumar, Borislav Petkov, linux-kernel, Meng Li
Add amd-pstate test trigger in kselftest, it will load/unload
amd-pstate-ut module to test some cases etc.
Signed-off-by: Meng Li <li.meng@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
---
tools/testing/selftests/Makefile | 1 +
tools/testing/selftests/amd-pstate/Makefile | 9 +++
.../selftests/amd-pstate/amd-pstate-ut.sh | 55 +++++++++++++++++++
tools/testing/selftests/amd-pstate/config | 1 +
4 files changed, 66 insertions(+)
create mode 100644 tools/testing/selftests/amd-pstate/Makefile
create mode 100755 tools/testing/selftests/amd-pstate/amd-pstate-ut.sh
create mode 100644 tools/testing/selftests/amd-pstate/config
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index 10b34bb03bc1..02b4f3477eae 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -1,5 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
TARGETS += alsa
+TARGETS += amd-pstate
TARGETS += arm64
TARGETS += bpf
TARGETS += breakpoints
diff --git a/tools/testing/selftests/amd-pstate/Makefile b/tools/testing/selftests/amd-pstate/Makefile
new file mode 100644
index 000000000000..199867f44b32
--- /dev/null
+++ b/tools/testing/selftests/amd-pstate/Makefile
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Makefile for amd-pstate/ function selftests
+
+# No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
+all:
+
+TEST_PROGS := amd-pstate-ut.sh
+
+include ../lib.mk
diff --git a/tools/testing/selftests/amd-pstate/amd-pstate-ut.sh b/tools/testing/selftests/amd-pstate/amd-pstate-ut.sh
new file mode 100755
index 000000000000..273364650285
--- /dev/null
+++ b/tools/testing/selftests/amd-pstate/amd-pstate-ut.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+# amd-pstate-ut is a test module for testing the amd-pstate driver.
+# It can only run on x86 architectures and current cpufreq driver
+# must be amd-pstate.
+# (1) It can help all users to verify their processor support
+# (SBIOS/Firmware or Hardware).
+# (2) Kernel can have a basic function test to avoid the kernel
+# regression during the update.
+# (3) We can introduce more functional or performance tests to align
+# the result together, it will benefit power and performance scale optimization.
+
+# Kselftest framework requirement - SKIP code is 4.
+ksft_skip=4
+
+# amd-pstate-ut only run on x86/x86_64 AMD systems.
+ARCH=$(uname -m 2>/dev/null | sed -e 's/i.86/x86/' -e 's/x86_64/x86/')
+VENDOR=$(cat /proc/cpuinfo | grep -m 1 'vendor_id' | awk '{print $NF}')
+
+if ! echo "$ARCH" | grep -q x86; then
+ echo "$0 # Skipped: Test can only run on x86 architectures."
+ exit $ksft_skip
+fi
+
+if ! echo "$VENDOR" | grep -iq amd; then
+ echo "$0 # Skipped: Test can only run on AMD CPU."
+ echo "$0 # Current cpu vendor is $VENDOR."
+ exit $ksft_skip
+fi
+
+scaling_driver=$(cat /sys/devices/system/cpu/cpufreq/policy0/scaling_driver)
+if [ "$scaling_driver" != "amd-pstate" ]; then
+ echo "$0 # Skipped: Test can only run on amd-pstate driver."
+ echo "$0 # Current cpufreq scaling drvier is $scaling_driver."
+ exit $ksft_skip
+fi
+
+msg="Skip all tests:"
+if [ ! -w /dev ]; then
+ echo $msg please run this as root >&2
+ exit $ksft_skip
+fi
+
+if ! /sbin/modprobe -q -n amd-pstate-ut; then
+ echo "amd-pstate-ut: module amd-pstate-ut is not found [SKIP]"
+ exit $ksft_skip
+fi
+if /sbin/modprobe -q amd-pstate-ut; then
+ /sbin/modprobe -q -r amd-pstate-ut
+ echo "amd-pstate-ut: ok"
+else
+ echo "amd-pstate-ut: [FAIL]"
+ exit 1
+fi
diff --git a/tools/testing/selftests/amd-pstate/config b/tools/testing/selftests/amd-pstate/config
new file mode 100644
index 000000000000..f43103c9adc4
--- /dev/null
+++ b/tools/testing/selftests/amd-pstate/config
@@ -0,0 +1 @@
+CONFIG_X86_AMD_PSTATE_UT=m
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [RESEND PATCH 4/4] Documentation: amd-pstate: Add unit test introduction
2022-08-17 3:46 [RESEND PATCH 0/4] Add unit test module for AMD P-State driver Meng Li
` (2 preceding siblings ...)
2022-08-17 3:46 ` [RESEND PATCH 3/4] selftests: amd-pstate: Add test trigger " Meng Li
@ 2022-08-17 3:46 ` Meng Li
2022-08-24 21:58 ` [RESEND PATCH 0/4] Add unit test module for AMD P-State driver Shuah Khan
4 siblings, 0 replies; 10+ messages in thread
From: Meng Li @ 2022-08-17 3:46 UTC (permalink / raw)
To: Shuah Khan, Huang Rui, linux-pm
Cc: Rafael J . Wysocki, Nathan Fontenot, Deepak Sharma, Alex Deucher,
Mario Limonciello, Jinzhou Su, Perry Yuan, Xiaojian Du,
Viresh Kumar, Borislav Petkov, linux-kernel, Meng Li
Introduce the AMD P-State unit test module design and implementation.
It also talks about kselftest and how to use.
Signed-off-by: Meng Li <li.meng@amd.com>
Acked-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
---
Documentation/admin-guide/pm/amd-pstate.rst | 76 +++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/Documentation/admin-guide/pm/amd-pstate.rst b/Documentation/admin-guide/pm/amd-pstate.rst
index 83b58eb4ab4d..8f3d30c5a0d8 100644
--- a/Documentation/admin-guide/pm/amd-pstate.rst
+++ b/Documentation/admin-guide/pm/amd-pstate.rst
@@ -182,6 +182,7 @@ to the ``struct sugov_cpu`` that the utilization update belongs to.
Then, ``amd-pstate`` updates the desired performance according to the CPU
scheduler assigned.
+.. _processor_support:
Processor Support
=======================
@@ -282,6 +283,8 @@ efficiency frequency management method on AMD processors.
Kernel Module Options for ``amd-pstate``
=========================================
+.. _shared_mem:
+
``shared_mem``
Use a module param (shared_mem) to enable related processors manually with
**amd_pstate.shared_mem=1**.
@@ -393,6 +396,76 @@ about part of the output. ::
CPU_005 712 116384 39 49 166 0.7565 9645075 2214891 38431470 25.1 11.646 469 2.496 kworker/5:0-40
CPU_006 712 116408 39 49 166 0.6769 8950227 1839034 37192089 24.06 11.272 470 2.496 kworker/6:0-1264
+Unit Tests for amd-pstate
+-------------------------
+
+``amd-pstate-ut`` is a test module for testing the ``amd-pstate`` driver.
+
+ * It can help all users to verify their processor support (SBIOS/Firmware or Hardware).
+
+ * Kernel can have a basic function test to avoid the kernel regression during the update.
+
+ * We can introduce more functional or performance tests to align the result together, it will benefit power and performance scale optimization.
+
+1. Test case decriptions
+
+ +---------+--------------------------------+------------------------------------------------------------------------------------+
+ | Index | Functions | Description |
+ +=========+================================+====================================================================================+
+ | 0 | amd_pstate_ut_acpi_cpc_valid || Check whether the _CPC object is present in SBIOS. |
+ | | || |
+ | | || The detail refer to `Processor Support <processor_support_>`_. |
+ +---------+--------------------------------+------------------------------------------------------------------------------------+
+ | 1 | amd_pstate_ut_check_enabled || Check whether AMD P-State is enabled. |
+ | | || |
+ | | || AMD P-States and ACPI hardware P-States always can be supported in one processor. |
+ | | | But AMD P-States has the higher priority and if it is enabled with |
+ | | | :c:macro:`MSR_AMD_CPPC_ENABLE` or ``cppc_set_enable``, it will respond to the |
+ | | | request from AMD P-States. |
+ +---------+--------------------------------+------------------------------------------------------------------------------------+
+ | 2 | amd_pstate_ut_check_perf || Check if the each performance values are reasonable. |
+ | | || highest_perf >= nominal_perf > lowest_nonlinear_perf > lowest_perf > 0. |
+ +---------+--------------------------------+------------------------------------------------------------------------------------+
+ | 3 | amd_pstate_ut_check_freq || Check if the each frequency values and max freq when set support boost mode |
+ | | | are reasonable. |
+ | | || max_freq >= nominal_freq > lowest_nonlinear_freq > min_freq > 0 |
+ | | || If boost is not active but supported, this maximum frequency will be larger than |
+ | | | the one in ``cpuinfo``. |
+ +---------+--------------------------------+------------------------------------------------------------------------------------+
+
+#. How to execute the tests
+
+ We use test module in the kselftest frameworks to implement it.
+ We create amd-pstate-ut module and tie it into kselftest.(for
+ details refer to Linux Kernel Selftests [4]_).
+
+ 1. Build
+
+ + open the :c:macro:`CONFIG_X86_AMD_PSTATE` configuration option.
+ + set the :c:macro:`CONFIG_X86_AMD_PSTATE_UT` configuration option to M.
+ + make project
+ + make selftest ::
+
+ $ cd linux
+ $ make -C tools/testing/selftests
+
+ #. Installation & Steps ::
+
+ $ make -C tools/testing/selftests install INSTALL_PATH=~/kselftest
+ $ sudo ./kselftest/run_kselftest.sh -c amd-pstate
+ TAP version 13
+ 1..1
+ # selftests: amd-pstate: amd-pstate-ut.sh
+ # amd-pstate-ut: ok
+ ok 1 selftests: amd-pstate: amd-pstate-ut.sh
+
+ #. Results ::
+
+ $ dmesg | grep "amd_pstate_ut" | tee log.txt
+ [12977.570663] amd_pstate_ut: 1 amd_pstate_ut_acpi_cpc_valid success!
+ [12977.570673] amd_pstate_ut: 2 amd_pstate_ut_check_enabled success!
+ [12977.571207] amd_pstate_ut: 3 amd_pstate_ut_check_perf success!
+ [12977.571212] amd_pstate_ut: 4 amd_pstate_ut_check_freq success!
Reference
===========
@@ -405,3 +478,6 @@ Reference
.. [3] Processor Programming Reference (PPR) for AMD Family 19h Model 51h, Revision A1 Processors
https://www.amd.com/system/files/TechDocs/56569-A1-PUB.zip
+
+.. [4] Linux Kernel Selftests,
+ https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
--
2.25.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [RESEND PATCH 0/4] Add unit test module for AMD P-State driver
2022-08-17 3:46 [RESEND PATCH 0/4] Add unit test module for AMD P-State driver Meng Li
` (3 preceding siblings ...)
2022-08-17 3:46 ` [RESEND PATCH 4/4] Documentation: amd-pstate: Add unit test introduction Meng Li
@ 2022-08-24 21:58 ` Shuah Khan
4 siblings, 0 replies; 10+ messages in thread
From: Shuah Khan @ 2022-08-24 21:58 UTC (permalink / raw)
To: Meng Li, Huang Rui, linux-pm, Rafael J . Wysocki, Viresh Kumar
Cc: Nathan Fontenot, Deepak Sharma, Alex Deucher, Mario Limonciello,
Jinzhou Su, Perry Yuan, Xiaojian Du, Borislav Petkov,
linux-kernel, Shuah Khan
On 8/16/22 9:46 PM, Meng Li wrote:
> Hi all:
>
> According to shuah's review comments, update the patches based on
> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git/log/?h=next
>
> AMD P-State unit test(amd-pstate-ut) is a kernel module for testing the
> functions of amd-pstate driver.
> It could import as a module to launch some test tasks.
> 1) It can help all users to verify their processor support (SBIOS/
> Firmware or Hardware).
> 2) Kernel can have a basic function test to avoid the kernel regression
> during the update.
> 3) We can introduce more functional or performance tests to align the
> together, it will benefit power and performance scale optimization.
>
> We upstream out AMD P-state driver into Linux kernel and use this unit
> test module to verify the required conditions and basic functions of
> amd-pstate before integration test.
>
> We use test module in the kselftest frameworks to implement it.
> We create amd-pstate-ut module and tie it into kselftest.
>
> For example: The test case aput_acpi_cpc is used to check whether the
> _CPC object is exist in SBIOS.
> The amd-pstate initialization will fail if the _CPC in ACPI SBIOS is not
> existed at the detected processor, so it is a necessary condition.
>
> At present, it only implements the basic framework and some simple test
> cases.
>
> TODO : 1) we will add more test cases to improve the depth and coverage
> of the test. E.X. use the script to trigger the tbench, gitsource,
> kernbench, netperf, speedometer, and etc. testing and monitor the cpu
> frequency and performance goals change, power consumption at runtime.
>
> Please check the documentation amd-pstate.rst for details of the test
> steps.
>
> See patch series in below git repo:
> V1: https://lore.kernel.org/linux-pm/20220323071502.2674156-1-li.meng@amd.com/
> V2: https://lore.kernel.org/lkml/20220413090510.4039589-1-li.meng@amd.com/
> V3: https://lore.kernel.org/lkml/20220421074152.599419-1-li.meng@amd.com/
> V4: https://lore.kernel.org/lkml/20220427135315.3447550-1-li.meng@amd.com/
> V5: https://lore.kernel.org/lkml/20220505022913.329259-1-li.meng@amd.com/
> V6: https://lore.kernel.org/lkml/20220519134737.359290-1-li.meng@amd.com/
> V7: https://lore.kernel.org/lkml/20220522115423.1147282-1-li.meng@amd.com/
>
> Changes from V1 -> V2:
> - cpufreq: amd-pstate:
> - - add a trailing of amd-pstate.h to MAINTAINER AMD PSTATE DRIVER.
> - selftests: cpufreq:
> - - add a wrapper shell script for the amd_pstate_testmod module.
> - selftests: cpufreq:
> - - remove amd_pstate_testmod kernel module to
> .../cpufreq/amd_pstate_testmod.
> - Documentation: amd-pstate:
> - - amd_pstate_testmod rst document is not provided at present.
>
> Changes from V2 -> V3:
> - cpufreq: amd-pstate:
> - - adjust the order of add amd-pstate.h in MAINTAINERS.
> - selftests: cpufreq:
> - - remove the call of amd_pstate_testmod.sh from cpufreq Makefile to
> main.sh.
> - selftests: cpufreq:
> - - add explain the goal or intention of the AMD P-State Unit Test
> module.
> - - modify comments.
> - - use the checkpatch.pl to check my patches.
> - - add conditions judgment before formal test.
> - - delete some unnecessary test cases.
> - - modify test cases about perf and performance etc.
>
> Changes from V3 -> V4:
> - selftests: amd-pstate:
> - - remove script and test module to tools/testing/selftests/amd-pstate/
> - - uniformly named amd-pstate-ut.
> - - check current architectures and cpufreq driver in amd-pstate-ut.sh
> - - delete codes about conditions in amd-pstate-ut.c
> - Documentation: amd-pstate:
> - - add introduce document about amd-pstate unit test.
>
> Changes from V4 -> V5:
> - selftests: amd-pstate:
> - - add print the current scaling_driver.
> - - add amd-pstate-ut.ko into TEST_GEN_FILES.
> - - move "insmod/rmmod amd-pstate-ut.ko" stuff into script
> amd_pstate_ut.sh
> - - add a check of read back from X86_FEATURE_CPPC in get_shared_mem().
> - Documentation: amd-pstate:
> - - delete the test step about insmod/rmmod amd-pstate-ut.ko
>
> Changes from V5 -> V6:
> - cpufreq: amd-pstate:
> - - add amd-pstate-ut test codes to drivers/cpurfreq
> - - add the macro CONFIG_X86_AMD_PSTATE_UT
> - selftests: amd-pstate:
> - - delete amd-pstate-ut test codes from
> tools/testing/selftests/amd-pstate/
>
> Changes from V6 -> V7:
> - cpufreq: amd-pstate:
> - - modify X86_AMD_PSTATE_UT dependencies and default value.
> - - modify a brief description of the amd-pstate-ut module.
> - - remove kselftest_module.h header include.
> - - modify shortform for AMD P-State unit test.
> - - add prefix for the names of test cases.
> - - in the file operation log, add the file path.
> - - add comments about the test cases.
> - - correct syntax errors.
> - selftests: amd-pstate:
> - - delete TEST_GEN_FILES$(TEST_GEN_FILES): $(HEADERS) form amd-pstate
> Makefile.
> - - simplify the judgment about ARCH.
> - - add the judgment about cpu vendor.
> - - modify the method about load the amd-pstate-ut module.
> - Documentation: amd-pstate:
> - - update the name of the test function.
> - - update kernel log about test result.
>
> Changes from V7 -> V8:
> - cpufreq: amd-pstate:
> - - amend commit message.
> - - amend module description.
> - Documentation: amd-pstate:
> - - amend commit message.
> - - Remove the personal data.
>
> Thanks,
> Jasmine
>
> Meng Li (4):
> cpufreq: amd-pstate: Expose struct amd_cpudata
> cpufreq: amd-pstate: Add test module for amd-pstate driver
> selftests: amd-pstate: Add test trigger for amd-pstate driver
> Documentation: amd-pstate: Add unit test introduction
>
> Documentation/admin-guide/pm/amd-pstate.rst | 76 +++++
> MAINTAINERS | 1 +
> drivers/cpufreq/Kconfig.x86 | 7 +
> drivers/cpufreq/Makefile | 1 +
> drivers/cpufreq/amd-pstate-ut.c | 293 ++++++++++++++++++
> drivers/cpufreq/amd-pstate.c | 60 +---
> include/linux/amd-pstate.h | 77 +++++
> tools/testing/selftests/Makefile | 1 +
> tools/testing/selftests/amd-pstate/Makefile | 9 +
> .../selftests/amd-pstate/amd-pstate-ut.sh | 55 ++++
> tools/testing/selftests/amd-pstate/config | 1 +
> 11 files changed, 522 insertions(+), 59 deletions(-)
> create mode 100644 drivers/cpufreq/amd-pstate-ut.c
> create mode 100644 include/linux/amd-pstate.h
> create mode 100644 tools/testing/selftests/amd-pstate/Makefile
> create mode 100755 tools/testing/selftests/amd-pstate/amd-pstate-ut.sh
> create mode 100644 tools/testing/selftests/amd-pstate/config
>
Rafael, Viresh,
I plan to apply these patches to linux-kselftest next for Linux 6.1
Please let me know if you have any objections.
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 10+ messages in thread