ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memory: avoid unnecessary coalesced_io_del operations 

Store whether the FlatRange has had any coalesced I/O ranges applied,
and if not avoid calling coalesced_io_del.  This is useful in preparation
for the next patch, which will call coalesced_io_del when rendering
memory regions.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-11-28 17:29:45 +01:00
parent 909bf76302
commit 1f7af80429
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
memory.c
View File

@ -217,6 +217,7 @@ struct FlatRange {
bool romd_mode; bool romd_mode;
bool readonly; bool readonly;
bool nonvolatile; bool nonvolatile;
bool has_coalesced_range;
}; };
#define FOR_EACH_FLAT_RANGE(var, view) \ #define FOR_EACH_FLAT_RANGE(var, view) \
@ -650,6 +651,7 @@ static void render_memory_region(FlatView *view,
fr.romd_mode = mr->romd_mode; fr.romd_mode = mr->romd_mode;
fr.readonly = readonly; fr.readonly = readonly;
fr.nonvolatile = nonvolatile; fr.nonvolatile = nonvolatile;
fr.has_coalesced_range = false;
/* Render the region itself into any gaps left by the current view. */ /* Render the region itself into any gaps left by the current view. */
for (i = 0; i < view->nr && int128_nz(remain); ++i) { for (i = 0; i < view->nr && int128_nz(remain); ++i) {
@ -852,6 +854,10 @@ static void address_space_update_ioeventfds(AddressSpace *as)
static void flat_range_coalesced_io_del(FlatRange *fr, AddressSpace *as) static void flat_range_coalesced_io_del(FlatRange *fr, AddressSpace *as)
{ {
if (!fr->has_coalesced_range) {
return;
}
MEMORY_LISTENER_UPDATE_REGION(fr, as, Reverse, coalesced_io_del, MEMORY_LISTENER_UPDATE_REGION(fr, as, Reverse, coalesced_io_del,
int128_get64(fr->addr.start), int128_get64(fr->addr.start),
int128_get64(fr->addr.size)); int128_get64(fr->addr.size));
@ -863,6 +869,11 @@ static void flat_range_coalesced_io_add(FlatRange *fr, AddressSpace *as)
CoalescedMemoryRange *cmr; CoalescedMemoryRange *cmr;
AddrRange tmp; AddrRange tmp;
if (QTAILQ_EMPTY(&mr->coalesced)) {
return;
}
fr->has_coalesced_range = true;
QTAILQ_FOREACH(cmr, &mr->coalesced, link) { QTAILQ_FOREACH(cmr, &mr->coalesced, link) {
tmp = addrrange_shift(cmr->addr, tmp = addrrange_shift(cmr->addr,
int128_sub(fr->addr.start, int128_sub(fr->addr.start,