Daniel Borkmann says:

====================
pull-request: bpf-next 2023-04-13

We've added 260 non-merge commits during the last 36 day(s) which contain
a total of 356 files changed, 21786 insertions(+), 11275 deletions(-).

The main changes are:

1) Rework BPF verifier log behavior and implement it as a rotating log
   by default with the option to retain old-style fixed log behavior,
   from Andrii Nakryiko.

2) Adds support for using {FOU,GUE} encap with an ipip device operating
   in collect_md mode and add a set of BPF kfuncs for controlling encap
   params, from Christian Ehrig.

3) Allow BPF programs to detect at load time whether a particular kfunc
   exists or not, and also add support for this in light skeleton,
   from Alexei Starovoitov.

4) Optimize hashmap lookups when key size is multiple of 4,
   from Anton Protopopov.

5) Enable RCU semantics for task BPF kptrs and allow referenced kptr
   tasks to be stored in BPF maps, from David Vernet.

6) Add support for stashing local BPF kptr into a map value via
   bpf_kptr_xchg(). This is useful e.g. for rbtree node creation
   for new cgroups, from Dave Marchevsky.

7) Fix BTF handling of is_int_ptr to skip modifiers to work around
   tracing issues where a program cannot be attached, from Feng Zhou.

8) Migrate a big portion of test_verifier unit tests over to
   test_progs -a verifier_* via inline asm to ease {read,debug}ability,
   from Eduard Zingerman.

9) Several updates to the instruction-set.rst documentation
   which is subject to future IETF standardization
   (https://lwn.net/Articles/926882/), from Dave Thaler.

10) Fix BPF verifier in the __reg_bound_offset's 64->32 tnum sub-register
    known bits information propagation, from Daniel Borkmann.

11) Add skb bitfield compaction work related to BPF with the overall goal
    to make more of the sk_buff bits optional, from Jakub Kicinski.

12) BPF selftest cleanups for build id extraction which stand on its own
    from the upcoming integration work of build id into struct file object,
    from Jiri Olsa.

13) Add fixes and optimizations for xsk descriptor validation and several
    selftest improvements for xsk sockets, from Kal Conley.

14) Add BPF links for struct_ops and enable switching implementations
    of BPF TCP cong-ctls under a given name by replacing backing
    struct_ops map, from Kui-Feng Lee.

15) Remove a misleading BPF verifier env->bypass_spec_v1 check on variable
    offset stack read as earlier Spectre checks cover this,
    from Luis Gerhorst.

16) Fix issues in copy_from_user_nofault() for BPF and other tracers
    to resemble copy_from_user_nmi() from safety PoV, from Florian Lehner
    and Alexei Starovoitov.

17) Add --json-summary option to test_progs in order for CI tooling to
    ease parsing of test results, from Manu Bretelle.

18) Batch of improvements and refactoring to prep for upcoming
    bpf_local_storage conversion to bpf_mem_cache_{alloc,free} allocator,
    from Martin KaFai Lau.

19) Improve bpftool's visual program dump which produces the control
    flow graph in a DOT format by adding C source inline annotations,
    from Quentin Monnet.

20) Fix attaching fentry/fexit/fmod_ret/lsm to modules by extracting
    the module name from BTF of the target and searching kallsyms of
    the correct module, from Viktor Malik.

21) Improve BPF verifier handling of '<const> <cond> <non_const>'
    to better detect whether in particular jmp32 branches are taken,
    from Yonghong Song.

22) Allow BPF TCP cong-ctls to write app_limited of struct tcp_sock.
    A built-in cc or one from a kernel module is already able to write
    to app_limited, from Yixin Shen.

Conflicts:

Documentation/bpf/bpf_devel_QA.rst
  b7abcd9c656b ("bpf, doc: Link to submitting-patches.rst for general patch submission info")
  0f10f647f455 ("bpf, docs: Use internal linking for link to netdev subsystem doc")
https://lore.kernel.org/all/20230307095812.236eb1be@canb.auug.org.au/

include/net/ip_tunnels.h
  bc9d003dc48c3 ("ip_tunnel: Preserve pointer const in ip_tunnel_info_opts")
  ac931d4cdec3d ("ipip,ip_tunnel,sit: Add FOU support for externally controlled ipip devices")
https://lore.kernel.org/all/20230413161235.4093777-1-broonie@kernel.org/

net/bpf/test_run.c
  e5995bc7e2ba ("bpf, test_run: fix crashes due to XDP frame overwriting/corruption")
  294635a8165a ("bpf, test_run: fix &xdp_frame misplacement for LIVE_FRAMES")
https://lore.kernel.org/all/20230320102619.05b80a98@canb.auug.org.au/
====================

Link: https://lore.kernel.org/r/20230413191525.7295-1-daniel@iogearbox.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --cc Documentation/bpf/bpf_devel_QA.rst
index 7403f81c995cf9acd3a1234a18150dce6494e7cc,e151e61dff381896c61027026a3faf791042e88b..609b71f5747d704e1fedec38a00152a089bc6b9c
--- 1/Documentation/bpf/bpf_devel_QA.rst
--- 2/Documentation/bpf/bpf_devel_QA.rst
+++ b/Documentation/bpf/bpf_devel_QA.rst
@@@ -684,8 -689,11 +689,7 @@@ when
  
  
  .. Links
- .. _netdev-FAQ: https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html
 -.. _Documentation/process/: https://www.kernel.org/doc/html/latest/process/
  .. _selftests:
     https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/tools/testing/selftests/bpf/
 -.. _Documentation/dev-tools/kselftest.rst:
 -   https://www.kernel.org/doc/html/latest/dev-tools/kselftest.html
 -.. _Documentation/bpf/btf.rst: btf.rst
  
  Happy BPF hacking!

diff --cc include/linux/skbuff.h
Simple merge

diff --cc include/net/ip_tunnels.h
index 255b32a90850a0a1b39604cc0b9407f5a0d4d5e5,7912f53caae0ba70eec66d24a22b760117433f07..ed4b6ad3fcac82650525bdf0702e806286f157b6
--- 1/include/net/ip_tunnels.h
--- 2/include/net/ip_tunnels.h
+++ b/include/net/ip_tunnels.h
@@@ -66,15 -73,9 +73,16 @@@ struct ip_tunnel_encap 
  #define IP_TUNNEL_OPTS_MAX                                    \
        GENMASK((sizeof_field(struct ip_tunnel_info,            \
                              options_len) * BITS_PER_BYTE) - 1, 0)
 +
 +#define ip_tunnel_info_opts(info)                             \
 +      _Generic(info,                                          \
 +               const struct ip_tunnel_info * : ((const void *)((info) + 1)),\
 +               struct ip_tunnel_info * : ((void *)((info) + 1))\
 +      )
 +
  struct ip_tunnel_info {
        struct ip_tunnel_key    key;
+       struct ip_tunnel_encap  encap;
  #ifdef CONFIG_DST_CACHE
        struct dst_cache        dst_cache;
  #endif

diff --cc include/net/tcp.h
Simple merge

diff --cc include/net/xdp.h
Simple merge

diff --cc kernel/bpf/btf.c
Simple merge

diff --cc net/bpf/test_run.c
index d350f31c7a3df2c1b7a656cced8f377c87380307,68bdfc041a7b3e6086134e06c563411abd4adedd..0b9bd9b399904ebd532900b89e5c5822a4d76e02
--- 1/net/bpf/test_run.c
--- 2/net/bpf/test_run.c
+++ b/net/bpf/test_run.c
@@@ -215,6 -208,16 +215,16 @@@ static void xdp_test_run_teardown(struc
        kfree(xdp->skbs);
  }
  
 -      return head->frm.data != head->orig_ctx.data ||
 -             head->frm.flags != head->orig_ctx.flags;
+ static bool frame_was_changed(const struct xdp_page_head *head)
+ {
+       /* xdp_scrub_frame() zeroes the data pointer, flags is the last field,
+        * i.e. has the highest chances to be overwritten. If those two are
+        * untouched, it's most likely safe to skip the context reset.
+        */
++      return head->frame->data != head->orig_ctx.data ||
++             head->frame->flags != head->orig_ctx.flags;
+ }
+ 
  static bool ctx_was_changed(struct xdp_page_head *head)
  {
        return head->orig_ctx.data != head->ctx.data ||

diff --cc net/core/filter.c
Simple merge

diff --cc net/core/xdp.c
Simple merge

diff --cc net/ipv4/ip_tunnel.c
Simple merge

diff --cc tools/testing/selftests/bpf/prog_tests/xdp_do_redirect.c
Simple merge