Commit 2996123e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.18-20180519' of... 

Merge tag 'perf-core-for-mingo-4.18-20180519' 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:

- Record min/max LBR cycles (>= Skylake) and add 'perf annotate' TUI
  hotkey to show it (c) (Jin Yao)

- Fix machine->kernel_start for PTI on x86 (Adrian Hunter)

- Make machine->env->arch always available, e.g. in 'perf top', not
  just when reading that info from perf.data files (Adrian Hunter)

- Reduce the number of files read at 'perf' start, leaving information such as
  cacheline size, tracefs mount point determination, max_stack, etc, to be
  lazily read as tools needs then (Arnaldo Carvalho de Melo)

- Fix up BPF include and examples install messages (Arnaldo Carvalho de Melo)

- Fix up callchain addresses and symbol offsets in 'perf script', to help
  correlating with objdump output (Sandipan Das)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 5aafae8d 19422a9f

tools/include/linux/compiler-gcc.h

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ 
/* &a[0] degrades to a pointer: a different type from an array */

#define __must_be_array(a)	BUILD_BUG_ON_ZERO(__same_type((a), &(a)[0]))



#ifndef __pure

#define  __pure		__attribute__((pure))

#endif

#define  noinline	__attribute__((noinline))

#ifndef __packed

#define __packed	__attribute__((packed))

tools/lib/api/fs/tracing_path.c

+33 −7
Original line number Diff line number Diff line
@@ -13,11 +13,9 @@ 


#include "tracing_path.h"





char tracing_mnt[PATH_MAX]         = "/sys/kernel/debug";

char tracing_path[PATH_MAX]        = "/sys/kernel/debug/tracing";

char tracing_events_path[PATH_MAX] = "/sys/kernel/debug/tracing/events";



static char tracing_mnt[PATH_MAX]  = "/sys/kernel/debug";

static char tracing_path[PATH_MAX]        = "/sys/kernel/debug/tracing";

static char tracing_events_path[PATH_MAX] = "/sys/kernel/debug/tracing/events";



static void __tracing_path_set(const char *tracing, const char *mountpoint)

{
@@ -76,7 +74,7 @@ char *get_tracing_file(const char *name) 
{

	char *file;



	if (asprintf(&file, "%s/%s", tracing_path, name) < 0)

	if (asprintf(&file, "%s/%s", tracing_path_mount(), name) < 0)

		return NULL;



	return file;
@@ -87,6 +85,34 @@ void put_tracing_file(char *file) 
	free(file);

}



char *get_events_file(const char *name)

{

	char *file;



	if (asprintf(&file, "%s/events/%s", tracing_path_mount(), name) < 0)

		return NULL;



	return file;

}



void put_events_file(char *file)

{

	free(file);

}



DIR *tracing_events__opendir(void)

{

	DIR *dir = NULL;

	char *path = get_tracing_file("events");



	if (path) {

		dir = opendir(path);

		put_events_file(path);

	}



	return dir;

}



int tracing_path__strerror_open_tp(int err, char *buf, size_t size,

				   const char *sys, const char *name)

{
@@ -129,7 +155,7 @@ int tracing_path__strerror_open_tp(int err, char *buf, size_t size, 
		snprintf(buf, size,

			 "Error:\tNo permissions to read %s/%s\n"

			 "Hint:\tTry 'sudo mount -o remount,mode=755 %s'\n",

			 tracing_events_path, filename, tracing_mnt);

			 tracing_events_path, filename, tracing_path_mount());

	}

		break;

	default:

tools/lib/api/fs/tracing_path.h

+7 −2
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
#define __API_FS_TRACING_PATH_H



#include <linux/types.h>

#include <dirent.h>



extern char tracing_path[];

extern char tracing_events_path[];

DIR *tracing_events__opendir(void);



void tracing_path_set(const char *mountpoint);

const char *tracing_path_mount(void);
@@ -13,5 +13,10 @@ const char *tracing_path_mount(void); 
char *get_tracing_file(const char *name);

void put_tracing_file(char *file);



char *get_events_file(const char *name);

void put_events_file(char *file);



#define zput_events_file(ptr) ({ free(*ptr); *ptr = NULL; })



int tracing_path__strerror_open_tp(int err, char *buf, size_t size, const char *sys, const char *name);

#endif /* __API_FS_TRACING_PATH_H */

tools/perf/Makefile.perf

+2 −0
Original line number Diff line number Diff line
@@ -770,9 +770,11 @@ endif 
ifndef NO_LIBBPF

	$(call QUIET_INSTALL, lib) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf'

	$(call QUIET_INSTALL, include/bpf) \

		$(INSTALL) include/bpf/*.h '$(DESTDIR_SQ)$(perf_include_instdir_SQ)/bpf'

	$(call QUIET_INSTALL, lib) \

		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf'

	$(call QUIET_INSTALL, examples/bpf) \

		$(INSTALL) examples/bpf/*.c '$(DESTDIR_SQ)$(perf_examples_instdir_SQ)/bpf'

endif

	$(call QUIET_INSTALL, perf-archive) \

tools/perf/builtin-script.c

+14 −12
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ static struct { 
		.fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |

			      PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |

			      PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |

			      PERF_OUTPUT_SYM | PERF_OUTPUT_DSO |

			      PERF_OUTPUT_PERIOD,

			      PERF_OUTPUT_SYM | PERF_OUTPUT_SYMOFFSET |

			      PERF_OUTPUT_DSO | PERF_OUTPUT_PERIOD,



		.invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT,

	},
@@ -165,8 +165,9 @@ static struct { 
		.fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |

			      PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |

			      PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |

			      PERF_OUTPUT_SYM | PERF_OUTPUT_DSO |

			      PERF_OUTPUT_PERIOD | PERF_OUTPUT_BPF_OUTPUT,

			      PERF_OUTPUT_SYM | PERF_OUTPUT_SYMOFFSET |

			      PERF_OUTPUT_DSO | PERF_OUTPUT_PERIOD |

			      PERF_OUTPUT_BPF_OUTPUT,



		.invalid_fields = PERF_OUTPUT_TRACE,

	},
@@ -185,10 +186,10 @@ static struct { 
		.fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |

			      PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |

			      PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |

			      PERF_OUTPUT_SYM | PERF_OUTPUT_DSO |

			      PERF_OUTPUT_PERIOD |  PERF_OUTPUT_ADDR |

			      PERF_OUTPUT_DATA_SRC | PERF_OUTPUT_WEIGHT |

			      PERF_OUTPUT_PHYS_ADDR,

			      PERF_OUTPUT_SYM | PERF_OUTPUT_SYMOFFSET |

			      PERF_OUTPUT_DSO | PERF_OUTPUT_PERIOD |

			      PERF_OUTPUT_ADDR | PERF_OUTPUT_DATA_SRC |

			      PERF_OUTPUT_WEIGHT | PERF_OUTPUT_PHYS_ADDR,



		.invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT,

	},
@@ -199,8 +200,8 @@ static struct { 
		.fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |

			      PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |

			      PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |

			      PERF_OUTPUT_SYM | PERF_OUTPUT_DSO |

			      PERF_OUTPUT_PERIOD,

			      PERF_OUTPUT_SYM | PERF_OUTPUT_SYMOFFSET |

			      PERF_OUTPUT_DSO | PERF_OUTPUT_PERIOD,



		.invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT,

	},
@@ -211,8 +212,8 @@ static struct { 
		.fields = PERF_OUTPUT_COMM | PERF_OUTPUT_TID |

			      PERF_OUTPUT_CPU | PERF_OUTPUT_TIME |

			      PERF_OUTPUT_EVNAME | PERF_OUTPUT_IP |

			      PERF_OUTPUT_SYM | PERF_OUTPUT_DSO |

			      PERF_OUTPUT_SYNTH,

			      PERF_OUTPUT_SYM | PERF_OUTPUT_SYMOFFSET |

			      PERF_OUTPUT_DSO | PERF_OUTPUT_SYNTH,



		.invalid_fields = PERF_OUTPUT_TRACE | PERF_OUTPUT_BPF_OUTPUT,

	},
@@ -544,6 +545,7 @@ static int perf_session__check_output_opt(struct perf_session *session) 
			if (attr->sample_type & PERF_SAMPLE_CALLCHAIN) {

				output[j].fields |= PERF_OUTPUT_IP;

				output[j].fields |= PERF_OUTPUT_SYM;

				output[j].fields |= PERF_OUTPUT_SYMOFFSET;

				output[j].fields |= PERF_OUTPUT_DSO;

				set_print_ip_opts(attr);

				goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE