powerpc: Correct VIO bus accounting problem in CMO env.
PATCH 1/1 powerpc: Correct VIO bus accounting problem in CMO env.
In the VIO bus code the wrappers for dma alloc_coherent and free_coherent calls are rounding to IOMMU_PAGE_SIZE. Taking a look at the underlying calls, the actual mapping is promoted to PAGE_SIZE. Changing the rounding in these two functions fixes under-reporting the entitlement used by the system. Without this change, the system could run out of entitlement before it believes it has and incur mapping failures at the firmware level.
Also in the VIO bus code, the wrapper for dma map_sg is not exiting in an error path where it should. Rather than fall through to code for the success case, this patch adds the return that is needed in the error path.
--- arch/powerpc/kernel/vio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
arch/powerpc/kernel/vio.c +4 -3
@@ -492,14 +492,14 @@ static void *vio_dma_iommu_alloc_coherenstruct vio_dev *viodev =to_vio_dev (dev);void *ret; -if (vio_cmo_alloc (viodev,roundup (size,IOMMU_PAGE_SIZE ))) { +if (vio_cmo_alloc (viodev,roundup (size,PAGE_SIZE ))) {atomic_inc (&viodev->cmo.allocs_failed);return NULL ; } ret = dma_iommu_ops.alloc_coherent (dev, size, dma_handle, flag);if (unlikely (ret ==NULL )) { -vio_cmo_dealloc (viodev,roundup (size,IOMMU_PAGE_SIZE )); +vio_cmo_dealloc (viodev,roundup (size,PAGE_SIZE ));atomic_inc (&viodev->cmo.allocs_failed); }
@@ -513,7 +513,7 @@ static void vio_dma_iommu_free_coherent( dma_iommu_ops.free_coherent (dev, size, vaddr, dma_handle); -vio_cmo_dealloc (viodev,roundup (size,IOMMU_PAGE_SIZE )); +vio_cmo_dealloc (viodev,roundup (size,PAGE_SIZE )); } static dma_addr_t vio_dma_iommu_map_page(struct device *dev, struct page *page,
@@ -572,6 +572,7 @@ static int vio_dma_iommu_map_sg(struct dif (unlikely (!ret)) {vio_cmo_dealloc (viodev, alloc_size);atomic_inc (&viodev->cmo.allocs_failed); +return ret; }for (sgl = sglist, count =0 ; count < ret; count++, sgl++)
Acked by: Brian King <[email protected]>
Quoted 60 lines · Robert Jennings
In the VIO bus code the wrappers for dma
alloc_coherentandfree_coherentcalls are rounding toIOMMU_PAGE_SIZE. Taking a look at the underlying calls, the actual mapping is promoted toPAGE_SIZE. Changing the rounding in these two functions fixes under-reporting the entitlement used by the system. Without this change, the system could run out of entitlement before it believes it has and incur mapping failures at the firmware level.Also in the VIO bus code, the wrapper for dma
map_sgis not exiting in an error path where it should. Rather than fall through to code for the success case, this patch adds the return that is needed in the error path.Signed-off-by Robert Jennings <[email protected]>--- arch/powerpc/kernel/vio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)Index:
b/arch/powerpc/kernel/vio.c
===================================================================arch/powerpc/kernel/vio.c +4
-3@@ -492,14 +492,14 @@ static void *vio_dma_iommu_alloc_coherenstruct vio_dev *viodev =to_vio_dev (dev);void *ret; -if (vio_cmo_alloc (viodev,roundup (size,IOMMU_PAGE_SIZE ))) { +if (vio_cmo_alloc (viodev,roundup (size,PAGE_SIZE ))) {atomic_inc (&viodev->cmo.allocs_failed);return NULL ; } ret = dma_iommu_ops.alloc_coherent (dev, size, dma_handle, flag);if (unlikely (ret ==NULL )) { -vio_cmo_dealloc (viodev,roundup (size,IOMMU_PAGE_SIZE )); +vio_cmo_dealloc (viodev,roundup (size,PAGE_SIZE ));atomic_inc (&viodev->cmo.allocs_failed); }@@ -513,7 +513,7 @@ static void vio_dma_iommu_free_coherent( dma_iommu_ops.free_coherent (dev, size, vaddr, dma_handle); -vio_cmo_dealloc (viodev,roundup (size,IOMMU_PAGE_SIZE )); +vio_cmo_dealloc (viodev,roundup (size,PAGE_SIZE )); } static dma_addr_t vio_dma_iommu_map_page(struct device *dev, struct page *page,@@ -572,6 +572,7 @@ static int vio_dma_iommu_map_sg(struct dif (unlikely (!ret)) {vio_cmo_dealloc (viodev, alloc_size);atomic_inc (&viodev->cmo.allocs_failed); +return ret; }for (sgl = sglist, count =0 ; count < ret; count++, sgl++)_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev
Signature · 3 lines
Brian King Linux on Power Virtualization IBM Linux Technology Center