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 EAFB5C54E67 for ; Thu, 14 Mar 2024 09:32:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3CB6F80093; Thu, 14 Mar 2024 05:32:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 37B6F80073; Thu, 14 Mar 2024 05:32:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2437880093; Thu, 14 Mar 2024 05:32:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 1571980073 for ; Thu, 14 Mar 2024 05:32:08 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id DA002140E00 for ; Thu, 14 Mar 2024 09:32:07 +0000 (UTC) X-FDA: 81895128294.27.DAAF6CF Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf10.hostedemail.com (Postfix) with ESMTP id DE217C0022 for ; Thu, 14 Mar 2024 09:32:05 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710408726; 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: in-reply-to:in-reply-to:references:references; bh=ElD7ZV89wMdNomPANITyD9nJyuyDpwx4OptZzBLJ5h0=; b=pKFJORO1B1JCDxMkc8/lsGUbwHi6BB74sZe7tRj4cAtnvMOMg3UejnXx9lEut7XY/nz5RL Bhf8sTJE14GgLtt9OCRbZXbuhvdvjOOPHSoiAeKYJCSmWL8fBH6B5ijUV1TONyloEbQfYI vzfvLn9yw4cz5oasMUTaiUKgg30+qrc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710408726; a=rsa-sha256; cv=none; b=519jNHvLcsiBnN9QjwjanfDa9hgYK85RChCY6NOpTPZXTMYhX3/0XxPhYIq2KESZK3MUzs v0dQ9uWUuxrNqI6eQAl9kOKdN3sS4zUXIvwTUIrvQhyiOd80hsgs7xlgIKoCrzl00JKC/k 97tnbhx9eCf4Z1wI1orckAXCEcTn+7w= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=none; spf=pass (imf10.hostedemail.com: domain of joey.gouly@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=joey.gouly@arm.com; dmarc=pass (policy=none) header.from=arm.com 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 C12621007; Thu, 14 Mar 2024 02:32:40 -0700 (PDT) Received: from e124191.cambridge.arm.com (e124191.cambridge.arm.com [10.1.197.45]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5499F3F762; Thu, 14 Mar 2024 02:32:03 -0700 (PDT) Date: Thu, 14 Mar 2024 09:31:55 +0000 From: Joey Gouly To: Muhammad Usama Anjum Cc: Andrew Morton , Shuah Khan , kernel@collabora.com, Ryan Roberts , linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 4/5] selftests/mm: protection_keys: save/restore nr_hugepages settings Message-ID: <20240314093155.GA3049647@e124191.cambridge.arm.com> References: <20240125154608.720072-1-usama.anjum@collabora.com> <20240125154608.720072-5-usama.anjum@collabora.com> <20240313145811.GA2896554@e124191.cambridge.arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: DE217C0022 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: wianc9pgsj46am1gozcsise6hn36zpxb X-HE-Tag: 1710408725-33686 X-HE-Meta: U2FsdGVkX1+DeFb8++bd1KiiRgEy970K1Vi89FJMEhkif2F38uczqVPGicEYYtXWpoKyfJAYLcL9v5onPpolFtepl/2+iypHiAb0WIW4Vxi+ZPKwmdCFbw8HxtOkNJeg8bPjCdV4xTZSOndH8/9g3U6GsVxO86EhoIREhfhh18CYow4RTSPP7eE3bxuBdS6ppA+ZchWAZZCikm0DNobBc7X5heWqgho+wbh+Ac+nnnm1KdGldY7TZJG1QHY53cNQjUOzlLrSAs4lAQiCXKDeTBV310tgjvujFz/dERAO1U8veppiWbq1Vfz9lY2OmVSQqu1aA6Pyl8buSxyufkWx+dyf9J1qjB6pMeizZ+a3XTeqjddImC3fIjkms+dVbKIf/zzLAESAko1zsz5TuwB0WWnzIa31QwSq7RQX6WWVfb//5dknIdNTZZm1/YhPTxPoXW65vmFFXfaetgxb+8SC77yVZdTzHJVQLh6B1zTblVp4IqQwq1pujHPm8G+lPDNBA49/kcNuqu9EJcpK2au/1mGY6aP8Eu9HbxglJXyeer0FYM1glkfZM4gTH/nC4vb3lpSYQMhPLYAzaPGYK6vDEbbEpYlCYTMSRwRF7CaVKjiLooZWvbn3qM67ggv6NiT5s+GMTJVIqJWeEXX5qPGs7Yuxy1jSIPlgAky/wLmLzztX9svwW7OFaNuje8phJrZ+w5ZjnaK1UyEl87MNjR6fRWBwsbdZCVm53CKwNDnpZLsLpAaeOQsNHxzyfyDO08c9zvh0INqngjJylPdXS9wrOHd161c1eQrQEuGOeLZw/wjJuDp+lcA+ZxDAjhk13nerIFjEiq628EqPY7reXJeDzEqGCJSA3tWxyBduL1J4Wdo= 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 Wed, Mar 13, 2024 at 11:12:58PM +0500, Muhammad Usama Anjum wrote: > On 3/13/24 7:58 PM, Joey Gouly wrote: > > Hi Muhammad, > > > > On Thu, Jan 25, 2024 at 08:46:07PM +0500, Muhammad Usama Anjum wrote: > >> Save and restore nr_hugepages before changing it during the test. A test > >> should not change system wide settings. > >> > >> Fixes: 5f23f6d082a9 ("x86/pkeys: Add self-tests") > >> Signed-off-by: Muhammad Usama Anjum > >> --- > >> tools/testing/selftests/mm/protection_keys.c | 34 ++++++++++++++++++++ > >> 1 file changed, 34 insertions(+) > >> > >> diff --git a/tools/testing/selftests/mm/protection_keys.c b/tools/testing/selftests/mm/protection_keys.c > >> index 48dc151f8fca8..f822ae31af22e 100644 > >> --- a/tools/testing/selftests/mm/protection_keys.c > >> +++ b/tools/testing/selftests/mm/protection_keys.c > >> @@ -54,6 +54,7 @@ int test_nr; > >> u64 shadow_pkey_reg; > >> int dprint_in_signal; > >> char dprint_in_signal_buffer[DPRINT_IN_SIGNAL_BUF_SIZE]; > >> +char buf[256]; > >> > >> void cat_into_file(char *str, char *file) > >> { > >> @@ -1744,6 +1745,38 @@ void pkey_setup_shadow(void) > >> shadow_pkey_reg = __read_pkey_reg(); > >> } > >> > >> +void restore_settings_atexit(void) > >> +{ > >> + cat_into_file(buf, "/proc/sys/vm/nr_hugepages"); > >> +} > >> + > >> +void save_settings(void) > >> +{ > >> + int fd; > >> + int err; > >> + > >> + if (geteuid()) > >> + return; > >> + > >> + fd = open("/proc/sys/vm/nr_hugepages", O_RDONLY); > >> + if (fd < 0) { > >> + fprintf(stderr, "error opening\n"); > >> + perror("error: "); > >> + exit(__LINE__); > >> + } > >> + > >> + /* -1 to guarantee leaving the trailing \0 */ > >> + err = read(fd, buf, sizeof(buf)-1); > >> + if (err < 0) { > >> + fprintf(stderr, "error reading\n"); > >> + perror("error: "); > >> + exit(__LINE__); > >> + } > >> + > >> + atexit(restore_settings_atexit); > >> + close(fd); > >> +} > >> + > >> int main(void) > >> { > >> int nr_iterations = 22; > >> @@ -1751,6 +1784,7 @@ int main(void) > >> > >> srand((unsigned int)time(NULL)); > >> > >> + save_settings(); > >> setup_handlers(); > >> > >> printf("has pkeys: %d\n", pkeys_supported); > >> -- > >> 2.42.0 > >> > > > > This break the tests for me: > > > > assert() at protection_keys.c::812 test_nr: 19 iteration: 1 > > running abort_hooks()... > > > > This is because some of the tests fork, so on their atexit() they will set the > > nr_hugepages back to the previous setting. Specifically the > > test_pkey_alloc_exhaust() test. > Thank you for reporting. Please can you test the following patch: > > --- a/tools/testing/selftests/mm/protection_keys.c > +++ b/tools/testing/selftests/mm/protection_keys.c > @@ -1745,9 +1745,12 @@ void pkey_setup_shadow(void) > shadow_pkey_reg = __read_pkey_reg(); > } > > +pid_t parent_pid; > + > void restore_settings_atexit(void) > { > - cat_into_file(buf, "/proc/sys/vm/nr_hugepages"); > + if (parent_pid == getpid()) > + cat_into_file(buf, "/proc/sys/vm/nr_hugepages"); > } > > void save_settings(void) > @@ -1773,6 +1776,7 @@ void save_settings(void) > exit(__LINE__); > } > > + parent_pid = getpid(); > atexit(restore_settings_atexit); > close(fd); > } > Thanks, works for me: Tested-by: Joey Gouly