Skip to contentSkip to conversation

mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled

PATCH Applied Jiri Olsa 5 participants 6 messages Aug 2, 2022 – Aug 8, 2022

Subsystems (3)
lore
Share & tools
lore

Jiri Olsa

author reviewer
#0 lore raw

PATCH v2 1/1 mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled

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.

---
 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]

include/net/mptcp.h +4 -0
index ac9cf7271d46..412479ebf5ad 100644
@@ -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 */
Signature · 1 line
2.37.1
#1 lore raw

Re: mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results

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)

Reviewed-by on v2 1/1
#2 lore raw
In reply to Jiri Olsa
Quoted 6 lines · Jiri Olsa

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:

Quoted 8 lines

BTFIDS vmlinux
WARN: resolve_btfids: unresolved symbol mptcp_sock

Adding empty difinition for struct mptcp_sock when CONFIG_MPTCP is disabled.

Thanks Jiri, v2 looks good to merge in bpf-next:

Quoted 25 lines

---
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]

include/net/mptcp.h +4 -0
index ac9cf7271d46..412479ebf5ad 100644
@@ -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 */
Signature · 1 line
2.37.1

--
Mat Martineau
Intel

#3 lore raw
In reply to Jiri Olsa

Hi Jiri, Mat,

(MPTCP ML only)

Quoted 11 lines · Jiri Olsa

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

Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
#4 lore raw

Re: mptcp: Add struct mptcp_sock definition when CONFIG_MPTCP is disabled: Tests Results

In reply to Jiri Olsa

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)

#5 lore raw
In reply to Jiri Olsa
This patch was applied to bpf/bpf.git (master) by Daniel Borkmann <[email protected]>:

Hello:

This patch was applied to bpf/bpf.git (master)
by Daniel Borkmann <[email protected]>:

Quoted 10 lines · 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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html