From nobody Thu May 2 13:28:09 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp53499jad; Mon, 14 Feb 2022 07:39:30 -0800 (PST) X-Google-Smtp-Source: ABdhPJxWxn+5ZXpaQqwRYgE44X6ldg5h341ovIcMMqp0K/dupsxkcLWYVFn6kh0535lCwNcCZPGb X-Received: by 2002:a63:ff43:: with SMTP id s3mr229514pgk.623.1644853170283; Mon, 14 Feb 2022 07:39:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644853170; cv=none; d=google.com; s=arc-20160816; b=GKYhtVAC1LVtCjSk0VExomCrW8WJ29gmlyDDtNNojHsf4LUuKQr5faiOWR8Rh4a6F+ OQDRVGMX4NzUfBuH2OgrvVFFPSTTMkhdSBqQTx7h6tiKUVyt7Wwe+JUrp6eOhamjGvam M4CpNpThwS97OaJG1P1u0KYZcJlYVhs0saRbPmV/6tCUUZX0+LkhfwiZJiLhV0/ELJ6W n8s0hI0O3v1Vr4WMSuVwQAmbv9f0uEFPww6NYQ9M55ziF0RSpdDOPwDdzC/9UG0xUXvq v87mp8S+2NYs+HSeYZOAw+9hOWrZpJsAII44E+XtHb/8eOd/zzWDkIBy3xcSYrlqeiui bybg== 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:dkim-signature; bh=3UBJflAZ80wm6ItZgAyOxnQGEwFP1voeDFnm8/KOqyg=; b=YIJDfFLnrQXRn+/gci+PAqJ0B9EmESg/aF3+s3wJnT03CcCXl9HKC7/YueBGrWkLXx dyvCDZNDvx2YkYzsgHsm45fE/LtUc2V/ihOJW7WK2kfesMDZvG82Xcd2GFfKFt74CTwC /Wi7qKv8+Z/ARnWYj88f7EJ45Uf9yYCD4dR3KaeIaRf1ZVsgrIXxiL+xnMZWx41h0Xcs ykC1ZwXOAWQqoeC+lyWmY7pIbkLXa/GjiSCB70TRvEkoIGii519b7DLtm+DN/mHvlS2H 7EzdpUlbbayqr5/L0rDz+h4/+YXhYHSVpDA4DFssNQJEjkwruIR1ZGKeqYwUvUGOMods PuAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cc0FVwci; spf=pass (google.com: domain of mptcp+bounces-3718-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3718-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. [147.75.69.165]) by mx.google.com with ESMTPS id u62si2304pgd.482.2022.02.14.07.39.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Feb 2022 07:39:30 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3718-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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cc0FVwci; spf=pass (google.com: domain of mptcp+bounces-3718-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3718-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 0CE5D3E0E75 for ; Mon, 14 Feb 2022 15:39:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1FFDC7A; Mon, 14 Feb 2022 15:39:28 +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 C235EA25 for ; Mon, 14 Feb 2022 15:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644853165; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3UBJflAZ80wm6ItZgAyOxnQGEwFP1voeDFnm8/KOqyg=; b=cc0FVwcilOLRASkpQHQAM1NUOCHctd1LkilOr8wGCZftpFrV1gn+Ce2mQ0LoCmAXrFzImN fjaoWvtt+c1kGNWZAh3gNvdlEPkwo6T1nUrmuCiDbq5vkfMLMXAZl28/3P00C5ZXzwT3tb jcBcPDhi5rXERiM+NPpuuyahx2QPxYE= 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-339-tsqUqcUeNUOZiAHLXnyzSQ-1; Mon, 14 Feb 2022 10:39:24 -0500 X-MC-Unique: tsqUqcUeNUOZiAHLXnyzSQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C9F408144E0 for ; Mon, 14 Feb 2022 15:39:23 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DA972B598 for ; Mon, 14 Feb 2022 15:39:23 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v4 mptcp-next 1/3] Squash-to: "mptcp: constify a bunch of helpers" Date: Mon, 14 Feb 2022 16:38:55 +0100 Message-Id: <9dee703e18b0981aa85abc45c35143411695d9c4.1644852970.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There are a few more helpers that can be const-ified and I missed in the previous patch, just squash these change into there. Signed-off-by: Paolo Abeni --- net/mptcp/pm_netlink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 46346f009485..56f5603c10f2 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1289,7 +1289,7 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct net *= net, unsigned int id, } =20 static bool remove_anno_list_by_saddr(struct mptcp_sock *msk, - struct mptcp_addr_info *addr) + const struct mptcp_addr_info *addr) { struct mptcp_pm_add_entry *entry; =20 @@ -1304,7 +1304,7 @@ static bool remove_anno_list_by_saddr(struct mptcp_so= ck *msk, } =20 static bool mptcp_pm_remove_anno_addr(struct mptcp_sock *msk, - struct mptcp_addr_info *addr, + const struct mptcp_addr_info *addr, bool force) { struct mptcp_rm_list list =3D { .nr =3D 0 }; --=20 2.34.1 From nobody Thu May 2 13:28:09 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp53578jad; Mon, 14 Feb 2022 07:39:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJzH6tw1SEhea9S0sMAXwTFR05ZoIkzygg2LbwnK7ihR8J6ezc8u8j/P+FxSPKXzjHHb4W1H X-Received: by 2002:a17:902:eb8c:: with SMTP id q12mr207061plg.131.1644853176552; Mon, 14 Feb 2022 07:39:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644853176; cv=none; d=google.com; s=arc-20160816; b=x8LZOWQNmhAEFXRJqlGacDg65Gj3ltgnV6QuhGKIReLwAWnDUvZIRcYgqQ6JRfKlwM vpxh/ymmQMf/LynP63byvltLMa8KXxYjrmbn9/6oU+7rKK+Tp8WxIjwnDhlhoKy4pdwd mkrLGwPl1iTReCFYiKuyHTOCRmyIGySe2lq3al9nzcyTycXRejWxT0J+LWV9wiEUUHEO pkfiY6EFJXhgPhAaIc63D7DLLn/LHnQNSultafF3M+MF47IdBVV4pxrmO4+kT8lRCxr1 KbbsB+DcpRxBUDYy2dCUWe567FbGAX9kjfSoJnB/rP6+qzGLGiXrOmePE1mr+jrVY5K/ UpTg== 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:dkim-signature; bh=J86av2Bkw6U2xVnT0WBv2YPqSRgcSeCjGVTPkPasr0k=; b=DAKq7vnsL11w6S2PXcGCszKfp/TkQWT8VQGwJbmB1qEAA3k4qOpo0eARBY3JTg5AkS 9tNrCjPdKmh/zMl2h5dMQWUY9FXMk+az+RVCGj6OE5p/4YHW25fZj5GdLbUcHvPjZ6Re UvC5xCcZKKXx54Zuip8N8rwvuxihum/hTqK96Xg+MdOlHOnQMoLkh2VUDe4WWDO1vhHu wH3mH0rrnAqqeuTtmrNTg9yMnj/UB/arc4fWm9G6pqgd2hmwkkc+2EgXiR95iY2ZqzNS uBZUQ+szU2l2pfdW5CKXtv4+eleF9RTkBhFRTS9WY/wDZ4qmZDh/Da76Ifnni8i0fsZL eHxw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FR+wCEoW; spf=pass (google.com: domain of mptcp+bounces-3719-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3719-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. [147.75.69.165]) by mx.google.com with ESMTPS id j17si14468648plx.316.2022.02.14.07.39.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Feb 2022 07:39:36 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3719-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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=FR+wCEoW; spf=pass (google.com: domain of mptcp+bounces-3719-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3719-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 B5B1D3E0F0A for ; Mon, 14 Feb 2022 15:39:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A7F9BA26; Mon, 14 Feb 2022 15:39:34 +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 6C3A67A for ; Mon, 14 Feb 2022 15:39:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644853172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=J86av2Bkw6U2xVnT0WBv2YPqSRgcSeCjGVTPkPasr0k=; b=FR+wCEoWZZJ/NC1QvbtIT5i1mSGDKV4hShxHunisyqKKjUaA5A92/0Qm/E67L5nMfETsy7 YoCoxtplzXiLPalIL5k+cOf4uLDnYEJ15c5nJniH4xNY+foOUVhko1D8BK4WGCVcogVc3e j/ubV/haH9dHllOK/pAFov2nmHLD93E= 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-195-Dx1plPEAPleIIqfdVNjY1Q-1; Mon, 14 Feb 2022 10:39:25 -0500 X-MC-Unique: Dx1plPEAPleIIqfdVNjY1Q-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E254F343C9 for ; Mon, 14 Feb 2022 15:39:24 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 552E22B598 for ; Mon, 14 Feb 2022 15:39:23 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v4 mptcp-next 2/3] mptcp: more careful RM_ADDR generation Date: Mon, 14 Feb 2022 16:38:56 +0100 Message-Id: <9ac38525eac5d4e812fd11f20125e28edd8514df.1644852970.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In some edge scenarios, an MPTCP subflows can use a local address mapped by a "implicit" endpoint created by the in-kernel path manager. When such endpoint is deleted, the in kernel PM sends a RM_ADDR MPTCP suboption. That is somewhat unexpected, as an MPTCP listener will keep accepting incoming subflows targeting such address and the unexpected options can confuse some self-tests. Be more conservative about RM_ADDR generation: explicitly track the implicit endpoint with an appropriate flag and exclude them from the RM_ADDR generation. Additionally allow the user-space to replace implicit endpoint with user-provided data at endpoint creation time. Signed-off-by: Paolo Abeni --- include/uapi/linux/mptcp.h | 1 + net/mptcp/pm_netlink.c | 42 ++++++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index f106a3941cdf..9690efedb5fa 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -81,6 +81,7 @@ enum { #define MPTCP_PM_ADDR_FLAG_SUBFLOW (1 << 1) #define MPTCP_PM_ADDR_FLAG_BACKUP (1 << 2) #define MPTCP_PM_ADDR_FLAG_FULLMESH (1 << 3) +#define MPTCP_PM_ADDR_FLAG_IMPLICIT (1 << 4) =20 enum { MPTCP_PM_CMD_UNSPEC, diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 56f5603c10f2..66cda3a425c4 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -901,8 +901,19 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm= _nl_pernet *pernet, list_for_each_entry(cur, &pernet->local_addr_list, list) { if (addresses_equal(&cur->addr, &entry->addr, address_use_port(entry) && - address_use_port(cur))) - goto out; + address_use_port(cur))) { + /* allow replacing the exiting endpoint only if such + * endpoint is an implicit one and the user-space + * did not provide an endpoint id + */ + if (!(cur->flags & MPTCP_PM_ADDR_FLAG_IMPLICIT)) + goto out; + if (entry->addr.id) + goto out; + + pernet->addrs--; + list_del_rcu(&entry->list); + } } =20 if (!entry->addr.id) { @@ -1036,7 +1047,7 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, = struct sock_common *skc) entry->addr.id =3D 0; entry->addr.port =3D 0; entry->ifindex =3D 0; - entry->flags =3D 0; + entry->flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; entry->lsk =3D NULL; ret =3D mptcp_pm_nl_append_new_local_addr(pernet, entry); if (ret < 0) @@ -1238,6 +1249,11 @@ static int mptcp_nl_cmd_add_addr(struct sk_buff *skb= , struct genl_info *info) return -EINVAL; } =20 + if (addr.flags & MPTCP_PM_ADDR_FLAG_IMPLICIT) { + GENL_SET_ERR_MSG(info, "can't create IMPLICIT endpoint"); + return -EINVAL; + } + entry =3D kmalloc(sizeof(*entry), GFP_KERNEL); if (!entry) { GENL_SET_ERR_MSG(info, "can't allocate addr"); @@ -1322,11 +1338,12 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_= sock *msk, } =20 static int mptcp_nl_remove_subflow_and_signal_addr(struct net *net, - struct mptcp_addr_info *addr) + const struct mptcp_pm_addr_entry *entry) { - struct mptcp_sock *msk; - long s_slot =3D 0, s_num =3D 0; + const struct mptcp_addr_info *addr =3D &entry->addr; struct mptcp_rm_list list =3D { .nr =3D 0 }; + long s_slot =3D 0, s_num =3D 0; + struct mptcp_sock *msk; =20 pr_debug("remove_id=3D%d", addr->id); =20 @@ -1346,7 +1363,8 @@ static int mptcp_nl_remove_subflow_and_signal_addr(st= ruct net *net, =20 lock_sock(sk); remove_subflow =3D lookup_subflow_by_saddr(&msk->conn_list, addr); - mptcp_pm_remove_anno_addr(msk, addr, remove_subflow); + mptcp_pm_remove_anno_addr(msk, addr, remove_subflow && + !(entry->flags & MPTCP_PM_ADDR_FLAG_IMPLICIT)); if (remove_subflow) mptcp_pm_remove_subflow(msk, &list); release_sock(sk); @@ -1443,7 +1461,7 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb,= struct genl_info *info) __clear_bit(entry->addr.id, pernet->id_bitmap); spin_unlock_bh(&pernet->lock); =20 - mptcp_nl_remove_subflow_and_signal_addr(sock_net(skb->sk), &entry->addr); + mptcp_nl_remove_subflow_and_signal_addr(sock_net(skb->sk), entry); synchronize_rcu(); __mptcp_pm_release_addr_entry(entry); =20 @@ -1458,9 +1476,11 @@ static void mptcp_pm_remove_addrs_and_subflows(struc= t mptcp_sock *msk, =20 list_for_each_entry(entry, rm_list, list) { if (lookup_subflow_by_saddr(&msk->conn_list, &entry->addr) && - alist.nr < MPTCP_RM_IDS_MAX && slist.nr < MPTCP_RM_IDS_MAX) { - alist.ids[alist.nr++] =3D entry->addr.id; + /* skip RM_ADDR for dummy endpoints */ + if (!(entry->flags & MPTCP_PM_ADDR_FLAG_IMPLICIT) && + alist.nr < MPTCP_RM_IDS_MAX) + alist.ids[alist.nr++] =3D entry->addr.id; slist.ids[slist.nr++] =3D entry->addr.id; } else if (remove_anno_list_by_saddr(msk, &entry->addr) && alist.nr < MPTCP_RM_IDS_MAX) { @@ -1811,7 +1831,7 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *skb= , struct genl_info *info) =20 spin_lock_bh(&pernet->lock); entry =3D __lookup_addr(pernet, &addr.addr, lookup_by_id); - if (!entry) { + if (!entry || (entry->flags & MPTCP_PM_ADDR_FLAG_IMPLICIT)) { spin_unlock_bh(&pernet->lock); return -EINVAL; } --=20 2.34.1 From nobody Thu May 2 13:28:09 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp53581jad; Mon, 14 Feb 2022 07:39:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwMqHc5YtvBI4HWdYxw0FotBOD6PBcRKcrMqsBRZh17HfI090bj8jTqj0eSb2QOrhs5/xms X-Received: by 2002:a17:902:d501:: with SMTP id b1mr338205plg.120.1644853177102; Mon, 14 Feb 2022 07:39:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644853177; cv=none; d=google.com; s=arc-20160816; b=DjrCqWTMH2xlKuaKZoX8bd/LrL5KHPUgfoq0GtURkQIcAfgewZ754oLEpFFynQS9in ryKJjpYRNxzJIjlpTysUUAe51AtKKobmmU10Gn+Qvt2bN1SiRXzR/ZXlecrURdr1g6x/ 8qZ8F7iN3jb7OSIUcMmxfjsr2DxpNElGE3dsl6Czne0XA14slwWIhZ0GwP8eYuBEb5gC DIf8hVXp4PYqSxRv6bT61buJonPc2rKp/1iLILWqgSLJSIYKeRU42kZ1hDHdLG4K7ZHg x89oF3Cah2iAa09WUu1GLUMxGSPdiaf8K0M1lAP80MJbHd5uirhThVonHV4fL7Y16DbA DMSw== 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:dkim-signature; bh=mXMsmFaXta3oWg5nuPCSVx577rlLT3nAIbkBlsoqENk=; b=WY5j+wl2xETxZWh+AMr9g2JxIZcBpRXXyCVXbzmbra0JAG9tUarau3y7P5Tu1E9tCs CMC3OJ1USLX69cyrMBJC88TUjw/Dk6S41wuZaNoMb0wvRVlfFD4bxkGX+jrm/Nz4zTK8 HAvvalvdtyYJWT9fBTEMaUcrU9RETNnomwt/v5jB5XNeUlPU+d3NUX71MRftvrOWKUqM 0E2uv7f+5DmsiKw7iGx1Kp5/wQm2mfcv2OW/Ni6g7gTCLpdwWoIbcbkWMSup7bJUSEKw KayDj21pvWfGyIaQy2eVj6sus2UNEyY0yKnDBlvIFqr9lSucfIvfV1ELqavbEKZZQVVB ZfBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="JW1R/ZUI"; spf=pass (google.com: domain of mptcp+bounces-3720-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3720-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 l13si9587pgq.411.2022.02.14.07.39.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Feb 2022 07:39:37 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3720-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="JW1R/ZUI"; spf=pass (google.com: domain of mptcp+bounces-3720-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3720-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 9EE993E0EC7 for ; Mon, 14 Feb 2022 15:39:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C1A6E7A; Mon, 14 Feb 2022 15:39:35 +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.133.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 9318BA25 for ; Mon, 14 Feb 2022 15:39:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644853173; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mXMsmFaXta3oWg5nuPCSVx577rlLT3nAIbkBlsoqENk=; b=JW1R/ZUIxVZcYEEoacLKoqer9ydUtE8YT6qRGGDXnJ0dB/QPGeUVrbPRqO7Omcvu01RPaF AEDBUP6qZCz251Jc++4hdpeI3HxhKcIoUQ8mEDl+84PoUGJcz3meKmL/E81nSco8uEuf7S GcsNm3e40Ql3CUuvGS0adrxx1BE2X2s= 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-368-qpNBEFFdN7O4BnFBEixRNQ-1; Mon, 14 Feb 2022 10:39:26 -0500 X-MC-Unique: qpNBEFFdN7O4BnFBEixRNQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D846B189DF41 for ; Mon, 14 Feb 2022 15:39:25 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C2E42B598 for ; Mon, 14 Feb 2022 15:39:25 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v4 mptcp-next 3/3] mptcp: strict local address ID selection. Date: Mon, 14 Feb 2022 16:38:57 +0100 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The address ID selection for MPJ subflows created in response to incoming ADD_ADDR option is currently unreliable: it happens at MPJ socket creation time, when the local address could be unknown. Additionally, if the no local endpoint is available for the local address, a new dummy endpoint is created, confusing the user-land. This change refactor the code to move the address ID seleciton inside the rebuild_header() helper, when the local address eventually selected by the route lookup is finally known. If the address used is not mapped by any endpoint - and thus can't be advertised/removed pick the id 0 instead of allocate a new endpoint. Signed-off-by: Paolo Abeni --- v3 -> v4: - really create endpoints in mptcp_pm_get_local_id() - Mat v2 -> v3: - keep creating dummy endpoint v1 -> v2: - hopefully fix build issue with ipv6 disabled - avoid looking-up multiple times the local_id for req sockets - factor-out an helper for local_id initialization RFC -> v1: - don't bail if ID lookup fails, use 0 instead --- net/mptcp/pm_netlink.c | 13 -------- net/mptcp/protocol.c | 3 ++ net/mptcp/protocol.h | 3 +- net/mptcp/subflow.c | 67 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 63 insertions(+), 23 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 66cda3a425c4..3686d4c803b6 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -83,16 +83,6 @@ static bool addresses_equal(const struct mptcp_addr_info= *a, return a->port =3D=3D b->port; } =20 -static bool address_zero(const struct mptcp_addr_info *addr) -{ - struct mptcp_addr_info zero; - - memset(&zero, 0, sizeof(zero)); - zero.family =3D addr->family; - - return addresses_equal(addr, &zero, true); -} - static void local_address(const struct sock_common *skc, struct mptcp_addr_info *addr) { @@ -1022,9 +1012,6 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, = struct sock_common *skc) if (addresses_equal(&msk_local, &skc_local, false)) return 0; =20 - if (address_zero(&skc_local)) - return 0; - pernet =3D net_generic(sock_net((struct sock *)msk), pm_nl_pernet_id); =20 rcu_read_lock(); diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 3324e1c61576..57caf470e500 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -117,6 +117,9 @@ static int __mptcp_socket_create(struct mptcp_sock *msk) list_add(&subflow->node, &msk->conn_list); sock_hold(ssock->sk); subflow->request_mptcp =3D 1; + + /* This is the first subflow, always with id 0 */ + subflow->local_id_valid =3D 1; mptcp_sock_graft(msk->first, sk->sk_socket); =20 return 0; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index a1ce1fd005ab..663b8d83154e 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -453,7 +453,8 @@ struct mptcp_subflow_context { rx_eof : 1, can_ack : 1, /* only after processing the remote a key */ disposable : 1, /* ctx can be free at ulp release time */ - stale : 1; /* unable to snd/rcv data, do not use for xmit */ + stale : 1, /* unable to snd/rcv data, do not use for xmit */ + local_id_valid : 1; /* local_id is correctly initialized */ enum mptcp_data_avail data_avail; u32 remote_nonce; u64 thmac; diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index b53b392dd280..283e5d57e003 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -481,6 +481,51 @@ static void subflow_finish_connect(struct sock *sk, co= nst struct sk_buff *skb) mptcp_subflow_reset(sk); } =20 +static void subflow_set_local_id(struct mptcp_subflow_context *subflow, in= t local_id) +{ + subflow->local_id =3D local_id; + subflow->local_id_valid =3D 1; +} + +static int subflow_chk_local_id(struct sock *sk) +{ + struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(sk); + struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); + int err; + + if (likely(subflow->local_id_valid)) + return 0; + + err =3D mptcp_pm_get_local_id(msk, (struct sock_common *)sk); + if (err < 0) + return err; + + subflow_set_local_id(subflow, err); + return 0; +} + +static int subflow_rebuild_header(struct sock *sk) +{ + int err =3D subflow_chk_local_id(sk); + + if (unlikely(err < 0)) + return err; + + return inet_sk_rebuild_header(sk); +} + +#if IS_ENABLED(CONFIG_MPTCP_IPV6) +static int subflow_v6_rebuild_header(struct sock *sk) +{ + int err =3D subflow_chk_local_id(sk); + + if (unlikely(err < 0)) + return err; + + return inet6_sk_rebuild_header(sk); +} +#endif + struct request_sock_ops mptcp_subflow_request_sock_ops; static struct tcp_request_sock_ops subflow_request_sock_ipv4_ops __ro_afte= r_init; =20 @@ -1403,13 +1448,8 @@ int __mptcp_subflow_connect(struct sock *sk, const s= truct mptcp_addr_info *loc, get_random_bytes(&subflow->local_nonce, sizeof(u32)); } while (!subflow->local_nonce); =20 - if (!local_id) { - err =3D mptcp_pm_get_local_id(msk, (struct sock_common *)ssk); - if (err < 0) - goto failed; - - local_id =3D err; - } + if (local_id) + subflow_set_local_id(subflow, local_id); =20 mptcp_pm_get_flags_and_ifindex_by_id(sock_net(sk), local_id, &flags, &ifindex); @@ -1434,7 +1474,6 @@ int __mptcp_subflow_connect(struct sock *sk, const st= ruct mptcp_addr_info *loc, pr_debug("msk=3D%p remote_token=3D%u local_id=3D%d remote_id=3D%d", msk, remote_token, local_id, remote_id); subflow->remote_token =3D remote_token; - subflow->local_id =3D local_id; subflow->remote_id =3D remote_id; subflow->request_join =3D 1; subflow->request_bkup =3D !!(flags & MPTCP_PM_ADDR_FLAG_BACKUP); @@ -1734,15 +1773,22 @@ static void subflow_ulp_clone(const struct request_= sock *req, new_ctx->token =3D subflow_req->token; new_ctx->ssn_offset =3D subflow_req->ssn_offset; new_ctx->idsn =3D subflow_req->idsn; + + /* this is the first subflow, id is always 0 */ + new_ctx->local_id_valid =3D 1; } else if (subflow_req->mp_join) { new_ctx->ssn_offset =3D subflow_req->ssn_offset; new_ctx->mp_join =3D 1; new_ctx->fully_established =3D 1; new_ctx->backup =3D subflow_req->backup; - new_ctx->local_id =3D subflow_req->local_id; new_ctx->remote_id =3D subflow_req->remote_id; new_ctx->token =3D subflow_req->token; new_ctx->thmac =3D subflow_req->thmac; + + /* the subflow req id is valid, fetched via subflow_check_req() + * and subflow_token_join_request() + */ + subflow_set_local_id(new_ctx, subflow_req->local_id); } } =20 @@ -1795,6 +1841,7 @@ void __init mptcp_subflow_init(void) subflow_specific.conn_request =3D subflow_v4_conn_request; subflow_specific.syn_recv_sock =3D subflow_syn_recv_sock; subflow_specific.sk_rx_dst_set =3D subflow_finish_connect; + subflow_specific.rebuild_header =3D subflow_rebuild_header; =20 tcp_prot_override =3D tcp_prot; tcp_prot_override.release_cb =3D tcp_release_cb_override; @@ -1807,6 +1854,7 @@ void __init mptcp_subflow_init(void) subflow_v6_specific.conn_request =3D subflow_v6_conn_request; subflow_v6_specific.syn_recv_sock =3D subflow_syn_recv_sock; subflow_v6_specific.sk_rx_dst_set =3D subflow_finish_connect; + subflow_v6_specific.rebuild_header =3D subflow_v6_rebuild_header; =20 subflow_v6m_specific =3D subflow_v6_specific; subflow_v6m_specific.queue_xmit =3D ipv4_specific.queue_xmit; @@ -1814,6 +1862,7 @@ void __init mptcp_subflow_init(void) subflow_v6m_specific.net_header_len =3D ipv4_specific.net_header_len; subflow_v6m_specific.mtu_reduced =3D ipv4_specific.mtu_reduced; subflow_v6m_specific.net_frag_header_len =3D 0; + subflow_v6m_specific.rebuild_header =3D subflow_rebuild_header; =20 tcpv6_prot_override =3D tcpv6_prot; tcpv6_prot_override.release_cb =3D tcp_release_cb_override; --=20 2.34.1