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

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

net: filter: move common defines into bpf_common.h 



userspace programs that use eBPF instruction macros need to include two files:
uapi/linux/filter.h and uapi/linux/bpf.h
Move common macro definitions that are shared between classic BPF and eBPF
into uapi/linux/bpf_common.h, so that user app can include only one bpf.h file

Cc: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@plumgrid.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91c4467e

include/uapi/linux/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ header-y += binfmts.h 
header-y += blkpg.h

header-y += blktrace_api.h

header-y += bpf.h

header-y += bpf_common.h

header-y += bpqether.h

header-y += bsg.h

header-y += btrfs.h

include/uapi/linux/bpf.h

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define _UAPI__LINUX_BPF_H__



#include <linux/types.h>

#include <linux/bpf_common.h>



/* Extended instruction set based on top of classic BPF */

include/uapi/linux/bpf_common.h

0 → 100644
+55 −0
Original line number Diff line number Diff line 
#ifndef _UAPI__LINUX_BPF_COMMON_H__

#define _UAPI__LINUX_BPF_COMMON_H__



/* Instruction classes */

#define BPF_CLASS(code) ((code) & 0x07)

#define		BPF_LD		0x00

#define		BPF_LDX		0x01

#define		BPF_ST		0x02

#define		BPF_STX		0x03

#define		BPF_ALU		0x04

#define		BPF_JMP		0x05

#define		BPF_RET		0x06

#define		BPF_MISC        0x07



/* ld/ldx fields */

#define BPF_SIZE(code)  ((code) & 0x18)

#define		BPF_W		0x00

#define		BPF_H		0x08

#define		BPF_B		0x10

#define BPF_MODE(code)  ((code) & 0xe0)

#define		BPF_IMM		0x00

#define		BPF_ABS		0x20

#define		BPF_IND		0x40

#define		BPF_MEM		0x60

#define		BPF_LEN		0x80

#define		BPF_MSH		0xa0



/* alu/jmp fields */

#define BPF_OP(code)    ((code) & 0xf0)

#define		BPF_ADD		0x00

#define		BPF_SUB		0x10

#define		BPF_MUL		0x20

#define		BPF_DIV		0x30

#define		BPF_OR		0x40

#define		BPF_AND		0x50

#define		BPF_LSH		0x60

#define		BPF_RSH		0x70

#define		BPF_NEG		0x80

#define		BPF_MOD		0x90

#define		BPF_XOR		0xa0



#define		BPF_JA		0x00

#define		BPF_JEQ		0x10

#define		BPF_JGT		0x20

#define		BPF_JGE		0x30

#define		BPF_JSET        0x40

#define BPF_SRC(code)   ((code) & 0x08)

#define		BPF_K		0x00

#define		BPF_X		0x08



#ifndef BPF_MAXINSNS

#define BPF_MAXINSNS 4096

#endif



#endif /* _UAPI__LINUX_BPF_COMMON_H__ */

include/uapi/linux/filter.h

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


#include <linux/compiler.h>

#include <linux/types.h>



#include <linux/bpf_common.h>



/*

 * Current version of the filter code architecture.
@@ -32,56 +32,6 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ 
	struct sock_filter __user *filter;

};



/*

 * Instruction classes

 */



#define BPF_CLASS(code) ((code) & 0x07)

#define         BPF_LD          0x00

#define         BPF_LDX         0x01

#define         BPF_ST          0x02

#define         BPF_STX         0x03

#define         BPF_ALU         0x04

#define         BPF_JMP         0x05

#define         BPF_RET         0x06

#define         BPF_MISC        0x07



/* ld/ldx fields */

#define BPF_SIZE(code)  ((code) & 0x18)

#define         BPF_W           0x00

#define         BPF_H           0x08

#define         BPF_B           0x10

#define BPF_MODE(code)  ((code) & 0xe0)

#define         BPF_IMM         0x00

#define         BPF_ABS         0x20

#define         BPF_IND         0x40

#define         BPF_MEM         0x60

#define         BPF_LEN         0x80

#define         BPF_MSH         0xa0



/* alu/jmp fields */

#define BPF_OP(code)    ((code) & 0xf0)

#define         BPF_ADD         0x00

#define         BPF_SUB         0x10

#define         BPF_MUL         0x20

#define         BPF_DIV         0x30

#define         BPF_OR          0x40

#define         BPF_AND         0x50

#define         BPF_LSH         0x60

#define         BPF_RSH         0x70

#define         BPF_NEG         0x80

#define		BPF_MOD		0x90

#define		BPF_XOR		0xa0



#define         BPF_JA          0x00

#define         BPF_JEQ         0x10

#define         BPF_JGT         0x20

#define         BPF_JGE         0x30

#define         BPF_JSET        0x40

#define BPF_SRC(code)   ((code) & 0x08)

#define         BPF_K           0x00

#define         BPF_X           0x08



/* ret - BPF_K and BPF_X also apply */

#define BPF_RVAL(code)  ((code) & 0x18)

#define         BPF_A           0x10
@@ -91,10 +41,6 @@ struct sock_fprog { /* Required for SO_ATTACH_FILTER. */ 
#define         BPF_TAX         0x00

#define         BPF_TXA         0x80



#ifndef BPF_MAXINSNS

#define BPF_MAXINSNS 4096

#endif



/*

 * Macros for filter block array initializers.

 */