From nobody Mon Feb 9 01:48:27 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp1881706jam; Wed, 9 Feb 2022 01:47:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJymiFIFfRaM5hjahtl3uub30ZblYlWuxhtezNtCBXFf0Co0Labc0hl+2jNgQzV3BMnEsBMe X-Received: by 2002:a37:30e:: with SMTP id 14mr568066qkd.571.1644400068899; Wed, 09 Feb 2022 01:47:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644400068; cv=none; d=google.com; s=arc-20160816; b=goh/Id1vQ7n/R/qXwxskpVXXfnpdrytSYWF6a+WbXSJPHoiw+a3GWdbxe+Mhejz882 ZW2NBTSXssp6SiMg46+FVXNRzN+gPA7Qok3OgunOqGkMYJT8F2SevCdgbCV2QbgiQrF7 ZvWLuGUu7AXCxkqsV7gzZgBnIAF34EJ4/dt/g4lIuCfvHbPdXzKMb3BhJriHnFj+CbXI tFMaNEmLg+QCeSMxOxAK7/2ED9i9LUONEMAvOHudAWwJqYDBHnUJwW8UGe2h/J1rFGYG Dv8bAn+8YR0b1aA1fpeix9b6lj1OXTw1YtGVp/VAXeO6OhFDiAG2prf9TGLBo6ifOFYf ov8A== 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=rH5USFWdLZjhEFfoKpz9D+T6Eoe4ntVi1Mzlbs2xw60=; b=jXe6/p69WpzKArQyYIitMxmsDBOu2TogJHdSnUOJNLgPDn2Qty1mUQczxyE8cqYEHY EWSg9IdprVOBcowoRIaTvA6u1kvZ6KH7emv9Ecw89oeKdV+asD55fCbkcQ0EyJxLEPA1 sP7bYNihcwIijjn4er/pOsoPec6rBaWi2XFlu9qPSHqzxEjXG2GIsj2qVZoI30bO/aee D6PJlMdgYdLyAPy2epQ/zQzhu6t5tJDgufEHxiWy9uEcjPl5q2ohopd+i6DFWp8xNTph CFANKIwatLv+NZU5vKbt/OsdRhTRZGEveJOMu7RmDs6ZDdp57Grf8d9Z0z+by0mnAKoq c7QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QVLwz+A7; spf=pass (google.com: domain of mptcp+bounces-3563-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3563-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. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id x16si3629250qko.559.2022.02.09.01.47.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Feb 2022 01:47:48 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3563-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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QVLwz+A7; spf=pass (google.com: domain of mptcp+bounces-3563-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3563-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 9D74F1C0A44 for ; Wed, 9 Feb 2022 09:47:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5E3C22C80; Wed, 9 Feb 2022 09:47:45 +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 495B02CA2 for ; Wed, 9 Feb 2022 09:47:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1644400063; 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=rH5USFWdLZjhEFfoKpz9D+T6Eoe4ntVi1Mzlbs2xw60=; b=QVLwz+A7m2DkOMCt01AFfj1ZFZglS1y/5ZOiv3ZHiVgkKXn1PvJE6NYHke3Lxrr9cfr/OU UjqENASCP68WlKpczvCsr3U7ZyFDH4VUkjdllcxnAhZZtkudYGW8jIqcE3pHJ4HVYuMdFy 0xsCmJgmvDEVOMjuflmkIPuzqEeO5eM= 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-524-YoovWK5QMxedmYoohEZrDQ-1; Wed, 09 Feb 2022 04:47:42 -0500 X-MC-Unique: YoovWK5QMxedmYoohEZrDQ-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 565DF5AB7 for ; Wed, 9 Feb 2022 09:47:41 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.181]) by smtp.corp.redhat.com (Postfix) with ESMTP id BCB5428546 for ; Wed, 9 Feb 2022 09:47:40 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-net v3 4/4] selftests: mptcp: more robust signal race test Date: Wed, 9 Feb 2022 10:47:33 +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 in kernel MPTCP PM implementation can process a single incoming add address option at any given time. In the mentioned test the server can surpas such limit. Let the setup cope with that allowing a faster add_addr retransmission. Signed-off-by: Paolo Abeni --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 90a6adc36490..66ac990415e6 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -915,11 +915,17 @@ chk_add_nr() local mis_ack_nr=3D${8:-0} local count local dump_stats + local timeout + + timeout=3D`ip netns exec $ns1 sysctl -n net.mptcp.add_addr_timeout` =20 printf "%-${nr_blank}s %s" " " "add" - count=3D`ip netns exec $ns2 nstat -as | grep MPTcpExtAddAddr | awk '{prin= t $2}'` + count=3D`ip netns exec $ns2 nstat -as MPTcpExtAddAddr | grep MPTcpExtAddA= ddr | awk '{print $2}'` [ -z "$count" ] && count=3D0 - if [ "$count" !=3D "$add_nr" ]; then + + # if the test configured a short timeout tolerate greater then expected + # add addrs options, due to retransmissions + if [ "$count" !=3D "$add_nr" ] && [ "$timeout" -gt 1 -o "$count" -lt "$ad= d_nr" ]; then echo "[fail] got $count ADD_ADDR[s] expected $add_nr" ret=3D1 dump_stats=3D1 @@ -1311,6 +1317,7 @@ signal_address_tests() =20 # signal addresses race test reset + pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns2 4 4 pm_nl_add_endpoint $ns1 10.0.1.1 flags signal @@ -1321,7 +1328,10 @@ signal_address_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags signal pm_nl_add_endpoint $ns2 10.0.3.2 flags signal pm_nl_add_endpoint $ns2 10.0.4.2 flags signal - run_tests $ns1 $ns2 10.0.1.1 + + # the peer could possibly miss some addr notification, allow retransmissi= on + ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=3D1 + run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow chk_join_nr "signal addresses race test" 3 3 3 =20 # the server will not signal the address terminating --=20 2.34.1