From patchwork Tue Mar 11 06:31:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 14011214 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 5B34D13C3C2 for ; Tue, 11 Mar 2025 06:32:27 +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=1741674748; cv=none; b=JmAEc7iSAUmhBwqKscVqqQWxYzA4oxtz+idG1hI1XRxRfrgZ/n1I77ggG852pH0tkvzuasvvKavs+TnWBK6wyo3HPiFgyHqi7PtNvjLdX9W/AfetN9CfIiYo5PRv2TEkcJUP2LLfBb+C500wwE3yvazFWMBbp/K64DhJOrzCvYk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741674748; c=relaxed/simple; bh=+nH88dP7Lw4AMHof9Ds35NJJ1HWFILVKR2SC2Nd4XYA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PBByvOED1Mp1WCDtSiVI18+dIHHl6wQXjm2/fwEfaZK5rOj9ziDiBEPPmnd2o6anbd5sFlDtB6U8NX0tLe69gxkz9oZJsPY4JYFIpZF7gYGLaQ+S1YRHE0sEoqiflbNJ13+JDqstbucVzMghDJdGMEUB3OY7lMAmHjE8iMwXRgs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WuATHQG4; 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="WuATHQG4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E0D12C4CEE9; Tue, 11 Mar 2025 06:32:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741674747; bh=+nH88dP7Lw4AMHof9Ds35NJJ1HWFILVKR2SC2Nd4XYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WuATHQG4p1uRDDRjweOGAcLtjqiED+guQc02HVicLbHcTyb03oOAvVU0g+9g5Q3vs c80dizJHfnzev67jUj1p3Ov8xuV3if0hPcacWPkOAYo8M8rHPXztlFaChBwn4o2HJg M2jmMgoBQjzfAde2K7NdqoiWIJJmXnv8IzadZoXoElf0V8UQIaHd/sXAcYHMJu0H4k QeY7vRxvkyYgYKfd852Mfg7ewLEAZ85Awmrr1tMlWKraRYTZKVTTDMdMKf6YN4ZzfG 6TxEwKlfAMcmyKgWaZlzlT16y85tF2G/DXdyUZS7oqGuaLjzYuZSM8M52yaQ1O6/ja Pkofuy/8jymkg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 07/10] mptcp: sysctl: map path_manager to pm_type Date: Tue, 11 Mar 2025 14:31:59 +0800 Message-ID: <3bed5ce4e4cfffaa7e41a449e80827faa70141f6.1741674285.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 maps the newly added path manager sysctl "path_manager" to the old one "pm_type". path_manager pm_type "kernel" -> MPTCP_PM_TYPE_KERNEL "userspace" -> MPTCP_PM_TYPE_USERSPACE others -> __MPTCP_PM_TYPE_NR Signed-off-by: Geliang Tang --- net/mptcp/ctrl.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/net/mptcp/ctrl.c b/net/mptcp/ctrl.c index 4209dc7f9704..cb0811e636ff 100644 --- a/net/mptcp/ctrl.c +++ b/net/mptcp/ctrl.c @@ -200,6 +200,9 @@ static int mptcp_set_path_manager(char *path_manager, const char *name) static int proc_path_manager(const struct ctl_table *ctl, int write, void *buffer, size_t *lenp, loff_t *ppos) { + struct mptcp_pernet *pernet = container_of(ctl->data, + struct mptcp_pernet, + path_manager); char (*path_manager)[MPTCP_PM_NAME_MAX] = ctl->data; char pm_name[MPTCP_PM_NAME_MAX]; const struct ctl_table tbl = { @@ -211,8 +214,18 @@ static int proc_path_manager(const struct ctl_table *ctl, int write, strscpy(pm_name, *path_manager, MPTCP_PM_NAME_MAX); ret = proc_dostring(&tbl, write, buffer, lenp, ppos); - if (write && ret == 0) + if (write && ret == 0) { ret = mptcp_set_path_manager(*path_manager, pm_name); + if (ret == 0) { + u8 pm_type = __MPTCP_PM_TYPE_NR; + + if (strncmp(pm_name, "kernel", MPTCP_PM_NAME_MAX) == 0) + pm_type = MPTCP_PM_TYPE_KERNEL; + else if (strncmp(pm_name, "userspace", MPTCP_PM_NAME_MAX) == 0) + pm_type = MPTCP_PM_TYPE_USERSPACE; + pernet->pm_type = pm_type; + } + } return ret; }