From nobody Tue Feb 10 01:35:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1563967572; cv=none; d=zoho.com; s=zohoarc; b=N9TGudiY2Ct0/uvW5VSVtGDNxdwZeBweP4CWlDfMWeDRyiDr6GQ1VlhmEJyGO4Jp0iW6rze/buSImivQgG8N+F3MGV1e21YNGYou6K0lm63QDJGnDJ7QZgiBom9M7/Tn3WuoaC4O0ZqmKFOJcVFeLjgty4Kp4lDOLQBE1mcrRvE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563967572; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=qEbkxalxQnUf+RpWNEKGEE+JIT4YT1ZYNsNEVYut3T0=; b=QFRKD97u6vQBNRKrM8wRUXrI8H3s1fj4r5xiVrAN3vL6gn+f8232qDY8UVPRmmMIg6FsmNe812/4ALkkZVuq113nGy4ewywlkQqg5pICJQwMMbdRLr/Q5bL6bWLN9jOeVhKfGJbfb7BQji5Nwyk55o37HqfmAtkfbb6Mnb4USyo= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1563967572803182.55001014311551; Wed, 24 Jul 2019 04:26:12 -0700 (PDT) Received: from localhost ([::1]:50598 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFPP-0001dR-LQ for importer@patchew.org; Wed, 24 Jul 2019 07:26:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55130) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqFP0-0000Bx-LW for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:25:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqFOz-0002HM-Bg for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:25:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36886) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqFOz-0002Gk-3w for qemu-devel@nongnu.org; Wed, 24 Jul 2019 07:25:45 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 69A38300413A; Wed, 24 Jul 2019 11:25:44 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-46.ams2.redhat.com [10.36.117.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FF7419C70; Wed, 24 Jul 2019 11:25:37 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 13:25:29 +0200 Message-Id: <20190724112531.232260-2-sgarzare@redhat.com> In-Reply-To: <20190724112531.232260-1-sgarzare@redhat.com> References: <20190724112531.232260-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 24 Jul 2019 11:25:44 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/3] loader: Handle memory-mapped ELFs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Julio Montes , "Dr . David Alan Gilbert" , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This patch allows handling an ELF memory-mapped, taking care the reference count of the GMappedFile* passed through rom_add_elf_program(). In this case, the 'data' pointer is not heap-allocated, so we cannot free it. Suggested-by: Paolo Bonzini Signed-off-by: Stefano Garzarella --- hw/core/loader.c | 37 ++++++++++++++++++++++++++++++------- include/hw/elf_ops.h | 2 +- include/hw/loader.h | 5 +++-- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 425bf69a99..637d448f42 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -836,6 +836,7 @@ struct Rom { int isrom; char *fw_dir; char *fw_file; + GMappedFile *mapped_file; =20 bool committed; =20 @@ -846,10 +847,25 @@ struct Rom { static FWCfgState *fw_cfg; static QTAILQ_HEAD(, Rom) roms =3D QTAILQ_HEAD_INITIALIZER(roms); =20 -/* rom->data must be heap-allocated (do not use with rom_add_elf_program()= ) */ +/* + * rom->data can be heap-allocated or memory-mapped (e.g. when added with + * rom_add_elf_program()) + */ +static void rom_free_data(Rom *rom) +{ + if (rom->mapped_file) { + g_mapped_file_unref(rom->mapped_file); + rom->mapped_file =3D NULL; + } else { + g_free(rom->data); + } + + rom->data =3D NULL; +} + static void rom_free(Rom *rom) { - g_free(rom->data); + rom_free_data(rom); g_free(rom->path); g_free(rom->name); g_free(rom->fw_dir); @@ -1057,10 +1073,12 @@ MemoryRegion *rom_add_blob(const char *name, const = void *blob, size_t len, /* This function is specific for elf program because we don't need to allo= cate * all the rom. We just allocate the first part and the rest is just zeros= . This * is why romsize and datasize are different. Also, this function seize the - * memory ownership of "data", so we don't have to allocate and copy the b= uffer. + * memory ownership of "data", increasing the reference count of "mapped_f= ile", + * so we don't have to allocate and copy the buffer. */ -int rom_add_elf_program(const char *name, void *data, size_t datasize, - size_t romsize, hwaddr addr, AddressSpace *as) +int rom_add_elf_program(const char *name, GMappedFile *mapped_file, void *= data, + size_t datasize, size_t romsize, hwaddr addr, + AddressSpace *as) { Rom *rom; =20 @@ -1071,6 +1089,12 @@ int rom_add_elf_program(const char *name, void *data= , size_t datasize, rom->romsize =3D romsize; rom->data =3D data; rom->as =3D as; + + if (mapped_file && data) { + g_mapped_file_ref(mapped_file); + rom->mapped_file =3D mapped_file; + } + rom_insert(rom); return 0; } @@ -1105,8 +1129,7 @@ static void rom_reset(void *unused) } if (rom->isrom) { /* rom needs to be written only once */ - g_free(rom->data); - rom->data =3D NULL; + rom_free_data(rom); } /* * The rom loader is really on the same level as firmware in the g= uest diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index 690f9238c8..fede37ee9c 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -525,7 +525,7 @@ static int glue(load_elf, SZ)(const char *name, int fd, snprintf(label, sizeof(label), "phdr #%d: %s", i, name= ); =20 /* rom_add_elf_program() seize the ownership of 'data'= */ - rom_add_elf_program(label, data, file_size, mem_size, + rom_add_elf_program(label, NULL, data, file_size, mem_= size, addr, as); } else { address_space_write(as ? as : &address_space_memory, diff --git a/include/hw/loader.h b/include/hw/loader.h index 3e1b3a4566..07fd9286e7 100644 --- a/include/hw/loader.h +++ b/include/hw/loader.h @@ -258,8 +258,9 @@ MemoryRegion *rom_add_blob(const char *name, const void= *blob, size_t len, FWCfgCallback fw_callback, void *callback_opaque, AddressSpace *as, bool read_only); -int rom_add_elf_program(const char *name, void *data, size_t datasize, - size_t romsize, hwaddr addr, AddressSpace *as); +int rom_add_elf_program(const char *name, GMappedFile *mapped_file, void *= data, + size_t datasize, size_t romsize, hwaddr addr, + AddressSpace *as); int rom_check_and_register_reset(void); void rom_set_fw(FWCfgState *f); void rom_set_order_override(int order); --=20 2.20.1