* [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled
@ 2022-08-02 16:33 Jiri Olsa
2022-08-02 19:16 ` mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results MPTCP CI
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Jiri Olsa @ 2022-08-02 16:33 UTC (permalink / raw)
To: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Mat Martineau, Matthieu Baerts
Cc: Martin KaFai Lau, bpf, Song Liu, Yonghong Song, John Fastabend,
KP Singh, Stanislav Fomichev, Hao Luo, mptcp
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
Adding empty difinition for struct mptcp_sock when CONFIG_MPTCP
is disabled.
Acked-by: Martin KaFai Lau <kafai@fb.com>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
include/net/mptcp.h | 4 ++++
1 file changed, 4 insertions(+)
v2 changes:
- moved the new empty struct declaration next to the inline
bpf_mptcp_sock_from_subflow function [Mat]
diff --git a/include/net/mptcp.h b/include/net/mptcp.h
index ac9cf7271d46..412479ebf5ad 100644
--- a/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@ -291,4 +291,8 @@ struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk);
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 */
--
2.37.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results
2022-08-02 16:33 [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled Jiri Olsa
@ 2022-08-02 19:16 ` MPTCP CI
2022-08-02 22:36 ` [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled Mat Martineau
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: MPTCP CI @ 2022-08-02 19:16 UTC (permalink / raw)
To: Jiri Olsa; +Cc: mptcp
Hi Jiri,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: Script error! ❓:
- :
- Task: https://cirrus-ci.com/task/4921402208813056
- Summary: https://api.cirrus-ci.com/v1/artifact/task/4921402208813056/summary/summary.txt
- KVM Validation: Script error! ❓:
- :
- Task: https://cirrus-ci.com/task/6047302115655680
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6047302115655680/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/71103ca3923b
If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debug
For more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled
2022-08-02 16:33 [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled Jiri Olsa
2022-08-02 19:16 ` mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results MPTCP CI
@ 2022-08-02 22:36 ` Mat Martineau
2022-08-03 16:31 ` Matthieu Baerts
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Mat Martineau @ 2022-08-02 22:36 UTC (permalink / raw)
To: Jiri Olsa
Cc: Alexei Starovoitov, Daniel Borkmann, Andrii Nakryiko,
Matthieu Baerts, Martin KaFai Lau, bpf, Song Liu, Yonghong Song,
John Fastabend, KP Singh, Stanislav Fomichev, Hao Luo, mptcp
On Tue, 2 Aug 2022, Jiri Olsa wrote:
> 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
>
> Adding empty difinition for struct mptcp_sock when CONFIG_MPTCP
> is disabled.
>
> Acked-by: Martin KaFai Lau <kafai@fb.com>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Thanks Jiri, v2 looks good to merge in bpf-next:
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
> ---
> include/net/mptcp.h | 4 ++++
> 1 file changed, 4 insertions(+)
>
> v2 changes:
> - moved the new empty struct declaration next to the inline
> bpf_mptcp_sock_from_subflow function [Mat]
>
> diff --git a/include/net/mptcp.h b/include/net/mptcp.h
> index ac9cf7271d46..412479ebf5ad 100644
> --- a/include/net/mptcp.h
> +++ b/include/net/mptcp.h
> @@ -291,4 +291,8 @@ struct mptcp_sock *bpf_mptcp_sock_from_subflow(struct sock *sk);
> 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 */
> --
> 2.37.1
>
>
--
Mat Martineau
Intel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled
2022-08-02 16:33 [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled Jiri Olsa
2022-08-02 19:16 ` mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results MPTCP CI
2022-08-02 22:36 ` [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled Mat Martineau
@ 2022-08-03 16:31 ` Matthieu Baerts
2022-08-03 18:07 ` mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results MPTCP CI
2022-08-08 13:40 ` [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled patchwork-bot+netdevbpf
4 siblings, 0 replies; 7+ messages in thread
From: Matthieu Baerts @ 2022-08-03 16:31 UTC (permalink / raw)
To: Jiri Olsa; +Cc: mptcp
Hi Jiri, Mat,
(MPTCP ML only)
On 02/08/2022 18:33, Jiri Olsa wrote:
> 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
>
> Adding empty difinition for struct mptcp_sock when CONFIG_MPTCP
> is disabled.
Thank you for the patch and the review!
FYI, I just applied this patch in MPTCP tree (feat. for other trees)
just to track it and prevent conflicts on our side with the future
bpf-next/net-next.
New patches for t/upstream:
- fa5c3bcfae6e: mptcp: Add struct mptcp_sock definition when
CONFIG_MPTCP is disabled
- Results: 982ba3087aac..ba0f79895fde (export)
Tests are now in progress:
https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20220803T162341
Cheers,
Matt
--
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results
2022-08-02 16:33 [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled Jiri Olsa
` (2 preceding siblings ...)
2022-08-03 16:31 ` Matthieu Baerts
@ 2022-08-03 18:07 ` MPTCP CI
2022-08-08 13:40 ` [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled patchwork-bot+netdevbpf
4 siblings, 0 replies; 7+ messages in thread
From: MPTCP CI @ 2022-08-03 18:07 UTC (permalink / raw)
To: Jiri Olsa; +Cc: mptcp
Hi Jiri,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal:
- Unstable: 1 failed test(s): selftest_mptcp_join 🔴:
- Task: https://cirrus-ci.com/task/4744036484382720
- Summary: https://api.cirrus-ci.com/v1/artifact/task/4744036484382720/summary/summary.txt
- KVM Validation: debug:
- Success! ✅:
- Task: https://cirrus-ci.com/task/5869936391225344
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5869936391225344/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/71103ca3923b
If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debug
For more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled
2022-08-02 16:33 [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled Jiri Olsa
` (3 preceding siblings ...)
2022-08-03 18:07 ` mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results MPTCP CI
@ 2022-08-08 13:40 ` patchwork-bot+netdevbpf
4 siblings, 0 replies; 7+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-08-08 13:40 UTC (permalink / raw)
To: Jiri Olsa
Cc: ast, daniel, andrii, mathew.j.martineau, matthieu.baerts, kafai,
bpf, songliubraving, yhs, john.fastabend, kpsingh, sdf, haoluo,
mptcp
Hello:
This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <daniel@iogearbox.net>:
On Tue, 2 Aug 2022 18:33:24 +0200 you wrote:
> 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
>
> [...]
Here is the summary with links:
- [PATCHv2,bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled
https://git.kernel.org/bpf/bpf/c/f1d41f7720c8
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results
2022-07-11 13:07 [PATCH " Jiri Olsa
@ 2022-07-11 14:41 ` MPTCP CI
0 siblings, 0 replies; 7+ messages in thread
From: MPTCP CI @ 2022-07-11 14:41 UTC (permalink / raw)
To: Jiri Olsa; +Cc: mptcp
Hi Jiri,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal:
- Unstable: 2 failed test(s): selftest_mptcp_join selftest_simult_flows 🔴:
- Task: https://cirrus-ci.com/task/5307521400307712
- Summary: https://api.cirrus-ci.com/v1/artifact/task/5307521400307712/summary/summary.txt
- KVM Validation: debug:
- Unstable: 1 failed test(s): selftest_mptcp_join 🔴:
- Task: https://cirrus-ci.com/task/6433421307150336
- Summary: https://api.cirrus-ci.com/v1/artifact/task/6433421307150336/summary/summary.txt
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/1d9ed6cb0b33
If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-debug
For more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (Tessares)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-08-08 13:40 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-02 16:33 [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled Jiri Olsa
2022-08-02 19:16 ` mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results MPTCP CI
2022-08-02 22:36 ` [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled Mat Martineau
2022-08-03 16:31 ` Matthieu Baerts
2022-08-03 18:07 ` mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results MPTCP CI
2022-08-08 13:40 ` [PATCHv2 bpf-next] mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled patchwork-bot+netdevbpf
-- strict thread matches above, loose matches on Subject: below --
2022-07-11 13:07 [PATCH " Jiri Olsa
2022-07-11 14:41 ` mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results MPTCP CI
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).