From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932654AbcH1VCe (ORCPT ); Sun, 28 Aug 2016 17:02:34 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:35124 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932502AbcH1VCb (ORCPT ); Sun, 28 Aug 2016 17:02:31 -0400 X-IBM-Helo: d28dlp03.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 10/13] tool/perf: Add support for perf_arch_regs Date: Mon, 29 Aug 2016 02:30:55 +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-0056-0000-0000-000002DB11B2 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16082821-0057-0000-0000-00000FB66E33 Message-Id: <1472418058-28659-11-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 Update the structure regs_dump with the arch_regs_mask variable. Update perf_evsel__parse_sample() and perf_event__sample_event_size() to include arch_regs_mask variable. 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 --- tools/perf/util/event.h | 1 + tools/perf/util/evsel.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h index 8d363d5e65a2..aee0ff536e29 100644 --- a/tools/perf/util/event.h +++ b/tools/perf/util/event.h @@ -94,6 +94,7 @@ struct sample_event { struct regs_dump { u64 abi; u64 mask; + u64 arch_regs_mask; u64 *regs; /* Cached values/mask filled by first register access. */ diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 21fd573106ed..aac8820b3bd5 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -1902,6 +1902,8 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event, OVERFLOW_CHECK_u64(array); data->user_regs.abi = *array; array++; + data->user_regs.arch_regs_mask = *array; + array++; if (data->user_regs.abi) { u64 mask = evsel->attr.sample_regs_user; @@ -1961,11 +1963,14 @@ int perf_evsel__parse_sample(struct perf_evsel *evsel, union perf_event *event, OVERFLOW_CHECK_u64(array); data->intr_regs.abi = *array; array++; + data->intr_regs.arch_regs_mask = *array; + array++; if (data->intr_regs.abi != PERF_SAMPLE_REGS_ABI_NONE) { u64 mask = evsel->attr.sample_regs_intr; sz = hweight_long(mask) * sizeof(u64); + sz += hweight_long(data->intr_regs.arch_regs_mask) * sizeof(u64); OVERFLOW_CHECK(array, sz, max_size); data->intr_regs.mask = mask; data->intr_regs.regs = (u64 *)array; @@ -2044,6 +2049,7 @@ size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type, if (sample->user_regs.abi) { result += sizeof(u64); sz = hweight_long(sample->user_regs.mask) * sizeof(u64); + sz += hweight_long(sample->user_regs.arch_regs_mask) * sizeof(u64); result += sz; } else { result += sizeof(u64); @@ -2072,6 +2078,7 @@ size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type, if (sample->intr_regs.abi) { result += sizeof(u64); sz = hweight_long(sample->intr_regs.mask) * sizeof(u64); + sz += hweight_long(sample->intr_regs.arch_regs_mask) * sizeof(u64); result += sz; } else { result += sizeof(u64); @@ -2223,7 +2230,9 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, if (type & PERF_SAMPLE_REGS_USER) { if (sample->user_regs.abi) { *array++ = sample->user_regs.abi; + *array++ = sample->user_regs.arch_regs_mask; sz = hweight_long(sample->user_regs.mask) * sizeof(u64); + sz += hweight_long(sample->user_regs.arch_regs_mask) * sizeof(u64); memcpy(array, sample->user_regs.regs, sz); array = (void *)array + sz; } else { @@ -2259,7 +2268,9 @@ int perf_event__synthesize_sample(union perf_event *event, u64 type, if (type & PERF_SAMPLE_REGS_INTR) { if (sample->intr_regs.abi) { *array++ = sample->intr_regs.abi; + *array++ = sample->intr_regs.arch_regs_mask; sz = hweight_long(sample->intr_regs.mask) * sizeof(u64); + sz += hweight_long(sample->intr_regs.arch_regs_mask) * sizeof(u64); memcpy(array, sample->intr_regs.regs, sz); array = (void *)array + sz; } else { -- 2.7.4