From patchwork Mon Nov 30 02:14:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 57413 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1179863lbb; Sun, 29 Nov 2015 18:18:09 -0800 (PST) X-Received: by 10.98.14.129 with SMTP id 1mr67179766pfo.161.1448849889285; Sun, 29 Nov 2015 18:18:09 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g14si3273100pfd.164.2015.11.29.18.18.09; Sun, 29 Nov 2015 18:18:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753449AbbK3CSF (ORCPT + 28 others); Sun, 29 Nov 2015 21:18:05 -0500 Received: from mail-pa0-f51.google.com ([209.85.220.51]:34269 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752473AbbK3CSA (ORCPT ); Sun, 29 Nov 2015 21:18:00 -0500 Received: by padhx2 with SMTP id hx2so168049545pad.1 for ; Sun, 29 Nov 2015 18:17:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oxMHm8Z/W6Fxm4/FZRkofuCrWyV0UNv6GHc9bzig91U=; b=cu7CTcc4hoXDVpPzS2KQy5dH50jnHIQRjukiZIq5BlR+GBq9PP1BODNDbe+TpucidN Az+ZUZOePVwXqCDxYa4wLC6CfYyYwJYfHRfqlZJNXwmncY08o93tcwaEhI+XnGkAOBLt y7HiaoafL74qmjdti5WBdSZOLSchJs7bdWJ+z/rYoFehdyih3nxkddsa/kFF7/ZU0rYW LXY0o4zCh1y7wPG1dHjyEl2mmfHNTp9NQzv44mevI3+bvNxB5nlnF5IUfLfDUSGTk0L2 i5VG0SbpkedkEOxZt99HUxiqvptOW3OxqK5N27LPPSP2avcx3/Om5gfx5CyWQiF4BwB8 ITxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oxMHm8Z/W6Fxm4/FZRkofuCrWyV0UNv6GHc9bzig91U=; b=G6V9iAgwrvjhzCIcPNSn4csHspOgiHhS5Gm3wV+eVgRmag7AmmVW53Cvc2D4UCyToA fFLu4bLHVAC44OryV8ybCqWcaX0uh+ilQIA3NjG0786yzngxz+CpUAJK/UcaoiIKys9o YHVDQt+th6dIp6IwJJIgurf3JEc9P9SFecy1WsUHnvGzw08WxpL6EaoWRjDR/Ye1XT4Z k5FthYGXVLMkSuF7rZig6LUgdcoPZ0OiER1G5Rl43DFHly5Xr8OyrV3nF9OOuxAjHc88 VrVozYx9IVAE4xx2pPNuxhAvipCyoxdxI4OJRsSMsJP9pBwxCq7rl5xMqV0ZpNQ+cHZU KrEQ== X-Gm-Message-State: ALoCoQnK6AKIACfS4lML+9CD8IkzCuWFp4A7WFcIhjWxKzrYCA0YyNdoG0GTMhotV0R09e2ARYDL X-Received: by 10.66.144.103 with SMTP id sl7mr72350524pab.3.1448849879215; Sun, 29 Nov 2015 18:17:59 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id n16sm47168818pfa.53.2015.11.29.18.17.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Nov 2015 18:17:58 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org, alexander.shishkin@linux.intel.com Cc: zhang.chunyan@linaro.org, mike.leach@arm.com, tor@ti.com, al.grant@arm.com, pawel.moll@arm.com, fainelli@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Mathieu Poirier , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo Subject: [PATCH V5 24/26] perf tools: adding perf_session to *info_prive_size() Date: Sun, 29 Nov 2015 19:14:45 -0700 Message-Id: <1448849687-5724-25-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1448849687-5724-1-git-send-email-mathieu.poirier@linaro.org> References: <1448849687-5724-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On some architecture the size of the private header may be dependent on the number of tracers used in the session. As such adding a "struct perf_session" parameter, which should contain all the required information. Also adjusting the existing client of the interface to take the new parameter into account. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Signed-off-by: Mathieu Poirier --- tools/perf/arch/x86/util/intel-bts.c | 4 +++- tools/perf/arch/x86/util/intel-pt.c | 4 +++- tools/perf/util/auxtrace.c | 7 ++++--- tools/perf/util/auxtrace.h | 6 ++++-- 4 files changed, 14 insertions(+), 7 deletions(-) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/tools/perf/arch/x86/util/intel-bts.c b/tools/perf/arch/x86/util/intel-bts.c index 9b94ce520917..6efdc5e86d97 100644 --- a/tools/perf/arch/x86/util/intel-bts.c +++ b/tools/perf/arch/x86/util/intel-bts.c @@ -60,7 +60,9 @@ struct branch { u64 misc; }; -static size_t intel_bts_info_priv_size(struct auxtrace_record *itr __maybe_unused) +static size_t +intel_bts_info_priv_size(struct auxtrace_record *itr __maybe_unused, + struct perf_session *session __maybe_unused) { return INTEL_BTS_AUXTRACE_PRIV_SIZE; } diff --git a/tools/perf/arch/x86/util/intel-pt.c b/tools/perf/arch/x86/util/intel-pt.c index b02af064f0f9..ad4e45c6eb9d 100644 --- a/tools/perf/arch/x86/util/intel-pt.c +++ b/tools/perf/arch/x86/util/intel-pt.c @@ -273,7 +273,9 @@ intel_pt_pmu_default_config(struct perf_pmu *intel_pt_pmu) return attr; } -static size_t intel_pt_info_priv_size(struct auxtrace_record *itr __maybe_unused) +static size_t +intel_pt_info_priv_size(struct auxtrace_record *itr __maybe_unused, + struct perf_session *session __maybe_unused) { return INTEL_PT_AUXTRACE_PRIV_SIZE; } diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index 7f10430af39c..90dc11ccf929 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c @@ -478,10 +478,11 @@ void auxtrace_heap__pop(struct auxtrace_heap *heap) heap_array[last].ordinal); } -size_t auxtrace_record__info_priv_size(struct auxtrace_record *itr) +size_t auxtrace_record__info_priv_size(struct auxtrace_record *itr, + struct perf_session *session) { if (itr) - return itr->info_priv_size(itr); + return itr->info_priv_size(itr, session); return 0; } @@ -852,7 +853,7 @@ int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr, int err; pr_debug2("Synthesizing auxtrace information\n"); - priv_size = auxtrace_record__info_priv_size(itr); + priv_size = auxtrace_record__info_priv_size(itr, session); ev = zalloc(sizeof(struct auxtrace_info_event) + priv_size); if (!ev) return -ENOMEM; diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h index b86f90db1352..4bace9a396a6 100644 --- a/tools/perf/util/auxtrace.h +++ b/tools/perf/util/auxtrace.h @@ -293,7 +293,8 @@ struct auxtrace_record { int (*recording_options)(struct auxtrace_record *itr, struct perf_evlist *evlist, struct record_opts *opts); - size_t (*info_priv_size)(struct auxtrace_record *itr); + size_t (*info_priv_size)(struct auxtrace_record *itr, + struct perf_session *session); int (*info_fill)(struct auxtrace_record *itr, struct perf_session *session, struct auxtrace_info_event *auxtrace_info, @@ -429,7 +430,8 @@ int auxtrace_parse_snapshot_options(struct auxtrace_record *itr, int auxtrace_record__options(struct auxtrace_record *itr, struct perf_evlist *evlist, struct record_opts *opts); -size_t auxtrace_record__info_priv_size(struct auxtrace_record *itr); +size_t auxtrace_record__info_priv_size(struct auxtrace_record *itr, + struct perf_session *session); int auxtrace_record__info_fill(struct auxtrace_record *itr, struct perf_session *session, struct auxtrace_info_event *auxtrace_info,