mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-18 13:57:37 +07:00
crypto: hisilicon - don't sleep of CRYPTO_TFM_REQ_MAY_SLEEP was not specified
There is this call chain:
sec_alg_skcipher_encrypt -> sec_alg_skcipher_crypto ->
sec_alg_alloc_and_calc_split_sizes -> kcalloc
where we call sleeping allocator function even if CRYPTO_TFM_REQ_MAY_SLEEP
was not specified.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org # v4.19+
Fixes: 915e4e8413 ("crypto: hisilicon - SEC security accelerator driver")
Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Mikulas Patocka
Herbert Xu
parent
9e27c99104
commit
5ead051780
@ -175,7 +175,8 @@ static int sec_alloc_and_fill_hw_sgl(struct sec_hw_sgl **sec_sgl,
|
||||
dma_addr_t *psec_sgl,
|
||||
struct scatterlist *sgl,
|
||||
int count,
|
||||
struct sec_dev_info *info)
|
||||
struct sec_dev_info *info,
|
||||
gfp_t gfp)
|
||||
{
|
||||
struct sec_hw_sgl *sgl_current = NULL;
|
||||
struct sec_hw_sgl *sgl_next;
|
||||
@ -190,7 +191,7 @@ static int sec_alloc_and_fill_hw_sgl(struct sec_hw_sgl **sec_sgl,
|
||||
sge_index = i % SEC_MAX_SGE_NUM;
|
||||
if (sge_index == 0) {
|
||||
sgl_next = dma_pool_zalloc(info->hw_sgl_pool,
|
||||
GFP_KERNEL, &sgl_next_dma);
|
||||
gfp, &sgl_next_dma);
|
||||
if (!sgl_next) {
|
||||
ret = -ENOMEM;
|
||||
goto err_free_hw_sgls;
|
||||
@ -545,14 +546,14 @@ void sec_alg_callback(struct sec_bd_info *resp, void *shadow)
|
||||
}
|
||||
|
||||
static int sec_alg_alloc_and_calc_split_sizes(int length, size_t **split_sizes,
|
||||
int *steps)
|
||||
int *steps, gfp_t gfp)
|
||||
{
|
||||
size_t *sizes;
|
||||
int i;
|
||||
|
||||
/* Split into suitable sized blocks */
|
||||
*steps = roundup(length, SEC_REQ_LIMIT) / SEC_REQ_LIMIT;
|
||||
sizes = kcalloc(*steps, sizeof(*sizes), GFP_KERNEL);
|
||||
sizes = kcalloc(*steps, sizeof(*sizes), gfp);
|
||||
if (!sizes)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -568,7 +569,7 @@ static int sec_map_and_split_sg(struct scatterlist *sgl, size_t *split_sizes,
|
||||
int steps, struct scatterlist ***splits,
|
||||
int **splits_nents,
|
||||
int sgl_len_in,
|
||||
struct device *dev)
|
||||
struct device *dev, gfp_t gfp)
|
||||
{
|
||||
int ret, count;
|
||||
|
||||
@ -576,12 +577,12 @@ static int sec_map_and_split_sg(struct scatterlist *sgl, size_t *split_sizes,
|
||||
if (!count)
|
||||
return -EINVAL;
|
||||
|
||||
*splits = kcalloc(steps, sizeof(struct scatterlist *), GFP_KERNEL);
|
||||
*splits = kcalloc(steps, sizeof(struct scatterlist *), gfp);
|
||||
if (!*splits) {
|
||||
ret = -ENOMEM;
|
||||
goto err_unmap_sg;
|
||||
}
|
||||
*splits_nents = kcalloc(steps, sizeof(int), GFP_KERNEL);
|
||||
*splits_nents = kcalloc(steps, sizeof(int), gfp);
|
||||
if (!*splits_nents) {
|
||||
ret = -ENOMEM;
|
||||
goto err_free_splits;
|
||||
@ -589,7 +590,7 @@ static int sec_map_and_split_sg(struct scatterlist *sgl, size_t *split_sizes,
|
||||
|
||||
/* output the scatter list before and after this */
|
||||
ret = sg_split(sgl, count, 0, steps, split_sizes,
|
||||
*splits, *splits_nents, GFP_KERNEL);
|
||||
*splits, *splits_nents, gfp);
|
||||
if (ret) {
|
||||
ret = -ENOMEM;
|
||||
goto err_free_splits_nents;
|
||||
@ -630,13 +631,13 @@ static struct sec_request_el
|
||||
int el_size, bool different_dest,
|
||||
struct scatterlist *sgl_in, int n_ents_in,
|
||||
struct scatterlist *sgl_out, int n_ents_out,
|
||||
struct sec_dev_info *info)
|
||||
struct sec_dev_info *info, gfp_t gfp)
|
||||
{
|
||||
struct sec_request_el *el;
|
||||
struct sec_bd_info *req;
|
||||
int ret;
|
||||
|
||||
el = kzalloc(sizeof(*el), GFP_KERNEL);
|
||||
el = kzalloc(sizeof(*el), gfp);
|
||||
if (!el)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
el->el_length = el_size;
|
||||
@ -668,7 +669,7 @@ static struct sec_request_el
|
||||
el->sgl_in = sgl_in;
|
||||
|
||||
ret = sec_alloc_and_fill_hw_sgl(&el->in, &el->dma_in, el->sgl_in,
|
||||
n_ents_in, info);
|
||||
n_ents_in, info, gfp);
|
||||
if (ret)
|
||||
goto err_free_el;
|
||||
|
||||
@ -679,7 +680,7 @@ static struct sec_request_el
|
||||
el->sgl_out = sgl_out;
|
||||
ret = sec_alloc_and_fill_hw_sgl(&el->out, &el->dma_out,
|
||||
el->sgl_out,
|
||||
n_ents_out, info);
|
||||
n_ents_out, info, gfp);
|
||||
if (ret)
|
||||
goto err_free_hw_sgl_in;
|
||||
|
||||
@ -720,6 +721,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq,
|
||||
int *splits_out_nents = NULL;
|
||||
struct sec_request_el *el, *temp;
|
||||
bool split = skreq->src != skreq->dst;
|
||||
gfp_t gfp = skreq->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : GFP_ATOMIC;
|
||||
|
||||
mutex_init(&sec_req->lock);
|
||||
sec_req->req_base = &skreq->base;
|
||||
@ -728,13 +730,13 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq,
|
||||
sec_req->len_in = sg_nents(skreq->src);
|
||||
|
||||
ret = sec_alg_alloc_and_calc_split_sizes(skreq->cryptlen, &split_sizes,
|
||||
&steps);
|
||||
&steps, gfp);
|
||||
if (ret)
|
||||
return ret;
|
||||
sec_req->num_elements = steps;
|
||||
ret = sec_map_and_split_sg(skreq->src, split_sizes, steps, &splits_in,
|
||||
&splits_in_nents, sec_req->len_in,
|
||||
info->dev);
|
||||
info->dev, gfp);
|
||||
if (ret)
|
||||
goto err_free_split_sizes;
|
||||
|
||||
@ -742,7 +744,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq,
|
||||
sec_req->len_out = sg_nents(skreq->dst);
|
||||
ret = sec_map_and_split_sg(skreq->dst, split_sizes, steps,
|
||||
&splits_out, &splits_out_nents,
|
||||
sec_req->len_out, info->dev);
|
||||
sec_req->len_out, info->dev, gfp);
|
||||
if (ret)
|
||||
goto err_unmap_in_sg;
|
||||
}
|
||||
@ -775,7 +777,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq,
|
||||
splits_in[i], splits_in_nents[i],
|
||||
split ? splits_out[i] : NULL,
|
||||
split ? splits_out_nents[i] : 0,
|
||||
info);
|
||||
info, gfp);
|
||||
if (IS_ERR(el)) {
|
||||
ret = PTR_ERR(el);
|
||||
goto err_free_elements;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user