From: David S. Miller <davem@davemloft.net>
Date: Fri, 21 Feb 2020 23:22:45 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b105e8e281ac2dbea4229982ad57fbefab05963d;p=linux.git

Merge git://git./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: David S. Miller <davem@davemloft.net>
---

b105e8e281ac2dbea4229982ad57fbefab05963d
diff --cc tools/testing/selftests/bpf/prog_tests/select_reuseport.c
index 0800036ed6547,9ed0ab06fd92e..68d452bb9fd9b
--- a/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
+++ b/tools/testing/selftests/bpf/prog_tests/select_reuseport.c
@@@ -823,11 -856,16 +858,18 @@@ void test_map_type(enum bpf_map_type mt
  	if (prepare_bpf_obj())
  		goto out;
  
+ 	test_all();
+ out:
+ 	cleanup();
+ }
+ 
+ void test_select_reuseport(void)
+ {
  	saved_tcp_fo = read_int_sysctl(TCP_FO_SYSCTL);
 +	if (saved_tcp_fo < 0)
 +		goto out;
  	saved_tcp_syncookie = read_int_sysctl(TCP_SYNCOOKIE_SYSCTL);
 -	if (saved_tcp_syncookie < 0 || saved_tcp_syncookie < 0)
 +	if (saved_tcp_syncookie < 0)
  		goto out;
  
  	if (enable_fastopen())