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

exec: put memory map in AddressSpaceDispatch 

After this patch, AddressSpaceDispatch holds a constistent tuple of
(phys_map, nodes, sections).  This will be important when updates
of the topology will run concurrently with reads.

cur_map is not used anymore except for freeing it at the end of the
topology update.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-05-29 12:28:21 +02:00
parent 0075270317
commit 0475d94fff
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
exec.c
View File

@ -88,11 +88,15 @@ struct PhysPageEntry {
uint16_t ptr : 15; uint16_t ptr : 15;
}; };
typedef PhysPageEntry Node[L2_SIZE];
struct AddressSpaceDispatch { struct AddressSpaceDispatch {
/* This is a multi-level map on the physical address space. /* This is a multi-level map on the physical address space.
* The bottom level has pointers to MemoryRegionSections. * The bottom level has pointers to MemoryRegionSections.
*/ */
PhysPageEntry phys_map; PhysPageEntry phys_map;
Node *nodes;
MemoryRegionSection *sections;
AddressSpace *as; AddressSpace *as;
}; };
@ -109,8 +113,6 @@ typedef struct subpage_t {
#define PHYS_SECTION_ROM 2 #define PHYS_SECTION_ROM 2
#define PHYS_SECTION_WATCH 3 #define PHYS_SECTION_WATCH 3
typedef PhysPageEntry Node[L2_SIZE];
typedef struct PhysPageMap { typedef struct PhysPageMap {
unsigned sections_nb; unsigned sections_nb;
unsigned sections_nb_alloc; unsigned sections_nb_alloc;
@ -232,14 +234,15 @@ static MemoryRegionSection *address_space_lookup_region(AddressSpace *as,
hwaddr addr, hwaddr addr,
bool resolve_subpage) bool resolve_subpage)
{ {
AddressSpaceDispatch *d = as->dispatch;
MemoryRegionSection *section; MemoryRegionSection *section;
subpage_t *subpage; subpage_t *subpage;
section = phys_page_find(as->dispatch->phys_map, addr >> TARGET_PAGE_BITS, section = phys_page_find(d->phys_map, addr >> TARGET_PAGE_BITS,
cur_map.nodes, cur_map.sections); d->nodes, d->sections);
if (resolve_subpage && section->mr->subpage) { if (resolve_subpage && section->mr->subpage) {
subpage = container_of(section->mr, subpage_t, iomem); subpage = container_of(section->mr, subpage_t, iomem);
section = &cur_map.sections[subpage->sub_section[SUBPAGE_IDX(addr)]]; section = &d->sections[subpage->sub_section[SUBPAGE_IDX(addr)]];
} }
return section; return section;
} }
@ -730,7 +733,7 @@ hwaddr memory_region_section_get_iotlb(CPUArchState *env,
iotlb |= PHYS_SECTION_ROM; iotlb |= PHYS_SECTION_ROM;
} }
} else { } else {
iotlb = section - cur_map.sections; iotlb = section - address_space_memory.dispatch->sections;
iotlb += xlat; iotlb += xlat;
} }
@ -1687,7 +1690,7 @@ static uint16_t dummy_section(MemoryRegion *mr)
MemoryRegion *iotlb_to_region(hwaddr index) MemoryRegion *iotlb_to_region(hwaddr index)
{ {
return cur_map.sections[index & ~TARGET_PAGE_MASK].mr; return address_space_memory.dispatch->sections[index & ~TARGET_PAGE_MASK].mr;
} }
static void io_mem_init(void) static void io_mem_init(void)
@ -1714,11 +1717,14 @@ static void mem_begin(MemoryListener *listener)
static void mem_commit(MemoryListener *listener) static void mem_commit(MemoryListener *listener)
{ {
AddressSpace *as = container_of(listener, AddressSpace, dispatch_listener); AddressSpace *as = container_of(listener, AddressSpace, dispatch_listener);
AddressSpaceDispatch *d = as->dispatch; AddressSpaceDispatch *cur = as->dispatch;
AddressSpaceDispatch *next = as->next_dispatch;
/* cur_map will soon be switched to next_map, too. */ next->nodes = next_map.nodes;
as->dispatch = as->next_dispatch; next->sections = next_map.sections;
g_free(d);
as->dispatch = next;
g_free(cur);
} }
static void core_begin(MemoryListener *listener) static void core_begin(MemoryListener *listener)