Commit 25a45ec6 authored by Olivier Bacon's avatar Olivier Bacon Committed by Chen Ridong
Browse files

crypto: engine - fix crypto_queue backlog handling 

mainline inclusion
from mainline-v6.4-rc1
commit 4140aafc
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9RWXP

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4140aafcff167b5b9e8dae6a1709a6de7cac6f74



----------------------------------------------------------------------

CRYPTO_TFM_REQ_MAY_BACKLOG tells the crypto driver that it should
internally backlog requests until the crypto hw's queue becomes
full. At that point, crypto_engine backlogs the request and returns
-EBUSY. Calling driver such as dm-crypt then waits until the
complete() function is called with a status of -EINPROGRESS before
sending a new request.

The problem lies in the call to complete() with a value of -EINPROGRESS
that is made when a backlog item is present on the queue. The call is
done before the successful execution of the crypto request. In the case
that do_one_request() returns < 0 and the retry support is available,
the request is put back in the queue. This leads upper drivers to send
a new request even if the queue is still full.

The problem can be reproduced by doing a large dd into a crypto
dm-crypt device. This is pretty easy to see when using
Freescale CAAM crypto driver and SWIOTLB dma. Since the actual amount
of requests that can be hold in the queue is unlimited we get IOs error
and dma allocation.

The fix is to call complete with a value of -EINPROGRESS only if
the request is not enqueued back in crypto_queue. This is done
by calling complete() later in the code. In order to delay the decision,
crypto_queue is modified to correctly set the backlog pointer
when a request is enqueued back.

Fixes: 6a89f492 ("crypto: engine - support for parallel requests based on retry mechanism")
Co-developed-by: default avatarSylvain Ouellet <souellet@genetec.com>
Signed-off-by: default avatarSylvain Ouellet <souellet@genetec.com>
Signed-off-by: default avatarOlivier Bacon <obacon@genetec.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>

Conflicts:
	crypto/crypto_engine.c
[->complete was refactored to crypto_request_complete function]
Signed-off-by: default avatarChen Ridong <chenridong@huawei.com>
parent 72644eb2

crypto/algapi.c

+3 −0
Original line number Diff line number Diff line
@@ -936,6 +936,9 @@ EXPORT_SYMBOL_GPL(crypto_enqueue_request); 
void crypto_enqueue_request_head(struct crypto_queue *queue,

				 struct crypto_async_request *request)

{

	if (unlikely(queue->qlen >= queue->max_qlen))

		queue->backlog = queue->backlog->prev;



	queue->qlen++;

	list_add(&request->list, &queue->list);

}

crypto/crypto_engine.c

+3 −3
Original line number Diff line number Diff line
@@ -128,9 +128,6 @@ static void crypto_pump_requests(struct crypto_engine *engine, 
	if (!engine->retry_support)

		engine->cur_req = async_req;



	if (backlog)

		backlog->complete(backlog, -EINPROGRESS);



	if (engine->busy)

		was_busy = true;

	else
@@ -216,6 +213,9 @@ static void crypto_pump_requests(struct crypto_engine *engine, 
	async_req->complete(async_req, ret);



retry:

	if (backlog)

		backlog->complete(backlog, -EINPROGRESS);



	/* If retry mechanism is supported, send new requests to engine */

	if (engine->retry_support) {

		spin_lock_irqsave(&engine->queue_lock, flags);