[PATCH mptcp-next] Squash to "mptcp: add sched_data_set_contexts helper"

Geliang Tang posted 1 patch 2 weeks, 6 days ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/multipath-tcp/mptcp_net-next tags/patchew/20221118221251.4330-1-geliang.tang@suse.com
Maintainers: Mat Martineau <mathew.j.martineau@linux.intel.com>, Matthieu Baerts <matthieu.baerts@tessares.net>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
net/mptcp/protocol.h | 2 ++
1 file changed, 2 insertions(+)
[PATCH mptcp-next] Squash to "mptcp: add sched_data_set_contexts helper"
Posted by Geliang Tang 2 weeks, 6 days ago
Fix this warning when compiling with W=1:

 $ make W=1 net/mptcp/sched.o
 net/mptcp/sched.c:97:6: warning: symbol
'mptcp_sched_data_set_contexts' was not declared. Should it be static?

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 net/mptcp/protocol.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index b2fb7e41807f..224f03a899c5 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -655,6 +655,8 @@ int mptcp_init_sched(struct mptcp_sock *msk,
 void mptcp_release_sched(struct mptcp_sock *msk);
 void mptcp_subflow_set_scheduled(struct mptcp_subflow_context *subflow,
 				 bool scheduled);
+void mptcp_sched_data_set_contexts(const struct mptcp_sock *msk,
+				   struct mptcp_sched_data *data);
 
 static inline bool __tcp_can_send(const struct sock *ssk)
 {
-- 
2.35.3
Re: [PATCH mptcp-next] Squash to "mptcp: add sched_data_set_contexts helper"
Posted by Matthieu Baerts 2 weeks, 3 days ago
Hi Geliang, Mat,

On 18/11/2022 23:12, Geliang Tang wrote:
> Fix this warning when compiling with W=1:
> 
>  $ make W=1 net/mptcp/sched.o
>  net/mptcp/sched.c:97:6: warning: symbol
> 'mptcp_sched_data_set_contexts' was not declared. Should it be static?

Thank you for the fix and the suggestion!

I reverted my workaround and applied this patch:

- 5ee2ef57cd35: Revert "tg: tmp workaround to avoid CI error"
- a376f74a8a99: "squashed" in "mptcp: add sched_data_set_contexts helper"
- Results: 33c2d9f3290e..839f235881d8 (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20221121T102509

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net
Re: Squash to "mptcp: add sched_data_set_contexts helper": Tests Results
Posted by MPTCP CI 2 weeks, 6 days ago
Hi Geliang,

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/5674094851522560
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5674094851522560/summary/summary.txt

- KVM Validation: debug:
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/5111144898101248
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5111144898101248/summary/summary.txt

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/e85f97ad01b7


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)