From nobody Fri May 3 05:21:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp41342uau; Tue, 28 Jun 2022 18:27:13 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sQtlmr/+Idqud+GonyNHR9IbJVb75EMAu2DLVm0vXr8Hh13oYPws8he3I9bu6vSr4xzemg X-Received: by 2002:a17:90b:4ac7:b0:1ed:21e8:ddb2 with SMTP id mh7-20020a17090b4ac700b001ed21e8ddb2mr892341pjb.93.1656466033016; Tue, 28 Jun 2022 18:27:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656466033; cv=none; d=google.com; s=arc-20160816; b=OZXu6xPOalEWd1LlCSHLkDuCyU7EXxbh5Tpu9pogi1q/0Qn6F03FIm45e3oOUqyYn0 fOgSQS6BJt1P+8WlwfrKTtOMcart6DGTaTyCWqA9kAOuKqTYJ7yZ0Ji8JhDQLIdz9UYW wYvb+qFn6YoOL+ADwnN+VyJ7CVe6HpNNuqavC+UR1389+J0EMjaJkDlIcXSWcDC2xf4S R606Fcu/LdIW6RkOFd7+IHzEKYB/+Ij+FW/Lv6mD02OUB+8R3Y25bXXCoMFwXs8uzly4 CoCGQD2tFbmsGgsC3ligC9/CaPRWJ/eiWrKxJsnq4zTESyfLZfRHILLAZhD4p0xfZHzN ZIIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=NXHJCZSspDtHRdoPscmgY+E8au18UMIu5UTB47BXJas=; b=tIj3DxcXxkqwn6qgzLglS6SKThgZbQAOfPoxw9UyjyN48YPzYh+Gbg6PQWSS3zSbXh t727LMI6PizHuOeJrWrG1aW1tBA01KWNZ3GiLycM+RbtUX5YtjRGdGT8fNgwUaMIzzuA jhzBqt3CyUgEpuAhPpnOPbWWg5aGqICEQmjJUUs32pMm9BlIyBmGSQzwrCAlb1oOaPQp r+5ch1TV5MeGeNFcheKq0+H45JLsyRFL48411/E4XtaN8EnTX3HYJ131o45cgrwa3vWn tRNcd9TxxZCwJIjScGZbn8RV622C8odEnp60LXBXc3Pguxpr0uFm0dTnaunRnGZ6CgVA MRgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ewdngf+m; spf=pass (google.com: domain of mptcp+bounces-5876-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5876-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id bq22-20020a056a000e1600b0052534e6f7a8si241264pfb.34.2022.06.28.18.27.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2022 18:27:13 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5876-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ewdngf+m; spf=pass (google.com: domain of mptcp+bounces-5876-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5876-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id B6437280C12 for ; Wed, 29 Jun 2022 01:27:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 09D9F642; Wed, 29 Jun 2022 01:27:12 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 3F89F63F for ; Wed, 29 Jun 2022 01:27:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656466030; x=1688002030; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=WAHi9xSqZUOGlvExsnLcgEDUdapMop7tfl0SFEHrI48=; b=ewdngf+m0WVRSXLXINlrMjUOWHzDx/zrgo0wUZDL/NJgizzBPUFbvnEV L1b9XEfXR29Caul4vIlR7gYfSDOsQS0GoDI60l6+PMfzyZqtSIyOw+25O n1xQCB+p2si/KxlFbYqwskC4B2k8UbixMX5jqrSoQhbm433B4YgsA01gA OeDmlsvdV0EHMAIo8siIW3jibaFU61VaQzuNTZ2aTS87zLXe9ulkTCwhF 49sYVSYhUISpUPcH2mDhWsLAtr8NO9sIZWaNauPL3W4FvoZ2bCD5SAMHJ Lia7VmnLxs+kmqR2AjPr3P3396OgCUuG9Uyb7qKGbx0DgTCmK9Ikt/sFg w==; X-IronPort-AV: E=McAfee;i="6400,9594,10392"; a="281926308" X-IronPort-AV: E=Sophos;i="5.92,230,1650956400"; d="scan'208";a="281926308" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2022 18:27:07 -0700 X-IronPort-AV: E=Sophos;i="5.92,230,1650956400"; d="scan'208";a="693355086" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2022 18:27:07 -0700 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-net v4 1/2] mptcp: netlink: issue MP_PRIO signals from userspace PMs Date: Tue, 28 Jun 2022 21:27:01 -0400 Message-Id: <20220629012702.425574-2-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220629012702.425574-1-kishen.maloor@intel.com> References: <20220629012702.425574-1-kishen.maloor@intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This change updates MPTCP_PM_CMD_SET_FLAGS to allow userspace PMs to issue MP_PRIO signals over a specific subflow selected by the connection token, local and remote address+port. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/286 Fixes: 702c2f646d42 ("mptcp: netlink: allow userspace-driven subflow establ= ishment") Signed-off-by: Kishen Maloor Acked-by: Paolo Abeni Reviewed-by: Mat Martineau --- v3: -use local and remote address+port (instead of address ID) alongwith the connection token to select a subflow. v4: -fixed bug during rebase in v3. --- net/mptcp/pm_netlink.c | 30 +++++++++++++++++++++++++----- net/mptcp/pm_userspace.c | 30 ++++++++++++++++++++++++++++++ net/mptcp/protocol.h | 8 +++++++- 3 files changed, 62 insertions(+), 6 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 05c6a95e9c28..c4ac0a6ad4dc 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -717,9 +717,10 @@ void mptcp_pm_nl_addr_send_ack(struct mptcp_sock *msk) } } =20 -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, + struct mptcp_addr_info *rem, + u8 bkup) { struct mptcp_subflow_context *subflow; =20 @@ -728,13 +729,19 @@ static int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_= sock *msk, mptcp_for_each_subflow(msk, subflow) { struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); struct sock *sk =3D (struct sock *)msk; - struct mptcp_addr_info local; + struct mptcp_addr_info local, remote; bool slow; =20 local_address((struct sock_common *)ssk, &local); if (!mptcp_addresses_equal(&local, addr, addr->port)) continue; =20 + if (rem && rem->family !=3D AF_UNSPEC) { + remote_address((struct sock_common *)ssk, &remote); + if (!mptcp_addresses_equal(&remote, rem, rem->port)) + continue; + } + slow =3D lock_sock_fast(ssk); if (subflow->backup !=3D bkup) msk->last_snd =3D NULL; @@ -1839,7 +1846,7 @@ static int mptcp_nl_set_flags(struct net *net, =20 lock_sock(sk); if (changed & MPTCP_PM_ADDR_FLAG_BACKUP) - ret =3D mptcp_pm_nl_mp_prio_send_ack(msk, addr, bkup); + ret =3D mptcp_pm_nl_mp_prio_send_ack(msk, addr, NULL, bkup); if (changed & MPTCP_PM_ADDR_FLAG_FULLMESH) mptcp_pm_nl_fullmesh(msk, addr); release_sock(sk); @@ -1855,6 +1862,9 @@ static int mptcp_nl_set_flags(struct net *net, static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *i= nfo) { struct mptcp_pm_addr_entry addr =3D { .addr =3D { .family =3D AF_UNSPEC }= , }, *entry; + struct mptcp_pm_addr_entry remote =3D { .addr =3D { .family =3D AF_UNSPEC= }, }; + struct nlattr *attr_rem =3D info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE]; + struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; struct nlattr *attr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); u8 changed, mask =3D MPTCP_PM_ADDR_FLAG_BACKUP | @@ -1867,6 +1877,12 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *sk= b, struct genl_info *info) if (ret < 0) return ret; =20 + if (attr_rem) { + ret =3D mptcp_pm_parse_entry(attr_rem, info, false, &remote); + if (ret < 0) + return ret; + } + if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP) bkup =3D 1; if (addr.addr.family =3D=3D AF_UNSPEC) { @@ -1875,6 +1891,10 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *sk= b, struct genl_info *info) return -EOPNOTSUPP; } =20 + if (token) + return mptcp_userspace_pm_set_flags(sock_net(skb->sk), + token, &addr, &remote, bkup); + spin_lock_bh(&pernet->lock); entry =3D __lookup_addr(pernet, &addr.addr, lookup_by_id); if (!entry) { diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 26212bebc5ed..51e2f066d54f 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -420,3 +420,33 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struc= t 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 *loc, + struct mptcp_pm_addr_entry *rem, u8 bkup) +{ + struct mptcp_sock *msk; + int ret =3D -EINVAL; + u32 token_val; + + token_val =3D nla_get_u32(token); + + msk =3D mptcp_token_get_sock(net, token_val); + if (!msk) + return ret; + + if (!mptcp_pm_is_userspace(msk)) + goto set_flags_err; + + if (loc->addr.family =3D=3D AF_UNSPEC || + rem->addr.family =3D=3D AF_UNSPEC) + goto set_flags_err; + + lock_sock((struct sock *)msk); + ret =3D mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup); + 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 033c995772dc..480c5320b86e 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -772,6 +772,10 @@ 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, + struct mptcp_addr_info *rem, + u8 bkup); 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); @@ -788,7 +792,9 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_s= ock *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 *loc, + struct mptcp_pm_addr_entry *rem, u8 bkup); int mptcp_pm_announce_addr(struct mptcp_sock *msk, const struct mptcp_addr_info *addr, bool echo); --=20 2.31.1 From nobody Fri May 3 05:21:47 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp41351uau; Tue, 28 Jun 2022 18:27:14 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uQ7i5qn36RkzPElqcKM/EQoOILHvyXqy5zFK5q6GMxGVp30EZdtuejEZsA6kTyTBrdjORl X-Received: by 2002:a05:6871:72a:b0:101:d0e7:17c6 with SMTP id f42-20020a056871072a00b00101d0e717c6mr1522708oap.19.1656466034220; Tue, 28 Jun 2022 18:27:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656466034; cv=none; d=google.com; s=arc-20160816; b=hKinY/IzEmph14/DQoVPkBtP3vvhxPynDJRMjdXXMlNs964g+LKOfgs4bzZftSfTex WARRV6mzPpDJaUotbv2ybyhxE8KKQ7abAKiK8maz/fBL65BObL9HE9I+XyZ/WAQWg8zz dG2P3KGggGtzSD8Td+UWLUi8qbn4WDYQC108NYm7Q2bUnTdE0kXkbeNYIgcazIfmhgXB vJGhXZW0p8F200zkiOx4AXNRbQKg4IezcmtYYqRYXZ4/TzvV3vnysUwfJ1qB58VPzsba CfiVikTDOB/t2TKPHcLmteWqflxn67N/O5GAMSKVujxcfGT58lhs66fmz9E/MHo0+Uy8 wz8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=aDcEDtjRZQxlD6g7Gj84fcPHosYWEA45nHXsjcPEkHM=; b=QEF2c4t+RaopuV6uvUjaJfyLluwnfWaG5guQMsaSYOZM//MfyAvSFX5puvRtLajxwB OHWLKiPl27TnySFOlZRUNTxIDMcsX/d/3Cw7j+nXUKwubasm8m7Ag7RFt5tQRfB8rphY 1cxpyIhbV5uYKePqGraQqsG/IVLWgRvQNFt5mtuGwun2/y4MgkfO8Fc/vGivai5tiGGf WaYxlXkDGnAQmW4N55LMsOu2P8Z5Ak1qb50hXAz8xzbM5tAiPWRUOLLvhyVa1qhihLwq VSRXxOfoCu+QCc+XFbFZG6/OOXAfE3hX5oEEenxRl+fkhzTQVG5Dv2b578X/pZI4gpy4 zJDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="d/OBqkm+"; spf=pass (google.com: domain of mptcp+bounces-5877-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5877-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id q26-20020a9d631a000000b00606a2eb5166si16013900otk.176.2022.06.28.18.27.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2022 18:27:14 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5877-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="d/OBqkm+"; spf=pass (google.com: domain of mptcp+bounces-5877-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5877-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 150542E0A48 for ; Wed, 29 Jun 2022 01:27:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 912ED63F; Wed, 29 Jun 2022 01:27:12 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 C0ED07B for ; Wed, 29 Jun 2022 01:27:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656466030; x=1688002030; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=BV2zJkP2GcXwkzqEjJszAgRr1Hb5MugnnctBzrVIoWc=; b=d/OBqkm+AsF80/3hvQcEkyoeSvegyGNk3wL6F5u4r8IhoO/Ntx/xjMD0 Zc4cou9U6vtoZkqo9WFDMIdko7iGeDlmDCpEG+dl6idzjXLYlWh5YP+mQ 8x/Pl0nm47aiVLdCjiLbcSFltyXwl8e5y1fDS0zWWvnFHhuD0ns0Sv0YJ ckg4z/LDbz3QB5ELjcKaCfLKPMA26T2S5qENaD1amgbutPPima/LqFCcj 8dEc62yUSS81BrI9oS53IwuNgYy6t7JSlJ3v1uhwQo4s0W9agYZaH+Cua rGrbtqulGphtN77ctahjpxI8MWGKKhpWrVyCfXwQUSKqssaQYX7NtY69i w==; X-IronPort-AV: E=McAfee;i="6400,9594,10392"; a="281926310" X-IronPort-AV: E=Sophos;i="5.92,230,1650956400"; d="scan'208";a="281926310" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2022 18:27:07 -0700 X-IronPort-AV: E=Sophos;i="5.92,230,1650956400"; d="scan'208";a="693355089" Received: from otc-tsn-4.jf.intel.com ([10.23.153.135]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2022 18:27:07 -0700 From: Kishen Maloor To: kishen.maloor@intel.com, mptcp@lists.linux.dev Subject: [PATCH mptcp-net v4 2/2] selftests: mptcp: userspace PM support for MP_PRIO signals Date: Tue, 28 Jun 2022 21:27:02 -0400 Message-Id: <20220629012702.425574-3-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220629012702.425574-1-kishen.maloor@intel.com> References: <20220629012702.425574-1-kishen.maloor@intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This change updates the testing sample (pm_nl_ctl) to exercise the updated MPTCP_PM_CMD_SET_FLAGS command for userspace PMs to issue MP_PRIO signals over the selected subflow. E.g. ./pm_nl_ctl set 10.0.1.2 port 47234 flags backup token 823274047 rip 1= 0.0.1.1 rport 50003 userspace_pm.sh has a new selftest that invokes this command. Fixes: 259a834fadda ("selftests: mptcp: functional tests for the userspace = PM type") Signed-off-by: Kishen Maloor Acked-by: Paolo Abeni Reviewed-by: Mat Martineau --- v2: -added a sleep after issuing the MP_PRIO signal in userspace_pm.sh. v3: -updated test to pass local and remote address+port to aid in selecting a subflow. --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 73 ++++++++++++++++++- .../selftests/net/mptcp/userspace_pm.sh | 32 ++++++++ 2 files changed, 103 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 6a2f4b981e1d..cb79f0719e3b 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 [po= rt ]\n"); + fprintf(stderr, "\tset [] [id ] flags [no]backup|[no]fullmesh [po= rt ] [token ] [rip ] [rport ]\n"); fprintf(stderr, "\tflush\n"); fprintf(stderr, "\tdump\n"); fprintf(stderr, "\tlimits [ ]\n"); @@ -1279,7 +1279,10 @@ int set_flags(int fd, int pm_family, int argc, char = *argv[]) struct rtattr *rta, *nest; struct nlmsghdr *nh; u_int32_t flags =3D 0; + u_int32_t token =3D 0; + u_int16_t rport =3D 0; u_int16_t family; + void *rip =3D NULL; int nest_start; int use_id =3D 0; u_int8_t id; @@ -1339,7 +1342,13 @@ int set_flags(int fd, int pm_family, int argc, char = *argv[]) error(1, 0, " missing flags keyword"); =20 for (; arg < argc; arg++) { - if (!strcmp(argv[arg], "flags")) { + if (!strcmp(argv[arg], "token")) { + if (++arg >=3D argc) + error(1, 0, " missing token value"); + + /* token */ + token =3D atoi(argv[arg]); + } else if (!strcmp(argv[arg], "flags")) { char *tok, *str; =20 /* flags */ @@ -1378,12 +1387,72 @@ int set_flags(int fd, int pm_family, int argc, char= *argv[]) rta->rta_len =3D RTA_LENGTH(2); memcpy(RTA_DATA(rta), &port, 2); off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "rport")) { + if (++arg >=3D argc) + error(1, 0, " missing remote port"); + + rport =3D atoi(argv[arg]); + } else if (!strcmp(argv[arg], "rip")) { + if (++arg >=3D argc) + error(1, 0, " missing remote ip"); + + rip =3D argv[arg]; } else { error(1, 0, "unknown keyword %s", argv[arg]); } } nest->rta_len =3D off - nest_start; =20 + /* token */ + if (token) { + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ATTR_TOKEN; + rta->rta_len =3D RTA_LENGTH(4); + memcpy(RTA_DATA(rta), &token, 4); + off +=3D NLMSG_ALIGN(rta->rta_len); + } + + /* remote addr/port */ + if (rip) { + nest_start =3D off; + nest =3D (void *)(data + off); + nest->rta_type =3D NLA_F_NESTED | MPTCP_PM_ATTR_ADDR_REMOTE; + nest->rta_len =3D RTA_LENGTH(0); + off +=3D NLMSG_ALIGN(nest->rta_len); + + /* addr data */ + rta =3D (void *)(data + off); + if (inet_pton(AF_INET, rip, RTA_DATA(rta))) { + family =3D AF_INET; + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_ADDR4; + rta->rta_len =3D RTA_LENGTH(4); + } else if (inet_pton(AF_INET6, rip, RTA_DATA(rta))) { + family =3D AF_INET6; + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_ADDR6; + rta->rta_len =3D RTA_LENGTH(16); + } else { + error(1, errno, "can't parse ip %s", (char *)rip); + } + off +=3D NLMSG_ALIGN(rta->rta_len); + + /* family */ + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_FAMILY; + rta->rta_len =3D RTA_LENGTH(2); + memcpy(RTA_DATA(rta), &family, 2); + off +=3D NLMSG_ALIGN(rta->rta_len); + + if (rport) { + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_PORT; + rta->rta_len =3D RTA_LENGTH(2); + memcpy(RTA_DATA(rta), &rport, 2); + off +=3D NLMSG_ALIGN(rta->rta_len); + } + + nest->rta_len =3D off - nest_start; + } + do_nl_req(fd, nh, off, 0); return 0; } diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index 78d0bb640b11..abe3d4ebe554 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -770,10 +770,42 @@ test_subflows() rm -f "$evts" } =20 +test_prio() +{ + local count + + # Send MP_PRIO signal from client to server machine + ip netns exec "$ns2" ./pm_nl_ctl set 10.0.1.2 port "$client4_port" flags = backup token "$client4_token" rip 10.0.1.1 rport "$server4_port" + sleep 0.5 + + # Check TX + stdbuf -o0 -e0 printf "MP_PRIO TX = \t" + count=3D$(ip netns exec "$ns2" nstat -as | grep MPTcpExtMPPrioTx | awk '{= print $2}') + [ -z "$count" ] && count=3D0 + if [ $count !=3D 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=3D$(ip netns exec "$ns1" nstat -as | grep MPTcpExtMPPrioRx | awk '{= print $2}') + [ -z "$count" ] && count=3D0 + if [ $count !=3D 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 =20 exit 0 --=20 2.31.1