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 844EEC4167B for ; Tue, 5 Dec 2023 17:00:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BA056B008A; Tue, 5 Dec 2023 12:00:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 06B1A6B008C; Tue, 5 Dec 2023 12:00:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E26C16B0092; Tue, 5 Dec 2023 12:00:26 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CD7176B008A for ; Tue, 5 Dec 2023 12:00:26 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A0C03A01EA for ; Tue, 5 Dec 2023 17:00:26 +0000 (UTC) X-FDA: 81533378052.25.F92F82D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 7D24B16002C for ; Tue, 5 Dec 2023 17:00:23 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J3AGqmLT; spf=pass (imf08.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701795623; a=rsa-sha256; cv=none; b=z7jlQdz3lrtaQuwn/HH81iiOovfMdP0F+vUrLd7EXS6q1RsrVR7i3ECz+d8xzgvtdypp7N d6WD6wYlyseRCLAKxLD4zAEwo0PmnzMJ0cIURjIBKThVVqxTbiKK4YC2+a627efhMZA0Zh IIVIrc+nTfg1xA9Lw7BwXfEBk9O07i4= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=J3AGqmLT; spf=pass (imf08.hostedemail.com: domain of david@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701795623; 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=73ItUJ6X7gBRGnFTkqu6MT50LunaIFjs5sccG6x1gvs=; b=lbX3pj8+94E8uwT07eePuCrHwMaH8Dj5h7xJv+yPtZrhpo9mEgdoeWHQ9Dm7DswdYfxF7M P/7QzNUiH+vvaepTFzvw1vxoAKgOnjl4BseTpdRG6J1/gHorItTJnAygMZq7Wib27G+pOQ QZJG8MBSxcBzfqcYIMQADAD6hQlIvI4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701795622; 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:autocrypt:autocrypt; bh=73ItUJ6X7gBRGnFTkqu6MT50LunaIFjs5sccG6x1gvs=; b=J3AGqmLTzMmM8TA19ZhJOK28ea+XT2P7RweLH1I7Kq0ISjmxopgY+NZKgfFWNBNrxt1rwn +vvWHTAWk5y5Jd3iVm+nOX2NVlPzlchzs3wvvay00S7xIXa+xUIv18G0xGxLF2tJh+fMqp Tozs9WUqbxV/giGFV/e51NANogW+/8M= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-684-2hlZT5-OOu2SO2J7yimJrA-1; Tue, 05 Dec 2023 12:00:21 -0500 X-MC-Unique: 2hlZT5-OOu2SO2J7yimJrA-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-333354a9242so1733228f8f.1 for ; Tue, 05 Dec 2023 09:00:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701795620; x=1702400420; h=content-transfer-encoding:in-reply-to:organization:autocrypt:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=73ItUJ6X7gBRGnFTkqu6MT50LunaIFjs5sccG6x1gvs=; b=mtunSasPjv5YQqYh/tb1bc09eTzUnkWLJiMHpoI0xXSO3pExk3iwrbT85qpA8DdP4z 4SNPvLX3+fK2bZ7JqzYEkueJzhLQYRQknHaJf7NDb6qcGd0jWy6icv27v2B+yUlrEbVA UQj2M5xByFvecVMBAgeDppZ8vfa/sNI9RkHcDSbg2s5B6rptLeYw45P8ud8szPaJeXfx IB74E6TKCn5Ysi0nTrSPRqZvFVoDCV35Vy779eM88a+L7BWV1I4PqQqkf9MNiWCzVHBJ e/QD8SpIIkRz5oOBW2jl4F0KFhIMjcbB1njon43ryKYIJBH4K9oooX2I8PWoMnDIDp71 sx4Q== X-Gm-Message-State: AOJu0YzyUinOBnF3nUmm9vhmhaZmcyEk31nIZ1kTkSc5U2FyTIvo3unN Lqs8xx/Hm0ULGF4bz3qc+JNDbCdOxfTCWF4Hrjf1Bq+e68LCWqcjmNEPmleURSsB5V8yi14OEj5 RdntvRhr2+UE= X-Received: by 2002:a05:600c:46c8:b0:40b:5e1f:c37f with SMTP id q8-20020a05600c46c800b0040b5e1fc37fmr772285wmo.21.1701795618463; Tue, 05 Dec 2023 09:00:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IHYHwZk2jkSUvfek4AZ+vf1sWX1nI3ih8AvGdhJ1N99yU4WbaE3O2x2XXs68NXZWz9gjas03Q== X-Received: by 2002:a05:600c:46c8:b0:40b:5e1f:c37f with SMTP id q8-20020a05600c46c800b0040b5e1fc37fmr772074wmo.21.1701795613247; Tue, 05 Dec 2023 09:00:13 -0800 (PST) Received: from ?IPV6:2003:cb:c72f:300:1ec7:2962:8889:ef6? (p200300cbc72f03001ec7296288890ef6.dip0.t-ipconnect.de. [2003:cb:c72f:300:1ec7:2962:8889:ef6]) by smtp.gmail.com with ESMTPSA id e12-20020adffd0c000000b0033342338a24sm7510724wrr.6.2023.12.05.09.00.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 05 Dec 2023 09:00:12 -0800 (PST) Message-ID: <22992b35-c6b6-4fcd-bfba-01a5f99198cd@redhat.com> Date: Tue, 5 Dec 2023 18:00:11 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v8 05/10] selftests/mm/kugepaged: Restore thp settings at exit To: Ryan Roberts , Andrew Morton , Matthew Wilcox , Yin Fengwei , Yu Zhao , Catalin Marinas , Anshuman Khandual , Yang Shi , "Huang, Ying" , Zi Yan , Luis Chamberlain , Itaru Kitayama , "Kirill A. Shutemov" , John Hubbard , David Rientjes , Vlastimil Babka , Hugh Dickins , Kefeng Wang , Barry Song <21cnbao@gmail.com>, Alistair Popple Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20231204102027.57185-1-ryan.roberts@arm.com> <20231204102027.57185-6-ryan.roberts@arm.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20231204102027.57185-6-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-Server: rspam08 X-Rspamd-Queue-Id: 7D24B16002C X-Stat-Signature: 6phcc6ihdbi8bc3qd4ugjwfriedzof4a X-Rspam-User: X-HE-Tag: 1701795623-741894 X-HE-Meta: U2FsdGVkX1/cawBoJuzpLoBOsA83DZDMsjfwB57C5sY2EUNZ/tg7tF3lufln6ZhgpFCp/vc48DmknJZi0/9qa0UscA9i1f7Hoy7VJOwx5dqje3EfUfYT7F5rQiWMVTxToFOpDwPOLRxgLyVUKjPfGRm+VlL9kU0nrIZ+AjATBPbVSNDRTOHtp2ntOueoqU5e+gMPkSfaBeGXkB92TRIGpguIhXII7jxQSXq1HQMCAAXBB4S5qx5DxeL74TmghtgndmhBhpZfJhN1nP1iuttdVaRbqwGvEW8ClkAfXOHrVOeNaR+gYeWPArcdW8izDTEoXbTeXRO3fDka8D1GClb+jkkGLx/7XKqPkVWlPfdARodBxWp9NOGmKkY2IX/IHVOygtXGhdGmCQgnZkn8NKNceK8SFpXaLPAZHWO4/YgcyzGm6gl+UONWw+6ewlF4m33bFyGAChM8wB+GPiE/aWN5F17U67YHFGmyRCu/WXbm8ZxpGWqN07zpr+KoTNAAbEoOUE/QuoVN5/2ozLM8k3tKiDzZ33DLue13oc0F1hpF3PoExobFUs1J1W1bEXV/liQbGcUZAOfDAUiK6DSq6a96VF+Z1+yydH5UVQdbI/GlEGyDVqbL4AIAP3muqp6tADsJ3OeBb4fRcpSg3gh5tF2G0UnHI5vDa/nTp9IsCqoPgDcmjMnEpVTqy3r472YfBr+4wXya4s8XvxKduBsJEyyLgJNFfJuVEGjUltdiJOfuhCDCsr9+BYhpWZsg2sahE4hb3VWi0YU7Vv+ZY4ioZEiB1UAc1JNW6JcglCelGJ7vjwZC1+Y5zSy4Qm4+HHR0XLBTBKFLseg/ENLpsxvbmIPlQQfyk9NW6qYwfmJ2fKUzYJEGlwbBh4e40M90WqgHiOvahaGaEujo7EQyWFiNf6edxzlVzzpRefgeqzuoa1jdPF2Oy8ftC0Vj1f5ZDfb5TNGDgOtHbxuJfQ/EsXe1JRN SIqqhIsb 8xRlHkow+srAM88HrlJzGWqjnBEqCE48JhHhBQgErxNloq97nuNeW5M3FM5zvL9/xYk7aIupRqqVSzHCIl7Oe7eqIY/WwEeymzfY566Ylb95Bs0IL2s3cXKb32vN7CZxQ8+DkjsVRGb7DCAcxLtT8ZOzwcYeK7OqgKrfJCH20Uo8Acs8q3ZrRrIYI06nNUNVJ34cWn9mkq4EpMiAgnPgVZQL0/SWT7NGoTdtL5EsrMHD00LFhZWQQ7bKkHSXwc9lK4zW7SOLwtKPK6EqMK5g3ZN130/sOt/c0zgcWcVrI0dL0B8DSssYt7bewzbL31u5SeyDc0s0KarZFjFkqmWRbPlo45us/PyrPjzXL76qjMZm29Jh+CF72PwoFp5XdTSJX5pgoYxkaZfsdttZ2yo9S24efWIuY6ri9ykexBkH109oiON71ZIES0shY1EE7ykOm7ssF7VaoTQRZxKCWS0VwGZX+UCt0F9MLKmvYsKnRBBrnh9QlxWaQmHvUjOmjxvcLXohwoAivrt80ex3Ei2cAkFvQ0FOVt6UcwKVTZe9x0oXb1o/XEzjps/iGwNI41XWEa8xrjTcRUiNMVOYzm72OtixPJw== 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: List-Subscribe: List-Unsubscribe: On 04.12.23 11:20, Ryan Roberts wrote: > Previously, the saved thp settings would be restored upon a signal or at > the natural end of the test suite. But there are some tests that > directly call exit() upon failure. In this case, the thp settings were > not being restored, which could then influence other tests. > > Fix this by installing an atexit() handler to do the actual restore. The > signal handler can now just call exit() and the atexit handler is > invoked. > > Reviewed-by: Alistair Popple > Signed-off-by: Ryan Roberts > --- > tools/testing/selftests/mm/khugepaged.c | 17 +++++++++++------ > 1 file changed, 11 insertions(+), 6 deletions(-) > > diff --git a/tools/testing/selftests/mm/khugepaged.c b/tools/testing/selftests/mm/khugepaged.c > index 030667cb5533..fc47a1c4944c 100644 > --- a/tools/testing/selftests/mm/khugepaged.c > +++ b/tools/testing/selftests/mm/khugepaged.c > @@ -374,18 +374,22 @@ static void pop_settings(void) > write_settings(current_settings()); > } > > -static void restore_settings(int sig) > +static void restore_settings_atexit(void) > { > if (skip_settings_restore) > - goto out; > + return; > > printf("Restore THP and khugepaged settings..."); > write_settings(&saved_settings); > success("OK"); > - if (sig) > - exit(EXIT_FAILURE); > -out: > - exit(exit_status); > + > + skip_settings_restore = true; > +} > + > +static void restore_settings(int sig) > +{ > + /* exit() will invoke the restore_settings_atexit handler. */ > + exit(sig ? EXIT_FAILURE : exit_status); > } > > static void save_settings(void) > @@ -415,6 +419,7 @@ static void save_settings(void) > > success("OK"); > > + atexit(restore_settings_atexit); > signal(SIGTERM, restore_settings); > signal(SIGINT, restore_settings); > signal(SIGHUP, restore_settings); Reviewed-by: David Hildenbrand Might similarly come in handy for the cow tests. Can be done later. -- Cheers, David / dhildenb