shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

vfio/spapr: Postpone allocation of userspace version of TCE table

Browse Source 
am: 5d8b3e7559

Change-Id: Idf49bd8447519d6c29619aa2bd81b1cfc6001712
This commit is contained in:
Alexey Kardashevskiy
2017-03-22 12:05:06 +00:00
committed by android-build-merger
parent 9ba5b007e2 5d8b3e7559
commit 2c4dda6373
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/vfio/vfio_iommu_spapr_tce.c
View File

@@ -509,6 +509,12 @@ static long tce_iommu_build_v2(struct tce_container *container,
unsigned long hpa;
enum dma_data_direction dirtmp;
if (!tbl->it_userspace) {
ret = tce_iommu_userspace_view_alloc(tbl);
if (ret)
return ret;
}
for (i = 0; i < pages; ++i) {
struct mm_iommu_table_group_mem_t *mem = NULL;
unsigned long *pua = IOMMU_TABLE_USERSPACE_ENTRY(tbl,
@@ -582,15 +588,6 @@ static long tce_iommu_create_table(struct tce_container *container,
WARN_ON(!ret && !(*ptbl)->it_ops->free);
WARN_ON(!ret && ((*ptbl)->it_allocated_size != table_size));
if (!ret && container->v2) {
ret = tce_iommu_userspace_view_alloc(*ptbl);
if (ret)
(*ptbl)->it_ops->free(*ptbl);
}
if (ret)
decrement_locked_vm(table_size >> PAGE_SHIFT);
return ret;
}
@@ -1062,10 +1059,7 @@ static int tce_iommu_take_ownership(struct tce_container *container,
if (!tbl || !tbl->it_map)
continue;
rc = tce_iommu_userspace_view_alloc(tbl);
if (!rc)
rc = iommu_take_ownership(tbl);
rc = iommu_take_ownership(tbl);
if (rc) {
for (j = 0; j < i; ++j)
iommu_release_ownership(