spapr_iommu: Realloc guest visible TCE table when hot(un)plugging vfio-pci
This replaces g_malloc() with spapr_tce_alloc_table() as this is the standard way of allocating tables and this allows moving the table back to KVM when unplugging a VFIO PCI device and VFIO TCE acceleration support is not present in the KVM. Although spapr_tce_alloc_table() is expected to fail with EBUSY if called when previous fd is not closed yet, in practice we will not see it because cap_spapr_vfio is false at the moment. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
54a50dae93
commit
f5509b6beb
|
@ -275,33 +275,26 @@ static void spapr_tce_table_realize(DeviceState *dev, Error **errp)
|
|||
void spapr_tce_set_need_vfio(sPAPRTCETable *tcet, bool need_vfio)
|
||||
{
|
||||
size_t table_size = tcet->nb_table * sizeof(uint64_t);
|
||||
void *newtable;
|
||||
uint64_t *oldtable;
|
||||
int newfd = -1;
|
||||
|
||||
if (need_vfio == tcet->need_vfio) {
|
||||
/* Nothing to do */
|
||||
return;
|
||||
}
|
||||
g_assert(need_vfio != tcet->need_vfio);
|
||||
|
||||
if (!need_vfio) {
|
||||
/* FIXME: We don't support transition back to KVM accelerated
|
||||
* TCEs yet */
|
||||
return;
|
||||
}
|
||||
tcet->need_vfio = need_vfio;
|
||||
|
||||
tcet->need_vfio = true;
|
||||
oldtable = tcet->table;
|
||||
|
||||
if (tcet->fd < 0) {
|
||||
/* Table is already in userspace, nothing to be do */
|
||||
return;
|
||||
}
|
||||
tcet->table = spapr_tce_alloc_table(tcet->liobn,
|
||||
tcet->page_shift,
|
||||
tcet->bus_offset,
|
||||
tcet->nb_table,
|
||||
&newfd,
|
||||
need_vfio);
|
||||
memcpy(tcet->table, oldtable, table_size);
|
||||
|
||||
newtable = g_malloc(table_size);
|
||||
memcpy(newtable, tcet->table, table_size);
|
||||
spapr_tce_free_table(oldtable, tcet->fd, tcet->nb_table);
|
||||
|
||||
kvmppc_remove_spapr_tce(tcet->table, tcet->fd, tcet->nb_table);
|
||||
|
||||
tcet->fd = -1;
|
||||
tcet->table = newtable;
|
||||
tcet->fd = newfd;
|
||||
}
|
||||
|
||||
sPAPRTCETable *spapr_tce_new_table(DeviceState *owner, uint32_t liobn)
|
||||
|
|
Loading…
Reference in a new issue