From patchwork Fri Aug 9 02:22:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 170877 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp9364043ile; Thu, 8 Aug 2019 19:22:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqxFoWU2o5WgOpjOmjPAy6FnobiH16u8vOJzmKoMLMoqJgJG57GgTGLBsbsI5ofenRTkGwJS X-Received: by 2002:a17:90a:33c4:: with SMTP id n62mr7286914pjb.28.1565317378453; Thu, 08 Aug 2019 19:22:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565317378; cv=none; d=google.com; s=arc-20160816; b=KwOmRtyXpOadnCba3GNDwdhcEMw6rfyLlLzodVvYCcCTWs7XoR8kAmxL+4cXiz9Hro acmztf0kpQ2C4If+wD8criAbipI0B38x4VV4cP7f+12pbGc7l4+/PlLNmEcupmjGZTa1 lgvioMp2HyzzB2PeSwdyiRkQ0L7aj/yahitjCTuGUxCtMCX/HLOK+6jhURQyYcsUHcG2 kj36ARtsKnx+A+nq9Qr9r9KqID6xzQfKKZ2HvTbU91nL4yrzgMrgZNsre9jbKGbXxYUq Ky7kxFnHzvyLcVKz1h7FZTS01Lam3XL4BfU3qYUCJ24REftDBaVdtwrDuvClPns+alP2 +5cw== 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 :dkim-signature; bh=lu46htF1InWlUeYM+9fitPBE//7fKQaOVdrljIrJ/CI=; b=pSHXXQ4aQ0kBAIFARNC3sZbiTfFZNrXh3yKjiXQhyxRc8ddzv7+VGFc5jeKadEJlUT Wj4QOJsEukHPGRVVVqPCbNyhHyw2/CRTk54RAlvCxuGYr0CUIxtGxsHGHsvH2Z5y/oFF m1daJkx4mokz/XBg8ET3zBKdxYjIiQEtEHqXDrJsKgiGoclUdSMdeXOjGIlwYbKVjC+f gEM/K96U1adNgEUJa8pcccGzMdDmpe1V6Oo6PN2F9WfQEETHaN3j4LCnWwMgdaKzuJU6 Iw2pZKL8EMv1KBaPfJfwScyEOk6kupCYpb/NIvyszrTevD3grHmNcj3exIGzo7W9emcL ZHHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sp+q6FY6; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e9si43796338pfi.170.2019.08.08.19.22.58; Thu, 08 Aug 2019 19:22:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sp+q6FY6; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404329AbfHICW5 (ORCPT + 11 others); Thu, 8 Aug 2019 22:22:57 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:46333 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729435AbfHICW5 (ORCPT ); Thu, 8 Aug 2019 22:22:57 -0400 Received: by mail-pl1-f196.google.com with SMTP id c2so44312922plz.13 for ; Thu, 08 Aug 2019 19:22:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lu46htF1InWlUeYM+9fitPBE//7fKQaOVdrljIrJ/CI=; b=sp+q6FY6ajqpisklQxr6q7qxxXi0j5dOM534M8NmwG5dNmzJt038Pp2unnhf6rSaIi ijlh9kDM7aBWkdU9uPRfBEPQWDWjjXGJo6GWXy4UHDeQ5/Em6RAzv9zkiMrXUuB4gkEl RLsMRBzVrtww79yvd2YQQAY5wz9VCe8bI/cm8zMEHqVtbaeTuN71L4TKi2CkI9pYYAGy E9nXi/Y59TAXhJ4I/mfDiRJkMreFxQ5RUUzepctU32oGQpPPatuH5EZDw1ejEpRCGJfl 5iz5aguFJP7Cvx5c6q5gabb3yKHofn96EYhGCMs1ifBn5GWNRCobS3Dxfhevwp0MYZ3C vvvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lu46htF1InWlUeYM+9fitPBE//7fKQaOVdrljIrJ/CI=; b=ql5QLy/XR3sqXCJEiUAXZuoFcHjeHsyJd3CMeCR/+TYdnOFLnuon2fmlrfVvenzrHD U5jZJ8as/pojiNzI72NwzX0PCqOUKxexufOrngS/GEApT10jHTcJDrjkdu/DP9LB0gAE xgGLA7jmXdVl7uGFmRFtJeyjNRRIbVPbB5xazKzVRgwvHcm8cvlYBtRuMp6ngoHiwvv1 hC7zanbY6TipX8JFJaqjzhpRF1BtcV05CXxunSiPUzzTs2K5PoqdeqfM9Qz7gdYy8+AA d4eNimUhXS0xzpaet3MQTqzfKYyXVIsSXhByYm+l9ghxWj6S6QGsJCSTMu8zq0t9keUZ sfFQ== X-Gm-Message-State: APjAAAUCbaVT95PjMUOQEKvk9wWjRVyfhAfN20p161tT9hgcT2fBH+Vz hbeMG5gKTf4EYw7/Qnvii+XLIA== X-Received: by 2002:a17:902:b48c:: with SMTP id y12mr16538879plr.202.1565317376400; Thu, 08 Aug 2019 19:22:56 -0700 (PDT) Received: from localhost ([122.172.76.219]) by smtp.gmail.com with ESMTPSA id w22sm102015392pfi.175.2019.08.08.19.22.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Aug 2019 19:22:55 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Srinivas Pandruvada , Len Brown , Viresh Kumar Cc: linux-pm@vger.kernel.org, Vincent Guittot , Doug Smythies , linux-kernel@vger.kernel.org Subject: [PATCH V5 2/2] cpufreq: intel_pstate: Implement QoS supported freq constraints Date: Fri, 9 Aug 2019 07:52:49 +0530 Message-Id: <85cdbc41f7f59a79b96793cbdcd49c53f964e46d.1565317135.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.21.0.rc0.269.g1a574e7a288b In-Reply-To: References: MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Intel pstate driver exposes min_perf_pct and max_perf_pct sysfs files, which can be used to force a limit on the min/max P state of the driver. Though these files eventually control the min/max frequencies that the CPUs will run at, they don't make a change to policy->min/max values. When the values of these files are changed (in passive mode of the driver), it leads to calling ->limits() callback of the cpufreq governors, like schedutil. On a call to it the governors shall forcefully update the frequency to come within the limits. Since the limits, i.e. policy->min/max, aren't updated by the driver, the governors fails to get the target freq within limit and sometimes aborts the update believing that the frequency is already set to the target value. This patch implements the QoS supported frequency constraints to update policy->min/max values whenever min_perf_pct or max_perf_pct files are updated. This is only done for the passive mode as of now, as the driver is already working fine in active mode. Fixes: ecd288429126 ("cpufreq: schedutil: Don't set next_freq to UINT_MAX") Reported-by: Doug Smythies Signed-off-by: Viresh Kumar --- V4->V5: - dev_pm_qos_update_request() can return 1 in case of success, handle that. drivers/cpufreq/intel_pstate.c | 120 +++++++++++++++++++++++++++++++-- 1 file changed, 116 insertions(+), 4 deletions(-) -- 2.21.0.rc0.269.g1a574e7a288b diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index cc27d4c59dca..32f27563613b 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -1085,6 +1086,47 @@ static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b, return count; } +static struct cpufreq_driver intel_pstate; + +static void update_qos_request(enum dev_pm_qos_req_type type) +{ + int max_state, turbo_max, freq, i, perf_pct; + struct dev_pm_qos_request *req; + struct cpufreq_policy *policy; + + for_each_possible_cpu(i) { + struct cpudata *cpu = all_cpu_data[i]; + + policy = cpufreq_cpu_get(i); + if (!policy) + continue; + + req = policy->driver_data; + cpufreq_cpu_put(policy); + + if (!req) + continue; + + if (hwp_active) + intel_pstate_get_hwp_max(i, &turbo_max, &max_state); + else + turbo_max = cpu->pstate.turbo_pstate; + + if (type == DEV_PM_QOS_MIN_FREQUENCY) { + perf_pct = global.min_perf_pct; + } else { + req++; + perf_pct = global.max_perf_pct; + } + + freq = DIV_ROUND_UP(turbo_max * perf_pct, 100); + freq *= cpu->pstate.scaling; + + if (dev_pm_qos_update_request(req, freq) < 0) + pr_warn("Failed to update freq constraint: CPU%d\n", i); + } +} + static ssize_t store_max_perf_pct(struct kobject *a, struct kobj_attribute *b, const char *buf, size_t count) { @@ -1108,7 +1150,10 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct kobj_attribute *b, mutex_unlock(&intel_pstate_limits_lock); - intel_pstate_update_policies(); + if (intel_pstate_driver == &intel_pstate) + intel_pstate_update_policies(); + else + update_qos_request(DEV_PM_QOS_MAX_FREQUENCY); mutex_unlock(&intel_pstate_driver_lock); @@ -1139,7 +1184,10 @@ static ssize_t store_min_perf_pct(struct kobject *a, struct kobj_attribute *b, mutex_unlock(&intel_pstate_limits_lock); - intel_pstate_update_policies(); + if (intel_pstate_driver == &intel_pstate) + intel_pstate_update_policies(); + else + update_qos_request(DEV_PM_QOS_MIN_FREQUENCY); mutex_unlock(&intel_pstate_driver_lock); @@ -2332,8 +2380,16 @@ static unsigned int intel_cpufreq_fast_switch(struct cpufreq_policy *policy, static int intel_cpufreq_cpu_init(struct cpufreq_policy *policy) { - int ret = __intel_pstate_cpu_init(policy); + int max_state, turbo_max, min_freq, max_freq, ret; + struct dev_pm_qos_request *req; + struct cpudata *cpu; + struct device *dev; + + dev = get_cpu_device(policy->cpu); + if (!dev) + return -ENODEV; + ret = __intel_pstate_cpu_init(policy); if (ret) return ret; @@ -2342,7 +2398,63 @@ static int intel_cpufreq_cpu_init(struct cpufreq_policy *policy) /* This reflects the intel_pstate_get_cpu_pstates() setting. */ policy->cur = policy->cpuinfo.min_freq; + req = kcalloc(2, sizeof(*req), GFP_KERNEL); + if (!req) { + ret = -ENOMEM; + goto pstate_exit; + } + + cpu = all_cpu_data[policy->cpu]; + + if (hwp_active) + intel_pstate_get_hwp_max(policy->cpu, &turbo_max, &max_state); + else + turbo_max = cpu->pstate.turbo_pstate; + + min_freq = DIV_ROUND_UP(turbo_max * global.min_perf_pct, 100); + min_freq *= cpu->pstate.scaling; + max_freq = DIV_ROUND_UP(turbo_max * global.max_perf_pct, 100); + max_freq *= cpu->pstate.scaling; + + ret = dev_pm_qos_add_request(dev, req, DEV_PM_QOS_MIN_FREQUENCY, + min_freq); + if (ret < 0) { + dev_err(dev, "Failed to add min-freq constraint (%d)\n", ret); + goto free_req; + } + + ret = dev_pm_qos_add_request(dev, req + 1, DEV_PM_QOS_MAX_FREQUENCY, + max_freq); + if (ret < 0) { + dev_err(dev, "Failed to add max-freq constraint (%d)\n", ret); + goto remove_min_req; + } + + policy->driver_data = req; + return 0; + +remove_min_req: + dev_pm_qos_remove_request(req); +free_req: + kfree(req); +pstate_exit: + intel_pstate_exit_perf_limits(policy); + + return ret; +} + +static int intel_cpufreq_cpu_exit(struct cpufreq_policy *policy) +{ + struct dev_pm_qos_request *req; + + req = policy->driver_data; + + dev_pm_qos_remove_request(req + 1); + dev_pm_qos_remove_request(req); + kfree(req); + + return intel_pstate_cpu_exit(policy); } static struct cpufreq_driver intel_cpufreq = { @@ -2351,7 +2463,7 @@ static struct cpufreq_driver intel_cpufreq = { .target = intel_cpufreq_target, .fast_switch = intel_cpufreq_fast_switch, .init = intel_cpufreq_cpu_init, - .exit = intel_pstate_cpu_exit, + .exit = intel_cpufreq_cpu_exit, .stop_cpu = intel_cpufreq_stop_cpu, .update_limits = intel_pstate_update_limits, .name = "intel_cpufreq",