Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68db7e98 authored by Alexander Shishkin's avatar Alexander Shishkin Committed by Ingo Molnar
Browse files

perf: Add AUX record 



When there's new data in the AUX space, output a record indicating its
offset and size and a set of flags, such as PERF_AUX_FLAG_TRUNCATED, to
mean the described data was truncated to fit in the ring buffer.

Signed-off-by: default avatarAlexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kaixu Xia <kaixu.xia@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Robert Richter <rric@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: adrian.hunter@intel.com
Cc: kan.liang@intel.com
Cc: markus.t.metzger@intel.com
Cc: mathieu.poirier@linaro.org
Link: http://lkml.kernel.org/r/1421237903-181015-7-git-send-email-alexander.shishkin@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bed5b25a

include/uapi/linux/perf_event.h

+19 −0
Original line number Diff line number Diff line
@@ -768,6 +768,20 @@ enum perf_event_type { 
	 */

	PERF_RECORD_MMAP2			= 10,



	/*

	 * Records that new data landed in the AUX buffer part.

	 *

	 * struct {

	 * 	struct perf_event_header	header;

	 *

	 * 	u64				aux_offset;

	 * 	u64				aux_size;

	 *	u64				flags;

	 * 	struct sample_id		sample_id;

	 * };

	 */

	PERF_RECORD_AUX				= 11,



	PERF_RECORD_MAX,			/* non-ABI */

};
@@ -785,6 +799,11 @@ enum perf_callchain_context { 
	PERF_CONTEXT_MAX		= (__u64)-4095,

};



/**

 * PERF_RECORD_AUX::flags bits

 */

#define PERF_AUX_FLAG_TRUNCATED		0x01	/* record was truncated to fit */



#define PERF_FLAG_FD_NO_GROUP		(1UL << 0)

#define PERF_FLAG_FD_OUTPUT		(1UL << 1)

#define PERF_FLAG_PID_CGROUP		(1UL << 2) /* pid=cgroup id, per-cpu mode only */

kernel/events/core.c

+34 −0
Original line number Diff line number Diff line
@@ -5916,6 +5916,40 @@ void perf_event_mmap(struct vm_area_struct *vma) 
	perf_event_mmap_event(&mmap_event);

}



void perf_event_aux_event(struct perf_event *event, unsigned long head,

			  unsigned long size, u64 flags)

{

	struct perf_output_handle handle;

	struct perf_sample_data sample;

	struct perf_aux_event {

		struct perf_event_header	header;

		u64				offset;

		u64				size;

		u64				flags;

	} rec = {

		.header = {

			.type = PERF_RECORD_AUX,

			.misc = 0,

			.size = sizeof(rec),

		},

		.offset		= head,

		.size		= size,

		.flags		= flags,

	};

	int ret;



	perf_event_header__init_id(&rec.header, &sample, event);

	ret = perf_output_begin(&handle, event, rec.header.size);



	if (ret)

		return;



	perf_output_put(&handle, rec);

	perf_event__output_id_sample(event, &handle, &sample);



	perf_output_end(&handle);

}



/*

 * IRQ throttle logging

 */

kernel/events/internal.h

+3 −0
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ static inline bool rb_has_aux(struct ring_buffer *rb) 
	return !!rb->aux_nr_pages;

}



void perf_event_aux_event(struct perf_event *event, unsigned long head,

			  unsigned long size, u64 flags);



extern void

perf_event_header__init_id(struct perf_event_header *header,

			   struct perf_sample_data *data,