[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v3 03/15] xen/cpufreq: refactor cmdline "cpufreq=xxx"


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Penny Zheng <Penny.Zheng@xxxxxxx>
  • Date: Thu, 6 Mar 2025 16:39:37 +0800
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7vUJg5LMMwbE6dMplBw9JQaR2FVtiWTtgPAfxAZ/n6U=; b=zDa7V0qbyz5WzVEGTBO/WjJwiQU9oTZMsf6FmFhU7sSOMhZDOzN2+Q/g5Rjhbus5vFBLb9eBLgH+Sl3SY2Vc0w/jwC+5v8UquBcYmVEjmSZ8Te5LfdCb7ya1M/UyAVTHpno/n7TeuKxLOv/SqwqHp7zRHVSBkYLpKBFwKF4imEued1EOyw368YOKc6v483OWN+TerWVSuWy/2T94ELBtKmdu/qxKB9OpeajZJC8dTe5pakNfCcE+eWm/gI1XdUGiNHfhF/TDBogOV8yfW9mC3bRIB/sVRugV+IevPHtR+NBy3WXqXPCnL5hZ4QlY7jm0DK+cB25lZxEN4bVhRe0Fkw==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FZofWO5foWIK3EclMoDdCwM7Uox5RAOsjw44e5CbCXdT7TCZtAa5r4X4s9JEMj0qXOnAZvYHWqxQhWYzXE+Ubf4XujU1Sa0XYw/MG766DxFvFb2r0Mj4k1b6Eohgvebzs/piJDcKqXR3QLDHpTgAEm/uLmELx62zA2W1WSzwRwNxaxswvJ33jew/NwEpLXdbb8728Q5WYKkxKPoqi/QS/sDdk28ciiv2QZ/SMZN6mgxt3pivI3qvXK4dkMCXJYiXdlojMmkxc7xelE0Xvqx25Ko4Rc6DcrqkS6f96Tto0tVPtApuFoeUBuOedupOBoY/Zccfy5t+TtwFtj7+D1Qisg==
  • Cc: <ray.huang@xxxxxxx>, Penny Zheng <Penny.Zheng@xxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>, Michal Orzel <michal.orzel@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, "Julien Grall" <julien@xxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>
  • Delivery-date: Thu, 06 Mar 2025 08:40:37 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

This commit includes the following modification:
- Introduce helper function cpufreq_cmdline_parse_xen and
cpufreq_cmdline_parse_hwp to tidy the different parsing path
- Add helper cpufreq_opts_contain to ignore user redundant setting,
like "cpufreq=hwp;hwp;xen"
- Doc refinement

Signed-off-by: Penny Zheng <Penny.Zheng@xxxxxxx>
---
v2 -> v3:
- new commit
---
 docs/misc/xen-command-line.pandoc |  3 +-
 xen/drivers/cpufreq/cpufreq.c     | 64 ++++++++++++++++++++++---------
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/docs/misc/xen-command-line.pandoc 
b/docs/misc/xen-command-line.pandoc
index 0c6225391d..a440042471 100644
--- a/docs/misc/xen-command-line.pandoc
+++ b/docs/misc/xen-command-line.pandoc
@@ -535,7 +535,8 @@ choice of `dom0-kernel` is deprecated and not supported by 
all Dom0 kernels.
   processor to autonomously force physical package components into idle state.
   The default is enabled, but the option only applies when `hwp` is enabled.
 
-There is also support for `;`-separated fallback options:
+User could use `;`-separated options to support universal options which they
+would like to try on any agnostic platform, *but* under priority order, like
 `cpufreq=hwp;xen,verbose`.  This first tries `hwp` and falls back to `xen` if
 unavailable.  Note: The `verbose` suboption is handled globally.  Setting it
 for either the primary or fallback option applies to both irrespective of where
diff --git a/xen/drivers/cpufreq/cpufreq.c b/xen/drivers/cpufreq/cpufreq.c
index 894bafebaa..cfae16c15f 100644
--- a/xen/drivers/cpufreq/cpufreq.c
+++ b/xen/drivers/cpufreq/cpufreq.c
@@ -71,6 +71,46 @@ unsigned int __initdata cpufreq_xen_cnt = 1;
 
 static int __init cpufreq_cmdline_parse(const char *s, const char *e);
 
+static bool __init cpufreq_opts_contain(enum cpufreq_xen_opt option)
+{
+    unsigned int count = cpufreq_xen_cnt;
+
+    while ( count )
+    {
+        if ( cpufreq_xen_opts[--count] == option )
+            return true;
+    }
+
+    return false;
+}
+
+static int __init cpufreq_cmdline_parse_xen(const char *arg, const char *end)
+{
+    int ret = 0;
+
+    xen_processor_pmbits |= XEN_PROCESSOR_PM_PX;
+    cpufreq_controller = FREQCTL_xen;
+    cpufreq_xen_opts[cpufreq_xen_cnt++] = CPUFREQ_xen;
+    ret = 0;
+    if ( arg[0] && arg[1] )
+        ret = cpufreq_cmdline_parse(arg + 1, end);
+
+    return ret;
+}
+
+static int __init cpufreq_cmdline_parse_hwp(const char *arg, const char *end)
+{
+    int ret = 0;
+
+    xen_processor_pmbits |= XEN_PROCESSOR_PM_PX;
+    cpufreq_controller = FREQCTL_xen;
+    cpufreq_xen_opts[cpufreq_xen_cnt++] = CPUFREQ_hwp;
+    if ( arg[0] && arg[1] )
+        ret = hwp_cmdline_parse(arg + 1, end);
+
+    return ret;
+}
+
 static int __init cf_check setup_cpufreq_option(const char *str)
 {
     const char *arg = strpbrk(str, ",:;");
@@ -112,25 +152,13 @@ static int __init cf_check setup_cpufreq_option(const 
char *str)
         if ( cpufreq_xen_cnt == ARRAY_SIZE(cpufreq_xen_opts) )
             return -E2BIG;
 
-        if ( choice > 0 || !cmdline_strcmp(str, "xen") )
-        {
-            xen_processor_pmbits |= XEN_PROCESSOR_PM_PX;
-            cpufreq_controller = FREQCTL_xen;
-            cpufreq_xen_opts[cpufreq_xen_cnt++] = CPUFREQ_xen;
-            ret = 0;
-            if ( arg[0] && arg[1] )
-                ret = cpufreq_cmdline_parse(arg + 1, end);
-        }
+        if ( (choice > 0 || !cmdline_strcmp(str, "xen")) &&
+             !cpufreq_opts_contain(CPUFREQ_xen) )
+            ret = cpufreq_cmdline_parse_xen(arg, end);
         else if ( IS_ENABLED(CONFIG_INTEL) && choice < 0 &&
-                  !cmdline_strcmp(str, "hwp") )
-        {
-            xen_processor_pmbits |= XEN_PROCESSOR_PM_PX;
-            cpufreq_controller = FREQCTL_xen;
-            cpufreq_xen_opts[cpufreq_xen_cnt++] = CPUFREQ_hwp;
-            ret = 0;
-            if ( arg[0] && arg[1] )
-                ret = hwp_cmdline_parse(arg + 1, end);
-        }
+                  !cmdline_strcmp(str, "hwp") &&
+                  !cpufreq_opts_contain(CPUFREQ_hwp) )
+            ret = cpufreq_cmdline_parse_hwp(arg, end);
         else
             ret = -EINVAL;
 
-- 
2.34.1




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.