MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-05 21:35:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf/aux: Make perf_event accessible to setup_aux()

Browse Source 
[ Upstream commit 840018668c ]

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 <mathieu.poirier@linaro.org>
Reviewed-by: Suzuki Poulouse <suzuki.poulose@arm.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-s390@vger.kernel.org
Link: http://lkml.kernel.org/r/20190131184714.20388-2-mathieu.poirier@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Mathieu Poirier 2019-01-31 11:47:08 -07:00 committed by Greg Kroah-Hartman
parent 81ee4eab31
commit 4e4fba6d30
7 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/s390/kernel/perf_cpum_sf.c
View File

@ -1600,7 +1600,7 @@ static void aux_sdb_init(unsigned long sdb)
/* /*
* aux_buffer_setup() - Setup AUX buffer for diagnostic mode sampling * 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 * @pages: Array of pointers to buffer pages passed from perf core
* @nr_pages: Total pages * @nr_pages: Total pages
* @snapshot: Flag for snapshot mode * @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. * Return the private AUX buffer structure if success or NULL if fails.
*/ */
static void *aux_buffer_setup(int cpu, void **pages, int nr_pages, static void *aux_buffer_setup(struct perf_event *event, void **pages,
bool snapshot) int nr_pages, bool snapshot)
{ {
struct sf_buffer *sfb; struct sf_buffer *sfb;
struct aux_buffer *aux; struct aux_buffer *aux;

4
arch/x86/events/intel/bts.c
View File

@ -77,10 +77,12 @@ static size_t buf_size(struct page *page)
} }
static void * 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 bts_buffer *buf;
struct page *page; struct page *page;
int cpu = event->cpu;
int node = (cpu == -1) ? cpu : cpu_to_node(cpu); int node = (cpu == -1) ? cpu : cpu_to_node(cpu);
unsigned long offset; unsigned long offset;
size_t size = nr_pages << PAGE_SHIFT; size_t size = nr_pages << PAGE_SHIFT;

5
arch/x86/events/intel/pt.c
View File

@ -1114,10 +1114,11 @@ static int pt_buffer_init_topa(struct pt_buffer *buf, unsigned long nr_pages,
* Return: Our private PT buffer structure. * Return: Our private PT buffer structure.
*/ */
static void * 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; struct pt_buffer *buf;
int node, ret; int node, ret, cpu = event->cpu;
if (!nr_pages) if (!nr_pages)
return NULL; return NULL;

6
drivers/hwtracing/coresight/coresight-etm-perf.c
View File

@ -177,15 +177,15 @@ static void etm_free_aux(void *data)
schedule_work(&event_data->work); 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 nr_pages, bool overwrite)
{ {
int cpu; int cpu = event->cpu;
cpumask_t *mask; cpumask_t *mask;
struct coresight_device *sink; struct coresight_device *sink;
struct etm_event_data *event_data = NULL; struct etm_event_data *event_data = NULL;
event_data = alloc_event_data(event_cpu); event_data = alloc_event_data(cpu);
if (!event_data) if (!event_data)
return NULL; return NULL;
INIT_WORK(&event_data->work, free_event_data); INIT_WORK(&event_data->work, free_event_data);

6
drivers/perf/arm_spe_pmu.c
View File

@ -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, static void *arm_spe_pmu_setup_aux(struct perf_event *event, void **pages,
bool snapshot) int nr_pages, bool snapshot)
{ {
int i; int i, cpu = event->cpu;
struct page **pglist; struct page **pglist;
struct arm_spe_pmu_buf *buf; struct arm_spe_pmu_buf *buf;

2
include/linux/perf_event.h
View File

@ -409,7 +409,7 @@ struct pmu {
/* /*
* Set up pmu-private data structures for an AUX area * 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); int nr_pages, bool overwrite);
/* optional */ /* optional */

2
kernel/events/ring_buffer.c
View File

@ -658,7 +658,7 @@ int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event,
goto out; 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); overwrite);
if (!rb->aux_priv) if (!rb->aux_priv)
goto out; goto out;