From nobody Thu Mar 28 20:44:54 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:27c:0:0:0:0 with SMTP id x28csp1072645jaq; Wed, 6 Oct 2021 21:37:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzfS1Iho2rdwjXjLRD3bNPytGVZvW7A4eQj0/MDKDJSAURkGkmwWA2Vh0/9vPY9GDpIfhX3 X-Received: by 2002:a05:620a:4c3:: with SMTP id 3mr1627564qks.19.1633581442758; Wed, 06 Oct 2021 21:37:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633581442; cv=none; d=google.com; s=arc-20160816; b=0+3xcttmFj2WW3+1deHuvD7KgrtC3OunYCsFpUTb7YvX/1JnElwcKSHvB1jkSYHEIl 4QsGU9LuCNvUadtXY5exWSI5rGRd/+wGo11bPMZLDmPjKlL/nQgM8t9ISj3+ybimZ3bt COqzKEqLctyOglSQVT/ezbXpB3688MicADvCCDM8MI/Jr0zP9U/BoaF674bT9syGGCtU 7PqB5HL5qR1zRLtwa81Avy4UlEBGT6BC89c30mAqEjA77dxuEXGgX6EwtJI8np1xNvcO xsxCOQ2AalxBvz1wmrl9oyDYNsrsdHhaBBSWPp9xndSrtQK0aKp4+UIJD69nKSYVPv7u CO8A== 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; bh=/ByrRriF2fRRuyVYSSrjFrrhn6SjDlvkc5S96BJ1Xq4=; b=0M4pX49FsUbGXGX0Buj5pzuM+AUbGt8G1Wr4cCOSWUASzpoNXoOE/ufCDhQur29JI8 NyaEIhue/y/VVSX4d+nOTBcN7Rtf7qPUmv+ie6nQQVY9iCgT13CHFEEKppJ2mLUOh8AQ Fij0vNAy/636tLQSQhR20MTUlTYkKybrNgOwObo3U+yBGW2OEQ3DLgjPAPJ24/GRXyz8 5SbGMpBSdYYdmD1FEuPcTWOJbhKjgGy8GWtkJGSiusKnlVHasdpM8/TRLZc2pLb0iyAc JAQ+Jgudp8fu4ymv0ZC1G9gqZ/+Ofpd6SwarbXxR80wvaPf23AV1oCZKk5IBJ+0KoGNl vQxQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2122-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2122-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id t32si16385415qtc.133.2021.10.06.21.37.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 21:37:22 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2122-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2122-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2122-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (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 ewr.edge.kernel.org (Postfix) with ESMTPS id 7C2B21C09FF for ; Thu, 7 Oct 2021 04:37:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B57BC2C8E; Thu, 7 Oct 2021 04:37:21 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 9E7A82C88 for ; Thu, 7 Oct 2021 04:37:19 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10129"; a="249476773" X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="249476773" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2021 21:37:19 -0700 X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="568443835" 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; 06 Oct 2021 21:37:19 -0700 From: Kishen Maloor To: mptcp@lists.linux.dev, mathew.j.martineau@linux.intel.com, kishen.maloor@intel.com Subject: [RFC PATCH 1/4] mptcp: pm_netlink: Add MPTCP_PM_CMD_ANNOUNCE Date: Thu, 7 Oct 2021 00:36:53 -0400 Message-Id: <20211007043656.261552-2-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211007043656.261552-1-kishen.maloor@intel.com> References: <20211007043656.261552-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 adds a MPTCP netlink interface command for issuing ADD_ADDR advertisements over the chosen MPTCP connection from a userspace path manager. The command requires the following parameters: {token, {loc_id, family, saddr4 | saddr6 [, sport]} }. Signed-off-by: Kishen Maloor --- include/uapi/linux/mptcp.h | 2 ++ net/mptcp/pm_netlink.c | 45 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index c8cc46f80a16..e22e891016e3 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -55,6 +55,7 @@ enum { MPTCP_PM_ATTR_ADDR, /* nested address */ MPTCP_PM_ATTR_RCV_ADD_ADDRS, /* u32 */ MPTCP_PM_ATTR_SUBFLOWS, /* u32 */ + MPTCP_PM_ATTR_TOKEN, /* u32 */ =20 __MPTCP_PM_ATTR_MAX }; @@ -92,6 +93,7 @@ enum { MPTCP_PM_CMD_SET_LIMITS, MPTCP_PM_CMD_GET_LIMITS, MPTCP_PM_CMD_SET_FLAGS, + MPTCP_PM_CMD_ANNOUNCE, =20 __MPTCP_PM_CMD_AFTER_LAST }; diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 2a3589b67768..1b41bbc70529 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1028,6 +1028,7 @@ static const struct nla_policy mptcp_pm_policy[MPTCP_= PM_ATTR_MAX + 1] =3D { NLA_POLICY_NESTED(mptcp_pm_addr_policy), [MPTCP_PM_ATTR_RCV_ADD_ADDRS] =3D { .type =3D NLA_U32, }, [MPTCP_PM_ATTR_SUBFLOWS] =3D { .type =3D NLA_U32, }, + [MPTCP_PM_ATTR_TOKEN] =3D { .type =3D NLA_U32, }, }; =20 void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct so= ck *ssk) @@ -1735,6 +1736,45 @@ static int mptcp_nl_addr_backup(struct net *net, return ret; } =20 +static int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *in= fo) +{ + struct nlattr *addr =3D info->attrs[MPTCP_PM_ATTR_ADDR], + *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; + struct mptcp_sock *msk; + struct mptcp_pm_addr_entry _addr; + u32 _token; + int err; + + if (!addr || !token) { + GENL_SET_ERR_MSG(info, "missing announce info"); + return -EINVAL; + } + + err =3D mptcp_pm_parse_addr(addr, info, true, &_addr); + if (err < 0) + return err; + + _token =3D nla_get_u32(token); + + msk =3D mptcp_token_get_sock(sock_net(skb->sk), _token); + if (!msk) { + NL_SET_ERR_MSG_ATTR(info->extack, token, "invalid token"); + return -EINVAL; + } + + lock_sock((struct sock *)msk); + spin_lock_bh(&msk->pm.lock); + + msk->pm.userspace =3D true; + mptcp_pm_announce_addr(msk, &_addr.addr, false); + mptcp_pm_nl_addr_send_ack(msk); + + spin_unlock_bh(&msk->pm.lock); + release_sock((struct sock *)msk); + + return 0; +} + static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *i= nfo) { struct nlattr *attr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; @@ -2067,6 +2107,11 @@ static const struct genl_small_ops mptcp_pm_ops[] = =3D { .doit =3D mptcp_nl_cmd_set_flags, .flags =3D GENL_ADMIN_PERM, }, + { + .cmd =3D MPTCP_PM_CMD_ANNOUNCE, + .doit =3D mptcp_nl_cmd_announce, + .flags =3D GENL_ADMIN_PERM, + }, }; =20 static struct genl_family mptcp_genl_family __ro_after_init =3D { --=20 2.31.1 From nobody Thu Mar 28 20:44:54 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:27c:0:0:0:0 with SMTP id x28csp1072661jaq; Wed, 6 Oct 2021 21:37:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzE/msPrFLbbPF7sdCWHPilXJQoQ7JpyqgbM9AKe5F2M3hdmHXwih8UukZudQB0HuBtaHf9 X-Received: by 2002:a37:a64b:: with SMTP id p72mr1596097qke.459.1633581443925; Wed, 06 Oct 2021 21:37:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633581443; cv=none; d=google.com; s=arc-20160816; b=p9s/kqnI7fCLe+xtVyaRr2kfYvRS/mcLMwjbmbMUkhABmV+VuZIGvayd1cZQHi/9dq K0W3+J28AkoTDOH7BsaFzpmMQMxxND0MrcBL9g+C8hEff0yw2P1UArrluuUgzlSdYuea ota4/JsWS23FQbIqtU9U79gmBGmwNkl1Ak/ly3TSscX8Hkeh6jBV7uh2QypZ/V7ENxNv DIjvDPqBGZxNQvF+ivQ8PjOXg0vDUJH3yp6RTzJ1MgUNekV1GIfMXPRpoD32lcBw2WoR tpFTD6mNJ14Rki6gkaEFIClW5TTWeu3ZgJeqC0CO5ujEyyrH8WRsydYpaxpX6TK083Ft 2VIw== 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; bh=/fuC1YOQSMe/pa1bpYxhRWFHWpHd5dx2bt1sB4ExZdo=; b=lzI57rDyH/mmj0T3dwF0CBVAxUlQEZEis9Px1VpR7AiheYi6wZHSyGkyc2giv8WOeF DtNAKw6ozDn+rtwSf0jOZMnbMqv1uIQKR8FtUs0VBtH8NAUI6Z2iBSjQMbECyhsOF5pt ZsX5d3XFfyGD17F9VqUCKifDEl/ShEWlWFY50QbIOihTDXF8nAtOiI1mAwNU7Oxwr1eG ZHzR2550+LBO3Qn4kprda0Xrfb5X4JBnVXIVqiVE+CDLmqoGPwuIZvzgcqeNPSbwOMdF NnnGs9HIZIF0qRtFJkyafnSMU97iSblu1J9H/OyemzdTv5OYt6Ic+ZNZTgfsOfsGlr7L 64Bg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2123-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2123-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id b10si12456564qvj.157.2021.10.06.21.37.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 21:37:23 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2123-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2123-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2123-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (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 ewr.edge.kernel.org (Postfix) with ESMTPS id 9B9E91C0A44 for ; Thu, 7 Oct 2021 04:37:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D617F2C89; Thu, 7 Oct 2021 04:37:21 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 7DFFA2C8B for ; Thu, 7 Oct 2021 04:37:20 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10129"; a="249476777" X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="249476777" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2021 21:37:20 -0700 X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="568443839" 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; 06 Oct 2021 21:37:20 -0700 From: Kishen Maloor To: mptcp@lists.linux.dev, mathew.j.martineau@linux.intel.com, kishen.maloor@intel.com Subject: [RFC PATCH 2/4] mptcp: selftests: MPTCP_PM_CMD_ANNOUNCE Date: Thu, 7 Oct 2021 00:36:54 -0400 Message-Id: <20211007043656.261552-3-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211007043656.261552-1-kishen.maloor@intel.com> References: <20211007043656.261552-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 "pm_nl_ctl" testing sample with an "ann" (announce) option to support the newly added netlink interface command MPTCP_PM_CMD_ANNOUNCE to issue ADD_ADDR advertisements over the chosen MPTCP connection. E.g. ./pm_nl_ctl ann 192.168.122.75 token 823274047 id 2345 dev enp1s0 Signed-off-by: Kishen Maloor --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 121 ++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 354784512748..47c2667ad676 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -26,6 +26,7 @@ static void syntax(char *argv[]) { fprintf(stderr, "%s add|get|set|del|flush|dump|accept []\n", argv[0= ]); fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [= dev ] \n"); + fprintf(stderr, "\tann token [port ] [id ] [dev ]\n"); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); fprintf(stderr, "\tset [flags backup|nobackup]\n"); @@ -170,6 +171,124 @@ static int resolve_mptcp_pm_netlink(int fd) return genl_parse_getfamily((void *)data); } =20 +int announce_addr(int fd, int pm_family, int argc, char *argv[]) +{ + char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + + NLMSG_ALIGN(sizeof(struct genlmsghdr)) + + 1024]; + struct rtattr *rta, *addr; + struct nlmsghdr *nh; + u_int32_t flags =3D 0; + u_int16_t family; + u_int32_t token; + int addr_start; + u_int8_t id, got_token =3D 0; + int off =3D 0; + int arg; + + memset(data, 0, sizeof(data)); + nh =3D (void *)data; + off =3D init_genl_req(data, pm_family, MPTCP_PM_CMD_ANNOUNCE, + MPTCP_PM_VER); + + if (argc < 5) + syntax(argv); + + /* addr header */ + addr_start =3D off; + addr =3D (void *)(data + off); + addr->rta_type =3D NLA_F_NESTED | MPTCP_PM_ATTR_ADDR; + addr->rta_len =3D RTA_LENGTH(0); + off +=3D NLMSG_ALIGN(addr->rta_len); + + /* addr data */ + rta =3D (void *)(data + off); + if (inet_pton(AF_INET, argv[2], 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, argv[2], 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", argv[2]); + 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); + + flags |=3D MPTCP_PM_ADDR_FLAG_SIGNAL; + + for (arg =3D 3; arg < argc; arg++) { + if (!strcmp(argv[arg], "id")) { + if (++arg >=3D argc) + error(1, 0, " missing id value"); + + id =3D atoi(argv[arg]); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_ID; + rta->rta_len =3D RTA_LENGTH(1); + memcpy(RTA_DATA(rta), &id, 1); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "dev")) { + int32_t ifindex; + + if (++arg >=3D argc) + error(1, 0, " missing dev name"); + + ifindex =3D if_nametoindex(argv[arg]); + if (!ifindex) + error(1, errno, "unknown device %s", argv[arg]); + + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ADDR_ATTR_IF_IDX; + rta->rta_len =3D RTA_LENGTH(4); + memcpy(RTA_DATA(rta), &ifindex, 4); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "port")) { + u_int16_t port; + + if (++arg >=3D argc) + error(1, 0, " missing port value"); + if (!(flags & MPTCP_PM_ADDR_FLAG_SIGNAL)) + error(1, 0, " flags must be signal when using port"); + + port =3D atoi(argv[arg]); + 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), &port, 2); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "token")) { + if (++arg >=3D argc) + error(1, 0, " missing token value"); + token =3D atoi(argv[arg]); + got_token =3D 1; + } else + error(1, 0, "unknown keyword %s", argv[arg]); + } + addr->rta_len =3D off - addr_start; + + if (!got_token) + error(1, 0, " missing token value"); + + /* 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); + + do_nl_req(fd, nh, off, 0); + + return 0; +} + int add_addr(int fd, int pm_family, int argc, char *argv[]) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + @@ -744,6 +863,8 @@ int main(int argc, char *argv[]) =20 if (!strcmp(argv[1], "add")) return add_addr(fd, pm_family, argc, argv); + else if (!strcmp(argv[1], "ann")) + return announce_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "del")) return del_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "flush")) --=20 2.31.1 From nobody Thu Mar 28 20:44:54 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:27c:0:0:0:0 with SMTP id x28csp1072671jaq; Wed, 6 Oct 2021 21:37:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyQDIHWRWXm0+CldmGwGzxH7NrxBJJKbvi7gw+jUo55bsVAVpCsFzvONsxGA6Th8JGHk/ub X-Received: by 2002:a17:90a:9b84:: with SMTP id g4mr574806pjp.123.1633581445001; Wed, 06 Oct 2021 21:37:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633581444; cv=none; d=google.com; s=arc-20160816; b=avviBitiw3J8n1WlW3etWYQ+vcjQX+3sjzfJTeF2wR6IqbYMCxrcPIYKfq7JrLpRIs sHMIVAICPOlznBwuw1ASDPXTx1IZWO80ri/PSWwjxMSKlogK2cgRwB4IrupIVGhn2is6 non96Zj4TrnhoNPp23Iursw7TNS0qYGF5koixQCb7Dz2kQg0o7wfX7HHpGeoBhDlW1qM MSkCXSmhM+KOAvpVKeOG0a35lboTjvyYgeQJvskfGsXi24bMgLoU2Xc/lEMoq0Bu5VXL +CiVNF6cFOI7mT2O/VbVplDEV5uHlBqiZ7Cci92k6PTJr8Olj6b1E+/E12MG3+3qPRht 07nw== 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; bh=M5s/OQ4NI3ZkMA4rPLsXhUnmdwKiowc/VJE37NZaHIE=; b=HsOdNEkVX3ZoiJIUCoKYf4DFexGRb8Nq1MXF06vByLUK37wUxz2TB1TMXxjHK20JO6 YcYFpcExvw/egI3OJAHYI6SKakr9Cv5fLGwR2FX+GX81tUlQJbEPzOr6gttPhcP10qoz +NmROkwB4Ri09JzWALZb36Tipv6xTuFMXqtwoGWMd3yxM/JH8r0WyiC9uBaF2xT1eyX3 Cc5RvQpR3D3JCG2xhoIwbY2sESglUl2AixQ/MI+4BdjqbEAGp+pcRVMwzwqVXrlKW5BC 3t0//IIKJEYZ5ABr2GWfTjPI+rW4mnslxFLuH/JrVXmJFtbqhBpWKWJ0Uz8fYwa83X+7 c2sw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2124-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2124-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id h197si5089207pfe.231.2021.10.06.21.37.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 21:37:24 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2124-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2124-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2124-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (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 sjc.edge.kernel.org (Postfix) with ESMTPS id 6EE4D3E0E39 for ; Thu, 7 Oct 2021 04:37:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C75A22C8B; Thu, 7 Oct 2021 04:37:22 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 BB28F2C88 for ; Thu, 7 Oct 2021 04:37:21 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10129"; a="249476779" X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="249476779" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2021 21:37:21 -0700 X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="568443844" 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; 06 Oct 2021 21:37:21 -0700 From: Kishen Maloor To: mptcp@lists.linux.dev, mathew.j.martineau@linux.intel.com, kishen.maloor@intel.com Subject: [RFC PATCH 3/4] mptcp: pm_netlink: Add MPTCP_PM_CMD_REMOVE Date: Thu, 7 Oct 2021 00:36:55 -0400 Message-Id: <20211007043656.261552-4-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211007043656.261552-1-kishen.maloor@intel.com> References: <20211007043656.261552-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 adds a MPTCP netlink interface command for issuing REMOVE_ADDR signals for a specific address over the chosen MPTCP connection from a userspace path manager. The command requires the following parameters: {token, loc_id}. Signed-off-by: Kishen Maloor --- include/uapi/linux/mptcp.h | 2 ++ net/mptcp/pm_netlink.c | 43 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index e22e891016e3..0ce8abce6d54 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -56,6 +56,7 @@ enum { MPTCP_PM_ATTR_RCV_ADD_ADDRS, /* u32 */ MPTCP_PM_ATTR_SUBFLOWS, /* u32 */ MPTCP_PM_ATTR_TOKEN, /* u32 */ + MPTCP_PM_ATTR_LOC_ID, /* u8 */ =20 __MPTCP_PM_ATTR_MAX }; @@ -94,6 +95,7 @@ enum { MPTCP_PM_CMD_GET_LIMITS, MPTCP_PM_CMD_SET_FLAGS, MPTCP_PM_CMD_ANNOUNCE, + MPTCP_PM_CMD_REMOVE, =20 __MPTCP_PM_CMD_AFTER_LAST }; diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 1b41bbc70529..bf92ef605043 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1029,6 +1029,7 @@ static const struct nla_policy mptcp_pm_policy[MPTCP_= PM_ATTR_MAX + 1] =3D { [MPTCP_PM_ATTR_RCV_ADD_ADDRS] =3D { .type =3D NLA_U32, }, [MPTCP_PM_ATTR_SUBFLOWS] =3D { .type =3D NLA_U32, }, [MPTCP_PM_ATTR_TOKEN] =3D { .type =3D NLA_U32, }, + [MPTCP_PM_ATTR_LOC_ID] =3D { .type =3D NLA_U8, }, }; =20 void mptcp_pm_nl_subflow_chk_stale(const struct mptcp_sock *msk, struct so= ck *ssk) @@ -1736,6 +1737,43 @@ static int mptcp_nl_addr_backup(struct net *net, return ret; } =20 +static int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info) +{ + struct nlattr *id =3D info->attrs[MPTCP_PM_ATTR_LOC_ID], + *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; + struct mptcp_sock *msk; + struct mptcp_rm_list rm_list =3D { .nr =3D 0 }; + u32 _token; + u8 _id; + + if (!id || !token) { + GENL_SET_ERR_MSG(info, "missing remove info"); + return -EINVAL; + } + + _id =3D nla_get_u8(id); + _token =3D nla_get_u32(token); + + msk =3D mptcp_token_get_sock(sock_net(skb->sk), _token); + if (!msk) { + NL_SET_ERR_MSG_ATTR(info->extack, token, "invalid token"); + return -EINVAL; + } + + rm_list.ids[rm_list.nr++] =3D _id; + + lock_sock((struct sock *)msk); + spin_lock_bh(&msk->pm.lock); + + msk->pm.userspace =3D true; + mptcp_pm_remove_addr(msk, &rm_list); + + spin_unlock_bh(&msk->pm.lock); + release_sock((struct sock *)msk); + + return 0; +} + static int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *in= fo) { struct nlattr *addr =3D info->attrs[MPTCP_PM_ATTR_ADDR], @@ -2112,6 +2150,11 @@ static const struct genl_small_ops mptcp_pm_ops[] = =3D { .doit =3D mptcp_nl_cmd_announce, .flags =3D GENL_ADMIN_PERM, }, + { + .cmd =3D MPTCP_PM_CMD_REMOVE, + .doit =3D mptcp_nl_cmd_remove, + .flags =3D GENL_ADMIN_PERM, + }, }; =20 static struct genl_family mptcp_genl_family __ro_after_init =3D { --=20 2.31.1 From nobody Thu Mar 28 20:44:54 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:27c:0:0:0:0 with SMTP id x28csp1072684jaq; Wed, 6 Oct 2021 21:37:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGI2hlqJoGH4s1M/mkClOzK6Ceh4iYUk4y7O3a5vXWqaBCUaZaF0ZDIMd/+/RQOkziCu4e X-Received: by 2002:a05:622a:199c:: with SMTP id u28mr2531432qtc.342.1633581446356; Wed, 06 Oct 2021 21:37:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633581446; cv=none; d=google.com; s=arc-20160816; b=pjjoLZT7WG1gp0+wuIb76q0Do+9Vx7hqNW/YCFuVE4RkQGcFcb48RSWfTU4GWcIWt8 t3UeX4Woj9sndttuy/XMf4JP89sOUsi/Vr5LN2uiKRji0ZNoy4M1cTBiY7Paglyt8SXK OK0jd/n1xs9y+ZX30eoLNzILVbMqWTe7YTND0nnCox3wNoy1DkhoKT+YAVSxXgkOLgH8 J0rRuBOOStuvozM2UOI1eUB/vINEoCkMVA2gWF4D0YoVZpNke5uAjP6J0ibrCiT1Hkvp VwlKoLsVOCtsik1J0W1hSyDYXcCo98apkdQM3ss8EAG50knIK9ucWZ6QoNCnzA+W4dLK xjQQ== 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; bh=JHjLPVHj+VLzqB2TKlQHdVn24BLNYdkMLnWRNN9zt9c=; b=GiCH+KlGL7BKGDnNbq4lqoc/DWWhzadYOiruGojCYE2N19cXuD8xl1FoiSAywNdtwC EBfhsGjDHCaMSq0BV85QVnbhUm8oU+eHBSotvhSw47pKTAqbSt9kE+4tzIk1TpEycKex 55hbJp5Rr4xeUkIi1E5azUhRM7hFUfLojbrWpM/slJYKdUciY6XkbIY0BzQbi3rcUe66 Z69AQ6VpGbqhYVvucg8gF5CbVcYIEHtp4lltVRnUMg+1g7ldhkXvRH9YBOaiATKOtmvM iODMvcYsgb53E3d4F3N6SNFF7sYc8vRnCyBa/lKF0ikLhwn5y0aq9Y6NWG69ecgvYxuM VQmw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2125-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2125-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id jv9si6537904qvb.35.2021.10.06.21.37.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Oct 2021 21:37:26 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-2125-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2125-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2125-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (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 ewr.edge.kernel.org (Postfix) with ESMTPS id 01BC21C0A97 for ; Thu, 7 Oct 2021 04:37:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BFD912C8E; Thu, 7 Oct 2021 04:37:23 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 CFAA92C88 for ; Thu, 7 Oct 2021 04:37:22 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10129"; a="249476780" X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="249476780" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Oct 2021 21:37:22 -0700 X-IronPort-AV: E=Sophos;i="5.85,352,1624345200"; d="scan'208";a="568443847" 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; 06 Oct 2021 21:37:22 -0700 From: Kishen Maloor To: mptcp@lists.linux.dev, mathew.j.martineau@linux.intel.com, kishen.maloor@intel.com Subject: [RFC PATCH 4/4] mptcp: selftests: MPTCP_PM_CMD_REMOVE Date: Thu, 7 Oct 2021 00:36:56 -0400 Message-Id: <20211007043656.261552-5-kishen.maloor@intel.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211007043656.261552-1-kishen.maloor@intel.com> References: <20211007043656.261552-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 "pm_nl_ctl" testing sample with a "rem" (remove) option to support the newly added netlink interface command MPTCP_PM_CMD_REMOVE to issue REMOVE_ADDR signals over the chosen MPTCP connection. E.g. ./pm_nl_ctl rem token 823274047 id 2345 Signed-off-by: Kishen Maloor --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 47c2667ad676..8adc370060d6 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -27,6 +27,7 @@ static void syntax(char *argv[]) fprintf(stderr, "%s add|get|set|del|flush|dump|accept []\n", argv[0= ]); fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [= dev ] \n"); fprintf(stderr, "\tann token [port ] [id ] [dev ]\n"); + fprintf(stderr, "\trem id token "); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); fprintf(stderr, "\tset [flags backup|nobackup]\n"); @@ -171,6 +172,54 @@ static int resolve_mptcp_pm_netlink(int fd) return genl_parse_getfamily((void *)data); } =20 +int remove_addr(int fd, int pm_family, int argc, char *argv[]) +{ + char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + + NLMSG_ALIGN(sizeof(struct genlmsghdr)) + + 1024]; + struct rtattr *rta; + struct nlmsghdr *nh; + u_int8_t id; + u_int32_t token; + int off =3D 0, arg; + + memset(data, 0, sizeof(data)); + nh =3D (void *)data; + off =3D init_genl_req(data, pm_family, MPTCP_PM_CMD_REMOVE, + MPTCP_PM_VER); + + if (argc < 6) + syntax(argv); + + for (arg =3D 2; arg < argc; arg++) { + if (!strcmp(argv[arg], "id")) { + if (++arg >=3D argc) + error(1, 0, " missing id value"); + + id =3D atoi(argv[arg]); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ATTR_LOC_ID; + rta->rta_len =3D RTA_LENGTH(1); + memcpy(RTA_DATA(rta), &id, 1); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "token")) { + if (++arg >=3D argc) + error(1, 0, " missing token value"); + + token =3D atoi(argv[arg]); + 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); + } else + error(1, 0, "unknown keyword %s", argv[arg]); + } + + do_nl_req(fd, nh, off, 0); + return 0; +} + int announce_addr(int fd, int pm_family, int argc, char *argv[]) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + @@ -865,6 +914,8 @@ int main(int argc, char *argv[]) return add_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "ann")) return announce_addr(fd, pm_family, argc, argv); + else if (!strcmp(argv[1], "rem")) + return remove_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "del")) return del_addr(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "flush")) --=20 2.31.1