Drop mptcp_pm_subflow_chk_stale in bpf
Subsystems (5)
Geliang Tang
reviewercover Drop mptcp_pm_subflow_chk_stale in bpf
From: Geliang Tang <[email protected]>
Since mptcp_pm_subflow_chk_stale is removed in the "mptcp: address stall under memory pressure" series, this patch drops it from BPF to keep the BPF tests passing.
Based-on: <[email protected]>
Geliang Tang (2):
Squash to "bpf: Export mptcp packet scheduler helpers" Squash to "selftests/bpf: Add bpf_burst scheduler & test"
net/mptcp/bpf.c | 1 - tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c | 2 -- 2 files changed, 3 deletions(-)
Signature · 1 line
2.53.0
Geliang Tang
reviewerPATCH 1/2 Squash to "bpf: Export mptcp packet scheduler helpers"
From: Geliang Tang <[email protected]>
mptcp_pm_subflow_chk_stale() is removed from mptcp_subflow_get_retrans() in kernel, drop it in bpf_mptcp_common_kfunc_ids.
--- net/mptcp/bpf.c | 1 - 1 file changed, 1 deletion(-)
net/mptcp/bpf.c +0 -1
@@ -322,7 +322,6 @@ BTF_ID_FLAGS(func, mptcp_subflow_active) BTF_ID_FLAGS(func, mptcp_set_timeout) BTF_ID_FLAGS(func, mptcp_wnd_end) BTF_ID_FLAGS(func, bpf_sk_stream_memory_free) -BTF_ID_FLAGS(func, mptcp_pm_subflow_chk_stale, KF_SLEEPABLE)BTF_KFUNCS_END (bpf_mptcp_common_kfunc_ids) static int bpf_mptcp_common_kfunc_filter(const struct bpf_prog *prog, u32 kfunc_id)
Signature · 1 line
2.53.0
Geliang Tang
reviewerPATCH 2/2 Squash to "selftests/bpf: Add bpf_burst scheduler & test"
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
mptcp_pm_subflow_chk_stale() is removed from mptcp_subflow_get_retrans() in kernel, drop it in bpf_burst_get_retrans() too.
--- tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c | 2 -- 1 file changed, 2 deletions(-)
tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c +0 -2
@@ -25,7 +25,6 @@ extern bool mptcp_subflow_active(struct mptcp_subflow_context *subflow) __ksym; extern void mptcp_set_timeout(struct sock *sk) __ksym; extern __u64 mptcp_wnd_end(const struct mptcp_sock *msk) __ksym; extern bool bpf_sk_stream_memory_free(const struct mptcp_subflow_context *subflow) __ksym; -extern void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) __ksym; static __always_inline __u64 div_u64(__u64 dividend, __u32 divisor) {
@@ -140,7 +139,6 @@ int BPF_PROG(bpf_burst_get_retrans, struct mptcp_sock *msk)/* still data outstanding at TCP level? skip this */ if (!tcp_rtx_and_write_queues_empty (ssk)) { -mptcp_pm_subflow_chk_stale (msk, ssk); min_stale_count =min (min_stale_count, subflow->stale_count);continue ; }
Signature · 1 line
2.53.0
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! ✅
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Success! ✅
- KVM Validation: debug (only selftest_mptcp_join): Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/31089366128
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/b071ec3b5fea
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1141341
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-normalFor 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 (NGI0 Core)
Paolo Abeni
maintainerQuoted 8 lines · Geliang Tang
From: Geliang Tang <[email protected]>
Since
mptcp_pm_subflow_chk_staleis removed in the "mptcp: address stall under memory pressure" series, this patch drops it from BPF to keep the BPF tests passing.Based-on: <[email protected]>
Quoted 8 lines
Geliang Tang (2):
Squash to "bpf: Export mptcp packet scheduler helpers" Squash to "selftests/bpf: Addbpf_burstscheduler & test"net/mptcp/bpf.c | 1 - tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c | 2 -- 2 files changed, 3 deletions(-)
Thanks Geliang for the quick turn around!
Both patches LGTM!
Side note: I really think it's for the better to keep the stale subflow logic detection out of the retrans scheduler.
/P
Matthieu Baerts
maintainerHi Geliang,
Quoted 5 lines · Geliang Tang
From: Geliang Tang <[email protected]>
Since
mptcp_pm_subflow_chk_staleis removed in the "mptcp: address stall under memory pressure" series, this patch drops it from BPF to keep the BPF tests passing.
Thank you for fixing that!
New patches for t/upstream:
- 3e3fab142e29: "squashed" patch 1/2 in "bpf: Export mptcp packet scheduler helpers"
- b1602f423178: "squashed" patch 2/2 in "selftests/bpf: Add bpf_burst scheduler & test"
- Results: 7bf94a8339a9..b67053e5e63b (export)
Tests are now in progress:
Cheers,
Matt
Signature · 1 line
Sponsored by the NGI0 Core fund.