From patchwork Mon Oct 22 20:29:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 10652467 X-Patchwork-Delegate: rui.zhang@intel.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C7B6413A4 for ; Mon, 22 Oct 2018 20:29:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA63F28CC7 for ; Mon, 22 Oct 2018 20:29:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE46E29058; Mon, 22 Oct 2018 20:29:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4BD1328CC7 for ; Mon, 22 Oct 2018 20:29:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726082AbeJWEtM (ORCPT ); Tue, 23 Oct 2018 00:49:12 -0400 Received: from mail-ot1-f73.google.com ([209.85.210.73]:37264 "EHLO mail-ot1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726824AbeJWEtH (ORCPT ); Tue, 23 Oct 2018 00:49:07 -0400 Received: by mail-ot1-f73.google.com with SMTP id h7so434729otm.4 for ; Mon, 22 Oct 2018 13:29:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=JagOLnWKBbMiEEr6b0nEo5A7+QFScixLH/s9yI7p3Hc=; b=Z5Cga2c47YOzY2FcS05xmXyAJEloSPvBWc6Hlg8KzUmiP70vpEGkzF3z2EYxua5Q8t HpCnVJk3I8cBvY/rIXwxi/uXvduDyjQB5NkdWiwTqZvQtuijzr6Bs3LlECCSBR9k4HYU Blj6Nr/uUra6BkTSgV61MHvSOx/9slCXVyaLkv/u0kug4P+PBYFefvwbJqsb7GIWuG9x Dk0G19ckQ/7RgtsHL8fvpONAA0OxBYUhBeT094oOJPJbIInDf9PuyOUJdJdTQUnG0K2z rm90wezQfvMoKDSVApQ/LENpssNk9mU5X47EPgUc413B7TZDg/cI/SKsfwpoo53sN8fC iOUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=JagOLnWKBbMiEEr6b0nEo5A7+QFScixLH/s9yI7p3Hc=; b=E2q9rPapasuwZfYJG02PHaoz0JVPZIOi4xIE6uC70OIH3V68IVq/Aq0gBRJuFFbFD4 1DcugJNidEaQmMCzaDLTn0N3K/22/RMUmdntaXWiTt2DCKBNLkY89YuFura2bYprvzth g3DdzjCDfSUiQNc5MYKATg94RbYXjYFAsGMJ989ey8PsQDvw0r3+Ix8QFPgTTu7k119G rriwDWhbZ19p1HxT/Q8IMlfZd0HvNLOleXOZwbM3XdCLFCkPmeZVXgc03IHC7N/HicLo wyE63nUaVRza+UD+mNRiUk53IKgEA9fL+oh9dkHq6t+H9mJtwxFClQ4jg57T1IL5GoGk OgZw== X-Gm-Message-State: ABuFfogrrz9i3e8iXvb5hSJTnQBeIbOHtVJYTpTtZN764uKJmyH6/KF4 7uymNZcorGhmNI1VKc0JC+HclNFU0uKf X-Google-Smtp-Source: ACcGV61M4afbVPLGv0WTPaIhbl2+VJyKBXYOJLm1lnHYswmcxI1N/7Ck8GMfSIL/Nfrgf2fXONgG5PuYPttz X-Received: by 2002:a9d:b9:: with SMTP id w54mr37581097oti.30.1540240145386; Mon, 22 Oct 2018 13:29:05 -0700 (PDT) Date: Mon, 22 Oct 2018 14:29:01 -0600 Message-Id: <20181022202901.1654-1-zwisler@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.19.1.568.g152ad8e336-goog Subject: [PATCH] thermal: add ratelimited thermal and power logging From: Ross Zwisler To: linux-kernel@vger.kernel.org Cc: Ricky Liang , Amit Daniel Kachhap , Daniel Lezcano , Eduardo Valentin , Javi Merino , Viresh Kumar , Zhang Rui , linux-pm@vger.kernel.org, Stephen Barber , Ross Zwisler Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ricky Liang Add thermal logs in devfreq_cooling and cpu_cooling. Also add logging to power_allocator when it starts to control power. These changes can lead to excessive log spam when running up against thermal limits, so have this logging ratelimited to allow only 1 log each 30 seconds from each of those subsystems. Signed-off-by: Ricky Liang Co-authored-by: Stephen Barber Signed-off-by: Stephen Barber Reviewed-by: Daniel Kurtz [ rez: squashed initial implementation & fixes, updated changelog for upstream. ] Signed-off-by: Ross Zwisler --- drivers/thermal/cpu_cooling.c | 16 ++++++++++++++++ drivers/thermal/devfreq_cooling.c | 12 ++++++++++++ drivers/thermal/power_allocator.c | 17 +++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index dfd23245f778a..d8d1855d7d991 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -31,9 +31,17 @@ #include #include #include +#include #include +static DEFINE_RATELIMIT_STATE(cpu_cooling_ratelimit_state, 30 * HZ, 1); + +static int cpu_cooling_ratelimit(void) +{ + return __ratelimit(&cpu_cooling_ratelimit_state); +} + /* * Cooling state <-> CPUFreq frequency * @@ -389,6 +397,7 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, { struct cpufreq_cooling_device *cpufreq_cdev = cdev->devdata; unsigned int clip_freq; + struct device *cpu_dev; /* Request state should be less than max_level */ if (WARN_ON(state > cpufreq_cdev->max_level)) @@ -404,6 +413,13 @@ static int cpufreq_set_cur_state(struct thermal_cooling_device *cdev, cpufreq_update_policy(cpufreq_cdev->policy->cpu); + if (cpu_cooling_ratelimit()) { + cpu_dev = get_cpu_device(cpufreq_cdev->policy->cpu); + dev_info(cpu_dev, + "Cooling state set to %lu. New max freq = %u\n", + state, clip_freq); + } + return 0; } diff --git a/drivers/thermal/devfreq_cooling.c b/drivers/thermal/devfreq_cooling.c index ef59256887ff6..f95c7f513f05a 100644 --- a/drivers/thermal/devfreq_cooling.c +++ b/drivers/thermal/devfreq_cooling.c @@ -25,6 +25,7 @@ #include #include #include +#include #include @@ -32,6 +33,13 @@ static DEFINE_IDA(devfreq_ida); +static DEFINE_RATELIMIT_STATE(devfreq_cooling_ratelimit_state, 30 * HZ, 1); + +static int devfreq_cooling_ratelimit(void) +{ + return __ratelimit(&devfreq_cooling_ratelimit_state); +} + /** * struct devfreq_cooling_device - Devfreq cooling device * @id: unique integer value corresponding to each @@ -150,6 +158,10 @@ static int devfreq_cooling_set_cur_state(struct thermal_cooling_device *cdev, dfc->cooling_state = state; + if (devfreq_cooling_ratelimit()) + dev_info(dev, "Cooling state set to %lu. New max freq = %u\n", + state, dfc->freq_table[state]); + return 0; } diff --git a/drivers/thermal/power_allocator.c b/drivers/thermal/power_allocator.c index 3055f9a12a170..5140a07fe60aa 100644 --- a/drivers/thermal/power_allocator.c +++ b/drivers/thermal/power_allocator.c @@ -15,6 +15,7 @@ #define pr_fmt(fmt) "Power allocator: " fmt +#include #include #include #include @@ -30,6 +31,13 @@ #define int_to_frac(x) ((x) << FRAC_BITS) #define frac_to_int(x) ((x) >> FRAC_BITS) +static DEFINE_RATELIMIT_STATE(power_allocator_ratelimit_state, 30 * HZ, 1); + +static int power_allocator_ratelimit(void) +{ + return __ratelimit(&power_allocator_ratelimit_state); +} + /** * mul_frac() - multiply two fixed-point numbers * @x: first multiplicand @@ -443,6 +451,15 @@ static int allocate_power(struct thermal_zone_device *tz, max_allocatable_power, tz->temperature, control_temp - tz->temperature); + if (total_granted_power < total_req_power && + power_allocator_ratelimit()) { + dev_info(&tz->device, "Controlling power: control_temp=%d " + "last_temp=%d, curr_temp=%d total_requested_power=%d " + "total_granted_power=%d\n", control_temp, + tz->last_temperature, tz->temperature, + total_req_power, total_granted_power); + } + kfree(req_power); unlock: mutex_unlock(&tz->lock);