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

Commit dca73a65 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next 



Alexei Starovoitov says:

====================
pull-request: bpf-next 2019-06-19

The following pull-request contains BPF updates for your *net-next* tree.

The main changes are:

1) new SO_REUSEPORT_DETACH_BPF setsocktopt, from Martin.

2) BTF based map definition, from Andrii.

3) support bpf_map_lookup_elem for xskmap, from Jonathan.

4) bounded loops and scalar precision logic in the verifier, from Alexei.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 497ad9f5 94079b64

arch/alpha/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ 
#define SO_RCVTIMEO_NEW         66

#define SO_SNDTIMEO_NEW         67



#define SO_DETACH_REUSEPORT_BPF 68



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

arch/mips/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -133,6 +133,8 @@ 
#define SO_RCVTIMEO_NEW         66

#define SO_SNDTIMEO_NEW         67



#define SO_DETACH_REUSEPORT_BPF 68



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

arch/parisc/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -114,6 +114,8 @@ 
#define SO_RCVTIMEO_NEW         0x4040

#define SO_SNDTIMEO_NEW         0x4041



#define SO_DETACH_REUSEPORT_BPF 0x4042



#if !defined(__KERNEL__)



#if __BITS_PER_LONG == 64

arch/sparc/include/uapi/asm/socket.h

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ 
#define SO_RCVTIMEO_NEW          0x0044

#define SO_SNDTIMEO_NEW          0x0045



#define SO_DETACH_REUSEPORT_BPF  0x0047



#if !defined(__KERNEL__)

include/linux/bpf.h

+25 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ enum bpf_reg_type { 
	PTR_TO_TCP_SOCK,	 /* reg points to struct tcp_sock */

	PTR_TO_TCP_SOCK_OR_NULL, /* reg points to struct tcp_sock or NULL */

	PTR_TO_TP_BUFFER,	 /* reg points to a writable raw tp's buffer */

	PTR_TO_XDP_SOCK,	 /* reg points to struct xdp_sock */

};



/* The information passed from prog-specific *_is_valid_access
@@ -1098,6 +1099,15 @@ u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type, 
				    struct bpf_insn *insn_buf,

				    struct bpf_prog *prog,

				    u32 *target_size);



bool bpf_xdp_sock_is_valid_access(int off, int size, enum bpf_access_type type,

				  struct bpf_insn_access_aux *info);



u32 bpf_xdp_sock_convert_ctx_access(enum bpf_access_type type,

				    const struct bpf_insn *si,

				    struct bpf_insn *insn_buf,

				    struct bpf_prog *prog,

				    u32 *target_size);

#else

static inline bool bpf_tcp_sock_is_valid_access(int off, int size,

						enum bpf_access_type type,
@@ -1114,6 +1124,21 @@ static inline u32 bpf_tcp_sock_convert_ctx_access(enum bpf_access_type type, 
{

	return 0;

}

static inline bool bpf_xdp_sock_is_valid_access(int off, int size,

						enum bpf_access_type type,

						struct bpf_insn_access_aux *info)

{

	return false;

}



static inline u32 bpf_xdp_sock_convert_ctx_access(enum bpf_access_type type,

						  const struct bpf_insn *si,

						  struct bpf_insn *insn_buf,

						  struct bpf_prog *prog,

						  u32 *target_size)

{

	return 0;

}

#endif /* CONFIG_INET */



#endif /* _LINUX_BPF_H */