From nobody Mon Feb 9 19:54:14 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=1566284784; cv=none; d=zoho.com; s=zohoarc; b=h+/U1qWUs8FxWyq1GtGFKLLVrNtHUwfC/HrG9hawylxtAPMG22QDg2fKrtQV+jnni85hphg+7sYNITv87ol/mJbVcmZwi7K78/6jxq01S7+dJum5D5zvY095l7qS3yMiRbbn8d+7VgoWMQpvrHD9hbI+t2kYA82Ta79M5vIDNC0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566284784; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=CDaGIlvVrQ3Wzv3gvRf6udUsq8WS+8t7MxNtaKrp0Ik=; b=YBcequ2dj+T7r7cfBpME+rEw2l0PAqHw7XScWW3GOe2IX7/hOjnLIQ1lV33ACTTC50GIXvY6Jd+l6ZiwKyZ5KIUlz0VZ/BeS2FJ9URYllLybeqJrupNn0dFgXrCCUpXYwCA3LQAGigfwrJ3LpzLTfTqzAEHzmpWDutLuwEdgyzU= 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 15662847840001022.4758948760982; Tue, 20 Aug 2019 00:06:24 -0700 (PDT) Received: from localhost ([::1]:33814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzyDm-0002Vj-Dy for importer@patchew.org; Tue, 20 Aug 2019 03:06:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42397) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hzy7t-0004wU-D6 for qemu-devel@nongnu.org; Tue, 20 Aug 2019 03:00:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hzy7p-0002iR-Kj for qemu-devel@nongnu.org; Tue, 20 Aug 2019 03:00:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51400) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hzy7o-0002gV-Mz for qemu-devel@nongnu.org; Tue, 20 Aug 2019 03:00:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 409A6307D921 for ; Tue, 20 Aug 2019 07:00:11 +0000 (UTC) Received: from 640k.localdomain.com (ovpn-112-20.ams2.redhat.com [10.36.112.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5EE3F18139; Tue, 20 Aug 2019 07:00:09 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 20 Aug 2019 08:59:22 +0200 Message-Id: <1566284395-30287-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1566284395-30287-1-git-send-email-pbonzini@redhat.com> References: <1566284395-30287-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 20 Aug 2019 07:00:11 +0000 (UTC) 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] [PULL 03/36] 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: Stefano Garzarella Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Stefano Garzarella 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 Message-Id: <20190724143105.307042-2-sgarzare@redhat.com> Signed-off-by: Paolo Bonzini --- hw/core/loader.c | 38 ++++++++++++++++++++++++++++++-------- include/hw/elf_ops.h | 2 +- include/hw/loader.h | 5 +++-- 3 files changed, 34 insertions(+), 11 deletions(-) diff --git a/hw/core/loader.c b/hw/core/loader.c index 425bf69..9fb93a6 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); @@ -1056,11 +1072,12 @@ MemoryRegion *rom_add_blob(const char *name, const = void *blob, size_t len, =20 /* 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. + * is why romsize and datasize are different. Also, this function takes it= s own + * reference to "mapped_file", so we don't have to allocate and copy the b= uffer. */ -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 +1088,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 +1128,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 690f923..fede37e 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 3e1b3a4..07fd928 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 1.8.3.1