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

memory: update coalesced_range on transaction_commit 

The e1000 driver calls memory_region_add_coalescing but
kvm_coalesce_mmio_region is never called for those regions.  The bug
dates back to the introduction of the memory region API; to fix it,
delete and re-add coalesced MMIO ranges when building the FlatViews.

Because coalesced MMIO regions apply to all address spaces, the
has_coalesced_range flag has to be changed into an int.

Fixes: 093bc2cd88 ("Hierarchical memory region API")
Reported-by: Atsushi Nemoto <atsushi.nemoto@sord.co.jp>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2018-11-28 17:28:45 +01:00
parent 1f7af80429
commit 3ac7d43a6f
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
memory.c
View File

@ -217,7 +217,7 @@ struct FlatRange {
bool romd_mode; bool romd_mode;
bool readonly; bool readonly;
bool nonvolatile; bool nonvolatile;
bool has_coalesced_range; int has_coalesced_range;
}; };
#define FOR_EACH_FLAT_RANGE(var, view) \ #define FOR_EACH_FLAT_RANGE(var, view) \
@ -651,7 +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; fr.has_coalesced_range = 0;
/* 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) {
@ -858,6 +858,10 @@ static void flat_range_coalesced_io_del(FlatRange *fr, AddressSpace *as)
return; return;
} }
if (--fr->has_coalesced_range > 0) {
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));
@ -873,7 +877,10 @@ static void flat_range_coalesced_io_add(FlatRange *fr, AddressSpace *as)
return; return;
} }
fr->has_coalesced_range = true; if (fr->has_coalesced_range++) {
return;
}
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,
@ -920,6 +927,7 @@ static void address_space_update_topology_pass(AddressSpace *as,
/* In old but not in new, or in both but attributes changed. */ /* In old but not in new, or in both but attributes changed. */
if (!adding) { if (!adding) {
flat_range_coalesced_io_del(frold, as);
MEMORY_LISTENER_UPDATE_REGION(frold, as, Reverse, region_del); MEMORY_LISTENER_UPDATE_REGION(frold, as, Reverse, region_del);
} }
@ -927,7 +935,9 @@ static void address_space_update_topology_pass(AddressSpace *as,
} else if (frold && frnew && flatrange_equal(frold, frnew)) { } else if (frold && frnew && flatrange_equal(frold, frnew)) {
/* In both and unchanged (except logging may have changed) */ /* In both and unchanged (except logging may have changed) */
if (adding) { if (!adding) {
flat_range_coalesced_io_del(frold, as);
} else {
MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_nop); MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_nop);
if (frnew->dirty_log_mask & ~frold->dirty_log_mask) { if (frnew->dirty_log_mask & ~frold->dirty_log_mask) {
MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, log_start, MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, log_start,
@ -939,6 +949,7 @@ static void address_space_update_topology_pass(AddressSpace *as,
frold->dirty_log_mask, frold->dirty_log_mask,
frnew->dirty_log_mask); frnew->dirty_log_mask);
} }
flat_range_coalesced_io_add(frnew, as);
} }
++iold; ++iold;
@ -948,6 +959,7 @@ static void address_space_update_topology_pass(AddressSpace *as,
if (adding) { if (adding) {
MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_add); MEMORY_LISTENER_UPDATE_REGION(frnew, as, Forward, region_add);
flat_range_coalesced_io_add(frnew, as);
} }
++inew; ++inew;