From patchwork Mon Jul 24 08:25:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 124709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1669006vqg; Mon, 24 Jul 2023 02:06:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlFEhDz3Sp28N4Ezx+soK5AqRmozr0Y56fakm8+SutWitOLKpOIloTEaPJvX9E2hYaUrZVJG X-Received: by 2002:a05:6a20:b715:b0:130:661c:613d with SMTP id fg21-20020a056a20b71500b00130661c613dmr7962911pzb.5.1690189614692; Mon, 24 Jul 2023 02:06:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690189614; cv=none; d=google.com; s=arc-20160816; b=s9L73OX6NWFKsy3lLjHIdb6OnWokO5bSPNoeZkquy2/bsIMFMJkzgQwY/6UKz+5mUw VzJAJbtgcqViEVpme8fU6210u5tUHVvLrLo99oafB+F/x+gyco9oWmsFUPPcrXVHwInO PTJJSfeW8+HT1i6UCtKk0aqfGINiUXAl7wgz4rc6GmuOBZhBODzfQtN6E8MvUktaQgJ0 g5/SPZ9bq2PhrsTSQqV+vu4EHQAlbbHVabxXZmb1RCpmk7PreYc9a/GNySueahGAdBFe vkOjZAzzugf8x4ZuHAOxn/pR5H1i7rModf1F8NV7KKPaDbTWgoWpVwla7pV1oz8Pp+eD Zgxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=c+gqtMtT71E+QHqOq+JqAAJ/D08SVzIjdaWzP+X/2vY=; fh=6rhI9kvwCMo+fckRKZYXD+Cg7edipvyuIhlyok3MppU=; b=ALuz/hUWiqbk/ufmjaD1zKyqLPzQhQpcVFjZ6MNJPl/HqNegUA2Wuoza/lQ1ByXLmO ouRjxnj1cswQKlS36W6cm48UJMVSNmRTZaPineW85THkk42GnNOLpfWIQMp4arBP5BGQ Nvxac9ccBhKg741OWNV56yfBnASdi+IiAkhDxEJyBZVrMUKd8vxkksVewpvBSlGzZnF/ sC0r5EnIydH3pLztzug8IX27OBE6VkpTsJ3nMuJqu/KBuQGOMlY1aWJviqYuwgsfffOs xKpnnv7EqyM3V8msH0bdLV+hulsx0xIkc0Pvv/A+wbcOfOkES6yqlViqquF38DE/C8Dt Kqeg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b4-20020a170902650400b001bbab41391esi878205plk.327.2023.07.24.02.06.41; Mon, 24 Jul 2023 02:06:54 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231521AbjGXI0G (ORCPT + 99 others); Mon, 24 Jul 2023 04:26:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54320 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231490AbjGXIZ7 (ORCPT ); Mon, 24 Jul 2023 04:25:59 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 1FADDE6C; Mon, 24 Jul 2023 01:25:46 -0700 (PDT) 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 97F62DE0; Mon, 24 Jul 2023 01:26:29 -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 B8B9E3F67D; Mon, 24 Jul 2023 01:25:44 -0700 (PDT) From: Ryan Roberts To: "Andrew Morton" , "Shuah Khan" , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , "David Hildenbrand" , "Mark Brown" , "John Hubbard" , "Florent Revest" , "Peter Xu" Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v3 7/8] selftests/mm: Optionally pass duration to transhuge-stress Date: Mon, 24 Jul 2023 09:25:21 +0100 Message-Id: <20230724082522.1202616-8-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230724082522.1202616-1-ryan.roberts@arm.com> References: <20230724082522.1202616-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772292265339053587 X-GMAIL-MSGID: 1772292265339053587 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. Acked-by: David Hildenbrand 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; } }