Commit c470ffa6 authored by Ovidiu Panait's avatar Ovidiu Panait Committed by Herbert Xu
Browse files

crypto: engine - remove request batching support 



Remove request batching support from crypto_engine, as there are no
drivers using this feature and it doesn't really work that well.

Instead of doing batching based on backlog, a more optimal approach
would be for the user to handle the batching (similar to how IPsec
can hook into GSO to get 64K of data each time or how block encryption
can use unit sizes much greater than 4K).

Suggested-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarOvidiu Panait <ovidiu.panait.oss@gmail.com>
Reviewed-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 3d4df408

arch/s390/crypto/paes_s390.c

+1 −1
Original line number Diff line number Diff line
@@ -1633,7 +1633,7 @@ static int __init paes_s390_init(void) 
	/* with this pseudo devie alloc and start a crypto engine */

	paes_crypto_engine =

		crypto_engine_alloc_init_and_set(paes_dev.this_device,

						 true, NULL, false, MAX_QLEN);

						 true, false, MAX_QLEN);

	if (!paes_crypto_engine) {

		rc = -ENOMEM;

		goto out_err;

arch/s390/crypto/phmac_s390.c

+1 −1
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static int __init s390_phmac_init(void) 
	/* with this pseudo device alloc and start a crypto engine */

	phmac_crypto_engine =

		crypto_engine_alloc_init_and_set(phmac_dev.this_device,

						 true, NULL, false, MAX_QLEN);

						 true, false, MAX_QLEN);

	if (!phmac_crypto_engine) {

		rc = -ENOMEM;

		goto out_err;

crypto/crypto_engine.c

+1 −24
Original line number Diff line number Diff line
@@ -195,17 +195,6 @@ static void crypto_pump_requests(struct crypto_engine *engine, 
out:

	spin_unlock_irqrestore(&engine->queue_lock, flags);



	/*

	 * Batch requests is possible only if

	 * hardware can enqueue multiple requests

	 */

	if (engine->do_batch_requests) {

		ret = engine->do_batch_requests(engine);

		if (ret)

			dev_err(engine->dev, "failed to do batch requests: %d\n",

				ret);

	}



	return;

}
@@ -462,12 +451,6 @@ EXPORT_SYMBOL_GPL(crypto_engine_stop); 
 * crypto-engine queue.

 * @dev: the device attached with one hardware engine

 * @retry_support: whether hardware has support for retry mechanism

 * @cbk_do_batch: pointer to a callback function to be invoked when executing

 *                a batch of requests.

 *                This has the form:

 *                callback(struct crypto_engine *engine)

 *                where:

 *                engine: the crypto engine structure.

 * @rt: whether this queue is set to run as a realtime task

 * @qlen: maximum size of the crypto-engine queue

 *
@@ -476,7 +459,6 @@ EXPORT_SYMBOL_GPL(crypto_engine_stop); 
 */

struct crypto_engine *crypto_engine_alloc_init_and_set(struct device *dev,

						       bool retry_support,

						       int (*cbk_do_batch)(struct crypto_engine *engine),

						       bool rt, int qlen)

{

	struct crypto_engine *engine;
@@ -495,11 +477,6 @@ struct crypto_engine *crypto_engine_alloc_init_and_set(struct device *dev, 
	engine->idling = false;

	engine->retry_support = retry_support;

	engine->priv_data = dev;

	/*

	 * Batch requests is possible only if

	 * hardware has support for retry mechanism.

	 */

	engine->do_batch_requests = retry_support ? cbk_do_batch : NULL;



	snprintf(engine->name, sizeof(engine->name),

		 "%s-engine", dev_name(dev));
@@ -534,7 +511,7 @@ EXPORT_SYMBOL_GPL(crypto_engine_alloc_init_and_set); 
 */

struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt)

{

	return crypto_engine_alloc_init_and_set(dev, false, NULL, rt,

	return crypto_engine_alloc_init_and_set(dev, false, rt,

						CRYPTO_ENGINE_MAX_QLEN);

}

EXPORT_SYMBOL_GPL(crypto_engine_alloc_init);

drivers/crypto/caam/jr.c

+1 −2
Original line number Diff line number Diff line
@@ -629,8 +629,7 @@ static int caam_jr_probe(struct platform_device *pdev) 
	}



	/* Initialize crypto engine */

	jrpriv->engine = crypto_engine_alloc_init_and_set(jrdev, true, NULL,

							  false,

	jrpriv->engine = crypto_engine_alloc_init_and_set(jrdev, true, false,

							  CRYPTO_ENGINE_MAX_QLEN);

	if (!jrpriv->engine) {

		dev_err(jrdev, "Could not init crypto-engine\n");

drivers/crypto/virtio/virtio_crypto_core.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static int virtcrypto_find_vqs(struct virtio_crypto *vi) 
		spin_lock_init(&vi->data_vq[i].lock);

		vi->data_vq[i].vq = vqs[i];

		/* Initialize crypto engine */

		vi->data_vq[i].engine = crypto_engine_alloc_init_and_set(dev, true, NULL, true,

		vi->data_vq[i].engine = crypto_engine_alloc_init_and_set(dev, true, true,

						virtqueue_get_vring_size(vqs[i]));

		if (!vi->data_vq[i].engine) {

			ret = -ENOMEM;