All of lore.kernel.org
 help / color / mirror / Atom feed
From: Geliang Tang <geliang.tang@suse.com>
To: mptcp@lists.linux.dev
Cc: Geliang Tang <geliang.tang@suse.com>
Subject: [PATCH mptcp-next 07/10] selftests/bpf: add bpf_rr scheduler
Date: Fri, 20 May 2022 16:04:52 +0800	[thread overview]
Message-ID: <6362a518b317124f75ed0c938e7b4b0dfb5d7c1c.1653033459.git.geliang.tang@suse.com> (raw)
In-Reply-To: <cover.1653033459.git.geliang.tang@suse.com>

This patch implements the round-robin BPF MPTCP scheduler, named bpf_rr,
which always picks the next available subflow to send data. If no such
next subflow available, picks the first one.

Signed-off-by: Geliang Tang <geliang.tang@suse.com>
---
 tools/testing/selftests/bpf/bpf_tcp_helpers.h |  1 +
 .../selftests/bpf/progs/mptcp_bpf_rr.c        | 48 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c

diff --git a/tools/testing/selftests/bpf/bpf_tcp_helpers.h b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
index 97407c02dc48..a95eda06fe7f 100644
--- a/tools/testing/selftests/bpf/bpf_tcp_helpers.h
+++ b/tools/testing/selftests/bpf/bpf_tcp_helpers.h
@@ -257,6 +257,7 @@ struct mptcp_sched_ops {
 struct mptcp_sock {
 	struct inet_connection_sock	sk;
 
+	struct sock	*last_snd;
 	__u32		token;
 	struct sock	*first;
 	struct mptcp_sched_ops	*sched;
diff --git a/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c
new file mode 100644
index 000000000000..74a98f5bb06a
--- /dev/null
+++ b/tools/testing/selftests/bpf/progs/mptcp_bpf_rr.c
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2022, SUSE. */
+
+#include <linux/bpf.h>
+#include "bpf_tcp_helpers.h"
+
+char _license[] SEC("license") = "GPL";
+
+SEC("struct_ops/mptcp_sched_rr_init")
+void BPF_PROG(mptcp_sched_rr_init, const struct mptcp_sock *msk)
+{
+}
+
+SEC("struct_ops/mptcp_sched_rr_release")
+void BPF_PROG(mptcp_sched_rr_release, const struct mptcp_sock *msk)
+{
+}
+
+void BPF_STRUCT_OPS(bpf_rr_get_subflow, const struct mptcp_sock *msk,
+		    bool reinject, struct mptcp_sched_data *data)
+{
+	unsigned long bitmap = 0;
+	int nr = 0;
+
+	for (int i = 0; i < MPTCP_SUBFLOWS_MAX; i++) {
+		if (!msk->last_snd || !data->contexts[i])
+			break;
+
+		if (data->contexts[i]->tcp_sock == msk->last_snd) {
+			if (i + 1 == MPTCP_SUBFLOWS_MAX || !data->contexts[i + 1])
+				break;
+
+			nr = i + 1;
+			break;
+		}
+	}
+
+	set_bit(nr, &bitmap);
+	data->bitmap = bitmap;
+}
+
+SEC(".struct_ops")
+struct mptcp_sched_ops rr = {
+	.init		= (void *)mptcp_sched_rr_init,
+	.release	= (void *)mptcp_sched_rr_release,
+	.get_subflow	= (void *)bpf_rr_get_subflow,
+	.name		= "bpf_rr",
+};
-- 
2.34.1


  parent reply	other threads:[~2022-05-20  8:05 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-20  8:04 [PATCH mptcp-next 00/10] BPF packet scheduler Geliang Tang
2022-05-20  8:04 ` [PATCH mptcp-next 01/10] Squash to "mptcp: add struct mptcp_sched_ops" Geliang Tang
2022-05-20  8:04 ` [PATCH mptcp-next 02/10] mptcp: reflect first flag in subflow_push_pending Geliang Tang
2022-05-20  8:04 ` [PATCH mptcp-next 03/10] Squash to "mptcp: add get_subflow wrappers" Geliang Tang
2022-05-20  8:04 ` [PATCH mptcp-next 04/10] Squash to "mptcp: add bpf_mptcp_sched_ops" Geliang Tang
2022-05-20  8:04 ` [PATCH mptcp-next 05/10] mptcp: add subflows array in sched data Geliang Tang
2022-05-20  8:04 ` [PATCH mptcp-next 06/10] Squash to "selftests/bpf: add bpf_first scheduler" Geliang Tang
2022-05-20  8:04 ` Geliang Tang [this message]
2022-05-20  8:04 ` [PATCH mptcp-next 08/10] selftests/bpf: add bpf_rr test Geliang Tang
2022-05-20  8:04 ` [PATCH mptcp-next 09/10] selftests/bpf: add bpf_red scheduler Geliang Tang
2022-05-20  8:04 ` [PATCH mptcp-next 10/10] selftests/bpf: add bpf_red test Geliang Tang
2022-05-20  8:17   ` selftests/bpf: add bpf_red test: Build Failure MPTCP CI
2022-05-20  9:52   ` selftests/bpf: add bpf_red test: Tests Results MPTCP CI

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=6362a518b317124f75ed0c938e7b4b0dfb5d7c1c.1653033459.git.geliang.tang@suse.com \
    --to=geliang.tang@suse.com \
    --cc=mptcp@lists.linux.dev \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.