From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758105AbcAYVKU (ORCPT ); Mon, 25 Jan 2016 16:10:20 -0500 Received: from mail.kernel.org ([198.145.29.136]:44897 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756832AbcAYVKQ (ORCPT ); Mon, 25 Jan 2016 16:10:16 -0500 Date: Mon, 25 Jan 2016 18:10:11 -0300 From: Arnaldo Carvalho de Melo To: Adrian Hunter Cc: Mathieu Poirier , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Peter Zijlstra , Ingo Molnar Subject: Re: [PATCH V8 22/23] perf tools: making coresight PMU listable Message-ID: <20160125211011.GD22501@kernel.org> References: <1452807977-8069-1-git-send-email-mathieu.poirier@linaro.org> <1452807977-8069-23-git-send-email-mathieu.poirier@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, Jan 25, 2016 at 01:49:47PM -0700, Mathieu Poirier escreveu: > On 14 January 2016 at 14:46, Mathieu Poirier wrote: > > Adding the required mechanic allowing 'perf list pmu' to > > discover coresight ETM/PTM tracers. > > > > Cc: Peter Zijlstra > > Cc: Ingo Molnar > > Cc: Arnaldo Carvalho de Melo > > Signed-off-by: Mathieu Poirier > > --- > > MAINTAINERS | 1 + > > tools/perf/arch/arm/util/Build | 2 ++ > > tools/perf/arch/arm/util/pmu.c | 34 ++++++++++++++++++++++++++++++++++ > > tools/perf/config/Makefile | 17 ++++++++++++----- > > 4 files changed, 49 insertions(+), 5 deletions(-) > > create mode 100644 tools/perf/arch/arm/util/pmu.c > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 233f83464814..b2a92245eece 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -1007,6 +1007,7 @@ F: drivers/hwtracing/coresight/* > > F: Documentation/trace/coresight.txt > > F: Documentation/devicetree/bindings/arm/coresight.txt > > F: Documentation/ABI/testing/sysfs-bus-coresight-devices-* > > +F: tools/perf/arch/arm/util/pmu.c > > > > ARM/CORGI MACHINE SUPPORT > > M: Richard Purdie > > diff --git a/tools/perf/arch/arm/util/Build b/tools/perf/arch/arm/util/Build > > index d22e3d07de3d..66ab0b05549c 100644 > > --- a/tools/perf/arch/arm/util/Build > > +++ b/tools/perf/arch/arm/util/Build > > @@ -2,3 +2,5 @@ libperf-$(CONFIG_DWARF) += dwarf-regs.o > > > > libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o > > libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o > > + > > +libperf-$(CONFIG_AUXTRACE) += pmu.o > > diff --git a/tools/perf/arch/arm/util/pmu.c b/tools/perf/arch/arm/util/pmu.c > > new file mode 100644 > > index 000000000000..af9fb666b44f > > --- /dev/null > > +++ b/tools/perf/arch/arm/util/pmu.c > > @@ -0,0 +1,34 @@ > > +/* > > + * Copyright(C) 2015 Linaro Limited. All rights reserved. > > + * Author: Mathieu Poirier > > + * > > + * This program is free software; you can redistribute it and/or modify it > > + * under the terms of the GNU General Public License version 2 as published by > > + * the Free Software Foundation. > > + * > > + * This program is distributed in the hope that it will be useful, but WITHOUT > > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > > + * more details. > > + * > > + * You should have received a copy of the GNU General Public License along with > > + * this program. If not, see . > > + */ > > + > > +#include > > +#include > > +#include > > + > > +#include "../../util/pmu.h" > > + > > +struct perf_event_attr > > +*perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused) > > +{ > > +#ifdef HAVE_AUXTRACE_SUPPORT > > + if (!strcmp(pmu->name, CORESIGHT_ETM_PMU_NAME)) { > > + /* add ETM default config here */ > > + pmu->selectable = true; > > + } > > +#endif > > + return NULL; > > +} > > diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile > > index de89ec574361..905faabff8b1 100644 > > --- a/tools/perf/config/Makefile > > +++ b/tools/perf/config/Makefile > > @@ -647,12 +647,19 @@ ifdef LIBBABELTRACE > > endif > > > > ifndef NO_AUXTRACE > > - ifeq ($(feature-get_cpuid), 0) > > - msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc); > > - NO_AUXTRACE := 1 > > + ifeq ($(ARCH),x86) > > + ifeq ($(feature-get_cpuid), 0) > > + msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc); > > + NO_AUXTRACE := 1 > > + else > > + $(call detected,CONFIG_AUXTRACE) > > + CFLAGS += -DHAVE_AUXTRACE_SUPPORT > > + endif > > else > > - $(call detected,CONFIG_AUXTRACE) > > - CFLAGS += -DHAVE_AUXTRACE_SUPPORT > > + ifeq ($(ARCH),$(filter $(ARCH), arm arm64)) > > + $(call detected,CONFIG_AUXTRACE) > > + CFLAGS += -DHAVE_AUXTRACE_SUPPORT > > + endif > > endif > > endif > > > > -- > > 2.1.4 > > > > Arnaldo, > > This is the third (of four) patch that I can't queue without a > reviewed by from you. > > It has been rebased to 4.5-rc1 here [1] for your convenience. I will > be happy to use another baseline should that be more adequate for you. Adrian, Are you ok with this? - Arnaldo From mboxrd@z Thu Jan 1 00:00:00 1970 From: acme@kernel.org (Arnaldo Carvalho de Melo) Date: Mon, 25 Jan 2016 18:10:11 -0300 Subject: [PATCH V8 22/23] perf tools: making coresight PMU listable In-Reply-To: References: <1452807977-8069-1-git-send-email-mathieu.poirier@linaro.org> <1452807977-8069-23-git-send-email-mathieu.poirier@linaro.org> Message-ID: <20160125211011.GD22501@kernel.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Em Mon, Jan 25, 2016 at 01:49:47PM -0700, Mathieu Poirier escreveu: > On 14 January 2016 at 14:46, Mathieu Poirier wrote: > > Adding the required mechanic allowing 'perf list pmu' to > > discover coresight ETM/PTM tracers. > > > > Cc: Peter Zijlstra > > Cc: Ingo Molnar > > Cc: Arnaldo Carvalho de Melo > > Signed-off-by: Mathieu Poirier > > --- > > MAINTAINERS | 1 + > > tools/perf/arch/arm/util/Build | 2 ++ > > tools/perf/arch/arm/util/pmu.c | 34 ++++++++++++++++++++++++++++++++++ > > tools/perf/config/Makefile | 17 ++++++++++++----- > > 4 files changed, 49 insertions(+), 5 deletions(-) > > create mode 100644 tools/perf/arch/arm/util/pmu.c > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 233f83464814..b2a92245eece 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -1007,6 +1007,7 @@ F: drivers/hwtracing/coresight/* > > F: Documentation/trace/coresight.txt > > F: Documentation/devicetree/bindings/arm/coresight.txt > > F: Documentation/ABI/testing/sysfs-bus-coresight-devices-* > > +F: tools/perf/arch/arm/util/pmu.c > > > > ARM/CORGI MACHINE SUPPORT > > M: Richard Purdie > > diff --git a/tools/perf/arch/arm/util/Build b/tools/perf/arch/arm/util/Build > > index d22e3d07de3d..66ab0b05549c 100644 > > --- a/tools/perf/arch/arm/util/Build > > +++ b/tools/perf/arch/arm/util/Build > > @@ -2,3 +2,5 @@ libperf-$(CONFIG_DWARF) += dwarf-regs.o > > > > libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o > > libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o > > + > > +libperf-$(CONFIG_AUXTRACE) += pmu.o > > diff --git a/tools/perf/arch/arm/util/pmu.c b/tools/perf/arch/arm/util/pmu.c > > new file mode 100644 > > index 000000000000..af9fb666b44f > > --- /dev/null > > +++ b/tools/perf/arch/arm/util/pmu.c > > @@ -0,0 +1,34 @@ > > +/* > > + * Copyright(C) 2015 Linaro Limited. All rights reserved. > > + * Author: Mathieu Poirier > > + * > > + * This program is free software; you can redistribute it and/or modify it > > + * under the terms of the GNU General Public License version 2 as published by > > + * the Free Software Foundation. > > + * > > + * This program is distributed in the hope that it will be useful, but WITHOUT > > + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or > > + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for > > + * more details. > > + * > > + * You should have received a copy of the GNU General Public License along with > > + * this program. If not, see . > > + */ > > + > > +#include > > +#include > > +#include > > + > > +#include "../../util/pmu.h" > > + > > +struct perf_event_attr > > +*perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused) > > +{ > > +#ifdef HAVE_AUXTRACE_SUPPORT > > + if (!strcmp(pmu->name, CORESIGHT_ETM_PMU_NAME)) { > > + /* add ETM default config here */ > > + pmu->selectable = true; > > + } > > +#endif > > + return NULL; > > +} > > diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile > > index de89ec574361..905faabff8b1 100644 > > --- a/tools/perf/config/Makefile > > +++ b/tools/perf/config/Makefile > > @@ -647,12 +647,19 @@ ifdef LIBBABELTRACE > > endif > > > > ifndef NO_AUXTRACE > > - ifeq ($(feature-get_cpuid), 0) > > - msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc); > > - NO_AUXTRACE := 1 > > + ifeq ($(ARCH),x86) > > + ifeq ($(feature-get_cpuid), 0) > > + msg := $(warning Your gcc lacks the __get_cpuid() builtin, disables support for auxtrace/Intel PT, please install a newer gcc); > > + NO_AUXTRACE := 1 > > + else > > + $(call detected,CONFIG_AUXTRACE) > > + CFLAGS += -DHAVE_AUXTRACE_SUPPORT > > + endif > > else > > - $(call detected,CONFIG_AUXTRACE) > > - CFLAGS += -DHAVE_AUXTRACE_SUPPORT > > + ifeq ($(ARCH),$(filter $(ARCH), arm arm64)) > > + $(call detected,CONFIG_AUXTRACE) > > + CFLAGS += -DHAVE_AUXTRACE_SUPPORT > > + endif > > endif > > endif > > > > -- > > 2.1.4 > > > > Arnaldo, > > This is the third (of four) patch that I can't queue without a > reviewed by from you. > > It has been rebased to 4.5-rc1 here [1] for your convenience. I will > be happy to use another baseline should that be more adequate for you. Adrian, Are you ok with this? - Arnaldo