From patchwork Thu Jul 13 13:54:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13312258 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 7D233C0015E for ; Thu, 13 Jul 2023 13:55:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CE57390001B; Thu, 13 Jul 2023 09:55:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C949090000B; Thu, 13 Jul 2023 09:55:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B0EE590001B; Thu, 13 Jul 2023 09:55:05 -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 9C17290000B for ; Thu, 13 Jul 2023 09:55:05 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 6F54F120293 for ; Thu, 13 Jul 2023 13:55:05 +0000 (UTC) X-FDA: 81006734970.24.75C9A40 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf22.hostedemail.com (Postfix) with ESMTP id A5BDDC0006 for ; Thu, 13 Jul 2023 13:55:03 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689256503; 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=rHtD/pnAHEzhlHxmKN5MIBCps4aYfm1NZFwHzfIO8rs=; b=x08GLZYq8UxHZ+wW0FRX7RG9AKBDHWHb9gumGwJVO7eJuwsbxIqOzIRuxxG2nnBPnqJC+5 /SLyJz78tEh13mDohG/xSxXv4pUuMTnyhGMMgx7vZxLoWzA5bWyIG5d9hJC/g8YoLEIQjf uKfg+JSantDm427b+p9enQvnCcKpi44= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf22.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689256503; a=rsa-sha256; cv=none; b=V0xJKe0dfJv4wfpsv6W+w6dYRrmadmyBxO9iiyTNjQ/i7g/3Q631VWG32BT9+oQuDp9Vhv TF2m71e3EnOMig47bDLTjfoU6WSVsODNqJ9YWQKduyHdbi6Cf0x1RnoLh58MbjeRTiAZQm HqrIOGn6haX8HK/r9XVKB4zsS9BlCII= 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 3E61C1595; Thu, 13 Jul 2023 06:55:45 -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 341AA3F73F; Thu, 13 Jul 2023 06:55:01 -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 7/9] selftests/mm: Make migration test robust to failure Date: Thu, 13 Jul 2023 14:54:38 +0100 Message-Id: <20230713135440.3651409-8-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-Rspamd-Queue-Id: A5BDDC0006 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: xmwz81wtpqgmjs6nbi1wz7ima3yif6p7 X-HE-Tag: 1689256503-465402 X-HE-Meta: U2FsdGVkX1+U34CrDznEf7GxI98fkymLmLaYKrnFKAnvnNgVLmF9sQhOfy7TBo4a7D8UbgJmp/MA90ai5vcz1aPvUw9WWTG4sz74Ol/UcmrXDioXO0oRQ3u7tAOYtObBBsNb0xDnt2d8gtdxSpzJzprybnCOfr6dkeQl6dfKcyew34+/A8KBY7VaFxqqi/5ir1jWodK8quQ7CBACQZtm12+KtDuCCxGri2t6F+IEPKxsPBJdVV7g08UFWEXDCdBAxI1w1JgQkkE3U/f5nJ1jSZuRVEZ6EmoX2zxoygVS1e49K8F9yn9kApfCux6/7bdWhHgqJiSy+lX9wwjbg8Avt0qJWgcllodjpW3Jbxh/8gdBoTBCaDqfUVatb7jnmJWMbJQg9H0BdjqSmDcQJhJz/QTtGnddehY/d6c9WSEOav1UUE4LuXhS6Z2KeY4aL+7MjHs5zCJxOI4DihEWhXh8u26/oqErNfyAZD6ibHNKidfos+BukpueLaUNnLYrW9/l7Zo4hbaWHtEZKbJOQpuYTwkqhKlIePkbPOVp3F/tnZrP3mC0UG34HFslja+CYEjKDxmaX/E1l8ysPD8bV9+zxYgZIyHNA+CVVhj2SiYlWk9knNaJJPVChe0P+zz/68DE7CCnN2jkSEdaf512HUMIaYRpTz0cm4PROiUUaoOHRpqh0yWjaviOp3b0r21GCECpQG23L0dGjKuFwhnSbDB14Sk3f9wtEVCCxbqv9B94p70ps6Gk+qDJPROfcRKFm71ikHJ6WIzxXtmou4ykgZQhtGl5Rbow9kGwjlWSwuqAjrehL/zVB1JUKs+jyVbIDPo/A2yFNUNh+b8ObAOuHthtQ0maQwzSpnMTJmu2v4Yan5yWFVNII0vUpKbrXBM76BNNH0U//KqaU869zaiLwArq0AOkJQ70TEYBwA9zpIzP/IMPAnQkMhGsk8hlJIoB4AWQNi2ko6eFgPn0304otmN 9R/j8TDv pRPus8wHuNdyzUaVM3pNIu+3CaveaOTcIck5osUASw4SpJVGMJYephr0qutQlXY/JWn8V5nPh3MUjwxrTe/u6LusOVxFr73jW5tGHvJl5MuBqjwItmZEGP5fDQ91QJtFis05FADl/j1FPxdPC9RGa975Yp5yjjPvekBA2 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: The `migration` test currently has a number of robustness problems that cause it to hang and leak resources. Timeout: There are 3 tests, which each previously ran for 60 seconds. However, the timeout in mm/settings for a single test binary was set to 45 seconds. So when run using run_kselftest.sh, the top level timeout would trigger before the test binary was finished. Solve this by meeting in the middle; each of the 3 tests now runs for 20 seconds (for a total of 60), and the top level timeout is set to 90 seconds. Leaking child processes: the `shared_anon` test fork()s some children but then an ASSERT() fires before the test kills those children. The assert causes immediate exit of the parent and leaking of the children. Furthermore, if run using the run_kselftest.sh wrapper, the wrapper would get stuck waiting for those children to exit, which never happens. Solve this by deferring any asserts until after the children are killed. The same pattern is used for the threaded tests for uniformity. With these changes, the test binary now runs to completion on arm64, with 2 tests passing and the `shared_anon` test failing. Signed-off-by: Ryan Roberts --- tools/testing/selftests/mm/migration.c | 14 ++++++++++---- tools/testing/selftests/mm/settings | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/mm/migration.c b/tools/testing/selftests/mm/migration.c index 379581567f27..189d7d9070e8 100644 --- a/tools/testing/selftests/mm/migration.c +++ b/tools/testing/selftests/mm/migration.c @@ -15,7 +15,7 @@ #include #define TWOMEG (2<<20) -#define RUNTIME (60) +#define RUNTIME (20) #define ALIGN(x, a) (((x) + (a - 1)) & (~((a) - 1))) @@ -118,6 +118,7 @@ TEST_F_TIMEOUT(migration, private_anon, 2*RUNTIME) { uint64_t *ptr; int i; + int ret; if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) SKIP(return, "Not enough threads or NUMA nodes available"); @@ -131,9 +132,10 @@ TEST_F_TIMEOUT(migration, private_anon, 2*RUNTIME) if (pthread_create(&self->threads[i], NULL, access_mem, ptr)) perror("Couldn't create thread"); - ASSERT_EQ(migrate(ptr, self->n1, self->n2), 0); + ret = migrate(ptr, self->n1, self->n2); for (i = 0; i < self->nthreads - 1; i++) ASSERT_EQ(pthread_cancel(self->threads[i]), 0); + ASSERT_EQ(ret, 0); } /* @@ -144,6 +146,7 @@ TEST_F_TIMEOUT(migration, shared_anon, 2*RUNTIME) pid_t pid; uint64_t *ptr; int i; + int ret; if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) SKIP(return, "Not enough threads or NUMA nodes available"); @@ -161,9 +164,10 @@ TEST_F_TIMEOUT(migration, shared_anon, 2*RUNTIME) self->pids[i] = pid; } - ASSERT_EQ(migrate(ptr, self->n1, self->n2), 0); + ret = migrate(ptr, self->n1, self->n2); for (i = 0; i < self->nthreads - 1; i++) ASSERT_EQ(kill(self->pids[i], SIGTERM), 0); + ASSERT_EQ(ret, 0); } /* @@ -173,6 +177,7 @@ TEST_F_TIMEOUT(migration, private_anon_thp, 2*RUNTIME) { uint64_t *ptr; int i; + int ret; if (self->nthreads < 2 || self->n1 < 0 || self->n2 < 0) SKIP(return, "Not enough threads or NUMA nodes available"); @@ -188,9 +193,10 @@ TEST_F_TIMEOUT(migration, private_anon_thp, 2*RUNTIME) if (pthread_create(&self->threads[i], NULL, access_mem, ptr)) perror("Couldn't create thread"); - ASSERT_EQ(migrate(ptr, self->n1, self->n2), 0); + ret = migrate(ptr, self->n1, self->n2); for (i = 0; i < self->nthreads - 1; i++) ASSERT_EQ(pthread_cancel(self->threads[i]), 0); + ASSERT_EQ(ret, 0); } TEST_HARNESS_MAIN diff --git a/tools/testing/selftests/mm/settings b/tools/testing/selftests/mm/settings index 9abfc60e9e6f..ba4d85f74cd6 100644 --- a/tools/testing/selftests/mm/settings +++ b/tools/testing/selftests/mm/settings @@ -1 +1 @@ -timeout=45 +timeout=90