Commit b105e8e2 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 



Daniel Borkmann says:

====================
pull-request: bpf-next 2020-02-21

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

We've added 25 non-merge commits during the last 4 day(s) which contain
a total of 33 files changed, 2433 insertions(+), 161 deletions(-).

The main changes are:

1) Allow for adding TCP listen sockets into sock_map/hash so they can be used
   with reuseport BPF programs, from Jakub Sitnicki.

2) Add a new bpf_program__set_attach_target() helper for adding libbpf support
   to specify the tracepoint/function dynamically, from Eelco Chaudron.

3) Add bpf_read_branch_records() BPF helper which helps use cases like profile
   guided optimizations, from Daniel Xu.

4) Enable bpf_perf_event_read_value() in all tracing programs, from Song Liu.

5) Relax BTF mandatory check if only used for libbpf itself e.g. to process
   BTF defined maps, from Andrii Nakryiko.

6) Move BPF selftests -mcpu compilation attribute from 'probe' to 'v3' as it has
   been observed that former fails in envs with low memlock, from Yonghong Song.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e65ee2fb eb1e1478

Documentation/bpf/bpf_devel_QA.rst

+12 −17
Original line number Diff line number Diff line
@@ -20,11 +20,11 @@ Reporting bugs 
Q: How do I report bugs for BPF kernel code?

--------------------------------------------

A: Since all BPF kernel development as well as bpftool and iproute2 BPF

loader development happens through the netdev kernel mailing list,

loader development happens through the bpf kernel mailing list,

please report any found issues around BPF to the following mailing

list:



 netdev@vger.kernel.org

 bpf@vger.kernel.org



This may also include issues related to XDP, BPF tracing, etc.
@@ -46,17 +46,12 @@ Submitting patches 


Q: To which mailing list do I need to submit my BPF patches?

------------------------------------------------------------

A: Please submit your BPF patches to the netdev kernel mailing list:



 netdev@vger.kernel.org

A: Please submit your BPF patches to the bpf kernel mailing list:



Historically, BPF came out of networking and has always been maintained

by the kernel networking community. Although these days BPF touches

many other subsystems as well, the patches are still routed mainly

through the networking community.

 bpf@vger.kernel.org



In case your patch has changes in various different subsystems (e.g.

tracing, security, etc), make sure to Cc the related kernel mailing

networking, tracing, security, etc), make sure to Cc the related kernel mailing

lists and maintainers from there as well, so they are able to review

the changes and provide their Acked-by's to the patches.
@@ -168,7 +163,7 @@ a BPF point of view. 
Be aware that this is not a final verdict that the patch will

automatically get accepted into net or net-next trees eventually:



On the netdev kernel mailing list reviews can come in at any point

On the bpf kernel mailing list reviews can come in at any point

in time. If discussions around a patch conclude that they cannot

get included as-is, we will either apply a follow-up fix or drop

them from the trees entirely. Therefore, we also reserve to rebase
@@ -494,15 +489,15 @@ A: You need cmake and gcc-c++ as build requisites for LLVM. Once you have 
that set up, proceed with building the latest LLVM and clang version

from the git repositories::



     $ git clone http://llvm.org/git/llvm.git

     $ cd llvm/tools

     $ git clone --depth 1 http://llvm.org/git/clang.git

     $ cd ..; mkdir build; cd build

     $ cmake .. -DLLVM_TARGETS_TO_BUILD="BPF;X86" \

     $ git clone https://github.com/llvm/llvm-project.git

     $ mkdir -p llvm-project/llvm/build/install

     $ cd llvm-project/llvm/build

     $ cmake .. -G "Ninja" -DLLVM_TARGETS_TO_BUILD="BPF;X86" \

                -DLLVM_ENABLE_PROJECTS="clang"    \

                -DBUILD_SHARED_LIBS=OFF           \

                -DCMAKE_BUILD_TYPE=Release        \

                -DLLVM_BUILD_RUNTIME=OFF

     $ make -j $(getconf _NPROCESSORS_ONLN)

     $ ninja



The built binaries can then be found in the build/bin/ directory, where

you can point the PATH variable to.

include/linux/skmsg.h

+3 −17
Original line number Diff line number Diff line
@@ -352,29 +352,15 @@ static inline void sk_psock_update_proto(struct sock *sk, 
	psock->saved_write_space = sk->sk_write_space;



	psock->sk_proto = sk->sk_prot;

	sk->sk_prot = ops;

	/* Pairs with lockless read in sk_clone_lock() */

	WRITE_ONCE(sk->sk_prot, ops);

}



static inline void sk_psock_restore_proto(struct sock *sk,

					  struct sk_psock *psock)

{

	sk->sk_prot->unhash = psock->saved_unhash;



	if (psock->sk_proto) {

		struct inet_connection_sock *icsk = inet_csk(sk);

		bool has_ulp = !!icsk->icsk_ulp_data;



		if (has_ulp) {

			tcp_update_ulp(sk, psock->sk_proto,

				       psock->saved_write_space);

		} else {

			sk->sk_prot = psock->sk_proto;

			sk->sk_write_space = psock->saved_write_space;

		}

		psock->sk_proto = NULL;

	} else {

		sk->sk_write_space = psock->saved_write_space;

	}

	tcp_update_ulp(sk, psock->sk_proto, psock->saved_write_space);

}



static inline void sk_psock_set_state(struct sk_psock *psock,

include/net/sock.h

+35 −2
Original line number Diff line number Diff line
@@ -527,10 +527,43 @@ enum sk_pacing { 
	SK_PACING_FQ		= 2,

};



/* Pointer stored in sk_user_data might not be suitable for copying

 * when cloning the socket. For instance, it can point to a reference

 * counted object. sk_user_data bottom bit is set if pointer must not

 * be copied.

 */

#define SK_USER_DATA_NOCOPY	1UL

#define SK_USER_DATA_PTRMASK	~(SK_USER_DATA_NOCOPY)



/**

 * sk_user_data_is_nocopy - Test if sk_user_data pointer must not be copied

 * @sk: socket

 */

static inline bool sk_user_data_is_nocopy(const struct sock *sk)

{

	return ((uintptr_t)sk->sk_user_data & SK_USER_DATA_NOCOPY);

}



#define __sk_user_data(sk) ((*((void __rcu **)&(sk)->sk_user_data)))



#define rcu_dereference_sk_user_data(sk)	rcu_dereference(__sk_user_data((sk)))

#define rcu_assign_sk_user_data(sk, ptr)	rcu_assign_pointer(__sk_user_data((sk)), ptr)

#define rcu_dereference_sk_user_data(sk)				\

({									\

	void *__tmp = rcu_dereference(__sk_user_data((sk)));		\

	(void *)((uintptr_t)__tmp & SK_USER_DATA_PTRMASK);		\

})

#define rcu_assign_sk_user_data(sk, ptr)				\

({									\

	uintptr_t __tmp = (uintptr_t)(ptr);				\

	WARN_ON_ONCE(__tmp & ~SK_USER_DATA_PTRMASK);			\

	rcu_assign_pointer(__sk_user_data((sk)), __tmp);		\

})

#define rcu_assign_sk_user_data_nocopy(sk, ptr)				\

({									\

	uintptr_t __tmp = (uintptr_t)(ptr);				\

	WARN_ON_ONCE(__tmp & ~SK_USER_DATA_PTRMASK);			\

	rcu_assign_pointer(__sk_user_data((sk)),			\

			   __tmp | SK_USER_DATA_NOCOPY);		\

})



/*

 * SK_CAN_REUSE and SK_NO_REUSE on a socket mean that the socket is OK

include/net/sock_reuseport.h

+0 −2
Original line number Diff line number Diff line
@@ -55,6 +55,4 @@ static inline bool reuseport_has_conns(struct sock *sk, bool set) 
	return ret;

}



int reuseport_get_id(struct sock_reuseport *reuse);



#endif  /* _SOCK_REUSEPORT_H */

include/net/tcp.h

+7 −0
Original line number Diff line number Diff line
@@ -2203,6 +2203,13 @@ int tcp_bpf_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, 
		    int nonblock, int flags, int *addr_len);

int __tcp_bpf_recvmsg(struct sock *sk, struct sk_psock *psock,

		      struct msghdr *msg, int len, int flags);

#ifdef CONFIG_NET_SOCK_MSG

void tcp_bpf_clone(const struct sock *sk, struct sock *newsk);

#else

static inline void tcp_bpf_clone(const struct sock *sk, struct sock *newsk)

{

}

#endif



/* Call BPF_SOCK_OPS program that returns an int. If the return value

 * is < 0, then the BPF op failed (for example if the loaded BPF

CRA Git | Maintained and supported by SUSTech CRA and CCSE