Received-SPF: pass (google.com: domain of linux-kernel+bounces-33141-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
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 <npache@redhat.com>
Date: Mon, 22 Jan 2024 07:08:48 -0700
Message-ID: <CAA1CXcANbz75MHKkJPEVa8AJBX4g8k7kq8i0ZCe9w_j9Oeg=ZA@mail.gmail.com>
Subject: Re: [PATCH v2] selftests: mm: fix map_hugetlb failure on 64K page
 size systems
To: Andrew Morton <akpm@linux-foundation.org>
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 <christophe.leroy@c-s.fr>, Michael Ellerman <mpe@ellerman.id.au>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

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 <akpm@linux-foundatio=
n.org> wrote:
>
> On Fri, 19 Jan 2024 06:14:29 -0700 Nico Pache <npache@redhat.com> 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 <unistd.h>
> >  #include <sys/mman.h>
> >  #include <fcntl.h>
> > +#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
>