From patchwork Wed May 15 09:36:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13664940 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 CD979C25B75 for ; Wed, 15 May 2024 09:37:02 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F81D6B0096; Wed, 15 May 2024 05:37:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 581BC6B009F; Wed, 15 May 2024 05:37:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 422846B00F0; Wed, 15 May 2024 05:37:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 222A76B0096 for ; Wed, 15 May 2024 05:37:02 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 9BAFFA0508 for ; Wed, 15 May 2024 09:37:01 +0000 (UTC) X-FDA: 82120126242.30.7118E6F Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf30.hostedemail.com (Postfix) with ESMTP id 0E4808001D for ; Wed, 15 May 2024 09:36:58 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@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=1715765819; 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:in-reply-to:references:references; bh=V1hD2OADbtQxHRJVDyKFEZJi+Pi9K/ReTRcMInFlQu8=; b=iIdND1qQjG2Ce6Ab+xTjsnM9VrfAGHj/pEwkatvmuH2Yh7eVc/Nca/98B5EGzOL/PbW1RF VPOaZMAuGe5KMMYwM3HXocl+cq0vSU5ieXp5Ifeu68MBxFlPqwGZ/WNhdt3GElMkgvgGH/ zXKH9x8Fe9dCI+AMpbmrWd7p6uFuifU= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715765819; a=rsa-sha256; cv=none; b=ow+reNCQufbT0fAH+592pW190HQqOJExTKyYAsItNPqjxriwhlIpMiCfZfyyu4hUKlsxNo XgoPHk4FMrAx8LGtGg3YyrQ2dp/GXljEX6xzTluzZOnpkc7XzLWoAlbZ1ilptmazP3Ncp8 pHEFIFS8UlkkjcV4eUK7XR7ABKSncYA= 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 BD0F51042; Wed, 15 May 2024 02:37:22 -0700 (PDT) Received: from e116581.blr.arm.com (e116581.arm.com [10.162.42.15]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0AE0F3F7A6; Wed, 15 May 2024 02:36:54 -0700 (PDT) From: Dev Jain To: akpm@linux-foundation.org, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Anshuman.Khandual@arm.com, sjayaram@akamai.com, Dev Jain , stable@vger.kernel.org Subject: [PATCH 1/2] selftests/mm: compaction_test: Fix incorrect write of zero to nr_hugepages Date: Wed, 15 May 2024 15:06:32 +0530 Message-Id: <20240515093633.54814-2-dev.jain@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515093633.54814-1-dev.jain@arm.com> References: <20240515093633.54814-1-dev.jain@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 0E4808001D X-Stat-Signature: 9zhdae3gg759wmci8con5wfiwoidk1qf X-HE-Tag: 1715765818-600405 X-HE-Meta: U2FsdGVkX18RvTbOYYqvyzByQ5X8WM8H5ZTQts5Zzc7oud8KrdVhJWrLOEAkJbB82obiKXOx+99+oUmaU8X1JisjD5bzcSj/3YcGd9c+8sk4rWCvH8jslvy2ysn7/nuFslaTU/14tOs9WVkn6SU4iMLX6BMRBT8u6aODguBnumZ3s7dqpLSz/PzOf410UF5edlCzLPt6CYJGphIhHRUPkxvk0GDv9XbH8OyJ3Ld2ZW+hqclALlHgYDWQFH2GcqrB6q1TxtUlmoxtj1JSnZfxk9NgThUmjRPWvJwyHvMq8fum+TPf8S6PiSi7b9sXBNEkg5LE3TgtWETb4Z5HT5xbgFtFXBENtHCF58JP5lC/Mv4BEZLMvmWcXT95ufLWC4vawcoey4uS0JE7ZBsGIXFTdre6/sofTSZ3pkxdvt74vZH1R0V4zLE0xtLBkH0ywl7EPtaaehpxyLRsAgbxGjjV+E4EhPv8Q/l6kTqymA6K03ZpcyJ1i0zOhDavLTGFEmtoOtSIyGSpF9tNDjGC/7Ge7MYmTcd+ZcTxM4skefYpzaq23Cm1YVQnmBW2fcNI9YTsAtmTfSBSGVSF1xQbGZwsJKwLfxhUDnH+3WUetqpsaVptlWUQMqgka13TMABxbq0TyBnLAk/tAlWBmzv+ehE6IDV/MGg/Deo8vU6ezAbs1+W2BBJUyExk7dj1+BlQ6XCB/wJrgQuwnrNmmcPOirAquLuzt7ovPW7g6NjScpgXPt4gIpWtjbIr6T07/8Zkby1v2t/g2GKYcP/H3nHurah2TfDh4Up9OtWyb8NecD28ySgUnwBrzhFyjgf3fHeY8TeEBs1+l9Er2EFD2LY8uCEwawV/FJnfEOQGrcx+OLABJwzUwfw/Wi5HlwkSzlJt7+MAAk0fqIPPhI5UTGw+CGPNlC778lvfYfIE68RlHTsti730JyuHFIR+bQKMd/D2gs0s1jVP2FZDmXjI3nxPg0G z67Yio/W Cseq/NAQWP1g22+JCaH9nmJi5IK5Hlv36bUMuN8Sp185wqws21woaimn3okOxfYqcjH95sRHpMuwAg9476OBQlHpYediexndMowTliKYjqPeKn4QCFRdi8AILHrvrFoBlcr42hZekEu2dru81YY+ljcgpv/I83DbkS5oscvJq9VGhnkRTK4N3+87LOvHVb6g7/IXd9VgL5YU5bIQTXwA9HVrwN1Sp3/WqaLU1ckd8AujTTlRJtlkI+XhI0ur2Vo3BHSl4XzXEcG7Rh6Y= 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: nr_hugepages is not set to zero because the file offset has not been reset after read(). Fix that using lseek(). Fixes: bd67d5c15cc1 ("Test compaction of mlocked memory") Cc: stable@vger.kernel.org Signed-off-by: Dev Jain --- Merge dependency: https://lore.kernel.org/all/20240513082842.4117782-1-dev.jain@arm.com/ Andrew, does it sound reasonable to have the fixes tag in the above patch too, along with this series? tools/testing/selftests/mm/compaction_test.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/testing/selftests/mm/compaction_test.c b/tools/testing/selftests/mm/compaction_test.c index 533999b6c284..c5be395f8363 100644 --- a/tools/testing/selftests/mm/compaction_test.c +++ b/tools/testing/selftests/mm/compaction_test.c @@ -107,6 +107,8 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size) goto close_fd; } + lseek(fd, 0, SEEK_SET); + /* Start with the initial condition of 0 huge pages*/ if (write(fd, "0", sizeof(char)) != sizeof(char)) { ksft_print_msg("Failed to write 0 to /proc/sys/vm/nr_hugepages: %s\n", From patchwork Wed May 15 09:36:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13664941 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 9B7BCC25B75 for ; Wed, 15 May 2024 09:37:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 18DC06B03E4; Wed, 15 May 2024 05:37:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 116446B03E5; Wed, 15 May 2024 05:37:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EF8646B03E6; Wed, 15 May 2024 05:37:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C9A066B03E4 for ; Wed, 15 May 2024 05:37:04 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6F7B316140C for ; Wed, 15 May 2024 09:37:04 +0000 (UTC) X-FDA: 82120126368.12.953D8D3 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id BB8D4100010 for ; Wed, 15 May 2024 09:37:02 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715765822; a=rsa-sha256; cv=none; b=4SnUphSiZqKn53hcuXgPcCnZKgJihczxWom8aKrL6xkT+tG3Hem3CBvWp7G1/9SG8xPqHg ++mvknEBFno5bs88Pix2VRW2DDndwx7q86ZCl11oNvKt3zJcQOnsOygAgHFvNXt+umfS6Q yc3jvCq6gMC5wE4DKxzxNtZV/g2aqQI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of dev.jain@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=dev.jain@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=1715765822; 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:in-reply-to:references:references; bh=taztA4X9SYAad6MljQhp5byUR0uDlX1bSOG8xe6+6QA=; b=l5+wd9t9TnfFfbm+Pf++guMWw0G0cBa72oU71RfV1bVasLr4Fife5US5G3YIr7pHXNb6ID TLNawWzDKNrxHxgwtjg7fRHCByqBZ116TrmLxTVcAoWXaso5HjfrHO43VyzwM3ehEAuiyv 1NQ6kfVs9lHiS3N3c9Yn8PSLmIQIvVw= 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 A2FDD1474; Wed, 15 May 2024 02:37:26 -0700 (PDT) Received: from e116581.blr.arm.com (e116581.arm.com [10.162.42.15]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B2AD63F7A6; Wed, 15 May 2024 02:36:58 -0700 (PDT) From: Dev Jain To: akpm@linux-foundation.org, shuah@kernel.org Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Anshuman.Khandual@arm.com, sjayaram@akamai.com, Dev Jain , stable@vger.kernel.org Subject: [PATCH 2/2] selftests/mm: compaction_test: Fix trivial test success and reduce probability of OOM-killer invocation Date: Wed, 15 May 2024 15:06:33 +0530 Message-Id: <20240515093633.54814-3-dev.jain@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240515093633.54814-1-dev.jain@arm.com> References: <20240515093633.54814-1-dev.jain@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: BB8D4100010 X-Rspam-User: X-Rspamd-Server: rspam12 X-Stat-Signature: 7ap6jpeq9wnxwaezi7oowzywx84wep7f X-HE-Tag: 1715765822-851875 X-HE-Meta: U2FsdGVkX1/9nCSIC+MioRra6YgmY8VmUg7tccvQ6TzNUTAMBU3FDu4WiobESVdq7lJGOAlwNFRQzCZMsEYziWwogtfnkUNNA+o/JuRQNd6AaGr+/dbkWxmXzwUk5NOvf/obQh7GfNEJtBl+RADGzefVNFiWtwPEcCjHEsdIfai5lpycUESbKb3kvQqOKc9Nlhi6SLewkFzIOX2/FVJ4aPDh5RHukx+fcE03OCfHeuE8lkn1lQxfovgyKQO5l/HQvDhcT7qXrxMbn+9DgC4iYI9NqAmVxDrLBnjitG8sYmnD5egwHzxLgWyt2uCELNgFyfkQQrk76KoT5f0Aa+IxjpKDBmzZ5HhXyf1pG7ijOyKBjYE+yuAVGxkF1k8AcSjW/lFD50IsVUM44VRYIlp2B3HAgyjKcr7DexM4soMkUoHzEuIxVKrAcPm5Iry4cSGx4bKc7sbIphaUrduOVH6NxdmmkNIscmOvpVCsGIZW8J2R+yb3rO7rHeCDkmUSGWVcZmfiDl/mN62SH/yJRbamX3RQfmB01wCsV9u+APSfkXhFr042NndB527tqxLaXAW2pROb71pQKXuKYGK+XrnVevM0J0e613uN9oxK1TeB+hV4ION0JgEqN/RwNchAeMlKn1Wtmh3NyR+Tca++lCbv/LrjPVmXVJaxAdABt9IBiSvPubEPiq6kvQVvt1OGu988HsiyrKivI0FvgySJKfYBtkQKMnFQ6GzNbiUF6iRMnJdIpOr9ey/DuFzOWqoGnkSMHN0wqdiAKS0qrD9ewFMaKxHV9ujM48zCc2nOjZ0EhOI1BcZxHx706pK70f+SkN6aOC61/M7jYoHTGa58FEkeiIGhFKcgOoavcPlOYuSjdecjGnpSMEqgVENbaSB0FnUItGZKXSq4ILNKYU3L3LEdbYphR2pM9MrF2Zhuppz3O8Y7cvXngdbOHpYWqWTgBgZRg9li53SWmJMNEEQBSqV tksMOJHT bDnCwIXWsAxTDf4o+LCOTrUQ+9EION3RSkp+mCPujGOB5llQ6dXKfY6skD0jWAzpwHxj37VM/6ZhOYLmcAE2xAOmUly+6DzGNIVHyiQAnjoL6rYCRg5puryzS6x7GUmJK7kvABDssK7UY/BzG1tBT7zNy6jovw6y2rwW8FKnDqQ8xA6/DufP1jtC3SsUPY8jsRdDARxQaRck8aYKzcjHles/NAl/wFX8VnnpHGA/4P6Q2cDrCsY/+3ewqbNfgZyTLZ6n0kkGoJv8bNyI= 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: Reset nr_hugepages to zero before the start of the test. If a non-zero number of hugepages is already set before the start of the test, the following problems arise: - The probability of the test getting OOM-killed increases. Proof: The test wants to run on 80% of available memory to prevent OOM-killing (see original code comments). Let the value of mem_free at the start of the test, when nr_hugepages = 0, be x. In the other case, when nr_hugepages > 0, let the memory consumed by hugepages be y. In the former case, the test operates on 0.8 * x of memory. In the latter, the test operates on 0.8 * (x - y) of memory, with y already filled, hence, memory consumed is y + 0.8 * (x - y) = 0.8 * x + 0.2 * y > 0.8 * x. Q.E.D - The probability of a bogus test success increases. Proof: Let the memory consumed by hugepages be greater than 25% of x, with x and y defined as above. The definition of compaction_index is c_index = (x - y)/z where z is the memory consumed by hugepages after trying to increase them again. In check_compaction(), we set the number of hugepages to zero, and then increase them back; the probability that they will be set back to consume at least y amount of memory again is very high (since there is not much delay between the two attempts of changing nr_hugepages). Hence, z >= y > (x/4) (by the 25% assumption). Therefore, c_index = (x - y)/z <= (x - y)/y = x/y - 1 < 4 - 1 = 3 hence, c_index can always be forced to be less than 3, thereby the test succeeding always. Q.E.D NOTE: This patch depends on the previous one. Fixes: bd67d5c15cc1 ("Test compaction of mlocked memory") Cc: stable@vger.kernel.org Signed-off-by: Dev Jain --- tools/testing/selftests/mm/compaction_test.c | 72 ++++++++++++++------ 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/mm/compaction_test.c b/tools/testing/selftests/mm/compaction_test.c index c5be395f8363..2ae059989771 100644 --- a/tools/testing/selftests/mm/compaction_test.c +++ b/tools/testing/selftests/mm/compaction_test.c @@ -82,12 +82,15 @@ int prereq(void) return -1; } -int check_compaction(unsigned long mem_free, unsigned int hugepage_size) +int check_compaction(unsigned long mem_free, unsigned int hugepage_size, + int initial_nr_hugepages) { int fd, ret = -1; int compaction_index = 0; - char initial_nr_hugepages[10] = {0}; char nr_hugepages[10] = {0}; + char init_nr_hugepages[10] = {0}; + + sprintf(init_nr_hugepages, "%d", initial_nr_hugepages); /* We want to test with 80% of available memory. Else, OOM killer comes in to play */ @@ -101,23 +104,6 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size) goto out; } - if (read(fd, initial_nr_hugepages, sizeof(initial_nr_hugepages)) <= 0) { - ksft_print_msg("Failed to read from /proc/sys/vm/nr_hugepages: %s\n", - strerror(errno)); - goto close_fd; - } - - lseek(fd, 0, SEEK_SET); - - /* Start with the initial condition of 0 huge pages*/ - if (write(fd, "0", sizeof(char)) != sizeof(char)) { - ksft_print_msg("Failed to write 0 to /proc/sys/vm/nr_hugepages: %s\n", - strerror(errno)); - goto close_fd; - } - - lseek(fd, 0, SEEK_SET); - /* Request a large number of huge pages. The Kernel will allocate as much as it can */ if (write(fd, "100000", (6*sizeof(char))) != (6*sizeof(char))) { @@ -140,8 +126,8 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size) lseek(fd, 0, SEEK_SET); - if (write(fd, initial_nr_hugepages, strlen(initial_nr_hugepages)) - != strlen(initial_nr_hugepages)) { + if (write(fd, init_nr_hugepages, strlen(init_nr_hugepages)) + != strlen(init_nr_hugepages)) { ksft_print_msg("Failed to write value to /proc/sys/vm/nr_hugepages: %s\n", strerror(errno)); goto close_fd; @@ -165,6 +151,42 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size) return ret; } +int set_zero_hugepages(int *initial_nr_hugepages) +{ + int fd, ret = -1; + char nr_hugepages[10] = {0}; + + fd = open("/proc/sys/vm/nr_hugepages", O_RDWR | O_NONBLOCK); + if (fd < 0) { + ksft_print_msg("Failed to open /proc/sys/vm/nr_hugepages: %s\n", + strerror(errno)); + goto out; + } + + if (read(fd, nr_hugepages, sizeof(nr_hugepages)) <= 0) { + ksft_print_msg("Failed to read from /proc/sys/vm/nr_hugepages: %s\n", + strerror(errno)); + goto close_fd; + } + + lseek(fd, 0, SEEK_SET); + + /* Start with the initial condition of 0 huge pages */ + if (write(fd, "0", sizeof(char)) != sizeof(char)) { + ksft_print_msg("Failed to write 0 to /proc/sys/vm/nr_hugepages: %s\n", + strerror(errno)); + goto close_fd; + } + + *initial_nr_hugepages = atoi(nr_hugepages); + ret = 0; + + close_fd: + close(fd); + + out: + return ret; +} int main(int argc, char **argv) { @@ -175,6 +197,7 @@ int main(int argc, char **argv) unsigned long mem_free = 0; unsigned long hugepage_size = 0; long mem_fragmentable_MB = 0; + int initial_nr_hugepages; ksft_print_header(); @@ -183,6 +206,10 @@ int main(int argc, char **argv) ksft_set_plan(1); + /* start the test without hugepages reducing mem_free */ + if (set_zero_hugepages(&initial_nr_hugepages)) + return ksft_exit_fail(); + lim.rlim_cur = RLIM_INFINITY; lim.rlim_max = RLIM_INFINITY; if (setrlimit(RLIMIT_MEMLOCK, &lim)) @@ -226,7 +253,8 @@ int main(int argc, char **argv) entry = entry->next; } - if (check_compaction(mem_free, hugepage_size) == 0) + if (check_compaction(mem_free, hugepage_size, + initial_nr_hugepages) == 0) return ksft_exit_pass(); return ksft_exit_fail();