Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id EE673C44501 for ; Thu, 9 Jul 2026 07:44:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.1357593.1611995 (Exim 4.92) (envelope-from ) id 1whjQr-0007rH-5a; Thu, 09 Jul 2026 07:44:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 1357593.1611995; Thu, 09 Jul 2026 07:44:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1whjQr-0007rA-2a; Thu, 09 Jul 2026 07:44:29 +0000 Received: by outflank-mailman (input) for mailman id 1357593; Thu, 09 Jul 2026 07:44:27 +0000 Received: from mx.expurgate.net ([194.145.224.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1whjQp-0007bd-N5 for xen-devel@lists.xenproject.org; Thu, 09 Jul 2026 07:44:27 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1whjQp-002ZqU-0O for xen-devel@lists.xenproject.org; Thu, 09 Jul 2026 09:44:27 +0200 Received: from [10.42.69.8] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 6a4f5151-5cb7-0a2a0a5109dd-0a2a4508d66a-12 for ; Thu, 09 Jul 2026 09:44:26 +0200 Received: from [209.85.128.52] (helo=mail-wm1-f52.google.com) by tlsNG-c1860d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.57.1) (envelope-from ) id 6a4f515a-edec-0a2a45080019-d1558034f152-3 for ; Thu, 09 Jul 2026 09:44:26 +0200 Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-493ba701891so10932755e9.3 for ; Thu, 09 Jul 2026 00:44:26 -0700 (PDT) Received: from localhost.localdomain (2.115.147.147.dyn.plus.net. [147.147.115.2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493eb6f3b85sm69114695e9.2.2026.07.09.00.44.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2026 00:44:25 -0700 (PDT) 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=20251104 header.d=gmail.com header.i="@gmail.com" header.h="Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783583066; x=1784187866; darn=lists.xenproject.org; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to:content-type; bh=SbsTLttx8i+LOt+EpVY9O+4mn+TTqNBKH43++Zu9LAk=; b=G98FWxkPF9XajoO7l9WWP6odvxwlkZv1TjCALS/yuAinL7d3BTgnrxUDFu8d84cmUU jLxU+GR14/O+/QxaK+zmEcIeOKgARE6zV9PsV5gGW8UdqWM/8XT8cteR0TSlaLKsSkIU PYI7V0RaRvnBAJ1ZVViW91Z+BrIOAT8Q5WtdaiLepu3tHof0pDKyzl7fWa2bJw8ZoA6D bbQwFDPQNJeLd5k21kbYHQ6Uys8XbdEbUy0AstHuGkBRg6wQfjWj6G47Xi9X71VynK5x BHuBPBw8jyAs1+N72RkhYMbAbPOpJMtY4i5PrmsMoDDGAqHc7NetP3WJtuyK9rYZwdF4 6gtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783583066; x=1784187866; h=content-transfer-encoding:content-type:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=SbsTLttx8i+LOt+EpVY9O+4mn+TTqNBKH43++Zu9LAk=; b=j8xM6Ws39RDCqkz0la4+hFQtBUEXMobezpxrUsrYts09Dcm0d6YS0LEI3dxeuEW0Cy ct59nao2vLVHaRfaJo5KQ4YNWO2bEw64fQ2ssc5BXiT5EuGwwlMGJ+zv1e1NeU9kcMoc SQMY3UFBSfsim9MREvN2W1ZGdgD4bzCuhDtt/nuBdtJSFcXB1a2AShQ845PuQoHD9Nac QJEjiZFAV1wMJ9FtJmFM46IyrnhxmTfzfHBbR73f1aKyBDVWzO5boe5E5ugBeutOvlt4 eVqvkIhwx/jqfa9z14kIP6EN1T3trc1BD4BTPtohUnRkwDv9Xrj5tujCr5O8slmyFGxG 62Pw== X-Gm-Message-State: AOJu0YwuHKrc3pc708uVroB4HEv7Uy1NVLXQTYpv6aJ2s+uDkaEb+/fB k2T0u1lhRCdHrm4pYYh3MhlUrn+y1AfMaBfdrnPIHANHkmYBxVsJxuwKN+tyok9uoXQ= X-Gm-Gg: AfdE7clBbRkAl6PgXxp7pjFc/moQRdJUF0LE49K3/BAMbwhTulhbvXjWQL6Jjn8ZVsX rqxWJ8EscmbT3FPYhTnZM0p5d5bHrEZZhsqTwY1jQ7rLshyfl0ZB+OLgQpb1YWfPT0ib1IOGk7t 87jMBPkFWXZIkiFYXTMVyttdctAeJKqZhS1NCNtR5D5s2Xhm8kHk7V35jlKTZI35dKawEts4djv kUsnNrAX5Sh9Rm7m7rUiOpTvBAT2TTRlFog4VybPN44r3bX+zOwMeFEF5wOStQ+0vlp5wrGse/y suPsFCmffMdQ2UYGi8gcmQGj41L/Qftb8E23F2ZIb51bGRA7+8U57MbqxdFq1O1r0dP+hP9mrA1 2+zyWfSP+xriwmmLCiECJhDnEQt8f74B8snIbQ1p/4hQC6zTMVvKUGvQEDSQuelFK564/bInSsH khU/QmWGIqfzH181PN0+8vJufj2CpWP7bUydudDsZJYLTbBKCkBub9UCAdv5LyeXTMNy+8U5bh+ OsI48HbDx9RgE6+HDw= X-Received: by 2002:a05:600d:8497:20b0:493:b55f:bca4 with SMTP id 5b1f17b1804b1-493e68cec61mr42867035e9.29.1783583066271; Thu, 09 Jul 2026 00:44:26 -0700 (PDT) From: Frediano Ziglio X-Google-Original-From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Teddy Astie , Anthony PERARD , Juergen Gross , Frediano Ziglio Subject: [PATCH v7 4/6] libs/guest: move batch_pfns into a separate structure Date: Thu, 9 Jul 2026 08:43:55 +0100 Message-ID: <20260709074358.256084-5-frediano.ziglio@citrix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260709074358.256084-1-frediano.ziglio@citrix.com> References: <20260709074358.256084-1-frediano.ziglio@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-purgate-ID: tlsNG-c1860d/1783583066-413283FC-20146C73/0/0 X-purgate-type: clean X-purgate-size: 5973 From: Edwin Török Prepare for following change. Signed-off-by: Frediano Ziglio --- Changes since v6: - split from "libs/guest: allocate various migration arrays just once". --- tools/libs/guest/xg_sr_common.h | 5 ++++- tools/libs/guest/xg_sr_save.c | 31 +++++++++++++++++-------------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/tools/libs/guest/xg_sr_common.h b/tools/libs/guest/xg_sr_common.h index f1573aefcb..7574c9f5b6 100644 --- a/tools/libs/guest/xg_sr_common.h +++ b/tools/libs/guest/xg_sr_common.h @@ -239,11 +239,14 @@ struct xc_sr_context struct precopy_stats stats; - xen_pfn_t *batch_pfns; unsigned int nr_batch_pfns; unsigned long *deferred_pages; unsigned long nr_deferred_pages; xc_hypercall_buffer_t dirty_bitmap_hbuf; + struct xc_sr_context_save_buffers + { + xen_pfn_t batch_pfns[MAX_BATCH_SIZE]; + } *buffers; } save; struct /* Restore data. */ diff --git a/tools/libs/guest/xg_sr_save.c b/tools/libs/guest/xg_sr_save.c index 84fdbe4140..8956f4260d 100644 --- a/tools/libs/guest/xg_sr_save.c +++ b/tools/libs/guest/xg_sr_save.c @@ -75,7 +75,7 @@ static int write_checkpoint_record(struct xc_sr_context *ctx) /* * Writes a batch of memory as a PAGE_DATA record into the stream. The batch - * is constructed in ctx->save.batch_pfns. + * is constructed in ctx->save.buffers->batch_pfns. * * This function: * - gets the types for each pfn in the batch. @@ -95,6 +95,7 @@ static int write_batch(struct xc_sr_context *ctx) void *page, *orig_page; uint64_t *rec_pfns = NULL; struct iovec *iov = NULL; int iovcnt = 0; + xen_pfn_t *batch_pfns; struct { struct xc_sr_rhdr rec; struct xc_sr_rec_page_data_header page_data; @@ -110,6 +111,10 @@ static int write_batch(struct xc_sr_context *ctx) }; assert(nr_pfns != 0); + assert(nr_pfns <= MAX_BATCH_SIZE); + assert(ctx->save.buffers); + + batch_pfns = ctx->save.buffers->batch_pfns; /* Mfns of the batch pfns. */ mfns = malloc(nr_pfns * sizeof(*mfns)); @@ -141,13 +146,12 @@ static int write_batch(struct xc_sr_context *ctx) for ( i = 0; i < nr_pfns; ++i ) { - types[i] = mfns[i] = ctx->save.ops.pfn_to_gfn(ctx, - ctx->save.batch_pfns[i]); + types[i] = mfns[i] = ctx->save.ops.pfn_to_gfn(ctx, batch_pfns[i]); /* Likely a ballooned page. */ if ( mfns[i] == INVALID_MFN ) { - set_bit(ctx->save.batch_pfns[i], ctx->save.deferred_pages); + set_bit(batch_pfns[i], ctx->save.deferred_pages); ++ctx->save.nr_deferred_pages; } } @@ -193,7 +197,7 @@ static int write_batch(struct xc_sr_context *ctx) if ( errors[p] ) { ERROR("Mapping of pfn %#"PRIpfn" (mfn %#"PRIpfn") failed %d", - ctx->save.batch_pfns[i], mfns[p], errors[p]); + batch_pfns[i], mfns[p], errors[p]); goto err; } @@ -207,7 +211,7 @@ static int write_batch(struct xc_sr_context *ctx) { if ( rc == -1 && errno == EAGAIN ) { - set_bit(ctx->save.batch_pfns[i], ctx->save.deferred_pages); + set_bit(batch_pfns[i], ctx->save.deferred_pages); ++ctx->save.nr_deferred_pages; types[i] = XEN_DOMCTL_PFINFO_XTAB; --nr_pages; @@ -235,7 +239,7 @@ static int write_batch(struct xc_sr_context *ctx) hdrs.rec.length += nr_pages * PAGE_SIZE; for ( i = 0; i < nr_pfns; ++i ) - rec_pfns[i] = ((uint64_t)(types[i]) << 32) | ctx->save.batch_pfns[i]; + rec_pfns[i] = ((uint64_t)(types[i]) << 32) | batch_pfns[i]; if ( writev_exact(ctx->fd, iov, iovcnt) ) { @@ -274,9 +278,9 @@ static int flush_batch(struct xc_sr_context *ctx) if ( !rc ) { - VALGRIND_MAKE_MEM_UNDEFINED(ctx->save.batch_pfns, + VALGRIND_MAKE_MEM_UNDEFINED(ctx->save.buffers->batch_pfns, MAX_BATCH_SIZE * - sizeof(*ctx->save.batch_pfns)); + sizeof(*ctx->save.buffers->batch_pfns)); } return rc; @@ -293,7 +297,7 @@ static int add_to_batch(struct xc_sr_context *ctx, xen_pfn_t pfn) rc = flush_batch(ctx); if ( rc == 0 ) - ctx->save.batch_pfns[ctx->save.nr_batch_pfns++] = pfn; + ctx->save.buffers->batch_pfns[ctx->save.nr_batch_pfns++] = pfn; return rc; } @@ -784,11 +788,10 @@ static int setup(struct xc_sr_context *ctx) dirty_bitmap = xc_hypercall_buffer_alloc_pages( xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); - ctx->save.batch_pfns = malloc(MAX_BATCH_SIZE * - sizeof(*ctx->save.batch_pfns)); ctx->save.deferred_pages = bitmap_alloc(ctx->save.p2m_size); + ctx->save.buffers = calloc(1, sizeof(*ctx->save.buffers)); - if ( !ctx->save.batch_pfns || !dirty_bitmap || !ctx->save.deferred_pages ) + if ( !ctx->save.buffers || !dirty_bitmap || !ctx->save.deferred_pages ) { ERROR("Unable to allocate memory for dirty bitmaps, batch pfns and" " deferred pages"); @@ -819,7 +822,7 @@ static void cleanup(struct xc_sr_context *ctx) xc_hypercall_buffer_free_pages(xch, dirty_bitmap, NRPAGES(bitmap_size(ctx->save.p2m_size))); free(ctx->save.deferred_pages); - free(ctx->save.batch_pfns); + free(ctx->save.buffers); } /* -- 2.43.0