On Thursday 06 December 2012 10:26:05 Dan Williams wrote:
> Use the generic unmap object to unmap dma buffers.
>
> Cc: Tomasz Figa <t.f...@samsung.com>
> Cc: Kyungmin Park <kyungmin.p...@samsung.com>
> Reported-by: Bartlomiej Zolnierkiewicz <b.zolnier...@samsung.com>
> Signed-off-by: Dan Williams <d...@fb.com>
> ---
> crypto/async_tx/async_pq.c | 58
> +++++++++++++++++++++++++++-----------------
> 1 file changed, 35 insertions(+), 23 deletions(-)
>
> diff --git a/crypto/async_tx/async_pq.c b/crypto/async_tx/async_pq.c
> index 1d78984..e5ddb31 100644
> --- a/crypto/async_tx/async_pq.c
> +++ b/crypto/async_tx/async_pq.c
> @@ -288,50 +288,60 @@ async_syndrome_val(struct page **blocks, unsigned int
> offset, int disks,
> struct dma_async_tx_descriptor *tx;
> unsigned char coefs[disks-2];
> enum dma_ctrl_flags dma_flags = submit->cb_fn ? DMA_PREP_INTERRUPT : 0;
> - dma_addr_t *dma_src = NULL;
> - int src_cnt = 0;
> + struct dmaengine_unmap_data *unmap = NULL;
>
> BUG_ON(disks < 4);
>
> - if (submit->scribble)
> - dma_src = submit->scribble;
> - else if (sizeof(dma_addr_t) <= sizeof(struct page *))
> - dma_src = (dma_addr_t *) blocks;
> + if (device)
> + unmap = dmaengine_get_unmap_data(device->dev, disks, GFP_NOIO);
>
> - if (dma_src && device && disks <= dma_maxpq(device, 0) &&
> + if (unmap && disks <= dma_maxpq(device, 0) &&
> is_dma_pq_aligned(device, offset, 0, len)) {
> struct device *dev = device->dev;
> - dma_addr_t *pq = &dma_src[disks-2];
> - int i;
> + dma_addr_t pq[2];
> + int i, j = 0, src_cnt = 0;
>
> pr_debug("%s: (async) disks: %d len: %zu\n",
> __func__, disks, len);
> - if (!P(blocks, disks))
> +
> + unmap->len = len;
> + for (i = 0; i < disks-2; i++)
> + if (likely(blocks[i])) {
> + unmap->addr[j] = dma_map_page(dev, blocks[i],
> + offset, len,
> + DMA_TO_DEVICE);
> + coefs[j] = raid6_gfexp[i];
> + unmap->to_cnt++;
> + src_cnt++;
> + j++;
> + }
> +
> + if (!P(blocks, disks)) {
> + pq[0] = 0;
> dma_flags |= DMA_PREP_PQ_DISABLE_P;
> - else
> + } else {
> pq[0] = dma_map_page(dev, P(blocks, disks),
> offset, len,
> DMA_TO_DEVICE);
> - if (!Q(blocks, disks))
> + unmap->addr[j++] = pq[0];
> + unmap->to_cnt++;
> + }
> + if (!Q(blocks, disks)) {
> + pq[1] = 0;
> dma_flags |= DMA_PREP_PQ_DISABLE_Q;
> - else
> + } else {
> pq[1] = dma_map_page(dev, Q(blocks, disks),
> offset, len,
> DMA_TO_DEVICE);
> + unmap->addr[j++] = pq[1];
> + unmap->to_cnt++;
> + }
>
> if (submit->flags & ASYNC_TX_FENCE)
> dma_flags |= DMA_PREP_FENCE;
> - for (i = 0; i < disks-2; i++)
> - if (likely(blocks[i])) {
> - dma_src[src_cnt] = dma_map_page(dev, blocks[i],
> - offset, len,
> - DMA_TO_DEVICE);
> - coefs[src_cnt] = raid6_gfexp[i];
> - src_cnt++;
> - }
> -
> for (;;) {
> - tx = device->device_prep_dma_pq_val(chan, pq, dma_src,
> + tx = device->device_prep_dma_pq_val(chan, pq,
> + unmap->addr,
> src_cnt,
> coefs,
> len, pqres,
> @@ -341,6 +351,8 @@ async_syndrome_val(struct page **blocks, unsigned int
> offset, int disks,
> async_tx_quiesce(&submit->depend_tx);
> dma_async_issue_pending(chan);
> }
> +
> + dma_set_unmap(tx, unmap);
> async_tx_submit(chan, tx, submit);
>
> return tx;
What did happen to dmaengine_unmap_put() calls?
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung Poland R&D Center
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
