Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f9e05fb authored by Wang Nan's avatar Wang Nan Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix PowerPC native building 



Checks BPF syscall number, turn off libbpf building on platform doesn't
correctly support sys_bpf instead of blocking compiling.

Reported-and-Tested-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Signed-off-by: default avatarWang Nan <wangnan0@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1452520124-2073-7-git-send-email-wangnan0@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3167eea2

tools/build/feature/test-bpf.c

+19 −1
Original line number Diff line number Diff line 
#include <asm/unistd.h>

#include <linux/bpf.h>

#include <unistd.h>



#ifndef __NR_bpf

# if defined(__i386__)

#  define __NR_bpf 357

# elif defined(__x86_64__)

#  define __NR_bpf 321

# elif defined(__aarch64__)

#  define __NR_bpf 280

#  error __NR_bpf not defined. libbpf does not support your arch.

# endif

#endif



int main(void)

{

	union bpf_attr attr;



	/* Check fields in attr */

	attr.prog_type = BPF_PROG_TYPE_KPROBE;

	attr.insn_cnt = 0;

	attr.insns = 0;
@@ -14,5 +28,9 @@ int main(void) 
	attr.kern_version = 0;



	attr = attr;

	return 0;

	/*

	 * Test existence of __NR_bpf and BPF_PROG_LOAD.

	 * This call should fail if we run the testcase.

	 */

	return syscall(__NR_bpf, BPF_PROG_LOAD, attr, sizeof(attr));

}

tools/lib/bpf/bpf.c

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include "bpf.h"



/*

 * When building perf, unistd.h is override. Define __NR_bpf is

 * required to be defined.

 * When building perf, unistd.h is overrided. __NR_bpf is

 * required to be defined explicitly.

 */

#ifndef __NR_bpf

# if defined(__i386__)