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

pcie: remove mmconfig memory leak and wrap mmconfig update with transaction 

This memory leak was introduced inadvertently by omitting object_unparent.
A better fix is to use the new memory_region_set_size instead of destroying
and recreating the MMIO region on the fly.

Also, ensure that unmapping and remapping the region is done atomically.

Acked-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2015-01-28 11:18:58 +01:00
parent ac95190ea9
commit 3a8f2a9ce5
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/pci/pcie_host.c
View File

@ -88,6 +88,8 @@ static void pcie_host_init(Object *obj)
PCIExpressHost *e = PCIE_HOST_BRIDGE(obj); PCIExpressHost *e = PCIE_HOST_BRIDGE(obj);
e->base_addr = PCIE_BASE_ADDR_UNMAPPED; e->base_addr = PCIE_BASE_ADDR_UNMAPPED;
memory_region_init_io(&e->mmio, OBJECT(e), &pcie_mmcfg_ops, e, "pcie-mmcfg-mmio",
PCIE_MMCFG_SIZE_MAX);
} }
void pcie_host_mmcfg_unmap(PCIExpressHost *e) void pcie_host_mmcfg_unmap(PCIExpressHost *e)
@ -104,8 +106,7 @@ void pcie_host_mmcfg_init(PCIExpressHost *e, uint32_t size)
assert(size >= PCIE_MMCFG_SIZE_MIN); assert(size >= PCIE_MMCFG_SIZE_MIN);
assert(size <= PCIE_MMCFG_SIZE_MAX); assert(size <= PCIE_MMCFG_SIZE_MAX);
e->size = size; e->size = size;
memory_region_init_io(&e->mmio, OBJECT(e), &pcie_mmcfg_ops, e, memory_region_set_size(&e->mmio, e->size);
"pcie-mmcfg", e->size);
} }
void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr, void pcie_host_mmcfg_map(PCIExpressHost *e, hwaddr addr,
@ -121,10 +122,12 @@ void pcie_host_mmcfg_update(PCIExpressHost *e,
hwaddr addr, hwaddr addr,
uint32_t size) uint32_t size)
{ {
memory_region_transaction_begin();
pcie_host_mmcfg_unmap(e); pcie_host_mmcfg_unmap(e);
if (enable) { if (enable) {
pcie_host_mmcfg_map(e, addr, size); pcie_host_mmcfg_map(e, addr, size);
} }
memory_region_transaction_commit();
} }
static const TypeInfo pcie_host_type_info = { static const TypeInfo pcie_host_type_info = {