Unverified Commit bb62feab authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7940 fix crypto_queue backlog handling 

Merge Pull Request from: @ci-robot 
 
PR sync from: Chen Ridong <chenridong@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/H2H6SFPKBONFAG2HUJSXUG5S3RKQMJO7/ 
*** BLURB HERE ***

Olivier Bacon (1):
  crypto: engine - fix crypto_queue backlog handling


-- 
2.34.1
 
https://gitee.com/openeuler/kernel/issues/I9RWXP 
 
Link:https://gitee.com/openeuler/kernel/pulls/7940

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 79524ebe a88b2d0e

crypto/algapi.c

+3 −0
Original line number Diff line number Diff line
@@ -963,6 +963,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);