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

Commit 1da8ac7c authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller
Browse files

selftests/bpf: fix broken build 



Recent merge of 'linux-kselftest-4.11-rc1' tree broke bpf test build.
None of the tests were building and test_verifier.c had tons of compiler errors.
Fix it and add #ifdef CAP_IS_SUPPORTED to support old versions of libcap.
Tested on centos 6.8 and 7

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Tested-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 79099aab

tools/include/uapi/linux/bpf_perf_event.h

0 → 100644
+18 −0
Original line number Diff line number Diff line 
/* Copyright (c) 2016 Facebook

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 */

#ifndef _UAPI__LINUX_BPF_PERF_EVENT_H__

#define _UAPI__LINUX_BPF_PERF_EVENT_H__



#include <linux/types.h>

#include <linux/ptrace.h>



struct bpf_perf_event_data {

	struct pt_regs regs;

	__u64 sample_period;

};



#endif /* _UAPI__LINUX_BPF_PERF_EVENT_H__ */

tools/testing/selftests/bpf/Makefile

+3 −1
Original line number Diff line number Diff line 
LIBDIR := ../../../lib

BPFOBJ := $(LIBDIR)/bpf/bpf.o



CFLAGS += -Wall -O2 -lcap -I../../../include/uapi -I$(LIBDIR)

CFLAGS += -Wall -O2 -lcap -I../../../include/uapi -I$(LIBDIR) $(BPFOBJ)



TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map



TEST_PROGS := test_kmod.sh



all: $(TEST_GEN_PROGS)



.PHONY: all clean force



# force a rebuild of BPFOBJ when its dependencies are updated

tools/testing/selftests/bpf/test_verifier.c

+4 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
 * License as published by the Free Software Foundation.

 */



#include <asm/types.h>

#include <linux/types.h>

#include <stdint.h>

#include <stdio.h>

#include <stdlib.h>
@@ -4583,10 +4585,12 @@ static bool is_admin(void) 
	cap_flag_value_t sysadmin = CAP_CLEAR;

	const cap_value_t cap_val = CAP_SYS_ADMIN;



#ifdef CAP_IS_SUPPORTED

	if (!CAP_IS_SUPPORTED(CAP_SETFCAP)) {

		perror("cap_get_flag");

		return false;

	}

#endif

	caps = cap_get_proc();

	if (!caps) {

		perror("cap_get_proc");