| Message ID | 49c0f49f6aabf0f55a16034b79d30fbceb1bc997.1643945076.git.geliang.tang@suse.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | David Ahern |
| Headers | show |
| Series | [iproute2-next] mptcp: add the fullmesh flag setting support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Fri, 4 Feb 2022 11:29:03 +0800 Geliang Tang <geliang.tang@suse.com> wrote: > This patch added the fullmesh flag setting support, use it like this: > > ip mptcp endpoint change id 1 fullmesh > ip mptcp endpoint change id 1 nofullmesh > ip mptcp endpoint change id 1 backup fullmesh > ip mptcp endpoint change id 1 nobackup nofullmesh > > Add the fullmesh flag check for the adding address, the fullmesh flag > can't be used with the signal flag in that case. > > Update the port keyword check for the setting flags, allow to use the > port keyword with the non-signal flags. Don't allow to use the port > keyword with the id number. > > Update the usage of 'ip mptcp endpoint change', it can be used in two > forms, using the address directly or the id number of the address: > > ip mptcp endpoint change id 1 fullmesh > ip mptcp endpoint change 10.0.2.1 fullmesh > ip mptcp endpoint change 10.0.2.1 port 10100 fullmesh > > Acked-by: Paolo Abeni <pabeni@redhat.com> > Acked-by: Mat Martineau <mathew.j.martineau@linux.intel.com> > Signed-off-by: Geliang Tang <geliang.tang@suse.com> I don't see any parts in here to show the flag settings?
On Fri, Feb 04, 2022 at 10:17:34AM -0800, Stephen Hemminger wrote: > On Fri, 4 Feb 2022 11:29:03 +0800 > Geliang Tang <geliang.tang@suse.com> wrote: > > > This patch added the fullmesh flag setting support, use it like this: > > > > ip mptcp endpoint change id 1 fullmesh > > ip mptcp endpoint change id 1 nofullmesh > > ip mptcp endpoint change id 1 backup fullmesh > > ip mptcp endpoint change id 1 nobackup nofullmesh > > > > Add the fullmesh flag check for the adding address, the fullmesh flag > > can't be used with the signal flag in that case. > > > > Update the port keyword check for the setting flags, allow to use the > > port keyword with the non-signal flags. Don't allow to use the port > > keyword with the id number. > > > > Update the usage of 'ip mptcp endpoint change', it can be used in two > > forms, using the address directly or the id number of the address: > > > > ip mptcp endpoint change id 1 fullmesh > > ip mptcp endpoint change 10.0.2.1 fullmesh > > ip mptcp endpoint change 10.0.2.1 port 10100 fullmesh > > > > Acked-by: Paolo Abeni <pabeni@redhat.com> > > Acked-by: Mat Martineau <mathew.j.martineau@linux.intel.com> > > Signed-off-by: Geliang Tang <geliang.tang@suse.com> > > I don't see any parts in here to show the flag settings? > Hi Stephen, Thanks for your review. We use the 'ip mptcp endpoint change flags' command to set the flags of the given address. It's a little strange because we use 'set flags' in the kernel space (like MPTCP_PM_CMD_SET_FLAGS, mptcp_nl_cmd_set_flags), but 'change flags' in the user space. Before applying this patch, we can only set the backup flag: > sudo ip mptcp endpoint add 10.0.2.1 subflow > sudo ip mptcp endpoint show 10.0.2.1 id 1 subflow > sudo ip mptcp endpoint change id 1 backup > sudo ip mptcp endpoint show 10.0.2.1 id 1 subflow backup > sudo ip mptcp endpoint change id 1 nobackup > sudo ip mptcp endpoint show 10.0.2.1 id 1 subflow The commit 73c762c1f07d ("mptcp: set fullmesh flag in pm_netlink") is merged to net-next recently. It added the fullmesh flag setting in the kernel space. We need to let the fullmesh flag not be blocked in the user space. So this patch added this code: + /* allow changing the 'backup' and 'fullmesh' flags only */ if (cmd == MPTCP_PM_CMD_SET_FLAGS && - (flags & ~MPTCP_PM_ADDR_FLAG_BACKUP)) + (flags & ~(MPTCP_PM_ADDR_FLAG_BACKUP | + MPTCP_PM_ADDR_FLAG_FULLMESH))) invarg("invalid flags\n", *argv); Now we can set the fullmesh flag like this: > sudo ip mptcp endpoint flush > sudo ip mptcp endpoint add 10.0.2.1 subflow > sudo ip mptcp endpoint show 10.0.2.1 id 1 subflow > sudo ip mptcp endpoint change id 1 fullmesh > sudo ip mptcp endpoint show 10.0.2.1 id 1 subflow fullmesh > sudo ip mptcp endpoint change id 1 nofullmesh > sudo ip mptcp endpoint show 10.0.2.1 id 1 subflow This patch also added the related flags checks and updated the usage. Thanks, Geliang SUSE
diff --git a/ip/ipmptcp.c b/ip/ipmptcp.c index eef7c6f4..efda7ef2 100644 --- a/ip/ipmptcp.c +++ b/ip/ipmptcp.c @@ -25,14 +25,15 @@ static void usage(void) "Usage: ip mptcp endpoint add ADDRESS [ dev NAME ] [ id ID ]\n" " [ port NR ] [ FLAG-LIST ]\n" " ip mptcp endpoint delete id ID [ ADDRESS ]\n" - " ip mptcp endpoint change id ID [ backup | nobackup ]\n" + " ip mptcp endpoint change [ id ID ] [ ADDRESS ] CHANGE-OPT\n" " ip mptcp endpoint show [ id ID ]\n" " ip mptcp endpoint flush\n" " ip mptcp limits set [ subflows NR ] [ add_addr_accepted NR ]\n" " ip mptcp limits show\n" " ip mptcp monitor\n" "FLAG-LIST := [ FLAG-LIST ] FLAG\n" - "FLAG := [ signal | subflow | backup | fullmesh ]\n"); + "FLAG := [ signal | subflow | backup | fullmesh ]\n" + "CHANGE-OPT := [ backup | nobackup | fullmesh | nofullmesh ]\n"); exit(-1); } @@ -46,7 +47,7 @@ static int genl_family = -1; GENL_REQUEST(_req, MPTCP_BUFLEN, genl_family, 0, \ MPTCP_PM_VER, _cmd, _flags) -#define MPTCP_PM_ADDR_FLAG_NOBACKUP 0x0 +#define MPTCP_PM_ADDR_FLAG_NONE 0x0 /* Mapping from argument to address flag mask */ static const struct { @@ -57,7 +58,8 @@ static const struct { { "subflow", MPTCP_PM_ADDR_FLAG_SUBFLOW }, { "backup", MPTCP_PM_ADDR_FLAG_BACKUP }, { "fullmesh", MPTCP_PM_ADDR_FLAG_FULLMESH }, - { "nobackup", MPTCP_PM_ADDR_FLAG_NOBACKUP } + { "nobackup", MPTCP_PM_ADDR_FLAG_NONE }, + { "nofullmesh", MPTCP_PM_ADDR_FLAG_NONE } }; static void print_mptcp_addr_flags(unsigned int flags) @@ -102,6 +104,7 @@ static int get_flags(const char *arg, __u32 *flags) static int mptcp_parse_opt(int argc, char **argv, struct nlmsghdr *n, int cmd) { + bool setting = cmd == MPTCP_PM_CMD_SET_FLAGS; bool adding = cmd == MPTCP_PM_CMD_ADD_ADDR; bool deling = cmd == MPTCP_PM_CMD_DEL_ADDR; struct rtattr *attr_addr; @@ -116,9 +119,15 @@ static int mptcp_parse_opt(int argc, char **argv, struct nlmsghdr *n, int cmd) ll_init_map(&rth); while (argc > 0) { if (get_flags(*argv, &flags) == 0) { - /* allow changing the 'backup' flag only */ + if (adding && + (flags & MPTCP_PM_ADDR_FLAG_SIGNAL) && + (flags & MPTCP_PM_ADDR_FLAG_FULLMESH)) + invarg("invalid flags\n", *argv); + + /* allow changing the 'backup' and 'fullmesh' flags only */ if (cmd == MPTCP_PM_CMD_SET_FLAGS && - (flags & ~MPTCP_PM_ADDR_FLAG_BACKUP)) + (flags & ~(MPTCP_PM_ADDR_FLAG_BACKUP | + MPTCP_PM_ADDR_FLAG_FULLMESH))) invarg("invalid flags\n", *argv); } else if (matches(*argv, "id") == 0) { @@ -166,9 +175,12 @@ static int mptcp_parse_opt(int argc, char **argv, struct nlmsghdr *n, int cmd) invarg("address is needed for deleting id 0 address\n", "ID"); } - if (port && !(flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) + if (adding && port && !(flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) invarg("flags must have signal when using port", "port"); + if (id_set && setting && port) + invarg("port can't be used with id", "port"); + attr_addr = addattr_nest(n, MPTCP_BUFLEN, MPTCP_PM_ATTR_ADDR | NLA_F_NESTED); if (id_set) diff --git a/man/man8/ip-mptcp.8 b/man/man8/ip-mptcp.8 index 0e789225..72762f49 100644 --- a/man/man8/ip-mptcp.8 +++ b/man/man8/ip-mptcp.8 @@ -38,11 +38,14 @@ ip-mptcp \- MPTCP path manager configuration .RB "] " .ti -8 -.BR "ip mptcp endpoint change id " +.BR "ip mptcp endpoint change " +.RB "[ " id .I ID -.RB "[ " -.I BACKUP-OPT -.RB "] " +.RB "] [ " +.IR IFADDR +.RB "] [ " port +.IR PORT " ]" +.RB "CHANGE-OPT" .ti -8 .BR "ip mptcp endpoint show " @@ -68,10 +71,14 @@ ip-mptcp \- MPTCP path manager configuration .RB "]" .ti -8 -.IR BACKUP-OPT " := [" +.IR CHANGE-OPT " := [" .B backup .RB "|" .B nobackup +.RB "|" +.B fullmesh +.RB "|" +.B nofullmesh .RB "]" .ti -8