From patchwork Fri Nov 3 17:33:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Breno Leitao X-Patchwork-Id: 13444811 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 909B9C4167D for ; Fri, 3 Nov 2023 17:34:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BFE6128000F; Fri, 3 Nov 2023 13:34:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BAE5A8D000C; Fri, 3 Nov 2023 13:34:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A765F28000F; Fri, 3 Nov 2023 13:34:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 9824D8D000C for ; Fri, 3 Nov 2023 13:34:19 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 6D0B81402FA for ; Fri, 3 Nov 2023 17:34:19 +0000 (UTC) X-FDA: 81417341838.04.1909C21 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by imf07.hostedemail.com (Postfix) with ESMTP id BA0524000C for ; Fri, 3 Nov 2023 17:34:16 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of breno.debian@gmail.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=breno.debian@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1699032856; 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:references; bh=DOsVzD5dPrBo4Rj12h5O/1Y3xsH9YzmJIcDBJLguEZw=; b=xj8Sx6iUoAlT323f4VdOh4b/2WacyYPhbSSIzpncrpPNh8BBs0X/8ivWNH36e2arazTdYh x/PCleYvfF5QUvagM0DdXu6u7IJ3KXyQd8rmY21Pxmy9WjtJcmZ7la55a90Z5XvGWbYtTW C0rXL2ZA6ObbXW6Ryd6nuf0hKwPBcHU= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf07.hostedemail.com: domain of breno.debian@gmail.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=breno.debian@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1699032856; a=rsa-sha256; cv=none; b=4tTfwcik8fHTuhtegqDDu7zuXeye9DJitMOTT0zg2f0+yBYpmVfrQ7ijfxnCdXEP8KlqRX J7gzSxju9VnMc655cQ7ywgrhtA9IdR+/cF3MMJuv6aeltfniiP53MWCL9F390JkvlwGNh0 KHMpva6pUYsn3ZtMtKZ36y8z+P15nxs= Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-9adb9fa7200so465235166b.0 for ; Fri, 03 Nov 2023 10:34:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699032855; x=1699637655; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=DOsVzD5dPrBo4Rj12h5O/1Y3xsH9YzmJIcDBJLguEZw=; b=tLCxN6d4SeBKGhtLqP41bgF2JapCl92dbdLbu9pGudTvF8cbGU3Gwvc8Vx+n1jl6Wr 2/O+4ac1SBArnMJ+UJ28r6poUs0qtpZk2xzGFtCSjecD+87qPNePm7BQvYNOeAU1cBW5 tbC6t5KIVZkoG0cupTaoJA1OGQIlcOnSGXOMtOh8v55Fuar9j6RllN8Jgs6yXeEgbPPS 0w+SkGiJO1+px/aat0yje+d6EWE76OFzOzdRhXB6Z50tZ+oUnP7mPao6slXJYauwJy24 FDL5sLpn1uDZAGD7bbGw3uZYfXn/Daia2GUgat6ubMeO37QXOay5NwO0HrZc36hI0TVr VL5g== X-Gm-Message-State: AOJu0Yyu/MJb4TGWHNaipYqswjW8V5a/5JfEJl7rgTG47kMQQFu7jxnE tZF1Z/RsM8xEDoY3ef5+ca4= X-Google-Smtp-Source: AGHT+IHHPkQYqzAEsDCwOratzEap8eorWUATEJ6RjhGLcAazrn0o4umOSPCMJdDGBclfNs4nJoaWaw== X-Received: by 2002:a17:907:8690:b0:9b2:b15b:383d with SMTP id qa16-20020a170907869000b009b2b15b383dmr3593576ejc.11.1699032854978; Fri, 03 Nov 2023 10:34:14 -0700 (PDT) Received: from localhost (fwdproxy-cln-018.fbsv.net. [2a03:2880:31ff:12::face:b00c]) by smtp.gmail.com with ESMTPSA id w8-20020a1709067c8800b009dbe08bc793sm1137288ejo.18.2023.11.03.10.34.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 10:34:14 -0700 (PDT) From: Breno Leitao To: ryan.roberts@arm.com, akpm@linux-foundation.org, linux-kselftest@vger.kernel.org Cc: linux-mm@kvack.org Subject: [PATCH 1/2] selftests/mm: restore number of hugepages Date: Fri, 3 Nov 2023 10:33:59 -0700 Message-Id: <20231103173400.1608403-1-leitao@debian.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: BA0524000C X-Stat-Signature: jr3uaqy6wrkm8ufx7m4guw44daximchx X-Rspam-User: X-HE-Tag: 1699032856-162739 X-HE-Meta: U2FsdGVkX19dd0fMVRlMJt+Y0DMrD/HXvEwSQ7K458JKne1otIThMp0e17URFZS/LSe6nC76FwGZ3GraY94tm8j9r0d47TbGBf42y6TVjCPMmSIPvSermMxLM8YPHQsj7HlCCeh8yJUGYwy3F7uFbjJYfZ3glZfdSaQKbb7GkPi5Qf9u0+Ru87NwvsoQtHVp+cRqb7j6Thnnnnb+WjGJM+rjE2CgkDQ7WIBiU0KcezEmpPaxQAZYskbffnatgqqOCmiXxYmektM0IQzq8kBIKbqAvSf6vRVhBweeJQtndl0NLWp82JxK7VgUQu2CiVe5SqYIqfYG4G/SrHIW7553Y81CSOrfQDsKAgToY6T8V9H7IJ2V7tdWcZFBxe6AL9Xo6fw9rXDT+NhfsmkMoDMN7pLK7csxCMXx1Fa0pl+rGeDqy7Cb0K+qvKzcz3E5Lrm610seUA1jJCZK5DOeYol1hvSlveHz98sd1np8z8y0MzIB1L4q4jHQ6Psm99v6y9SUVDX/9nDGviXmf2qeHK5lR55GOqgPzC4X4LhIfNKhrlectxmRCSVAcri52S+Cs8aecFiCrOiPDYfMUSoUUf6FNLGh0LsTPKh/sMvmh9x89HIzhy5Jh069uKBeW+8q1ODzybEGr85FL8cqbYQ2PK9AuW9p8TIVLz6FF2o/Bd8nnnZnfYx3dIyag5JXbF9kHxHJDqxMLIk0YcFZSmlwWCR9fXUgh2t1F4iqwE0ZrF4XOYgqRf7szsVNbjPAadB9OPA70IlU6ca9HFGoddDJc/1hg4ES0CrjtDpSqhyjyxKMsbjE+lp0bu6eL2lgl4sTbopBCN2G3ppaNCWB1MI/OXsV/hasXMfbhF9r85sbM4JhYSp6fdif2l0yRtWzPrOzJ3Ne8593I15uFDesmYS0WbEOu0tArf7nbe5K56fBaMplU3USBu28+GncWaP6NtEixEslJ0+lcfIJC68MjBG8zDU 3jwSQxkr RjZzDlM3QAbbL8+5xe+5MYQp/kDcHF5Ts44tNsrL1lDq2FJG1rsdGXhmD8SWM5mfE3YomjM0VfdkRGSY7AEFy3NX2O01Gwauynzd08DwHXcvymNPfpbY1l1zBM3u/2Irlx5dfsUhHU0rk3VRQln1j0azneJ5qAMOK+eI4kZgH9hC1tunfTSKpbS5UvrXSVB0vp8NxGKEW3uaft/EeZjqX1Nd3LShlAHGt36WxMaD1sZE2stfbK5idA28YraXE87c7hzGsdgKWeqioteF1A8UUbc71GSycuSqvDObP2MbC9TysN4YOXUYoazB/HGlqkiSv4VXG08tOABd62XSc39kIiGLBQ/+Yv+UugfVAYU9itzy1PXg+/vykJEGSKwRCoK1tHEbvRbVWMS99r/nfCcwd6GqPO9Lp8YyarhWRHyxaYeLjRZaEKNmSgXqj/ShbBMne7J1MCzpfMCtRKc69ISg4n9sfRhEx4Wp7W0dEDDB2jC6geAPG7AdTt6ZFzd44/Uz/2Oq7b4K4eCISfcGMxmbWryoO1L5ydeotabNSlNRq1wc4vPJDciyxMC1LCBmqA+k3n9H8 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: The test mm `hugetlb_fault_after_madv` selftest needs one and only one huge page to run, thus it sets `/proc/sys/vm/nr_hugepages` to 1. The problem is that further tests require the previous number of hugepages allocated in order to succeed. Save the number of huge pages before changing it, and restore it once the test finishes, so, further tests could run successfully. Fixes: 116d57303a05 ("selftests/mm: add a new test for madv and hugetlb") Reported-by: Ryan Roberts Closes: https://lore.kernel.org/all/662df57e-47f1-4c15-9b84-f2f2d587fc5c@arm.com/ Signed-off-by: Breno Leitao --- tools/testing/selftests/mm/run_vmtests.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/testing/selftests/mm/run_vmtests.sh b/tools/testing/selftests/mm/run_vmtests.sh index cc16f6ca8533..00757445278e 100755 --- a/tools/testing/selftests/mm/run_vmtests.sh +++ b/tools/testing/selftests/mm/run_vmtests.sh @@ -223,9 +223,12 @@ CATEGORY="hugetlb" run_test ./hugepage-mremap CATEGORY="hugetlb" run_test ./hugepage-vmemmap CATEGORY="hugetlb" run_test ./hugetlb-madvise +nr_hugepages_tmp=$(cat /proc/sys/vm/nr_hugepages) # For this test, we need one and just one huge page echo 1 > /proc/sys/vm/nr_hugepages CATEGORY="hugetlb" run_test ./hugetlb_fault_after_madv +# Restore the previous number of huge pages, since further tests rely on it +echo "$nr_hugepages_tmp" > /proc/sys/vm/nr_hugepages if test_selected "hugetlb"; then echo "NOTE: These hugetlb tests provide minimal coverage. Use"