From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1JFZaB-0005bg-Jo
	for qemu-devel@nongnu.org; Thu, 17 Jan 2008 13:35:19 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1JFZaA-0005av-FT
	for qemu-devel@nongnu.org; Thu, 17 Jan 2008 13:35:19 -0500
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1JFZaA-0005ad-2Y
	for qemu-devel@nongnu.org; Thu, 17 Jan 2008 13:35:18 -0500
Received: from csl.cornell.edu ([128.84.224.10] helo=vlsi.csl.cornell.edu)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <vince@bell.csl.cornell.edu>) id 1JFZa9-0008G9-Ny
	for qemu-devel@nongnu.org; Thu, 17 Jan 2008 13:35:17 -0500
Received: from bell.csl.cornell.edu (bell.csl.cornell.edu [128.84.224.41])
	by vlsi.csl.cornell.edu (8.13.4/8.13.4) with ESMTP id m0HIZ7mu005590
	for <qemu-devel@nongnu.org>; Thu, 17 Jan 2008 13:35:12 -0500 (EST)
Date: Thu, 17 Jan 2008 13:35:07 -0500 (EST)
From: Vince Weaver <vince@csl.cornell.edu>
Message-ID: <20080117133009.P82491-100000@bell.csl.cornell.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Subject: [Qemu-devel] [patch] fix mmap 0.9.1 mmap regression in linux-user
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Hello

The 0.9.1 release segfaults on certain benchmarks under linux-user
emulation (x86 on x86).

Specifically "facerec" from the SPEC2000 benchmarks, and over half of the
SPEC2006 benchmarks.

I tracked this down to a problem in the mmap() code in linux-user.

I've attached a patch that reverts behavior back to that from 0.9.0, which
makes the benchmarks all run for me.

The problem is that after a large number of mmap() calls, the
mmap_find_vma() fuction sometimes completely destroys the memory map
table.  I can produce debug info on this if needed.  What the patch does
is make the code ignore the results of mmap_find_vma().

I'm not familiar enough with the qemu mmap() code to fix this properly...

Thanks

Vince

--- ./qemu-0.9.1-stock/linux-user/mmap.c	2008-01-06 14:38:42.000000000 -0500
+++ ./qemu-0.9.1/linux-user/mmap.c	2008-01-17 13:27:11.000000000 -0500
@@ -250,8 +250,8 @@
         /* Note: we prefer to control the mapping address. It is
            especially important if qemu_host_page_size >
            qemu_real_host_page_size */
-        p = mmap(g2h(mmap_start),
-                 host_len, prot, flags | MAP_FIXED, fd, host_offset);
+        p = mmap(real_start ? g2h(real_start) : NULL,
+                 host_len, prot, flags, fd, host_offset);
         if (p == MAP_FAILED)
             return -1;
         /* update start so that it points to the file position at 'offset' */