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 75A7FC4725D for ; Fri, 19 Jan 2024 13:12:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D08266B0081; Fri, 19 Jan 2024 08:12:24 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id CB8B86B0082; Fri, 19 Jan 2024 08:12:24 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B81506B0085; Fri, 19 Jan 2024 08:12:24 -0500 (EST) 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 A67FB6B0081 for ; Fri, 19 Jan 2024 08:12:24 -0500 (EST) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 4CAE51C17E9 for ; Fri, 19 Jan 2024 13:12:24 +0000 (UTC) X-FDA: 81696099408.05.5DEF2CB Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf17.hostedemail.com (Postfix) with ESMTP id 2E4624001E for ; Fri, 19 Jan 2024 13:12:21 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="OuUH4I/E"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1705669942; 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=vi/ghrBJ2abck4Wwi0h7DJOTr7ObAnQ+55jlxgP3HjA=; b=isdRC/+K8OrXZW35JfvopK3o506PfLJLnes9u5Nyl+2loMoqwSnAhzwg0LIvdk5qyBbWGh K6royZik98uGeAXFzVZqEKOGuixZS58tm/j2uN60F58Sk1fEm4gR/t1j1PBoXMr9mIIgv/ DTJ3WZ3CMNy4FUfmM+NednSF7q9+e2E= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="OuUH4I/E"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf17.hostedemail.com: domain of npache@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=npache@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705669942; a=rsa-sha256; cv=none; b=51DPMIbCaSQpphCdvmaUIAfv0m09kBlY1Qh0h+SQBXvHCjwA6XrcBH+y1J2a7kD3r9sn84 nBrM03Oha1tn2xOk9Kx7GN+UL1RncnHaMdguJQT6eWaAudfzDCgHzxaC2vF2SSJvi0P9Qs 99Izi/pK/U7F863h1Ply4E96FCbSzAo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705669941; 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=vi/ghrBJ2abck4Wwi0h7DJOTr7ObAnQ+55jlxgP3HjA=; b=OuUH4I/ElixPlLjwG0toH+dcDBtPYPdQ2h+bZSbS7NLVtPUq5bZuPE6LGFWVAu6KwU6b0D GO4+xD+hQe5H3v8SpzkQFgVtyCHoCV/YNkBNQXHYaLYk/x1fA+cBIqDdzeAGRtN+xYr6bc artYrVSH6fwOYafBDEy0z4wJA+YAgY4= Received: from mail-yw1-f199.google.com (mail-yw1-f199.google.com [209.85.128.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-266-yfxajAEcNZ6Siunyq3qUNQ-1; Fri, 19 Jan 2024 08:12:20 -0500 X-MC-Unique: yfxajAEcNZ6Siunyq3qUNQ-1 Received: by mail-yw1-f199.google.com with SMTP id 00721157ae682-5f0fd486b9aso9538937b3.2 for ; Fri, 19 Jan 2024 05:12:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705669939; x=1706274739; 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=vi/ghrBJ2abck4Wwi0h7DJOTr7ObAnQ+55jlxgP3HjA=; b=f5cXB/5+43MYYUm+7XLiSgLxPxvulmBKptjxf6rWA9bMifyzmQHaQOud6IR9mCRfUa X4nJbG20kks/G48OLsPuIj8G+m/abxd3kcR+LJaBPwGv4OlA8r6SZ/cwk/I9bfuErjUi Ri6LTnTSUkZJ9ny3QR4nB4sOvmlMgSJjD4sFPEIp5LNqtAGhif1JXOzWkpHp2nRiBXV3 UqmD31DfjLU99OOHVVwmzrK9tMAgSfMub0IxTL3gqqDtN3f+dpYJAtuJqsLtJI9iTnUM rcsF3rX/GslQTP+YuvWC0tPlh6f25Gkcw08luwcNDXVq74Xm09jEAqFV1m9GGq1/kqfo BxmQ== X-Gm-Message-State: AOJu0Yybo1g+nn3KnIRwXeBrJgRHRQ0DZEGY16UPAO1jnb+aIENXut0T R18GBxfS9SVmz/G+JZ8HkDxrKUKowbeYFOgWAC1InV5F5XpJBoCwxhjSlyjNb9WfToUAn/Ou/1h n1nQfdIFOA3FTQw4y3CkrpK5Nov/E5vDWn05SkrHSHn/1+cAgM5puwQtH+3pKXfBuoay9ZkSlsb R6r7ffQdqqXxgR14C2ocBxeyo= X-Received: by 2002:a0d:c645:0:b0:5ff:a425:d64c with SMTP id i66-20020a0dc645000000b005ffa425d64cmr315874ywd.81.1705669939705; Fri, 19 Jan 2024 05:12:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IGWU7V9Q1CXIQM2Ccn6r6qwMKr0viLEcFyZjGJWi2COiELrL6Ao+cdsiwQaNT8Dcq5w8OWMxHAZin/mrp2Jjac= X-Received: by 2002:a0d:c645:0:b0:5ff:a425:d64c with SMTP id i66-20020a0dc645000000b005ffa425d64cmr315869ywd.81.1705669939501; Fri, 19 Jan 2024 05:12:19 -0800 (PST) MIME-Version: 1.0 References: <20240119125753.152354-1-npache@redhat.com> In-Reply-To: <20240119125753.152354-1-npache@redhat.com> From: Nico Pache Date: Fri, 19 Jan 2024 06:11:53 -0700 Message-ID: Subject: Re: [PATCH] selftests: mm: fix map_hugetlb failure on 64K page size systems To: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, shuah@kernel.org, donettom@linux.vnet.ibm.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 2E4624001E X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: ad17h81bh88h3iiymdijm3hsssm88o9j X-HE-Tag: 1705669941-96726 X-HE-Meta: U2FsdGVkX1+F1Pm5kyQa8H9AVnZy/CtJ1wt+2Ir1tkD8D0yafzKYbgeRkQSa3rQHI1HkUPWLR2Bgx18rPYZ/Cp4aFo6HI2ykyIfGI87BU6HdwgrjU/7VnQlw4tNwkU8iJ9EOTHFJ6Tb+UsHY0d6aIOliKMFWfnJJ62WAKRz5Dj7dTC2K1ka/iZdzJuXEHE3AQykAgv5jIwRMTKzmT2npGDng1g+0g2Awzfx65WRoNd7VOXpAsyUuEpii2oPMLHAthiw9s5Gm9tR6nVgxWjQchni0bVeiPXUkl4aQmsLYZGkE0g7ODBRC1hcdmMODkxPkF2WFhbwgrKItyw0vH8B1uGclonx3Vmrn8J2kPhD745HiGT6++pfJfAECkClQ1ky0qh2WPs7r504y4KNwgEUyVFDDZZmTn+Mqq4HQd2Io+fqkQVoeibDIFRYSw7aRYZ1+iLFC+YUBpQ2VVLC2X1vf+AVyshZhD1K39u+8hZYjw4rLK/nd8Uj/y7eVGCihNBNZNOpmHWhsARuID/VQTWfV/FgX2LJ6Lub/TsjCQG02UdAVeh17PmBNodCkMIDB/Tw3nw7utTVRyAeoHuoclSU46LMCDELT7BGTUIhRodAAdyZsle3ovn9puI7NLBNEe8jlGDA2/ClpSZGEQ3gJWGr9lRIaNVsVyRTRKsX9HMoSU2fjWb3j/LJINP3PCSjNcMuRmDpkwQ4GRGv3Ta8RIeT+NNdvs1Xft8Xrie49Z245wjL6v68GEOc/htEly8vMvrWfJwmszXR7lErTtchzJyV9wdH4Tyl92Jgeq2p5wgV3gEl4onZSSIb+rk/euqevbm5EaVSmf7//z5/dS5uFMiuLyDK0Qxumgtq/F8VX1fqhTngViXeQXb1rBD7PrBxZJZ6ybkWMyfn/dL9wePV+K+NeQlVYGKRVId2LUzWpz1j6Jvfyv5sNoQKNIKj3YO9eRxmzy9HKE0RNdN2p5nB6hHU 4gffs0vX haSuirKbsGZ6Zhxj1UpOFGSTQnnlPTT53ubiL0HeUO3ydJPF00Ak0H90tTd7RiXJPwhImlh7cA1SwoWU8+hiNXvVcoF0VQtxdXv70vrzAYAWRAfT0mXAlgT0IZFWk5ceUoh6YwaczF4Nloe3+pQkUpEfp8FnIQOmG1lyFHF0xOK6H0xVxmGWBzfvMuhKgdHOAzezU6ARGR/KBGsI6tVYbVZat5QTN/rl9GGKs7TywC8SFHCJVVVBkkMhTGHVcYt3KO6Fmd8hCuk7e3ebmnFYDK0w4+5LFZ38tzwDb6nYmA77IM0+1RASUSa6erg== 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: NACK. I accidentally sent an older version of this patch. Following up with V2. On Fri, Jan 19, 2024 at 5:58=E2=80=AFAM Nico Pache wrot= e: > > 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. > > Signed-off-by: Nico Pache > --- > tools/testing/selftests/mm/map_hugetlb.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/tools/testing/selftests/mm/map_hugetlb.c b/tools/testing/sel= ftests/mm/map_hugetlb.c > index 193281560b61..dcb8095fcd45 100644 > --- a/tools/testing/selftests/mm/map_hugetlb.c > +++ b/tools/testing/selftests/mm/map_hugetlb.c > @@ -58,10 +58,16 @@ int main(int argc, char **argv) > { > void *addr; > int ret; > + size_t maplength; > size_t length =3D LENGTH; > int flags =3D FLAGS; > int shift =3D 0; > > + maplength =3D default_huge_page_size(); > + /* mmap with fail if the length is not page */ > + if (maplength > length) > + length =3D maplength; > + > if (argc > 1) > length =3D atol(argv[1]) << 20; > if (argc > 2) { > -- > 2.43.0 >