This is a note to let you know that I've just added the patch titled mptcp, btf: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled to the 5.19-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mptcp-btf-add-struct-mptcp_sock-definition-when-config_mptcp-is-disabled.patch and it can be found in the queue-5.19 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From f1d41f7720c89705c20e4335a807b1c518c2e7be Mon Sep 17 00:00:00 2001 From: Jiri Olsa <jolsa@xxxxxxxxxx> Date: Tue, 2 Aug 2022 18:33:24 +0200 Subject: mptcp, btf: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled From: Jiri Olsa <jolsa@xxxxxxxxxx> commit f1d41f7720c89705c20e4335a807b1c518c2e7be upstream. The btf_sock_ids array needs struct mptcp_sock BTF ID for the bpf_skc_to_mptcp_sock helper. When CONFIG_MPTCP is disabled, the 'struct mptcp_sock' is not defined and resolve_btfids will complain with: [...] BTFIDS vmlinux WARN: resolve_btfids: unresolved symbol mptcp_sock [...] Add an empty definition for struct mptcp_sock when CONFIG_MPTCP is disabled. Fixes: 3bc253c2e652 ("bpf: Add bpf_skc_to_mptcp_sock_proto") Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx> Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx> Reviewed-by: Mat Martineau <mathew.j.martineau@xxxxxxxxxxxxxxx> Acked-by: Martin KaFai Lau <kafai@xxxxxx> Link: https://lore.kernel.org/bpf/20220802163324.1873044-1-jolsa@xxxxxxxxxx Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- include/net/mptcp.h | 4 ++++ 1 file changed, 4 insertions(+) --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -290,4 +290,8 @@ struct mptcp_sock *bpf_mptcp_sock_from_s static inline struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk) { return NULL; } #endif +#if !IS_ENABLED(CONFIG_MPTCP) +struct mptcp_sock { }; +#endif + #endif /* __NET_MPTCP_H */ Patches currently in stable-queue which might be from jolsa@xxxxxxxxxx are queue-5.19/tracing-perf-fix-double-put-of-trace-event-when-init-fails.patch queue-5.19/mptcp-btf-add-struct-mptcp_sock-definition-when-config_mptcp-is-disabled.patch