From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12BF2C388F7 for ; Wed, 4 Nov 2020 01:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC4BF223C7 for ; Wed, 4 Nov 2020 01:44:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="PUSbB9Fd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730520AbgKDBoN (ORCPT ); Tue, 3 Nov 2020 20:44:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730431AbgKDBoJ (ORCPT ); Tue, 3 Nov 2020 20:44:09 -0500 Received: from mail-lf1-x141.google.com (mail-lf1-x141.google.com [IPv6:2a00:1450:4864:20::141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A85AAC040203 for ; Tue, 3 Nov 2020 17:44:08 -0800 (PST) Received: by mail-lf1-x141.google.com with SMTP id l28so24913399lfp.10 for ; Tue, 03 Nov 2020 17:44:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=gdC625JFiE2W57simQHJmNDK13PuYVLqMyBvUpicOvI=; b=PUSbB9FdfGn+p8e+WKdaZvziSwvt4YBZ52DDriLYfcVfMK+kOLr/+lsvIV/bp7Gfj0 Svs2F8Lp/bcyUsFUuCIuAhC/YX/fjAx0fyaZfSt3Oyhx7dtL5+rCaF0RZFrMUS+gzH/K pJvVKHnA1dfkyrO0eViw5ntIj7omrbrLCkZiMXsiocSh3vsUpEX99rxgLn601iAi41BM fizIZEnpVgXdrvi/FTvKDMOgQ9UrpQ7wlMmxJ+jmFLAY9BxDjsEZsvhpreEsUQJ3FHX0 L0buyKsL0O4EEn36/JE39F0hdCZpvvCMcajnGcykVf80eYGO/jb/JIKoEREVW4e64W4q UZvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=gdC625JFiE2W57simQHJmNDK13PuYVLqMyBvUpicOvI=; b=bVk7TAewP87PWefjVSKR/Kxr2SrCWPKqUMBXvCEdho9beev+9i921h528TKCPnWvTi 5ztwo7pTFmRtRhBiVce9jpEPiBH3VZJvkqRuA4FYtZozxaekkY7x46FSys4S806WzEWE EpPQZoE1Rz390A4L7Hm3C0yUZWC+mbya1Umn9ae8bTezi+hifQyGrkdNoQIL6YBWzSJa 0sJCmDxKZLIMAndV23znJhKEJTvFB2wdF41kRhngvRj/bGFH3ZupP00lZy1vq1euHJZX MUfQzTxe36+XP7m/gRAcPMZ8/GOBBEofy4TmIzFvBiVYFTzhZxIfIIqeShmIM3y//OEe 1CZg== X-Gm-Message-State: AOAM532kxH8/mueMfVO/cEdXMXSWBYnUyYNCkAPN5nzgq7eqSVqDptZ5 0YreX5RrGpBT8VY9obRcLTWQhKz9FeZ1r4GGpH7XTLtZnigs7w== X-Google-Smtp-Source: ABdhPJwvhB/YVRrG2WPlLlwQ1JThS05mkFKMYRKSFiF7P00XZQHW4zIwH2l42HTnSWtFYtyTIu3ch2dKG6iX1JSTFK0= X-Received: by 2002:ac2:4d96:: with SMTP id g22mr9449458lfe.335.1604454246669; Tue, 03 Nov 2020 17:44:06 -0800 (PST) MIME-Version: 1.0 References: <20201027072358.13725-1-victording@google.com> <20201027072358.13725-4-victording@google.com> <82f3070691438d3f651d2e5e5fb5499131cdbd15.camel@intel.com> In-Reply-To: From: Victor Ding Date: Wed, 4 Nov 2020 12:43:30 +1100 Message-ID: Subject: Re: [PATCH v3 3/4] powercap: Add AMD Fam17h RAPL support To: Srinivas Pandruvada Cc: Zhang Rui , LKML , Daniel Lezcano , Kim Phillips , linux-pm@vger.kernel.org, Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Joerg Roedel , Kan Liang , Pawan Gupta , "Peter Zijlstra (Intel)" , "Rafael J. Wysocki" , Sean Christopherson , Thomas Gleixner , Tony Luck , Vineela Tummalapalli , x86@kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 4, 2020 at 4:09 AM Srinivas Pandruvada wrote: > > On Tue, 2020-11-03 at 17:10 +1100, Victor Ding wrote: > > On Mon, Nov 2, 2020 at 12:39 PM Zhang Rui > > wrote: > > > On Tue, 2020-10-27 at 07:23 +0000, Victor Ding wrote: > > > > This patch enables AMD Fam17h RAPL support for the power capping > > > > framework. The support is as per AMD Fam17h Model31h (Zen2) and > > > > model 00-ffh (Zen1) PPR. > > > > > > > > Tested by comparing the results of following two sysfs entries > > > > and > > > > the > > > > values directly read from corresponding MSRs via > > > > /dev/cpu/[x]/msr: > > > > /sys/class/powercap/intel-rapl/intel-rapl:0/energy_uj > > > > /sys/class/powercap/intel-rapl/intel-rapl:0/intel- > > > > rapl:0:0/energy_uj > > Is this for just energy reporting? No capping of power? Correct, the hardware does not support capping of power. > > Thanks, > Srinivas > > > > > > > > > > Signed-off-by: Victor Ding > > > > Acked-by: Kim Phillips > > > > > > > > > > > > --- > > > > > > > > Changes in v3: > > > > By Victor Ding > > > > - Rebased to the latest code. > > > > - Created a new rapl_defaults for AMD CPUs. > > > > - Removed redundant setting to zeros. > > > > - Stopped using the fake power limit domain 1. > > > > > > > > Changes in v2: > > > > By Kim Phillips : > > > > - Added Kim's Acked-by. > > > > - Added Daniel Lezcano to Cc. > > > > - (No code change). > > > > > > > > arch/x86/include/asm/msr-index.h | 1 + > > > > drivers/powercap/intel_rapl_common.c | 6 ++++++ > > > > drivers/powercap/intel_rapl_msr.c | 20 +++++++++++++++++++- > > > > 3 files changed, 26 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/arch/x86/include/asm/msr-index.h > > > > b/arch/x86/include/asm/msr-index.h > > > > index 21917e134ad4..c36a083c8ec0 100644 > > > > --- a/arch/x86/include/asm/msr-index.h > > > > +++ b/arch/x86/include/asm/msr-index.h > > > > @@ -327,6 +327,7 @@ > > > > #define MSR_PP1_POLICY 0x00000642 > > > > > > > > #define MSR_AMD_RAPL_POWER_UNIT 0xc0010299 > > > > +#define MSR_AMD_CORE_ENERGY_STATUS 0xc001029a > > > > #define MSR_AMD_PKG_ENERGY_STATUS 0xc001029b > > > > > > > > /* Config TDP MSRs */ > > > > diff --git a/drivers/powercap/intel_rapl_common.c > > > > b/drivers/powercap/intel_rapl_common.c > > > > index 0b2830efc574..bedd780bed12 100644 > > > > --- a/drivers/powercap/intel_rapl_common.c > > > > +++ b/drivers/powercap/intel_rapl_common.c > > > > @@ -1011,6 +1011,10 @@ static const struct rapl_defaults > > > > rapl_defaults_cht = { > > > > .compute_time_window = rapl_compute_time_window_atom, > > > > }; > > > > > > > > +static const struct rapl_defaults rapl_defaults_amd = { > > > > + .check_unit = rapl_check_unit_core, > > > > +}; > > > > + > > > > > > why do we need power_unit and time_unit if we only want to expose > > > the > > > energy counter? > > AMD's Power Unit MSR provides identical information as Intel's, > > including > > time units, power units, and energy status units. By reusing the > > check unit > > method, we could avoid code duplication as well as easing future > > enhance- > > ment when AMD starts to support power limits. > > > Plus, in rapl_init_domains(), PL1 is enabled for every RAPL Domain > > > blindly, I'm not sure how this is handled on the AMD CPUs. > > > Is PL1 invalidated by rapl_detect_powerlimit()? or is it still > > > registered as a valid constraint into powercap sysfs I/F? > > AMD's CORE_ENERGY_STAT MSR is like Intel's PP0_ENERGY_STATUS; > > therefore, PL1 also always exists on AMD. rapl_detect_powerlimit() > > correctly > > markes the domain as monitoring-only after finding power limit MSRs > > do not > > exist. > > > Currently, the code makes the assumption that there is only on > > > power > > > limit if priv->limits[domain_id] not set, we probably need to > > > change > > > this if we want to support RAPL domains with no power limit. > > The existing code already supports RAPL domains with no power limit: > > PL1 is > > enabled when there is zero or one power limit, > > rapl_detect_powerlimit() will then > > mark if PL1 is monitoring-only if power limit MSRs do not exist. Both > > AMD's RAPL > > domains are monitoring-only and are correctly marked and handled. > > > thanks, > > > rui > > > > static const struct x86_cpu_id rapl_ids[] __initconst = { > > > > X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE, &rapl_defau > > > > lt > > > > s_core), > > > > X86_MATCH_INTEL_FAM6_MODEL(SANDYBRIDGE_X, &rapl_defau > > > > lts_core), > > > > @@ -1061,6 +1065,8 @@ static const struct x86_cpu_id rapl_ids[] > > > > __initconst = { > > > > > > > > X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNL, &rapl_defau > > > > lts_hsw_se > > > > rver), > > > > X86_MATCH_INTEL_FAM6_MODEL(XEON_PHI_KNM, &rapl_defau > > > > lts_hsw_se > > > > rver), > > > > + > > > > + X86_MATCH_VENDOR_FAM(AMD, 0x17, &rapl_defaults_amd), > > > > {} > > > > }; > > > > MODULE_DEVICE_TABLE(x86cpu, rapl_ids); > > > > diff --git a/drivers/powercap/intel_rapl_msr.c > > > > b/drivers/powercap/intel_rapl_msr.c > > > > index a819b3b89b2f..78213d4b5b16 100644 > > > > --- a/drivers/powercap/intel_rapl_msr.c > > > > +++ b/drivers/powercap/intel_rapl_msr.c > > > > @@ -49,6 +49,14 @@ static struct rapl_if_priv rapl_msr_priv_intel > > > > = { > > > > .limits[RAPL_DOMAIN_PLATFORM] = 2, > > > > }; > > > > > > > > +static struct rapl_if_priv rapl_msr_priv_amd = { > > > > + .reg_unit = MSR_AMD_RAPL_POWER_UNIT, > > > > + .regs[RAPL_DOMAIN_PACKAGE] = { > > > > + 0, MSR_AMD_PKG_ENERGY_STATUS, 0, 0, 0 }, > > > > + .regs[RAPL_DOMAIN_PP0] = { > > > > + 0, MSR_AMD_CORE_ENERGY_STATUS, 0, 0, 0 }, > > > > +}; > > > > + > > > > /* Handles CPU hotplug on multi-socket systems. > > > > * If a CPU goes online as the first CPU of the physical package > > > > * we add the RAPL package to the system. Similarly, when the > > > > last > > > > @@ -138,7 +146,17 @@ static int rapl_msr_probe(struct > > > > platform_device > > > > *pdev) > > > > const struct x86_cpu_id *id = > > > > x86_match_cpu(pl4_support_ids); > > > > int ret; > > > > > > > > - rapl_msr_priv = &rapl_msr_priv_intel; > > > > + switch (boot_cpu_data.x86_vendor) { > > > > + case X86_VENDOR_INTEL: > > > > + rapl_msr_priv = &rapl_msr_priv_intel; > > > > + break; > > > > + case X86_VENDOR_AMD: > > > > + rapl_msr_priv = &rapl_msr_priv_amd; > > > > + break; > > > > + default: > > > > + pr_err("intel-rapl does not support CPU vendor > > > > %d\n", > > > > boot_cpu_data.x86_vendor); > > > > + return -ENODEV; > > > > + } > > > > rapl_msr_priv->read_raw = rapl_msr_read_raw; > > > > rapl_msr_priv->write_raw = rapl_msr_write_raw; > > > > > > Best regards, > > Victor Ding > Best regards, Victor Ding