From nobody Thu Mar 28 11:57:48 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp510665jap; Thu, 18 Nov 2021 06:00:21 -0800 (PST) X-Google-Smtp-Source: ABdhPJwvciBdbOk64DSLP6p1aLg1/TUDwj0EhUYFPX87mO+2P7lQgHFE+pYi3UuopRnQkaMOsx35 X-Received: by 2002:a17:90b:1b03:: with SMTP id nu3mr10749980pjb.240.1637244020447; Thu, 18 Nov 2021 06:00:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637244020; cv=none; d=google.com; s=arc-20160816; b=wcypAFXwCQZbB8JU6shGJQcaA13QJgf1BhJzfs9+KkGeFGa4Ahk9T6ob/9KVormq+L wcIXrq1j5bXwASiHc4P8TM901W0c4ru+BqEk5OgH1x4TUUd+6yWs2U7XDPFSz8JhFtXH e8xqgUPaSnjeMThTKp47FFdWHV0oByNecaH/ca1GMHd7Bp2bwG9gLsYahD3ZVtLWwsR7 xbodyIZa3GaifRCpjfLrWacPKWzPFuZaV3LfqAjjm7GKfoj1yWt+oZxlLGYpSFX+YsQi DjqwxewLRHnFJbx8oOVAYYencEEJv1bZ6quF7mK3oVayuHF0Bt/J5ZAIqL82pRbAGCul iL7A== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=2joO8jS3Ie5xpyBkZ2g+0qXY750ulN41DKRAm1lQerQ=; b=R9txLFPfxSGdp1rztg7T1kz4JhS6P+g6KR6CLhMyxksrt7bN3xWBmtCofSf9ZtMK8I YsODpl20qhZYBLOQ3KYP07te/22C30fSg2ptCwforUj1QJAHFnizmPYN5r4yWrKou9HN vOC5X87cyRJfXDCQqDz1sg4BNL9z2OPmVZWerx5TC3P8QeEVvnCSDemQ8gxfUGgD6Fq5 pP8HiKDldbaqyDzohjldvptqrhP8Z+Fcjy1BT0cf2lOftKSa7FCnly/XXtIpUyqSNt3A +UJWJxFOdm1iwRdffvzOmIcyVrQNN1FfDKB3gI+b230k/+iiaCVC6V37xsElae2yCc5N qoGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TJwF2jvp; spf=pass (google.com: domain of mptcp+bounces-2466-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2466-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id u28si3981633pga.583.2021.11.18.06.00.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Nov 2021 06:00:20 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2466-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=TJwF2jvp; spf=pass (google.com: domain of mptcp+bounces-2466-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-2466-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.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 690D53E0F55 for ; Thu, 18 Nov 2021 14:00:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 38E0072; Thu, 18 Nov 2021 14:00:18 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 A74CD68 for ; Thu, 18 Nov 2021 14:00:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637244015; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2joO8jS3Ie5xpyBkZ2g+0qXY750ulN41DKRAm1lQerQ=; b=TJwF2jvpNmgc1Bm8CNxpTkzi+MyFDqv71dMnuuXgEx2uZeHihzwmte0nzoVg7bk/QyKxe5 xysOLFHlXRo4dVPxFhIa/0hH63AikeCuob/3oPF+TUA6VyFahgPrbukY+NXtc9jf/qg6ft VnyQ/P+Nw266xvBEBlMJIZ3vYcYsG4A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-451-Kyk_iGlsMpO38Od1Up-t0g-1; Thu, 18 Nov 2021 09:00:10 -0500 X-MC-Unique: Kyk_iGlsMpO38Od1Up-t0g-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92B8F10247A8; Thu, 18 Nov 2021 14:00:09 +0000 (UTC) Received: from dcaratti.users.ipa.redhat.com (unknown [10.40.194.144]) by smtp.corp.redhat.com (Postfix) with ESMTP id 616F560CC4; Thu, 18 Nov 2021 14:00:08 +0000 (UTC) From: Davide Caratti To: mptcp@lists.linux.dev Cc: Mat Martineau , Matthieu Baerts Subject: [PATCH mptcp-next v2] mptcp: allow changing the "backup" bit by endpoint id Date: Thu, 18 Nov 2021 15:00:02 +0100 Message-Id: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dcaratti@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Mat Martineau --- Notes: v2: - remove poltergeist that handles id zero 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.31.1