Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Message-ID: <59cdcd821f794a9cbd8ab315b441a7ee2e43e431.camel@linux.ibm.com>
Subject: Re: [PATCH] selftests/vm: Fix map_hugetlb length used for testing
 read and write
From:   Leonardo Bras <leonardo@linux.ibm.com>
To:     Christophe Leroy <christophe.leroy@c-s.fr>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Shuah Khan <shuah@kernel.org>
Cc:     linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org,
        linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org
Date:   Sat, 15 Feb 2020 03:49:38 -0300
In-Reply-To: <9a404a13c871c4bd0ba9ede68f69a1225180dd7e.1580978385.git.christophe.leroy@c-s.fr>
References: <9a404a13c871c4bd0ba9ede68f69a1225180dd7e.1580978385.git.christophe.leroy@c-s.fr>
Content-Type: multipart/signed; micalg="pgp-sha256";
        protocol="application/pgp-signature"; boundary="=-ZEi+P+decY37pq44DvhU"
User-Agent: Evolution 3.34.3 (3.34.3-1.fc31) 
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--=-ZEi+P+decY37pq44DvhU
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hello Christophe, thank you for the patch.

On Thu, 2020-02-06 at 08:42 +0000, Christophe Leroy wrote:
> Commit fa7b9a805c79 ("tools/selftest/vm: allow choosing mem size and
> page size in map_hugetlb") added the possibility to change the size
> of memory mapped for the test, but left the read and write test using
> the default value. This is unnoticed when mapping a length greater
> than the default one, but segfaults otherwise.
>=20
> Fix read_bytes() and write_bytes() by giving them the real length.
>=20
> Also fix the call to munmap().
>=20
> Fixes: fa7b9a805c79 ("tools/selftest/vm: allow choosing mem size and page=
 size in map_hugetlb")
> Cc: stable@vger.kernel.org
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
>  tools/testing/selftests/vm/map_hugetlb.c | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
>=20
> diff --git a/tools/testing/selftests/vm/map_hugetlb.c b/tools/testing/sel=
ftests/vm/map_hugetlb.c
> index 5a2d7b8efc40..6af951900aa3 100644
> --- a/tools/testing/selftests/vm/map_hugetlb.c
> +++ b/tools/testing/selftests/vm/map_hugetlb.c
> @@ -45,20 +45,20 @@ static void check_bytes(char *addr)
>  	printf("First hex is %x\n", *((unsigned int *)addr));
>  }
> =20
> -static void write_bytes(char *addr)
> +static void write_bytes(char *addr, size_t length)
>  {
>  	unsigned long i;
> =20
> -	for (i =3D 0; i < LENGTH; i++)
> +	for (i =3D 0; i < length; i++)
>  		*(addr + i) =3D (char)i;
>  }
> =20
> -static int read_bytes(char *addr)
> +static int read_bytes(char *addr, size_t length)
>  {
>  	unsigned long i;
> =20
>  	check_bytes(addr);
> -	for (i =3D 0; i < LENGTH; i++)
> +	for (i =3D 0; i < length; i++)
>  		if (*(addr + i) !=3D (char)i) {
>  			printf("Mismatch at %lu\n", i);
>  			return 1;
> @@ -96,11 +96,11 @@ int main(int argc, char **argv)
> =20
>  	printf("Returned address is %p\n", addr);
>  	check_bytes(addr);
> -	write_bytes(addr);
> -	ret =3D read_bytes(addr);
> +	write_bytes(addr, length);
> +	ret =3D read_bytes(addr, length);
> =20
>  	/* munmap() length of MAP_HUGETLB memory must be hugepage aligned */
> -	if (munmap(addr, LENGTH)) {
> +	if (munmap(addr, length)) {
>  		perror("munmap");
>  		exit(1);
>  	}

I agree with you, it's a needed fix.

FWIW:
Reviwed-by: Leonardo Bras <leonardo@linux.ibm.com>

--=-ZEi+P+decY37pq44DvhU
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: This is a digitally signed message part
Content-Transfer-Encoding: 7bit

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEMdeUgIzgjf6YmUyOlQYWtz9SttQFAl5HlIIACgkQlQYWtz9S
ttS7OxAAwH0NauZuTxADtbg3X+UGv2GluaVEy2mQL3aZfSNO6caYZ7vkFMh2x7Ot
JahcPBeMG0b9nw/lz3CNjVy9ZELdcFT/740aYibRRM2jyXRu3SCu3SKZj7FS/fg2
JGRTibi5yRoGnhyHIlukySLnUtPD8AE2uIqiwsmlBPqma8Ny7jZ5ngXeVf70vTG1
ofchi7BFHFmv2ujuMvj7PlKMoZVA+AzOu+bpK84kF8fb2GLPy5VdvIh1tVoIx0KW
VpNJSvhJTYcBYRdh8z1/FnfMWgR9wRHl7l4GC+ArAtQQJhzcaxPR5kko2VrLn29D
oxUU0CmuKGazbiJkLjD5IzLXdRs3ZD2VjZpRoTqUdZO+6rozDnt2ku4RzzTaQDQW
kOiPrF3ozMPvrNXLae85q7/XZCQUpIfzib9A2D8Tbyu86XcDkigrdeD5/IuJMkR8
9VzSYuE+RYISRmwygFHWms1CXWFrmPkurMdmNuakpbKh8wDsq5uOMR24f3gAY3EK
BJwaDMeMZgGMfZpjf4H/i2gpXxt+GQxDu8IXI8j7lpF1qMnRmszC4KZcC/4mzi4y
3qSnuDCbj9O3gwUqBXJJ/tghN/g376Q6DTe+J7pMEMJ4h+T9BaTflRBENV9USsLd
S2S0dh0mWWiXGc0JD0cTd2haFR1OubCmhpNCJduE3ORRzvTT1xI=
=oY9v
-----END PGP SIGNATURE-----

--=-ZEi+P+decY37pq44DvhU--