From patchwork Thu Jul 13 13:54:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13312257 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 827A4C001DF for ; Thu, 13 Jul 2023 13:55:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E21AE90001A; Thu, 13 Jul 2023 09:55:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D7EB790000B; Thu, 13 Jul 2023 09:55:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C201590001A; Thu, 13 Jul 2023 09:55:01 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id AEBB590000B for ; Thu, 13 Jul 2023 09:55:01 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 7EF1E1402BC for ; Thu, 13 Jul 2023 13:55:01 +0000 (UTC) X-FDA: 81006734802.05.399A9EC Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf18.hostedemail.com (Postfix) with ESMTP id A3C521C001A for ; Thu, 13 Jul 2023 13:54:59 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689256499; a=rsa-sha256; cv=none; b=a6GVeLRi9Z4WNeTgmDHWfhakXDt745XWvLtnJyxupM2IDIn1hvptj/Ki2W8gPfYiBLMH1f jDAm3hSitYWEQrIlBZMyvejgd/HjTkNsS8g7/ZjqMw/kcKBpoUFA2tZuepV4rY7XNrvIj2 pfNBVdPW630f24hZm9aH+J+NwTO8R8k= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf18.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689256499; 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=/uEzG53FLjd2glqlFJWx0HAfJNrq3vkp38/U3IednXU=; b=gZdDRY+TYF+DvbDCrb1ytjzOrBXzAddX2hX9JhYjddK2f9EB+I3hvQ66PNc6y511ENO00D jAEjqeAwa0as/0r6SrOwBNCQsaUlO7Xr+FjHCDzXDguA0/KdXAIpa44rPY+PJayvXy/V7G H5mr9sseHTeJuSMlQaFqnhvYs2gUNsY= 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 B6F501595; Thu, 13 Jul 2023 06:55:41 -0700 (PDT) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id ACC483F73F; Thu, 13 Jul 2023 06:54:57 -0700 (PDT) From: Ryan Roberts To: Andrew Morton , Shuah Khan , =?utf-8?b?SsOpcsO0bWUgR2xpc3Nl?= , David Hildenbrand , Mark Brown , John Hubbard , Florent Revest , "Liam R. Howlett" Cc: Ryan Roberts , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH v1 5/9] selftests/mm: Fix thuge-gen test bugs Date: Thu, 13 Jul 2023 14:54:36 +0100 Message-Id: <20230713135440.3651409-6-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230713135440.3651409-1-ryan.roberts@arm.com> References: <20230713135440.3651409-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: A3C521C001A X-Stat-Signature: ii775fcbdif4if1kknh8jus39q5dodhe X-Rspam-User: X-HE-Tag: 1689256499-173324 X-HE-Meta: U2FsdGVkX1+KlncIkJ5kXj9WfoOxsWPZDQMAed5H89KK3qNRo8J8kPoUAFoQUk6rhYKSE75cqicgCTQO70E4gkZQzvj6XzSttDNJmh1DKxBHrLBIONXu8o+RmWa6BRtprSktVms3Gb+o2xjqKg0xJMHLgU7/ir/U0ppgI7hyhQaWL45SZlm0mEZj8mRknZkZl8BBQIom/EY0uOVNK/NcN2rey6Aluozn4OvA7l2ZNKrE0oyP2wa0ZRLn0sUl8VGqt/XKBdl6aDdTmys4aRjI16qcGdhpXOVHFpNZdx1x0i/0Y1U2cMWa3Lqzvre578gBTocSFquAlhQJWnBF0kmi75gSxPZKMud9iqdeaPHDyBA5d26ZobcIKClVkd8jgYtWM1/zaZL9DeYKEFMbvIHTLyLkKLCRfZj16omPbC1T1m7Gl3zl9rjkMSU/es93m7w/rQF++eKnjdzujDj5SKEi/80KQ+hyj30AJy6sCAe84YmKKS6ig+Zg9aA4RQmHgpeslePohZ8OWq7Ee8dcrby6KfgHRXQMX982j4Tht5HRzD1MD3jTfuwqY4P+QF573juolZ3QIXiR9O0i2wVls5xv3SWw6d/WIw7DjIKULokW1xUQnLjIPhDZSuf+0nkGfOBCwnjRXNDa75YOTMKhlPpq7uDc9W8+GD/K5irt+f3cFMy6+v8CpgecmlaCP5/d0Q/L4lyUp9/kqPVL37jRRxC8ptcwGM6F191dOhCJJyjPG8+OjomlKS93NyRslR56pWkoqSbSfOCATpbmCakgh36Xkuru5pP66Wc52q96h6AvpewW4WiC0H5mg6+688usGVOD2e91lbGFjNqeSEeDH4K6V3anuowvJIRCblunM3jGeRO2VSgLoyO2eoui+Gxt1p+E7h8H5HNIlspvLntJ+fYDUxhXY1oACg0CqAVF403mvfLewE8T2vJZwM4+OqbezC2MABhaeEIRKv6gb1tlvFs OEvvlm++ JIn/FIZWnY1J86Hy3rn5Duvh/ysxUqbkJIiB/xYlk7OkQxBSUdjZ49KVqN4u1h1aYijkW6xzomnqR4tL7Y3D9tdkOsdaAKcbDg30j4sjQe7IfcloK7PlB2MCUp9Gx79MzRpQUosmNllVt+F2nLagIFrEABI3R93GvEHV9 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: thuge-gen was previously only munmapping part of the mmapped buffer, which caused us to run out of 1G huge pages for a later part of the test. Fix this by munmapping the whole buffer. Based on the code, it looks like a typo rather than an intention to keep some of the buffer mapped. thuge-gen was also calling mmap with SHM_HUGETLB flag (bit 11 set), which is actually MAP_DENYWRITE in mmap context. The man page says this flag is ignored in modern kernels. I'm pretty sure from the context that the author intended to pass the MAP_HUGETLB flag so I've fixed that up too. Signed-off-by: Ryan Roberts --- tools/testing/selftests/mm/thuge-gen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/mm/thuge-gen.c b/tools/testing/selftests/mm/thuge-gen.c index 380ab5f0a534..16ed4dfa7359 100644 --- a/tools/testing/selftests/mm/thuge-gen.c +++ b/tools/testing/selftests/mm/thuge-gen.c @@ -139,7 +139,7 @@ void test_mmap(unsigned long size, unsigned flags) before, after, before - after, size); assert(size == getpagesize() || (before - after) == NUM_PAGES); show(size); - err = munmap(map, size); + err = munmap(map, size * NUM_PAGES); assert(!err); } @@ -222,7 +222,7 @@ int main(void) test_mmap(ps, MAP_HUGETLB | arg); } printf("Testing default huge mmap\n"); - test_mmap(default_hps, SHM_HUGETLB); + test_mmap(default_hps, MAP_HUGETLB); puts("Testing non-huge shmget"); test_shmget(getpagesize(), 0);