From patchwork Thu Dec 31 07:14:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 561846 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 E3477140BC5 for ; Thu, 31 Dec 2015 18:15:45 +1100 (AEDT) Received: from localhost ([::1]:54900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEXSZ-0004CC-NQ for incoming@patchwork.ozlabs.org; Thu, 31 Dec 2015 02:15:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60085) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEXSL-0003vj-C3 for qemu-devel@nongnu.org; Thu, 31 Dec 2015 02:15:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aEXSH-0002QP-1f for qemu-devel@nongnu.org; Thu, 31 Dec 2015 02:15:29 -0500 Received: from out1134-243.mail.aliyun.com ([42.120.134.243]:59248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aEXSG-0002Pd-Lf for qemu-devel@nongnu.org; Thu, 31 Dec 2015 02:15:24 -0500 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.07757618|-1; FP=0|0|0|0|0|-1|-1|-1; HT=e01l10450; MF=chengang@emindsoft.com.cn; NM=1; PH=DS; RN=8; RT=7; SR=0; TI=SMTPD_----4PFnk1L_1451546109; Received: from localhost.localdomain(mailfrom:chengang@emindsoft.com.cn ip:36.110.17.42) by smtp.aliyun-inc.com(10.147.41.120); Thu, 31 Dec 2015 15:15:15 +0800 From: chengang@emindsoft.com.cn To: riku.voipio@iki.fi, laurent@vivier.eu Date: Thu, 31 Dec 2015 15:14:37 +0800 Message-Id: <1451546077-7969-1-git-send-email-chengang@emindsoft.com.cn> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 42.120.134.243 Cc: peter.maydell@linaro.org, Chen Gang , Chen Gang , qemu-devel@nongnu.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH] linux-user/mmap.c: Set prot page flags for the correct region in mmap_frag() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Chen Gang mmap() size in mmap_frag() is qemu_host_page_size, but the outside calls page_set_flags() may be not with qemu_host_page_size. So after mmap(), call page_set_flags() in time. Also let addr increasing step be TARGET_PAGE_SIZE, just like another areas have done. Also remote redundant varialbe p. Signed-off-by: Chen Gang --- linux-user/mmap.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 445e8c6..7920c5e 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -151,17 +151,19 @@ static int mmap_frag(abi_ulong real_start, /* get the protection of the target pages outside the mapping */ prot1 = 0; - for(addr = real_start; addr < real_end; addr++) { + for(addr = real_start; addr < real_end; addr += TARGET_PAGE_SIZE) { if (addr < start || addr >= end) prot1 |= page_get_flags(addr); } if (prot1 == 0) { /* no page was there, so we allocate one */ - void *p = mmap(host_start, qemu_host_page_size, prot, - flags | MAP_ANONYMOUS, -1, 0); - if (p == MAP_FAILED) + if (mmap(host_start, qemu_host_page_size, prot, flags | MAP_ANONYMOUS, + -1, 0) == MAP_FAILED) { return -1; + } + page_set_flags(real_start, real_start + qemu_host_page_size, + prot | PAGE_VALID); prot1 = prot; } prot1 &= PAGE_BITS;