From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTAIm-00088k-Q8 for qemu-devel@nongnu.org; Tue, 30 Oct 2012 07:48:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTAIg-0003v6-0g for qemu-devel@nongnu.org; Tue, 30 Oct 2012 07:48:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTAIf-0003v2-OV for qemu-devel@nongnu.org; Tue, 30 Oct 2012 07:48:05 -0400 From: Avi Kivity Date: Tue, 30 Oct 2012 13:47:45 +0200 Message-Id: <1351597670-23031-3-git-send-email-avi@redhat.com> In-Reply-To: <1351597670-23031-1-git-send-email-avi@redhat.com> References: <1351597670-23031-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH v2 2/7] memory: limit sections in the radix tree to the actual address space size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Alexander Graf , Blue Swirl , Alex Williamson , Anthony Liguori The radix tree is statically sized to fit TARGET_PHYS_ADDR_SPACE_BITS. If a larger memory region is registered, it will overflow. Fix by limiting any section in the radix tree to the supported size. This problem was not observed earlier since artificial regions (containers and aliases) are eliminated by the memory core, leaving only device regions which have reasonable sizes. An IOMMU however cannot be eliminated by the memory core, and may have an artificial size. Signed-off-by: Avi Kivity --- exec.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/exec.c b/exec.c index b0ed593..deee8ec 100644 --- a/exec.c +++ b/exec.c @@ -2280,10 +2280,23 @@ static void register_multipage(AddressSpaceDispatch *d, MemoryRegionSection *sec section_index); } +static MemoryRegionSection limit(MemoryRegionSection section) +{ + unsigned practical_as_bits = MIN(TARGET_PHYS_ADDR_SPACE_BITS, 62); + hwaddr as_limit; + + as_limit = (hwaddr)1 << practical_as_bits; + + section.size = MIN(section.offset_within_address_space + section.size, as_limit) + - section.offset_within_address_space; + + return section; +} + static void mem_add(MemoryListener *listener, MemoryRegionSection *section) { AddressSpaceDispatch *d = container_of(listener, AddressSpaceDispatch, listener); - MemoryRegionSection now = *section, remain = *section; + MemoryRegionSection now = limit(*section), remain = limit(*section); if ((now.offset_within_address_space & ~TARGET_PAGE_MASK) || (now.size < TARGET_PAGE_SIZE)) { -- 1.7.12