All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
To: mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>,
	 Geliang Tang <geliang@kernel.org>,
	"David S. Miller" <davem@davemloft.net>,
	 Eric Dumazet <edumazet@google.com>,
	Jakub Kicinski <kuba@kernel.org>,
	 Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>
Cc: Geliang Tang <tanggeliang@kylinos.cn>,
	netdev@vger.kernel.org,  linux-kernel@vger.kernel.org,
	linux-kselftest@vger.kernel.org,
	 "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Subject: [PATCH net-next 08/15] selftests: mptcp: add token for dump_addr
Date: Fri, 01 Mar 2024 19:18:32 +0100	[thread overview]
Message-ID: <20240301-upstream-net-next-20240301-mptcp-userspace-pm-dump-addr-v1-8-dc30a420b3a0@kernel.org> (raw)
In-Reply-To: <20240301-upstream-net-next-20240301-mptcp-userspace-pm-dump-addr-v1-0-dc30a420b3a0@kernel.org>

From: Geliang Tang <tanggeliang@kylinos.cn>

The command dump_addr() of pm_nl_ctl can be used like this in in-kernel PM:

        pm_nl_ctl dump

This patch adds token argument for it to support userspace PM:

        pm_nl_ctl dump token $token

If 'token $token' is passed to dump_addr(), copy it into the kernel
netlink.

Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
 tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
index e97856323ec3..8d7d1b4ed28e 100644
--- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
+++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c
@@ -1127,8 +1127,16 @@ int dump_addrs(int fd, int pm_family, int argc, char *argv[])
 		  1024];
 	pid_t pid = getpid();
 	struct nlmsghdr *nh;
+	u_int32_t token = 0;
+	struct rtattr *rta;
 	int off = 0;
 
+	if (argc != 2 && argc != 4)
+		syntax(argv);
+
+	if (argc == 4 && !strcmp(argv[2], "token"))
+		token = strtoul(argv[3], NULL, 10);
+
 	memset(data, 0, sizeof(data));
 	nh = (void *)data;
 	off = init_genl_req(data, pm_family, MPTCP_PM_CMD_GET_ADDR,
@@ -1138,6 +1146,15 @@ int dump_addrs(int fd, int pm_family, int argc, char *argv[])
 	nh->nlmsg_pid = pid;
 	nh->nlmsg_len = off;
 
+	/* token */
+	if (token) {
+		rta = (void *)(data + off);
+		rta->rta_type = MPTCP_PM_ATTR_TOKEN;
+		rta->rta_len = RTA_LENGTH(4);
+		memcpy(RTA_DATA(rta), &token, 4);
+		off += NLMSG_ALIGN(rta->rta_len);
+	}
+
 	print_addrs(nh, pm_family, do_nl_req(fd, nh, off, sizeof(data)));
 	return 0;
 }

-- 
2.43.0


  parent reply	other threads:[~2024-03-01 18:18 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-01 18:18 [PATCH net-next 00/15] mptcp: userspace pm: 'dump addrs' and 'get addr' Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 01/15] mptcp: make pm_remove_addrs_and_subflows static Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 02/15] mptcp: export mptcp_genl_family & mptcp_nl_fill_addr Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 03/15] mptcp: implement mptcp_userspace_pm_dump_addr Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 04/15] mptcp: add token for get-addr in yaml Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 05/15] mptcp: dump addrs in userspace pm list Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 06/15] mptcp: check userspace pm flags Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 07/15] selftests: mptcp: add userspace pm subflow flag Matthieu Baerts (NGI0)
2024-03-01 18:18 ` Matthieu Baerts (NGI0) [this message]
2024-03-01 18:18 ` [PATCH net-next 09/15] selftests: mptcp: add mptcp_lib_check_output helper Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 10/15] selftests: mptcp: dump userspace addrs list Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 11/15] mptcp: add userspace_pm_lookup_addr_by_id helper Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 12/15] mptcp: implement mptcp_userspace_pm_get_addr Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 13/15] mptcp: get addr in userspace pm list Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 14/15] selftests: mptcp: add token for get_addr Matthieu Baerts (NGI0)
2024-03-01 18:18 ` [PATCH net-next 15/15] selftests: mptcp: userspace pm get addr tests Matthieu Baerts (NGI0)
2024-03-04 13:10 ` [PATCH net-next 00/15] mptcp: userspace pm: 'dump addrs' and 'get addr' patchwork-bot+netdevbpf

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=20240301-upstream-net-next-20240301-mptcp-userspace-pm-dump-addr-v1-8-dc30a420b3a0@kernel.org \
    --to=matttbe@kernel.org \
    --cc=davem@davemloft.net \
    --cc=edumazet@google.com \
    --cc=geliang@kernel.org \
    --cc=kuba@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=martineau@kernel.org \
    --cc=mptcp@lists.linux.dev \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=shuah@kernel.org \
    --cc=tanggeliang@kylinos.cn \
    /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.