From mboxrd@z Thu Jan 1 00:00:00 1970 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 246C3C001DF for ; Mon, 17 Jul 2023 17:40:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 72E816B0072; Mon, 17 Jul 2023 13:40:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6DED46B0074; Mon, 17 Jul 2023 13:40:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5A63D6B0075; Mon, 17 Jul 2023 13:40:17 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 4AE046B0072 for ; Mon, 17 Jul 2023 13:40:17 -0400 (EDT) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D6253C04B5 for ; Mon, 17 Jul 2023 17:40:16 +0000 (UTC) X-FDA: 81021817632.20.DBE2FD0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf09.hostedemail.com (Postfix) with ESMTP id 71A9B140014 for ; Mon, 17 Jul 2023 17:40:14 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="R7F/xu9M"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689615614; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=F4zjgn0cYB98ujXpFEQtfUyI4X2KQIDCSEQefL4BBIc=; b=eacOiqMriBkL8xBHtW75vtjWtBCr+ZqGpmG2vCHkFUG3y8ISUdyf8MsnxaObpAgmGXM7x3 1/2NzAi+uhc8UgIwGHX1CYwqjvBvBTFxpr6kzubu4r7eY85gWSRBEn1PaU76Q6oA8YiL0Z 0kEGUkjw1Lq+bPcvT0rk+/SD/UHFk9Q= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="R7F/xu9M"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf09.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689615614; a=rsa-sha256; cv=none; b=wIqTT9QGjVxTjp+h+IR+/oV2aAg2uHWdLz0lFIckB6v02hSv6VwrAnraz9bNrG/EkVdp4V a3riqgCEnKQQcY565HoGtlouc5vE8FcDR+deLCyAYVzxytxqCQr3e9r4ebpuUQ0+8DpRQR lU4ONA3qTjg7VVJD2SnFuFoEQsRf6G4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689615613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=F4zjgn0cYB98ujXpFEQtfUyI4X2KQIDCSEQefL4BBIc=; b=R7F/xu9Mc8h0fWEtL3oiEqmD1P3ORkVylDqRcBhg1GAVQizQVVQgbf2jQPn/6EL2Y4l+Z8 89/7jf4XXrRGtgfukhbw+C6/NOwF+sP5p/euXsmpI0h7sOAZsKfhBXV+yalvGIgUiVxTOF p5fkBFz7z6F931H62q9C4LIvub9BbAI= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-549--AUBAHsiPvu2b6gN_Q1KSQ-1; Mon, 17 Jul 2023 13:40:12 -0400 X-MC-Unique: -AUBAHsiPvu2b6gN_Q1KSQ-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-31701b27d19so595541f8f.1 for ; Mon, 17 Jul 2023 10:40:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689615611; x=1692207611; h=content-transfer-encoding:in-reply-to:subject:organization:from :references:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=F4zjgn0cYB98ujXpFEQtfUyI4X2KQIDCSEQefL4BBIc=; b=eA0SllXduOvEpg9vfe4M5CJR33rSQAgf153uJePZG6MqfWeWiXs+fomhxbbyFUxiK8 TYRHuvRg8TRrYO8RsF+WXVzgV/L974/ihWhcxxA7sCg9TOHY+KrURSGPiGvnPumDQhfY zEvtoR8qTw4BnHURyg54qwiWrR3/hoqbrsFt0+4V4rykxN8mCETjgqYXS+pJf35L0k14 Bj6qiz8v5SAisX85CeQ8hlIaHcWwof/c72Hiq+YCHeA8vmMlNld84SC971+UNVG2FW9T 1cPf3Yft6Zffcw0Q6vIcP5XXZ8kEEE6GR1ve2bbUFYqD0buyjay3god5G77MAVSNcmj6 Rj2g== X-Gm-Message-State: ABy/qLY6V5XXlP6v5zUDLFD75tcBfIjEclM8EPz2/bHuvGKc/9oGkT5h yBveTa5BQdeCeE+Pz1psjkwYR0doZ2Liikw1gLv1MhKebCc8Ytw64J1kesrztpJJP19DQzLE8hy D1220EQj+K8s= X-Received: by 2002:a5d:6a4b:0:b0:314:2d59:c6d5 with SMTP id t11-20020a5d6a4b000000b003142d59c6d5mr8812535wrw.15.1689615611229; Mon, 17 Jul 2023 10:40:11 -0700 (PDT) X-Google-Smtp-Source: APBJJlHEPgjdDbvTWro3bKwzreEOmxLeSINhxQaDSvP7WJA9cGucuWmHNwMsfnwVewA5GsbLTJHKRQ== X-Received: by 2002:a5d:6a4b:0:b0:314:2d59:c6d5 with SMTP id t11-20020a5d6a4b000000b003142d59c6d5mr8812516wrw.15.1689615610882; Mon, 17 Jul 2023 10:40:10 -0700 (PDT) Received: from [192.168.3.108] (p5b0c62d6.dip0.t-ipconnect.de. [91.12.98.214]) by smtp.gmail.com with ESMTPSA id m3-20020a5d56c3000000b0030ae3a6be4asm42184wrw.72.2023.07.17.10.40.09 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 17 Jul 2023 10:40:10 -0700 (PDT) Message-ID: <20501a7c-19f6-4154-aebc-49df04c9b043@redhat.com> Date: Mon, 17 Jul 2023 19:40:09 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 To: Ryan Roberts , Andrew Morton , Shuah Khan , =?UTF-8?B?SsOpcsO0bWUgR2xpc3Nl?= , Mark Brown , John Hubbard , Florent Revest , Peter Xu Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org References: <20230717103152.202078-1-ryan.roberts@arm.com> <20230717103152.202078-7-ryan.roberts@arm.com> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH v2 6/8] selftests/mm: Make migration test robust to failure In-Reply-To: <20230717103152.202078-7-ryan.roberts@arm.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 71A9B140014 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: 3ojfps68g379wr3fywe1rrxhomsmbcus X-HE-Tag: 1689615614-65540 X-HE-Meta: U2FsdGVkX19dPY17U3ohR+mM7mYpuc7hex2lSZMa45KLQbuTLsiNg4XsSJb+JTv0D5gjqDZ4sVET8subwMtx1VBQH8ZrQiqOvSrSKtKhfQ3vSLLPMNghiMDGPKFjdshGf6q7Xhu9FXZoM3DgjmO/pnyOHpcdGkKTs/Yd5pmmDfulUMjVHpyEGV3VIJHpwl+y5FsZ5L3Fvlx7NhbnbwfwwBIfBjm+CbYDBwSKmoOW1uOLhAXSR8Vi/qwwHl7eGydidEj7oW5uC7g3F5OPkkf57zb3ApsQghxhICDLjsnUBBe0xNkaK89W7+gjLLuHR9Umrzy+loJuLXeZYncDu+pwYHQr7qLAlIxIiKfKcMt3e9+0t/L2eEvYd1sKo9p7+C8hqkzyrqpOsTIWgrX/sCrC1P80HyVqYPp2TJKd+O4vE6Hb3mzNR3unrzLbRJwwQJ7cArQ9PJqDeAhCUYMWcEf5zK+CR/omSGg9gPkmlr2MEdXuaUvYMXtW6t14bI9iP10raACVmPYgJ6GTpCU5+c++EUFDpQ4qkpg0gm+ymEwd9u/xO5cdf/B86W1fhUTTd1pV2AgCQGKPvzN0azkBaxso7Eg/1rZg9z+iUtnppwLLrbLfD4XHUj0Eq11KmwgXL8WV3Tp2NA/+c6UprAHOp5jXAC3VSXoL9K/x34TZbvCy6riTkInkxZYz3aUtDzimIN+/wEgfGLy2jgkuasbLh5IXc4Vr2mYu+Xd/Wzk7qWfaR8gRONPeklMYNm9UQ+wGy1buG0s6DAXY2jUeSpSeWFv4zN8Qvu9kZP3aeeMRtIyQAI+lwPIh9HF7e7D/rbOqap986++aHlmFXoXEEhv33/5ikpIysVdQuYRvoYXAU2Bk4PFkXf+ItMjMg2eA+osPvyduyTvHbilFWAQ+0hb6ESAnlBchKnQxvHpZMBlp4MkTgDEk7Ly2pvNwoT8yqo9gqJoa1N30JCIFJZrWsljuFcb jB9PAzgf hAnumDqfR/Kv7HQDNZXbp58m6JyholdM8QHJDYOqQAf75ePVxp8yYDc7IAsGkZffaayQI60VXTwWzaOcY0vCT6+YFCmsKH1KHRw6n6XekqrMjyxoAEh6mHvedaRJPuhgzwa212QZm99w5SRvY4B2/JQEc59QONP0YDBvD9N49c5IiMVqJnWgt/EP0xIYt8V4UGH7MnvAc+wwDT/uLLmspk9Oc8Ri13z2b13eS0ASqFnTAUVoJ7njPrUgdJzNRI8s/XCYyjOoZlAWtHznC42+TvWrujZktJjRSYn0CYawwHOw+Smn4uehVb/eeyTbUheSK++KI6lLDUdbbwOWGhTR2rNqVzuz8VNnru66yT3fn3ES4bQo= 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: On 17.07.23 12:31, Ryan Roberts wrote: > 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); Why is that required? This does not involve fork. > } > > /* > @@ -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); Might be cleaner to also: diff --git a/tools/testing/selftests/mm/migration.c b/tools/testing/selftests/mm/migration.c index 379581567f27..b3f12b9847ec 100644 --- a/tools/testing/selftests/mm/migration.c +++ b/tools/testing/selftests/mm/migration.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -155,10 +156,12 @@ TEST_F_TIMEOUT(migration, shared_anon, 2*RUNTIME) memset(ptr, 0xde, TWOMEG); for (i = 0; i < self->nthreads - 1; i++) { pid = fork(); - if (!pid) + if (!pid) { + prctl(PR_SET_PDEATHSIG, SIGHUP); access_mem(ptr); - else + } else { self->pids[i] = pid; + } } ASSERT_EQ(migrate(ptr, self->n1, self->n2), 0); Then, whenever the parent dies, all child processes get zapped. -- Cheers, David / dhildenb