Skip to content

Commit

Permalink
tls: Add support for encryption using async offload accelerator
Browse files Browse the repository at this point in the history
Async crypto accelerators (e.g. drivers/crypto/caam) support offloading
GCM operation. If they are enabled, crypto_aead_encrypt() return error
code -EINPROGRESS. In this case tls_do_encryption() needs to wait on a
completion till the time the response for crypto offload request is
received.

Signed-off-by: Vakul Garg <vakul.garg@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Vakul Garg authored and David S. Miller committed Jan 31, 2018
1 parent 4adfa79 commit a54667f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 2 additions & 0 deletions include/net/tls.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

#include <linux/types.h>
#include <asm/byteorder.h>
#include <linux/crypto.h>
#include <linux/socket.h>
#include <linux/tcp.h>
#include <net/tcp.h>
Expand All @@ -57,6 +58,7 @@

struct tls_sw_context {
struct crypto_aead *aead_send;
struct crypto_wait async_wait;

/* Sending context */
char aad_space[TLS_AAD_SPACE_SIZE];
Expand Down
8 changes: 7 additions & 1 deletion net/tls/tls_sw.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,11 @@ static int tls_do_encryption(struct tls_context *tls_ctx,
aead_request_set_ad(aead_req, TLS_AAD_SPACE_SIZE);
aead_request_set_crypt(aead_req, ctx->sg_aead_in, ctx->sg_aead_out,
data_len, tls_ctx->iv);
rc = crypto_aead_encrypt(aead_req);

aead_request_set_callback(aead_req, CRYPTO_TFM_REQ_MAY_BACKLOG,
crypto_req_done, &ctx->async_wait);

rc = crypto_wait_req(crypto_aead_encrypt(aead_req), &ctx->async_wait);

ctx->sg_encrypted_data[0].offset -= tls_ctx->prepend_size;
ctx->sg_encrypted_data[0].length += tls_ctx->prepend_size;
Expand Down Expand Up @@ -665,6 +669,8 @@ int tls_set_sw_offload(struct sock *sk, struct tls_context *ctx)
goto out;
}

crypto_init_wait(&sw_ctx->async_wait);

ctx->priv_ctx = (struct tls_offload_context *)sw_ctx;

crypto_info = &ctx->crypto_send;
Expand Down

0 comments on commit a54667f

Please sign in to comment.