[mptcp-next] Squash to "selftests/bpf: Add bpf_burst scheduler"

Commit Message

Geliang Tang Nov. 22, 2023, 3:42 a.m. UTC

Fix the bpf selftests build error:

progs/mptcp_bpf_burst.c:37:18: error: no member named 'write_seq' in 'struct tcp_sock'
        return tp ? tp->write_seq == tp->snd_nxt : true;
                    ~~  ^
1 error generated.
make: *** [Makefile:614: tools/testing/selftests/bpf/mptcp_bpf_burst.bpf.o] Error 1
make: *** Waiting for unfinished jobs....

Reported-by: kernel test robot <[e-mail]>
Closes: https://lore.kernel.org/r/[e-mail]/
Signed-off-by: Geliang Tang <[e-mail]>
---
 tools/testing/selftests/bpf/bpf_tcp_helpers.h | 1 +
 1 file changed, 1 insertion(+)

Comments

MPTCP CI Nov. 22, 2023, 4:49 a.m. UTC | #1

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

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

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

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

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


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)

Matthieu Baerts Nov. 27, 2023, 5:56 p.m. UTC | #2

Hi Geliang,

On 22/11/2023 04:42, Geliang Tang wrote:
> Fix the bpf selftests build error:
> 
> progs/mptcp_bpf_burst.c:37:18: error: no member named 'write_seq' in 'struct tcp_sock'
>         return tp ? tp->write_seq == tp->snd_nxt : true;
>                     ~~  ^
> 1 error generated.
> make: *** [Makefile:614: tools/testing/selftests/bpf/mptcp_bpf_burst.bpf.o] Error 1
> make: *** Waiting for unfinished jobs....

Thank you for the patch, now in our tree:

New patches for t/upstream:
- bd37dad396df: "squashed" in "selftests/bpf: Add bpf_burst scheduler"
- Results: d4787f01696d..1ee636354037 (export)

Tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20231127T175348

Cheers,
Matt

Patch

diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
index 6b43845f1234..2c71226b3631 100644
--- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
@@ -87,6 +87,7 @@  struct tcp_sock {
 	__u32	lsndtime;
 	__u32	prior_cwnd;
 	__u64	tcp_mstamp;	/* most recent packet received/sent */
+	__u32	write_seq;	/* Tail(+1) of data held in tcp send buffer */
 	bool	is_mptcp;
 } __attribute__((preserve_access_index));