From patchwork Wed Nov 4 20:46:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madhavan Srinivasan X-Patchwork-Id: 7553271 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 7B82CBEEA4 for ; Wed, 4 Nov 2015 20:49:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 772C920643 for ; Wed, 4 Nov 2015 20:49:10 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5357620640 for ; Wed, 4 Nov 2015 20:49:09 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zu4xl-0007AC-Po; Wed, 04 Nov 2015 20:47:21 +0000 Received: from e28smtp05.in.ibm.com ([122.248.162.5]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Zu4xU-00072c-W2 for linux-arm-kernel@lists.infradead.org; Wed, 04 Nov 2015 20:47:07 +0000 Received: from /spool/local by e28smtp05.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 5 Nov 2015 02:16:41 +0530 Received: from d28dlp01.in.ibm.com (9.184.220.126) by e28smtp05.in.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 5 Nov 2015 02:16:40 +0530 X-Helo: d28dlp01.in.ibm.com X-MailFrom: maddy@linux.vnet.ibm.com X-RcptTo: linux-arm-kernel@lists.infradead.org Received: from d28relay01.in.ibm.com (d28relay01.in.ibm.com [9.184.220.58]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 94768E004C for ; Thu, 5 Nov 2015 02:16:56 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay01.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tA4KkdwG3473882 for ; Thu, 5 Nov 2015 02:16:39 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tA4KkbPq028085 for ; Thu, 5 Nov 2015 02:16:38 +0530 Received: from SrihariMadhavan.ibm.com ([9.80.69.130]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id tA4KkL12027305; Thu, 5 Nov 2015 02:16:34 +0530 From: Madhavan Srinivasan To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org Subject: [RFC PATCH 2/3]perf/powerpc: update macros and add regs to arch_misc_reg struct Date: Thu, 5 Nov 2015 02:16:17 +0530 Message-Id: <1446669978-6366-3-git-send-email-maddy@linux.vnet.ibm.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1446669978-6366-1-git-send-email-maddy@linux.vnet.ibm.com> References: <1446669978-6366-1-git-send-email-maddy@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15110420-0017-0000-0000-0000083A4D56 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151104_124705_644360_D917639F X-CRM114-Status: GOOD ( 14.64 ) X-Spam-Score: -4.2 (----) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Madhavan Srinivasan , Peter Zijlstra , Benjamin Herrenschmidt , Arnaldo Carvalho de Melo , Jiri Olsa , Michael Ellerman , Thomas Gleixner , Sukadev Bhattiprolu , Ingo Molnar MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Patch updates the arch_misc_regs struct (arch/powerpc/ptrace.h) with arch/powerpc specific regs (PMU regs). Updates asm/perf_regs.h and perf_regs.c with corresponding macros to export the arch_misc_reg values. Signed-off-by: Madhavan Srinivasan Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Jiri Olsa CC: Arnaldo Carvalho de Melo Cc: Benjamin Herrenschmidt Cc: Michael Ellerman Cc: Sukadev Bhattiprolu --- Will really appreciate comments and feedback for the patch. arch/powerpc/include/uapi/asm/perf_regs.h | 10 ++++++++++ arch/powerpc/include/uapi/asm/ptrace.h | 11 ++++++++++- arch/powerpc/perf/perf_regs.c | 28 +++++++++++++++++++++++++--- tools/perf/arch/powerpc/include/perf_regs.h | 16 ++++++++++++++++ 4 files changed, 61 insertions(+), 4 deletions(-) -- 1.9.1 diff --git a/arch/powerpc/include/uapi/asm/perf_regs.h b/arch/powerpc/include/uapi/asm/perf_regs.h index 30fb601bdbb2..2d170734f47d 100644 --- a/arch/powerpc/include/uapi/asm/perf_regs.h +++ b/arch/powerpc/include/uapi/asm/perf_regs.h @@ -49,6 +49,16 @@ enum perf_event_powerpc_regs { PERF_REG_POWERPC_TRAP, PERF_REG_POWERPC_DAR, PERF_REG_POWERPC_DSISR, + PERF_REG_POWERPC_PMC1, + PERF_REG_POWERPC_PMC2, + PERF_REG_POWERPC_PMC3, + PERF_REG_POWERPC_PMC4, + PERF_REG_POWERPC_PMC5, + PERF_REG_POWERPC_PMC6, + PERF_REG_POWERPC_MMCR0, + PERF_REG_POWERPC_MMCR1, + PERF_REG_POWERPC_MAX, + PERF_REG_PT_REGS_END = PERF_REG_POWERPC_DSISR + 1, }; #endif /* _ASM_POWERPC_PERF_REGS_H */ diff --git a/arch/powerpc/include/uapi/asm/ptrace.h b/arch/powerpc/include/uapi/asm/ptrace.h index 0025651ab8bc..5e9b3259ef78 100644 --- a/arch/powerpc/include/uapi/asm/ptrace.h +++ b/arch/powerpc/include/uapi/asm/ptrace.h @@ -51,7 +51,16 @@ struct pt_regs { unsigned long result; /* Result of a system call */ }; -struct arch_misc_regs {}; +struct arch_misc_regs { + unsigned long pmc1; + unsigned long pmc2; + unsigned long pmc3; + unsigned long pmc4; + unsigned long pmc5; + unsigned long pmc6; + unsigned long mmcr0; + unsigned long mmcr1; +}; #endif /* __ASSEMBLY__ */ diff --git a/arch/powerpc/perf/perf_regs.c b/arch/powerpc/perf/perf_regs.c index f7995b46078a..48e479c91fb2 100644 --- a/arch/powerpc/perf/perf_regs.c +++ b/arch/powerpc/perf/perf_regs.c @@ -8,8 +8,11 @@ #include #define PT_REGS_OFFSET(id, r) [id] = offsetof(struct pt_regs, r) +#define ARCH_REGS_OFFSET(id, r) [id] = offsetof(struct arch_misc_regs, r) #define REG_RESERVED (~((1ULL << PERF_REG_POWERPC_MAX) - 1)) +#define MAX_ARCH_REG_OFFSET (offsetof(struct arch_misc_regs, mmcr1)) + static unsigned int pt_regs_offset[PERF_REG_POWERPC_MAX] = { PT_REGS_OFFSET(PERF_REG_POWERPC_GPR0, gpr[0]), @@ -59,15 +62,34 @@ static unsigned int pt_regs_offset[PERF_REG_POWERPC_MAX] = { PT_REGS_OFFSET(PERF_REG_POWERPC_TRAP, trap), PT_REGS_OFFSET(PERF_REG_POWERPC_DAR, dar), PT_REGS_OFFSET(PERF_REG_POWERPC_DSISR, dsisr), + ARCH_REGS_OFFSET(PERF_REG_POWERPC_PMC1, pmc1), + ARCH_REGS_OFFSET(PERF_REG_POWERPC_PMC2, pmc2), + ARCH_REGS_OFFSET(PERF_REG_POWERPC_PMC3, pmc3), + ARCH_REGS_OFFSET(PERF_REG_POWERPC_PMC4, pmc4), + ARCH_REGS_OFFSET(PERF_REG_POWERPC_PMC5, pmc5), + ARCH_REGS_OFFSET(PERF_REG_POWERPC_PMC6, pmc6), + ARCH_REGS_OFFSET(PERF_REG_POWERPC_MMCR0, mmcr0), + ARCH_REGS_OFFSET(PERF_REG_POWERPC_MMCR1, mmcr1), }; -u64 perf_reg_value(struct perf_regs *p_regs, int idx) +static inline unsigned long +arch_regs_get_register(struct arch_misc_regs *regs, unsigned int offset) { - struct pt_regs *regs = p_regs->regs; + if (unlikely(offset > MAX_ARCH_REG_OFFSET)) + return 0; + return *(unsigned long *)((unsigned long)regs + offset); +} +u64 perf_reg_value(struct perf_regs *p_regs, int idx) +{ if (WARN_ON_ONCE(idx >= PERF_REG_POWERPC_MAX)) return 0; - return regs_get_register(regs, pt_regs_offset[idx]); + + if (idx >= PERF_REG_PT_REGS_END) + return arch_regs_get_register(p_regs->arch_regs, + pt_regs_offset[idx]); + else + return regs_get_register(p_regs->regs, pt_regs_offset[idx]); } int perf_reg_validate(u64 mask) diff --git a/tools/perf/arch/powerpc/include/perf_regs.h b/tools/perf/arch/powerpc/include/perf_regs.h index 47307ca19c28..e0d23b274644 100644 --- a/tools/perf/arch/powerpc/include/perf_regs.h +++ b/tools/perf/arch/powerpc/include/perf_regs.h @@ -106,6 +106,22 @@ static inline const char *perf_reg_name(int id) return "dar"; case PERF_REG_POWERPC_DSISR: return "dsisr"; + case PERF_REG_POWERPC_PMC1: + return "pmc1"; + case PERF_REG_POWERPC_PMC2: + return "pmc2"; + case PERF_REG_POWERPC_PMC3: + return "pmc3"; + case PERF_REG_POWERPC_PMC4: + return "pmc4"; + case PERF_REG_POWERPC_PMC5: + return "pmc5"; + case PERF_REG_POWERPC_PMC6: + return "pmc6"; + case PERF_REG_POWERPC_MMCR0: + return "mmcr0"; + case PERF_REG_POWERPC_MMCR1: + return "mmcr1"; default: return NULL; }