crypto: remove redundant backlog checks on EBUSY
Now that -EBUSY return code only indicates backlog queueing we can safely remove the now redundant check for the CRYPTO_TFM_REQ_MAY_BACKLOG flag when -EBUSY is returned. Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
parent
068c2e7035
commit
4e5b0ad582
|
@ -334,9 +334,7 @@ static int ahash_op_unaligned(struct ahash_request *req,
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
err = op(req);
|
err = op(req);
|
||||||
if (err == -EINPROGRESS ||
|
if (err == -EINPROGRESS || err == -EBUSY)
|
||||||
(err == -EBUSY && (ahash_request_flags(req) &
|
|
||||||
CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
ahash_restore_req(req, err);
|
ahash_restore_req(req, err);
|
||||||
|
@ -394,9 +392,7 @@ static int ahash_def_finup_finish1(struct ahash_request *req, int err)
|
||||||
req->base.complete = ahash_def_finup_done2;
|
req->base.complete = ahash_def_finup_done2;
|
||||||
|
|
||||||
err = crypto_ahash_reqtfm(req)->final(req);
|
err = crypto_ahash_reqtfm(req)->final(req);
|
||||||
if (err == -EINPROGRESS ||
|
if (err == -EINPROGRESS || err == -EBUSY)
|
||||||
(err == -EBUSY && (ahash_request_flags(req) &
|
|
||||||
CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
@ -432,9 +428,7 @@ static int ahash_def_finup(struct ahash_request *req)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
err = tfm->update(req);
|
err = tfm->update(req);
|
||||||
if (err == -EINPROGRESS ||
|
if (err == -EINPROGRESS || err == -EBUSY)
|
||||||
(err == -EBUSY && (ahash_request_flags(req) &
|
|
||||||
CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
return ahash_def_finup_finish1(req, err);
|
return ahash_def_finup_finish1(req, err);
|
||||||
|
|
|
@ -136,8 +136,7 @@ static void crypto_cts_encrypt_done(struct crypto_async_request *areq, int err)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
err = cts_cbc_encrypt(req);
|
err = cts_cbc_encrypt(req);
|
||||||
if (err == -EINPROGRESS ||
|
if (err == -EINPROGRESS || err == -EBUSY)
|
||||||
(err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
@ -229,8 +228,7 @@ static void crypto_cts_decrypt_done(struct crypto_async_request *areq, int err)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
err = cts_cbc_decrypt(req);
|
err = cts_cbc_decrypt(req);
|
||||||
if (err == -EINPROGRESS ||
|
if (err == -EINPROGRESS || err == -EBUSY)
|
||||||
(err == -EBUSY && req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
|
|
@ -328,9 +328,7 @@ static int do_encrypt(struct skcipher_request *req, int err)
|
||||||
crypto_skcipher_encrypt(subreq) ?:
|
crypto_skcipher_encrypt(subreq) ?:
|
||||||
post_crypt(req);
|
post_crypt(req);
|
||||||
|
|
||||||
if (err == -EINPROGRESS ||
|
if (err == -EINPROGRESS || err == -EBUSY)
|
||||||
(err == -EBUSY &&
|
|
||||||
req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -380,9 +378,7 @@ static int do_decrypt(struct skcipher_request *req, int err)
|
||||||
crypto_skcipher_decrypt(subreq) ?:
|
crypto_skcipher_decrypt(subreq) ?:
|
||||||
post_crypt(req);
|
post_crypt(req);
|
||||||
|
|
||||||
if (err == -EINPROGRESS ||
|
if (err == -EINPROGRESS || err == -EBUSY)
|
||||||
(err == -EBUSY &&
|
|
||||||
req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -279,9 +279,7 @@ static int pkcs1pad_encrypt(struct akcipher_request *req)
|
||||||
req->dst, ctx->key_size - 1, req->dst_len);
|
req->dst, ctx->key_size - 1, req->dst_len);
|
||||||
|
|
||||||
err = crypto_akcipher_encrypt(&req_ctx->child_req);
|
err = crypto_akcipher_encrypt(&req_ctx->child_req);
|
||||||
if (err != -EINPROGRESS &&
|
if (err != -EINPROGRESS && err != -EBUSY)
|
||||||
(err != -EBUSY ||
|
|
||||||
!(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
||||||
return pkcs1pad_encrypt_sign_complete(req, err);
|
return pkcs1pad_encrypt_sign_complete(req, err);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
|
@ -383,9 +381,7 @@ static int pkcs1pad_decrypt(struct akcipher_request *req)
|
||||||
ctx->key_size);
|
ctx->key_size);
|
||||||
|
|
||||||
err = crypto_akcipher_decrypt(&req_ctx->child_req);
|
err = crypto_akcipher_decrypt(&req_ctx->child_req);
|
||||||
if (err != -EINPROGRESS &&
|
if (err != -EINPROGRESS && err != -EBUSY)
|
||||||
(err != -EBUSY ||
|
|
||||||
!(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
||||||
return pkcs1pad_decrypt_complete(req, err);
|
return pkcs1pad_decrypt_complete(req, err);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
|
@ -440,9 +436,7 @@ static int pkcs1pad_sign(struct akcipher_request *req)
|
||||||
req->dst, ctx->key_size - 1, req->dst_len);
|
req->dst, ctx->key_size - 1, req->dst_len);
|
||||||
|
|
||||||
err = crypto_akcipher_sign(&req_ctx->child_req);
|
err = crypto_akcipher_sign(&req_ctx->child_req);
|
||||||
if (err != -EINPROGRESS &&
|
if (err != -EINPROGRESS && err != -EBUSY)
|
||||||
(err != -EBUSY ||
|
|
||||||
!(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
||||||
return pkcs1pad_encrypt_sign_complete(req, err);
|
return pkcs1pad_encrypt_sign_complete(req, err);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
|
@ -561,9 +555,7 @@ static int pkcs1pad_verify(struct akcipher_request *req)
|
||||||
ctx->key_size);
|
ctx->key_size);
|
||||||
|
|
||||||
err = crypto_akcipher_verify(&req_ctx->child_req);
|
err = crypto_akcipher_verify(&req_ctx->child_req);
|
||||||
if (err != -EINPROGRESS &&
|
if (err != -EINPROGRESS && err != -EBUSY)
|
||||||
(err != -EBUSY ||
|
|
||||||
!(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
||||||
return pkcs1pad_verify_complete(req, err);
|
return pkcs1pad_verify_complete(req, err);
|
||||||
|
|
||||||
return err;
|
return err;
|
||||||
|
|
|
@ -269,9 +269,7 @@ static int do_encrypt(struct skcipher_request *req, int err)
|
||||||
crypto_skcipher_encrypt(subreq) ?:
|
crypto_skcipher_encrypt(subreq) ?:
|
||||||
post_crypt(req);
|
post_crypt(req);
|
||||||
|
|
||||||
if (err == -EINPROGRESS ||
|
if (err == -EINPROGRESS || err == -EBUSY)
|
||||||
(err == -EBUSY &&
|
|
||||||
req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -321,9 +319,7 @@ static int do_decrypt(struct skcipher_request *req, int err)
|
||||||
crypto_skcipher_decrypt(subreq) ?:
|
crypto_skcipher_decrypt(subreq) ?:
|
||||||
post_crypt(req);
|
post_crypt(req);
|
||||||
|
|
||||||
if (err == -EINPROGRESS ||
|
if (err == -EINPROGRESS || err == -EBUSY)
|
||||||
(err == -EBUSY &&
|
|
||||||
req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG))
|
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue