Commit 277d6f1d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-4.11-20170213' of... 

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

New features:

 - Introduce the 'delta-abs' 'perf diff' compute method, that orders the
   histogram entries by the absolute value of the percentage delta for a
   function in two perf.data files, i.e. the functions that changed the
   most (increase or decrease in samples) comes first (Namhyung Kim)

User visible changes:

 - Improve message about tweaking the kernel.perf_event_paranoid setting,
   telling how to make the change permanent by editing /etc/sysctl.conf
   (Arnaldo Carvalho de Melo)

Infrastructure changes:

 - Introduce linux/compiler-gcc.h as a counterpart to the kernel's,
   initially containing the definition of __fallthrough, more to
   come (__maybe_unused, etc) (Arnaldo Carvalho de Melo)

 - Fixes for problems uncovered by building tools/perf with clang, such
   as always true tests of arrays against NULL and variables that sometimes
   were used without being initialized (Arnaldo Carvalho de Melo, Steven Rostedt)

 - Before loading a new ELF, clear global variables set by the
   samples/bpf loader (Mickaël Salaün)

 - Ignore already processed ELF sections in the samples/bpf
   loader (Mickaël Salaün)

 - Fix compile error in the scripting code with some perl5
   versions (Wang YanQing)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 210f400d a734fb5d

samples/bpf/bpf_load.c

+7 −0
Original line number Diff line number Diff line
@@ -277,6 +277,11 @@ int load_bpf_file(char *path) 
	Elf_Data *data, *data_prog, *symbols = NULL;

	char *shname, *shname_prog;



	/* reset global variables */

	kern_version = 0;

	memset(license, 0, sizeof(license));

	memset(processed_sec, 0, sizeof(processed_sec));



	if (elf_version(EV_CURRENT) == EV_NONE)

		return 1;
@@ -328,6 +333,8 @@ int load_bpf_file(char *path) 


	/* load programs that need map fixup (relocations) */

	for (i = 1; i < ehdr.e_shnum; i++) {

		if (processed_sec[i])

			continue;



		if (get_sec(elf, i, &ehdr, &shname, &shdr, &data))

			continue;

samples/bpf/tracex5_kern.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/version.h>

#include <uapi/linux/bpf.h>

#include <uapi/linux/seccomp.h>

#include <uapi/linux/unistd.h>

#include "bpf_helpers.h"



#define PROG(F) SEC("kprobe/"__stringify(F)) int bpf_func_##F

tools/include/linux/compiler-gcc.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_COMPILER_H_

#error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."

#endif



/*

 * Common definitions for all gcc versions go here.

 */

#define GCC_VERSION (__GNUC__ * 10000		\

		     + __GNUC_MINOR__ * 100	\

		     + __GNUC_PATCHLEVEL__)



#if GCC_VERSION >= 70000 && !defined(__CHECKER__)

# define __fallthrough __attribute__ ((fallthrough))

#endif

tools/include/linux/compiler.h

+5 −5
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_COMPILER_H_

#define _TOOLS_LINUX_COMPILER_H_



#ifdef __GNUC__

#include <linux/compiler-gcc.h>

#endif



/* Optimization barrier */

/* The "volatile" is due to gcc bugs */

#define barrier() __asm__ __volatile__("": : :"memory")
@@ -128,11 +132,7 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s 




#ifndef __fallthrough

# if defined(__GNUC__) && __GNUC__ >= 7

#  define __fallthrough __attribute__ ((fallthrough))

# else

# define __fallthrough

#endif

#endif



#endif /* _TOOLS_LINUX_COMPILER_H */

tools/lib/traceevent/kbuffer-parse.c

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ static unsigned int old_update_pointers(struct kbuffer *kbuf) 
		extend += delta;

		delta = extend;

		ptr += 4;

		length = 0;

		break;



	case OLD_RINGBUF_TYPE_TIME_STAMP:

CRA Git | Maintained and supported by SUSTech CRA and CCSE