From patchwork Thu Feb 16 14:38:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 728772 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vPKsg1TmKz9s8T for ; Fri, 17 Feb 2017 02:32:38 +1100 (AEDT) Received: from localhost ([::1]:47355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceO2s-0002ee-Bk for incoming@patchwork.ozlabs.org; Thu, 16 Feb 2017 10:32:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ceNCo-0000kk-B0 for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:38:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ceNCj-0002N3-QY for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:38:46 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:55514) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ceNCj-0002MU-Fa for qemu-devel@nongnu.org; Thu, 16 Feb 2017 09:38:41 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MK2AX-1cd09m01Kf-001Ntv; Thu, 16 Feb 2017 15:38:27 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 16 Feb 2017 15:38:13 +0100 Message-Id: <20170216143816.2384-12-laurent@vivier.eu> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20170216143816.2384-1-laurent@vivier.eu> References: <20170216143816.2384-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K0:WZOg6fF87hps4ye7wL4orEuVZ+eC9bE+LIKHGBqMGdfoIf0LkdG U/4XGJ6Fcue8SQbB9TwVWE4K7E1b0p/Pw1+E0irzqVLEM6gVDHCOA2EOyLAgeZc7hHg/cjP 25P7lOci3ikdiL9TDKERwa2EflXjAEdMuSHZlCMTPF7s/5V+J2NZZVT2AMVkKy0Li7wNKyE D8mBySTxK1AgCOM5/t+Kg== X-UI-Out-Filterresults: notjunk:1; V01:K0:007AmvymhOk=:3LeeDRWDhbZ/nQ3Yz3M6W7 EbALeYGF3sd8Y3s4+uwY91Lsl51bnuwynvfnCdPh/RJmX/IdXlFf4Q6g1yBgvicJWACO3Sc4R C+mrl8K2m+DRR+BUH3Fm+blqMrHTHlUJBVVWuHX0L4qGoizeVeCiF9n5n9rovmompvsgYjcbQ rnlmQQbx/AHZlGFnW37coyJgRl/ABWQfdQsXdCj6FMoGsDXRMGZGG310WTcxBqUMIfCSNQb7G PyqCWymnURGYgunKZsmWAuy6B5RyN8aenYnsFU8RlRRwXwmLfop/H+qhg7nEeUPFUwZaoaQVE i09VboHBBwsR5DbrzsrslbwyWND/rfDRSAnllloYZlU0SjHP467XcV3nFo7H6eyS3EUXKZtr/ MB0NzvJVjxyektQkfy+/iDaX48IlU1zE9FN0Xj4OWdyJ1lPgti+jBb773WEIvTSkEAspnxzXN +al49qIB9sBLif8x52OHzYDmHw3Y8vL75XKCb4vllPrxdc1cwCt6OGluFzDrqJM5u/jVJpOdb oPq6+lEb3O/wDSSlVcPOh9egpJ8vhZqiELNB/SrmD2X+B+1Busxdvg7kaW2+UhnF9IVpzwsw2 EOcLjTJkF5euvyL4znmy1UvnC68DYqT+WweEU9OtKICtfnxnorUFcctJjMsDq3hdvNRfhT7DN k9Gjiefbq11+msDyv6Lu+ViIcZ0Y4n2CJReS3dNLgDQp4gErsmjL5DBRDtpJpBpIPdahoZJlX XW5oPEXNQBf4zdhv X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL v2 11/14] linux-user: fix tcg/mmap test X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pranith Kumar , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Marc-André Lureau tests/tcg/mmap test fails with values other than default target page size. When creating a map beyond EOF, extra anonymous pages are added up to the target page boundary. Currently, this operation is performed only when qemu_real_host_page_size < TARGET_PAGE_SIZE, but it should be performed if the configured page size (qemu -p) is larger than qemu_real_host_page_size too. Signed-off-by: Marc-André Lureau [pranith: dropped checkpatch changes] Signed-off-by: Pranith Kumar Reviewed-by: Alex Bennée Reviewed-by: Laurent Vivier Message-Id: <20170119151533.29328-2-bobby.prani@gmail.com> Signed-off-by: Laurent Vivier --- linux-user/mmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 4ed9cad..4888f53 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -426,9 +426,9 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, may need to truncate file maps at EOF and add extra anonymous pages up to the targets page boundary. */ - if ((qemu_real_host_page_size < TARGET_PAGE_SIZE) - && !(flags & MAP_ANONYMOUS)) { - struct stat sb; + if ((qemu_real_host_page_size < qemu_host_page_size) && + !(flags & MAP_ANONYMOUS)) { + struct stat sb; if (fstat (fd, &sb) == -1) goto fail;