From patchwork Thu Dec 3 21:04:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 57673 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp166411lbb; Thu, 3 Dec 2015 13:06:11 -0800 (PST) X-Received: by 10.66.193.73 with SMTP id hm9mr16296194pac.117.1449176767923; Thu, 03 Dec 2015 13:06:07 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 17si14114182pfo.238.2015.12.03.13.06.07; Thu, 03 Dec 2015 13:06:07 -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 S1754499AbbLCVGB (ORCPT + 28 others); Thu, 3 Dec 2015 16:06:01 -0500 Received: from mail-io0-f177.google.com ([209.85.223.177]:35099 "EHLO mail-io0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754360AbbLCVF5 (ORCPT ); Thu, 3 Dec 2015 16:05:57 -0500 Received: by ioc74 with SMTP id 74so94845297ioc.2 for ; Thu, 03 Dec 2015 13:05:56 -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=MnXA5BoOi9RYKscOXC+DPUXZmvjAz6qJ/gXFY+n+TXA=; b=ETif7SK6sLO2sVhV6eNpDrfIozsonqG8E6MoufP5aUbx7OUhHLh6qG64uOOMwsBG1d XDCaPGAw2GpOHIGpviSDRuzKgV2Xf+qbJChG3aZAX7WkeuQny7BFTWtoi46MBuGuyG3C l3DOQr59cQxjZyeKdkko1j/YtlN+Bykajl9KGBgoLnLxGCQmRVGWew2ioPM1gFGcP7tP ifYMfuZYxtOnUsuY61dLvH0ggixBCdA+6nASwXrOmSbhQ7o3FmHx8CbSMsnCNDjTOhCH u9OtRaUBVzlcjt4I6FvLNjEPu6mlFeBxX2eE0XK+VjKuG1pTpEoVtlwIQQ3sIRFIcLBo TaiA== 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=MnXA5BoOi9RYKscOXC+DPUXZmvjAz6qJ/gXFY+n+TXA=; b=eSHaYpwctktd+2W3Kuszi5x0/DTPHsEcD6usWjYqNQsWzjgRzQvXuDNFS0whSWwLdy 0YSyeIChrnNU8+ehvRPlZHKycbPPk6796PXe8jCmSRzMQBBQ3Tf1KdpZuVJGdcjwV02x sWyEDbAbCqrSJT3Ii2tz/+EqCbkKKndOdnCPprHI2XXjnfg8dObH/gcaBiA+cvaFDtJ7 vlry3OQZFcFvZ/W+dSimUwI8R4spF2V+Lf9dYLo+rk3YSDeKo4+PjhHjEo411EJqabJR uIBPA7xjWueKAu0VNroFyUlfs2zyPwP+bohGtRISNWlj0Z18HTUxnjRTs5Ir3XXR8g7L svWg== X-Gm-Message-State: ALoCoQnQbNLcM8kbOdDlQtN1+WxtYGxQti8BWyDZvSf8Cd634Y0N3Q10GV3NgaKUNbWRuSO3M+NM X-Received: by 10.107.16.18 with SMTP id y18mr11131090ioi.113.1449176756744; Thu, 03 Dec 2015 13:05:56 -0800 (PST) Received: from t430.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [184.64.168.246]) by smtp.gmail.com with ESMTPSA id d81sm3615433ioj.12.2015.12.03.13.05.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Dec 2015 13:05:56 -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, 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 V6 20/26] perf: changing pmu::setup_aux() parameter to include event Date: Thu, 3 Dec 2015 14:04:56 -0700 Message-Id: <1449176702-13213-21-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1449176702-13213-1-git-send-email-mathieu.poirier@linaro.org> References: <1449176702-13213-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 For Coresight ETMv3/4 tracers the event carries information about trace modes such as user or kernel space tracing and whether tracing is allowed when operating in secure mode. Since this information is to be embedded in the private structure returned by setup_aux(), changing the first parameter to be of type struct perf_event * so that all the necessary information can be conveyed. Also changing current customer of the API to reflect the modification. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Signed-off-by: Mathieu Poirier --- arch/x86/kernel/cpu/perf_event_intel_bts.c | 4 +++- arch/x86/kernel/cpu/perf_event_intel_pt.c | 5 +++-- include/linux/perf_event.h | 2 +- kernel/events/ring_buffer.c | 2 +- 4 files changed, 8 insertions(+), 5 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/arch/x86/kernel/cpu/perf_event_intel_bts.c b/arch/x86/kernel/cpu/perf_event_intel_bts.c index 2cad71d1b14c..4bb5bdc092f5 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_bts.c +++ b/arch/x86/kernel/cpu/perf_event_intel_bts.c @@ -68,10 +68,12 @@ static size_t buf_size(struct page *page) } static void * -bts_buffer_setup_aux(int cpu, void **pages, int nr_pages, bool overwrite) +bts_buffer_setup_aux(struct perf_event *event, void **pages, + int nr_pages, bool overwrite) { struct bts_buffer *buf; struct page *page; + int cpu = event->cpu; int node = (cpu == -1) ? cpu : cpu_to_node(cpu); unsigned long offset; size_t size = nr_pages << PAGE_SHIFT; diff --git a/arch/x86/kernel/cpu/perf_event_intel_pt.c b/arch/x86/kernel/cpu/perf_event_intel_pt.c index 868e1194337f..ba8077cbc755 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_pt.c +++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c @@ -860,10 +860,11 @@ static int pt_buffer_init_topa(struct pt_buffer *buf, unsigned long nr_pages, * Return: Our private PT buffer structure. */ static void * -pt_buffer_setup_aux(int cpu, void **pages, int nr_pages, bool snapshot) +pt_buffer_setup_aux(struct perf_event *event, void **pages, + int nr_pages, bool snapshot) { struct pt_buffer *buf; - int node, ret; + int node, ret, cpu = event->cpu; if (!nr_pages) return NULL; diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index d841d33bcdc9..da02d4a0baa2 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -378,7 +378,7 @@ struct pmu { /* * Set up pmu-private data structures for an AUX area */ - void *(*setup_aux) (int cpu, void **pages, + void *(*setup_aux) (struct perf_event *event, void **pages, int nr_pages, bool overwrite); /* optional */ diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c index b5d1ea79c595..b1316d12bb40 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -522,7 +522,7 @@ int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event, goto out; } - rb->aux_priv = event->pmu->setup_aux(event->cpu, rb->aux_pages, nr_pages, + rb->aux_priv = event->pmu->setup_aux(event, rb->aux_pages, nr_pages, overwrite); if (!rb->aux_priv) goto out;