Commit ed8c8f60 authored Feb 04, 2022 by Jakub Kicinski

Merge branch 'mptcp-improve-set-flags-command-and-update-self-tests'

Mat Martineau says:

====================
mptcp: Improve set-flags command and update self tests

Patches 1-3 allow more flexibility in the combinations of features and
flags allowed with the MPTCP_PM_CMD_SET_FLAGS netlink command, and add
self test case coverage for the new functionality.

Patches 4-6 and 9 refactor the mptcp_join.sh self tests to allow them to
configure all of the test cases using either the pm_nl_ctl utility (part
of the mptcp self tests) or the 'ip mptcp' command (from iproute2). The
default remains to use pm_nl_ctl.

Patches 7 and 8 update the pm_netlink.sh self tests to cover the use of
endpoint ids to set endpoint flags (instead of just addresses).
====================

Link: https://lore.kernel.org/r/20220205000337.187292-1-mathew.j.martineau@linux.intel.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parents 660a38bf 621bd393

net/mptcp/pm_netlink.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -1174,14 +1174,8 @@ static int mptcp_pm_parse_addr(struct nlattr attr, struct genl_info info,
		if (tb[MPTCP_PM_ADDR_ATTR_FLAGS])
		entry->flags = nla_get_u32(tb[MPTCP_PM_ADDR_ATTR_FLAGS]);

		if (tb[MPTCP_PM_ADDR_ATTR_PORT]) {
		if (!(entry->flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) {
		NL_SET_ERR_MSG_ATTR(info->extack, attr,
		"flags must have signal when using port");
		return -EINVAL;
		}
		if (tb[MPTCP_PM_ADDR_ATTR_PORT])
		entry->addr.port = htons(nla_get_u16(tb[MPTCP_PM_ADDR_ATTR_PORT]));
		}

		return 0;
		}
		@@ -1227,6 +1221,11 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff skb, struct genl_info info)
		if (ret < 0)
		return ret;

		if (addr.addr.port && !(addr.flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) {
		GENL_SET_ERR_MSG(info, "flags must have signal when using port");
		return -EINVAL;
		}

		entry = kmalloc(sizeof(*entry), GFP_KERNEL);
		if (!entry) {
		GENL_SET_ERR_MSG(info, "can't allocate addr");