From nobody Fri Dec 19 21:50:02 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510576284934760.5968461921892; Mon, 13 Nov 2017 04:31:24 -0800 (PST) Received: from localhost ([::1]:53968 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEDtR-0007QI-4Q for importer@patchew.org; Mon, 13 Nov 2017 07:31:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEDs1-0006cW-S2 for qemu-devel@nongnu.org; Mon, 13 Nov 2017 07:29:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEDrx-0000kZ-3T for qemu-devel@nongnu.org; Mon, 13 Nov 2017 07:29:45 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2346) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1eEDrw-0000hb-7j; Mon, 13 Nov 2017 07:29:41 -0500 Received: from 172.30.72.60 (EHLO DGGEMS406-HUB.china.huawei.com) ([172.30.72.60]) by dggrg04-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DKT03136; Mon, 13 Nov 2017 20:29:31 +0800 (CST) Received: from localhost (10.177.27.25) by DGGEMS406-HUB.china.huawei.com (10.3.19.206) with Microsoft SMTP Server id 14.3.361.1; Mon, 13 Nov 2017 20:29:22 +0800 From: To: , , Date: Mon, 13 Nov 2017 20:29:03 +0800 Message-ID: <1510576145-23084-4-git-send-email-zhuyijun@huawei.com> X-Mailer: git-send-email 1.8.4.msysgit.0 In-Reply-To: <1510576145-23084-1-git-send-email-zhuyijun@huawei.com> References: <1510576145-23084-1-git-send-email-zhuyijun@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.27.25] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.5A09902C.006B, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 8197e73b3ca87d9a208b7667f2e25e04 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 45.249.212.190 Subject: [Qemu-devel] [RFC 3/5] hw/arm: add scattered RAM memory region support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, shameerali.kolothum.thodi@huawei.com, zhaoshenglong@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Zhu Yijun Dig out reserved memory holes and collect scattered RAM memory regions by adding mem_list member in arm_boot_info struct. Signed-off-by: Zhu Yijun --- hw/arm/boot.c | 8 ++++ hw/arm/virt.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++= +++- include/hw/arm/arm.h | 1 + 3 files changed, 108 insertions(+), 2 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index c2720c8..30438f4 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -836,6 +836,14 @@ static void arm_load_kernel_notify(Notifier *notifier,= void *data) */ assert(!(info->secure_board_setup && kvm_enabled())); =20 + /* If machine is not virt, the mem_list will empty. */ + if (QLIST_EMPTY(&vms->bootinfo.mem_list)) { + RAMRegion *new =3D g_new(RAMRegion, 1); + new->base =3D info->loader_start; + new->size =3D info->ram_size; + QLIST_INSERT_HEAD(&vms->bootinfo.mem_list, new, next); + } + info->dtb_filename =3D qemu_opt_get(qemu_get_machine_opts(), "dtb"); =20 /* Load the kernel. */ diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ddde5e1..ff334c1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -56,6 +56,7 @@ #include "hw/smbios/smbios.h" #include "qapi/visitor.h" #include "standard-headers/linux/input.h" +#include "hw/vfio/vfio-common.h" =20 #define DEFINE_VIRT_MACHINE_LATEST(major, minor, latest) \ static void virt_##major##_##minor##_class_init(ObjectClass *oc, \ @@ -1225,6 +1226,98 @@ void virt_machine_done(Notifier *notifier, void *dat= a) virt_build_smbios(vms); } =20 +static void handle_reserved_ram_region_overlap(void) +{ + hwaddr cur_end, next_end; + RAMRegion *reg, *next_reg, *tmp_reg; + + QLIST_FOREACH(reg, &reserved_ram_regions, next) { + next_reg =3D QLIST_NEXT(reg, next); + + while (next_reg && next_reg->base <=3D (reg->base + reg->size)) { + next_end =3D next_reg->base + next_reg->size; + cur_end =3D reg->base + reg->size; + if (next_end > cur_end) { + reg->size +=3D (next_end - cur_end); + } + + tmp_reg =3D QLIST_NEXT(next_reg, next); + QLIST_REMOVE(next_reg, next); + g_free(next_reg); + next_reg =3D tmp_reg; + } + } +} + +static void update_memory_regions(VirtMachineState *vms, hwaddr ram_size) +{ + + RAMRegion *new, *reg, *last =3D NULL; + hwaddr virt_start, virt_end; + virt_start =3D vms->memmap[VIRT_MEM].base; + virt_end =3D virt_start + ram_size - 1; + + handle_reserved_ram_region_overlap(); + + QLIST_FOREACH(reg, &reserved_ram_regions, next) { + if (reg->base >=3D virt_start && reg->base < virt_end) { + if (reg->base =3D=3D virt_start) { + virt_start +=3D reg->size; + virt_end +=3D reg->size; + continue; + } else { + new =3D g_new(RAMRegion, 1); + new->base =3D virt_start; + new->size =3D reg->base - virt_start; + virt_start =3D reg->base + reg->size; + } + + if (QLIST_EMPTY(&vms->bootinfo.mem_list)) { + QLIST_INSERT_HEAD(&vms->bootinfo.mem_list, new, next); + } else { + QLIST_INSERT_AFTER(last, new, next); + } + + last =3D new; + ram_size -=3D new->size; + virt_end +=3D reg->size; + } + } + + if (ram_size > 0) { + new =3D g_new(RAMRegion, 1); + new->base =3D virt_start; + new->size =3D ram_size; + + if (QLIST_EMPTY(&vms->bootinfo.mem_list)) { + QLIST_INSERT_HEAD(&vms->bootinfo.mem_list, new, next); + } else { + QLIST_INSERT_AFTER(last, new, next); + } + } +} + +static void create_ram_alias(VirtMachineState *vms, + MemoryRegion *sysmem, + MemoryRegion *ram) +{ + RAMRegion *reg; + MemoryRegion *ram_memory; + char *nodename; + hwaddr sz =3D 0; + + QLIST_FOREACH(reg, &vms->bootinfo.mem_list, next) { + nodename =3D g_strdup_printf("ram@%" PRIx64, reg->base); + ram_memory =3D g_new(MemoryRegion, 1); + memory_region_init_alias(ram_memory, NULL, nodename, ram, sz, + reg->size); + memory_region_add_subregion(sysmem, reg->base, ram_memory); + sz +=3D reg->size; + + g_free(nodename); + } +} + static void virt_ram_memory_region_init(Notifier *notifier, void *data) { MachineState *machine =3D MACHINE(qdev_get_machine()); @@ -1232,10 +1325,15 @@ static void virt_ram_memory_region_init(Notifier *n= otifier, void *data) MemoryRegion *ram =3D g_new(MemoryRegion, 1); VirtMachineState *vms =3D container_of(notifier, VirtMachineState, ram_memory_region_init); + RAMRegion *first_mem_reg; =20 memory_region_allocate_system_memory(ram, NULL, "mach-virt.ram", machine->ram_size); - memory_region_add_subregion(sysmem, vms->memmap[VIRT_MEM].base, ram); + update_memory_regions(vms, machine->ram_size); + create_ram_alias(vms, sysmem, ram); + + first_mem_reg =3D QLIST_FIRST(&vms->bootinfo.mem_list); + vms->bootinfo.loader_start =3D first_mem_reg->base; } =20 static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) @@ -1458,7 +1556,6 @@ static void machvirt_init(MachineState *machine) vms->bootinfo.initrd_filename =3D machine->initrd_filename; vms->bootinfo.nb_cpus =3D smp_cpus; vms->bootinfo.board_id =3D -1; - vms->bootinfo.loader_start =3D vms->memmap[VIRT_MEM].base; vms->bootinfo.get_dtb =3D machvirt_dtb; vms->bootinfo.firmware_loaded =3D firmware_loaded; arm_load_kernel(ARM_CPU(first_cpu), &vms->bootinfo); diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h index ce769bd..d953026 100644 --- a/include/hw/arm/arm.h +++ b/include/hw/arm/arm.h @@ -124,6 +124,7 @@ struct arm_boot_info { bool secure_board_setup; =20 arm_endianness endianness; + QLIST_HEAD(, RAMRegion) mem_list; }; =20 /** --=20 1.8.3.1