From nobody Sat May 18 12:47:55 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=1563890725; cv=none; d=zoho.com; s=zohoarc; b=A5eQq5oWG0D3sofkJedgqmg+O1LOHE6P3gyjEv16yczPD0rpI4zunSe3zKo38djFp7Ibdi9yvRKW0rkMYMo5GD/mtHHDYtqRAuQ4xlI2aleElHeKizn667IF4CzPnN+nagcW0hy3sNZhaSiWK6E+pPRsOvykry5rQlXPlH0tEZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563890725; 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=Grq4nvo5p4VQnb7T94Zrezav95OSFNyxejeRYmO4utc=; b=h6cVA95fPfBl72OqlNDaZZh1TCe2C2Olg8cEr3oD+nRcyGcqadmgyw5QjLqXSk3pDDLm6FiZV/zqFlbDrek672XhcjdNd2naCoRE4E6HxMx8/6NO7eeoTpq64oQaTBjL40Oyie5u6W6NWXC+9myqLoc4fbNYcGNOiJPWKdSHqEo= 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 156389072510588.39007094136048; Tue, 23 Jul 2019 07:05:25 -0700 (PDT) Received: from localhost ([::1]:42774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpvPv-00085P-MS for importer@patchew.org; Tue, 23 Jul 2019 10:05:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43396) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpvPc-0006zI-C8 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 10:05:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpvPa-0005ai-TQ for qemu-devel@nongnu.org; Tue, 23 Jul 2019 10:05:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52844) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpvPa-0005Zv-M8 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 10:05:02 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DA7B72CD7EB; Tue, 23 Jul 2019 14:05:01 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 55A1C17B80; Tue, 23 Jul 2019 14:04:57 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Tue, 23 Jul 2019 16:04:44 +0200 Message-Id: <20190723140445.12748-2-sgarzare@redhat.com> In-Reply-To: <20190723140445.12748-1-sgarzare@redhat.com> References: <20190723140445.12748-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Tue, 23 Jul 2019 14:05:01 +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 v2 1/2] 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 --- 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 | 64 ++++++++++++++++++++++++-------------------- 1 file changed, 35 insertions(+), 29 deletions(-) diff --git a/include/hw/elf_ops.h b/include/hw/elf_ops.h index 690f9238c8..d80e7ad20c 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 *gmf =3D NULL; uint8_t *data =3D NULL; char label[128]; int ret =3D ELF_LOAD_FAILED; @@ -409,22 +410,31 @@ 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. + */ + gmf =3D g_mapped_file_new_from_fd(fd, true, NULL); + if (!gmf) { + 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) { - goto fail; - } + data_offset =3D ph->p_offset; /* Offset where the data is loca= ted */ + + if (g_mapped_file_get_length(gmf) < file_size + data_offset) { + goto fail; } =20 + data =3D (uint8_t *)g_mapped_file_get_contents(gmf); + data +=3D data_offset; + /* The ELF spec is somewhat vague about the purpose of the * physical address field. One common use in the embedded world * is that physical address field specifies the load address @@ -513,17 +523,16 @@ 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= ); - + /* Increments the reference count to avoid the unmap */ + g_mapped_file_ref(gmf); /* rom_add_elf_program() seize the ownership of 'data'= */ rom_add_elf_program(label, data, file_size, mem_size, addr, as); @@ -531,7 +540,6 @@ static int glue(load_elf, SZ)(const char *name, int fd, address_space_write(as ? as : &address_space_memory, addr, MEMTXATTRS_UNSPECIFIED, data, file_size); - g_free(data); } } =20 @@ -547,16 +555,15 @@ 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) { - goto fail; - } + data_offset =3D ph->p_offset; /* Offset where the notes are lo= cated */ + + if (g_mapped_file_get_length(gmf) < file_size + data_offset) { + goto fail; } =20 + data =3D (uint8_t *)g_mapped_file_get_contents(gmf); + data +=3D data_offset; + /* * Search the ELF notes to find one with a type matching the * value passed in via 'translate_opaque' @@ -570,7 +577,6 @@ static int glue(load_elf, SZ)(const char *name, int fd, 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; } } @@ -582,7 +588,7 @@ static int glue(load_elf, SZ)(const char *name, int fd, *highaddr =3D (uint64_t)(elf_sword)high; return total_size; fail: - g_free(data); + g_mapped_file_unref(gmf); g_free(phdr); return ret; } --=20 2.20.1 From nobody Sat May 18 12:47:55 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=1563890744; cv=none; d=zoho.com; s=zohoarc; b=J+Z0Y6UGbBUvncaNz7XplkuvD2OR8mJ5tkRI7j0xPDMNlXn9PcEwSbv8k9HZZlFsBw52bHO4vzqMwWXQSb9ZcYlUasAlIJs/zPYSakFQcMhDaczI6qCdFVyyOFo3/JVSWUQm56jfFyjhDvjDUyHfgQuHZQGmUo3sk4H0thUVdPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563890744; 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=7Nr7hUbqtmtvob3/xkMQf4mvZpTKkrqtpUP/Z9MTuew=; b=Qz1wWZJ5Rs4PtQLXnXdaaTWKATEmYvYbjYI0qMvKYw36Iy3UODIjxMgsPVCE5t5s2Wx8PAxFOJrztqVwPfqZSMS750hAAXG2wrsaKO4LUo0t8wWmXXg3Krya4czC9uQybJYHBF/4IkDipSEP6y9pcI7uSQWiro11leIAfk18Xww= 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 1563890744373840.9308724795935; Tue, 23 Jul 2019 07:05:44 -0700 (PDT) Received: from localhost ([::1]:42784 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpvQE-0000nx-SG for importer@patchew.org; Tue, 23 Jul 2019 10:05:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43441) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpvPv-0008LZ-5Q for qemu-devel@nongnu.org; Tue, 23 Jul 2019 10:05:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpvPq-0005nl-9k for qemu-devel@nongnu.org; Tue, 23 Jul 2019 10:05:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58248) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpvPq-0005nV-2s for qemu-devel@nongnu.org; Tue, 23 Jul 2019 10:05:18 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 668B485542; Tue, 23 Jul 2019 14:05:17 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-116-45.ams2.redhat.com [10.36.116.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4152E5D704; Tue, 23 Jul 2019 14:05:02 +0000 (UTC) From: Stefano Garzarella To: qemu-devel@nongnu.org Date: Tue, 23 Jul 2019 16:04:45 +0200 Message-Id: <20190723140445.12748-3-sgarzare@redhat.com> In-Reply-To: <20190723140445.12748-1-sgarzare@redhat.com> References: <20190723140445.12748-1-sgarzare@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 23 Jul 2019 14:05: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 v2 2/2] 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 --- hw/i386/pc.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 549c437050..b139589777 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1241,17 +1241,20 @@ static void load_linux(PCMachineState *pcms, =20 /* load initrd */ if (initrd_filename) { + GMappedFile *gmf; gsize initrd_size; gchar *initrd_data; GError *gerr =3D NULL; =20 - if (!g_file_get_contents(initrd_filename, &initrd_data, - &initrd_size, &gerr)) { + gmf =3D g_mapped_file_new(initrd_filename, false, &gerr); + if (!gmf) { fprintf(stderr, "qemu: error reading initrd %s: %s\n", initrd_filename, gerr->message); exit(1); } =20 + initrd_data =3D g_mapped_file_get_contents(gmf); + initrd_size =3D g_mapped_file_get_length(gmf); 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 +1381,7 @@ static void load_linux(PCMachineState *pcms, =20 /* load initrd */ if (initrd_filename) { + GMappedFile *gmf; gsize initrd_size; gchar *initrd_data; GError *gerr =3D NULL; @@ -1387,12 +1391,15 @@ static void load_linux(PCMachineState *pcms, exit(1); } =20 - if (!g_file_get_contents(initrd_filename, &initrd_data, - &initrd_size, &gerr)) { + gmf =3D g_mapped_file_new(initrd_filename, false, &gerr); + if (!gmf) { fprintf(stderr, "qemu: error reading initrd %s: %s\n", initrd_filename, gerr->message); exit(1); } + + initrd_data =3D g_mapped_file_get_contents(gmf); + initrd_size =3D g_mapped_file_get_length(gmf); if (initrd_size >=3D initrd_max) { fprintf(stderr, "qemu: initrd is too large, cannot support." "(max: %"PRIu32", need %"PRId64")\n", --=20 2.20.1