* [PATCH v2 0/2] crypto: qat - fixes related to 'dma_map_single'
@ 2021-03-05 6:35 Hui Tang
2021-03-05 6:35 ` [PATCH v2 1/2] crypto: qat - fix unmap invalid dma address Hui Tang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Hui Tang @ 2021-03-05 6:35 UTC (permalink / raw)
To: herbert, davem, marco.chiappero, ebiggers, tomaszx.kowalik
Cc: linux-crypto, xuzaibo, wangzhou1, linux-kernel
This patchset fix bugs related to 'dma_map_single' use:
Hui Tang (2):
crypto: qat - fix 'dma_unmap_single' invalid address
crypto: qat - fix use of 'dma_map_single'
v1 -> v2:
1.fix build warning reported by kernel test rebot
2.add patch #1
drivers/crypto/qat/qat_common/qat_algs.c | 32 ++++++++++++++++++++------------
1 file changed, 20 insertions(+), 12 deletions(-)
--
2.8.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] crypto: qat - fix unmap invalid dma address
2021-03-05 6:35 [PATCH v2 0/2] crypto: qat - fixes related to 'dma_map_single' Hui Tang
@ 2021-03-05 6:35 ` Hui Tang
2021-03-05 6:35 ` [PATCH v2 2/2] crypto: qat - fix use of 'dma_map_single' Hui Tang
2021-03-12 13:13 ` [PATCH v2 0/2] crypto: qat - fixes related to 'dma_map_single' Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Hui Tang @ 2021-03-05 6:35 UTC (permalink / raw)
To: herbert, davem, marco.chiappero, ebiggers, tomaszx.kowalik
Cc: linux-crypto, xuzaibo, wangzhou1, linux-kernel
'dma_mapping_error' return a negative value if 'dma_addr' is equal to
'DMA_MAPPING_ERROR' not zero, so fix initialization of 'dma_addr'.
Signed-off-by: Hui Tang <tanghui20@huawei.com>
---
drivers/crypto/qat/qat_common/qat_algs.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c
index ff78c73..ea1c689 100644
--- a/drivers/crypto/qat/qat_common/qat_algs.c
+++ b/drivers/crypto/qat/qat_common/qat_algs.c
@@ -719,7 +719,7 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
struct qat_alg_buf_list *bufl;
struct qat_alg_buf_list *buflout = NULL;
dma_addr_t blp;
- dma_addr_t bloutp = 0;
+ dma_addr_t bloutp;
struct scatterlist *sg;
size_t sz_out, sz = struct_size(bufl, bufers, n + 1);
@@ -731,6 +731,9 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
if (unlikely(!bufl))
return -ENOMEM;
+ for_each_sg(sgl, sg, n, i)
+ bufl->bufers[i].addr = DMA_MAPPING_ERROR;
+
blp = dma_map_single(dev, bufl, sz, DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(dev, blp)))
goto err_in;
@@ -764,10 +767,14 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
dev_to_node(&GET_DEV(inst->accel_dev)));
if (unlikely(!buflout))
goto err_in;
+
+ bufers = buflout->bufers;
+ for_each_sg(sglout, sg, n, i)
+ bufers[i].addr = DMA_MAPPING_ERROR;
+
bloutp = dma_map_single(dev, buflout, sz_out, DMA_TO_DEVICE);
if (unlikely(dma_mapping_error(dev, bloutp)))
goto err_out;
- bufers = buflout->bufers;
for_each_sg(sglout, sg, n, i) {
int y = sg_nctr;
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] crypto: qat - fix use of 'dma_map_single'
2021-03-05 6:35 [PATCH v2 0/2] crypto: qat - fixes related to 'dma_map_single' Hui Tang
2021-03-05 6:35 ` [PATCH v2 1/2] crypto: qat - fix unmap invalid dma address Hui Tang
@ 2021-03-05 6:35 ` Hui Tang
2021-03-12 13:13 ` [PATCH v2 0/2] crypto: qat - fixes related to 'dma_map_single' Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Hui Tang @ 2021-03-05 6:35 UTC (permalink / raw)
To: herbert, davem, marco.chiappero, ebiggers, tomaszx.kowalik
Cc: linux-crypto, xuzaibo, wangzhou1, linux-kernel
DMA_TO_DEVICE synchronisation must be done after the last modification
of the memory region by the software and before it is handed off to
the device.
Signed-off-by: Hui Tang <tanghui20@huawei.com>
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/crypto/qat/qat_common/qat_algs.c | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/qat_common/qat_algs.c
index ea1c689..f998ed5 100644
--- a/drivers/crypto/qat/qat_common/qat_algs.c
+++ b/drivers/crypto/qat/qat_common/qat_algs.c
@@ -718,8 +718,8 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
int n = sg_nents(sgl);
struct qat_alg_buf_list *bufl;
struct qat_alg_buf_list *buflout = NULL;
- dma_addr_t blp;
- dma_addr_t bloutp;
+ dma_addr_t blp = DMA_MAPPING_ERROR;
+ dma_addr_t bloutp = DMA_MAPPING_ERROR;
struct scatterlist *sg;
size_t sz_out, sz = struct_size(bufl, bufers, n + 1);
@@ -734,10 +734,6 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
for_each_sg(sgl, sg, n, i)
bufl->bufers[i].addr = DMA_MAPPING_ERROR;
- blp = dma_map_single(dev, bufl, sz, DMA_TO_DEVICE);
- if (unlikely(dma_mapping_error(dev, blp)))
- goto err_in;
-
for_each_sg(sgl, sg, n, i) {
int y = sg_nctr;
@@ -753,6 +749,9 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
sg_nctr++;
}
bufl->num_bufs = sg_nctr;
+ blp = dma_map_single(dev, bufl, sz, DMA_TO_DEVICE);
+ if (unlikely(dma_mapping_error(dev, blp)))
+ goto err_in;
qat_req->buf.bl = bufl;
qat_req->buf.blp = blp;
qat_req->buf.sz = sz;
@@ -772,9 +771,6 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
for_each_sg(sglout, sg, n, i)
bufers[i].addr = DMA_MAPPING_ERROR;
- bloutp = dma_map_single(dev, buflout, sz_out, DMA_TO_DEVICE);
- if (unlikely(dma_mapping_error(dev, bloutp)))
- goto err_out;
for_each_sg(sglout, sg, n, i) {
int y = sg_nctr;
@@ -791,6 +787,9 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
}
buflout->num_bufs = sg_nctr;
buflout->num_mapped_bufs = sg_nctr;
+ bloutp = dma_map_single(dev, buflout, sz_out, DMA_TO_DEVICE);
+ if (unlikely(dma_mapping_error(dev, bloutp)))
+ goto err_out;
qat_req->buf.blout = buflout;
qat_req->buf.bloutp = bloutp;
qat_req->buf.sz_out = sz_out;
@@ -802,17 +801,21 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
return 0;
err_out:
+ if (!dma_mapping_error(dev, bloutp))
+ dma_unmap_single(dev, bloutp, sz_out, DMA_TO_DEVICE);
+
n = sg_nents(sglout);
for (i = 0; i < n; i++)
if (!dma_mapping_error(dev, buflout->bufers[i].addr))
dma_unmap_single(dev, buflout->bufers[i].addr,
buflout->bufers[i].len,
DMA_BIDIRECTIONAL);
- if (!dma_mapping_error(dev, bloutp))
- dma_unmap_single(dev, bloutp, sz_out, DMA_TO_DEVICE);
kfree(buflout);
err_in:
+ if (!dma_mapping_error(dev, blp))
+ dma_unmap_single(dev, blp, sz, DMA_TO_DEVICE);
+
n = sg_nents(sgl);
for (i = 0; i < n; i++)
if (!dma_mapping_error(dev, bufl->bufers[i].addr))
@@ -820,8 +823,6 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instance *inst,
bufl->bufers[i].len,
DMA_BIDIRECTIONAL);
- if (!dma_mapping_error(dev, blp))
- dma_unmap_single(dev, blp, sz, DMA_TO_DEVICE);
kfree(bufl);
dev_err(dev, "Failed to map buf for dma\n");
--
2.8.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 0/2] crypto: qat - fixes related to 'dma_map_single'
2021-03-05 6:35 [PATCH v2 0/2] crypto: qat - fixes related to 'dma_map_single' Hui Tang
2021-03-05 6:35 ` [PATCH v2 1/2] crypto: qat - fix unmap invalid dma address Hui Tang
2021-03-05 6:35 ` [PATCH v2 2/2] crypto: qat - fix use of 'dma_map_single' Hui Tang
@ 2021-03-12 13:13 ` Herbert Xu
2 siblings, 0 replies; 4+ messages in thread
From: Herbert Xu @ 2021-03-12 13:13 UTC (permalink / raw)
To: Hui Tang
Cc: davem, marco.chiappero, ebiggers, tomaszx.kowalik, linux-crypto,
xuzaibo, wangzhou1, linux-kernel
On Fri, Mar 05, 2021 at 02:35:00PM +0800, Hui Tang wrote:
> This patchset fix bugs related to 'dma_map_single' use:
>
> Hui Tang (2):
> crypto: qat - fix 'dma_unmap_single' invalid address
> crypto: qat - fix use of 'dma_map_single'
>
>
> v1 -> v2:
> 1.fix build warning reported by kernel test rebot
> 2.add patch #1
>
> drivers/crypto/qat/qat_common/qat_algs.c | 32 ++++++++++++++++++++------------
> 1 file changed, 20 insertions(+), 12 deletions(-)
All applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-03-12 13:14 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-05 6:35 [PATCH v2 0/2] crypto: qat - fixes related to 'dma_map_single' Hui Tang
2021-03-05 6:35 ` [PATCH v2 1/2] crypto: qat - fix unmap invalid dma address Hui Tang
2021-03-05 6:35 ` [PATCH v2 2/2] crypto: qat - fix use of 'dma_map_single' Hui Tang
2021-03-12 13:13 ` [PATCH v2 0/2] crypto: qat - fixes related to 'dma_map_single' Herbert Xu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).