Received: by 2002:a05:6358:7058:b0:131:369:b2a3 with SMTP id 24csp6997930rwp; Tue, 18 Jul 2023 08:36:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlG87kDNln0QQbY5qT8FcETPAF/x/pjK1Ii7IdocPfSPBTsoJXYi9DR6Xjyq4rfEh8ydcrES X-Received: by 2002:a05:6a20:8f03:b0:132:842f:8adb with SMTP id b3-20020a056a208f0300b00132842f8adbmr17812297pzk.23.1689694579396; Tue, 18 Jul 2023 08:36:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689694579; cv=none; d=google.com; s=arc-20160816; b=0T+X2glBj+ilm3CR5o4tCMTf8DgtbFNxmdkCKiKxbkvKmFYX8+IgB7NkKu4v40ltEB 5MULBdCWGvTOCmffyPod1kftqvLI99CxSNaZtCa5Ltf9l+zh1msDn/V1UUmpn4IlI60t Hx//1/wGXb1huVN8UGzpOh1AghW+uql/Sg/RINrj6heLtTh+is8GhdRx/Q1akEUtvbxw T17DMgdTuZMecmA0CdMZqeAu+IoShUNlIsasnmI0qwaPNZ25G6kG5aj71E/80rWwZB3b 9S8kSXQcCcOxglsi1C9zwP1/vHOTNVZAsdaKWr7OigFRetH+u2OTgN2cqPHyhyP6xxgo cV/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:subject :organization:from:references:cc:to:content-language:user-agent :mime-version:date:message-id:dkim-signature; bh=yHlHwKpoA0bi1nyvFXl3JPkte3c23L/WObN+n1+gtHA=; fh=P9AbSbZnl2hMasUBuQnUpwYJYnbBz4pIdK1+zQLp7ZE=; b=ABA5SA/pyDHPURy6ULdRRIxe/BhQKuZsCcPGvURjaAOdPQ7L5IsjYQQPgjljTzFnl9 wQECf0t+VuRZqyZoKgSFJmJHYkLy2tgQUBZF7WJMPUZ1/FRCjoqsW/WPscQOeqfy+cBM wthNonj/s+E3DYYwWia9oq6/AekGIvnJ+ydtaJLki1x3krCflQ/FbDf6DlpdQGoX/Uda 20VrJkRjAJoQsFfyJWRQy4oqjSWmcAW8iePPhH2Rjbc7Vw0rQvzOFST4cOsMdXMCaNjZ zPpbBSgwOw3UuOdXb7JlAUmg2f/gWgS+Ik80fJzfsVTb2BbFaBO2pTWrtQcJOiZo1pts 7rmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Ap312J/g"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s124-20020a632c82000000b0055c875bed32si1813435pgs.706.2023.07.18.08.36.06; Tue, 18 Jul 2023 08:36:19 -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; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Ap312J/g"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233602AbjGRPZE (ORCPT + 99 others); Tue, 18 Jul 2023 11:25:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231993AbjGRPZC (ORCPT ); Tue, 18 Jul 2023 11:25:02 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB44DC0 for ; Tue, 18 Jul 2023 08:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689693848; 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=yHlHwKpoA0bi1nyvFXl3JPkte3c23L/WObN+n1+gtHA=; b=Ap312J/gpK2Tag41yBpv242IB5b76GSO3/ws14xJ7vxAXLa8i7aIeF4ZGaWSCJ48K48WAq jMqDSwx+TwFG4a4btsnRcc08yEoKB0ee05twv60XcA94ev8qJ81qwg1zlZzfAL5qeA4CvI 5o/KtHY2H2lpMkvnNnUGgzwj2s3ymmU= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-660-xjj_l5WvO8mVjpktTV-dzQ-1; Tue, 18 Jul 2023 11:24:07 -0400 X-MC-Unique: xjj_l5WvO8mVjpktTV-dzQ-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-3fc07d4c63eso29040575e9.1 for ; Tue, 18 Jul 2023 08:24:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689693846; x=1692285846; 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=yHlHwKpoA0bi1nyvFXl3JPkte3c23L/WObN+n1+gtHA=; b=AScJ6vSYUcI4DfH2PyKtwaZUPKKoEhai/k9US3joCH3OQrGFI1JZyI75hWuHqZk161 P+4FarRV8Vx0ivTQJVDq63meVGus0q1QEeeTRyv3WLYIvLBCcGHFu6ywh1GVngTAT947 7wmds644fW7F1+NExSTpCaTowvxLYZAil2Ox4oo28hvK5TMRbgjNfZEZ5ZSraivRL6Qo BxmVaNu9HrlJsGQ+LPbyvQ9uHQzQl1sTGGkrVoKOhOm7rWtfV78gsnUTRq8tLnH8mf/w xPdT87PkbpT75Lg3BEIjg0CS32NBIFpE1o1+NT95FeHzgEHFdtUNniGdIGXlhKxlCNnb 6I1Q== X-Gm-Message-State: ABy/qLbOClaCvlZVCmBukUInXkQYi0rh20+fROW0GVs3tsLu6et2dn4i VgKFtczHlMOX4J2S56PJ2F/8X3Hqy2FpHUMd8qMV0M0E5Z4qT3Vm42UluJZxPwn8GmXgVxng98m 3WtgFOw+gpLJKnJI8PV1ogJeki34yRC4I X-Received: by 2002:a05:600c:3ac6:b0:3fa:8c8b:716 with SMTP id d6-20020a05600c3ac600b003fa8c8b0716mr2305399wms.1.1689693845844; Tue, 18 Jul 2023 08:24:05 -0700 (PDT) X-Received: by 2002:a05:600c:3ac6:b0:3fa:8c8b:716 with SMTP id d6-20020a05600c3ac600b003fa8c8b0716mr2305379wms.1.1689693845445; Tue, 18 Jul 2023 08:24:05 -0700 (PDT) Received: from ?IPV6:2003:cb:c740:6200:84e1:eabc:8e2:7429? (p200300cbc740620084e1eabc08e27429.dip0.t-ipconnect.de. [2003:cb:c740:6200:84e1:eabc:8e2:7429]) by smtp.gmail.com with ESMTPSA id f22-20020a7bc8d6000000b003fbb5142c4bsm10735127wml.18.2023.07.18.08.24.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 18 Jul 2023 08:24:04 -0700 (PDT) Message-ID: <5cee5039-b641-82f6-547f-12d94057d0ad@redhat.com> Date: Tue, 18 Jul 2023 17:24:03 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US 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> <20501a7c-19f6-4154-aebc-49df04c9b043@redhat.com> <2e5baba4-c8ef-9da4-a2d6-3cf383ed05bd@arm.com> <1314fe0e-dd32-bf10-0a33-2b571dad70bd@redhat.com> <90a8b224-4566-5051-4903-f9ab83b26150@redhat.com> From: David Hildenbrand Organization: Red Hat Subject: Re: [PATCH v2 6/8] selftests/mm: Make migration test robust to failure In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,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 On 18.07.23 14:42, Ryan Roberts wrote: > On 18/07/2023 12:24, David Hildenbrand wrote: >> On 18.07.23 13:23, David Hildenbrand wrote: >>> On 18.07.23 12:49, Ryan Roberts wrote: >>>> On 17/07/2023 18:40, David Hildenbrand wrote: >>>>> 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. >>>> >>>> It's not required. I was just trying to keep everything aligned to the same >>>> pattern. >>>> >>>>> >>>>>>     } >>>>>>       /* >>>>>> @@ -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: >>>> >>>> Or instead of? I agree this is neater, so will undo the moving of the ASSERT() >>>> and rely on this prctl. >>> >>> I was thinking about possible races when our parent process already >>> quits before our child managed to set the prctl. prctl() won't do >>> anything in that case, hmmmm. >>> >>> But similarly, existing code might already trigger the migrate() + kill >>> before the child processes even started to access_mem(). >>> >>> Racy :) >>> >> >> Maybe what would work, is checking after the prctl() in the child if the parent >> is already gone. > > > Like this? > > if (!pid) { > prctl(PR_SET_PDEATHSIG, SIGHUP); > /* Parent may have died before prctl so check now. */ > if (getppid() == 1) > kill(getpid(), SIGHUP); > access_mem(ptr); > } Staring at forget_original_parent(), that order should work. I do wonder if there is a nicer way to handle that, but maybe that already is the "nice" way. -- Cheers, David / dhildenb