From nobody Tue Feb 10 20:49:03 2026 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 1510622319151768.0372989253011; Mon, 13 Nov 2017 17:18:39 -0800 (PST) Received: from localhost ([::1]:57146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEPro-0004X4-9N for importer@patchew.org; Mon, 13 Nov 2017 20:18:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEPqD-0002os-OH for qemu-devel@nongnu.org; Mon, 13 Nov 2017 20:16:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEPqC-0003ql-Ck for qemu-devel@nongnu.org; Mon, 13 Nov 2017 20:16:41 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:2291) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1eEPqB-0003pK-GF; Mon, 13 Nov 2017 20:16:40 -0500 Received: from 172.30.72.58 (EHLO DGGEMS405-HUB.china.huawei.com) ([172.30.72.58]) by dggrg05-dlp.huawei.com (MOS 4.4.6-GA FastPath queued) with ESMTP id DKW85566; Tue, 14 Nov 2017 09:16:35 +0800 (CST) Received: from localhost (10.177.27.25) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.361.1; Tue, 14 Nov 2017 09:15:58 +0800 From: To: , , Date: Tue, 14 Nov 2017 09:15:53 +0800 Message-ID: <1510622154-17224-5-git-send-email-zhuyijun@huawei.com> X-Mailer: git-send-email 1.8.4.msysgit.0 In-Reply-To: <1510622154-17224-1-git-send-email-zhuyijun@huawei.com> References: <1510622154-17224-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.0A020201.5A0A43F3.0052, 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: 165b4da8128d720285897c371ffa0918 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] [fuzzy] X-Received-From: 45.249.212.191 Subject: [Qemu-devel] [RFC 4/5] hw/arm/boot: set fdt size cell of memory node from mem_list 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 In case of accessing memory holes, we create memory fdt node by traversing mem_list and adjust memory address if the addr is not belong to RAM memory region. Signed-off-by: Zhu Yijun --- hw/arm/boot.c | 151 ++++++++++++++++++++++++++++++++++++++++++------------= ---- 1 file changed, 109 insertions(+), 42 deletions(-) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 30438f4..f4ca599 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -384,6 +384,25 @@ static void set_kernel_args_old(const struct arm_boot_= info *info) } } =20 +static char *create_memory_fdt(void *fdt, uint32_t acells, hwaddr mem_base, + uint32_t scells, hwaddr mem_len) +{ + char *nodename =3D NULL; + int rc; + + nodename =3D g_strdup_printf("/memory@%" PRIx64, mem_base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory"); + rc =3D qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", acells, mem_= base, + scells, mem_len); + if (rc < 0) { + fprintf(stderr, "couldn't set %s/reg\n", nodename); + g_free(nodename); + } + + return nodename; +} + /** * load_dtb() - load a device tree binary image into memory * @addr: the address to load the image at @@ -412,7 +431,7 @@ static int load_dtb(hwaddr addr, const struct arm_boot_= info *binfo, uint32_t acells, scells; char *nodename; unsigned int i; - hwaddr mem_base, mem_len; + RAMRegion *reg; =20 if (binfo->dtb_filename) { char *filename; @@ -464,49 +483,65 @@ static int load_dtb(hwaddr addr, const struct arm_boo= t_info *binfo, goto fail; } =20 + /* + * Turn the /memory node created before into a NOP node, then create + * /memory@addr nodes for all numa nodes respectively. + */ + qemu_fdt_nop_node(fdt, "/memory"); + if (nb_numa_nodes > 0) { - /* - * Turn the /memory node created before into a NOP node, then crea= te - * /memory@addr nodes for all numa nodes respectively. - */ - qemu_fdt_nop_node(fdt, "/memory"); - mem_base =3D binfo->loader_start; + hwaddr reg_offset =3D 0; /* region base addr offset */ + hwaddr reg_alloc_size =3D 0; /* region consumed size */ + hwaddr node_mem_size =3D 0; + RAMRegion *tmp_reg =3D QLIST_FIRST(&binfo->mem_list); + for (i =3D 0; i < nb_numa_nodes; i++) { - mem_len =3D numa_info[i].node_mem; - nodename =3D g_strdup_printf("/memory@%" PRIx64, mem_base); - qemu_fdt_add_subnode(fdt, nodename); - qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory"= ); - rc =3D qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", - acells, mem_base, - scells, mem_len); - if (rc < 0) { - fprintf(stderr, "couldn't set %s/reg for node %d\n", noden= ame, - i); - goto fail; - } + node_mem_size =3D numa_info[i].node_mem; + QLIST_FOREACH(reg, &binfo->mem_list, next) { + if (reg->base !=3D tmp_reg->base) { + continue; + } =20 - qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", i); - mem_base +=3D mem_len; - g_free(nodename); - } - } else { - Error *err =3D NULL; + if (node_mem_size >=3D (reg->size - reg_offset)) { + reg_alloc_size =3D reg->size - reg_offset; + } else { + reg_alloc_size =3D node_mem_size; + } =20 - rc =3D fdt_path_offset(fdt, "/memory"); - if (rc < 0) { - qemu_fdt_add_subnode(fdt, "/memory"); - } + nodename =3D create_memory_fdt(fdt, acells, + reg->base + reg_offset, + scells, reg_alloc_size); + if (!nodename) { + goto fail; + } + + qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", i); + g_free(nodename); =20 - if (!qemu_fdt_getprop(fdt, "/memory", "device_type", NULL, &err)) { - qemu_fdt_setprop_string(fdt, "/memory", "device_type", "memory= "); + node_mem_size -=3D reg_alloc_size; + reg_offset +=3D reg_alloc_size; + tmp_reg =3D reg; + + /* The region is depleted */ + if (reg->size =3D=3D reg_offset) { + reg_offset =3D 0; + tmp_reg =3D QLIST_NEXT(reg, next); + } + + if (node_mem_size =3D=3D 0) { + break; + } + } } + } else { + QLIST_FOREACH(reg, &binfo->mem_list, next) { + nodename =3D create_memory_fdt(fdt, acells, reg->base, + scells, reg->size); + if (!nodename) { + goto fail; + } =20 - rc =3D qemu_fdt_setprop_sized_cells(fdt, "/memory", "reg", - acells, binfo->loader_start, - scells, binfo->ram_size); - if (rc < 0) { - fprintf(stderr, "couldn't set /memory/reg\n"); - goto fail; + g_free(nodename); } } =20 @@ -814,6 +849,35 @@ static uint64_t load_aarch64_image(const char *filenam= e, hwaddr mem_base, return size; } =20 +/* Find the max size memory region after info->initrd_start. + * TODO: we may have a corner case where the memory node size may not corr= ectly + * fit into kernel/initrd/dtb Image sizes. + * */ +static RAMRegion *find_initrd_memregion(const struct arm_boot_info *info, + hwaddr *initrd_start) +{ + RAMRegion *reg, *initrd_reg =3D NULL; + hwaddr max_size =3D 0; + hwaddr addr =3D *initrd_start; + + QLIST_FOREACH(reg, &info->mem_list, next) { + if (addr < reg->base) { + if (max_size < reg->size) { + max_size =3D reg->size; + *initrd_start =3D reg->base; + initrd_reg =3D reg; + } + } else if (addr >=3D reg->base && addr < (reg->base + reg->size)) { + if (max_size < reg->base + reg->size - addr) { + max_size =3D reg->base + reg->size - addr; + initrd_reg =3D reg; + } + } + } + + return initrd_reg; +} + static void arm_load_kernel_notify(Notifier *notifier, void *data) { CPUState *cs; @@ -837,11 +901,11 @@ 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)) { + if (QLIST_EMPTY(&info->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); + QLIST_INSERT_HEAD(&info->mem_list, new, next); } =20 info->dtb_filename =3D qemu_opt_get(qemu_get_machine_opts(), "dtb"); @@ -973,14 +1037,16 @@ static void arm_load_kernel_notify(Notifier *notifie= r, void *data) uint32_t fixupcontext[FIXUP_MAX]; =20 if (info->initrd_filename) { + RAMRegion *reg =3D find_initrd_memregion(info, &info->initrd_s= tart); + initrd_size =3D load_ramdisk(info->initrd_filename, info->initrd_start, - info->ram_size - + reg->base + reg->size - info->initrd_start); if (initrd_size < 0) { initrd_size =3D load_image_targphys(info->initrd_filename, info->initrd_start, - info->ram_size - + reg->base + reg->size - info->initrd_start); } if (initrd_size < 0) { @@ -1027,7 +1093,8 @@ static void arm_load_kernel_notify(Notifier *notifier= , void *data) } fixupcontext[FIXUP_ARGPTR] =3D dtb_start; } else { - fixupcontext[FIXUP_ARGPTR] =3D info->loader_start + KERNEL_ARG= S_ADDR; + hwaddr kernel_args_addr =3D info->loader_start + KERNEL_ARGS_A= DDR; + fixupcontext[FIXUP_ARGPTR] =3D kernel_args_addr; if (info->ram_size >=3D (1ULL << 32)) { fprintf(stderr, "qemu: RAM size must be less than 4GB to b= oot" " Linux kernel using ATAGS (try passing a device t= ree" --=20 1.8.3.1