From patchwork Fri Dec 9 08:06:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen Congyang X-Patchwork-Id: 130314 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3E3B61007D7 for ; Fri, 9 Dec 2011 19:05:04 +1100 (EST) Received: from localhost ([::1]:48428 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYvS0-0006VW-HH for incoming@patchwork.ozlabs.org; Fri, 09 Dec 2011 03:05:00 -0500 Received: from eggs.gnu.org ([140.186.70.92]:46474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYvRu-0006VP-QA for qemu-devel@nongnu.org; Fri, 09 Dec 2011 03:04:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RYvRq-0007gt-7v for qemu-devel@nongnu.org; Fri, 09 Dec 2011 03:04:54 -0500 Received: from [222.73.24.84] (port=64524 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RYvRo-0007gZ-VW for qemu-devel@nongnu.org; Fri, 09 Dec 2011 03:04:50 -0500 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 6451817008D; Fri, 9 Dec 2011 16:04:43 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id pB984fAS021903; Fri, 9 Dec 2011 16:04:41 +0800 Received: from [10.167.225.226] ([10.167.225.226]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011120916041196-373753 ; Fri, 9 Dec 2011 16:04:11 +0800 Message-ID: <4EE1C19D.6060200@cn.fujitsu.com> Date: Fri, 09 Dec 2011 16:06:53 +0800 From: Wen Congyang User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100413 Fedora/3.0.4-2.fc13 Thunderbird/3.0.4 MIME-Version: 1.0 To: qemu-devel , Jan Kiszka , Dave Anderson , HATAYAMA Daisuke References: <4EE1BF66.7030602@cn.fujitsu.com> In-Reply-To: <4EE1BF66.7030602@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-12-09 16:04:12, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-12-09 16:04:13, Serialize complete at 2011-12-09 16:04:13 X-detected-operating-system: by eggs.gnu.org: FreeBSD 6.x (1) X-Received-From: 222.73.24.84 Subject: [Qemu-devel] [RFC][PATCH 1/5 v2] Add API to create memory mapping list 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 The memory mapping list stores virtual address and physical address mapping. The folloing patch will use this information to create PT_LOAD in the vmcore. Signed-off-by: Wen Congyang --- Makefile.target | 1 + memory_mapping.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ memory_mapping.h | 29 ++++++++++++ 3 files changed, 160 insertions(+), 0 deletions(-) create mode 100644 memory_mapping.c create mode 100644 memory_mapping.h diff --git a/Makefile.target b/Makefile.target index a111521..778f514 100644 --- a/Makefile.target +++ b/Makefile.target @@ -205,6 +205,7 @@ obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o obj-$(CONFIG_NO_KVM) += kvm-stub.o obj-y += memory.o +obj-y += memory_mapping.o LIBS+=-lz QEMU_CFLAGS += $(VNC_TLS_CFLAGS) diff --git a/memory_mapping.c b/memory_mapping.c new file mode 100644 index 0000000..d83b7d7 --- /dev/null +++ b/memory_mapping.c @@ -0,0 +1,130 @@ +/* + * QEMU memory mapping + * + * Copyright Fujitsu, Corp. 2011 + * + * Authors: + * Wen Congyang + * + * This work is licensed under the terms of the GNU GPL, version 2. See + * the COPYING file in the top-level directory. + * + */ + +#include "cpu.h" +#include "cpu-all.h" +#include "memory_mapping.h" + +static MemoryMapping *last_mapping; + +static void create_new_memory_mapping(MemoryMappingList *list, + target_phys_addr_t phys_addr, + target_phys_addr_t virt_addr, + ram_addr_t length) +{ + MemoryMapping *memory_mapping, *p; + + memory_mapping = g_malloc(sizeof(MemoryMapping)); + memory_mapping->phys_addr = phys_addr; + memory_mapping->virt_addr = virt_addr; + memory_mapping->length = length; + last_mapping = memory_mapping; + list->num++; + QTAILQ_FOREACH(p, &list->head, next) { + if (p->phys_addr >= memory_mapping->phys_addr) { + QTAILQ_INSERT_BEFORE(p, memory_mapping, next); + return; + } + } + QTAILQ_INSERT_TAIL(&list->head, memory_mapping, next); + return; +} + +void create_new_memory_mapping_head(MemoryMappingList *list, + target_phys_addr_t phys_addr, + target_phys_addr_t virt_addr, + ram_addr_t length) +{ + MemoryMapping *memory_mapping; + + memory_mapping = g_malloc(sizeof(MemoryMapping)); + memory_mapping->phys_addr = phys_addr; + memory_mapping->virt_addr = virt_addr; + memory_mapping->length = length; + last_mapping = memory_mapping; + list->num++; + QTAILQ_INSERT_HEAD(&list->head, memory_mapping, next); + return; +} + +void add_to_memory_mapping(MemoryMappingList *list, + target_phys_addr_t phys_addr, + target_phys_addr_t virt_addr, + ram_addr_t length) +{ + MemoryMapping *memory_mapping; + + if (QTAILQ_EMPTY(&list->head)) { + create_new_memory_mapping(list, phys_addr, virt_addr, length); + return; + } + + if (last_mapping) { + if ((phys_addr == (last_mapping->phys_addr + last_mapping->length)) && + (virt_addr == (last_mapping->virt_addr + last_mapping->length))) { + last_mapping->length += length; + return; + } + } + + QTAILQ_FOREACH(memory_mapping, &list->head, next) { + last_mapping = memory_mapping; + if ((phys_addr == (last_mapping->phys_addr + last_mapping->length)) && + (virt_addr == (last_mapping->virt_addr + last_mapping->length))) { + last_mapping->length += length; + return; + } + + if (!(phys_addr >= (last_mapping->phys_addr)) || + !(phys_addr < (last_mapping->phys_addr + last_mapping->length))) { + /* last_mapping does not contain this region */ + continue; + } + if (!(virt_addr >= (last_mapping->virt_addr)) || + !(virt_addr < (last_mapping->virt_addr + last_mapping->length))) { + /* last_mapping does not contain this region */ + continue; + } + if ((virt_addr - last_mapping->virt_addr) != + (phys_addr - last_mapping->phys_addr)) { + /* + * last_mapping contains this region, but we should create another + * mapping region. + */ + break; + } + + /* merge this region into last_mapping */ + if ((virt_addr + length) > + (last_mapping->virt_addr + last_mapping->length)) { + last_mapping->length = virt_addr + length - last_mapping->virt_addr; + } + return; + } + + /* this region can not be merged into any existed memory mapping. */ + create_new_memory_mapping(list, phys_addr, virt_addr, length); + return; +} + +void free_memory_mapping_list(MemoryMappingList *list) +{ + MemoryMapping *p, *q; + + QTAILQ_FOREACH_SAFE(p, &list->head, next, q) { + QTAILQ_REMOVE(&list->head, p, next); + g_free(p); + } + + list->num = 0; +} diff --git a/memory_mapping.h b/memory_mapping.h new file mode 100644 index 0000000..871591d --- /dev/null +++ b/memory_mapping.h @@ -0,0 +1,29 @@ +#ifndef MEMORY_MAPPING_H +#define MEMORY_MAPPING_H + +#include "qemu-queue.h" + +typedef struct MemoryMapping { + target_phys_addr_t phys_addr; + target_ulong virt_addr; + ram_addr_t length; + QTAILQ_ENTRY(MemoryMapping) next; +} MemoryMapping; + +typedef struct MemoryMappingList { + unsigned int num; + QTAILQ_HEAD(, MemoryMapping) head; +} MemoryMappingList; + +void create_new_memory_mapping_head(MemoryMappingList *list, + target_phys_addr_t phys_addr, + target_phys_addr_t virt_addr, + ram_addr_t length); +void add_to_memory_mapping(MemoryMappingList *list, + target_phys_addr_t phys_addr, + target_phys_addr_t virt_addr, + ram_addr_t length); + +void free_memory_mapping_list(MemoryMappingList *list); + +#endif