]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf...
authorJakub Kicinski <kuba@kernel.org>
Sat, 18 Oct 2025 00:20:41 +0000 (17:20 -0700)
committerJakub Kicinski <kuba@kernel.org>
Sat, 18 Oct 2025 00:20:42 +0000 (17:20 -0700)
commite90576829ce47a46838685153494bc12cd1bc333
tree438eaa3d0ebae810f84532006c3eafd8ac580536
parent37a183d3b7cdb873e7f5f9daef1ad6d8f7c95fb7
parent03de843bd0806184505f1e8099ff4ca9a8665dbb
Merge tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Martin KaFai Lau says:

====================
pull-request: bpf-next 2025-10-16

We've added 6 non-merge commits during the last 1 day(s) which contain
a total of 18 files changed, 577 insertions(+), 38 deletions(-).

The main changes are:

1) Bypass the global per-protocol memory accounting either by setting
   a netns sysctl or using bpf_setsockopt in a bpf program,
   from Kuniyuki Iwashima.

* tag 'for-netdev' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next:
  selftests/bpf: Add test for sk->sk_bypass_prot_mem.
  bpf: Introduce SK_BPF_BYPASS_PROT_MEM.
  bpf: Support bpf_setsockopt() for BPF_CGROUP_INET_SOCK_CREATE.
  net: Introduce net.core.bypass_prot_mem sysctl.
  net: Allow opt-out from global protocol memory accounting.
  tcp: Save lock_sock() for memcg in inet_csk_accept().
====================

Link: https://patch.msgid.link/20251016204539.773707-1-martin.lau@linux.dev
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
include/net/sock.h
include/net/tcp.h
net/ipv4/tcp.c