From nobody Thu Jul 17 13:43:50 2025 Delivered-To: importer2@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer2=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1650626816070648.6239832079195; Fri, 22 Apr 2022 04:26:56 -0700 (PDT) Received: from localhost ([::1]:53420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nhrR8-00026e-Ub for importer2@patchew.org; Fri, 22 Apr 2022 07:26:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33040) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhqL8-0001HY-Em for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:16:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:53005) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nhqL6-0004s5-LP for qemu-devel@nongnu.org; Fri, 22 Apr 2022 06:16:38 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-187-guFB9XEdOxWlligQ8iMrhg-1; Fri, 22 Apr 2022 06:16:35 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 867C2886064; Fri, 22 Apr 2022 10:16:18 +0000 (UTC) Received: from localhost (unknown [10.39.208.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F98240885A1; Fri, 22 Apr 2022 10:16:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650622596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=S5RvyNxXEYShfr4Q7IiYdFz1VRPMbYGzJ+InfSOKIYY=; b=gVcu3Z1Sini6Z3VQJRuDuQl0WD0Luwixk2kttG665s33rHYq2BkoE4NpMhxok5Eya9Ya9w ZMv5yFb5ThczUoze/GLsZm7XsL2w0cbTWHUPMbnChWo6LwIwplVB/Wg8jIO7jZp4WTeEAz c3/RL1wnMoGM34xufXhzFzroxaDFWJQ= X-MC-Unique: guFB9XEdOxWlligQ8iMrhg-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Subject: [PULL v2 07/13] dump: Consolidate phdr note writes Date: Fri, 22 Apr 2022 14:15:19 +0400 Message-Id: <20220422101525.3260741-8-marcandre.lureau@redhat.com> In-Reply-To: <20220422101525.3260741-1-marcandre.lureau@redhat.com> References: <20220422101525.3260741-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , viktor.prutyanov@redhat.com, richard.henderson@linaro.org, frankja@linux.ibm.com Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1650626817066100001 From: Janosch Frank There's no need to have two write functions. Let's rather have two functions that set the data for elf 32/64 and then write it in a common function. Signed-off-by: Janosch Frank Reviewed-by: Richard Henderson Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20220330123603.107120-8-frankja@linux.ibm.com> --- dump/dump.c | 94 +++++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 46 deletions(-) diff --git a/dump/dump.c b/dump/dump.c index b063db134021..0d95fc5b7a3c 100644 --- a/dump/dump.c +++ b/dump/dump.c @@ -245,24 +245,15 @@ static void write_elf32_load(DumpState *s, MemoryMapp= ing *memory_mapping, } } =20 -static void write_elf64_note(DumpState *s, Error **errp) +static void write_elf64_phdr_note(DumpState *s, Elf64_Phdr *phdr) { - Elf64_Phdr phdr; - int ret; - - memset(&phdr, 0, sizeof(Elf64_Phdr)); - phdr.p_type =3D cpu_to_dump32(s, PT_NOTE); - phdr.p_offset =3D cpu_to_dump64(s, s->note_offset); - phdr.p_paddr =3D 0; - phdr.p_filesz =3D cpu_to_dump64(s, s->note_size); - phdr.p_memsz =3D cpu_to_dump64(s, s->note_size); - phdr.p_vaddr =3D 0; - - ret =3D fd_write_vmcore(&phdr, sizeof(Elf64_Phdr), s); - if (ret < 0) { - error_setg_errno(errp, -ret, - "dump: failed to write program header table"); - } + memset(phdr, 0, sizeof(*phdr)); + phdr->p_type =3D cpu_to_dump32(s, PT_NOTE); + phdr->p_offset =3D cpu_to_dump64(s, s->note_offset); + phdr->p_paddr =3D 0; + phdr->p_filesz =3D cpu_to_dump64(s, s->note_size); + phdr->p_memsz =3D cpu_to_dump64(s, s->note_size); + phdr->p_vaddr =3D 0; } =20 static inline int cpu_index(CPUState *cpu) @@ -310,24 +301,15 @@ static void write_elf64_notes(WriteCoreDumpFunction f= , DumpState *s, write_guest_note(f, s, errp); } =20 -static void write_elf32_note(DumpState *s, Error **errp) +static void write_elf32_phdr_note(DumpState *s, Elf32_Phdr *phdr) { - Elf32_Phdr phdr; - int ret; - - memset(&phdr, 0, sizeof(Elf32_Phdr)); - phdr.p_type =3D cpu_to_dump32(s, PT_NOTE); - phdr.p_offset =3D cpu_to_dump32(s, s->note_offset); - phdr.p_paddr =3D 0; - phdr.p_filesz =3D cpu_to_dump32(s, s->note_size); - phdr.p_memsz =3D cpu_to_dump32(s, s->note_size); - phdr.p_vaddr =3D 0; - - ret =3D fd_write_vmcore(&phdr, sizeof(Elf32_Phdr), s); - if (ret < 0) { - error_setg_errno(errp, -ret, - "dump: failed to write program header table"); - } + memset(phdr, 0, sizeof(*phdr)); + phdr->p_type =3D cpu_to_dump32(s, PT_NOTE); + phdr->p_offset =3D cpu_to_dump32(s, s->note_offset); + phdr->p_paddr =3D 0; + phdr->p_filesz =3D cpu_to_dump32(s, s->note_size); + phdr->p_memsz =3D cpu_to_dump32(s, s->note_size); + phdr->p_vaddr =3D 0; } =20 static void write_elf32_notes(WriteCoreDumpFunction f, DumpState *s, @@ -357,6 +339,32 @@ static void write_elf32_notes(WriteCoreDumpFunction f,= DumpState *s, write_guest_note(f, s, errp); } =20 +static void write_elf_phdr_note(DumpState *s, Error **errp) +{ + ERRP_GUARD(); + Elf32_Phdr phdr32; + Elf64_Phdr phdr64; + void *phdr; + size_t size; + int ret; + + if (dump_is_64bit(s)) { + write_elf64_phdr_note(s, &phdr64); + size =3D sizeof(phdr64); + phdr =3D &phdr64; + } else { + write_elf32_phdr_note(s, &phdr32); + size =3D sizeof(phdr32); + phdr =3D &phdr32; + } + + ret =3D fd_write_vmcore(phdr, size, s); + if (ret < 0) { + error_setg_errno(errp, -ret, + "dump: failed to write program header table"); + } +} + static void write_elf_section(DumpState *s, int type, Error **errp) { Elf32_Shdr shdr32; @@ -550,13 +558,13 @@ static void dump_begin(DumpState *s, Error **errp) return; } =20 - if (dump_is_64bit(s)) { - /* write PT_NOTE to vmcore */ - write_elf64_note(s, errp); - if (*errp) { - return; - } + /* write PT_NOTE to vmcore */ + write_elf_phdr_note(s, errp); + if (*errp) { + return; + } =20 + if (dump_is_64bit(s)) { /* write all PT_LOAD to vmcore */ write_elf_loads(s, errp); if (*errp) { @@ -577,12 +585,6 @@ static void dump_begin(DumpState *s, Error **errp) return; } } else { - /* write PT_NOTE to vmcore */ - write_elf32_note(s, errp); - if (*errp) { - return; - } - /* write all PT_LOAD to vmcore */ write_elf_loads(s, errp); if (*errp) { --=20 2.36.0