From patchwork Thu Jul 4 07:36:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 168467 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1921828ilk; Thu, 4 Jul 2019 00:36:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzAn4Bg+r3Z3+2dBdMGv0V5KdQ8WLgtw37BjRIV5ABxSyxxYqViIwZeQQP69UkVQ7Deg8Dm X-Received: by 2002:a17:902:467:: with SMTP id 94mr47280319ple.131.1562225815690; Thu, 04 Jul 2019 00:36:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562225815; cv=none; d=google.com; s=arc-20160816; b=FRQf6B5ylaqKGQfh99Q5r5PyBUUcbd2IQ0IQtR6gHj7eM3zMqFHN0AT+Mv+zfwHO+n xaFlTYHGPewjxMgygk5PffH+iUMMSKVIBDOLl+5KMggyT1o9IY+6bArR9Wh5y5IX9RXv E7fljIYJNl9AOzS07K64833T2aZFpGC0ByaConiIYqd4ebLcXj3qvSjLRQWGVInaUfC4 QGCnsatGfkH+Gtk9lsnWunAOqtqwP2jge2ESJk9QThXTs/47DKdVhulkcKvoLdcvcqEn Vrp/0BDtaCl56WL96Wm5aP4Yb7jB0+EoomaylTqZeUAaz/6qxh7waxkZvLT2qRs1WeQ2 ZShw== 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=47nu70zu7IH4O5mYfwvkO2JIEeyQhRCLZhm8kmN821M=; b=xZ6zLZlDheW6Z33+R3YGmDYuHNMz+l87AUJW59qOyIu9bBFmjrvJqvnlIq0JLONquC XDkBNjImQHV6QXOyqhDVGVCZVyMat3x+5SedQ2Te6Sacke2UB6mnz/Pse/RJPMVTEAR/ iODSHM7HzuaQ18ZcYvTzzjuTcsMOsSOV6DbNJ0+ubD3hBzGPiMvgOG8Mt4LqFMmrlgHL GfJ/3HCjKsvOFaWjNWxCPpyvwUPN/HShAAjT5G7Pg3WvLTPE6wPcubPjkRBl73dT2XZz HHpv2REJCanCJvyhrA3WRNxZiG7F/piXNKXWbcaiRZ5vwk16EIncLUAFoKPj04K5lJqa +tdA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=had28dnX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 r1si4501575pjp.80.2019.07.04.00.36.55; Thu, 04 Jul 2019 00:36:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=had28dnX; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 S1727573AbfGDHgy (ORCPT + 30 others); Thu, 4 Jul 2019 03:36:54 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:32978 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727558AbfGDHgv (ORCPT ); Thu, 4 Jul 2019 03:36:51 -0400 Received: by mail-pg1-f195.google.com with SMTP id m4so2516068pgk.0 for ; Thu, 04 Jul 2019 00:36:51 -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=47nu70zu7IH4O5mYfwvkO2JIEeyQhRCLZhm8kmN821M=; b=had28dnXoGd0QBJsiA7AXZG88tv+5KTH+WuLgm5O/7W526+9jgnNoUDdVTleis8Rvu T+NTaFgZD+mpuVqcvmXQ+cNULNPw27bFwc/CrYRoey1CJ9QqG08JEOkz5e78KJ1zaROX 0kQXORIFuS5Cn112TwBdqoyYr6+CdQwY9Cx8UEy6K98Gl7Qzkqjc7Du4xP7m6YuFYuBm EwdUHIjDPRZVvUW5fmxvkelU3YySPfDACg4IOy1+3f3w3/ppTSL1b2Y5fA1JkHDhXghT HCgecjYAnvvp/QpQwMgxkmcybvbd5kKa2M5MW+iF3vUZfi+qhlYlcKSyEBGMzoJG7XTr xdjg== 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=47nu70zu7IH4O5mYfwvkO2JIEeyQhRCLZhm8kmN821M=; b=fCfRDO7BFSsCI9fSgOSx/6WHqxo9zurpMPWSydPmb1Xi+wiN7AdeAU4VSjPOjTsmdE WhK5ionRvU6usgaLBF3t7l8goTI8XXWYBu9hzSWgKqdZpLpR5A7qR5QmN0eNOeLQuptN //pbApPKZY8+YgcRSNbI51JmAY38cM2k6ifKAppDbksz23PdqosCPTFhnEGxQ5gZcJeS ynEdNN75Ft3x4cfMwBiZEOMjNplhHXeJZFXG0H62zAz6iId7ryrSPBM3QEeNp0FwhUAL nEmeL/GarVJbWdnk1Cy1fasr7Y5zrRZs9h8QBbPlb3iZc9c+couZBXvQZ6K45u1InTNj oRgg== X-Gm-Message-State: APjAAAXrvr77zRVd0Hswq6GKLDAsJiLt5MExLNkIkwID2i2q4OpjczxW jbzovycH9JZG7TzHm7Ts0FaGdQ== X-Received: by 2002:a63:de50:: with SMTP id y16mr42148903pgi.431.1562225810570; Thu, 04 Jul 2019 00:36:50 -0700 (PDT) Received: from localhost ([122.172.21.205]) by smtp.gmail.com with ESMTPSA id f7sm6167329pfd.43.2019.07.04.00.36.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 00:36:50 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , Matthias Kaehlcke , Ulf Hansson , "Rafael J . Wysocki" , linux-kernel@vger.kernel.org Subject: [PATCH V6 7/7] cpufreq: Add QoS requests for userspace constraints Date: Thu, 4 Jul 2019 13:06:23 +0530 Message-Id: <0d4c2a013b32bf18d45817011b028918220580f5.1562210705.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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This implements QoS requests to manage userspace configuration of min and max frequency. Reviewed-by: Matthias Kaehlcke Reviewed-by: Ulf Hansson Signed-off-by: Viresh Kumar Signed-off-by: Rafael J. Wysocki --- drivers/cpufreq/cpufreq.c | 87 ++++++++++++++++++++------------------- include/linux/cpufreq.h | 8 +--- 2 files changed, 46 insertions(+), 49 deletions(-) -- 2.21.0.rc0.269.g1a574e7a288b diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 091789e868ee..13c2f119cc0c 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -718,23 +718,15 @@ static ssize_t show_scaling_cur_freq(struct cpufreq_policy *policy, char *buf) static ssize_t store_##file_name \ (struct cpufreq_policy *policy, const char *buf, size_t count) \ { \ - int ret, temp; \ - struct cpufreq_policy new_policy; \ + unsigned long val; \ + int ret; \ \ - memcpy(&new_policy, policy, sizeof(*policy)); \ - new_policy.min = policy->user_policy.min; \ - new_policy.max = policy->user_policy.max; \ - \ - ret = sscanf(buf, "%u", &new_policy.object); \ + ret = sscanf(buf, "%lu", &val); \ if (ret != 1) \ return -EINVAL; \ \ - temp = new_policy.object; \ - ret = cpufreq_set_policy(policy, &new_policy); \ - if (!ret) \ - policy->user_policy.object = temp; \ - \ - return ret ? ret : count; \ + ret = dev_pm_qos_update_request(policy->object##_freq_req, val);\ + return ret >= 0 ? count : ret; \ } store_one(scaling_min_freq, min); @@ -1126,8 +1118,6 @@ void refresh_frequency_limits(struct cpufreq_policy *policy) new_policy = *policy; pr_debug("updating policy for CPU %u\n", policy->cpu); - new_policy.min = policy->user_policy.min; - new_policy.max = policy->user_policy.max; cpufreq_set_policy(policy, &new_policy); } @@ -1238,6 +1228,12 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) goto err_min_qos_notifier; } + policy->min_freq_req = kzalloc(2 * sizeof(*policy->min_freq_req), + GFP_KERNEL); + if (!policy->min_freq_req) + goto err_max_qos_notifier; + + policy->max_freq_req = policy->min_freq_req + 1; INIT_LIST_HEAD(&policy->policy_list); init_rwsem(&policy->rwsem); spin_lock_init(&policy->transition_lock); @@ -1248,6 +1244,9 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) policy->cpu = cpu; return policy; +err_max_qos_notifier: + dev_pm_qos_remove_notifier(dev, &policy->nb_max, + DEV_PM_QOS_MAX_FREQUENCY); err_min_qos_notifier: dev_pm_qos_remove_notifier(dev, &policy->nb_min, DEV_PM_QOS_MIN_FREQUENCY); @@ -1283,6 +1282,9 @@ static void cpufreq_policy_free(struct cpufreq_policy *policy) DEV_PM_QOS_MAX_FREQUENCY); dev_pm_qos_remove_notifier(dev, &policy->nb_min, DEV_PM_QOS_MIN_FREQUENCY); + dev_pm_qos_remove_request(policy->max_freq_req); + dev_pm_qos_remove_request(policy->min_freq_req); + kfree(policy->min_freq_req); cpufreq_policy_put_kobj(policy); free_cpumask_var(policy->real_cpus); @@ -1361,16 +1363,30 @@ static int cpufreq_online(unsigned int cpu) cpumask_and(policy->cpus, policy->cpus, cpu_online_mask); if (new_policy) { - policy->user_policy.min = policy->min; - policy->user_policy.max = policy->max; + struct device *dev = get_cpu_device(cpu); for_each_cpu(j, policy->related_cpus) { per_cpu(cpufreq_cpu_data, j) = policy; add_cpu_dev_symlink(policy, j); } - } else { - policy->min = policy->user_policy.min; - policy->max = policy->user_policy.max; + + ret = dev_pm_qos_add_request(dev, policy->min_freq_req, + DEV_PM_QOS_MIN_FREQUENCY, + policy->min); + if (ret < 0) { + dev_err(dev, "Failed to add min-freq constraint (%d)\n", + ret); + goto out_destroy_policy; + } + + ret = dev_pm_qos_add_request(dev, policy->max_freq_req, + DEV_PM_QOS_MAX_FREQUENCY, + policy->max); + if (ret < 0) { + dev_err(dev, "Failed to add max-freq constraint (%d)\n", + ret); + goto out_destroy_policy; + } } if (cpufreq_driver->get && has_target()) { @@ -2344,7 +2360,6 @@ int cpufreq_set_policy(struct cpufreq_policy *policy, { struct cpufreq_governor *old_gov; struct device *cpu_dev = get_cpu_device(policy->cpu); - unsigned long min, max; int ret; pr_debug("setting new policy for CPU %u: %u - %u kHz\n", @@ -2352,24 +2367,12 @@ int cpufreq_set_policy(struct cpufreq_policy *policy, memcpy(&new_policy->cpuinfo, &policy->cpuinfo, sizeof(policy->cpuinfo)); - /* - * This check works well when we store new min/max freq attributes, - * because new_policy is a copy of policy with one field updated. - */ - if (new_policy->min > new_policy->max) - return -EINVAL; - /* * PM QoS framework collects all the requests from users and provide us * the final aggregated value here. */ - min = dev_pm_qos_read_value(cpu_dev, DEV_PM_QOS_MIN_FREQUENCY); - max = dev_pm_qos_read_value(cpu_dev, DEV_PM_QOS_MAX_FREQUENCY); - - if (min > new_policy->min) - new_policy->min = min; - if (max < new_policy->max) - new_policy->max = max; + new_policy->min = dev_pm_qos_read_value(cpu_dev, DEV_PM_QOS_MIN_FREQUENCY); + new_policy->max = dev_pm_qos_read_value(cpu_dev, DEV_PM_QOS_MAX_FREQUENCY); /* verify the cpu speed can be set within this limit */ ret = cpufreq_driver->verify(new_policy); @@ -2458,10 +2461,9 @@ int cpufreq_set_policy(struct cpufreq_policy *policy, * @cpu: CPU to re-evaluate the policy for. * * Update the current frequency for the cpufreq policy of @cpu and use - * cpufreq_set_policy() to re-apply the min and max limits saved in the - * user_policy sub-structure of that policy, which triggers the evaluation - * of policy notifiers and the cpufreq driver's ->verify() callback for the - * policy in question, among other things. + * cpufreq_set_policy() to re-apply the min and max limits, which triggers the + * evaluation of policy notifiers and the cpufreq driver's ->verify() callback + * for the policy in question, among other things. */ void cpufreq_update_policy(unsigned int cpu) { @@ -2521,10 +2523,9 @@ static int cpufreq_boost_set_sw(int state) break; } - down_write(&policy->rwsem); - policy->user_policy.max = policy->max; - cpufreq_governor_limits(policy); - up_write(&policy->rwsem); + ret = dev_pm_qos_update_request(policy->max_freq_req, policy->max); + if (ret) + break; } return ret; diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 1fa37b675a80..afc683021ac5 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -50,11 +50,6 @@ struct cpufreq_cpuinfo { unsigned int transition_latency; }; -struct cpufreq_user_policy { - unsigned int min; /* in kHz */ - unsigned int max; /* in kHz */ -}; - struct cpufreq_policy { /* CPUs sharing clock, require sw coordination */ cpumask_var_t cpus; /* Online CPUs only */ @@ -84,7 +79,8 @@ struct cpufreq_policy { struct work_struct update; /* if update_policy() needs to be * called, but you're in IRQ context */ - struct cpufreq_user_policy user_policy; + struct dev_pm_qos_request *min_freq_req; + struct dev_pm_qos_request *max_freq_req; struct cpufreq_frequency_table *freq_table; enum cpufreq_table_sorting freq_table_sorted;