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

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

[Geliang Tang]

Move this block from 'Squash to "mptcp: add scheduler wrappers"' into
'mptcp: add mptcp_subflow_ctx_by_pos helper' to fix the following error
reported by CI:

  net/mptcp/sched.c: In function 'mptcp_subflow_ctx_by_pos':
  net/mptcp/sched.c:122:19: error: 'const struct mptcp_sock' has no member named 'sched_data'
    122 |         return msk->sched_data.contexts[pos];
        |                   ^~
  net/mptcp/sched.c:123:1: error: control reaches end of non-void function [-Werror=return-type]
    123 | }
        | ^

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

diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h
index 4e42f52596d4..bda91399be49 100644
--- a/net/mptcp/protocol.h
+++ b/net/mptcp/protocol.h
@@ -314,6 +314,7 @@ struct mptcp_sock {
 				   */
 	struct sock	*first;
 	struct mptcp_pm_data	pm;
+	struct mptcp_sched_data sched_data;
 	struct mptcp_sched_ops	*sched;
 	struct {
 		u32	space;	/* bytes copied in last measurement window */
-- 
2.35.3

Re: Squash to "mptcp: add mptcp_subflow_ctx_by_pos helper": Tests Results

[MPTCP CI]

Hi Geliang,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal (except selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/5838969158500352
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5838969158500352/summary/summary.txt

- KVM Validation: normal (only selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/5276019205079040
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/5276019205079040/summary/summary.txt

- KVM Validation: debug (except selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/6401919111921664
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/6401919111921664/summary/summary.txt

- KVM Validation: debug (only selftest_mptcp_join):
  - Success! ✅:
  - Task: https://cirrus-ci.com/task/4994544228368384
  - Summary: https://api.cirrus-ci.com/v1/artifact/task/4994544228368384/summary/summary.txt

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


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)