From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932589AbcH1VCO (ORCPT ); Sun, 28 Aug 2016 17:02:14 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:36525 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932279AbcH1VCM (ORCPT ); Sun, 28 Aug 2016 17:02:12 -0400 X-IBM-Helo: d28dlp01.in.ibm.com X-IBM-MailFrom: maddy@linux.vnet.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org From: Madhavan Srinivasan To: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: Madhavan Srinivasan , Thomas Gleixner , Ingo Molnar , Peter Zijlstra , Jiri Olsa , Arnaldo Carvalho de Melo , Stephane Eranian , Russell King , Catalin Marinas , Will Deacon , Benjamin Herrenschmidt , Michael Ellerman , Sukadev Bhattiprolu Subject: [PATCH 03/13] perf/core: Update perf_*_sample() to include perf_arch_regs Date: Mon, 29 Aug 2016 02:30:48 +0530 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472418058-28659-1-git-send-email-maddy@linux.vnet.ibm.com> References: <1472418058-28659-1-git-send-email-maddy@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16082821-0060-0000-0000-00000116059F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16082821-0061-0000-0000-00000F2E5EF1 Message-Id: <1472418058-28659-4-git-send-email-maddy@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-08-28_10:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608280206 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org perf_prepare_sample is extended to include the perf_arch_regs_mask in the sample header size calculation. Update perf_output_sample() to dump the perf_arch_regs_mask to sample output. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Jiri Olsa Cc: Arnaldo Carvalho de Melo Cc: Stephane Eranian Cc: Russell King Cc: Catalin Marinas Cc: Will Deacon Cc: Benjamin Herrenschmidt Cc: Michael Ellerman Cc: Sukadev Bhattiprolu Signed-off-by: Madhavan Srinivasan --- kernel/events/core.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 8cf540275c34..274288819829 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -5780,12 +5780,14 @@ void perf_output_sample(struct perf_output_handle *handle, if (sample_type & PERF_SAMPLE_REGS_USER) { u64 abi = data->regs_user.abi; + u64 arch_regs_mask = data->regs_user.arch_regs_mask; /* * If there are no regs to dump, notice it through * first u64 being zero (PERF_SAMPLE_REGS_ABI_NONE). */ perf_output_put(handle, abi); + perf_output_put(handle, arch_regs_mask); if (abi) { u64 mask = event->attr.sample_regs_user; @@ -5812,11 +5814,14 @@ void perf_output_sample(struct perf_output_handle *handle, if (sample_type & PERF_SAMPLE_REGS_INTR) { u64 abi = data->regs_intr.abi; + u64 arch_regs_mask = data->regs_intr.arch_regs_mask; + /* * If there are no regs to dump, notice it through * first u64 being zero (PERF_SAMPLE_REGS_ABI_NONE). */ perf_output_put(handle, abi); + perf_output_put(handle, arch_regs_mask); if (abi) { u64 mask = event->attr.sample_regs_intr; @@ -5910,8 +5915,8 @@ void perf_prepare_sample(struct perf_event_header *header, &data->regs_user_copy); if (sample_type & PERF_SAMPLE_REGS_USER) { - /* regs dump ABI info */ - int size = sizeof(u64); + /* regs dump ABI info and arch_regs_mask */ + int size = sizeof(u64) * 2; if (data->regs_user.regs) { u64 mask = event->attr.sample_regs_user; @@ -5947,8 +5952,8 @@ void perf_prepare_sample(struct perf_event_header *header, } if (sample_type & PERF_SAMPLE_REGS_INTR) { - /* regs dump ABI info */ - int size = sizeof(u64); + /* regs dump ABI info and arch_regs_mask */ + int size = sizeof(u64) * 2; perf_sample_regs_intr(&data->regs_intr, regs); @@ -5956,6 +5961,9 @@ void perf_prepare_sample(struct perf_event_header *header, u64 mask = event->attr.sample_regs_intr; size += hweight64(mask) * sizeof(u64); + + mask = data->regs_intr.arch_regs_mask; + size += hweight64(mask) * sizeof(u64); } header->size += size; -- 2.7.4