From patchwork Thu May 3 06:22:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Smythies X-Patchwork-Id: 10377099 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3DF266037D for ; Thu, 3 May 2018 06:23:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F9AB28FEF for ; Thu, 3 May 2018 06:23:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 244C328FF4; Thu, 3 May 2018 06:23:58 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=unavailable 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 AFD0D28FEF for ; Thu, 3 May 2018 06:23:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752001AbeECGXo (ORCPT ); Thu, 3 May 2018 02:23:44 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:36838 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751894AbeECGXn (ORCPT ); Thu, 3 May 2018 02:23:43 -0400 Received: by mail-pf0-f196.google.com with SMTP id w129so8438270pfd.3; Wed, 02 May 2018 23:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=9iByaj+ZMWO9VMoYaGPNmNnYgIElth1ugSk8irBVDBk=; b=BuETlGr+P380PV5v4AJwJh7LErLkKCaYinYpJGErBp/1302fns9GzKJVN77kWX949f Yl4rCpNHGx2LqEwB7qcSzmOMdrjzw3QsZUa4VEYEY2/VXF2nzcT6236eRS3/TcttfSHP VzCyaa42uTPBtrFaN505RWDBL2brUMmgZGHigGlvrqO3kHaHdeh3K3UM6nlnONYVBdrZ YgvEvMFuXhllHgsXNmimKU2Ckt7BEc+GKxmhmFuRLXeuR2XCFI4IE4aQF/WERUOGPqGL PgT2PzVMv/9eOk+b9iDM8y2L2MZ/2F7bSVbWFcUNfF9s9fwzYZejjDxxMhZjcyA8U/sc 4wbw== 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; bh=9iByaj+ZMWO9VMoYaGPNmNnYgIElth1ugSk8irBVDBk=; b=Vci9Xd93Z5gBS6jO4P/ftNkhZY25hLBvjS1KCQh13sC0MKsLGKevt0WlQlOta1lsO/ bTeQUl5c2fLQtT3waqcL02e9QHOk3SkaUzwC+PSewgePtzaFv7+hMNErtA4DxFyCS37d ZkjbSWp7RWrXUmdEOdoav0SFHOVb2Wbi67FzeMSRkkHs13BEfR5RhzTRz05CQrlCnj5c u943VsCdr+ePY/HmF6FBgIZIAQtYHwTfn782o6F3XKI00LTXuXH49F5ZMVO86KQUd3TY C3WCZjdSAfr5byE8GbGPnp5KSsXURu+k2E8MtuAr8nFmAfrQjEHjS74XpZCWsFNAoeq7 7M6A== X-Gm-Message-State: ALQs6tCiko5xGs9YIKEtC7i0KfBl2yT6+9zTRTRL/ao1iVpSzGVblPPs tzSFIQpW9birQ38EkrnulSYI1Q== X-Google-Smtp-Source: AB8JxZpYZHOLCes7w8LO4T7XUcnnHvKxUtnYh06BfbpNhMgFes3LZgfMCgv+BMnuhrGCTIJQl1byIA== X-Received: by 2002:a17:902:7c0d:: with SMTP id x13-v6mr4074720pll.291.1525328622950; Wed, 02 May 2018 23:23:42 -0700 (PDT) Received: from s15.smythies.com (mail.smythies.com. [173.180.45.4]) by smtp.gmail.com with ESMTPSA id y29sm28671528pff.42.2018.05.02.23.23.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 May 2018 23:23:42 -0700 (PDT) From: Doug Smythies X-Google-Original-From: Doug Smythies To: srinivas.pandruvada@linux.intel.com, rjw@rjwysocki.net Cc: dsmythies@telus.net, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org Subject: [PATCH V5] cpufreq: intel_pstate: allow trace in passive mode Date: Wed, 2 May 2018 23:22:47 -0700 Message-Id: <1525328567-23747-1-git-send-email-dsmythies@telus.net> X-Mailer: git-send-email 2.7.4 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 Allow use of the trace_pstate_sample trace function when the intel_pstate driver is in passive mode. Since the core_busy and scaled_busy fields are not used, and it might be desirable to know which path through the driver was used, either intel_cpufreq_target or intel_cpufreq_fast_switch, re-task the core_busy field as a flag indicator. The user can then use the intel_pstate_tracer.py utility to summarize and plot the trace. Note: The core_busy feild still goes by that name in include/trace/events/power.h and within the intel_pstate_tracer.py script and csv file headers, but it is graphed as "performance", and called core_avg_perf now in the intel_pstate driver. Sometimes, in passive mode, the driver is not called for many tens or even hundreds of seconds. The user needs to understand, and not be confused by, this limitation. Signed-off-by: Doug Smythies --- V5: Changes as per Rafael J. Wysocki feedback. See: https://lkml.org/lkml/2018/1/7/270 V4: Only execute the trace specific overhead code if trace is enabled. Suggested by Srinivas Pandruvada. V3: Move largely duplicate code to a subroutine. Suggested by Rafael J. Wysocki. V2: prepare for resend. Rebase to current kernel, 4.15-rc3. --- drivers/cpufreq/intel_pstate.c | 44 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 17e566af..4a08686 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -1939,13 +1939,49 @@ static int intel_cpufreq_verify_policy(struct cpufreq_policy *policy) return 0; } +/* Use of trace in passive mode: + * + * In passive mode the trace core_busy field (also known as the + * performance field, and lablelled as such on the graphs; also known as + * core_avg_perf) is not needed and so is re-assigned to indicate if the + * driver call was via the normal or fast switch path. Various graphs + * output from the intel_pstate_tracer.py utility that include core_busy + * (or performance or core_avg_perf) have a fixed y-axis from 0 to 100%, + * so we use 10 to indicate the the normal path through the driver, and + * 90 to indicate the fast switch path through the driver. + * The scaled_busy field is not used, and is set to 0. + */ + +#define INTEL_PSTATE_TRACE_TARGET 10 +#define INTEL_PSTATE_TRACE_FAST_SWITCH 90 + +static void intel_cpufreq_trace(struct cpudata *cpu, unsigned int trace_type, int old_pstate) +{ + struct sample *sample; + + if (!trace_pstate_sample_enabled()) + return; + if (!intel_pstate_sample(cpu, ktime_get())) + return; + sample = &cpu->sample; + trace_pstate_sample(trace_type, + 0, + old_pstate, + cpu->pstate.current_pstate, + sample->mperf, + sample->aperf, + sample->tsc, + get_avg_frequency(cpu), + fp_toint(cpu->iowait_boost * 100)); +} + static int intel_cpufreq_target(struct cpufreq_policy *policy, unsigned int target_freq, unsigned int relation) { struct cpudata *cpu = all_cpu_data[policy->cpu]; struct cpufreq_freqs freqs; - int target_pstate; + int target_pstate, old_pstate; update_turbo_state(); @@ -1965,12 +2001,14 @@ static int intel_cpufreq_target(struct cpufreq_policy *policy, break; } target_pstate = intel_pstate_prepare_request(cpu, target_pstate); + old_pstate = cpu->pstate.current_pstate; if (target_pstate != cpu->pstate.current_pstate) { cpu->pstate.current_pstate = target_pstate; wrmsrl_on_cpu(policy->cpu, MSR_IA32_PERF_CTL, pstate_funcs.get_val(cpu, target_pstate)); } freqs.new = target_pstate * cpu->pstate.scaling; + intel_cpufreq_trace(cpu, INTEL_PSTATE_TRACE_TARGET, old_pstate); cpufreq_freq_transition_end(policy, &freqs, false); return 0; @@ -1980,13 +2018,15 @@ static unsigned int intel_cpufreq_fast_switch(struct cpufreq_policy *policy, unsigned int target_freq) { struct cpudata *cpu = all_cpu_data[policy->cpu]; - int target_pstate; + int target_pstate, old_pstate; update_turbo_state(); target_pstate = DIV_ROUND_UP(target_freq, cpu->pstate.scaling); target_pstate = intel_pstate_prepare_request(cpu, target_pstate); + old_pstate = cpu->pstate.current_pstate; intel_pstate_update_pstate(cpu, target_pstate); + intel_cpufreq_trace(cpu, INTEL_PSTATE_TRACE_FAST_SWITCH, old_pstate); return target_pstate * cpu->pstate.scaling; }