From nobody Mon Feb 9 07:23:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1603992073; cv=none; d=zohomail.com; s=zohoarc; b=VVOWOUPPrvfOUAqaF7YwvJXApbGORUjMD7ThWZaZL3J9z3BSkaZoxKDlaU0+JLZWSQYFsFjB8LM9X+Fu7mzCD82p8dDVLCzrsjPvWVA4a56P0cWoUaeKzpnLFEmhV9lI4ummGM6/BObOrl6G0xCmA0sM2DWyJIhINbRkmk9UZfM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603992073; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7yf5VgvfryEVAPtE1hdfDVCjjHFoZWgCpzJbwfomFp0=; b=VSUcCEvyHtZmOvXndNGGfiGcuJB0BrVbvXB4e5fIT1xEYx7SacHnx8l2pgY0HS4R+Zgi2WSz7yekyq5nRSm7diPWs+7HKfiB6h30wJXkcfhOFh32rNedf5Naxw+Tb/Bq37RlbhvRLr6irVA2ZfBEgpV+U2uYcb1Nc8M+U1Lb1ZI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1603992073129876.2071304348818; Thu, 29 Oct 2020 10:21:13 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.14441.35787 (Exim 4.92) (envelope-from ) id 1kYBbe-0004ba-21; Thu, 29 Oct 2020 17:20:58 +0000 Received: by outflank-mailman (output) from mailman id 14441.35787; Thu, 29 Oct 2020 17:20:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kYBbd-0004bN-Rn; Thu, 29 Oct 2020 17:20:57 +0000 Received: by outflank-mailman (input) for mailman id 14441; Thu, 29 Oct 2020 17:20:56 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kYBbc-0003MC-MN for xen-devel@lists.xenproject.org; Thu, 29 Oct 2020 17:20:56 +0000 Received: from mo4-p02-ob.smtp.rzone.de (unknown [81.169.146.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3c76ea11-9640-4cc7-aaec-5b32a0503c23; Thu, 29 Oct 2020 17:20:21 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.3.0 DYNA|AUTH) with ESMTPSA id j0b1afw9THKF3fP (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Thu, 29 Oct 2020 18:20:15 +0100 (CET) Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kYBbc-0003MC-MN for xen-devel@lists.xenproject.org; Thu, 29 Oct 2020 17:20:56 +0000 Received: from mo4-p02-ob.smtp.rzone.de (unknown [81.169.146.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 3c76ea11-9640-4cc7-aaec-5b32a0503c23; Thu, 29 Oct 2020 17:20:21 +0000 (UTC) Received: from sender by smtp.strato.de (RZmta 47.3.0 DYNA|AUTH) with ESMTPSA id j0b1afw9THKF3fP (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256 bits)) (Client did not present a certificate); Thu, 29 Oct 2020 18:20:15 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 3c76ea11-9640-4cc7-aaec-5b32a0503c23 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1603992020; s=strato-dkim-0002; d=aepfle.de; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: X-RZG-CLASS-ID:X-RZG-AUTH:From:Subject:Sender; bh=7yf5VgvfryEVAPtE1hdfDVCjjHFoZWgCpzJbwfomFp0=; b=F1zOdzX4p3t36MPCxlIyOJl3UjwfgkUMdjSGnCnrZM1vBjOziZWe4u7r0N1usI9uxI /wAvj56seYsFj6DLNdrq/GRUelq8pKby205Sa/hAl+tLzu5GRZDztj9HqBdh3n1roAja +B0EjX80SKUXiyshn72T84QMG1H8gBxT46K8WQaN534jyMgmID8f/ZMhI10Ur2n83aF9 /xJP6sK3L0YLKjepBC/Nh7fCgdXOwB6PFwNM6ZBKnD3R8fliR+hjj8V3R2KyMATJlaDV Kwwp78xhCIdUKendWi+7nepwG/cW1uya5Lxqbc5BY+w2YiFHPR0suWeeJnonu/5htLRR Dx4A== X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzBW/OdlBZQ4AHSS3G1Jjw==" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: xen-devel@lists.xenproject.org Cc: Olaf Hering , Ian Jackson , Wei Liu , Anthony PERARD Subject: [PATCH v1 17/23] tools/guest: restore: move mfns array Date: Thu, 29 Oct 2020 18:19:57 +0100 Message-Id: <20201029172004.17219-18-olaf@aepfle.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201029172004.17219-1-olaf@aepfle.de> References: <20201029172004.17219-1-olaf@aepfle.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Remove allocation from hotpath, move mfns array into preallocated space. Signed-off-by: Olaf Hering --- tools/libs/guest/xg_sr_common.h | 2 ++ tools/libs/guest/xg_sr_restore.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/libs/guest/xg_sr_common.h b/tools/libs/guest/xg_sr_commo= n.h index 0ceecb289d..5731a5c186 100644 --- a/tools/libs/guest/xg_sr_common.h +++ b/tools/libs/guest/xg_sr_common.h @@ -227,6 +227,8 @@ struct xc_sr_restore_arrays { /* handle_page_data */ xen_pfn_t pfns[MAX_BATCH_SIZE]; uint32_t types[MAX_BATCH_SIZE]; + /* process_page_data */ + xen_pfn_t mfns[MAX_BATCH_SIZE]; }; =20 struct xc_sr_context diff --git a/tools/libs/guest/xg_sr_restore.c b/tools/libs/guest/xg_sr_rest= ore.c index 7729071e41..3ba089f862 100644 --- a/tools/libs/guest/xg_sr_restore.c +++ b/tools/libs/guest/xg_sr_restore.c @@ -205,7 +205,7 @@ static int process_page_data(struct xc_sr_context *ctx,= unsigned int count, xen_pfn_t *pfns, uint32_t *types, void *page_= data) { xc_interface *xch =3D ctx->xch; - xen_pfn_t *mfns =3D malloc(count * sizeof(*mfns)); + xen_pfn_t *mfns =3D ctx->restore.m->mfns; int *map_errs =3D malloc(count * sizeof(*map_errs)); int rc; void *mapping =3D NULL, *guest_page =3D NULL; @@ -213,7 +213,7 @@ static int process_page_data(struct xc_sr_context *ctx,= unsigned int count, j, /* j indexes the subset of pfns we decide to map. */ nr_pages =3D 0; =20 - if ( !mfns || !map_errs ) + if ( !map_errs ) { rc =3D -1; ERROR("Failed to allocate %zu bytes to process page data", @@ -299,7 +299,6 @@ static int process_page_data(struct xc_sr_context *ctx,= unsigned int count, xenforeignmemory_unmap(xch->fmem, mapping, nr_pages); =20 free(map_errs); - free(mfns); =20 return rc; }