Commit 749730ce authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by David S. Miller
Browse files

bpf: enable bpf syscall on x64 and i386 



done as separate commit to ease conflict resolution

Signed-off-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 99c55f7d

arch/x86/syscalls/syscall_32.tbl

+1 −0
Original line number Diff line number Diff line
@@ -363,3 +363,4 @@ 
354	i386	seccomp			sys_seccomp

355	i386	getrandom		sys_getrandom

356	i386	memfd_create		sys_memfd_create

357	i386	bpf			sys_bpf

arch/x86/syscalls/syscall_64.tbl

+1 −0
Original line number Diff line number Diff line
@@ -327,6 +327,7 @@ 
318	common	getrandom		sys_getrandom

319	common	memfd_create		sys_memfd_create

320	common	kexec_file_load		sys_kexec_file_load

321	common	bpf			sys_bpf



#

# x32-specific system call numbers start at 512 to avoid cache impact

include/linux/syscalls.h

+2 −1
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ struct old_linux_dirent; 
struct perf_event_attr;

struct file_handle;

struct sigaltstack;

union bpf_attr;



#include <linux/types.h>

#include <linux/aio_abi.h>
@@ -875,5 +876,5 @@ asmlinkage long sys_seccomp(unsigned int op, unsigned int flags, 
			    const char __user *uargs);

asmlinkage long sys_getrandom(char __user *buf, size_t count,

			      unsigned int flags);



asmlinkage long sys_bpf(int cmd, union bpf_attr *attr, unsigned int size);

#endif

include/uapi/asm-generic/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -705,9 +705,11 @@ __SYSCALL(__NR_seccomp, sys_seccomp) 
__SYSCALL(__NR_getrandom, sys_getrandom)

#define __NR_memfd_create 279

__SYSCALL(__NR_memfd_create, sys_memfd_create)

#define __NR_bpf 280

__SYSCALL(__NR_bpf, sys_bpf)



#undef __NR_syscalls

#define __NR_syscalls 280

#define __NR_syscalls 281



/*

 * All syscalls below here should go away really,

kernel/sys_ni.c

+3 −0
Original line number Diff line number Diff line
@@ -218,3 +218,6 @@ cond_syscall(sys_kcmp); 


/* operate on Secure Computing state */

cond_syscall(sys_seccomp);



/* access BPF programs and maps */

cond_syscall(sys_bpf);