[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/17] exec: Relax range check in ram_block_discard_range()
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 09/17] exec: Relax range check in ram_block_discard_range() |
Date: |
Thu, 13 May 2021 18:37:29 +0100 |
From: David Hildenbrand <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>
Message-Id: <20210429112708.12291-6-david@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
softmmu/physmem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index 813a3efe8e..e1da81ed2f 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -3500,7 +3500,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",
@@ -3567,7 +3567,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.31.1
- [PULL 00/17] migration queue, (continued)
- [PULL 00/17] migration queue, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 01/17] migrate/ram: remove "ram_bulk_stage" and "fpo_enabled", Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 02/17] migration/ram: Reduce unnecessary rate limiting, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 03/17] migration/ram: Optimize ram_save_host_page(), Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 04/17] migration: Drop redundant query-migrate result @blocked, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 05/17] util: vfio-helpers: Factor out and fix processing of existing ram blocks, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 06/17] numa: Teach ram block notifiers about resizeable ram blocks, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 07/17] numa: Make all callbacks of ram block notifiers optional, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 08/17] migration/ram: Handle RAM block resizes during precopy, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 10/17] migration/ram: Discard RAM when growing RAM blocks after ram_postcopy_incoming_init(), Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 09/17] exec: Relax range check in ram_block_discard_range(),
Dr. David Alan Gilbert (git) <=
- [PULL 11/17] migration/ram: Simplify host page handling in ram_load_postcopy(), Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 13/17] migration/multifd: Print used_length of memory block, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 12/17] migration/ram: Handle RAM block resizes during postcopy, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 14/17] migration/ram: Use offset_in_ramblock() in range checks, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 15/17] tests/migration-test: Fix "true" vs true, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 16/17] tests/qtest/migration-test: Use g_autofree to avoid leaks on error paths, Dr. David Alan Gilbert (git), 2021/05/13
- [PULL 17/17] tests/migration: introduce multifd into guestperf, Dr. David Alan Gilbert (git), 2021/05/13
- Re: [PULL 00/17] migration queue, Peter Maydell, 2021/05/14