From: Alexei Starovoitov <ast@kernel.org>
Date: Fri, 21 Feb 2025 02:10:24 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf bpf-6.14-rc4
X-Git-Tag: v6.15-rc1~98^2~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd4319b6c2b36aa5c6534aec1dbe16921ec960ef;p=thirdparty%2Fkernel%2Flinux.git

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

Cross-merge bpf fixes after downstream PR (bpf-6.14-rc4).

Minor conflict:
  kernel/bpf/btf.c
Adjacent changes:
  kernel/bpf/arena.c
  kernel/bpf/btf.c
  kernel/bpf/syscall.c
  kernel/bpf/verifier.c
  mm/memory.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
---

bd4319b6c2b36aa5c6534aec1dbe16921ec960ef
diff --cc kernel/bpf/btf.c
index 69f5752e880be,c3223e0db2f51..12426e10baf30
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@@ -6505,8 -6507,8 +6505,10 @@@ static const struct bpf_raw_tp_null_arg
  	/* rxrpc */
  	{ "rxrpc_recvdata", 0x1 },
  	{ "rxrpc_resend", 0x10 },
 +	{ "rxrpc_tq", 0x10 },
 +	{ "rxrpc_client", 0x1 },
+ 	/* skb */
+ 	{"kfree_skb", 0x1000},
  	/* sunrpc */
  	{ "xs_stream_read_data", 0x1 },
  	/* ... from xprt_cong_event event class */