From patchwork Mon Nov 23 18:33:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 57175 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp1602557lbb; Mon, 23 Nov 2015 10:34:49 -0800 (PST) X-Received: by 10.66.100.226 with SMTP id fb2mr37349774pab.16.1448303689084; Mon, 23 Nov 2015 10:34:49 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n12si21229032pfa.89.2015.11.23.10.34.48; Mon, 23 Nov 2015 10:34:49 -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 S1755125AbbKWSeb (ORCPT + 28 others); Mon, 23 Nov 2015 13:34:31 -0500 Received: from mail-pa0-f42.google.com ([209.85.220.42]:33411 "EHLO mail-pa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755010AbbKWSeY (ORCPT ); Mon, 23 Nov 2015 13:34:24 -0500 Received: by pabfh17 with SMTP id fh17so204848369pab.0 for ; Mon, 23 Nov 2015 10:34:24 -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=D+I39M6rgjKk3I/UUQoiOuCY5q+RqgkJIRPqP+30pBw=; b=yBrwVVkbkXEjrg9z41DmloF2JUo2agDteyb3Ss2eGnJQT+cwmm30QBXQ7uIpWwi6LF OvqdENyf9Cshfz3CG22Wja/iARVix78ecMkWq1J473lKkTDWZ0Rk6GmEuRg2bKWrsCRI 8HBEtX4ihU/dywhR0TjF19ZHWEqGdZKTF/1nNbGevuA2xGgS173HgS+4TbXqA85A5i/w o+RzvrK5hAySikwdbTSn9yC1lFnipsfdcAiffdD1DoWU48wOB9rJj17vWkDoY7AdIpUm Dp/kB02KZAxT9Lc0DfJ5makLkyVUIJaFl57HnWfxGQzeBP+UFbevJwY3/60ht8C4Bst2 11lA== 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=D+I39M6rgjKk3I/UUQoiOuCY5q+RqgkJIRPqP+30pBw=; b=NugNZYOxR+FuXvXtu/aoLIjr90UapVEyNjOL34CuTx19XSntOsTEIJcJR78sahoH2y 2O881cqHYMKO6pvqQ7S9DVBLE9xdm6K3LfJV4WdZvlG4wIBVD3kC48bZ9seDEuQvNIY1 y4n29iBarYPHROu+qhun2dCGt7aiQKSvrLVaZk0el0b3W7F9aohierzRg19wLBDXxZIS jrQrnGLr2HTWcm0BQxOCT7PhWVrmzwUYtGght8g8D0J1KfYRd9rJmpytN/BAQ2p1gD6t qSD2bpsYXMLqUpPEutFB9XlxhYi2PI9sQbH7OUBvQTL7/06vxFuCBPh673hgHZI8NKVD N/IA== X-Gm-Message-State: ALoCoQndNqEC8RF+impdvV3NKbmc8FBdMG2n7eeicf8sLdQeISHZcYcrBP2735E4euZOOdGAEMQB X-Received: by 10.66.155.226 with SMTP id vz2mr37775724pab.18.1448303664144; Mon, 23 Nov 2015 10:34:24 -0800 (PST) Received: from t430.cg.shawcable.net ([184.64.168.246]) by smtp.gmail.com with ESMTPSA id r20sm10865186pfa.93.2015.11.23.10.34.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 10:34:23 -0800 (PST) From: Mathieu Poirier To: gregkh@linuxfoundation.org, a.p.zijlstra@chello.nl, alexander.shishkin@linux.intel.com, acme@kernel.org, mingo@redhat.com, corbet@lwn.net, nicolas.pitre@linaro.org 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 Subject: [RESEND PATCH V4 16/26] perf: changing pmu::setup_aux() parameter to include event Date: Mon, 23 Nov 2015 11:33:08 -0700 Message-Id: <1448303598-11249-17-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1448303598-11249-1-git-send-email-mathieu.poirier@linaro.org> References: <1448303598-11249-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. 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(-) -- 1.9.1 -- 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 d1c0f254afbe..773600b2f313 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 42169283448b..f8b881210648 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_pt.c +++ b/arch/x86/kernel/cpu/perf_event_intel_pt.c @@ -863,10 +863,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 092a0e8a479a..0d9964b5ed4d 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -292,7 +292,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 182bc30899d5..87171b700c77 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;