From: Andrew Cooper <andrew.cooper3@citrix.com>
To: Xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <iwj@xenproject.org>, Wei Liu <wl@xen.org>,
Juergen Gross <jgross@suse.com>, Jan Beulich <JBeulich@suse.com>,
Olaf Hering <olaf@aepfle.de>
Subject: [PATCH 1/2] tools/migration: Fix iovec handling in send_checkpoint_dirty_pfn_list()
Date: Tue, 6 Jul 2021 12:23:31 +0100 [thread overview]
Message-ID: <20210706112332.31753-2-andrew.cooper3@citrix.com> (raw)
In-Reply-To: <20210706112332.31753-1-andrew.cooper3@citrix.com>
We shouldn't be using two struct iovec's to write half of 'rec' each, and
there is no need to malloc() for two struct iovec's at all.
Simplify down to just two - one covering the whole of 'rec', and one covering
the pfns array.
No functional change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Ian Jackson <iwj@xenproject.org>
CC: Wei Liu <wl@xen.org>
CC: Juergen Gross <jgross@suse.com>
CC: Jan Beulich <JBeulich@suse.com>
CC: Olaf Hering <olaf@aepfle.de>
---
tools/libs/guest/xg_sr_restore.c | 25 ++++++-------------------
1 file changed, 6 insertions(+), 19 deletions(-)
diff --git a/tools/libs/guest/xg_sr_restore.c b/tools/libs/guest/xg_sr_restore.c
index aa4113d7f679..07c9e291610b 100644
--- a/tools/libs/guest/xg_sr_restore.c
+++ b/tools/libs/guest/xg_sr_restore.c
@@ -425,11 +425,13 @@ static int send_checkpoint_dirty_pfn_list(struct xc_sr_context *ctx)
int rc = -1;
unsigned int count, written;
uint64_t i, *pfns = NULL;
- struct iovec *iov = NULL;
xc_shadow_op_stats_t stats = { 0, ctx->restore.p2m_size };
struct xc_sr_record rec = {
.type = REC_TYPE_CHECKPOINT_DIRTY_PFN_LIST,
};
+ struct iovec iov[2] = {
+ { &rec, sizeof(rec) },
+ };
DECLARE_HYPERCALL_BUFFER_SHADOW(unsigned long, dirty_bitmap,
&ctx->restore.dirty_bitmap_hbuf);
@@ -471,26 +473,12 @@ static int send_checkpoint_dirty_pfn_list(struct xc_sr_context *ctx)
pfns[written++] = i;
}
- /* iovec[] for writev(). */
- iov = malloc(3 * sizeof(*iov));
- if ( !iov )
- {
- ERROR("Unable to allocate memory for sending dirty bitmap");
- goto err;
- }
-
rec.length = count * sizeof(*pfns);
- iov[0].iov_base = &rec.type;
- iov[0].iov_len = sizeof(rec.type);
-
- iov[1].iov_base = &rec.length;
- iov[1].iov_len = sizeof(rec.length);
-
- iov[2].iov_base = pfns;
- iov[2].iov_len = count * sizeof(*pfns);
+ iov[1].iov_base = pfns;
+ iov[1].iov_len = rec.length;
- if ( writev_exact(ctx->restore.send_back_fd, iov, 3) )
+ if ( writev_exact(ctx->restore.send_back_fd, iov, ARRAY_SIZE(iov)) )
{
PERROR("Failed to write dirty bitmap to stream");
goto err;
@@ -499,7 +487,6 @@ static int send_checkpoint_dirty_pfn_list(struct xc_sr_context *ctx)
rc = 0;
err:
free(pfns);
- free(iov);
return rc;
}
--
2.11.0
next prev parent reply other threads:[~2021-07-06 11:24 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 11:23 [PATCH 0/2] tools/migration: Fixes in send_checkpoint_dirty_pfn_list() Andrew Cooper
2021-07-06 11:23 ` Andrew Cooper [this message]
2021-07-06 11:54 ` [PATCH 1/2] tools/migration: Fix iovec handling " Jan Beulich
2021-07-06 12:20 ` Olaf Hering
2021-07-06 11:23 ` [PATCH 2/2] tools/migration: Fix potential overflow " Andrew Cooper
2021-07-06 12:03 ` Jan Beulich
2021-07-06 13:34 ` Andrew Cooper
2021-07-06 14:00 ` Jan Beulich
2021-07-06 12:58 ` Olaf Hering
2021-07-06 13:19 ` Andrew Cooper
2021-07-06 13:22 ` Andrew Cooper
2021-07-06 13:39 ` Olaf Hering
2021-07-06 13:43 ` Andrew Cooper
2021-07-06 13:28 ` Olaf Hering
2021-07-06 13:56 ` Jan Beulich
2021-07-06 14:11 ` Olaf Hering
2021-07-06 15:13 ` Jan Beulich
2021-07-06 15:22 ` Jan Beulich
2021-07-06 16:08 ` Andrew Cooper
2021-07-06 12:07 ` [PATCH 0/2] tools/migration: Fixes " Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210706112332.31753-2-andrew.cooper3@citrix.com \
--to=andrew.cooper3@citrix.com \
--cc=JBeulich@suse.com \
--cc=iwj@xenproject.org \
--cc=jgross@suse.com \
--cc=olaf@aepfle.de \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.