From patchwork Tue May 21 07:43:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dev Jain X-Patchwork-Id: 13668974 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 253A9C25B74 for ; Tue, 21 May 2024 07:44:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A1BC6B008A; Tue, 21 May 2024 03:44:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5521F6B008C; Tue, 21 May 2024 03:44:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 441166B0092; Tue, 21 May 2024 03:44:26 -0400 (EDT) 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 292606B008A for ; Tue, 21 May 2024 03:44:26 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 98AF8801A9 for ; Tue, 21 May 2024 07:44:25 +0000 (UTC) X-FDA: 82141615290.16.A04E171 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf30.hostedemail.com (Postfix) with ESMTP id 097CD8000F for ; Tue, 21 May 2024 07:44:23 +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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716277464; a=rsa-sha256; cv=none; b=GU+vcWol+op+l9MNydrUHhmc0+9aOpzB1AiiXuuUshpfEb3rBLSQUuhWRdTOVy4Phjf0YM geSMiQiUVYMAdFkzhlHw/s3uwNKfKAdO/VAmSp8EHDEUtZ8a5GQt02TZSmfIo9zdahq3DA QPYWYCSS0JD7OWYUrXRxfNsN3rCb8Y0= 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716277464; 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=uHco4/l+DIy5bStEcsrRUhdcO6HXBj/kpjTeF+RtgSc=; b=g5ScWhbH2X7vCi95k00idKujBfjegUjqLJ7fE4T5BbKKFy9WfCjetz15Ht2Pij49jlz1bw zQ5XZA8KqdiBgbJe7Bf9gqvD+f5EshMIrcp2wqAMIBwbRLPQ4rmfirLc3ekydYVjdxsqpd 82CmbTKd84k4Zk748vsH2IOTVsdl2AA= 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 4435CFEC; Tue, 21 May 2024 00:44:47 -0700 (PDT) Received: from e116581.blr.arm.com (e116581.arm.com [10.162.42.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id DB03C3F641; Tue, 21 May 2024 00:44:19 -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 v2 1/3] selftests/mm: compaction_test: Fix bogus test success on Aarch64 Date: Tue, 21 May 2024 13:13:56 +0530 Message-Id: <20240521074358.675031-2-dev.jain@arm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240521074358.675031-1-dev.jain@arm.com> References: <20240521074358.675031-1-dev.jain@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 097CD8000F X-Rspam-User: X-Rspamd-Server: rspam12 X-Stat-Signature: jcyn54xush5pqnj8cn45ieexjzpi37yi X-HE-Tag: 1716277463-566777 X-HE-Meta: U2FsdGVkX1+yzNMcp9j6v4jyk2jvB0NnmigouhzRi4XjiXp5rTAblXyT+aURuxdv4fiHStZ5mAMBhBfX4VVtS/D9nky1SzSWNm74LmzuDO2GaZormDHOh0Wp6H8q7tqvQFqnH+aRcemQpJE+0DQd9DtsqovgcbZM2w8A2jPOzuIzYGL8cb7OV5vGnZyZYNRwLHIUe14+1M+5MlPgMY2sDR7HvLGJOvyn9YjmK1xB7tZ4QIH5jbXqlAZW9hN8FsbpjvPpJ6DvUy67yK2tt/8XjHYvan8M+JE5MpSXDdK7N0i3mosv/+IXBOHvWta+j2Mm0huR6sK2GFhMh6HwDsEGLp0zNocsw5wWlOwVbB7w4hueVQjpxDtjVpE+IaBSqrgljNlcTYm9DUANRsABMHuP67wTMs6AsuIa8rYGcuWzfiwehUE9sCXWY5wnYt31Fw63IbvNLUKf5ZhRb9M4GkKvryuIGigDxNizNfQBdbR0tfqsvN3uuSazuXJSVdt+hjxYrYA4WbMDJATu7Yx9raBpWmMLkX4zpGUrL9Xg8/KYP9uQ8hf1uE82TMv6ix2lWuJOrOKSb2u9xfLy+tthzASdec0rERGyzM579uLPMiNXopa7IY6V6ycSWZbuzLasrlQAXrrBvTnVJ9o8ohLs1sLR1AXc7knV1ljEKHi8Dr2bplOVxXzXv5nG8nPRqvpZ+z7/Y/LOkemlovIQnGVH/qRosQWx45A8iErSTB4ttpxq2ukU6v8XzASgiStAdtI86sy329jRsdEQ56FnwWx7Sb2orrXno/HWDWP1ogUhCJE7cDUQPDl3nnPtkDzn/S4NjxMGt4ttb2FoKvsSMlYmz93lqY19uERU1tnuLHybkwnRembGpEdJzYgvIz0P2+Zh8LeeM1Ptns9OcHtaRBVRJ8H0So+Nr+l8GQ6o//feiJ57bipXWleRYGRNksbp+T+qMXOvz1eP2tVQJHEZNaiIUMU 2YG21+M4 1ri76zdgcb8A2W3mHqpZD9XotZrpk1ZeSz2+sTapxw3mLXIvW0SeGIWdVMP6ctgPHXo8qqr+zFyAjIdeG7MWfm3fGVXnhHxAlUw4aIo7ucmSlV4SP2pw6di7kL8SrHJZI5UdmC2igZNSKHLikKoLdknNGi9IwQQFhVPYDYFSNTrzCVTr2XvJAZN4hwujbt/tXEyPmQ3k8ujWbtY6f7SzyvZbZofVUaUE85LTkWK9Tm/20QQmfSK0jlbbAUxxuSKS04V8KPQpZaxEntdY= 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: Currently, if at runtime we are not able to allocate a huge page, the test will trivially pass on Aarch64 due to no exception being raised on division by zero while computing compaction_index. Fix that by checking for nr_hugepages == 0. Anyways, in general, avoid a division by zero by exiting the program beforehand. While at it, fix a typo, and handle the case where the number of hugepages may overflow an integer. Changes in v2: - Combine with this series, handle unsigned long number of hugepages v1: - https://lore.kernel.org/all/20240513082842.4117782-1-dev.jain@arm.com/ Fixes: bd67d5c15cc1 ("Test compaction of mlocked memory") Cc: stable@vger.kernel.org Signed-off-by: Dev Jain --- tools/testing/selftests/mm/compaction_test.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/mm/compaction_test.c b/tools/testing/selftests/mm/compaction_test.c index 4f42eb7d7636..0b249a06a60b 100644 --- a/tools/testing/selftests/mm/compaction_test.c +++ b/tools/testing/selftests/mm/compaction_test.c @@ -82,12 +82,13 @@ int prereq(void) return -1; } -int check_compaction(unsigned long mem_free, unsigned int hugepage_size) +int check_compaction(unsigned long mem_free, unsigned long hugepage_size) { + unsigned long nr_hugepages_ul; int fd, ret = -1; int compaction_index = 0; - char initial_nr_hugepages[10] = {0}; - char nr_hugepages[10] = {0}; + char initial_nr_hugepages[20] = {0}; + char nr_hugepages[20] = {0}; /* We want to test with 80% of available memory. Else, OOM killer comes in to play */ @@ -134,7 +135,12 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size) /* We should have been able to request at least 1/3 rd of the memory in huge pages */ - compaction_index = mem_free/(atoi(nr_hugepages) * hugepage_size); + nr_hugepages_ul = strtoul(nr_hugepages, NULL, 10); + if (!nr_hugepages_ul) { + ksft_print_msg("ERROR: No memory is available as huge pages\n"); + goto close_fd; + } + compaction_index = mem_free/(nr_hugepages_ul * hugepage_size); lseek(fd, 0, SEEK_SET); @@ -145,11 +151,11 @@ int check_compaction(unsigned long mem_free, unsigned int hugepage_size) goto close_fd; } - ksft_print_msg("Number of huge pages allocated = %d\n", - atoi(nr_hugepages)); + ksft_print_msg("Number of huge pages allocated = %lu\n", + nr_hugepages_ul); if (compaction_index > 3) { - ksft_print_msg("ERROR: Less that 1/%d of memory is available\n" + ksft_print_msg("ERROR: Less than 1/%d of memory is available\n" "as huge pages\n", compaction_index); goto close_fd; }