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 B48F9C47422 for ; Sun, 21 Jan 2024 04:39:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5A086B006E; Sat, 20 Jan 2024 23:39:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A09DA6B0071; Sat, 20 Jan 2024 23:39:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 920106B0072; Sat, 20 Jan 2024 23:39:13 -0500 (EST) 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 864B86B006E for ; Sat, 20 Jan 2024 23:39:13 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 04F921C0E2E for ; Sun, 21 Jan 2024 04:39:12 +0000 (UTC) X-FDA: 81702063786.15.C42026D Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf03.hostedemail.com (Postfix) with ESMTP id 1625020005 for ; Sun, 21 Jan 2024 04:39:10 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=BwQvJDCf; dmarc=none; spf=pass (imf03.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705811951; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=bRBF1+pfDeQswKi81Y17Gn+qbgBBSVOuqE4iNLQ5a0U=; b=PGeV5pJn6geAv+bt/bqLvGNVXq0ifoG0VvoODw/7amiODsoMBe5z9Ar8mZQVo0gnokGn+A 1HUnShiEJrc9y/C0fPoDcdBfxllFXOyCAt4IhQ5ttW+tjt8QEUj3d02ybtszb5I33Ld/Qz WCVxLB755obU5YZnkRxdoR/2yYTegYI= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=BwQvJDCf; dmarc=none; spf=pass (imf03.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705811951; a=rsa-sha256; cv=none; b=MaWzhFE2boSD/l4MSgCa6iRmwN6XK9MFSEH/N4bF8uw5yebAkRTQq0wKgZf/S7C8gUpNTB 29IK45LWcpOVCS9AQMM3VqGc0dEA1EgxReapXz9D0liwd9uA8hpaLyQErM3cuqXwQsuhym jf/SlV6ZSakxiTMfkv2nNdbDx3iRUNk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id EA06260B30; Sun, 21 Jan 2024 04:39:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E4ECC433F1; Sun, 21 Jan 2024 04:39:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1705811949; bh=yIOumgNOZ9bkJGMG/1d6rDyM3BTp4bkXptOAOxlqCJ0=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BwQvJDCfYfTXExSJSf3xqci+aY+1XKcLAlmsLPTzqMBhzhMhq2PXggSWvOLiKm4hh +QHW7/hx6bVrSiB8DQhLGVVLV8Oz87H9DikZnni/eOToqFCtAFXYaCwcmtUMhfHeIB 1w3YYdL40bkntnnyiotUKSCDxCiaJstu5eZJGJbo= Date: Sat, 20 Jan 2024 20:39:04 -0800 From: Andrew Morton To: Nico Pache Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, shuah@kernel.org, donettom@linux.vnet.ibm.com, Christophe Leroy , Michael Ellerman Subject: Re: [PATCH v2] selftests: mm: fix map_hugetlb failure on 64K page size systems Message-Id: <20240120203904.8f36140cd2f507b25e9a09a3@linux-foundation.org> In-Reply-To: <20240119131429.172448-1-npache@redhat.com> References: <20240119131429.172448-1-npache@redhat.com> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 1625020005 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: yzq4qow6qibty3yophjam1hmsgujz7qw X-HE-Tag: 1705811950-929978 X-HE-Meta: U2FsdGVkX18/VdZ79g0YpDtuF9vMp/R3c5wKJ7+pgRHyZ4/lSPRX/4Z24N63Z3l1h9O2YQdXBmtN5HbiDB/6KeIGq32LUyCDNEkFB1I9yWU3VpWtsxPab0k4EcLOCVhBaocPMtV+8qJNEG4/M2zscLqE9Zkimk2LE8JbTJmeREiTO1LIYogy5dneum7m2Wx0asYHGDcN9xRYtz3i5gQcen3Tx3fZUgaVS4u/XdqhhCM+s/eCY1p47uUxgzlHa4U2DsUjB4yOFEonEucnUkSq8GjvtC4ggHBRUOTHurKG8oNK+fAFCpD14W7kOSqLPMdcnF71VDeHiS6ATJ4Sem2iiryMskSTHuExxKckKbOmpjnKBcFUZGKNLcX6a2sTyc1XY+GhFkF1DdvsBWEfDQbnYKZER20/kjPiSrkBk67wEntk28o7cACSaZ8Y3JtVfdjcHqpxJ8boMpSYOQAJEaq/rzYG32gKeWyiAmMCdv5WkIIl7fA94726NQdbxcfkfqehhxDrpaVpScH2o5cEmDEXkMThMUAQJq8oNyqLLnsc1YJTnQ5kc+0rFIMKj8+/SyqLQN5kuboiFDY1DxLyUsVhrVu3RwhyDy7u1eKkvfbAXRIi9fJmZuk1Bad8DTnQKtkFLx3S0q2mbkovBwGYSE2VeWsjQWkBrS+96hAqORsQRFnDjcfrlj52Jghp1IRUbXc7qPdlxfT9oxod15xxUyBllaFFSoXt2bNFUl958Hd+bCPuJpeKLG971Hyb5AQHnw/4bVGF7skd+2CIiLpxIghpvRcZuY6jfjIbfvog1j9irdoR0Fc4OvlSj44jOlXzYtxeqfTyD7gTHMhnQTROHd5mVgw/7nEIgWpsFeqhAuDaCx5z2Xr1hHaItGXvJSd5c6RleuUXDbEbbyc8bWKU/9NQ7GnlJmaDRdrCFqPNWxS4svQAD2cGJOSANL4vAWEtdVWEU/45eBu/eNXqQCNH0m8 R0+ISXRf UARfJL/Y9Y6xlhkkVO79mBY6uhJiklafgzjeNvwmIUQhdVjmOUqCRFNTxTTBbXfCRDAZL8lWrlo68JozKzSyLypDFJsFOTPvsJsQBND0wMa3BFOJHin0O0dtK976B5T7v4wa7TcwkG3hEDnWdXKMBpclPtVOAFG4jdAhDSFRy6VrnDQGHA2b2+sdVvib6IJ83ZR4hMH8QzGkGw3strh4mNJXrjdGDoB6QG6n1C/E+B5Yvb0CZzG3BUY5ag2oE4HF0Yyagz9LmxlGm/NnO/Rk23pAZTKiLqzLNgFvvISZiCgPi598= 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 Fri, 19 Jan 2024 06:14:29 -0700 Nico Pache wrote: > On systems with 64k page size and 512M huge page sizes, the allocation > and test succeeds but errors out at the munmap. As the comment states, > munmap will failure if its not HUGEPAGE aligned. This is due to the > length of the mapping being 1/2 the size of the hugepage causing the > munmap to not be hugepage aligned. Fix this by making the mapping length > the full hugepage if the hugepage is larger than the length of the > mapping. Is Fixes: fa7b9a805c79 ("tools/selftest/vm: allow choosing mem size and page size in map_hugetlb") a suitable Fixes: target for this? > --- a/tools/testing/selftests/mm/map_hugetlb.c > +++ b/tools/testing/selftests/mm/map_hugetlb.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include "vm_util.h" > > #define LENGTH (256UL*1024*1024) > #define PROTECTION (PROT_READ | PROT_WRITE) > @@ -58,10 +59,16 @@ int main(int argc, char **argv) > { > void *addr; > int ret; > + size_t hugepage_size; > size_t length = LENGTH; > int flags = FLAGS; > int shift = 0; > > + hugepage_size = default_huge_page_size(); > + /* munmap with fail if the length is not page aligned */ > + if (hugepage_size > length) > + length = hugepage_size; > + > if (argc > 1) > length = atol(argv[1]) << 20; > if (argc > 2) { > -- > 2.43.0