From patchwork Mon Jan 11 09:01:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 565706 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 94D491402BD for ; Mon, 11 Jan 2016 20:02:21 +1100 (AEDT) Received: from localhost ([::1]:52686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIYMl-0005ZG-Ld for incoming@patchwork.ozlabs.org; Mon, 11 Jan 2016 04:02:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55452) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIYMV-0005BV-HG for qemu-devel@nongnu.org; Mon, 11 Jan 2016 04:02:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIYMQ-0005Mj-38 for qemu-devel@nongnu.org; Mon, 11 Jan 2016 04:02:03 -0500 Received: from out1134-251.mail.aliyun.com ([42.120.134.251]:45767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIYMP-0005Md-Jd for qemu-devel@nongnu.org; Mon, 11 Jan 2016 04:01:58 -0500 X-Alimail-AntiSpam: AC=CONTINUE; BC=0.08428432|-1; FP=0|0|0|0|0|-1|-1|-1; HT=e01l10434; MF=chengang@emindsoft.com.cn; NM=1; PH=DS; RN=8; RT=7; SR=0; TI=SMTPD_----4RH5ev._1452502904; Received: from localhost.localdomain(mailfrom:chengang@emindsoft.com.cn ip:36.110.17.42) by smtp.aliyun-inc.com(10.147.41.199); Mon, 11 Jan 2016 17:01:49 +0800 From: chengang@emindsoft.com.cn To: riku.voipio@iki.fi, laurent@vivier.eu Date: Mon, 11 Jan 2016 17:01:05 +0800 Message-Id: <1452502867-12148-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.251 Cc: peter.maydell@linaro.org, Chen Gang , Chen Gang , qemu-devel@nongnu.org, rth@twiddle.net Subject: [Qemu-devel] [PATCH v2 1/3] 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. After this fix, for the next call for the same region, prot1 will be PAGE_VALID (not 0), so can avoid to enter "if (prot1 == 0)" case, again. Signed-off-by: Chen Gang --- linux-user/mmap.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/linux-user/mmap.c b/linux-user/mmap.c index 445e8c6..7807ed0 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c @@ -162,6 +162,8 @@ static int mmap_frag(abi_ulong real_start, flags | MAP_ANONYMOUS, -1, 0); if (p == MAP_FAILED) return -1; + page_set_flags(real_start, real_start + qemu_host_page_size, + PAGE_VALID); prot1 = prot; } prot1 &= PAGE_BITS;