From nobody Thu May 2 15:32:11 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp851036jad; Thu, 17 Feb 2022 13:45:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJw856vpLsa3Hd2K5icR6aTbm1K5sO3P2jQz53EHuiMpnfBea21IggECYabFqSuoUuBW/wdI X-Received: by 2002:a17:90b:4c50:b0:1b5:58fc:5f07 with SMTP id np16-20020a17090b4c5000b001b558fc5f07mr9285754pjb.94.1645134306762; Thu, 17 Feb 2022 13:45:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645134306; cv=none; d=google.com; s=arc-20160816; b=x1D1ayLWvgFmdjZOqaLlhIKaXebIJmJf7U3HGWRh0sJ0ULdglxOvsQGasw2GQPpN3Z u/I46Md1N4me8KqYQDlldmqCnxSge1ZbDtweLd/wrjLYW1muv/ov5v0bkZp5kXad2wS2 EK/gzgMWT7SsNsttFgPtFMlHF76kcPdb8ICXNwZBOxq8FZEP+LiXhgqYMjs+AVq2nHJT jylNLQogBuF8/fqhhR9wsFaquVVPKZtL71b2Y8WSkfdhQ+89HLZLM5If0gnc3c72Ybn2 BnlSqT80BIEVvyLtG7eZNrXNtWeR8IgJgfQl2usTbLSL3uNRaohm7LW5L+lxsZxIFdO1 RWog== 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=YgOFHWmmKOGZSAB7ZfDqkTFFOfv1EwuyUDi5VDFQ0hk=; b=OnSyLMS4ZHyVGYUDHf1p0n5Xw0z0cbiQ5YhWGreSs2sm4XABhx2ebI7tPRwmWj7ueZ c9HJPBk7NBkdl14n7UzVfD4owjt5WbeCJh/XJG7zJ4GnBLw3Kd+E5CJHwhAlf7KbTiir xtiwY1Gq12DjESZXI7xrhj+pAlEU6sZF8FjLlseDwZJ1FkXf0A6o4t20Sr/f9zPJ+mQD 5gizdHqWePN6TK+T7+2SAe5RzE62gOCUNx5ONmgUgwhBhCSSNWYUp16bRK61Nb3Il6UU 2qvwi5v2HDYrTWvGLUQzithdmLMVyazhxcnuUSsmvNu3iZ0kAziANpH21assT/5yJpir RkxA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Xv2IZ9bT; spf=pass (google.com: domain of mptcp+bounces-3822-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3822-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 l193si9281962pge.263.2022.02.17.13.45.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 13:45:06 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3822-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=Xv2IZ9bT; spf=pass (google.com: domain of mptcp+bounces-3822-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3822-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 26EFE3E0F84 for ; Thu, 17 Feb 2022 21:45:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 20DC44625; Thu, 17 Feb 2022 21:45:05 +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 D77281FD3 for ; Thu, 17 Feb 2022 21:45:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645134303; 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=YgOFHWmmKOGZSAB7ZfDqkTFFOfv1EwuyUDi5VDFQ0hk=; b=Xv2IZ9bTU/tvLcfu7rE8phmH2JxwTgbtMA6fH7gAFGRtfBT4Md+wgxGFF+X5h2Ym512rc4 /DTsaxvVY0PV+6v6DGqtvQqevJ0OZyX/DXxTpOcnXGR0fJlgw6EyW2AWOfIoXvagpBcznC zYN9oFVm5h1o3EbXr9vdA9h4Cm2Lu6U= 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-161-LktLvA2bPB2QQoBRurGRDA-1; Thu, 17 Feb 2022 16:44:53 -0500 X-MC-Unique: LktLvA2bPB2QQoBRurGRDA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E13B6814249 for ; Thu, 17 Feb 2022 21:44:52 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55AF645312 for ; Thu, 17 Feb 2022 21:44:51 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-next 1/4] mptcp: more careful RM_ADDR generation Date: Thu, 17 Feb 2022 22:44:11 +0100 Message-Id: <09b238d91c9f02ef154b5adcfbafc676ab6bc78b.1645134065.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.79 on 10.5.11.14 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 in-kernel MPTCP path manager, when processing the MPTCP_PM_CMD_FLUSH_AD= DR command, generates RM_ADDR events for each known local address. While that is allowed by the RFC, it makes unpredictable the exact number of RM_ADDR generated when both ends flush the PM addresses. This change restricts the RM_ADDR generation to previously explicitly announced addresses, and adjust the expected results in a bunch of related self-tests. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/pm_netlink.c | 10 ++++------ tools/testing/selftests/net/mptcp/mptcp_join.sh | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 56f5603c10f2..619746611110 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1458,14 +1458,12 @@ static void mptcp_pm_remove_addrs_and_subflows(stru= ct 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; + slist.nr < MPTCP_RM_IDS_MAX) slist.ids[slist.nr++] =3D entry->addr.id; - } else if (remove_anno_list_by_saddr(msk, &entry->addr) && - alist.nr < MPTCP_RM_IDS_MAX) { + + if (remove_anno_list_by_saddr(msk, &entry->addr) && + alist.nr < MPTCP_RM_IDS_MAX) alist.ids[alist.nr++] =3D entry->addr.id; - } } =20 if (alist.nr) { diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b48b11714817..6f16337409e3 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1577,7 +1577,7 @@ remove_tests() run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush subflows and signal" 3 3 3 chk_add_nr 1 1 - chk_rm_nr 2 2 + chk_rm_nr 1 1 invert =20 # subflows flush reset @@ -1588,7 +1588,7 @@ remove_tests() pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow chk_join_nr "flush subflows" 3 3 3 - chk_rm_nr 3 3 + chk_rm_nr 0 3 =20 # addresses flush reset @@ -1884,7 +1884,7 @@ add_addr_ports_tests() run_tests $ns1 $ns2 10.0.1.1 0 -8 -2 slow chk_join_nr "flush subflows and signal with port" 3 3 3 chk_add_nr 1 1 - chk_rm_nr 2 2 + chk_rm_nr 1 1 invert =20 # multiple addresses with port reset --=20 2.34.1 From nobody Thu May 2 15:32:11 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp850977jad; Thu, 17 Feb 2022 13:45:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkHrWXcy9v9bCzJRLRjTTZLAt/l7QNLsjxuA/SzHGgQGmeUW6EKxFPHxUeMUwigNSohQSB X-Received: by 2002:a05:622a:1820:b0:2d4:e473:d69d with SMTP id t32-20020a05622a182000b002d4e473d69dmr4181920qtc.623.1645134301874; Thu, 17 Feb 2022 13:45:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645134301; cv=none; d=google.com; s=arc-20160816; b=oAXs+sA1ulby7IT4jo2MaWmldlc+QbQZs3jf3RDvEqGW2HPbBgiM4JK4B5urOeI2OG mEQ3bJdbriEK4ZF1exZP4cpilGBcew6ESimM4FMdS4LjwmAWK3S025zPxOtDN+K/aDhq 9MddHbWR9qWlvoLf1uJXr6waZiCwrb1ot6HFj5w3EUIW+gCcYwHyhJUtJj9QTCSF++eg 6p96YC/fdMcmUG/WVCe0aEuJn+/BHzgOGpYn5PHkhxXyZ0y9tQsO8iIrL7DEHjGnOrzk WNT5Xx8J0mCVoRwCKx/BsBX4dZ35HFX8UrPr+Y+RI5i4/yrQYulUjMTjMrkbYBoMwoZg 0XiQ== 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=QBQR2Q/3YGZHJOkOX0gjkQLxVWn2naaTBsFiPscPD8c=; b=q0BGxA69DH3PDm8y0EjBIFERgFbqzdLIqyE3SmrwCc2f9ayhbZtU7XIRgbfUpea7sa S8CqsLoHsVWdyH6idsaYCjdfyOgEGxo8gwOABsWjPQ4rumujoj3XwiKW+0IGKbWvtfqH tQ8GRDQkgf1iIRN35nSrOnE9Obg+sKNI8UAWcNKrYQ7eox34KyQm19lR+g9bRJQNcUtN JmkSSRZrr8R9BvP2rT/ObQzsKQ1RQQLv5V498H/pcjdIZD6F8HQYyxz0v1miHuhGHInQ /mq2qzbbClce9SvjutOjznyViF3IeLkfPYWsVLzfNPdZIUO5bEkJG8QONE4kgYlXWDwz jgYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UwU+fxQj; spf=pass (google.com: domain of mptcp+bounces-3819-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3819-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id p2si6738134qvm.582.2022.02.17.13.45.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 13:45:01 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3819-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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UwU+fxQj; spf=pass (google.com: domain of mptcp+bounces-3819-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3819-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 842331C0C5F for ; Thu, 17 Feb 2022 21:45:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 410514626; Thu, 17 Feb 2022 21:45:00 +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 882D21FD3 for ; Thu, 17 Feb 2022 21:44:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645134297; 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=QBQR2Q/3YGZHJOkOX0gjkQLxVWn2naaTBsFiPscPD8c=; b=UwU+fxQjz1GTDCJBBB0z1SVq6u/Z09IHSbmXeJP6kexVGWx6EDY6FM18Uigs002MxaDjcj B+41xRg+Pf92I3n+GiqxwQlfG0mzeXCIqv5i2/zMeIIDS+VzjS2Hi8SCJ7V2lq4I8+tBnl sC4t+b/6GQ6WOGvVUj9o+dT7Ual7u4c= 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-611--P_97MFjMqGEHoY5pxBrsg-1; Thu, 17 Feb 2022 16:44:55 -0500 X-MC-Unique: -P_97MFjMqGEHoY5pxBrsg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 23CA015720 for ; Thu, 17 Feb 2022 21:44:54 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4776445312 for ; Thu, 17 Feb 2022 21:44:53 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-next 2/4] mptcp: introduce implicit endpoints Date: Thu, 17 Feb 2022 22:44:12 +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.79 on 10.5.11.14 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. Such endpoints presence can be confusing, as it's creation is hard to track and will prevent the later endpoint creation from the user-space using the same address. Define a new endpoint flag to mark implicit endpoints and allow the user-space to replace implicit them with user-provided data at endpoint creation time. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- v4 -> v5: - fixed a few book-keeping issues detected by the paired self-test --- include/uapi/linux/mptcp.h | 1 + net/mptcp/pm_netlink.c | 61 +++++++++++++------ .../testing/selftests/net/mptcp/mptcp_join.sh | 4 +- 3 files changed, 47 insertions(+), 19 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 619746611110..3bbc5f9b1983 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -877,10 +877,18 @@ static bool address_use_port(struct mptcp_pm_addr_ent= ry *entry) MPTCP_PM_ADDR_FLAG_SIGNAL; } =20 +/* caller must ensure the RCU grace period is already elapsed */ +static void __mptcp_pm_release_addr_entry(struct mptcp_pm_addr_entry *entr= y) +{ + if (entry->lsk) + sock_release(entry->lsk); + kfree(entry); +} + static int mptcp_pm_nl_append_new_local_addr(struct pm_nl_pernet *pernet, struct mptcp_pm_addr_entry *entry) { - struct mptcp_pm_addr_entry *cur; + struct mptcp_pm_addr_entry *cur, *del_entry =3D NULL; unsigned int addr_max; int ret =3D -EINVAL; =20 @@ -901,8 +909,22 @@ 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--; + entry->addr.id =3D cur->addr.id; + list_del_rcu(&cur->list); + del_entry =3D cur; + break; + } } =20 if (!entry->addr.id) { @@ -938,6 +960,12 @@ static int mptcp_pm_nl_append_new_local_addr(struct pm= _nl_pernet *pernet, =20 out: spin_unlock_bh(&pernet->lock); + + /* just replaced an existing entry, free it */ + if (del_entry) { + synchronize_rcu(); + __mptcp_pm_release_addr_entry(del_entry); + } return ret; } =20 @@ -1036,7 +1064,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 +1266,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 +1355,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 +1380,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); @@ -1359,14 +1394,6 @@ static int mptcp_nl_remove_subflow_and_signal_addr(s= truct net *net, return 0; } =20 -/* caller must ensure the RCU grace period is already elapsed */ -static void __mptcp_pm_release_addr_entry(struct mptcp_pm_addr_entry *entr= y) -{ - if (entry->lsk) - sock_release(entry->lsk); - kfree(entry); -} - static int mptcp_nl_remove_id_zero_address(struct net *net, struct mptcp_addr_info *addr) { @@ -1443,7 +1470,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 diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 6f16337409e3..913866d5d570 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1819,7 +1819,7 @@ backup_tests() run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup chk_join_nr "single address, backup" 1 1 1 chk_add_nr 1 1 - chk_prio_nr 1 0 + chk_prio_nr 1 1 =20 # single address with port, backup reset @@ -1829,7 +1829,7 @@ backup_tests() run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup chk_join_nr "single address with port, backup" 1 1 1 chk_add_nr 1 1 - chk_prio_nr 1 0 + chk_prio_nr 1 1 } =20 add_addr_ports_tests() --=20 2.34.1 From nobody Thu May 2 15:32:11 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp850999jad; Thu, 17 Feb 2022 13:45:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJyYCPTJtQrK141eO8j6zhFMjE9cf8QykaCuSOcLkciNXrblU2TLdtXAcxF6aapKduSUVLgr X-Received: by 2002:a63:d63:0:b0:36c:670d:b6c9 with SMTP id 35-20020a630d63000000b0036c670db6c9mr3801357pgn.343.1645134303838; Thu, 17 Feb 2022 13:45:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645134303; cv=none; d=google.com; s=arc-20160816; b=x0a8Soh4XYhjd7HbK0nZhUNiGnHMnjz5GSWUp1cE3hNstvWBUuNmMF3K3M115JrHgu ZeopqjgB5iXlufbiVIV7OT63Hx3fvecNvpgA4niz6fkozYAHZCsL2kimN19niW+E7vfo y1AwlhJ+dHU//fhmGB5C9bQtjORRXLyBiFOVgh10rMT4td9cEUD7TYKFUXQkjOlMT5Ss 5ky2pFyABOoHZmKbl7QCE/nT3dn0dTNp2Lwt0CXmQRW4+p66ps3frkRkPbYe5eXEwq7G BGADn74FF4Z7i1XcG0hzwTYMpmtk/G8jDLiqKL28g1KbbVXKTzEO9LSAAQE4Cs8HIYX7 WjFg== 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=Drkmdhign2FA0bAQW7DtutOJlrlLWcpMBzLkiOhDWoI=; b=s3bGE9LkCf5ct29SyzwXXOqvD6HdD3cAmKiChWStpBqU5EHfKk4q9OAhRWopV+IFQo HXUu5RXB9RsvkGZZQlMVZjOomPda9BWbMeUacLwkHH9WpEHDRd+d+MDcMACDpSgv9avt 7jV2/GlGJ1G56d0vqXHwkQXBIHTEuhmBJ/AMcpPQ0MFor86dmM/mmF8mJc7cJFmG31mM JTZeeChapDqNP8B7Xk2gFJjIeVPtA+SXAHhDmxAvDLoyJRjlRAPXgVcZtdLYZ7HAct8M gTipp4AdKdLjmeHz6OzQfLJP3kJd2BefJnz5l/FxcIQB/2nGmf5BUPkbk/eoUs0d4OcG kLFg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=hEtddg5p; spf=pass (google.com: domain of mptcp+bounces-3821-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3821-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 i1si21389869plr.524.2022.02.17.13.45.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 13:45:03 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3821-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=hEtddg5p; spf=pass (google.com: domain of mptcp+bounces-3821-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3821-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 631EF3E0F48 for ; Thu, 17 Feb 2022 21:45:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8321D4625; Thu, 17 Feb 2022 21:45:01 +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 96CF03D6A for ; Thu, 17 Feb 2022 21:44:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645134298; 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=Drkmdhign2FA0bAQW7DtutOJlrlLWcpMBzLkiOhDWoI=; b=hEtddg5pr3aIF85Knw29iQm6Xzt6kZ28KG+OS1SIgF1wTUnGgLL6mAw7KN6RW7m/uo8zzV DX4+2Q7YKIHYrfCFbHN+yoQ4LMFc4IAt5xjoFfAgrPbF7n3IyQJG2YhiSo17ihROHy2EbG kThvcQDYvcydLVRoPoUs5q2FOtRvy1I= 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-673-4js0qs_xP2KHXnrrxHIkIA-1; Thu, 17 Feb 2022 16:44:56 -0500 X-MC-Unique: 4js0qs_xP2KHXnrrxHIkIA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 16F06814243 for ; Thu, 17 Feb 2022 21:44:55 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AB0945312 for ; Thu, 17 Feb 2022 21:44:54 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-next 3/4] mptcp: strict local address ID selection. Date: Thu, 17 Feb 2022 22:44:13 +0100 Message-Id: <2e61762e19ec5eaf1c75dd8a478f2e5e93e9b42b.1645134065.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.79 on 10.5.11.14 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 Reviewed-by: Mat Martineau --- 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 3bbc5f9b1983..a0e7d5b7e22f 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) { @@ -1039,9 +1029,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 4599bde215b2..bf5af6bf8756 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 18ca0248c084..c8bada4537e2 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 e727d838da0e..c05c19f92532 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 From nobody Thu May 2 15:32:11 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:bd2:0:0:0:0 with SMTP id g18csp850992jad; Thu, 17 Feb 2022 13:45:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJyJLDMiN2xSw14JqOsdTrF0gN1n7q5/AO+1wRzoE3gKDVVbeySN4a/XMP/2VRrpdmz/C/hn X-Received: by 2002:a62:d158:0:b0:4e1:5807:5ee6 with SMTP id t24-20020a62d158000000b004e158075ee6mr4759436pfl.46.1645134303213; Thu, 17 Feb 2022 13:45:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1645134303; cv=none; d=google.com; s=arc-20160816; b=xw5SacC5qJlFrgBqH9WJjkNsISgFt9yhtIi01zyWXGWtbi8Fyjrbx4qHSPleW1yWJo C94SWBI9cMqiJagQKlYMzKjB+uNQl4HcTclf9KqYwruDncQ6KAABiG7nb6eHzqidd67w JwRm9wvWcN/UeylMbLfSLVlbZLlfnM30zHWUM6kcv+W2pPgF2z9Au2L9fVMFknS9XAWA M8FuZIZi7gWZ16kMTNDM1hN7JmHEkAKM6nG04G2M8u0S+LDdexjBFrLeggxfRuPzW/jt UTv38SMvB8/4WSQ8XFWa2y6Ofr0soegxpt18bwuzuq/BVaREItbqz6FyxHk0DZ3+IYXE 8u0Q== 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=MDxtmpkjdaEaEPOBBZxTL283xP61OodFJWQs9REG3b8=; b=o613St05mwQA8kCDLI+zypn+AVPj/Rtc37rdvpuoiATMFX85QqKSVUsi8VmZQFcvhJ aopidVKJl9mmaOXmzU3YIWXJvjalUAFicHmGu4aheMQVK57bf0LW2tn4Qxsw2hpyMs++ iiThp/nL86yb2HUOLazMoCZgDgHWptA7JQyckj/d4ogWuFdLgiT/AGY1ucYsdE1CXIX7 p4k5+VQ/33ACJKm2gYDIaO3V1yUCZWnqQH4IsOQ3jwTUoMuNrlfmZnvTfvpwlUGXX6XY 0nHFH5glGvAfUr7NKUwhP8fFpsym5/uCpRJckdg0kC22Rt7uQiZLJeAlzFux5e06VfJp Xo2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=HhPyLC1Y; spf=pass (google.com: domain of mptcp+bounces-3820-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3820-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 s127si9440848pgs.683.2022.02.17.13.45.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Feb 2022 13:45:03 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3820-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=HhPyLC1Y; spf=pass (google.com: domain of mptcp+bounces-3820-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3820-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 5F3AC3E0FDC for ; Thu, 17 Feb 2022 21:45:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9FB214627; Thu, 17 Feb 2022 21:45:00 +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 33A214625 for ; Thu, 17 Feb 2022 21:44:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645134298; 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=MDxtmpkjdaEaEPOBBZxTL283xP61OodFJWQs9REG3b8=; b=HhPyLC1YGw+JsYXRUZivV/GdjO8hZ4S1MXRn6SOoEd9fun3OCp/UZ1VxtKyQRG+f+0GTr5 BHM7TawLYKb2+bQpP2i8NtBYoDZQiGgT7KFFlMyNnLZPN6llX2f5r9zo5l0a70bUq4yzI6 UEWIUvhe2LxMb8H1fqBsX+YTZ3dS/Yo= 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-52-LkQWin9RM3C77-8NLGaddw-1; Thu, 17 Feb 2022 16:44:56 -0500 X-MC-Unique: LkQWin9RM3C77-8NLGaddw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0C0FF18C8C00 for ; Thu, 17 Feb 2022 21:44:56 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.122]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6FEF95E26B for ; Thu, 17 Feb 2022 21:44:55 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v5 mptcp-next 4/4] selftests: mptcp: add implicit endpoint test case Date: Thu, 17 Feb 2022 22:44:14 +0100 Message-Id: <25749985f541eff90e537d56abeff5c289639384.1645134065.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.79 on 10.5.11.14 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" Ensure implicit endpoint are created when expected and that the user-space can update them Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 111 +++++++++++++++++- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 7 ++ 2 files changed, 117 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 913866d5d570..9414a1c62fe0 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -413,6 +413,76 @@ pm_nl_change_endpoint() fi } =20 +pm_nl_check_endpoint() +{ + local line expected_line + local msg=3D"$1" + local addr=3D$3 + local ns=3D$2 + local _flags=3D"" + local flags + local _port + local port + local dev + local _id + local id + + TEST_COUNT=3D$((TEST_COUNT + 1)) + printf "%03u %-40s" "$TEST_COUNT" "$msg" + + shift 3 + while [ -n "$1" ]; do + if [ $1 =3D "flags" ]; then + _flags=3D$2 + [ ! -z $_flags ]; flags=3D"flags $_flags" + shift + elif [ $1 =3D "dev" ]; then + [ ! -z $2 ]; dev=3D"dev $1" + shift + elif [ $1 =3D "id" ]; then + _id=3D$2 + [ ! -z $_id ]; id=3D"id $_id" + shift + elif [ $1 =3D "port" ]; then + _port=3D$2 + [ ! -z $_port ]; port=3D" port $_port" + shift + fi + + shift + done + + if [ -z "$id" ]; then + echo "[skip] bad test - missing endpoint id" + return + fi + + if [ $ip_mptcp -eq 1 ]; then + line=3D$(ip -n $ns mptcp endpoint show $id) + # the dump order is: address id flags port dev + expected_line=3D"$addr" + [ -n "$addr" ] && expected_line=3D"$expected_line $addr" + expected_line=3D"$expected_line $id" + [ -n "$_flags" ] && expected_line=3D"$expected_line ${_flags//","/" "}" + [ -n "$dev" ] && expected_line=3D"$expected_line $dev" + [ -n "$port" ] && expected_line=3D"$expected_line $port" + else + line=3D$(ip netns exec $ns ./pm_nl_ctl get $_id) + # the dump order is: id flags dev address port + expected_line=3D"$id" + [ -n "$flags" ] && expected_line=3D"$expected_line $flags" + [ -n "$dev" ] && expected_line=3D"$expected_line $dev" + [ -n "$addr" ] && expected_line=3D"$expected_line $addr" + [ -n "$_port" ] && expected_line=3D"$expected_line $_port" + fi + if [ "$line" =3D "$expected_line" ]; then + echo "[ ok ]" + else + echo "[fail] expected '$expected_line' found '$line'" + ret=3D1 + fi +} + do_transfer() { listener_ns=3D"$1" @@ -2203,6 +2273,41 @@ userspace_tests() chk_rm_nr 0 0 } =20 +wait_mpj() +{ + local ns=3D"${1}" + local old_cnt=3D$(ip netns exec ${ns} nstat -as | grep MPJoinAckRx | awk = '{print $2}') + + for i in $(seq 10); do + cnt=3D$(ip netns exec ${ns} nstat -as | grep MPJoinAckRx | awk '{print $= 2}') + [ "$cnt" =3D "${old_cnt}" ] || break + sleep 0.1 + done +} + +implicit_tests() +{ + # userspace pm type prevents add_addr + reset + pm_nl_set_limits $ns1 2 2 + pm_nl_set_limits $ns2 2 2 + pm_nl_add_endpoint $ns1 10.0.2.1 flags signal + run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow & + + wait_mpj $ns1 + pm_nl_check_endpoint "implicit EP creation" \ + $ns2 10.0.2.2 id 1 flags implicit + + pm_nl_add_endpoint $ns2 10.0.2.2 id 33 + pm_nl_check_endpoint "implicit EP ID change is prevented" \ + $ns2 10.0.2.2 id 1 flags implicit + + pm_nl_add_endpoint $ns2 10.0.2.2 flags signal + pm_nl_check_endpoint "implicit EP modification is allowed" \ + $ns2 10.0.2.2 id 1 flags signal + wait +} + all_tests() { subflows_tests @@ -2221,6 +2326,7 @@ all_tests() deny_join_id0_tests fullmesh_tests userspace_tests + implicit_tests } =20 # [$1: error message] @@ -2279,7 +2385,7 @@ if [ $do_all_tests -eq 1 ]; then exit $ret fi =20 -while getopts 'fesltra64bpkdmuchCSi' opt; do +while getopts 'fesltra64bpkdmuchCSiI' opt; do case $opt in f) subflows_tests @@ -2335,6 +2441,9 @@ while getopts 'fesltra64bpkdmuchCSi' opt; do ;; i) ;; + I) + implicit_tests + ;; h) usage ;; diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 22a5ec1e128e..a75a68ad652e 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -436,6 +436,13 @@ static void print_addr(struct rtattr *attrs, int len) printf(","); } =20 + if (flags & MPTCP_PM_ADDR_FLAG_IMPLICIT) { + printf("implicit"); + flags &=3D ~MPTCP_PM_ADDR_FLAG_IMPLICIT; + if (flags) + printf(","); + } + /* bump unknown flags, if any */ if (flags) printf("0x%x", flags); --=20 2.34.1