From patchwork Thu Jul 13 13:54:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13312260 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F872C04A6A for ; Thu, 13 Jul 2023 13:55:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DCEFA90001D; Thu, 13 Jul 2023 09:55:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D313490001C; Thu, 13 Jul 2023 09:55:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BF86990001D; Thu, 13 Jul 2023 09:55:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A249590001C for ; Thu, 13 Jul 2023 09:55:07 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 42CEDC027D for ; Thu, 13 Jul 2023 13:55:07 +0000 (UTC) X-FDA: 81006735054.05.1935FC2 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf16.hostedemail.com (Postfix) with ESMTP id 32061180012 for ; Thu, 13 Jul 2023 13:55:04 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689256505; a=rsa-sha256; cv=none; b=mq6LK5C/ebpbMwuJGVuCGkwND0qkU73Ua9wCeO8a4DgWCantKF+Xt3MnsXGakwBoOlBH6P vPCi9NdZ1+KnhZHoQq5JUV1g3kxVidYr06fwgongZWzcZueNsLIqE7z43U7lsuuDiZvjwo LuW64WPq5/aTlsrcdUh0O12Wi7etgtE= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; spf=pass (imf16.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689256505; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HXaz2BG8nd6sNHnpf1UWxQkbMfGOr+JlGHxrRhsm3QQ=; b=V7qTbCveylMVltjzjqsCfyxaO7TsrVBb1Yj7MK8f+sYIBTa8aPOlm6+FWUVGm6j0X3gVdr Y7zdOo1WY5A27l/atVHkfyED5ejdmhcckxO9htlzO6o6C8Xtu4E3d8ckEUdFdYnR6D0tq/ fMktx3YIOoKmDN5FAcTbzOBNlN2HisI= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 01FAE1576; Thu, 13 Jul 2023 06:55:47 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EC0623F73F; Thu, 13 Jul 2023 06:55:02 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Shuah Khan , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , David Hildenbrand , Mark Brown , John Hubbard , Florent Revest , "Liam R. Howlett" Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v1 8/9] selftests/mm: Optionally pass duration to transhuge-stress Date: Thu, 13 Jul 2023 14:54:39 +0100 Message-Id: <20230713135440.3651409-9-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230713135440.3651409-1-ryan.roberts@arm.com> References: <20230713135440.3651409-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 32061180012 X-Stat-Signature: juhkg4qgokycbfqgsh6odmdc4e749sza X-HE-Tag: 1689256504-405265 X-HE-Meta: U2FsdGVkX1+k/ygkSxVXQZxDUBrsOVG9ahSC1RaeMv7QVGF2Y5Q2KMlWneW7rvo1MLCV8VLj+Zr3l5cFmiq374ndBPDNRl4UgoDr0ShmPH9A2XmfPPk7TjbltXTtn/6bRP4qwsi82wBwdEZVAbHljmlJOw0nX1k5pNinbzoGk3XfNh/iauNMIGi9eXmCtZnglyddBMWuDRuLZDOsYQilLbSkUqiF7tz+Q70rA1LbinwMUrmbp7hQC9PzFiXVX3y8SQ/vd2FZAYq9hloghR1oo1NJOw1n7qrNVf3gGfjBFeceNuVCatmusHcV6n2O39JuCp/i8syX/d+QbGAE4wkZ5ftHVBESQw592JbvBG/8FGSuWe0QkH82zi5ds99oQjTEowcHfAWhmSROi6UfjcJRM8Xdv/Em23ISCccldiXWAG7hrSFc7YiNRks5Z6oe2Qa9/WeLPXVXghG7c1Iyyb+Vrrs+cvGb5XDWX/vQKgmABHA817JHCar/A3loz/bxsAWD/f7+NS6z6RM264N2riYE/lVLl7uMxzvrp3kB/QA/6/lYAdDap4Ubf6QRLDms82T8ePRZTLvh9gpGiD/XNQO5oRv7EPrhaXGmzKq1/9JapXHkxIjQ5jt7jLOg0y6X27IfOiTbjIRcO3kJWaS3doFE9Uy/GzI/S/Hhng6aJRaGI7f2IL/BLyxiVQ919/hAIzzGCk0C7Rg4SnebeSFqMdlUUugackTooxzZJw1ecESMGgPHw1Z4/Fkat4I4q3MsJ2t4yYKhkm849Dy/pVGFHxwfFj5B5AQjX+6tXR+UNpakIfudsBHLJQpAxppG2YP/pX9gcXGwD0z7n4nhoqV1Ni9Xd6kV4S8Q+aYry7sMF+yUFnNsELqUG9ZKFYJsgE42CZjIvzhS8jqvIk0zGk59vroLtK92Rno4oUTSE+d6FrjZXaRnvXNY78ilpfO4KkJfCbJW+1HAnSUKiqyqYCn3P9B xqModGE8 G6Lq3NMVbUlSaA5hebPpcVFveoKGxxFjT0W/oAOs60euVVMGnnGf+dwkhE5/RFAzxiSDyCV6q3HT15ba3RKSTGuIUi1xd20a9Hk/9splDd/+mLJcP9agPYqIOLiDnKVwMmiE+wtpPNdifXVPZ8oPBorRO3TkvM5goWUqD X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Until now, transhuge-stress runs until its explicitly killed, so when invoked by run_kselftest.sh, it would run until the test timeout, then it would be killed and the test would be marked as failed. Add a new, optional command line parameter that allows the user to specify the duration in seconds that the program should run. The program exits after this duration with a success (0) exit code. If the argument is omitted the old behacvior remains. On it's own, this doesn't quite solve our problem because run_kselftest.sh does not allow passing parameters to the program under test. But we will shortly move this to run_vmtests.sh, which does allow parameter passing. Signed-off-by: Ryan Roberts --- tools/testing/selftests/mm/transhuge-stress.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/transhuge-stress.c b/tools/testing/selftests/mm/transhuge-stress.c index ba9d37ad3a89..c61fb9350b8c 100644 --- a/tools/testing/selftests/mm/transhuge-stress.c +++ b/tools/testing/selftests/mm/transhuge-stress.c @@ -25,13 +25,14 @@ int main(int argc, char **argv) { size_t ram, len; void *ptr, *p; - struct timespec a, b; + struct timespec start, a, b; int i = 0; char *name = NULL; double s; uint8_t *map; size_t map_len; int pagemap_fd; + int duration = 0; ram = sysconf(_SC_PHYS_PAGES); if (ram > SIZE_MAX / psize() / 4) @@ -42,9 +43,11 @@ int main(int argc, char **argv) while (++i < argc) { if (!strcmp(argv[i], "-h")) - errx(1, "usage: %s [size in MiB]", argv[0]); + errx(1, "usage: %s [-f ] [-d ] [size in MiB]", argv[0]); else if (!strcmp(argv[i], "-f")) name = argv[++i]; + else if (!strcmp(argv[i], "-d")) + duration = atoi(argv[++i]); else len = atoll(argv[i]) << 20; } @@ -78,6 +81,8 @@ int main(int argc, char **argv) if (!map) errx(2, "map malloc"); + clock_gettime(CLOCK_MONOTONIC, &start); + while (1) { int nr_succeed = 0, nr_failed = 0, nr_pages = 0; @@ -118,5 +123,8 @@ int main(int argc, char **argv) "%4d succeed, %4d failed, %4d different pages", s, s * 1000 / (len >> HPAGE_SHIFT), len / s / (1 << 20), nr_succeed, nr_failed, nr_pages); + + if (duration > 0 && b.tv_sec - start.tv_sec >= duration) + return 0; } }