From patchwork Mon Mar 24 08:19:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 14026908 X-Patchwork-Delegate: matthieu.baerts@tessares.net 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 47A6425D200 for ; Mon, 24 Mar 2025 08:20:01 +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=1742804402; cv=none; b=QT7PnZIFa+tWCp2xiy7e24okzB94KF9jlu7zxarxbwTKZWx3M7ps19Uc9Slifpgbb3ScDAHsfFARWPiF90rELZ1TS6VhNGijeouGmouzERINMvkTElB+1bsJ9E8vMeNz2Bmr0wWNfHLkXAJdd5qU8YjGXyw4lBAXDDc8/A71SD8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742804402; c=relaxed/simple; bh=W/e97zLFoyLEYBASGxWCwqj1wdt2TFdaNun5EwZGW/4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Oc+n741voOZMaxbpY/mf4prR5UG05jwYnVzufI029i1ZeIc266S6ohAgFdGsWgYkRvogZ+Lf7OYs2Uzj3I51cCRi0IqNo8h5zVm3iazTMTcfqJazDFjsTXVWHfdA2v/6DGmoysNvNJ4uFUXaBtPIkD+lvPV6lnriK22wPf2crXI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oLA3B8Ie; 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="oLA3B8Ie" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A7E18C4CEE4; Mon, 24 Mar 2025 08:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742804401; bh=W/e97zLFoyLEYBASGxWCwqj1wdt2TFdaNun5EwZGW/4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oLA3B8IeyYAXOhTQT+X0fK/bcO6nDkHmoXkQZv0nLCmK/1v1KiQMkPKc54UXyU0dm /mVpk+Gs+xYuDol9n4ZBKUNhMkdzKWVGxdUYodbzWVDukKxmz0yCx74DM6U3qgqLX6 KTXKoasUqUGmRZC69oeCoVMHqPYIB94+8srf7K5EeAzWg+9HsbclqMgY5IYNzQjFkg XKt/b3szUE02guPS1TNYewFIk8VXq8sYFIyLFGbhn3tEpNI6GaDJQuAMjKL6X2z+Yv qfx+c55ZlVdvFp51MW1Uv1O+iCEKePMLo6p9rhgJDLUjBxnGbvKIVH0KFA7kmW9dGh GUVaIRyuZ260g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 6/9] mptcp: pm: add rm_addr_received() interface Date: Mon, 24 Mar 2025 16:19:40 +0800 Message-ID: <73e63af9c3dc74deb1b6aa79a9b7ed57f331ba33.1742804266.git.tanggeliang@kylinos.cn> 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 This patch adds an optional .rm_addr_received interface for struct mptcp_pm_ops and invokes it in mptcp_pm_rm_addr_or_subflow(). This interface is only implemented in the in-kernel PM as a wrapper of mptcp_pm_nl_rm_addr(). Signed-off-by: Geliang Tang --- include/net/mptcp.h | 1 + net/mptcp/pm.c | 4 ++-- net/mptcp/pm_kernel.c | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 5118d11d2ee9..3f06fbd2a908 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -128,6 +128,7 @@ struct mptcp_pm_ops { void (*established)(struct mptcp_sock *msk); void (*subflow_established)(struct mptcp_sock *msk); void (*add_addr_received)(struct mptcp_sock *msk); + void (*rm_addr_received)(struct mptcp_sock *msk, u8 id); char name[MPTCP_PM_NAME_MAX]; struct module *owner; diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 71589cd5dee7..bf3c19defe98 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -703,8 +703,8 @@ static void mptcp_pm_rm_addr_or_subflow(struct mptcp_sock *msk, if (rm_type == MPTCP_MIB_RMADDR) { __MPTCP_INC_STATS(sock_net(sk), rm_type); - if (removed && mptcp_pm_is_kernel(msk)) - mptcp_pm_nl_rm_addr(msk, rm_id); + if (removed && msk->pm.ops->rm_addr_received) + msk->pm.ops->rm_addr_received(msk, rm_id); } } } diff --git a/net/mptcp/pm_kernel.c b/net/mptcp/pm_kernel.c index 4f4791620072..1a71676bdf43 100644 --- a/net/mptcp/pm_kernel.c +++ b/net/mptcp/pm_kernel.c @@ -1391,6 +1391,11 @@ static void mptcp_pm_kernel_add_addr_received(struct mptcp_sock *msk) mptcp_pm_nl_add_addr_received(msk); } +static void mptcp_pm_kernel_rm_addr_received(struct mptcp_sock *msk, u8 id) +{ + mptcp_pm_nl_rm_addr(msk, id); +} + static void mptcp_pm_kernel_init(struct mptcp_sock *msk) { bool subflows_allowed = !!mptcp_pm_get_subflows_max(msk); @@ -1417,6 +1422,7 @@ struct mptcp_pm_ops mptcp_pm_kernel = { .established = mptcp_pm_kernel_established, .subflow_established = mptcp_pm_kernel_subflow_established, .add_addr_received = mptcp_pm_kernel_add_addr_received, + .rm_addr_received = mptcp_pm_kernel_rm_addr_received, .init = mptcp_pm_kernel_init, .name = "kernel", .owner = THIS_MODULE,