From patchwork Thu Jun 23 00:59:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishen Maloor X-Patchwork-Id: 12891609 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 1BB631366 for ; Thu, 23 Jun 2022 00:59:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655945996; x=1687481996; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=vvj/lpl/Ht10ibAe0ySlf5CaHdJ3WbdmdDTNHjVhBHM=; b=IsdeuByIzpoBfUORDovh3BL5Ux7xq01ZyChEZNkeCGonrEW/fn798sAD jas8t2Ng8LosE2vmKwNO6r+a2etFtqneLjdZ4KIo98+lBJHTqKc/tfiwb 4yBMx5os0pkNlIxfMk7srhNShA/lEbLPPFjmfFw3ab57K1sldQoNKyOwE IYp4UxJccKgQY1L6IUgJw5fUMcFFnJz202ZYBDZNXS8vIN1SFxOFACwwC PPZiDK+yKvKZOOcAtX4BGjCha1qZjzEL2eVlo/6pMLgf1DcWTz4lUGK0H PULNGul+yIkNF6zaCidUjPt5SuYF2G4XMcxpzzLJJ+EVjX6FbPmVyNMEr g==; X-IronPort-AV: E=McAfee;i="6400,9594,10386"; a="278137859" X-IronPort-AV: E=Sophos;i="5.92,215,1650956400"; d="scan'208";a="278137859" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2022 17:59:54 -0700 X-IronPort-AV: E=Sophos;i="5.92,215,1650956400"; d="scan'208";a="914950196" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2022 17:59:53 -0700 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-net v2 1/2] mptcp: netlink: issue MP_PRIO signals from userspace PMs Date: Wed, 22 Jun 2022 20:59:47 -0400 Message-Id: <20220623005948.291792-2-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220623005948.291792-1-kishen.maloor@intel.com> References: <20220623005948.291792-1-kishen.maloor@intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This change updates MPTCP_PM_CMD_SET_FLAGS to allow userspace PMs to issue MP_PRIO signals for a specified address ID over a chosen (by token) MPTCP connection. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/286 Fixes: 702c2f646d42 ("mptcp: netlink: allow userspace-driven subflow establishment") Signed-off-by: Kishen Maloor --- net/mptcp/pm_netlink.c | 23 +++++++++++++++++------ net/mptcp/pm_userspace.c | 30 ++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 6 +++++- 3 files changed, 52 insertions(+), 7 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index e099f2a12504..063700ff8cbb 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -717,9 +717,9 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk) } } -static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, - struct mptcp_addr_info *addr, - u8 bkup) +int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, + struct mptcp_addr_info *addr, + u8 bkup, bool use_id) { struct mptcp_subflow_context *subflow; @@ -730,10 +730,15 @@ static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct sock *sk = (struct sock *)msk; struct mptcp_addr_info local; - local_address((struct sock_common *)ssk, &local); - if (!mptcp_addresses_equal(&local, addr, addr->port)) + if (use_id && subflow->local_id != addr->id) continue; + if (!use_id) { + local_address((struct sock_common *)ssk, &local); + if (!mptcp_addresses_equal(&local, addr, addr->port)) + continue; + } + if (subflow->backup != bkup) msk->last_snd = NULL; subflow->backup = bkup; @@ -1837,7 +1842,7 @@ static int mptcp_nl_set_flags(struct net *net, lock_sock(sk); spin_lock_bh(&msk->pm.lock); if (changed & MPTCP_PM_ADDR_FLAG_BACKUP) - ret = mptcp_pm_nl_mp_prio_send_ack(msk, addr, bkup); + ret = mptcp_pm_nl_mp_prio_send_ack(msk, addr, bkup, false); if (changed & MPTCP_PM_ADDR_FLAG_FULLMESH) mptcp_pm_nl_fullmesh(msk, addr); spin_unlock_bh(&msk->pm.lock); @@ -1854,6 +1859,7 @@ static int mptcp_nl_set_flags(struct net *net, static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *info) { struct mptcp_pm_addr_entry addr = { .addr = { .family = AF_UNSPEC }, }, *entry; + struct nlattr *token = info->attrs[MPTCP_PM_ATTR_TOKEN]; struct nlattr *attr = info->attrs[MPTCP_PM_ATTR_ADDR]; struct pm_nl_pernet *pernet = genl_info_pm_nl(info); u8 changed, mask = MPTCP_PM_ADDR_FLAG_BACKUP | @@ -1868,6 +1874,11 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *info) if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP) bkup = 1; + + if (token) + return mptcp_userspace_pm_set_flags(sock_net(skb->sk), + token, &addr, bkup); + if (addr.addr.family == AF_UNSPEC) { lookup_by_id = 1; if (!addr.addr.id) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 3d1d365e9c6f..b9df969cd38a 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -429,3 +429,33 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info) sock_put((struct sock *)msk); return err; } + +int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, + struct mptcp_pm_addr_entry *entry, u8 bkup) +{ + struct mptcp_sock *msk; + int ret = -EINVAL; + u32 token_val; + + token_val = nla_get_u32(token); + + msk = mptcp_token_get_sock(net, token_val); + if (!msk) + return ret; + + if (!mptcp_pm_is_userspace(msk)) + goto set_flags_err; + + if (entry->addr.family != AF_UNSPEC) + goto set_flags_err; + + lock_sock((struct sock *)msk); + spin_lock_bh(&msk->pm.lock); + ret = mptcp_pm_nl_mp_prio_send_ack(msk, &entry->addr, bkup, true); + spin_unlock_bh(&msk->pm.lock); + release_sock((struct sock *)msk); + +set_flags_err: + sock_put((struct sock *)msk); + return ret; +} diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index bef7dea9f358..9bb49d199fa5 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -783,6 +783,9 @@ void mptcp_pm_rm_addr_received(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); void mptcp_pm_mp_prio_received(struct sock *sk, u8 bkup); void mptcp_pm_mp_fail_received(struct sock *sk, u64 fail_seq); +int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, + struct mptcp_addr_info *addr, + u8 bkup, bool use_id); bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, const struct mptcp_pm_addr_entry *entry); void mptcp_pm_free_anno_list(struct mptcp_sock *msk); @@ -799,7 +802,8 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id, u8 *flags, int *ifindex); - +int mptcp_userspace_pm_set_flags(struct net *net, struct nlattr *token, + struct mptcp_pm_addr_entry *entry, u8 bkup); int mptcp_pm_announce_addr(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool echo); From patchwork Thu Jun 23 00:59:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kishen Maloor X-Patchwork-Id: 12891610 Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 2DBB3139E for ; Thu, 23 Jun 2022 00:59:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1655945997; x=1687481997; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=iUv7CrXlBd8xzkmyJQHh19NwFYdx1qcyUfy+h4KvXZQ=; b=DW3qx0xwdwJnzuhtIWyYX3jKBPy+8bdqrp6uKckzlT4+RanthRf2S4vD Mmc/sJJBiL8NWp4ugLSb6lZ4WXLpaGUOlYxRPD1kHDry8TAlmu4O/jX9X wLp1CvFp5qMpNRUw2kYMJAuazcmn2ASDfL6WmTokxaY5hwQg0hp4PWZfo hhI53hxIRsnsdk5LtynPdDFHSfo2f7/9/l9KpKl/aLTELjg3jVVZHT6ZP AKVOPSTeKUjy5n2JFIWtOnq2UGe0WFeQwkCIFMMp6eBq2+fLwuQ2duW2o eCPx+Kkb4hqcU6Ah7un23bq1AQGVj+6NpbdpUTTH1sgtxHFq6OuXZbkie A==; X-IronPort-AV: E=McAfee;i="6400,9594,10386"; a="278137860" X-IronPort-AV: E=Sophos;i="5.92,215,1650956400"; d="scan'208";a="278137860" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2022 17:59:54 -0700 X-IronPort-AV: E=Sophos;i="5.92,215,1650956400"; d="scan'208";a="914950199" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jun 2022 17:59:54 -0700 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-net v2 2/2] selftests: mptcp: userspace PM support for MP_PRIO signals Date: Wed, 22 Jun 2022 20:59:48 -0400 Message-Id: <20220623005948.291792-3-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220623005948.291792-1-kishen.maloor@intel.com> References: <20220623005948.291792-1-kishen.maloor@intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This change updates the testing sample (pm_nl_ctl) to take a connection token as an optional param for the MPTCP_PM_CMD_SET_FLAGS command. This is used to test the userspace PM code path for issuing MP_PRIO signals over a connection for the specified address ID. E.g. ./pm_nl_ctl set id 0 flags backup token 823274047 userspace_pm.sh has new selftests which exercise this command. Fixes: 259a834fadda ("selftests: mptcp: functional tests for the userspace PM type") Signed-off-by: Kishen Maloor --- v2: -added a sleep after issuing the MP_PRIO signal in userspace_pm.sh. --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 19 +++++++++-- .../selftests/net/mptcp/userspace_pm.sh | 32 +++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c index 4dd87bb9ee91..0512d64b1d11 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -39,7 +39,7 @@ static void syntax(char *argv[]) fprintf(stderr, "\tdsf lip lport rip rport token \n"); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); - fprintf(stderr, "\tset [] [id ] flags [no]backup|[no]fullmesh [port ]\n"); + fprintf(stderr, "\tset [] [id ] flags [no]backup|[no]fullmesh [port ] [token ]\n"); fprintf(stderr, "\tflush\n"); fprintf(stderr, "\tdump\n"); fprintf(stderr, "\tlimits [ ]\n"); @@ -1279,6 +1279,7 @@ int set_flags(int fd, int pm_family, int argc, char *argv[]) struct rtattr *rta, *nest; struct nlmsghdr *nh; u_int32_t flags = 0; + u_int32_t token = 0; u_int16_t family; int nest_start; int use_id = 0; @@ -1339,7 +1340,13 @@ int set_flags(int fd, int pm_family, int argc, char *argv[]) error(1, 0, " missing flags keyword"); for (; arg < argc; arg++) { - if (!strcmp(argv[arg], "flags")) { + if (!strcmp(argv[arg], "token")) { + if (++arg >= argc) + error(1, 0, " missing token value"); + + /* token */ + token = atoi(argv[arg]); + } else if (!strcmp(argv[arg], "flags")) { char *tok, *str; /* flags */ @@ -1384,6 +1391,14 @@ int set_flags(int fd, int pm_family, int argc, char *argv[]) } nest->rta_len = off - nest_start; + 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); + } + do_nl_req(fd, nh, off, 0); return 0; } diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh index d586bc5ffe01..8bf16ad51074 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -776,10 +776,42 @@ test_subflows() rm -f "$evts" } +test_prio() +{ + local count + + # Send MP_PRIO signal from client to server machine + ip netns exec "$ns2" ./pm_nl_ctl set id 0 flags backup token "$client4_token" + sleep 0.5 + + # Check TX + stdbuf -o0 -e0 printf "MP_PRIO TX \t" + count=$(ip netns exec "$ns2" nstat -as | grep MPTcpExtMPPrioTx | awk '{print $2}') + [ -z "$count" ] && count=0 + if [ $count != 1 ]; then + stdbuf -o0 -e0 printf "[FAIL]\n" + exit 1 + else + stdbuf -o0 -e0 printf "[OK]\n" + fi + + # Check RX + stdbuf -o0 -e0 printf "MP_PRIO RX \t" + count=$(ip netns exec "$ns1" nstat -as | grep MPTcpExtMPPrioRx | awk '{print $2}') + [ -z "$count" ] && count=0 + if [ $count != 1 ]; then + stdbuf -o0 -e0 printf "[FAIL]\n" + exit 1 + else + stdbuf -o0 -e0 printf "[OK]\n" + fi +} + make_connection make_connection "v6" test_announce test_remove test_subflows +test_prio exit 0