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 0D554C4725D for ; Mon, 22 Jan 2024 14:09:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 791C86B0071; Mon, 22 Jan 2024 09:09:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 71AFD6B0078; Mon, 22 Jan 2024 09:09:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5BBA66B007E; Mon, 22 Jan 2024 09:09:19 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 494096B0071 for ; Mon, 22 Jan 2024 09:09:19 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 03D88A0A56 for ; Mon, 22 Jan 2024 14:09:18 +0000 (UTC) X-FDA: 81707129238.12.F520B3B Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf21.hostedemail.com (Postfix) with ESMTP id D90721C0012 for ; Mon, 22 Jan 2024 14:09:16 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Tm/N0MHP"; spf=pass (imf21.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705932556; a=rsa-sha256; cv=none; b=gKSam/zku6/00VnE+KlnYiQqu+ZXVU8lTojUUI+CH8Ba2tNajc06j7gpCQg2GiMgwv42mi BcE+TrVLpQfz6eUJS4K0lpMZ3bWDEdpouvPkCS1auR8PU8CczRGwigBMWHO9SGUMXSGo32 amk4k7tiwFn/4EqpBcznAVywHawziW4= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="Tm/N0MHP"; spf=pass (imf21.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705932556; 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=seqmVAFBDnuLvzwL3rN06iKmJlHsjwn1tq37k8ac87U=; b=dSRbd7+cMjaPvcR7ctdqHiKMdr6KrpVnze2QWy9xhpcCKSHesM4RdDdmRW+TCM9Idsu0Kz FTQPGNDGY5m7V6PLEZ1X2mG5EekMazej7AbvU/4jdvtAiSYIMzC/xNEicbybYY+hXZIR+n 3R0Yrnh6jDaTgVti0eO55TaHKiVfe0k= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705932556; h=from:from: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; bh=seqmVAFBDnuLvzwL3rN06iKmJlHsjwn1tq37k8ac87U=; b=Tm/N0MHP1bRE93JiRT5A9fkwKpBLB4OFKQs8W7npKkfgf2htGYMjWRJSlR8K/PDacSD8SB wtPntu6lHNrLR1IeGKZ0LtbA9LTtpuypbe4ty58q3w7zy14VnLe7q+eVezMDOSzu481Mdz sIrns0YR2KlliUfXy1ZV4HB5SM2RrCs= Received: from mail-yw1-f197.google.com (mail-yw1-f197.google.com [209.85.128.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-388-F5L4rBBGNeOOA6b5AbWp9w-1; Mon, 22 Jan 2024 09:09:14 -0500 X-MC-Unique: F5L4rBBGNeOOA6b5AbWp9w-1 Received: by mail-yw1-f197.google.com with SMTP id 00721157ae682-5f38d676cecso46340157b3.0 for ; Mon, 22 Jan 2024 06:09:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705932554; x=1706537354; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=seqmVAFBDnuLvzwL3rN06iKmJlHsjwn1tq37k8ac87U=; b=EIqEzHwW57PhNcCBdYEfKZQ3RU85PB6ZNweVj8YVQ5b1HmtYc+rZhcvi7Po4pTMwt5 alLPErsNyTNHsPc2QmPfu50y1zoD7p0oyN33TR/lBzOKJyARYq2z0jL2NvsKOntuQZYh YvqeIKF4jORUQILz1rLFv005Ezwa12rPcltrqKGWVD649wqqFs110OJpZwlkSN5JHwY+ 4KQQd3udcIVJZI64ODfeiPHM9m5N/7aBdYLYQGBMGnGMovVmGDNC199jpUDSc4KoU0Qp IKEki9SwY3GDnREk5gfIt8bYlGG08uze652xG6J0F1hyVr9gO+T8gFza4Scm5wasVklG CF9A== X-Gm-Message-State: AOJu0Yx43wbcs9Lo8GQEEMkTujXzumGDkayucazu2oAb99vdBTeMBMT4 EBSU12Uzo3dHvXUPl3uytRtAKE4RTmoOPrcKvOCJnSgtwtzRV/SvCQzFzwpIhVCrE6SapvzMsaX GtHDRGwh96Oek+am2suVT64IbowyrxvDPHhyU6TylSFt10tqbgzV8xtkkITmZtKphycKxOLQp9M lBon+Tba2PFQuTBRvE11pQw58= X-Received: by 2002:a81:8411:0:b0:5ff:b07b:e534 with SMTP id u17-20020a818411000000b005ffb07be534mr1742474ywf.9.1705932554311; Mon, 22 Jan 2024 06:09:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IF5TYT+m+Db5kWU9mkYv5aX43/bLG4o8DXbKxjOnIgv6IVDOYqnnpHQAvVW5nvty8UP/kaTKK+uoXudOp0V9CI= X-Received: by 2002:a81:8411:0:b0:5ff:b07b:e534 with SMTP id u17-20020a818411000000b005ffb07be534mr1742466ywf.9.1705932554072; Mon, 22 Jan 2024 06:09:14 -0800 (PST) MIME-Version: 1.0 References: <20240119131429.172448-1-npache@redhat.com> <20240120203904.8f36140cd2f507b25e9a09a3@linux-foundation.org> In-Reply-To: <20240120203904.8f36140cd2f507b25e9a09a3@linux-foundation.org> From: Nico Pache Date: Mon, 22 Jan 2024 07:08:48 -0700 Message-ID: Subject: Re: [PATCH v2] selftests: mm: fix map_hugetlb failure on 64K page size systems To: Andrew Morton 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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: D90721C0012 X-Stat-Signature: s6chiy19rr5g9ewxngut548ebweasrrj X-Rspam-User: X-HE-Tag: 1705932556-337232 X-HE-Meta: U2FsdGVkX197gPHWWcmTVrhE1tPqn8RB+pHPVzAyCL0N0bE5C/6Hlbuyu64C0uzYgUdZfULmC7whfOpfDEwLiHfWx/1WExymWnm5EHOLL1dQqdjJWZBxPMZEIBc0lcCNyTXPh0hg0wtD2sNAwYTdx93w0M/oM1Dm/WoJoBRMTm9wEBDpL7dtSPhMFvM+wmzF2RM/e17PNMjIz7oXbu3nAVY08oW7a5KBFg36XlKKaHeMakMmQemCZ2I0Yw9vx1Rmq9NRdSesGevOwgdE6qPt3thPbYepjmEN7CVYWQ6fBQo37sSH6RpdAX2NcYYlsFisdrHnG7nxUVeuiCBwU3RCfyTvF61HU/lC04fCaOaCuVAbOjr4J55G+qxMrRoj4JtbhvLLh4E4GsuzIebW0SnaVE0aKKVeleU+gBIsKsaOaEdRpbOLmgaf88oES8LQecQ6d4XU72Ap+pxPQBDpXisOFm/YjIGBgqQDVwZhK1UjwotUrx6mbwoW7EE30Dah6ECJY+O2WLwRgr45gVmUgJIMbCCmhlLW98+IDWgOQC+sOB2SbYHPIbVaQf0iQYK7/CPmayHrw+1mdfuObvrjAFxWx/Tk0VcIIGZqY30FnI9P52+Ypn8Mck5C+62AsFL3KT11kkFsqVMMRfI3NwBjY8TmLL/GJEUKUTmE4GyeRM9u4ZWRkIk9oqGhCiVbPx9MDnCo+5y4hgfSt3VDdmiq4R+HCNyezP6k8R7jcUN8Vjg/PHe9R+3aWFs9Uz4AwuhoV3WN2kZ3QZzexUbRGlzRNqxBC3TmbgcjisVWvvKkb5sNcF1vNHDejzSlpmKvXbecmpRg1rQzU76ZrJoPm4aPkx0RIOAjrv/ysFHRxK7sNcuAgjYeeqZF5po2GIsa2b3VUHvfsVOqlWctXzZ/1/k37l6QOm8fOhb6TcTYlx5K5nKX16tiIJ2zBIWJNXRGLlVZzXgcShA25VAgSEk/1dL9e3P BlFfBZPP zByoJQ5lK7uDGDwHhJhDYOcIoeUGIiBEoAYLfdYWQ1mG4C4D7OL/XMLnTnf+P0PK+jkRxLryI7+KTG1M87NNjheQuEMDY9k+bxOx4GKSLhCR+MQln321pBefIny7Z/xaPnmDpmeP5umD1UJySYpKVEaoFr0D9kY9VNtb6zXKu9LeLG8P5juO1gL0Am3YTFbtUPRSfDyCnxTojb17jyTrf196j+oSWiTM2y8rlu1/rooTsE3F2+5SmVk2SadbcRm8X39krvgVWt68ossPn97oRhe4VmB/42BNfyrZm/MC7ApcG2bqQ7XfoxC+PvQo5q6pbZqTTpwZJsla9+iD+5IuI1/Du0pVfAevrhe2J3OJ5EeMTtmxA4dwsUyvVhg== 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: Hi Andrew, No, I think it's always been broken-- I don't think the test was written with 512M huge page sizes in mind. -- Nico On Sat, Jan 20, 2024 at 9:39=E2=80=AFPM Andrew Morton wrote: > > 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 lengt= h > > 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 =3D LENGTH; > > int flags =3D FLAGS; > > int shift =3D 0; > > > > + hugepage_size =3D default_huge_page_size(); > > + /* munmap with fail if the length is not page aligned */ > > + if (hugepage_size > length) > > + length =3D hugepage_size; > > + > > if (argc > 1) > > length =3D atol(argv[1]) << 20; > > if (argc > 2) { > > -- > > 2.43.0 >