From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Xu <peterx@redhat.com>
Subject: [Qemu-devel] [PULL 11/13] memory: Fix up memory_region_{add|del}_coalescing
Date: Wed, 21 Aug 2019 19:28:19 +0200 [thread overview]
Message-ID: <1566408501-48680-12-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1566408501-48680-1-git-send-email-pbonzini@redhat.com>
From: Peter Xu <peterx@redhat.com>
The old memory_region_{add|clear}_coalescing() has some defects
because they both changed mr->coalesced before updating the regions
using memory_region_update_coalesced_range_as(). Then when the
regions were updated in memory_region_update_coalesced_range_as() the
mr->coalesced will always be either one more or one less. So:
- For memory_region_add_coalescing: it'll always trying to remove the
newly added coalesced region while it shouldn't, and,
- For memory_region_clear_coalescing: when it calls the update there
will be no coalesced ranges on mr->coalesced because they were all
removed before hand so the update will probably do nothing for real.
Let's fix this. Now we've got flat_range_coalesced_io_notify() to
notify a single CoalescedMemoryRange instance change, so use it in the
existing memory_region_update_coalesced_range() logic by only notify
either an addition or deletion. Then we hammer both the
memory_region_{add|clear}_coalescing() to use it.
Fixes: 3ac7d43a6fbb5d4a3
Signed-off-by: Peter Xu <peterx@redhat.com>
Message-Id: <20190820141328.10009-5-peterx@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
memory.c | 36 +++++++++++++++++-------------------
1 file changed, 17 insertions(+), 19 deletions(-)
diff --git a/memory.c b/memory.c
index 6e4b06e..7fd93b1 100644
--- a/memory.c
+++ b/memory.c
@@ -2243,27 +2243,26 @@ void memory_region_ram_resize(MemoryRegion *mr, ram_addr_t newsize, Error **errp
qemu_ram_resize(mr->ram_block, newsize, errp);
}
-static void memory_region_update_coalesced_range_as(MemoryRegion *mr, AddressSpace *as)
+/*
+ * Call proper memory listeners about the change on the newly
+ * added/removed CoalescedMemoryRange.
+ */
+static void memory_region_update_coalesced_range(MemoryRegion *mr,
+ CoalescedMemoryRange *cmr,
+ bool add)
{
+ AddressSpace *as;
FlatView *view;
FlatRange *fr;
- view = address_space_get_flatview(as);
- FOR_EACH_FLAT_RANGE(fr, view) {
- if (fr->mr == mr) {
- flat_range_coalesced_io_del(fr, as);
- flat_range_coalesced_io_add(fr, as);
- }
- }
- flatview_unref(view);
-}
-
-static void memory_region_update_coalesced_range(MemoryRegion *mr)
-{
- AddressSpace *as;
-
QTAILQ_FOREACH(as, &address_spaces, address_spaces_link) {
- memory_region_update_coalesced_range_as(mr, as);
+ view = address_space_get_flatview(as);
+ FOR_EACH_FLAT_RANGE(fr, view) {
+ if (fr->mr == mr) {
+ flat_range_coalesced_io_notify(fr, as, cmr, add);
+ }
+ }
+ flatview_unref(view);
}
}
@@ -2281,7 +2280,7 @@ void memory_region_add_coalescing(MemoryRegion *mr,
cmr->addr = addrrange_make(int128_make64(offset), int128_make64(size));
QTAILQ_INSERT_TAIL(&mr->coalesced, cmr, link);
- memory_region_update_coalesced_range(mr);
+ memory_region_update_coalesced_range(mr, cmr, true);
memory_region_set_flush_coalesced(mr);
}
@@ -2299,10 +2298,9 @@ void memory_region_clear_coalescing(MemoryRegion *mr)
while (!QTAILQ_EMPTY(&mr->coalesced)) {
cmr = QTAILQ_FIRST(&mr->coalesced);
QTAILQ_REMOVE(&mr->coalesced, cmr, link);
+ memory_region_update_coalesced_range(mr, cmr, false);
g_free(cmr);
}
-
- memory_region_update_coalesced_range(mr);
}
void memory_region_set_flush_coalesced(MemoryRegion *mr)
--
1.8.3.1
next prev parent reply other threads:[~2019-08-21 17:52 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-21 17:28 [Qemu-devel] [PULL 00/13] Misc patches for 2019-08-21 Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 01/13] qemu-ga: clean up TOOLS variable Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 02/13] configure: define CONFIG_TOOLS here Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 03/13] module: use g_hash_table_add() Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 04/13] module: return success on module load Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 05/13] tests: add module loading test Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 06/13] configure: remove AUTOCONF_HOST Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 07/13] minikconf: don't print CONFIG_FOO=n lines Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 08/13] memory: Refactor memory_region_clear_coalescing Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 09/13] memory: Split zones when do coalesced_io_del() Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 10/13] memory: Remove has_coalesced_range counter Paolo Bonzini
2019-08-21 17:28 ` Paolo Bonzini [this message]
2019-08-21 17:28 ` [Qemu-devel] [PULL 12/13] main-loop: Fix GSource leak in qio_task_thread_worker() Paolo Bonzini
2019-08-21 17:28 ` [Qemu-devel] [PULL 13/13] char-socket: Lock tcp_chr_disconnect() and socket_reconnect_timeout() Paolo Bonzini
2019-08-22 13:16 ` [Qemu-devel] [PULL 00/13] Misc patches for 2019-08-21 Peter Maydell
2019-08-22 17:22 ` Peter Maydell
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=1566408501-48680-12-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.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).