From patchwork Wed Oct 16 07:33:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 13837833 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D4CFDBA45 for ; Wed, 16 Oct 2024 07:33:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729064020; cv=none; b=M1ch0ts9Bp5GqCsxRxUvJD4Q5kwZ5z2ZwriYrfKMdIFFLHeDBhITL/moXYx4UpBm0jgmJnFjAO5I6JPMytFp72X5a4LSMWCAVqdqtuWwMKHadP59IKvQ/mGzUkCIOVgGHYjcrA8XWc558y3za2gDo8nUjxn0wHST1B3Ulqkj1mU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729064020; c=relaxed/simple; bh=uP2+vEIHhzORm4aKIH4TIot3P+Ep8rXugxt0n7xXjkY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XVOGOjkVo+HNwJH+ZCMzJVLPC3a+0u4tzLmDd1mX8jE4rmbdH4N40sbJPAD3G1FpTUgVPBUkPzhCxQ1rOBzAmsFCZUirMNSE7rczzF7mOC29HAArOsf1fyIYKbbdfBQMgltsNgKDP/DIekeZbeCLm0rLxlg2Px2PXY618ew5lQY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oTp0jQQu; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oTp0jQQu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02E75C4CECE; Wed, 16 Oct 2024 07:33:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729064020; bh=uP2+vEIHhzORm4aKIH4TIot3P+Ep8rXugxt0n7xXjkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oTp0jQQuX7D6thQAxQGNNscyFy5TY7Pfad/ctbFTuFCa+J3lGjWji1UKxyIujg17S dBdlo6C83FUgLx65E8EzZ0MkSlfIk+bSpdpEiOBtOssXGj7OwTrnTXusZYhxGC+Wzd 6vFPpTMIq63Q/xhAR7qPZVhJNdz4AN+TyG2iLFa+D6C4f4WFKHGwjn2xjY+mJFvsCr +rTEhKCvZBTpUlkpxWI/BjysCYnZCiicdTinC4Lctq5Iq2HYuwxMpI5q37W9CutZWi nyIyD2m31+rnCC0C02A6AKcHEGChM/FxX+TiwWuev4Pqg7dz1XmlCSJtGJguKXVWv3 usHmjSsxX6PoQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 9/9] Squash to "bpf: Add bpf_mptcp_sched_kfunc_set" Date: Wed, 16 Oct 2024 15:33:16 +0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Geliang Tang Please update the subject to "bpf: Export mptcp packet scheduler helpers" Make bpf_mptcp_subflow_queues_empty static. Merge "bpf: Export more bpf_burst related functions" into this patch. Signed-off-by: Geliang Tang --- net/mptcp/bpf.c | 11 +++++++++++ net/mptcp/protocol.c | 4 ++-- net/mptcp/protocol.h | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/net/mptcp/bpf.c b/net/mptcp/bpf.c index 1ff26069b9fd..0a14cc45d240 100644 --- a/net/mptcp/bpf.c +++ b/net/mptcp/bpf.c @@ -279,6 +279,11 @@ bpf_mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int p return data->contexts[pos]; } +__bpf_kfunc static bool bpf_mptcp_subflow_queues_empty(struct sock *sk) +{ + return tcp_rtx_queue_empty(sk); +} + __bpf_kfunc_end_defs(); BTF_KFUNCS_START(bpf_mptcp_common_kfunc_ids) @@ -299,6 +304,12 @@ static const struct btf_kfunc_id_set bpf_mptcp_common_kfunc_set = { BTF_KFUNCS_START(bpf_mptcp_sched_kfunc_ids) BTF_ID_FLAGS(func, mptcp_subflow_set_scheduled) BTF_ID_FLAGS(func, bpf_mptcp_subflow_ctx_by_pos) +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, tcp_stream_memory_free) +BTF_ID_FLAGS(func, bpf_mptcp_subflow_queues_empty) +BTF_ID_FLAGS(func, mptcp_pm_subflow_chk_stale) BTF_KFUNCS_END(bpf_mptcp_sched_kfunc_ids) static const struct btf_kfunc_id_set bpf_mptcp_sched_kfunc_set = { diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e978e05ec8d1..e420ce9bbfb6 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -50,7 +50,7 @@ DEFINE_PER_CPU(struct mptcp_delegated_action, mptcp_delegated_actions); static struct net_device mptcp_napi_dev; /* Returns end sequence number of the receiver's advertised window */ -static u64 mptcp_wnd_end(const struct mptcp_sock *msk) +u64 mptcp_wnd_end(const struct mptcp_sock *msk) { return READ_ONCE(msk->wnd_end); } @@ -489,7 +489,7 @@ static long mptcp_timeout_from_subflow(const struct mptcp_subflow_context *subfl inet_csk(ssk)->icsk_timeout - jiffies : 0; } -static void mptcp_set_timeout(struct sock *sk) +void mptcp_set_timeout(struct sock *sk) { struct mptcp_subflow_context *subflow; long tout = 0; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 0624de84e339..b4c72a73594f 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -720,6 +720,8 @@ void __mptcp_subflow_send_ack(struct sock *ssk); void mptcp_subflow_reset(struct sock *ssk); void mptcp_subflow_queue_clean(struct sock *sk, struct sock *ssk); void mptcp_sock_graft(struct sock *sk, struct socket *parent); +u64 mptcp_wnd_end(const struct mptcp_sock *msk); +void mptcp_set_timeout(struct sock *sk); struct mptcp_subflow_context * bpf_mptcp_subflow_ctx_by_pos(const struct mptcp_sched_data *data, unsigned int pos); struct sock *__mptcp_nmpc_sk(struct mptcp_sock *msk);