From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756470AbaAFWRw (ORCPT ); Mon, 6 Jan 2014 17:17:52 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:58332 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755299AbaAFWRv (ORCPT ); Mon, 6 Jan 2014 17:17:51 -0500 From: "Rafael J. Wysocki" To: Prarit Bhargava Cc: linux-kernel@vger.kernel.org, Len Brown , "Rafael J. Wysocki" , Josh Triplett , Kristen Carlson Accardi Subject: Re: [PATCH] turbostat, servers do not support uncore power register Date: Mon, 06 Jan 2014 23:31:38 +0100 Message-ID: <1715797.v2zpxSt0AQ@vostro.rjw.lan> User-Agent: KMail/4.11.3 (Linux/3.13.0-rc6+; KDE/4.11.3; x86_64; ; ) In-Reply-To: <1387499242-30364-1-git-send-email-prarit@redhat.com> References: <1387499242-30364-1-git-send-email-prarit@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday, December 19, 2013 07:27:22 PM Prarit Bhargava wrote: > From the Intel Software Developer's Manual section 14.7.4, > > "For server platforms, PP1 domain is not supported, but its PP0 domain > supports the MSR_PP0_PERF_STATUS interface." > > When I run 'turbostat ls' I see the following error: > > /dev/cpu/0/msr offset 0x641 read failed > > because the server doesn't support the MSR_PP1_ENERGY_STATUS > register (0x641). This patch implements a get_msr_nowarn() which suppresses the > above warning and then sets !RAPL_GFX. > > Signed-off-by: Prarit Bhargava > Cc: Len Brown > Cc: "Rafael J. Wysocki" > Cc: Josh Triplett > Cc: Kristen Carlson Accardi Queued up for 3.14, thanks! > --- > tools/power/x86/turbostat/turbostat.c | 23 ++++++++++++++++++----- > 1 file changed, 18 insertions(+), 5 deletions(-) > > diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c > index 9d77f13..ff505c2 100644 > --- a/tools/power/x86/turbostat/turbostat.c > +++ b/tools/power/x86/turbostat/turbostat.c > @@ -219,7 +219,7 @@ int cpu_migrate(int cpu) > return 0; > } > > -int get_msr(int cpu, off_t offset, unsigned long long *msr) > +int _get_msr(int cpu, off_t offset, unsigned long long *msr, int warn) > { > ssize_t retval; > char pathname[32]; > @@ -234,13 +234,25 @@ int get_msr(int cpu, off_t offset, unsigned long long *msr) > close(fd); > > if (retval != sizeof *msr) { > - fprintf(stderr, "%s offset 0x%zx read failed\n", pathname, offset); > + if (warn) > + fprintf(stderr, "%s offset 0x%zx read failed\n", > + pathname, offset); > return -1; > } > > return 0; > } > > +int get_msr(int cpu, off_t offset, unsigned long long *msr) > +{ > + return _get_msr(cpu, offset, msr, 1); > +} > + > +int get_msr_nowarn(int cpu, off_t offset, unsigned long long *msr) > +{ > + return _get_msr(cpu, offset, msr, 0); > +} > + > void print_header(void) > { > if (show_pkg) > @@ -953,9 +965,10 @@ int get_counters(struct thread_data *t, struct core_data *c, struct pkg_data *p) > p->energy_dram = msr & 0xFFFFFFFF; > } > if (do_rapl & RAPL_GFX) { > - if (get_msr(cpu, MSR_PP1_ENERGY_STATUS, &msr)) > - return -16; > - p->energy_gfx = msr & 0xFFFFFFFF; > + if (get_msr_nowarn(cpu, MSR_PP1_ENERGY_STATUS, &msr)) > + do_rapl &= ~RAPL_GFX; /* unsupported on servers */ > + else > + p->energy_gfx = msr & 0xFFFFFFFF; > } > if (do_rapl & RAPL_PKG_PERF_STATUS) { > if (get_msr(cpu, MSR_PKG_PERF_STATUS, &msr)) > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.