From nobody Mon Feb 9 16:13:05 2026 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