perf: Make perf build for x86 with UAPI disintegration applied
Make perf build for x86 once the UAPI disintegration patches for that arch have been applied by adding the appropriate -I flags - in the right order - and then converting some #includes that use ../.. notation to find main kernel headerfiles to use <asm/foo.h> and <linux/foo.h> instead. Note that -Iarch/foo/include/uapi is present _before_ -Iarch/foo/include. This makes sure we get the userspace version of the pt_regs struct. Ideally, we wouldn't have the latter -I flag at all, but unfortunately we want asm/svm.h and asm/vmx.h in builtin-kvm.c and these aren't part of the UAPI - at least not for x86. I wonder if the bits outside of the __KERNEL__ guards *should* be transferred there. I note also that perf seems to do its dependency handling manually by listing all the header files it might want to use in LIB_H in the Makefile. Can this be changed to use -MD? Note that to do make this work, we need to export and UAPI disintegrate linux/hw_breakpoint.h, which I think should've been exported previously so that perf can access the bits. We have to do this in the same patch to maintain bisectability. Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
parent
f2d9cae9ea
commit
d2709c7ce4
|
@ -1,35 +1,8 @@
|
||||||
#ifndef _LINUX_HW_BREAKPOINT_H
|
#ifndef _LINUX_HW_BREAKPOINT_H
|
||||||
#define _LINUX_HW_BREAKPOINT_H
|
#define _LINUX_HW_BREAKPOINT_H
|
||||||
|
|
||||||
enum {
|
|
||||||
HW_BREAKPOINT_LEN_1 = 1,
|
|
||||||
HW_BREAKPOINT_LEN_2 = 2,
|
|
||||||
HW_BREAKPOINT_LEN_4 = 4,
|
|
||||||
HW_BREAKPOINT_LEN_8 = 8,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum {
|
|
||||||
HW_BREAKPOINT_EMPTY = 0,
|
|
||||||
HW_BREAKPOINT_R = 1,
|
|
||||||
HW_BREAKPOINT_W = 2,
|
|
||||||
HW_BREAKPOINT_RW = HW_BREAKPOINT_R | HW_BREAKPOINT_W,
|
|
||||||
HW_BREAKPOINT_X = 4,
|
|
||||||
HW_BREAKPOINT_INVALID = HW_BREAKPOINT_RW | HW_BREAKPOINT_X,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum bp_type_idx {
|
|
||||||
TYPE_INST = 0,
|
|
||||||
#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS
|
|
||||||
TYPE_DATA = 0,
|
|
||||||
#else
|
|
||||||
TYPE_DATA = 1,
|
|
||||||
#endif
|
|
||||||
TYPE_MAX
|
|
||||||
};
|
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
|
||||||
|
|
||||||
#include <linux/perf_event.h>
|
#include <linux/perf_event.h>
|
||||||
|
#include <uapi/linux/hw_breakpoint.h>
|
||||||
|
|
||||||
#ifdef CONFIG_HAVE_HW_BREAKPOINT
|
#ifdef CONFIG_HAVE_HW_BREAKPOINT
|
||||||
|
|
||||||
|
@ -151,6 +124,4 @@ static inline struct arch_hw_breakpoint *counter_arch_bp(struct perf_event *bp)
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_HAVE_HW_BREAKPOINT */
|
#endif /* CONFIG_HAVE_HW_BREAKPOINT */
|
||||||
#endif /* __KERNEL__ */
|
|
||||||
|
|
||||||
#endif /* _LINUX_HW_BREAKPOINT_H */
|
#endif /* _LINUX_HW_BREAKPOINT_H */
|
||||||
|
|
|
@ -415,3 +415,4 @@ header-y += wireless.h
|
||||||
header-y += x25.h
|
header-y += x25.h
|
||||||
header-y += xattr.h
|
header-y += xattr.h
|
||||||
header-y += xfrm.h
|
header-y += xfrm.h
|
||||||
|
header-y += hw_breakpoint.h
|
||||||
|
|
30
include/uapi/linux/hw_breakpoint.h
Normal file
30
include/uapi/linux/hw_breakpoint.h
Normal file
|
@ -0,0 +1,30 @@
|
||||||
|
#ifndef _UAPI_LINUX_HW_BREAKPOINT_H
|
||||||
|
#define _UAPI_LINUX_HW_BREAKPOINT_H
|
||||||
|
|
||||||
|
enum {
|
||||||
|
HW_BREAKPOINT_LEN_1 = 1,
|
||||||
|
HW_BREAKPOINT_LEN_2 = 2,
|
||||||
|
HW_BREAKPOINT_LEN_4 = 4,
|
||||||
|
HW_BREAKPOINT_LEN_8 = 8,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum {
|
||||||
|
HW_BREAKPOINT_EMPTY = 0,
|
||||||
|
HW_BREAKPOINT_R = 1,
|
||||||
|
HW_BREAKPOINT_W = 2,
|
||||||
|
HW_BREAKPOINT_RW = HW_BREAKPOINT_R | HW_BREAKPOINT_W,
|
||||||
|
HW_BREAKPOINT_X = 4,
|
||||||
|
HW_BREAKPOINT_INVALID = HW_BREAKPOINT_RW | HW_BREAKPOINT_X,
|
||||||
|
};
|
||||||
|
|
||||||
|
enum bp_type_idx {
|
||||||
|
TYPE_INST = 0,
|
||||||
|
#ifdef CONFIG_HAVE_MIXED_BREAKPOINTS_REGS
|
||||||
|
TYPE_DATA = 0,
|
||||||
|
#else
|
||||||
|
TYPE_DATA = 1,
|
||||||
|
#endif
|
||||||
|
TYPE_MAX
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif /* _UAPI_LINUX_HW_BREAKPOINT_H */
|
|
@ -169,7 +169,34 @@ endif
|
||||||
|
|
||||||
### --- END CONFIGURATION SECTION ---
|
### --- END CONFIGURATION SECTION ---
|
||||||
|
|
||||||
BASIC_CFLAGS = -Iutil/include -Iarch/$(ARCH)/include -I$(OUTPUT)util -I$(TRACE_EVENT_DIR) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
|
ifeq ($(srctree),)
|
||||||
|
srctree := $(patsubst %/,%,$(dir $(shell pwd)))
|
||||||
|
srctree := $(patsubst %/,%,$(dir $(srctree)))
|
||||||
|
#$(info Determined 'srctree' to be $(srctree))
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq ($(objtree),)
|
||||||
|
#$(info Determined 'objtree' to be $(objtree))
|
||||||
|
endif
|
||||||
|
|
||||||
|
ifneq ($(OUTPUT),)
|
||||||
|
#$(info Determined 'OUTPUT' to be $(OUTPUT))
|
||||||
|
endif
|
||||||
|
|
||||||
|
BASIC_CFLAGS = \
|
||||||
|
-Iutil/include \
|
||||||
|
-Iarch/$(ARCH)/include \
|
||||||
|
$(if $(objtree),-I$(objtree)/arch/$(ARCH)/include/generated/uapi) \
|
||||||
|
-I$(srctree)/arch/$(ARCH)/include/uapi \
|
||||||
|
-I$(srctree)/arch/$(ARCH)/include \
|
||||||
|
$(if $(objtree),-I$(objtree)/include/generated/uapi) \
|
||||||
|
-I$(srctree)/include/uapi \
|
||||||
|
-I$(srctree)/include \
|
||||||
|
-I$(OUTPUT)util \
|
||||||
|
-Iutil \
|
||||||
|
-I. \
|
||||||
|
-I$(TRACE_EVENT_DIR) \
|
||||||
|
-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
|
||||||
BASIC_LDFLAGS =
|
BASIC_LDFLAGS =
|
||||||
|
|
||||||
# Guard against environment variables
|
# Guard against environment variables
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include "../../util/types.h"
|
#include "../../util/types.h"
|
||||||
#include "../../../../../arch/x86/include/asm/perf_regs.h"
|
#include <asm/perf_regs.h>
|
||||||
|
|
||||||
#ifndef ARCH_X86_64
|
#ifndef ARCH_X86_64
|
||||||
#define PERF_REGS_MASK ((1ULL << PERF_REG_X86_32_MAX) - 1)
|
#define PERF_REGS_MASK ((1ULL << PERF_REG_X86_32_MAX) - 1)
|
||||||
|
|
|
@ -22,9 +22,9 @@
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include "../../arch/x86/include/asm/svm.h"
|
#include <asm/svm.h>
|
||||||
#include "../../arch/x86/include/asm/vmx.h"
|
#include <asm/vmx.h>
|
||||||
#include "../../arch/x86/include/asm/kvm.h"
|
#include <asm/kvm.h>
|
||||||
|
|
||||||
struct event_key {
|
struct event_key {
|
||||||
#define INVALID_KEY (~0ULL)
|
#define INVALID_KEY (~0ULL)
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
#include "util/thread_map.h"
|
#include "util/thread_map.h"
|
||||||
#include "util/pmu.h"
|
#include "util/pmu.h"
|
||||||
#include "event-parse.h"
|
#include "event-parse.h"
|
||||||
#include "../../include/linux/hw_breakpoint.h"
|
#include <linux/hw_breakpoint.h>
|
||||||
|
|
||||||
#include <sys/mman.h>
|
#include <sys/mman.h>
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,9 @@ struct winsize;
|
||||||
|
|
||||||
void get_term_dimensions(struct winsize *ws);
|
void get_term_dimensions(struct winsize *ws);
|
||||||
|
|
||||||
|
#include <asm/unistd.h>
|
||||||
|
|
||||||
#if defined(__i386__)
|
#if defined(__i386__)
|
||||||
#include "../../arch/x86/include/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
|
#define rmb() asm volatile("lock; addl $0,0(%%esp)" ::: "memory")
|
||||||
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
|
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
|
||||||
#define CPUINFO_PROC "model name"
|
#define CPUINFO_PROC "model name"
|
||||||
|
@ -16,7 +17,6 @@ void get_term_dimensions(struct winsize *ws);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__x86_64__)
|
#if defined(__x86_64__)
|
||||||
#include "../../arch/x86/include/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile("lfence" ::: "memory")
|
#define rmb() asm volatile("lfence" ::: "memory")
|
||||||
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
|
#define cpu_relax() asm volatile("rep; nop" ::: "memory");
|
||||||
#define CPUINFO_PROC "model name"
|
#define CPUINFO_PROC "model name"
|
||||||
|
@ -26,20 +26,17 @@ void get_term_dimensions(struct winsize *ws);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __powerpc__
|
#ifdef __powerpc__
|
||||||
#include "../../arch/powerpc/include/uapi/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile ("sync" ::: "memory")
|
#define rmb() asm volatile ("sync" ::: "memory")
|
||||||
#define cpu_relax() asm volatile ("" ::: "memory");
|
#define cpu_relax() asm volatile ("" ::: "memory");
|
||||||
#define CPUINFO_PROC "cpu"
|
#define CPUINFO_PROC "cpu"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __s390__
|
#ifdef __s390__
|
||||||
#include "../../arch/s390/include/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile("bcr 15,0" ::: "memory")
|
#define rmb() asm volatile("bcr 15,0" ::: "memory")
|
||||||
#define cpu_relax() asm volatile("" ::: "memory");
|
#define cpu_relax() asm volatile("" ::: "memory");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __sh__
|
#ifdef __sh__
|
||||||
#include "../../arch/sh/include/asm/unistd.h"
|
|
||||||
#if defined(__SH4A__) || defined(__SH5__)
|
#if defined(__SH4A__) || defined(__SH5__)
|
||||||
# define rmb() asm volatile("synco" ::: "memory")
|
# define rmb() asm volatile("synco" ::: "memory")
|
||||||
#else
|
#else
|
||||||
|
@ -50,35 +47,30 @@ void get_term_dimensions(struct winsize *ws);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __hppa__
|
#ifdef __hppa__
|
||||||
#include "../../arch/parisc/include/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile("" ::: "memory")
|
#define rmb() asm volatile("" ::: "memory")
|
||||||
#define cpu_relax() asm volatile("" ::: "memory");
|
#define cpu_relax() asm volatile("" ::: "memory");
|
||||||
#define CPUINFO_PROC "cpu"
|
#define CPUINFO_PROC "cpu"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __sparc__
|
#ifdef __sparc__
|
||||||
#include "../../arch/sparc/include/uapi/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile("":::"memory")
|
#define rmb() asm volatile("":::"memory")
|
||||||
#define cpu_relax() asm volatile("":::"memory")
|
#define cpu_relax() asm volatile("":::"memory")
|
||||||
#define CPUINFO_PROC "cpu"
|
#define CPUINFO_PROC "cpu"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __alpha__
|
#ifdef __alpha__
|
||||||
#include "../../arch/alpha/include/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile("mb" ::: "memory")
|
#define rmb() asm volatile("mb" ::: "memory")
|
||||||
#define cpu_relax() asm volatile("" ::: "memory")
|
#define cpu_relax() asm volatile("" ::: "memory")
|
||||||
#define CPUINFO_PROC "cpu model"
|
#define CPUINFO_PROC "cpu model"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __ia64__
|
#ifdef __ia64__
|
||||||
#include "../../arch/ia64/include/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile ("mf" ::: "memory")
|
#define rmb() asm volatile ("mf" ::: "memory")
|
||||||
#define cpu_relax() asm volatile ("hint @pause" ::: "memory")
|
#define cpu_relax() asm volatile ("hint @pause" ::: "memory")
|
||||||
#define CPUINFO_PROC "model name"
|
#define CPUINFO_PROC "model name"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __arm__
|
#ifdef __arm__
|
||||||
#include "../../arch/arm/include/asm/unistd.h"
|
|
||||||
/*
|
/*
|
||||||
* Use the __kuser_memory_barrier helper in the CPU helper page. See
|
* Use the __kuser_memory_barrier helper in the CPU helper page. See
|
||||||
* arch/arm/kernel/entry-armv.S in the kernel source for details.
|
* arch/arm/kernel/entry-armv.S in the kernel source for details.
|
||||||
|
@ -89,13 +81,11 @@ void get_term_dimensions(struct winsize *ws);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __aarch64__
|
#ifdef __aarch64__
|
||||||
#include "../../arch/arm64/include/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile("dmb ld" ::: "memory")
|
#define rmb() asm volatile("dmb ld" ::: "memory")
|
||||||
#define cpu_relax() asm volatile("yield" ::: "memory")
|
#define cpu_relax() asm volatile("yield" ::: "memory")
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef __mips__
|
#ifdef __mips__
|
||||||
#include "../../arch/mips/include/asm/unistd.h"
|
|
||||||
#define rmb() asm volatile( \
|
#define rmb() asm volatile( \
|
||||||
".set mips2\n\t" \
|
".set mips2\n\t" \
|
||||||
"sync\n\t" \
|
"sync\n\t" \
|
||||||
|
@ -112,7 +102,7 @@ void get_term_dimensions(struct winsize *ws);
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <sys/syscall.h>
|
#include <sys/syscall.h>
|
||||||
|
|
||||||
#include "../../include/uapi/linux/perf_event.h"
|
#include <linux/perf_event.h>
|
||||||
#include "util/types.h"
|
#include "util/types.h"
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
#include "cpumap.h"
|
#include "cpumap.h"
|
||||||
#include "thread_map.h"
|
#include "thread_map.h"
|
||||||
#include "target.h"
|
#include "target.h"
|
||||||
#include "../../../include/linux/hw_breakpoint.h"
|
#include <linux/hw_breakpoint.h>
|
||||||
#include "../../../include/uapi/linux/perf_event.h"
|
#include <linux/perf_event.h>
|
||||||
#include "perf_regs.h"
|
#include "perf_regs.h"
|
||||||
|
|
||||||
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
|
#define FD(e, x, y) (*(int *)xyarray__entry(e->fd, x, y))
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
|
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "../../../include/uapi/linux/perf_event.h"
|
#include <stddef.h>
|
||||||
|
#include <linux/perf_event.h>
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
#include "xyarray.h"
|
#include "xyarray.h"
|
||||||
#include "cgroup.h"
|
#include "cgroup.h"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#ifndef __PERF_HEADER_H
|
#ifndef __PERF_HEADER_H
|
||||||
#define __PERF_HEADER_H
|
#define __PERF_HEADER_H
|
||||||
|
|
||||||
#include "../../../include/uapi/linux/perf_event.h"
|
#include <linux/perf_event.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include "evsel.h"
|
#include "evsel.h"
|
||||||
#include "evlist.h"
|
#include "evlist.h"
|
||||||
#include "sysfs.h"
|
#include "sysfs.h"
|
||||||
#include "../../../include/linux/hw_breakpoint.h"
|
#include <linux/hw_breakpoint.h>
|
||||||
|
|
||||||
#define TEST_ASSERT_VAL(text, cond) \
|
#define TEST_ASSERT_VAL(text, cond) \
|
||||||
do { \
|
do { \
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "../../../include/linux/hw_breakpoint.h"
|
#include <linux/hw_breakpoint.h>
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "../perf.h"
|
#include "../perf.h"
|
||||||
#include "evlist.h"
|
#include "evlist.h"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include <linux/list.h>
|
#include <linux/list.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
#include "../../../include/uapi/linux/perf_event.h"
|
#include <linux/perf_event.h>
|
||||||
#include "types.h"
|
#include "types.h"
|
||||||
|
|
||||||
struct list_head;
|
struct list_head;
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define __PMU_H
|
#define __PMU_H
|
||||||
|
|
||||||
#include <linux/bitops.h>
|
#include <linux/bitops.h>
|
||||||
#include "../../../include/uapi/linux/perf_event.h"
|
#include <linux/perf_event.h>
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
PERF_PMU_FORMAT_VALUE_CONFIG,
|
PERF_PMU_FORMAT_VALUE_CONFIG,
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
#include "symbol.h"
|
#include "symbol.h"
|
||||||
#include "thread.h"
|
#include "thread.h"
|
||||||
#include <linux/rbtree.h>
|
#include <linux/rbtree.h>
|
||||||
#include "../../../include/uapi/linux/perf_event.h"
|
#include <linux/perf_event.h>
|
||||||
|
|
||||||
struct sample_queue;
|
struct sample_queue;
|
||||||
struct ip_callchain;
|
struct ip_callchain;
|
||||||
|
|
Loading…
Reference in a new issue