From nobody Mon Feb 9 11:30:46 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp3841453uad; Tue, 5 Jul 2022 14:32:34 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vEBmfPoAkLpCQ/yjgqiBspy+w1uoq72pcYiiTnrU8RcjdcGuqWo7H7DUvawCgiuNeJClok X-Received: by 2002:ac8:5a4d:0:b0:31d:c63:5637 with SMTP id o13-20020ac85a4d000000b0031d0c635637mr30065121qta.102.1657056754343; Tue, 05 Jul 2022 14:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657056754; cv=none; d=google.com; s=arc-20160816; b=qt9DXSurgBTw84eUZvHA971A1kYU+XNrtD9WpXKqQCeKIBUpQ/QTZ6b3GU6X6f+9bP fJ2XpFHV+D33s6ui9mnDMUBkjKpUx5zBQdPY3ZtmGBcCxLWvN47IwYEKu+DQJyIWMBe3 o/2H0rddGfGQf1BIPhrgKKP1YJxaeoGuhu06lK3dpYlg3+raTQiVIqY1zQFXWpQuhKFs brwCER9Nt+2HZ6uuf+dx2EbSpV+U1b3F7jDSu4R8/USGfaXVIVxF2TmsZctPyU/kNxwl J+V34n+Xq1b6jiuWUTdeR/rY6kF635T6B2AV5kPGW5s+zqOYqF+T6LHSzuDqNeoI8liD ns1w== 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:cc:to:from:dkim-signature; bh=rXtD5P0+oboelULg9lJJJnJLenfK3LPJKz2A7ROYaRE=; b=px4wg7EoaOuyjtBItKt/0a08bhFGCxtk7kUEWo+Gzovjun7BtuzaF73drJbpqRDL4N a7aaKdyLxz6oimAUN1cucACAWOTusTKjES4zJOf7R4KNIyawl0o0GOzNEBAdTVMpc5D4 bsk89L0TK2OAkPxm5YKL/0+96H92od/cFmGM0gaCVRlJbq58xmGkwqr4ntdFJqVSO4E0 eGrDGoqE6k+T2x6targop7vz5adbSpfcWVaqwIlWYZA5z7jpNXSg8K9GmGWKRpyMxvGm XD9APAgTR+mdgMy/E97MiLE4BIwh1sPW/i1GohOX1j9K/HTUybrqWZAXQ+OtDU7GZkC4 pVog== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dmGls7Ha; spf=pass (google.com: domain of mptcp+bounces-5960-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-5960-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id 13-20020ac8560d000000b002f7a43bf153si20687095qtr.556.2022.07.05.14.32.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jul 2022 14:32:34 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5960-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=dmGls7Ha; spf=pass (google.com: domain of mptcp+bounces-5960-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-5960-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 1A6961C2086A for ; Tue, 5 Jul 2022 21:32:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 350D66029; Tue, 5 Jul 2022 21:32:27 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 D59506028 for ; Tue, 5 Jul 2022 21:32:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657056745; x=1688592745; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=a2vfLDIU1Y8R3v+h0jDohycCBGEae5albz97uSQfIr4=; b=dmGls7HaEaCbl+HjhXwv2FXDNKblQQw5Er8bhJ5F4c/N/PKegyYmwT0w 0X6uaTSJSlBZNXB8T4a/d6liydnjOlH8Q6WAWasfUINtSdYI1lr2MzwKO eCFdOrOIMnTxHBKpspV1cN503+h4ra1nYlgeGmyiEJ0G8ckBIQU7eHQoN H8zZCAMx/RLBG+nauFRxSKOQ3D8rgCvADwyJsdUeVmPEJR/28oZG6hC1E ErwkTVp/uvUnzD1n5pjXbr7/XN20OOqqGMWL/qyZ+Zl7xuCn4AR4Zf+ao Wnn2RDpK4b1Lt8mNygDDpCympXBAUQarzT+IuHJKi/Evi81lDgy7begRu w==; X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="284633936" X-IronPort-AV: E=Sophos;i="5.92,247,1650956400"; d="scan'208";a="284633936" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 14:32:23 -0700 X-IronPort-AV: E=Sophos;i="5.92,247,1650956400"; d="scan'208";a="590558751" Received: from rcenter-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.17.169]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 14:32:22 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Kishen Maloor , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, fw@strlen.de, geliang.tang@suse.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net 5/7] selftests: mptcp: userspace PM support for MP_PRIO signals Date: Tue, 5 Jul 2022 14:32:15 -0700 Message-Id: <20220705213217.146898-6-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220705213217.146898-1-mathew.j.martineau@linux.intel.com> References: <20220705213217.146898-1-mathew.j.martineau@linux.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" From: Kishen Maloor 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") Acked-by: Paolo Abeni Signed-off-by: Kishen Maloor Signed-off-by: Mat Martineau --- 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.37.0