Skip to content

Commit a77842e

Browse files
Geliang Tangintel-lab-lkp
Geliang Tang
authored andcommitted
Squash to "selftests/bpf: Add bpf_burst scheduler & test"
Update test_bpf_sched(). Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
1 parent 1dc120b commit a77842e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tools/testing/selftests/bpf/prog_tests/mptcp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ static void test_burst(void)
741741
if (!ASSERT_OK(mptcp_bpf_burst__load(skel), "load: burst"))
742742
goto skel_destroy;
743743

744-
test_bpf_sched(skel->obj, "burst", WITH_DATA, WITH_DATA);
744+
test_bpf_sched(skel->maps.burst, "burst", WITH_DATA, WITH_DATA);
745745
skel_destroy:
746746
mptcp_bpf_burst__destroy(skel);
747747
}

tools/testing/selftests/bpf/progs/mptcp_bpf_burst.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ char _license[] SEC("license") = "GPL";
99

1010
#define MPTCP_SEND_BURST_SIZE 65428
1111

12+
#define SSK_MODE_ACTIVE 0
13+
#define SSK_MODE_BACKUP 1
14+
#define SSK_MODE_MAX 2
15+
1216
#define min(a, b) ((a) < (b) ? (a) : (b))
1317

1418
extern bool mptcp_subflow_active(struct mptcp_subflow_context *subflow) __ksym;
@@ -18,10 +22,6 @@ extern bool bpf_sk_stream_memory_free(const struct sock *sk) __ksym;
1822
extern bool bpf_mptcp_subflow_queues_empty(struct sock *sk) __ksym;
1923
extern void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) __ksym;
2024

21-
#define SSK_MODE_ACTIVE 0
22-
#define SSK_MODE_BACKUP 1
23-
#define SSK_MODE_MAX 2
24-
2525
static __always_inline __u64 div_u64(__u64 dividend, __u32 divisor)
2626
{
2727
return dividend / divisor;
@@ -163,7 +163,7 @@ int BPF_PROG(bpf_burst_get_retrans, struct mptcp_sock *msk)
163163
return 0;
164164
}
165165

166-
SEC(".struct_ops")
166+
SEC(".struct_ops.link")
167167
struct mptcp_sched_ops burst = {
168168
.init = (void *)mptcp_sched_burst_init,
169169
.release = (void *)mptcp_sched_burst_release,

0 commit comments

Comments
 (0)