From nobody Sat Apr 27 04:04:56 2024 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=1563978717; cv=none; d=zoho.com; s=zohoarc; b=XCWj56DcT6gPOQ0MXOncwCCp9ZwxQu2/cER1Ql25GoI/BYe/Xjt+IStPlsZ6lISXd+Yno3juYT8OqIjJkRHzXvCyzOs4mPpprh9K5EtYalZ8f0WWSn1XG3k9QDgL225ZuuB7mqr4daWqKT9sNNvGcVAi+d43VYFr0kb+j8gj36A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563978717; 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=LYSGDdGju0tdcoHFF/lGZ2Qjkeu4lTTj6+DxeA8XsNY=; b=JFtlEotGYpFLsEPcsxkb+XS1yy809zHkLFc6EfZ10Tlh2nc25EuD2+JrWo/lQq7GhKjPXz+XHR3zy6U9d9xjdWqNDjHzdVnVjt+tStpYX1WlWiQPmU58kqmhz+xNCQX2VvfqpnYQVGF4mbbEfmhY2UZcIqTJeuzWDr6auFl33hg= 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 1563978717960654.5464844007121; Wed, 24 Jul 2019 07:31:57 -0700 (PDT) Received: from localhost ([::1]:52164 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqIJA-0004Ur-VM for importer@patchew.org; Wed, 24 Jul 2019 10:31:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58733) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqIIa-0002SG-St for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqIIZ-00055X-LM for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:20 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55322) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqIIZ-00053d-DU for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:19 -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 1EA6DC057F2E; Wed, 24 Jul 2019 14:31:17 +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 9C89F60BEC; Wed, 24 Jul 2019 14:31:14 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 16:31:03 +0200 Message-Id: <20190724143105.307042-2-sgarzare@redhat.com> In-Reply-To: <20190724143105.307042-1-sgarzare@redhat.com> References: <20190724143105.307042-1-sgarzare@redhat.com> MIME-Version: 1.0 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.32]); Wed, 24 Jul 2019 14:31:17 +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 v4 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 --- v4: - fix the rom_add_elf_program() comment [Paolo] --- 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 425bf69a99..9fb93a6541 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 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 From nobody Sat Apr 27 04:04:56 2024 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=1563978710; cv=none; d=zoho.com; s=zohoarc; b=oEWgSMx41AkJBO8C7olRswk8ISk19epmCX3gYi7rdbJgMeQQEEQqofJQdusj4kIctq71jr6ig3AONeuQCYDjm6BafxI+A3fSrI/CHCyJ+w8Z7NVqbaY+9qXfNBfmdEfCfxazQwOUhXs2kSAf2TTp6iEY4CPriHDdin326hK6ECY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563978710; 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=EeGz1LTu7VM46WJhK+qja7OPHyHv5EJdvvn2WwKvCZI=; b=Nuqs521mG8XjhbkJQHj2+CC7iwyQSuTiar/B2MsUgTwplOrRsHpQwptHnYlBoPTnRkyaZcuxFOKzbbcTanHgAQnjKvyJdkaHzqzTSC56cygDbhEyNV56w7TaGLBGaO+s8px6d3nGRjgzkqZFEH/rRVM0omPrDWoujofkNiSlcY0= 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 1563978710856120.85953498536571; Wed, 24 Jul 2019 07:31:50 -0700 (PDT) Received: from localhost ([::1]:52154 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqIIy-0003VF-BV for importer@patchew.org; Wed, 24 Jul 2019 10:31:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58760) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqIIc-0002Sd-Fk for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqIIb-000570-5z for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:63211) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqIIa-00056J-UG for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:21 -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 31D1B307CDFC; Wed, 24 Jul 2019 14:31:20 +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 7B94260BEC; Wed, 24 Jul 2019 14:31:17 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 16:31:04 +0200 Message-Id: <20190724143105.307042-3-sgarzare@redhat.com> In-Reply-To: <20190724143105.307042-1-sgarzare@redhat.com> References: <20190724143105.307042-1-sgarzare@redhat.com> MIME-Version: 1.0 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.49]); Wed, 24 Jul 2019 14:31:20 +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 v4 2/3] elf-ops.h: Map into memory the ELF to load 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" In order to reduce the memory footprint we map into memory the ELF to load using g_mapped_file_new_from_fd() instead of reading each sections. In this way we can share the ELF pages between multiple instances of QEMU. Suggested-by: Dr. David Alan Gilbert Suggested-by: Paolo Bonzini Signed-off-by: Stefano Garzarella --- v4: - fix the missing of g_mapped_file_unref() in the success case [Paolo] - fix the rom_add_elf_program() comment [Paolo] v3: - renamed 'GMappedFile *gmf' in 'GMappedFile *mapped_filed' for readabili= ty. - passed the GMappedFile* to rom_add_elf_program() to correctly handle the reference count. [Paolo] - set 'data' pointer only if 'file_size > 0' as the original behaviour [check-qtest-ppc64 fails without it] v2: - used g_mapped_file_new_from_fd() with 'writeble' set to 'true', since we can modify the mapped buffer. [Paolo, Peter] --- include/hw/elf_ops.h | 71 ++++++++++++++++++++++++++------------------ 1 file changed, 42 insertions(+), 29 deletions(-) diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index fede37ee9c..1496d7e753 100644 --- a/include/hw/elf_ops.h +++ b/include/hw/elf_ops.h @@ -323,8 +323,9 @@ static int glue(load_elf, SZ)(const char *name, int fd, struct elfhdr ehdr; struct elf_phdr *phdr =3D NULL, *ph; int size, i, total_size; - elf_word mem_size, file_size; + elf_word mem_size, file_size, data_offset; uint64_t addr, low =3D (uint64_t)-1, high =3D 0; + GMappedFile *mapped_file =3D NULL; uint8_t *data =3D NULL; char label[128]; int ret =3D ELF_LOAD_FAILED; @@ -409,20 +410,32 @@ static int glue(load_elf, SZ)(const char *name, int f= d, } } =20 + /* + * Since we want to be able to modify the mapped buffer, we set the + * 'writeble' parameter to 'true'. Modifications to the buffer are not + * written back to the file. + */ + mapped_file =3D g_mapped_file_new_from_fd(fd, true, NULL); + if (!mapped_file) { + goto fail; + } + total_size =3D 0; for(i =3D 0; i < ehdr.e_phnum; i++) { ph =3D &phdr[i]; if (ph->p_type =3D=3D PT_LOAD) { mem_size =3D ph->p_memsz; /* Size of the ROM */ file_size =3D ph->p_filesz; /* Size of the allocated data */ - data =3D g_malloc0(file_size); - if (ph->p_filesz > 0) { - if (lseek(fd, ph->p_offset, SEEK_SET) < 0) { - goto fail; - } - if (read(fd, data, file_size) !=3D file_size) { + data_offset =3D ph->p_offset; /* Offset where the data is loca= ted */ + + if (file_size > 0) { + if (g_mapped_file_get_length(mapped_file) < + file_size + data_offset) { goto fail; } + + data =3D (uint8_t *)g_mapped_file_get_contents(mapped_file= ); + data +=3D data_offset; } =20 /* The ELF spec is somewhat vague about the purpose of the @@ -513,25 +526,25 @@ static int glue(load_elf, SZ)(const char *name, int f= d, *pentry =3D ehdr.e_entry - ph->p_vaddr + ph->p_paddr; } =20 - if (mem_size =3D=3D 0) { - /* Some ELF files really do have segments of zero size; - * just ignore them rather than trying to create empty - * ROM blobs, because the zero-length blob can falsely - * trigger the overlapping-ROM-blobs check. - */ - g_free(data); - } else { + /* Some ELF files really do have segments of zero size; + * just ignore them rather than trying to create empty + * ROM blobs, because the zero-length blob can falsely + * trigger the overlapping-ROM-blobs check. + */ + if (mem_size !=3D 0) { if (load_rom) { snprintf(label, sizeof(label), "phdr #%d: %s", i, name= ); =20 - /* rom_add_elf_program() seize the ownership of 'data'= */ - rom_add_elf_program(label, NULL, data, file_size, mem_= size, - addr, as); + /* + * rom_add_elf_program() takes its own reference to + * 'mapped_file'. + */ + rom_add_elf_program(label, mapped_file, data, file_siz= e, + mem_size, addr, as); } else { address_space_write(as ? as : &address_space_memory, addr, MEMTXATTRS_UNSPECIFIED, data, file_size); - g_free(data); } } =20 @@ -547,14 +560,16 @@ static int glue(load_elf, SZ)(const char *name, int f= d, struct elf_note *nhdr =3D NULL; =20 file_size =3D ph->p_filesz; /* Size of the range of ELF notes = */ - data =3D g_malloc0(file_size); - if (ph->p_filesz > 0) { - if (lseek(fd, ph->p_offset, SEEK_SET) < 0) { - goto fail; - } - if (read(fd, data, file_size) !=3D file_size) { + data_offset =3D ph->p_offset; /* Offset where the notes are lo= cated */ + + if (file_size > 0) { + if (g_mapped_file_get_length(mapped_file) < + file_size + data_offset) { goto fail; } + + data =3D (uint8_t *)g_mapped_file_get_contents(mapped_file= ); + data +=3D data_offset; } =20 /* @@ -570,19 +585,17 @@ static int glue(load_elf, SZ)(const char *name, int f= d, sizeof(struct elf_note) =3D=3D sizeof(struct elf64_not= e); elf_note_fn((void *)nhdr, (void *)&ph->p_align, is64); } - g_free(data); data =3D NULL; } } =20 - g_free(phdr); if (lowaddr) *lowaddr =3D (uint64_t)(elf_sword)low; if (highaddr) *highaddr =3D (uint64_t)(elf_sword)high; - return total_size; + ret =3D total_size; fail: - g_free(data); + g_mapped_file_unref(mapped_file); g_free(phdr); return ret; } --=20 2.20.1 From nobody Sat Apr 27 04:04:56 2024 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=1563978737; cv=none; d=zoho.com; s=zohoarc; b=Bw4YjPfLqD3PMX/v2nK1CcUXJKAsqm0X/yR1rNveRgYRazzh4/Vc6RMFihtaxJwun2xyKE/xNcWlQ/3ZQ6cgH4FTFfo5rRfYbvLwKncTi5xAms5xL/Yl9qK0GNbMOqozpGIkC2mcUGL26CZqYZctw3QLwGNjAMX4Dl3Kg7MNEjQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563978737; 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=v6wEMhratp0yAAPpdLzMncju2BArAyN5nL67Kr4Zucc=; b=nezOX73V71rwpAKi9Jv4cXGw0PXlVuCR+xJDIrI+OGdVk62iByRi0vqPQRaseFvu9/kTLlFy/uv/LL62df3Uk9w3YgXypnwQzOA22Aftnduas3efWwKS7WgVZ1lKnr2DmjNbQO5SU21AoTvVYAvkLoJG1EqVlbO6VXdyVUjv8/0= 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 1563978737222246.86972817114372; Wed, 24 Jul 2019 07:32:17 -0700 (PDT) Received: from localhost ([::1]:52178 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqIJU-0005WJ-5P for importer@patchew.org; Wed, 24 Jul 2019 10:32:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58822) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqIIf-0002bd-2H for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqIIe-00059x-0R for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33942) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqIId-00059F-NN for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:31:23 -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 0338D87630; Wed, 24 Jul 2019 14:31:23 +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 8CC6D60BEC; Wed, 24 Jul 2019 14:31:20 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Wed, 24 Jul 2019 16:31:05 +0200 Message-Id: <20190724143105.307042-4-sgarzare@redhat.com> In-Reply-To: <20190724143105.307042-1-sgarzare@redhat.com> References: <20190724143105.307042-1-sgarzare@redhat.com> MIME-Version: 1.0 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.26]); Wed, 24 Jul 2019 14:31:23 +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 v4 3/3] hw/i386/pc: Map into memory the initrd 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" In order to reduce the memory footprint we map into memory the initrd using g_mapped_file_new() instead of reading it. In this way we can share the initrd pages between multiple instances of QEMU. Suggested-by: Paolo Bonzini Signed-off-by: Stefano Garzarella --- v3: - renamed 'GMappedFile *gmf' in 'GMappedFile *mapped_filed' for readabili= ty - stored the initrd GMappedFile* in PCMachineState to avoid Coverity issue [Paolo] --- hw/i386/pc.c | 17 +++++++++++++---- include/hw/i386/pc.h | 1 + 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 549c437050..96f6b89f70 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1241,17 +1241,21 @@ static void load_linux(PCMachineState *pcms, =20 /* load initrd */ if (initrd_filename) { + GMappedFile *mapped_file; gsize initrd_size; gchar *initrd_data; GError *gerr =3D NULL; =20 - if (!g_file_get_contents(initrd_filename, &initrd_data, - &initrd_size, &gerr)) { + mapped_file =3D g_mapped_file_new(initrd_filename, false, = &gerr); + if (!mapped_file) { fprintf(stderr, "qemu: error reading initrd %s: %s\n", initrd_filename, gerr->message); exit(1); } + pcms->initrd_mapped_file =3D mapped_file; =20 + initrd_data =3D g_mapped_file_get_contents(mapped_file); + initrd_size =3D g_mapped_file_get_length(mapped_file); initrd_max =3D pcms->below_4g_mem_size - pcmc->acpi_data_s= ize - 1; if (initrd_size >=3D initrd_max) { fprintf(stderr, "qemu: initrd is too large, cannot sup= port." @@ -1378,6 +1382,7 @@ static void load_linux(PCMachineState *pcms, =20 /* load initrd */ if (initrd_filename) { + GMappedFile *mapped_file; gsize initrd_size; gchar *initrd_data; GError *gerr =3D NULL; @@ -1387,12 +1392,16 @@ static void load_linux(PCMachineState *pcms, exit(1); } =20 - if (!g_file_get_contents(initrd_filename, &initrd_data, - &initrd_size, &gerr)) { + mapped_file =3D g_mapped_file_new(initrd_filename, false, &gerr); + if (!mapped_file) { fprintf(stderr, "qemu: error reading initrd %s: %s\n", initrd_filename, gerr->message); exit(1); } + pcms->initrd_mapped_file =3D mapped_file; + + initrd_data =3D g_mapped_file_get_contents(mapped_file); + initrd_size =3D g_mapped_file_get_length(mapped_file); if (initrd_size >=3D initrd_max) { fprintf(stderr, "qemu: initrd is too large, cannot support." "(max: %"PRIu32", need %"PRId64")\n", diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 859b64c51d..44edc6955e 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -42,6 +42,7 @@ struct PCMachineState { FWCfgState *fw_cfg; qemu_irq *gsi; PFlashCFI01 *flash[2]; + GMappedFile *initrd_mapped_file; =20 /* Configuration options: */ uint64_t max_ram_below_4g; --=20 2.20.1