Commit 9835bf7f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.20-20180919' of... 

Merge tag 'perf-core-for-mingo-4.20-20180919' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

perf test improvements:

- Add watchpoint entry (Ravi Bangoria)

Build fixes:

- Initialize perf_data_file fd field to fix building the CTF (trace format)
  converter with with gcc 4.8.4 on Ubuntu 14.04 (Jérémie Galarneau)

- Use -Wno-redundant-decls to build with PYTHON=python3 to
  build the python binding, fixing the build in systems such
  as Clear Linux (Arnaldo Carvalho de Melo)

Hardware tracing improvements:

- Suppress AUX/OVERWRITE records (Alexander Shishkin)

Infrastructure changes:

- Adopt PTR_ERR_OR_ZERO from the kernel and use it in
  the bpf-loader instead of open coded equivalent (Ding Xiang)

- Improve the event ordering code to make it clear and fix
  a bug related to freeing of events when using pipe mode
  from 'record' to 'inject' (Jiri Olsa)

- Some prep work to facilitate per-cpu threads to write
  record data to per-cpu files (Jiri Olsa)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents fb437bc8 24ef0fd0

kernel/events/ring_buffer.c

+12 −2
Original line number Diff line number Diff line
@@ -459,8 +459,18 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size) 
	if (size || handle->aux_flags) {

		/*

		 * Only send RECORD_AUX if we have something useful to communicate

		 *

		 * Note: the OVERWRITE records by themselves are not considered

		 * useful, as they don't communicate any *new* information,

		 * aside from the short-lived offset, that becomes history at

		 * the next event sched-in and therefore isn't useful.

		 * The userspace that needs to copy out AUX data in overwrite

		 * mode should know to use user_page::aux_head for the actual

		 * offset. So, from now on we don't output AUX records that

		 * have *only* OVERWRITE flag set.

		 */



		if (handle->aux_flags & ~(u64)PERF_AUX_FLAG_OVERWRITE)

			perf_event_aux_event(handle->event, aux_head, size,

			                     handle->aux_flags);

	}

tools/include/linux/err.h

+7 −0
Original line number Diff line number Diff line
@@ -52,4 +52,11 @@ static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr) 
	return unlikely(!ptr) || IS_ERR_VALUE((unsigned long)ptr);

}



static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr)

{

	if (IS_ERR(ptr))

		return PTR_ERR(ptr);

	else

		return 0;

}

#endif /* _LINUX_ERR_H */

tools/perf/builtin-annotate.c

+3 −4
Original line number Diff line number Diff line
@@ -283,12 +283,11 @@ out_put: 
	return ret;

}



static int process_feature_event(struct perf_tool *tool,

				 union perf_event *event,

				 struct perf_session *session)

static int process_feature_event(struct perf_session *session,

				 union perf_event *event)

{

	if (event->feat.feat_id < HEADER_LAST_FEATURE)

		return perf_event__process_feature(tool, event, session);

		return perf_event__process_feature(session, event);

	return 0;

}

tools/perf/builtin-inject.c

+16 −21
Original line number Diff line number Diff line
@@ -86,12 +86,10 @@ static int perf_event__drop_oe(struct perf_tool *tool __maybe_unused, 
}

#endif



static int perf_event__repipe_op2_synth(struct perf_tool *tool,

					union perf_event *event,

					struct perf_session *session

					__maybe_unused)

static int perf_event__repipe_op2_synth(struct perf_session *session,

					union perf_event *event)

{

	return perf_event__repipe_synth(tool, event);

	return perf_event__repipe_synth(session->tool, event);

}



static int perf_event__repipe_attr(struct perf_tool *tool,
@@ -133,10 +131,10 @@ static int copy_bytes(struct perf_inject *inject, int fd, off_t size) 
	return 0;

}



static s64 perf_event__repipe_auxtrace(struct perf_tool *tool,

				       union perf_event *event,

				       struct perf_session *session)

static s64 perf_event__repipe_auxtrace(struct perf_session *session,

				       union perf_event *event)

{

	struct perf_tool *tool = session->tool;

	struct perf_inject *inject = container_of(tool, struct perf_inject,

						  tool);

	int ret;
@@ -174,9 +172,8 @@ static s64 perf_event__repipe_auxtrace(struct perf_tool *tool, 
#else



static s64

perf_event__repipe_auxtrace(struct perf_tool *tool __maybe_unused,

			    union perf_event *event __maybe_unused,

			    struct perf_session *session __maybe_unused)

perf_event__repipe_auxtrace(struct perf_session *session __maybe_unused,

			    union perf_event *event __maybe_unused)

{

	pr_err("AUX area tracing not supported\n");

	return -EINVAL;
@@ -362,26 +359,24 @@ static int perf_event__repipe_exit(struct perf_tool *tool, 
	return err;

}



static int perf_event__repipe_tracing_data(struct perf_tool *tool,

					   union perf_event *event,

					   struct perf_session *session)

static int perf_event__repipe_tracing_data(struct perf_session *session,

					   union perf_event *event)

{

	int err;



	perf_event__repipe_synth(tool, event);

	err = perf_event__process_tracing_data(tool, event, session);

	perf_event__repipe_synth(session->tool, event);

	err = perf_event__process_tracing_data(session, event);



	return err;

}



static int perf_event__repipe_id_index(struct perf_tool *tool,

				       union perf_event *event,

				       struct perf_session *session)

static int perf_event__repipe_id_index(struct perf_session *session,

				       union perf_event *event)

{

	int err;



	perf_event__repipe_synth(tool, event);

	err = perf_event__process_id_index(tool, event, session);

	perf_event__repipe_synth(session->tool, event);

	err = perf_event__process_id_index(session, event);



	return err;

}

tools/perf/builtin-record.c

+27 −24
Original line number Diff line number Diff line
@@ -106,9 +106,12 @@ static bool switch_output_time(struct record *rec) 
	       trigger_is_ready(&switch_output_trigger);

}



static int record__write(struct record *rec, void *bf, size_t size)

static int record__write(struct record *rec, struct perf_mmap *map __maybe_unused,

			 void *bf, size_t size)

{

	if (perf_data__write(rec->session->data, bf, size) < 0) {

	struct perf_data_file *file = &rec->session->data->file;



	if (perf_data_file__write(file, bf, size) < 0) {

		pr_err("failed to write perf data, error: %m\n");

		return -1;

	}
@@ -127,15 +130,15 @@ static int process_synthesized_event(struct perf_tool *tool, 
				     struct machine *machine __maybe_unused)

{

	struct record *rec = container_of(tool, struct record, tool);

	return record__write(rec, event, event->header.size);

	return record__write(rec, NULL, event, event->header.size);

}



static int record__pushfn(void *to, void *bf, size_t size)

static int record__pushfn(struct perf_mmap *map, void *to, void *bf, size_t size)

{

	struct record *rec = to;



	rec->samples++;

	return record__write(rec, bf, size);

	return record__write(rec, map, bf, size);

}



static volatile int done;
@@ -170,6 +173,7 @@ static void record__sig_exit(void) 
#ifdef HAVE_AUXTRACE_SUPPORT



static int record__process_auxtrace(struct perf_tool *tool,

				    struct perf_mmap *map,

				    union perf_event *event, void *data1,

				    size_t len1, void *data2, size_t len2)

{
@@ -197,21 +201,21 @@ static int record__process_auxtrace(struct perf_tool *tool, 
	if (padding)

		padding = 8 - padding;



	record__write(rec, event, event->header.size);

	record__write(rec, data1, len1);

	record__write(rec, map, event, event->header.size);

	record__write(rec, map, data1, len1);

	if (len2)

		record__write(rec, data2, len2);

	record__write(rec, &pad, padding);

		record__write(rec, map, data2, len2);

	record__write(rec, map, &pad, padding);



	return 0;

}



static int record__auxtrace_mmap_read(struct record *rec,

				      struct auxtrace_mmap *mm)

				      struct perf_mmap *map)

{

	int ret;



	ret = auxtrace_mmap__read(mm, rec->itr, &rec->tool,

	ret = auxtrace_mmap__read(map, rec->itr, &rec->tool,

				  record__process_auxtrace);

	if (ret < 0)

		return ret;
@@ -223,11 +227,11 @@ static int record__auxtrace_mmap_read(struct record *rec, 
}



static int record__auxtrace_mmap_read_snapshot(struct record *rec,

					       struct auxtrace_mmap *mm)

					       struct perf_mmap *map)

{

	int ret;



	ret = auxtrace_mmap__read_snapshot(mm, rec->itr, &rec->tool,

	ret = auxtrace_mmap__read_snapshot(map, rec->itr, &rec->tool,

					   record__process_auxtrace,

					   rec->opts.auxtrace_snapshot_size);

	if (ret < 0)
@@ -245,13 +249,12 @@ static int record__auxtrace_read_snapshot_all(struct record *rec) 
	int rc = 0;



	for (i = 0; i < rec->evlist->nr_mmaps; i++) {

		struct auxtrace_mmap *mm =

				&rec->evlist->mmap[i].auxtrace_mmap;

		struct perf_mmap *map = &rec->evlist->mmap[i];



		if (!mm->base)

		if (!map->auxtrace_mmap.base)

			continue;



		if (record__auxtrace_mmap_read_snapshot(rec, mm) != 0) {

		if (record__auxtrace_mmap_read_snapshot(rec, map) != 0) {

			rc = -1;

			goto out;

		}
@@ -295,7 +298,7 @@ static int record__auxtrace_init(struct record *rec) 


static inline

int record__auxtrace_mmap_read(struct record *rec __maybe_unused,

			       struct auxtrace_mmap *mm __maybe_unused)

			       struct perf_mmap *map __maybe_unused)

{

	return 0;

}
@@ -529,17 +532,17 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evli 
		return 0;



	for (i = 0; i < evlist->nr_mmaps; i++) {

		struct auxtrace_mmap *mm = &maps[i].auxtrace_mmap;

		struct perf_mmap *map = &maps[i];



		if (maps[i].base) {

			if (perf_mmap__push(&maps[i], rec, record__pushfn) != 0) {

		if (map->base) {

			if (perf_mmap__push(map, rec, record__pushfn) != 0) {

				rc = -1;

				goto out;

			}

		}



		if (mm->base && !rec->opts.auxtrace_snapshot_mode &&

		    record__auxtrace_mmap_read(rec, mm) != 0) {

		if (map->auxtrace_mmap.base && !rec->opts.auxtrace_snapshot_mode &&

		    record__auxtrace_mmap_read(rec, map) != 0) {

			rc = -1;

			goto out;

		}
@@ -550,7 +553,7 @@ static int record__mmap_read_evlist(struct record *rec, struct perf_evlist *evli 
	 * at least one event.

	 */

	if (bytes_written != rec->bytes_written)

		rc = record__write(rec, &finished_round_event, sizeof(finished_round_event));

		rc = record__write(rec, NULL, &finished_round_event, sizeof(finished_round_event));



	if (overwrite)

		perf_evlist__toggle_bkw_mmap(evlist, BKW_MMAP_EMPTY);

CRA Git | Maintained and supported by SUSTech CRA and CCSE