Linux-kselftest Archive on lore.kernel.org
 help / color / Atom feed
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
Subject: Re: [PATCH] selftests/vm: Fix map_hugetlb length used for testing read and write
Date: Mon, 17 Feb 2020 11:10:54 -0300
Message-ID: <f863080dd219faa73bb64b05312012f74026c25c.camel@linux.ibm.com> (raw)
In-Reply-To: <59cdcd821f794a9cbd8ab315b441a7ee2e43e431.camel@linux.ibm.com>

[-- Attachment #1: Type: text/plain, Size: 2599 bytes --]

On Sat, 2020-02-15 at 03:49 -0300, Leonardo Bras wrote:
> 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.
> > 
> > Fix read_bytes() and write_bytes() by giving them the real length.
> > 
> > Also fix the call to munmap().
> > 
> > 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(-)
> > 
> > diff --git a/tools/testing/selftests/vm/map_hugetlb.c b/tools/testing/selftests/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));
> >  }
> >  
> > -static void write_bytes(char *addr)
> > +static void write_bytes(char *addr, size_t length)
> >  {
> >  	unsigned long i;
> >  
> > -	for (i = 0; i < LENGTH; i++)
> > +	for (i = 0; i < length; i++)
> >  		*(addr + i) = (char)i;
> >  }
> >  
> > -static int read_bytes(char *addr)
> > +static int read_bytes(char *addr, size_t length)
> >  {
> >  	unsigned long i;
> >  
> >  	check_bytes(addr);
> > -	for (i = 0; i < LENGTH; i++)
> > +	for (i = 0; i < length; i++)
> >  		if (*(addr + i) != (char)i) {
> >  			printf("Mismatch at %lu\n", i);
> >  			return 1;
> > @@ -96,11 +96,11 @@ int main(int argc, char **argv)
> >  
> >  	printf("Returned address is %p\n", addr);
> >  	check_bytes(addr);
> > -	write_bytes(addr);
> > -	ret = read_bytes(addr);
> > +	write_bytes(addr, length);
> > +	ret = read_bytes(addr, length);
> >  
> >  	/* 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>
Sorry, typo.
Reviewed-by: Leonardo Bras <leonardo@linux.ibm.com>

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply index

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-06  8:42 Christophe Leroy
2020-02-15  6:49 ` Leonardo Bras
2020-02-17 14:10   ` Leonardo Bras [this message]
2020-02-27 17:03 ` Christophe Leroy

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f863080dd219faa73bb64b05312012f74026c25c.camel@linux.ibm.com \
    --to=leonardo@linux.ibm.com \
    --cc=christophe.leroy@c-s.fr \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linuxppc-dev@lists.ozlabs.org \
    --cc=mpe@ellerman.id.au \
    --cc=shuah@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-kselftest Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-kselftest/0 linux-kselftest/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-kselftest linux-kselftest/ https://lore.kernel.org/linux-kselftest \
		linux-kselftest@vger.kernel.org
	public-inbox-index linux-kselftest

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kselftest


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git