From patchwork Tue Jan 22 18:11:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 156311 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp7883269jaa; Tue, 22 Jan 2019 10:12:17 -0800 (PST) X-Google-Smtp-Source: ALg8bN7MJuqx6Q/VssockLqc/L4KRNcC0hmUdScTCM7ZfpsemNP/uu3r09nUxxP8k7cCY5rWqvr9 X-Received: by 2002:a62:140a:: with SMTP id 10mr34014871pfu.157.1548180736934; Tue, 22 Jan 2019 10:12:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548180736; cv=none; d=google.com; s=arc-20160816; b=iIUiRXi8RUasYfxo2f0eBWI9bDhGNmIK7DyKov+0yMZiVEgFGn6x/6/p9rbnWwIRQM MBMHCZf0+2pJnvepFrmm4aGBJfo0A5BG+7uNOVfYR7UaQ04897s6Z+4HPQYjywHHnPhW cMKzc6oF8YpQGJ0kwS3RZMxc7iMW/pddOuoniKmPhdGhtZqBJZjhpdX2D4a2mmqSLB8Y ncgvpltnVa/DN/6YMmtUjhwdiCkpc3tiJLXJf0Sb3EJpbX+7zfk82D1il47r4t7GLQGK 1jLzkCu4CfxPjcSDiQu/ESVp6xqZ8m3GcJLgjGu5jsUlSQJw9DFyF52CbyOK43V79lEs yltQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=OJPXA6lSpBfqPbKWnv+BzpsRIc5VmSE4ADKHlW/2O0g=; b=vJcogJOvOm4uvIrRQRX63G/if4VFLZ53EJlRbZfXeYfrGsCBxFYAZIdFVTxWmzR+XB bWSdD4kIfY+16mlWcr7JPc1JfXkw+q7QyYufVUmUmfLllZHpfXfLB8lTo/pOQbutnD/0 XPB4bNg2csYOp20psuNtNLLCrxWtJAp4LXxuOkcZDHZYwtmpGXLcYn5WVWDVjZs/QHef iLa3Tpu8S0fQGXL3kqyLFurObKk5LGxkIMEj6A1KUsEgTSaGXqmSBuP/S1zuwFYtsf3t t5hfyRH+Hz0HQcC1KIpUA2tiKTaqw9ziSlLhGXT3pVmEHtYWMpUJ8fLl1+wFummF5Rw4 +xxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=TBHC630Z; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y15si10844961pgf.321.2019.01.22.10.12.16; Tue, 22 Jan 2019 10:12:16 -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; dkim=pass header.i=@linaro.org header.s=google header.b=TBHC630Z; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726792AbfAVSLy (ORCPT + 27 others); Tue, 22 Jan 2019 13:11:54 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:44994 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726291AbfAVSLu (ORCPT ); Tue, 22 Jan 2019 13:11:50 -0500 Received: by mail-pg1-f195.google.com with SMTP id t13so11406842pgr.11 for ; Tue, 22 Jan 2019 10:11:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OJPXA6lSpBfqPbKWnv+BzpsRIc5VmSE4ADKHlW/2O0g=; b=TBHC630ZBree1vMKU8Mts6R8xPb14IDVvUgiNeXSoyXpp941wDPu6MhoGjkQOtKdAX 3fosK4jpcohAxzaEEj9TZ/1dR/S3VFjkNbZrMhNLSxkb1Cvj06RvlE0241ciSpKDKxEf fg69IG+j0jXxJCnLf/l5opvLqjaSGOyPgJwK4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OJPXA6lSpBfqPbKWnv+BzpsRIc5VmSE4ADKHlW/2O0g=; b=EmyehmVL0r+DN5ogrjZtYdbzwP8FjCFhrxKmI4dpwoUjMNRy1Erc2AguImtwXjlzWS YLiKeyUrcAdGPDQGxXaOv6m+s+kMkUBAigHAqecQmv7lR3ZuW7RGljDSNYtq+dN2TSsq UN8MTpcubJbA7vGuXBVx70gWFR76Sq97LgyZHx1CVO1mq+jPRS2Un4E4WPQ+btNFkhlJ WiROiPGdNneiEGxPjAO1tOyz84fkNPahNHfHiT4xJV0xxI7of0oCPIG/cte2srXm4KVa Sce+xQ6yhqvXaoZh53WLfAlCFRuOb3kcVAUu+YfE5ZsnQSNLv5UqsGta60OH/cmJmWh+ 5dAw== X-Gm-Message-State: AJcUukdkEsXpJbwwciZlZrne4WNC3lx/8wwGGenHYen/DMdcdpEJZ9Hc YBds7l2jEE3ZOtCZKGWy34lIwA== X-Received: by 2002:a62:2e46:: with SMTP id u67mr33799408pfu.3.1548180708924; Tue, 22 Jan 2019 10:11:48 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id a18sm23489919pgj.30.2019.01.22.10.11.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jan 2019 10:11:48 -0800 (PST) From: Mathieu Poirier To: acme@kernel.org, peterz@infradead.org Cc: gregkh@linuxfoundation.org, mingo@redhat.com, tglx@linutronix.de, alexander.shishkin@linux.intel.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, will.deacon@arm.com, mark.rutland@arm.com, jolsa@redhat.com, namhyung@kernel.org, adrian.hunter@intel.com, ast@kernel.org, hpa@zytor.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, suzuki.poulose@arm.com Subject: [PATCH v2 1/7] perf/aux: Make perf_event accessible to setup_aux() Date: Tue, 22 Jan 2019 11:11:38 -0700 Message-Id: <20190122181144.26645-2-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190122181144.26645-1-mathieu.poirier@linaro.org> References: <20190122181144.26645-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When pmu::setup_aux() is called the coresight PMU needs to know which sink to use for the session by looking up the information in the event's attr::config2 field. As such simply replace the cpu information by the complete perf_event structure and change all affected customers. Signed-off-by: Mathieu Poirier Reviewed-by: Suzuki K Poulose --- arch/s390/kernel/perf_cpum_sf.c | 6 +++--- arch/x86/events/intel/bts.c | 4 +++- arch/x86/events/intel/pt.c | 5 +++-- drivers/hwtracing/coresight/coresight-etm-perf.c | 6 +++--- drivers/perf/arm_spe_pmu.c | 6 +++--- include/linux/perf_event.h | 2 +- kernel/events/ring_buffer.c | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) -- 2.17.1 diff --git a/arch/s390/kernel/perf_cpum_sf.c b/arch/s390/kernel/perf_cpum_sf.c index bfabeb1889cc..1266194afb02 100644 --- a/arch/s390/kernel/perf_cpum_sf.c +++ b/arch/s390/kernel/perf_cpum_sf.c @@ -1600,7 +1600,7 @@ static void aux_sdb_init(unsigned long sdb) /* * aux_buffer_setup() - Setup AUX buffer for diagnostic mode sampling - * @cpu: On which to allocate, -1 means current + * @event: Event the buffer is setup for, event->cpu == -1 means current * @pages: Array of pointers to buffer pages passed from perf core * @nr_pages: Total pages * @snapshot: Flag for snapshot mode @@ -1612,8 +1612,8 @@ static void aux_sdb_init(unsigned long sdb) * * Return the private AUX buffer structure if success or NULL if fails. */ -static void *aux_buffer_setup(int cpu, void **pages, int nr_pages, - bool snapshot) +static void *aux_buffer_setup(struct perf_event *event, void **pages, + int nr_pages, bool snapshot) { struct sf_buffer *sfb; struct aux_buffer *aux; diff --git a/arch/x86/events/intel/bts.c b/arch/x86/events/intel/bts.c index a01ef1b0f883..7cdd7b13bbda 100644 --- a/arch/x86/events/intel/bts.c +++ b/arch/x86/events/intel/bts.c @@ -77,10 +77,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/events/intel/pt.c b/arch/x86/events/intel/pt.c index 9494ca68fd9d..c0e86ff21f81 100644 --- a/arch/x86/events/intel/pt.c +++ b/arch/x86/events/intel/pt.c @@ -1114,10 +1114,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/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index abe8249b893b..f21eb28b6782 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -177,15 +177,15 @@ static void etm_free_aux(void *data) schedule_work(&event_data->work); } -static void *etm_setup_aux(int event_cpu, void **pages, +static void *etm_setup_aux(struct perf_event *event, void **pages, int nr_pages, bool overwrite) { - int cpu; + int cpu = event->cpu; cpumask_t *mask; struct coresight_device *sink; struct etm_event_data *event_data = NULL; - event_data = alloc_event_data(event_cpu); + event_data = alloc_event_data(cpu); if (!event_data) return NULL; INIT_WORK(&event_data->work, free_event_data); diff --git a/drivers/perf/arm_spe_pmu.c b/drivers/perf/arm_spe_pmu.c index 8e46a9dad2fa..7cb766dafe85 100644 --- a/drivers/perf/arm_spe_pmu.c +++ b/drivers/perf/arm_spe_pmu.c @@ -824,10 +824,10 @@ static void arm_spe_pmu_read(struct perf_event *event) { } -static void *arm_spe_pmu_setup_aux(int cpu, void **pages, int nr_pages, - bool snapshot) +static void *arm_spe_pmu_setup_aux(struct perf_event *event, void **pages, + int nr_pages, bool snapshot) { - int i; + int i, cpu = event->cpu; struct page **pglist; struct arm_spe_pmu_buf *buf; diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 1d5c551a5add..3e49b2144808 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -409,7 +409,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 4a9937076331..857308295f63 100644 --- a/kernel/events/ring_buffer.c +++ b/kernel/events/ring_buffer.c @@ -658,7 +658,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;