From nobody Mon Apr 29 08:31:25 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp3907087uad; Tue, 5 Jul 2022 16:51:54 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u5LtFWg/NgQCgijwUv2k1UpYZ7qGzRkg6xuhi47Sp04Ewp3ULLgz12YmgYfXF3Dxo8Xl7q X-Received: by 2002:a05:620a:1a0b:b0:6af:33c1:1e4 with SMTP id bk11-20020a05620a1a0b00b006af33c101e4mr25831341qkb.377.1657065114450; Tue, 05 Jul 2022 16:51:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657065114; cv=none; d=google.com; s=arc-20160816; b=VhHUp0+P48L/oYbo21Y0P5941cViTc2YWbJXVK1SqKPhj0uvL0sO4OK1P+uAnW90oN Z3HOyVqB2kHvTKsLsiJtB9g4DiYXq9mnlS1TsYc3gMQBP4M/NQoLfwriRN/VotP33HqA +SQWToAdR+Mpym/sIuPxzt+Kn1D3j2JQRC2GpmhSM8Ea2/xfNHUGMvmQgvkrLM3lgh7o VMGyULUp5jyU/pKWm+0A1JzKYipneDnliEpJLln3qoB6rIvhETdHNAuYJrBl/XdyyrbB 0E866XOk0uwjUhsCTf0H2rd3ebv7iK2jYNX0K8IKW0er8p8eiq033Yb45fTRtkuv6zAI NuYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=3RzWDq8iyLfaft7Z2B7Q+jjV0t4/MnMMqu+VROZY3Es=; b=GL2v5h4BUTFCtuHDhznRs1APq6VK0tRtvROEg5YAHDvERm2eqQIMJmZf5RRVLORBP2 4/ruEDc0efRuqlhVLT9b1DK6K0i1Iuq1mFEZjc+6EAtyS3ynfT2tDTbOMpzOcRANCNGL lQFctUmngE6bcrhiblmP1jc4Ikbn5WzbJbF0LzlOREFIN6VzTdANVHGZMTRD7T6+C/WW WlHf6VxxE/BHqSKYZq1jbrpye/u1J1JOC8iuv3BRwnCpZWvB7MZ2CfBoOsY9bAMl7RCV 7fOyyUofNYYAab50kYQ4P9n93WBOSYYAfYd7Hp/FB08Nla9MCUhl/hoWNTv7SzbNEaML cPlA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JYNGjVp0; spf=pass (google.com: domain of mptcp+bounces-5963-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-5963-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 do40-20020a05620a2b2800b006b1b465edc9si13278668qkb.673.2022.07.05.16.51.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Jul 2022 16:51:54 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5963-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=JYNGjVp0; spf=pass (google.com: domain of mptcp+bounces-5963-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-5963-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 112C71C208CF for ; Tue, 5 Jul 2022 23:51:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7CC002F5A; Tue, 5 Jul 2022 23:51:52 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 AA2A52F2D for ; Tue, 5 Jul 2022 23:51:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1657065110; x=1688601110; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=0DS/bgEX/ASK8qONgZPlYBLbKb8JLeh8BGr1BS7s1AM=; b=JYNGjVp0e713PVwuoj0nRRh4wqkBx5iommIDP+z8xaBZ1pfCnCJIXtcf sE1ufV0qfW/m3V8VP10bmK6cWO4N33hHnTerZAbEml9dZJHAb11CvZcmZ N46e7oAozJ6fuB+qXVgb6zSaOycyCE/9NNnzBmnetuAXCIZvUdsq+kfWQ YB4mzNknc9ZcRbT/LuydUoFHY0zlLQ0sTbtmL+pxF3mH/wa11eJZeM1Vc KR2MO7fPS5sRTh37gtwop9iOPxAfDcujr/swD1MoUjQebUVDre5ixku/K RR09Cs4QFTVwJnZ+4a12VYNqPXhRMOoEcIceF1ZwFoOZYOjdP9LPCSPqu g==; X-IronPort-AV: E=McAfee;i="6400,9594,10399"; a="281131797" X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="281131797" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 16:51:49 -0700 X-IronPort-AV: E=Sophos;i="5.92,248,1650956400"; d="scan'208";a="735345345" Received: from rcenter-mobl.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.17.169]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jul 2022 16:51:49 -0700 From: Mat Martineau To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH mptcp-next v2] Squash-to: "selftests: mptcp: tweak simult_flows for debug kernels" Date: Tue, 5 Jul 2022 16:51:44 -0700 Message-Id: <20220705235144.221591-1-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 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" kbuild is still seeing intermittent failures in the simult_flows.sh test. It uses a kernel config without kmemleak, but with other performance-affecting debug options like lockdep and kasan. Example failures: kernel-selftests.net/mptcp.simult_flows.sh.unbalanced_bwidth_with_unbalance= d_delay_transfer_slower_than_expected!_runtime_4339_ms_expected_4005_ms_max= _4005.fail kernel-selftests.net/mptcp.simult_flows.sh.unbalanced_bwidth_transfer_slowe= r_than_expected!_runtime_4285_ms_expected_4005_ms_max_4005.fail kernel-selftests.net/mptcp.simult_flows.sh.unbalanced_bwidth_transfer_slowe= r_than_expected!_runtime_4346_ms_expected_4005_ms_max_4005.fail Adjust the debug detection to look for more kernel debug features and further loosen the simult_flows timing constraints if any of those features are detected. v2: Use kallsyms for debug feature detection, increase the debug timeout. Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/simult_flows.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index e266b26a4274..ffa13a957a36 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -110,9 +110,12 @@ setup() # 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 the kmemleak file presence as a rough estimate for this being - # a debug kernel and increase the maximum run-time accordingly - [ -f /sys/kernel/debug/kmemleak ] && slack=3D$((slack+200)) + # 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 --=20 2.37.0