From nobody Mon Feb 9 07:05:40 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp1110639jap; Fri, 3 Dec 2021 14:35:56 -0800 (PST) X-Google-Smtp-Source: ABdhPJxVin93rxmtlYi0xfdI4rkM0EGncrLTPdUcfXBw/u4qmuEqlDdjZn+RRQkkoNurRz3Th14u X-Received: by 2002:a05:622a:120e:: with SMTP id y14mr23396270qtx.671.1638570956015; Fri, 03 Dec 2021 14:35:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638570956; cv=none; d=google.com; s=arc-20160816; b=VmewdY3l0RkKstLkdqF8+vfB3hbL2TZqls/YV9esGsDZ5mfptKVs4ozWgZ9vpHPn1g lhjrvnQCKV1kff/w7xOWXHdOdBwWXiiK/sSyopVSGElvcC51DmSlngmjs5m1Qva+rUjF QD+WNNF4kPOHAOTpaVxahF+Tm9h7Uo67X5bICDYiOhx3zrO8K44MS3fzbG8qYi4lgMKY y18NRbHjskSjLbnihTKCDEstuyQj645NCKI+pDURcogXroPgf7lAKwU2RowBEeW03TqN Px/nD4KuB15jxfWCf/7/XgkJ00O9e2G0WJPMSSuj3Ir7yU1ue88JsFKDbiHs5ifUcMLx P2cA== 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; bh=tpiTTOoIrEz/WRXhKvQLwu2D2qRthTZyvtj8bkaBXew=; b=B8mMcY3hm/G/XNZOK5arCnCRgLWJ659foEa08K/y92BjQfudCsXJ+Ty7MIH4UX5stZ bpMz9oNuZ/P4dCEAT/HFPAwosePVbE2XVgkRSVuNglSpXF8gQ3uVyFZoGv8/dyFmdiZU H6krBy8TjSQi/DVwP4DAHN84WhyzmTJsIWUmKx/+LAP8/Qfx8T3K3dw7lj4xpQKuXdur 6Ma1+daCXAh+q4lHEtCcI3tMAOEWLWUiEx4vv3RTN+vSyR/TYpyDbV4keYw5n39CnodZ VqI0EaDYP2DZBTkwASTAUvk3ox3egCpbx/9TM7ceAn4HVF0s9wyTXWyZSeN2DHdpnLPB k14Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2628-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2628-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. [147.75.197.195]) by mx.google.com with ESMTPS id w74si3750076qkb.730.2021.12.03.14.35.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Dec 2021 14:35:56 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2628-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2628-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2628-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 A086B1C0F0A for ; Fri, 3 Dec 2021 22:35:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D7D252C9E; Fri, 3 Dec 2021 22:35:51 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (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 CAA752CA8 for ; Fri, 3 Dec 2021 22:35:50 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10187"; a="235802944" X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="235802944" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 14:35:47 -0800 X-IronPort-AV: E=Sophos;i="5.87,284,1631602800"; d="scan'208";a="460185309" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.18.88]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2021 14:35:47 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Davide Caratti , davem@davemloft.net, kuba@kernel.org, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 05/10] mptcp: allow changing the "backup" bit by endpoint id Date: Fri, 3 Dec 2021 14:35:36 -0800 Message-Id: <20211203223541.69364-6-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211203223541.69364-1-mathew.j.martineau@linux.intel.com> References: <20211203223541.69364-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: Davide Caratti a non-zero 'id' is sufficient to identify MPTCP endpoints: allow changing the value of 'backup' bit by simply specifying the endpoint id. Link: https://github.com/multipath-tcp/mptcp_net-next/issues/158 Signed-off-by: Davide Caratti Signed-off-by: Mat Martineau --- net/mptcp/pm_netlink.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 7b96be1e9f14..4ff8d55cbe82 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1702,22 +1702,28 @@ static int mptcp_nl_addr_backup(struct net *net, =20 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 nlattr *attr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); - struct mptcp_pm_addr_entry addr, *entry; struct net *net =3D sock_net(skb->sk); - u8 bkup =3D 0; + u8 bkup =3D 0, lookup_by_id =3D 0; int ret; =20 - ret =3D mptcp_pm_parse_addr(attr, info, true, &addr); + ret =3D mptcp_pm_parse_addr(attr, info, false, &addr); if (ret < 0) return ret; =20 if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP) bkup =3D 1; + if (addr.addr.family =3D=3D AF_UNSPEC) { + lookup_by_id =3D 1; + if (!addr.addr.id) + return -EOPNOTSUPP; + } =20 list_for_each_entry(entry, &pernet->local_addr_list, list) { - if (addresses_equal(&entry->addr, &addr.addr, true)) { + if ((!lookup_by_id && addresses_equal(&entry->addr, &addr.addr, true)) || + (lookup_by_id && entry->addr.id =3D=3D addr.addr.id)) { mptcp_nl_addr_backup(net, &entry->addr, bkup); =20 if (bkup) --=20 2.34.1