From patchwork Thu Nov 7 10:41:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Apfelbaum X-Patchwork-Id: 289281 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BCDDB2C007A for ; Thu, 7 Nov 2013 21:45:14 +1100 (EST) Received: from localhost ([::1]:39498 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeN5M-00021T-9y for incoming@patchwork.ozlabs.org; Thu, 07 Nov 2013 05:45:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeN4l-0001ol-5Z for qemu-devel@nongnu.org; Thu, 07 Nov 2013 05:44:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VeN4f-0007wa-5e for qemu-devel@nongnu.org; Thu, 07 Nov 2013 05:44:35 -0500 Received: from mx1.redhat.com ([209.132.183.28]:34820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VeN4e-0007wP-Tw for qemu-devel@nongnu.org; Thu, 07 Nov 2013 05:44:29 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rA7AiQFP016934 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 7 Nov 2013 05:44:26 -0500 Received: from localhost.localdomain.com (vpn-200-52.tlv.redhat.com [10.35.200.52]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rA7Ai5qY015341; Thu, 7 Nov 2013 05:44:23 -0500 From: Marcel Apfelbaum To: qemu-devel@nongnu.org Date: Thu, 7 Nov 2013 12:41:20 +0200 Message-Id: <1383820884-29596-5-git-send-email-marcel.a@redhat.com> In-Reply-To: <1383820884-29596-1-git-send-email-marcel.a@redhat.com> References: <1383820884-29596-1-git-send-email-marcel.a@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: peter.maydell@linaro.org, ehabkost@redhat.com, mst@redhat.com, jan.kiszka@siemens.com, agraf@suse.de, lcapitulino@redhat.com, aliguori@amazon.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH for-1.7 v2 4/8] exec: don't ignore high address bits on lookup 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: "Michael S. Tsirkin" Lookup of address > target address space should return an unassigned section, instead of silently ignoring high bits. Reported-by: Luiz Capitulino Signed-off-by: Michael S. Tsirkin Signed-off-by: Marcel Apfelbaum --- exec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/exec.c b/exec.c index 79610ce..aeeaf00 100644 --- a/exec.c +++ b/exec.c @@ -197,6 +197,9 @@ static void phys_page_set_level(PhysPageEntry *lp, hwaddr *index, } } +#define TARGET_PHYS_MAX_ADDR \ + (0x1ULL << (TARGET_PHYS_ADDR_SPACE_BITS - TARGET_PAGE_BITS)) + static void phys_page_set(AddressSpaceDispatch *d, hwaddr index, hwaddr nb, uint16_t leaf) @@ -213,6 +216,10 @@ static MemoryRegionSection *phys_page_find(PhysPageEntry lp, hwaddr index, PhysPageEntry *p; int i; + if (index >= TARGET_PHYS_MAX_ADDR) { + return §ions[PHYS_SECTION_UNASSIGNED]; + } + for (i = P_L2_LEVELS - 1; i >= 0 && !lp.is_leaf; i--) { if (lp.ptr == PHYS_MAP_NODE_NIL) { return §ions[PHYS_SECTION_UNASSIGNED];