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: <f863080dd219faa73bb64b05312012f74026c25c.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:   Mon, 17 Feb 2020 11:10:54 -0300
In-Reply-To: <59cdcd821f794a9cbd8ab315b441a7ee2e43e431.camel@linux.ibm.com>
References: <9a404a13c871c4bd0ba9ede68f69a1225180dd7e.1580978385.git.christophe.leroy@c-s.fr>
         <59cdcd821f794a9cbd8ab315b441a7ee2e43e431.camel@linux.ibm.com>
Content-Type: multipart/signed; micalg="pgp-sha256";
        protocol="application/pgp-signature"; boundary="=-OhqSPoXv3B77dbBkpEwa"
User-Agent: Evolution 3.34.3 (3.34.3-1.fc31) 
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--=-OhqSPoXv3B77dbBkpEwa
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Sat, 2020-02-15 at 03:49 -0300, Leonardo Bras wrote:
> Hello Christophe, thank you for the patch.
>=20
> 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 pa=
ge 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/s=
elftests/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);
> >  	}
>=20
> I agree with you, it's a needed fix.
>=20
> FWIW:
> Reviwed-by: Leonardo Bras <leonardo@linux.ibm.com>
Sorry, typo.
Reviewed-by: Leonardo Bras <leonardo@linux.ibm.com>

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

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

iQIzBAABCAAdFiEEMdeUgIzgjf6YmUyOlQYWtz9SttQFAl5Knu4ACgkQlQYWtz9S
ttRXyA//Yisq+PvM8Uzh/kxc8abgrggbW7RK8b4TqHbedTzzXA23kpqvXJZVXror
n7okrTtwXUbUtsMNlus0plf4a3UFzm8rP4M6/PPBFUgb99D/dmtkohzVZ2Kyc8Yd
FIMfsAHWS9mC7sVB6IIAjmz/79yl0Qvr7JUhMIIXUDDyfpSPNT21rDFT6JzCKz3o
JGG6BMAUXBNAUNx7V8rYvLfFhHlnqw0in28YGk9JbW7/ew9nbUF1Ob+5ZXsw3uRo
cSQ1ADKat8VB8suqG8/DxA3QZsgyN/okk/z0rRIpg6P4lH68iJz5drdfVo5Bhj6m
wQEi89mU1eVX21BiipRq22kR6CMnO3EwzRW11mLUoQSBWs9V9LqYPJOaPXm4Mxu1
cS8ZMrVuiiDo2KNCfg/0lof5GppL4Jpc4pQrYijkAv9LXJSs9g8AaN5x5d8KsIbG
7V+ogOv9czfvpER5AXwuX0S5RbTCA79SEuAdG1Zx7qRAq+dQIrCGmIeSYUVb5V9U
XwRBRby+2AtBF8YcYpwkXUlQ2AGMZvqZJsVJxMXjvUT5XeNhg9vGMnUiHbGSVJkt
aQilurNKaO49W7hY2Lwu+1RvYwAraUSXS67oURD/eMMBmNLfQgyoQtkZ1eP+i9h+
hGo9sYlOIGh7vnWAb8PD6dfBCYzkNA7Q75Tuu4hAM55I0+R3ZtM=
=l342
-----END PGP SIGNATURE-----

--=-OhqSPoXv3B77dbBkpEwa--