Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp2342264pxa; Mon, 24 Aug 2020 11:24:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw3uimsV3Ite5wNVHtPYp/F/WDzvudyiZKLhd2wHVdT1nw+0Kn379oxRJ9MBbS1hK2H3lhG X-Received: by 2002:a17:906:2f07:: with SMTP id v7mr7086165eji.313.1598293460496; Mon, 24 Aug 2020 11:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598293460; cv=none; d=google.com; s=arc-20160816; b=NlBnOKB4eF4nhLhvldSpdvsOg6MYuw6STWAXagkns1lCAhD3miAaDoesTnH9WWR5Jv UNgxjg97fSVTJwCdJLlM6HvEWFSTo/JtX2k3ZQVyU8QvRYCvD9ziPUT0DebEENDKlJWl 1aZXt7ieuYYG8xaoqUVPyukX2fAdFw9ZkIXkOIydmS+Azv56B3MYR4tA5ieH8iNsiCDB 4lWaFABPqNcp8h1Ktny69Lpap7vmqXvr2oe0atyx5XIZYwO0AVsgNKt5GujwBTNRi8TB ISIrYpeKBJOfJ2BZagnTSW4MAl68ZNv4C+h4PMwHix0Zo4DmodrvW5oRFR3dE68Vzcz3 uiig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=RCLW658ZAAtYA1QekTUH+dTOjhDu6tPsfqFfxJP2l7U=; b=1G2VI21jM6xQTYtUaYaeU6lQMG1hxXs5m8OlwRnG4ZV1HEQ9/OVxq5Py4FFc6ehXso OOT9ztAt2dz5TBBMPOtvHEP7rWr8uB/WwMYPdjufx7ah8tmjVylVrxjo7S6MAhRf3A1Y AIYZ+P7joXcMlfhmVbvnl1l6qMpE7grA7iImmDHgOXHY4smrV0wd0pvMhrm3T842aqWM OBml9E1u1TGLsUqhqz3SdrQcNm9tbIOacmZ6XgBadnXG03EjPRqjxfEJTzIz7aFbEbvX OIUgyIJCKn1bXyx89RgvKld8M8sLaiCSDwDgrUm5rfsc0HV9Qie2XIpSDnun/rHufb0g oTpA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ks17si7531083ejb.204.2020.08.24.11.23.56; Mon, 24 Aug 2020 11:24:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726943AbgHXRsS (ORCPT + 99 others); Mon, 24 Aug 2020 13:48:18 -0400 Received: from cloudserver094114.home.pl ([79.96.170.134]:52682 "EHLO cloudserver094114.home.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726090AbgHXRsN (ORCPT ); Mon, 24 Aug 2020 13:48:13 -0400 Received: from 89-64-88-199.dynamic.chello.pl (89.64.88.199) (HELO kreacher.localnet) by serwer1319399.home.pl (79.96.170.134) with SMTP (IdeaSmtpServer 0.83.459) id c3f7b119fc80de18; Mon, 24 Aug 2020 19:48:10 +0200 From: "Rafael J. Wysocki" To: Linux PM Cc: Srinivas Pandruvada , LKML , Doug Smythies Subject: [PATCH v2 4/5] cpufreq: intel_pstate: Free memory only when turning off Date: Mon, 24 Aug 2020 19:46:36 +0200 Message-ID: <2782151.99gFAjWadp@kreacher> In-Reply-To: <4169555.5IIHXK4Dsd@kreacher> References: <4169555.5IIHXK4Dsd@kreacher> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Rafael J. Wysocki" When intel_pstate switches the operation mode from "active" to "passive" or the other way around, freeing its data structures representing CPUs and allocating them again from scratch is not necessary and wasteful. Moreover, if these data structures are preserved, the cached HWP Request MSR value from there may be written to the MSR to start with to reinitialize it and help to restore the EPP value set previously (it is set to 0xFF when CPUs go offline to allow their SMT siblings to use the full range of EPP values and that also happens when the driver gets unregistered). Accordingly, modify the driver to only do a full cleanup on driver object registration errors and when its status is changed to "off" via sysfs and to write the cached HWP Request MSR value back to the MSR on CPU init if the data structure representing the given CPU is still there. Signed-off-by: Rafael J. Wysocki --- -> v2: Rearrange intel_pstate_init_cpu() to restore some of the previous behavior of it to retain the current active-mode EPP management. --- drivers/cpufreq/intel_pstate.c | 54 +++++++++++++--------------------- 1 file changed, 21 insertions(+), 33 deletions(-) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 98836ac299db..37731d45f0ea 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -2098,25 +2098,28 @@ static int intel_pstate_init_cpu(unsigned int cpunum) all_cpu_data[cpunum] = cpu; - cpu->epp_default = -EINVAL; - cpu->epp_powersave = -EINVAL; - cpu->epp_saved = -EINVAL; - } + cpu->cpu = cpunum; - cpu = all_cpu_data[cpunum]; - - cpu->cpu = cpunum; + cpu->epp_default = -EINVAL; - if (hwp_active) { - const struct x86_cpu_id *id; + if (hwp_active) { + const struct x86_cpu_id *id; - intel_pstate_hwp_enable(cpu); + intel_pstate_hwp_enable(cpu); - id = x86_match_cpu(intel_pstate_hwp_boost_ids); - if (id && intel_pstate_acpi_pm_profile_server()) - hwp_boost = true; + id = x86_match_cpu(intel_pstate_hwp_boost_ids); + if (id && intel_pstate_acpi_pm_profile_server()) + hwp_boost = true; + } + } else if (hwp_active) { + cpu->epp_policy = 0; + wrmsrl_on_cpu(cpunum, MSR_HWP_REQUEST, + cpu->hwp_req_cached); } + cpu->epp_powersave = -EINVAL; + cpu->epp_saved = -EINVAL; + intel_pstate_get_cpu_pstates(cpu); pr_debug("controlling: cpu %d\n", cpunum); @@ -2701,9 +2704,6 @@ static void intel_pstate_driver_cleanup(void) } put_online_cpus(); - if (intel_pstate_driver == &intel_pstate) - intel_pstate_sysfs_hide_hwp_dynamic_boost(); - intel_pstate_driver = NULL; } @@ -2729,14 +2729,6 @@ static int intel_pstate_register_driver(struct cpufreq_driver *driver) return 0; } -static int intel_pstate_unregister_driver(void) -{ - cpufreq_unregister_driver(intel_pstate_driver); - intel_pstate_driver_cleanup(); - - return 0; -} - static ssize_t intel_pstate_show_status(char *buf) { if (!intel_pstate_driver) @@ -2748,8 +2740,6 @@ static ssize_t intel_pstate_show_status(char *buf) static int intel_pstate_update_status(const char *buf, size_t size) { - int ret; - if (size == 3 && !strncmp(buf, "off", size)) { if (!intel_pstate_driver) return -EINVAL; @@ -2757,7 +2747,8 @@ static int intel_pstate_update_status(const char *buf, size_t size) if (hwp_active) return -EBUSY; - return intel_pstate_unregister_driver(); + cpufreq_unregister_driver(intel_pstate_driver); + intel_pstate_driver_cleanup(); } if (size == 6 && !strncmp(buf, "active", size)) { @@ -2765,9 +2756,7 @@ static int intel_pstate_update_status(const char *buf, size_t size) if (intel_pstate_driver == &intel_pstate) return 0; - ret = intel_pstate_unregister_driver(); - if (ret) - return ret; + cpufreq_unregister_driver(intel_pstate_driver); } return intel_pstate_register_driver(&intel_pstate); @@ -2778,9 +2767,8 @@ static int intel_pstate_update_status(const char *buf, size_t size) if (intel_pstate_driver == &intel_cpufreq) return 0; - ret = intel_pstate_unregister_driver(); - if (ret) - return ret; + cpufreq_unregister_driver(intel_pstate_driver); + intel_pstate_sysfs_hide_hwp_dynamic_boost(); } return intel_pstate_register_driver(&intel_cpufreq); -- 2.26.2