From nobody Sat May 18 06:50:49 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1676451467; cv=none; d=zohomail.com; s=zohoarc; b=OXizQM/uGNSV7FHK6S9nXBTQyGqlAo7gjswCw84kGuWU8JtQMUfCaCNzCn6YUwidtcMratfMr56momYuvICrkgezr/QwjPJ65eEV8KRpTRFpRV0xV5ATBaDMcpxGnNsoRmqitqgKaYuY9I3iXvgwFuh6WSSWfXkdKOJMayFAHro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1676451467; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=xxlgeH/sE0AYKJ9NgTnwOtzFYAQfkptFPd4VAfosM7k=; b=Vw1eaBGfbO/XLz+1/O8fpGbzuf74R8KYdJkzUlLRozdmpbj4YxtBXv594tFpGfy6s7GNNszAfx7srEYWZYlo8eJc149eCnut3xLrEWT/GEKQvyiZ4HIn73wE0leegEbBAWE4/R38dDanoQKCPse/dz2NDu/7dXl5S3eiG7qkhec= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 167645146709593.61303373169414; Wed, 15 Feb 2023 00:57:47 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pSDbJ-0002Yq-Gg; Wed, 15 Feb 2023 03:57:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pSDbH-0002YM-IH for qemu-devel@nongnu.org; Wed, 15 Feb 2023 03:57:15 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pSDbG-0002A7-2H for qemu-devel@nongnu.org; Wed, 15 Feb 2023 03:57:15 -0500 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-567-_eHnfcVeNxSIwXAKyCfIcw-1; Wed, 15 Feb 2023 03:57:07 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9731185A588; Wed, 15 Feb 2023 08:57:06 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.40]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F9542166B31; Wed, 15 Feb 2023 08:57:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1676451433; 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; bh=xxlgeH/sE0AYKJ9NgTnwOtzFYAQfkptFPd4VAfosM7k=; b=aNp/ozh+OlUFEvv0FCC/ByhFkLG2hUYDdj9FGDOzAb2xRR/fkZEZzC+u/6ik0QlrA0EYNj XfBKZS/6L1/J+e06K3SkPUIEEO+1Q5Vvgxl7KJ90akNIZKYVj15fjU+3jZVNAqjy4BWpMw /8L0ZdVZq8jMoSPdByGNZ6ZFU7JSYFI= X-MC-Unique: _eHnfcVeNxSIwXAKyCfIcw-1 From: Thomas Huth To: qemu-s390x@nongnu.org, David Hildenbrand , Janosch Frank , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: qemu-devel@nongnu.org, Ilya Leoshkevich Subject: [PATCH v2] target/s390x/arch_dump: Simplify memory allocation in s390x_write_elf64_notes() Date: Wed, 15 Feb 2023 09:57:03 +0100 Message-Id: <20230215085703.746788-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1676451468890100003 We are not on a hot path here, so there is no real need for the logic here with the split heap and stack space allocation. Simplify it by always allocating memory from the heap. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Thomas Huth --- v2: - Added the missing "prev_size =3D note_size" (thanks, Janosch!) - Use g_free+g_malloc instead of g_realloc to avoid copying old contents target/s390x/arch_dump.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/target/s390x/arch_dump.c b/target/s390x/arch_dump.c index a7c44ba49d..cb98f4894d 100644 --- a/target/s390x/arch_dump.c +++ b/target/s390x/arch_dump.c @@ -227,25 +227,25 @@ static int s390x_write_elf64_notes(const char *note_n= ame, DumpState *s, const NoteFuncDesc *funcs) { - Note note, *notep; + g_autofree Note *notep =3D NULL; const NoteFuncDesc *nf; - int note_size, content_size; + int note_size, prev_size =3D 0, content_size; int ret =3D -1; =20 - assert(strlen(note_name) < sizeof(note.name)); + assert(strlen(note_name) < sizeof(notep->name)); =20 for (nf =3D funcs; nf->note_contents_func; nf++) { - notep =3D ¬e; if (nf->pvonly && !s390_is_pv()) { continue; } =20 content_size =3D nf->note_size_func ? nf->note_size_func() : nf->c= ontents_size; - note_size =3D sizeof(note) - sizeof(notep->contents) + content_siz= e; + note_size =3D sizeof(Note) - sizeof(notep->contents) + content_siz= e; =20 - /* Notes with dynamic sizes need to allocate a note */ - if (nf->note_size_func) { + if (prev_size < note_size) { + g_free(notep); notep =3D g_malloc(note_size); + prev_size =3D note_size; } =20 memset(notep, 0, note_size); @@ -258,15 +258,9 @@ static int s390x_write_elf64_notes(const char *note_na= me, /* Get contents and write them out */ (*nf->note_contents_func)(notep, cpu, id); ret =3D f(notep, note_size, s); - - if (nf->note_size_func) { - g_free(notep); - } - if (ret < 0) { return -1; } - } =20 return 0; --=20 2.31.1