Commit d2709c7c authored by David Howells's avatar David Howells
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
parent f2d9cae9

include/linux/hw_breakpoint.h

+1 −30
Original line number Diff line number Diff line 
#ifndef _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 <uapi/linux/hw_breakpoint.h>



#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 /* __KERNEL__ */



#endif /* _LINUX_HW_BREAKPOINT_H */

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -415,3 +415,4 @@ header-y += wireless.h 
header-y += x25.h

header-y += xattr.h

header-y += xfrm.h

header-y += hw_breakpoint.h

include/uapi/linux/hw_breakpoint.h

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#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 */

tools/perf/Makefile

+28 −1
Original line number Diff line number Diff line
@@ -169,7 +169,34 @@ endif 


### --- 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 =



# Guard against environment variables

tools/perf/arch/x86/include/perf_regs.h

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <stdlib.h>

#include "../../util/types.h"

#include "../../../../../arch/x86/include/asm/perf_regs.h"

#include <asm/perf_regs.h>



#ifndef ARCH_X86_64

#define PERF_REGS_MASK ((1ULL << PERF_REG_X86_32_MAX) - 1)

CRA Git | Maintained and supported by SUSTech CRA and CCSE