Skip to content

Commit f25af2f

Browse files
mszyprowgregkh
authored andcommitted
misc: fastrpc: fix common struct sg_table related issues
[ Upstream commit 7cd7edb ] The Documentation/DMA-API-HOWTO.txt states that the dma_map_sg() function returns the number of the created entries in the DMA address space. However the subsequent calls to the dma_sync_sg_for_{device,cpu}() and dma_unmap_sg must be called with the original number of the entries passed to the dma_map_sg(). struct sg_table is a common structure used for describing a non-contiguous memory buffer, used commonly in the DRM and graphics subsystems. It consists of a scatterlist with memory pages and DMA addresses (sgl entry), as well as the number of scatterlist entries: CPU pages (orig_nents entry) and DMA mapped pages (nents entry). It turned out that it was a common mistake to misuse nents and orig_nents entries, calling DMA-mapping functions with a wrong number of entries or ignoring the number of mapped entries returned by the dma_map_sg() function. To avoid such issues, lets use a common dma-mapping wrappers operating directly on the struct sg_table objects and use scatterlist page iterators where possible. This, almost always, hides references to the nents and orig_nents entries, making the code robust, easier to follow and copy/paste safe. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20200826063316.23486-29-m.szyprowski@samsung.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 7c9edab commit f25af2f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/misc/fastrpc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ fastrpc_map_dma_buf(struct dma_buf_attachment *attachment,
518518

519519
table = &a->sgt;
520520

521-
if (!dma_map_sg(attachment->dev, table->sgl, table->nents, dir))
521+
if (!dma_map_sgtable(attachment->dev, table, dir, 0))
522522
return ERR_PTR(-ENOMEM);
523523

524524
return table;
@@ -528,7 +528,7 @@ static void fastrpc_unmap_dma_buf(struct dma_buf_attachment *attach,
528528
struct sg_table *table,
529529
enum dma_data_direction dir)
530530
{
531-
dma_unmap_sg(attach->dev, table->sgl, table->nents, dir);
531+
dma_unmap_sgtable(attach->dev, table, dir, 0);
532532
}
533533

534534
static void fastrpc_release(struct dma_buf *dmabuf)

0 commit comments

Comments
 (0)