From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1424019Ab2LFPuH (ORCPT ); Thu, 6 Dec 2012 10:50:07 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:16241 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424000Ab2LFPuD (ORCPT ); Thu, 6 Dec 2012 10:50:03 -0500 X-AuditID: cbfee61b-b7f616d00000319b-32-50c0bea98a7f From: Bartlomiej Zolnierkiewicz To: Dan Williams Subject: Re: [PATCH 10/12] async_pq_val: convert to dmaengine_unmap_data Date: Thu, 06 Dec 2012 16:48:10 +0100 User-Agent: KMail/1.13.2 (Linux/3.5.0-rc2+; KDE/4.4.5; i686; ; ) Cc: linux-kernel@vger.kernel.org, linux@arm.linux.org.uk, vinod.koul@intel.com, Tomasz Figa , Kyungmin Park , dave.jiang@intel.com References: <20121206091055.17085.47979.stgit@dev279.prn1.facebook.com> <20121206092605.17085.40510.stgit@dev279.prn1.facebook.com> In-reply-to: <20121206092605.17085.40510.stgit@dev279.prn1.facebook.com> MIME-version: 1.0 Message-id: <201212061648.11062.b.zolnierkie@samsung.com> Content-type: Text/Plain; charset=us-ascii Content-transfer-encoding: 7bit X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJLMWRmVeSWpSXmKPExsVy+t9jAd2V+w4EGFz9yGFxedccNgdGj8+b 5AIYo7hsUlJzMstSi/TtErgynu/9xVKwXqbizpd1jA2Mc0W7GDk5JARMJA5++c4GYYtJXLi3 HswWEljEKNG70LmLkQvIXsokseVrGytIgk3ASmJi+ypGEFtEQE5i9e0pzCC2sICHxOblx1hA bBYBVYlL67qZQGxRAQeJzqkT2EAGMQtsZZT4/mQnK8SGVkaJ7XNzQGxOoOa30/aDDeUVEJT4 Mfke0CAOINtS4utVRZAws4CWRPObTYwQtrzE5jVvmScwCsxC0jELSdksJGULGJlXMYqmFiQX FCel5xrpFSfmFpfmpesl5+duYgQH4DPpHYyrGiwOMQpwMCrx8FpU7w8QYk0sK67MPcQowcGs JMIb03EgQIg3JbGyKrUoP76oNCe1+BCjNAeLkjhvs0dKgJBAemJJanZqakFqEUyWiYNTqoFR +8AhNTb/VQ75c7rMc8Q78npObOO3/vl6TnG8182jn3ULHkpmq3vaKzJWn175wvtM8qxT+xvv M+3SLzfh2uBuftZYmWnKZ/YFxl+Cd1yfxfRzw8n2k99jljluu/Fwmai34CGmxGfvpvsryEj/ /3huQmQTZ7KxnViZcO19Wy9RWXXFsovTb/MosRRnJBpqMRcVJwIAdSqNrTwCAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday 06 December 2012 10:26:05 Dan Williams wrote: > Use the generic unmap object to unmap dma buffers. > > Cc: Tomasz Figa > Cc: Kyungmin Park > Reported-by: Bartlomiej Zolnierkiewicz > Signed-off-by: Dan Williams > --- > 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