Patch "iommu/dma: Restore scatterlist offsets correctly" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
iommu/dma: Restore scatterlist offsets correctly
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iommu-dma-restore-scatterlist-offsets-correctly.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
07b48ac4bbe527e68cfc555f2b2b206908437141Mon Sep 17 00:00:00 2001
From: Robin Murphy <[email protected]>
Date: Thu, 10 Mar 2016 19:28:12 +0000
Subject: iommu/dma: Restore scatterlist offsets correctly
From: Robin Murphy <[email protected]>
commit 07b48ac4bbe527e68cfc555f2b2b206908437141 upstream.
With the change to stashing just the IOVA-page-aligned remainder of the CPU-page offset rather than the whole thing, the failure path in __invalidate_sg() also needs tweaking to account for that in the case of differing page sizes where the two offsets may not be equivalent. Similarly in __finalise_sg(), lest the architecture-specific wrappers later get the wrong address for cache maintenance on sync or unmap.
--- drivers/iommu/dma-iommu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iommu/dma-iommu.c +2 -2
@@ -403,7 +403,7 @@ static int __finalise_sg(struct device *unsigned int s_length =sg_dma_len (s);unsigned int s_dma_len = s->length; - s->offset = s_offset; + s->offset += s_offset; s->length = s_length;sg_dma_address (s) = dma_addr + s_offset; dma_addr += s_dma_len;
@@ -422,7 +422,7 @@ static void __invalidate_sg(struct scattfor_each_sg (sg, s, nents, i) {if (sg_dma_address (s) !=DMA_ERROR_CODE ) - s->offset =sg_dma_address (s); + s->offset +=sg_dma_address (s);if (sg_dma_len (s)) s->length =sg_dma_len (s);sg_dma_address (s) =DMA_ERROR_CODE ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/iommu-dma-restore-scatterlist-offsets-correctly.patch