From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
To: Wei Yang <richardw.yang@linux.intel.com>, berrange@redhat.com
Cc: qemu-devel@nongnu.org, quintela@redhat.com
Subject: Re: [Qemu-devel] [PATCH 2/2] migration/qemu-file: fix potential buf waste for extra buf_index adjustment
Date: Fri, 23 Aug 2019 12:06:09 +0100 [thread overview]
Message-ID: <20190823110609.GF2784@work-vm> (raw)
In-Reply-To: <20190731144225.3784-3-richardw.yang@linux.intel.com>
(Copying Dan in)
* Wei Yang (richardw.yang@linux.intel.com) wrote:
> In add_to_iovec(), qemu_fflush() will be called if iovec is full. If
> this happens, buf_index is reset. Currently, this is not checked and
> buf_index would always been adjust with buf size.
>
> This is not harmful, but will waste some space in file buffer.
That's a nice find.
> This patch make add_to_iovec() return 1 when it has flushed the file.
> Then the caller could check the return value to see whether it is
> necessary to adjust the buf_index any more.
>
> Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
(I wonder if there's a way to wrap that little add_to_iovec, check, add
to index, flush in a little wrapper).
Dave
> ---
> migration/qemu-file.c | 42 ++++++++++++++++++++++++++++--------------
> 1 file changed, 28 insertions(+), 14 deletions(-)
>
> diff --git a/migration/qemu-file.c b/migration/qemu-file.c
> index 35c22605dd..05d9f42ddb 100644
> --- a/migration/qemu-file.c
> +++ b/migration/qemu-file.c
> @@ -343,8 +343,16 @@ int qemu_fclose(QEMUFile *f)
> return ret;
> }
>
> -static void add_to_iovec(QEMUFile *f, const uint8_t *buf, size_t size,
> - bool may_free)
> +/*
> + * Add buf to iovec. Do flush if iovec is full.
> + *
> + * Return values:
> + * 1 iovec is full and flushed
> + * 0 iovec is not flushed
> + *
> + */
> +static int add_to_iovec(QEMUFile *f, const uint8_t *buf, size_t size,
> + bool may_free)
> {
> /* check for adjacent buffer and coalesce them */
> if (f->iovcnt > 0 && buf == f->iov[f->iovcnt - 1].iov_base +
> @@ -362,7 +370,10 @@ static void add_to_iovec(QEMUFile *f, const uint8_t *buf, size_t size,
>
> if (f->iovcnt >= MAX_IOV_SIZE) {
> qemu_fflush(f);
> + return 1;
> }
> +
> + return 0;
> }
>
> void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, size_t size,
> @@ -391,10 +402,11 @@ void qemu_put_buffer(QEMUFile *f, const uint8_t *buf, size_t size)
> }
> memcpy(f->buf + f->buf_index, buf, l);
> f->bytes_xfer += l;
> - add_to_iovec(f, f->buf + f->buf_index, l, false);
> - f->buf_index += l;
> - if (f->buf_index == IO_BUF_SIZE) {
> - qemu_fflush(f);
> + if (!add_to_iovec(f, f->buf + f->buf_index, l, false)) {
> + f->buf_index += l;
> + if (f->buf_index == IO_BUF_SIZE) {
> + qemu_fflush(f);
> + }
> }
> if (qemu_file_get_error(f)) {
> break;
> @@ -412,10 +424,11 @@ void qemu_put_byte(QEMUFile *f, int v)
>
> f->buf[f->buf_index] = v;
> f->bytes_xfer++;
> - add_to_iovec(f, f->buf + f->buf_index, 1, false);
> - f->buf_index++;
> - if (f->buf_index == IO_BUF_SIZE) {
> - qemu_fflush(f);
> + if (!add_to_iovec(f, f->buf + f->buf_index, 1, false)) {
> + f->buf_index++;
> + if (f->buf_index == IO_BUF_SIZE) {
> + qemu_fflush(f);
> + }
> }
> }
>
> @@ -717,10 +730,11 @@ ssize_t qemu_put_compression_data(QEMUFile *f, z_stream *stream,
> }
>
> qemu_put_be32(f, blen);
> - add_to_iovec(f, f->buf + f->buf_index, blen, false);
> - f->buf_index += blen;
> - if (f->buf_index == IO_BUF_SIZE) {
> - qemu_fflush(f);
> + if (!add_to_iovec(f, f->buf + f->buf_index, blen, false)) {
> + f->buf_index += blen;
> + if (f->buf_index == IO_BUF_SIZE) {
> + qemu_fflush(f);
> + }
> }
> return blen + sizeof(int32_t);
> }
> --
> 2.17.1
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
next prev parent reply other threads:[~2019-08-23 11:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-31 14:42 [Qemu-devel] [PATCH 0/2] migration/qemu-file: cleanup and refine qemu-file Wei Yang
2019-07-31 14:42 ` [Qemu-devel] [PATCH 1/2] migration/qemu-file: remove check on writev_buffer in qemu_put_compression_data Wei Yang
2019-08-23 10:30 ` Dr. David Alan Gilbert
2019-07-31 14:42 ` [Qemu-devel] [PATCH 2/2] migration/qemu-file: fix potential buf waste for extra buf_index adjustment Wei Yang
2019-08-23 11:06 ` Dr. David Alan Gilbert [this message]
2019-08-23 11:38 ` Daniel P. Berrangé
2019-08-23 13:05 ` Dr. David Alan Gilbert
2019-08-24 16:22 ` Wei Yang
2019-09-03 13:22 ` Dr. David Alan Gilbert
2019-08-24 16:15 ` Wei Yang
2019-09-03 18:43 ` Dr. David Alan Gilbert
2019-09-11 12:26 ` Wei Yang
2019-08-19 2:36 ` [Qemu-devel] [PATCH 0/2] migration/qemu-file: cleanup and refine qemu-file Wei Yang
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=20190823110609.GF2784@work-vm \
--to=dgilbert@redhat.com \
--cc=berrange@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richardw.yang@linux.intel.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).