From nobody Wed Apr 24 12:23:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp480148uad; Fri, 8 Jul 2022 10:14:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tnf2X8gM+iEctVXwZcmwCx/nj+1sQeeKjYeLolI2ORVoSX/+qmvY+NnX3/vs8sDJW9aQcT X-Received: by 2002:a17:90a:5d8b:b0:1ef:8659:92ab with SMTP id t11-20020a17090a5d8b00b001ef865992abmr944561pji.7.1657300462683; Fri, 08 Jul 2022 10:14:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657300462; cv=none; d=google.com; s=arc-20160816; b=KpdPQi1N7gZu4fvBkFy1JPUTE2lsiqMbvnrp1iiJi2XTzuiVCuJkNIrNjRcbH1jwIS tfBphfvvOpckGIstjMHNwgb5cFMsJaU77uLs9bp1oYXQUm5LXzM105NDZiw/4qiv9Skc 4fg2qW7DwfRncFfVdbuzxLypfV9V0gY2zT2StgUy/QByBeKuYLwarf7IdmRdxATB2U20 +C6YtSoDXo0jfAGhjSUgD+YEe6ru1rnSYzusl23bRdokptLQ/Hv26MZPKgJd2tA8jyZe DmxGuOYu0w46HgCxZwSJF+bA8GZ6d+W6oDEp9sFyAPGjNrM+CLv58+VczrUxy3VEaZze t3XA== 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:dkim-signature; bh=dNwHHMn6RB3N7myAozf+I7xckitF16Hmf44OmssNwoY=; b=F76whPtnH0b7VvV4WON9siEDt+z6LYMcfBW8rCHXU6ZGs44RSyThnptuyZrUKuSZ1n liLPZ9KK2duWjgpJiPmzf7oxV6OaxJmaYqUjPoIrYzPE0/uZH10Lgu8Ylbc86uqt8ijn TuYSil4hM4llPA3PeZSXiJaLbWJJTa8pJhOu+vVPVaHADlJPpl/K749CfS9C4+yEsDru dXyqlRRCM92kNxG1FSReHYCMQKDJ/JtdpwIzslpaAfIr84yj385DFs+NSVc268UZ74my Eyhq9rwOFfDwDA1RKyFMgVACPO1RZih2Nkd0ZsH7uyWkP29orDy+/4mnGMYm1tMvQs4f xe2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gp2Nvm3C; spf=pass (google.com: domain of mptcp+bounces-5985-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5985-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id a192-20020a6390c9000000b00415c679f6dcsi600058pge.180.2022.07.08.10.14.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2022 10:14:22 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5985-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=gp2Nvm3C; spf=pass (google.com: domain of mptcp+bounces-5985-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5985-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 590E3280BE8 for ; Fri, 8 Jul 2022 17:14:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 45B0C3239; Fri, 8 Jul 2022 17:14:21 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 0E45E3229 for ; Fri, 8 Jul 2022 17:14:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657300460; x=1688836460; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=wvwoov0ZtEtx5i1pjqAsOc7JoLHCC2rk2TZrjCa1l7A=; b=gp2Nvm3C3nfRRGmvFlmsTVqMT6RUf3fyQ4nHTjqEXq3M8vAE7CgwZKLn GxRJ95rx5ksBNddYlWOtPQfUzuB6V5nm40TpyqEJH2L4zZsMbC4g90rDL VGnaKKy9fOhtLes/Vj8gA8hN28N3m6D/T3pGd9O+HCFPZUttFC15jVPby PJY0Bc8Rrdj4lLKTzZ1/tXuwHXlPcQ6eMVhNJVnOi5FrSTwllCEYM1iZv Jl38rVXCQFFedidLhE4eSwA04zp+YMsWoJjtne3+Umff8PkfzecaoOuhW 1S4WbfHsFmlCn0e2WzhCnxfNqabFuzUI7PGK2lIAcr3VyDFZSizOfXz1p w==; X-IronPort-AV: E=McAfee;i="6400,9594,10402"; a="285069092" X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="285069092" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:18 -0700 X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="651641497" Received: from aroras-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.1.203]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:17 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 1/6] mptcp: move MPTCPOPT_HMAC_LEN to net/mptcp.h Date: Fri, 8 Jul 2022 10:14:08 -0700 Message-Id: <20220708171413.327112-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220708171413.327112-1-mathew.j.martineau@linux.intel.com> References: <20220708171413.327112-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: Geliang Tang Move macro MPTCPOPT_HMAC_LEN definition from net/mptcp/protocol.h to include/net/mptcp.h. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- include/net/mptcp.h | 3 ++- net/mptcp/protocol.h | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 4d761ad530c9..ac9cf7271d46 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -39,6 +39,7 @@ struct mptcp_ext { infinite_map:1; }; =20 +#define MPTCPOPT_HMAC_LEN 20 #define MPTCP_RM_IDS_MAX 8 =20 struct mptcp_rm_list { @@ -89,7 +90,7 @@ struct mptcp_out_options { u32 nonce; u32 token; u64 thmac; - u8 hmac[20]; + u8 hmac[MPTCPOPT_HMAC_LEN]; }; }; #endif diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 480c5320b86e..07871e10e510 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -83,7 +83,6 @@ =20 /* MPTCP MP_JOIN flags */ #define MPTCPOPT_BACKUP BIT(0) -#define MPTCPOPT_HMAC_LEN 20 #define MPTCPOPT_THMAC_LEN 8 =20 /* MPTCP MP_CAPABLE flags */ --=20 2.37.0 From nobody Wed Apr 24 12:23:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp480170uad; Fri, 8 Jul 2022 10:14:24 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vCt3+jhAdok1V1u/84QjQgJs9ZN+5DLlfKl9qQlzodoAUPzOPKEVbw4rBzQuSQkVqUmv1z X-Received: by 2002:a05:620a:4081:b0:6af:31c6:c1d3 with SMTP id f1-20020a05620a408100b006af31c6c1d3mr3252793qko.733.1657300464113; Fri, 08 Jul 2022 10:14:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657300464; cv=none; d=google.com; s=arc-20160816; b=Iqk5IgbH39DAFaIOdkBA5RDXGYCH8OA7XyWQ8AY5YcX5a6bjUpP//pFH3N92DBott6 RKLg5cYhaK9R2UBdXzi1rO8Gf9s0CGJwCVDqG4n7ju4D4cXocDg4VffnUF0LRbtMPL35 OZmHA0uyuj217/PE92SYnI/2QRJEAwEQpnz9GNOcYsGWK6EW0dxwwhkTwaGnYQlJfJQx ff8M52BSJ0PUGr7nRo7avpIKhynNnuSKQxMCrFn7Xb1VCT6Y2BltN2M4Jhm4X2JiJLrt sjar8zhvBBbh8m6v3IKdqF6wW0uvctRpNLCCQ2LfzEvMotP1KEScJ66zJ55plo8UKgqt 7rsg== 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:dkim-signature; bh=nIi3ZCJ8L6e/fcyARU+yUYij/zvM/R5pCIR6FMtfxZE=; b=ZiqDnsVTAkX0EQvAEloLuZtTn4nEoQkXiaXdy59hOMbcw1teQpk6Ek2mEjcegP/DNr y0+n990Ib9BgQR1X/0l1LsxTeDzM6PsB+YzbYeq2Awq8IwriIR1nmJXN3WGveW42poCm 4R0gOYqU1pH+Gl2IN+805FJNSRSpNTQ2IjlPhP/Vy5b/Oq9fckxNTkLyVAPqtUnsL8Vq KiiEmEf/AUh3628z9WSFjk3ipyIO5i2DHlp1LVq2zQ18SaiNGCR56yvhjuJgRzQ8I0i9 pzsK+jkVbR0OftJY6zo2wsd/ouyLJLCwTmpDhvCN5CWeP+d/XQkIfI3jt3IN0X8Iu9kv PEDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=n+P8dGIe; spf=pass (google.com: domain of mptcp+bounces-5986-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5986-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id h5-20020a05620a400500b006b554b09de5si3961012qko.160.2022.07.08.10.14.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2022 10:14:24 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5986-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=n+P8dGIe; spf=pass (google.com: domain of mptcp+bounces-5986-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5986-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (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 ny.mirrors.kernel.org (Postfix) with ESMTPS id EE6EE1C208C0 for ; Fri, 8 Jul 2022 17:14:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0A30833CE; Fri, 8 Jul 2022 17:14:22 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 2270A3238 for ; Fri, 8 Jul 2022 17:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657300460; x=1688836460; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dDFcKsL9kB1Uqm+n86u6isMH3J6Z2PbdfW1/uIBATOc=; b=n+P8dGIefs65IFTfPn9M4TeBwe+DcU5gbdwD/JU4wY8o/SM8lp7tUGQo C4bLodU7WPdK9Au7G8hfZMPgJ8z2B1xSNdX1p/5enC2TKrCNtF64uoi6a ky0jWZc3wRp8SdI0Aq0sqQKWMey49mX5dNI4X1cCZN7wWk2zkJnfeY6nL xz9glcT2OXmyP8t40YXxeBZ6rIGnQwzUdeRQtNu9BT+BOoyPy175PYoO3 gxQyWY0QikvdEk/ygzzJYeydI2oPfsYvtx2F/LVsKhg1icGpxcPRIACbG DmCiFQgwy/5IvHg52GkXqBLB5t5T2pVvQvON7nrMxsUwZCxEAdkOd5QZr Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10402"; a="285069095" X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="285069095" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:18 -0700 X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="651641498" Received: from aroras-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.1.203]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:18 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Paolo Abeni , davem@davemloft.net, kuba@kernel.org, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 2/6] selftests: mptcp: tweak simult_flows for debug kernels Date: Fri, 8 Jul 2022 10:14:09 -0700 Message-Id: <20220708171413.327112-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220708171413.327112-1-mathew.j.martineau@linux.intel.com> References: <20220708171413.327112-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: Paolo Abeni The mentioned test measures the transfer run-time to verify that the user-space program is able to use the full aggregate B/W. Even on (virtual) link-speed-bound tests, debug kernel can slow down the transfer enough to cause sporadic test failures. Instead of unconditionally raising the maximum allowed run-time, tweak when the running kernel is a debug one, and use some simple/ rough heuristic to guess such scenarios. Note: this intentionally avoids looking for /boot/config- as the latter file is not always available in our reference CI environments. Signed-off-by: Paolo Abeni Co-developed-by: Mat Martineau Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/simult_flows.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index f441ff7904fc..ffa13a957a36 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -12,6 +12,7 @@ timeout_test=3D$((timeout_poll * 2 + 1)) test_cnt=3D1 ret=3D0 bail=3D0 +slack=3D50 =20 usage() { echo "Usage: $0 [ -b ] [ -c ] [ -d ]" @@ -52,6 +53,7 @@ setup() cout=3D$(mktemp) capout=3D$(mktemp) size=3D$((2 * 2048 * 4096)) + dd if=3D/dev/zero of=3D$small bs=3D4096 count=3D20 >/dev/null 2>&1 dd if=3D/dev/zero of=3D$large bs=3D4096 count=3D$((size / 4096)) >/dev/nu= ll 2>&1 =20 @@ -104,6 +106,16 @@ setup() ip -net "$ns3" route add default via dead:beef:3::2 =20 ip netns exec "$ns3" ./pm_nl_ctl limits 1 1 + + # debug build can slow down measurably the test program + # we use quite tight time limit on the run-time, to ensure + # maximum B/W usage. + # Use kmemleak/lockdep/kasan/prove_locking presence as a rough + # estimate for this being a debug kernel and increase the + # maximum run-time accordingly. Observed run times for CI builds + # running selftests, including kbuild, were used to determine the + # amount of time to add. + grep -q ' kmemleak_init$\| lockdep_init$\| kasan_init$\| prove_locking$' = /proc/kallsyms && slack=3D$((slack+550)) } =20 # $1: ns, $2: port @@ -241,7 +253,7 @@ run_test() =20 # mptcp_connect will do some sleeps to allow the mp_join handshake # completion (see mptcp_connect): 200ms on each side, add some slack - time=3D$((time + 450)) + time=3D$((time + 400 + slack)) =20 printf "%-60s" "$msg" do_transfer $small $large $time --=20 2.37.0 From nobody Wed Apr 24 12:23:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp480180uad; Fri, 8 Jul 2022 10:14:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sVu0BTgzBMF/FFXCzqpS7vYfv4RlpoK1Qp4oVyXiHY165uROsygBN0D44isefKPlmylpGi X-Received: by 2002:a63:4524:0:b0:412:a2ee:eaf4 with SMTP id s36-20020a634524000000b00412a2eeeaf4mr4038362pga.41.1657300465277; Fri, 08 Jul 2022 10:14:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657300465; cv=none; d=google.com; s=arc-20160816; b=qS6STVbvkMDA33Mb1tiyV3rkBDZwChL2yJ0C3Ho0UCSOhJ1Ot7NVXUPIhwanoZm045 EvDga9HxLlLzjjJTRjYlt1LBHezJ8I9hdwisvvddaW+nKx1wUdb9c1JxAvEcHBXxJcRc 9lXWXRZft/HnoV5p2jLS5lrYGiwzJsf8UhF7AVV0SLJvxAtn+CL9M8k4OcjXjZIpoJ5/ GvvS7TbpcaQKJhnotvsKZpKaQlk/80GaJNluR1Xzsw4S4XQjCNtv5hbogrJ6KPEcXELP Twu2z0Pxrp8VPHm1u3/Nfc2ef6Yf9lsGtnPRDRQLeNWU1oRxI5WEiwGcBuuZttYQGk3J vKFg== 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:dkim-signature; bh=vNdFTlAXchv6fk0wLLj6TuB1t9UZnZ5s7IIvj2XE8Qg=; b=Y/0AfHq3rGRKrTxWNGKSfel3OzYbfRbBNUAPXThkgD8c+ZPRVfmqYQt8tLY6wwijA6 u+Z+IAM2N4QlifLTJuPYFXU5Vgb6054aKO6F00Rm8qWImUS/M1sEYrnieTh6219aAxU3 zmZOmXNu0basxImOjPqPosTYJEb8eeLEVkf4DMfw1pXV3wXSz2OgTH6a0QQIyjwUNaj2 zQ8SgFYNPWz940/nyreXJureYGmHWV2gPo+LZYqVioz8MOFtfQau1As62vm0uUWOo64m 8Od3yr4xU7D1MrZ/LUv/5sc/oh5fqwG5bJPFOm2M6c2oGYDEyxoVM9O46T7uzV8pohWR 9OnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EHJmphvd; spf=pass (google.com: domain of mptcp+bounces-5987-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5987-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id x9-20020a1709029a4900b0016bf246e333si14254842plv.617.2022.07.08.10.14.25 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2022 10:14:25 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5987-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=EHJmphvd; spf=pass (google.com: domain of mptcp+bounces-5987-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5987-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (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 sv.mirrors.kernel.org (Postfix) with ESMTPS id B89C9280ACA for ; Fri, 8 Jul 2022 17:14:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A5CA233D1; Fri, 8 Jul 2022 17:14:22 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 57A583229 for ; Fri, 8 Jul 2022 17:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657300461; x=1688836461; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DQFTa2o7tX8z6E5Yqben/xtRbWyD1sotbqs9kP1vAWI=; b=EHJmphvdpFgq+EhL8tvIX8kBr4O1UaMFLHYEhn9PhaYVbZxXUSKnjVLC kRn89peFaT/UNXXmZI1BBgp6gy8gK4BpkhXpkKmDEG0g46hzbAFCXGk2O 8YABVotzk2LziCcTkaA+A6DkvFK4dDI35Xz8M6hXO+iH1oPUWu8f8YaUe 4GwV3x1siCVRKum0FzmNfMo04e9TBMuTuGVibcU4SXvad1vlfjVVt0zbC djjJi8hUvZzhgazDGxstT1qckCKTXbt4g29BIQQhKb4eUWx9+kzvAACkB w9+q1Lc4gJwQRz0EuHU8wo8riciOevRpoJuQ4eCquIhm1xJzq9X1+NqbR Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10402"; a="285069096" X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="285069096" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:19 -0700 X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="651641504" Received: from aroras-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.1.203]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:18 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 3/6] selftests: mptcp: userspace pm address tests Date: Fri, 8 Jul 2022 10:14:10 -0700 Message-Id: <20220708171413.327112-4-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220708171413.327112-1-mathew.j.martineau@linux.intel.com> References: <20220708171413.327112-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: Geliang Tang This patch adds userspace pm tests support for mptcp_join.sh script. Add userspace pm add_addr and rm_addr test cases in userspace_tests(). Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 49 ++++++++++++++++++- 1 file changed, 48 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 a4406b7a8064..d889e7507cd9 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -455,6 +455,12 @@ wait_mpj() done } =20 +kill_wait() +{ + kill $1 > /dev/null 2>&1 + wait $1 2>/dev/null +} + pm_nl_set_limits() { local ns=3D$1 @@ -654,6 +660,9 @@ do_transfer() =20 local port=3D$((10000 + TEST_COUNT - 1)) local cappid + local userspace_pm=3D0 + local evts_ns1 + local evts_ns1_pid =20 :> "$cout" :> "$sout" @@ -690,12 +699,24 @@ do_transfer() extra_args=3D"-r ${speed:6}" fi =20 + if [[ "${addr_nr_ns1}" =3D "userspace_"* ]]; then + userspace_pm=3D1 + addr_nr_ns1=3D${addr_nr_ns1:10} + fi + if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then # disconnect extra_args=3D"$extra_args -I ${addr_nr_ns2:10}" addr_nr_ns2=3D0 fi =20 + if [ $userspace_pm -eq 1 ]; then + evts_ns1=3D$(mktemp) + :> "$evts_ns1" + ip netns exec ${listener_ns} ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & + evts_ns1_pid=3D$! + fi + local local_addr if is_v6 "${connect_addr}"; then local_addr=3D"::" @@ -748,6 +769,8 @@ do_transfer() if [ $addr_nr_ns1 -gt 0 ]; then local counter=3D2 local add_nr_ns1=3D${addr_nr_ns1} + local id=3D10 + local tk while [ $add_nr_ns1 -gt 0 ]; do local addr if is_v6 "${connect_addr}"; then @@ -755,9 +778,18 @@ do_transfer() else addr=3D"10.0.$counter.1" fi - pm_nl_add_endpoint $ns1 $addr flags signal + if [ $userspace_pm -eq 0 ]; then + pm_nl_add_endpoint $ns1 $addr flags signal + else + tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns1") + ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id + sleep 1 + ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id + fi + counter=3D$((counter + 1)) add_nr_ns1=3D$((add_nr_ns1 - 1)) + id=3D$((id + 1)) done elif [ $addr_nr_ns1 -lt 0 ]; then local rm_nr_ns1=3D$((-addr_nr_ns1)) @@ -890,6 +922,11 @@ do_transfer() kill $cappid fi =20 + if [ $userspace_pm -eq 1 ]; then + kill_wait $evts_ns1_pid + rm -rf $evts_ns1 + fi + NSTAT_HISTORY=3D/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \ nstat | grep Tcp > /tmp/${listener_ns}.out NSTAT_HISTORY=3D/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \ @@ -2810,6 +2847,16 @@ userspace_tests() chk_join_nr 0 0 0 chk_rm_nr 0 0 fi + + # userspace pm add & remove address + if reset "userspace pm add & remove address"; then + set_userspace_pm $ns1 + pm_nl_set_limits $ns2 1 1 + run_tests $ns1 $ns2 10.0.1.1 0 userspace_1 0 slow + chk_join_nr 1 1 1 + chk_add_nr 1 1 + chk_rm_nr 1 1 invert + fi } =20 endpoint_tests() --=20 2.37.0 From nobody Wed Apr 24 12:23:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp480200uad; Fri, 8 Jul 2022 10:14:26 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vYcMe9JTKp3h5PaPX8rK58JkUM7yGloAUldUjTHWyJq9+IRA5mb1Rcueg+r6Kq6nAzL92B X-Received: by 2002:ac8:5dd1:0:b0:31d:34db:e0d with SMTP id e17-20020ac85dd1000000b0031d34db0e0dmr4000911qtx.592.1657300466487; Fri, 08 Jul 2022 10:14:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657300466; cv=none; d=google.com; s=arc-20160816; b=n0t45L0pz9uiUmYEBIXjEEpq6B9LE09nPHQ4/QD+XnM7w6MgtNbp6sYhT96UJVsMHS 7x9rv2atRdhx/qGYpXnygH9BXx3sOplWUvEKh5ccV8+IDz9vm+lYMR7vjxwchGx1ZjIi 3SxwlfFbOx6tkkQD9QgAC4xIbfKDtPb1oZWNhqVni9rJ6WFNxPa3tQTIiLJXehVKbilu oF3FkZI2Cf7XBGA9WWMJETC1VVF6KJeh1A0Q7gcLdZ1pu7j9xnlG4/45FiOcwmm52J98 5SW71daY+oQPcCX4U325SU99W5OTFy4owp3ttRGbNOq4FuUgYQBG31WYEus2lmV6/Iwk Kn5w== 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:dkim-signature; bh=FjuRGpLXw1E4wmnQZPJYnqKphdjp6yVjpvyW01zTUsw=; b=m9pqWMib/6WTRZaY7Ok361Rmnbge0tbUBUnYAR5Hys6IVxg0zurkpvM7qrC1SIpU0S x+T/OUAbvqatSkL/S6PcRg71is26FcaoVo8jpphnIxQIiM2G1HFk2z5oQtLolofsx/lF NyFCdoRqsZtP6ls2DcOceP8kqDQknZuHnDWTn7z1D4OYqopQEoilKstp6Kgq1vo3gI9r 5mgVJELwKFUGDpAQDWNfKjHIZ7lRWJ5k6Q8KtrHguSTeeFz+/9TpQlYTh3eMo8g2PeYi PcFkYxk+n3rmkv6vTkz6GfV/AjxC6Awq8n1bkW2i0+V1Yo4ngXlJ/iBymRHXPeE2sDMq +/kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="n/VxM/2A"; spf=pass (google.com: domain of mptcp+bounces-5988-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-5988-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id bb30-20020a05622a1b1e00b0031e9dba6284si2810645qtb.575.2022.07.08.10.14.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2022 10:14:26 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5988-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="n/VxM/2A"; spf=pass (google.com: domain of mptcp+bounces-5988-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-5988-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 311271C20944 for ; Fri, 8 Jul 2022 17:14:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D5C333D4; Fri, 8 Jul 2022 17:14:23 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 935E8323C for ; Fri, 8 Jul 2022 17:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657300461; x=1688836461; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=hGuJQcWGX80+CC/bcE33cZMqB9MmIQkT5cBply9gaiw=; b=n/VxM/2AxZ+QKa7Np4SSgMvmhVGUVAL7dlriXOkzDNQRGGYxC/azDwrr R8zQ6VF4k/dLiCV8NsZs1wcvgFc+PuTvHJQYaBfe8ALteNtpNleI0P2lF BA4t1H0z/J/9m6IC1sarKTOWRTbv5Dw9WndKdeD4uXi9vP25JbDpRV/OL Gk+98so5xnZ3IBb5Kun1T0rBcX6OgUhWAx/XHcd44MC8HHfL71fy1/IRT GY5miB/sMP0oRcTzombR4EqrPf2qcITBNn8ycUX6XQOuz1kraEZ/GkbCR +aRBk1STZOlzS//vBrrC6e4z/5oXQsZphQ7wt+9wMne2wKcxv/IkrmFq8 w==; X-IronPort-AV: E=McAfee;i="6400,9594,10402"; a="285069100" X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="285069100" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:19 -0700 X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="651641506" Received: from aroras-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.1.203]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:19 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 4/6] selftests: mptcp: userspace pm subflow tests Date: Fri, 8 Jul 2022 10:14:11 -0700 Message-Id: <20220708171413.327112-5-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220708171413.327112-1-mathew.j.martineau@linux.intel.com> References: <20220708171413.327112-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: Geliang Tang This patch adds userspace pm subflow tests support for mptcp_join.sh script. Add userspace pm create subflow and destroy test cases in userspace_tests(). Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../testing/selftests/net/mptcp/mptcp_join.sh | 39 ++++++++++++++++++- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index d889e7507cd9..55efe2aafb84 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -663,6 +663,8 @@ do_transfer() local userspace_pm=3D0 local evts_ns1 local evts_ns1_pid + local evts_ns2 + local evts_ns2_pid =20 :> "$cout" :> "$sout" @@ -708,13 +710,20 @@ do_transfer() # disconnect extra_args=3D"$extra_args -I ${addr_nr_ns2:10}" addr_nr_ns2=3D0 + elif [[ "${addr_nr_ns2}" =3D "userspace_"* ]]; then + userspace_pm=3D1 + addr_nr_ns2=3D${addr_nr_ns2:10} fi =20 if [ $userspace_pm -eq 1 ]; then evts_ns1=3D$(mktemp) + evts_ns2=3D$(mktemp) :> "$evts_ns1" + :> "$evts_ns2" ip netns exec ${listener_ns} ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & evts_ns1_pid=3D$! + ip netns exec ${connector_ns} ./pm_nl_ctl events >> "$evts_ns2" 2>&1 & + evts_ns2_pid=3D$! fi =20 local local_addr @@ -836,6 +845,8 @@ do_transfer() if [ $addr_nr_ns2 -gt 0 ]; then local add_nr_ns2=3D${addr_nr_ns2} local counter=3D3 + local id=3D20 + local tk da dp sp while [ $add_nr_ns2 -gt 0 ]; do local addr if is_v6 "${connect_addr}"; then @@ -843,9 +854,23 @@ do_transfer() else addr=3D"10.0.$counter.2" fi - pm_nl_add_endpoint $ns2 $addr flags $flags + if [ $userspace_pm -eq 0 ]; then + pm_nl_add_endpoint $ns2 $addr flags $flags + else + tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + da=3D$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") + dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + ip netns exec ${connector_ns} ./pm_nl_ctl csf lip $addr lid $id \ + rip $da rport $dp token $tk + sleep 1 + sp=3D$(grep "type:10" "$evts_ns2" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ + rip $da rport $dp token $tk + fi counter=3D$((counter + 1)) add_nr_ns2=3D$((add_nr_ns2 - 1)) + id=3D$((id + 1)) done elif [ $addr_nr_ns2 -lt 0 ]; then local rm_nr_ns2=3D$((-addr_nr_ns2)) @@ -924,7 +949,8 @@ do_transfer() =20 if [ $userspace_pm -eq 1 ]; then kill_wait $evts_ns1_pid - rm -rf $evts_ns1 + kill_wait $evts_ns2_pid + rm -rf $evts_ns1 $evts_ns2 fi =20 NSTAT_HISTORY=3D/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \ @@ -2857,6 +2883,15 @@ userspace_tests() chk_add_nr 1 1 chk_rm_nr 1 1 invert fi + + # userspace pm create destroy subflow + if reset "userspace pm create destroy subflow"; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 1 + run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow + chk_join_nr 1 1 1 + chk_rm_nr 0 1 + fi } =20 endpoint_tests() --=20 2.37.0 From nobody Wed Apr 24 12:23:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp480214uad; Fri, 8 Jul 2022 10:14:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1spEXbyhBbpil88NxwnhbPNhPj8ROfHCQ0vUumWKWiGWPBDZh06xS3labTEULJwtrkDApb+ X-Received: by 2002:a05:620a:489c:b0:6af:4a7a:52d with SMTP id ea28-20020a05620a489c00b006af4a7a052dmr3069277qkb.573.1657300467591; Fri, 08 Jul 2022 10:14:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657300467; cv=none; d=google.com; s=arc-20160816; b=h9nrDjbymGns+vqFTiz0Axq6+JOYSnQeKXqbz8SFhmxwz2j7Nc3/nKSl9WyFMUKPd0 OSR1USYcTk4COlrSFP/Tpb4x4cNjio+elBcmG0ZLB23LQ0qb3QGE11hMjgBbqxlzCBCP I5QbIX/EIiyPFrXFfK6ybhQ2mS91vhvMTofCbwGRkcIA0uXB1O9G0/pGnbERtJ1VnGzl 1FP/6O1WRE1JmWx1BWU65C6jr9JUwcoWk67/gJ8JMa3PCpw3+zzBktUH5BHO64fHb+3v fmbsaZiL3osQOna3CsdpNBerqSk1BHpkhGpAH73L+m3EpSk4Hiszizci5CZcw/ytaZ9/ j9wg== 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:dkim-signature; bh=aZSmnsJGi5emiIeZ3lQtXW+GWY9UuZqup+CPHvuURb4=; b=qxKiexnHfuOw7Nj6kztL3V52HLuGUlJYtxCwTiY1AmHV9wbDtArmWUMqngYI3UuehN cfltjuqmBPgNnPUT9h1k3Tv7xCYAxBRvIczdCTcJLtcIsi3MpzWX2KalI9AFB991F3nG rEGElhWN9NQPZswtL33Yaks1omtjHy5i77RLAR2JTb8dJzJ5W07lK3uf4xUK3nNz82uZ 7oSx2iVYKmiogSeWrCrG1nKcb4RJQUuiB07rBxBmJAdfOP6lVVN3JMakN/Z+JDjKCpk1 iGy/nsr8+WBG1tac4pMC66W/mLbEv3oX8RmzOtjByg+ARhCTMxNYpKsXBjWuHV8UuFq2 UAxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZusCFmSb; spf=pass (google.com: domain of mptcp+bounces-5989-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-5989-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id bb30-20020a05622a1b1e00b0031e9dba6284si2810645qtb.575.2022.07.08.10.14.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2022 10:14:27 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5989-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZusCFmSb; spf=pass (google.com: domain of mptcp+bounces-5989-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-5989-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 625841C20925 for ; Fri, 8 Jul 2022 17:14:27 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 36C8133D5; Fri, 8 Jul 2022 17:14:23 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 0314D33CC for ; Fri, 8 Jul 2022 17:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657300462; x=1688836462; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0Y3ODIlrpwkLL50TGSGUaZwVDIT7lYbj4rnRycY3o4w=; b=ZusCFmSbYvrL1hBcT/2OBNqGMrpOGLuHLLnHaS6/5wl/VUoSIOcXoL1Q v7wTVjvFKqXgZXj4bC/wN1Wnh08JfDdcySrgi9OC42nKsEAg437Aht6rK XA4Sbq7Z3qQGkeXjgFtkmvZSkJZZnmbJuKZZ7vzThtRHEoC6Ec/vB4zbw h8MS1oopdqDeoAu2FVDVd4PSxHoFh6olUnP1azcc/hGbrvRCc0j1c8A7n DGMLuq7KVfE4BGbuhiALlZZqx/ev+bZDagBqm01vKnfHYA2sdwz8wDQhE zkSaZu6LTTSTyEz4GeWte/4t6jqSDXgLj2h6Y2JAg4IiwQICloUYK8M0D g==; X-IronPort-AV: E=McAfee;i="6400,9594,10402"; a="285069102" X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="285069102" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:20 -0700 X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="651641507" Received: from aroras-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.1.203]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:19 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 5/6] selftests: mptcp: avoid Terminated messages in userspace_pm Date: Fri, 8 Jul 2022 10:14:12 -0700 Message-Id: <20220708171413.327112-6-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220708171413.327112-1-mathew.j.martineau@linux.intel.com> References: <20220708171413.327112-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: Geliang Tang There're some 'Terminated' messages in the output of userspace pm tests script after killing './pm_nl_ctl events' processes: Created network namespaces ns1, ns2 [OK] ./userspace_pm.sh: line 166: 13735 Terminated ip netns exec "$= ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 ./userspace_pm.sh: line 172: 13737 Terminated ip netns exec "$= ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 Established IPv4 MPTCP Connection ns2 =3D> ns1 [OK] ./userspace_pm.sh: line 166: 13753 Terminated ip netns exec "$= ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 ./userspace_pm.sh: line 172: 13755 Terminated ip netns exec "$= ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 Established IPv6 MPTCP Connection ns2 =3D> ns1 [OK] ADD_ADDR 10.0.2.2 (ns2) =3D> ns1, invalid token [OK] This patch adds a helper kill_wait(), in it using 'wait $pid 2>/dev/null' commands after 'kill $pid' to avoid printing out these Terminated messages. Use this helper instead of using 'kill $pid'. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- .../selftests/net/mptcp/userspace_pm.sh | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/test= ing/selftests/net/mptcp/userspace_pm.sh index abe3d4ebe554..3229725b64b0 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -37,6 +37,12 @@ rndh=3D$(stdbuf -o0 -e0 printf %x "$sec")-$(mktemp -u XX= XXXX) ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" =20 +kill_wait() +{ + kill $1 > /dev/null 2>&1 + wait $1 2>/dev/null +} + cleanup() { echo "cleanup" @@ -48,16 +54,16 @@ cleanup() kill -SIGUSR1 $client4_pid > /dev/null 2>&1 fi if [ $server4_pid -ne 0 ]; then - kill $server4_pid > /dev/null 2>&1 + kill_wait $server4_pid fi if [ $client6_pid -ne 0 ]; then kill -SIGUSR1 $client6_pid > /dev/null 2>&1 fi if [ $server6_pid -ne 0 ]; then - kill $server6_pid > /dev/null 2>&1 + kill_wait $server6_pid fi if [ $evts_pid -ne 0 ]; then - kill $evts_pid > /dev/null 2>&1 + kill_wait $evts_pid fi local netns for netns in "$ns1" "$ns2" ;do @@ -153,7 +159,7 @@ make_connection() sleep 1 =20 # Capture client/server attributes from MPTCP connection netlink events - kill $client_evts_pid + kill_wait $client_evts_pid =20 local client_token local client_port @@ -165,7 +171,7 @@ make_connection() client_port=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2= /p;q' "$client_evts") client_serverside=3D$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit= :]]*\).*$/\2/p;q'\ "$client_evts") - kill $server_evts_pid + kill_wait $server_evts_pid server_token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\= 2/p;q' "$server_evts") server_serverside=3D$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit= :]]*\).*$/\2/p;q'\ "$server_evts") @@ -286,7 +292,7 @@ test_announce() verify_announce_event "$evts" "$ANNOUNCED" "$server4_token" "10.0.2.2"\ "$client_addr_id" "$new4_port" =20 - kill $evts_pid + kill_wait $evts_pid =20 # Capture events on the network namespace running the client :>"$evts" @@ -321,7 +327,7 @@ test_announce() verify_announce_event "$evts" "$ANNOUNCED" "$client4_token" "10.0.2.1"\ "$server_addr_id" "$new4_port" =20 - kill $evts_pid + kill_wait $evts_pid rm -f "$evts" } =20 @@ -416,7 +422,7 @@ test_remove() sleep 0.5 verify_remove_event "$evts" "$REMOVED" "$server6_token" "$client_addr_id" =20 - kill $evts_pid + kill_wait $evts_pid =20 # Capture events on the network namespace running the client :>"$evts" @@ -449,7 +455,7 @@ test_remove() sleep 0.5 verify_remove_event "$evts" "$REMOVED" "$client6_token" "$server_addr_id" =20 - kill $evts_pid + kill_wait $evts_pid rm -f "$evts" } =20 @@ -553,7 +559,7 @@ test_subflows() "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 local sport sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") @@ -592,7 +598,7 @@ test_subflows() "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -631,7 +637,7 @@ test_subflows() "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -647,7 +653,7 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\ "$client4_token" > /dev/null 2>&1 =20 - kill $evts_pid + kill_wait $evts_pid =20 # Capture events on the network namespace running the client :>"$evts" @@ -674,7 +680,7 @@ test_subflows() "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created - kill $listener_pid> /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -713,7 +719,7 @@ test_subflows() "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -750,7 +756,7 @@ test_subflows() "10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "= ns1" =20 # Delete the listener from the server ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -766,7 +772,7 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\ "$server4_token" > /dev/null 2>&1 =20 - kill $evts_pid + kill_wait $evts_pid rm -f "$evts" } =20 --=20 2.37.0 From nobody Wed Apr 24 12:23:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp480234uad; Fri, 8 Jul 2022 10:14:28 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u2V6tuBIgM+Pryqaehfwu7ZrZabU+2wTkWx0BgQXQWdYUAWSZCWR+fo+JiGTAz6hkfwoFX X-Received: by 2002:a05:6808:b22:b0:337:8c1e:dfb8 with SMTP id t2-20020a0568080b2200b003378c1edfb8mr504592oij.184.1657300468788; Fri, 08 Jul 2022 10:14:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657300468; cv=none; d=google.com; s=arc-20160816; b=cf/ilkTItz508XYgsxacPp/k3r+23GnGzROGnbF2gyZB5KmdVYHZW7s6qkzNUk1071 fLGL5QK4xFhmeSwzAby2YuDGQktIdZWFh5DoPn9OUN5/WGb6aigYejhMYWFjAtUKOHs+ pKonU8Se11WX8nli6Qnl0+OAC2cihVUGpuWzIsBvgYbjtDX9tuCnM1IEG+I2Fb38S08l b3tZIz3S2cOwsuD/bPsgxWDZsPFDzltj1vVtnIscFWz2aGgsARfAxhwHCRG0LLtcRG7B XI6ao9cLV3wvb6Re+JTIHA/MxM6ferMVfaT+xBXz8JCYGvu5XYLiFPrRQRTcaQqd+DaE 4Z2g== 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:dkim-signature; bh=qI4ogldJiDsvdWQwRHn4j1Fr45KSrcYUAYsNEXPSuCU=; b=z97xOPdx/tQXscgzTIv8IDb1aUoBymdxuIQQySBQF8QKgf4hscy/O9wBuU6dwYRV6h 4BemheNo7dgbye3JnOQiv6jA+cvXuVNLDvB7GgE/nECBtKg64LCXL4oSpFaprTB8fI2M 23AX0eFpMbl8GBrvKuZSP2rDzy0+gLLSo7KxcTEWekLdSEqU1Txi3NfO3/1KscDMfhFO XKpxejh3aiPvWZSS3xOF5SY0EkY1SZb0r7oIbqKI8kORm8/Dyo+UlxDvDllNZoKxhkYB scr+vUfmrN71oWYRIiHPA+uC1rFdURii+LK1tWkZNQiMosFvkWtgzwu8C6nYaaj2q50Q QErA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=inhPm1dB; spf=pass (google.com: domain of mptcp+bounces-5990-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5990-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id a8-20020a056830008800b00616b55f62d2si46219466oto.222.2022.07.08.10.14.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Jul 2022 10:14:28 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5990-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=inhPm1dB; spf=pass (google.com: domain of mptcp+bounces-5990-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5990-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 5C0DB280BFE for ; Fri, 8 Jul 2022 17:14:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BD47033CC; Fri, 8 Jul 2022 17:14:23 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) (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 A96A433D2 for ; Fri, 8 Jul 2022 17:14:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657300462; x=1688836462; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=khkwPk/CnUj8fSk953hczeRged9KSBy6ZNMvRMBn4ng=; b=inhPm1dBRC3FAELYx4CT6Rpe1tT0SHXon74j7EscaNbx06jSwurGbQcp uI6gRzkR5M+NYooksQkeSefB+w9dteLn0/dpD9ulZguHt7lrvJXRjDxMl ZL/7/JFCBsS1/WdSwVMuI18p/LfBPqmKKQYazZXpEo6MUpqfVH1YR1Qlm NB65XkzydjeSgHC/c6t/FbRRvSOvsUGq8klHKo5JUKjwVClBhpWhFeywt HBLCDvcxKcNu3d+Bo4u7hVHtsZ5QRRcthyTRvSh79ar8P+v0Lkoct0Qay haYxSgnEqhRJ8Fwtt5C6S72CFSz2rjGnWfmrq79zPE7c7b5uNOyzTm+P6 Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10402"; a="285069105" X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="285069105" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:20 -0700 X-IronPort-AV: E=Sophos;i="5.92,256,1650956400"; d="scan'208";a="651641509" Received: from aroras-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.1.203]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Jul 2022 10:14:19 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 6/6] selftests: mptcp: update pm_nl_ctl usage header Date: Fri, 8 Jul 2022 10:14:13 -0700 Message-Id: <20220708171413.327112-7-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220708171413.327112-1-mathew.j.martineau@linux.intel.com> References: <20220708171413.327112-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: Geliang Tang The usage header of pm_nl_ctl command doesn't match with the context. So this patch adds the missing userspace PM keywords 'ann', 'rem', 'csf', 'dsf', 'events' and 'listen' in it. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index cb79f0719e3b..abddf4c63e79 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -31,7 +31,7 @@ =20 static void syntax(char *argv[]) { - fprintf(stderr, "%s add|get|set|del|flush|dump|accept []\n", argv[0= ]); + fprintf(stderr, "%s add|ann|rem|csf|dsf|get|set|del|flush|dump|events|lis= ten|accept []\n", argv[0]); fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [= dev ] \n"); fprintf(stderr, "\tann id token [port ] [dev ]\n"); fprintf(stderr, "\trem id token \n"); --=20 2.37.0