From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: Eduardo Habkost <ehabkost@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
David Hildenbrand <david@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
Peter Xu <peterx@redhat.com>, Juan Quintela <quintela@redhat.com>,
Alex Williamson <alex.williamson@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PATCH v5 05/10] exec: Relax range check in ram_block_discard_range()
Date: Thu, 29 Apr 2021 13:27:03 +0200 [thread overview]
Message-ID: <20210429112708.12291-6-david@redhat.com> (raw)
In-Reply-To: <20210429112708.12291-1-david@redhat.com>
We want to make use of ram_block_discard_range() in the RAM block resize
callback when growing a RAM block, *before* used_length is changed.
Let's relax the check. As RAM blocks always mmap the whole max_length area,
we cannot corrupt unrelated data.
Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
softmmu/physmem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 4834003d47..4e587de150 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -3503,7 +3503,7 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length)
goto err;
}
- if ((start + length) <= rb->used_length) {
+ if ((start + length) <= rb->max_length) {
bool need_madvise, need_fallocate;
if (!QEMU_IS_ALIGNED(length, rb->page_size)) {
error_report("ram_block_discard_range: Unaligned length: %zx",
@@ -3570,7 +3570,7 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length)
} else {
error_report("ram_block_discard_range: Overrun block '%s' (%" PRIu64
"/%zx/" RAM_ADDR_FMT")",
- rb->idstr, start, length, rb->used_length);
+ rb->idstr, start, length, rb->max_length);
}
err:
--
2.30.2
next prev parent reply other threads:[~2021-04-29 11:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-29 11:26 [PATCH v5 00/10] numa/exec/migration: Fix resizing RAM blocks while migrating David Hildenbrand
2021-04-29 11:26 ` [PATCH v5 01/10] util: vfio-helpers: Factor out and fix processing of existing ram blocks David Hildenbrand
2021-04-29 13:13 ` Philippe Mathieu-Daudé
2021-04-29 11:27 ` [PATCH v5 02/10] numa: Teach ram block notifiers about resizeable " David Hildenbrand
2021-04-29 11:27 ` [PATCH v5 03/10] numa: Make all callbacks of ram block notifiers optional David Hildenbrand
2021-04-29 11:27 ` [PATCH v5 04/10] migration/ram: Handle RAM block resizes during precopy David Hildenbrand
2021-04-29 11:27 ` David Hildenbrand [this message]
2021-04-29 11:27 ` [PATCH v5 06/10] migration/ram: Discard RAM when growing RAM blocks after ram_postcopy_incoming_init() David Hildenbrand
2021-04-29 11:27 ` [PATCH v5 07/10] migration/ram: Simplify host page handling in ram_load_postcopy() David Hildenbrand
2021-04-29 11:27 ` [PATCH v5 08/10] migration/ram: Handle RAM block resizes during postcopy David Hildenbrand
2021-04-29 11:27 ` [PATCH v5 09/10] migration/multifd: Print used_length of memory block David Hildenbrand
2021-04-29 11:27 ` [PATCH v5 10/10] migration/ram: Use offset_in_ramblock() in range checks David Hildenbrand
2021-05-06 17:57 ` [PATCH v5 00/10] numa/exec/migration: Fix resizing RAM blocks while migrating Eduardo Habkost
2021-05-06 18:04 ` Dr. David Alan Gilbert
2021-05-11 9:42 ` Dr. David Alan Gilbert
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=20210429112708.12291-6-david@redhat.com \
--to=david@redhat.com \
--cc=alex.williamson@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=richard.henderson@linaro.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 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).