From: T Pratham <t-pratham@ti.com>
To: T Pratham <t-pratham@ti.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>
Cc: Sebin Francis <sebin.francis@ti.com>,
Manorit Chawdhry <m-chawdhry@ti.com>,
Praneeth Bajjuri <praneeth@ti.com>,
Vishal Mahaveer <vishalm@ti.com>, <linux-crypto@vger.kernel.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH v6 06/15] crypto: ti - Align buffers to cacheline for DMA
Date: Wed, 30 Sep 2026 16:55:24 +0530 [thread overview]
Message-ID: <20260930112533.1593952-7-t-pratham@ti.com> (raw)
In-Reply-To: <20260930112533.1593952-1-t-pratham@ti.com>
Align padding buffer which are DMA mapped to cache line to avoid any
potential cache coherence problem. Add DMA padding to reqctx and use
req_ctx_dma helpers instead of req_ctx.
Fixes: 35645ca63caa1 ("crypto: ti - Add support for AES-CTR in DTHEv2 driver")
Signed-off-by: T Pratham <t-pratham@ti.com>
---
drivers/crypto/ti/dthev2-aes.c | 46 +++++++++++++++++--------------
drivers/crypto/ti/dthev2-common.h | 2 ++
2 files changed, 28 insertions(+), 20 deletions(-)
diff --git a/drivers/crypto/ti/dthev2-aes.c b/drivers/crypto/ti/dthev2-aes.c
index be7ec62ab2513..5be1bcaeee5ed 100644
--- a/drivers/crypto/ti/dthev2-aes.c
+++ b/drivers/crypto/ti/dthev2-aes.c
@@ -298,7 +298,7 @@ static void dthe_aes_set_ctrl_key(struct dthe_tfm_ctx *ctx,
static int dthe_aes_do_fallback(struct skcipher_request *req)
{
struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(crypto_skcipher_reqtfm(req));
- struct dthe_aes_req_ctx *rctx = skcipher_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = skcipher_request_ctx_dma(req);
SYNC_SKCIPHER_REQUEST_ON_STACK(subreq, ctx->skcipher_fb);
@@ -314,7 +314,7 @@ static int dthe_aes_do_fallback(struct skcipher_request *req)
static void dthe_aes_dma_in_callback(void *data)
{
struct skcipher_request *req = (struct skcipher_request *)data;
- struct dthe_aes_req_ctx *rctx = skcipher_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = skcipher_request_ctx_dma(req);
complete(&rctx->aes_compl);
}
@@ -323,7 +323,7 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq)
{
struct skcipher_request *req = container_of(areq, struct skcipher_request, base);
struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(crypto_skcipher_reqtfm(req));
- struct dthe_aes_req_ctx *rctx = skcipher_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = skcipher_request_ctx_dma(req);
struct dthe_data *dev_data = rctx->dev_data;
unsigned int len = req->cryptlen;
@@ -515,7 +515,7 @@ static int dthe_aes_run(struct crypto_engine *engine, void *areq)
static int dthe_aes_crypt(struct skcipher_request *req)
{
struct dthe_tfm_ctx *ctx = crypto_skcipher_ctx(crypto_skcipher_reqtfm(req));
- struct dthe_aes_req_ctx *rctx = skcipher_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = skcipher_request_ctx_dma(req);
struct dthe_data *dev_data;
struct crypto_engine *engine;
int ret;
@@ -560,7 +560,7 @@ static int dthe_aes_crypt(struct skcipher_request *req)
static int dthe_aes_encrypt(struct skcipher_request *req)
{
- struct dthe_aes_req_ctx *rctx = skcipher_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = skcipher_request_ctx_dma(req);
rctx->enc = 1;
return dthe_aes_crypt(req);
@@ -568,7 +568,7 @@ static int dthe_aes_encrypt(struct skcipher_request *req)
static int dthe_aes_decrypt(struct skcipher_request *req)
{
- struct dthe_aes_req_ctx *rctx = skcipher_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = skcipher_request_ctx_dma(req);
rctx->enc = 0;
return dthe_aes_crypt(req);
@@ -735,7 +735,7 @@ static int dthe_aead_read_tag(struct dthe_aes_req_ctx *rctx, u32 *tag)
static int dthe_aead_enc_get_tag(struct aead_request *req)
{
struct dthe_tfm_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
- struct dthe_aes_req_ctx *rctx = aead_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = aead_request_ctx_dma(req);
u32 tag[AES_BLOCK_WORDS];
int nents;
int ret;
@@ -755,7 +755,7 @@ static int dthe_aead_enc_get_tag(struct aead_request *req)
static int dthe_aead_dec_verify_tag(struct aead_request *req)
{
struct dthe_tfm_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
- struct dthe_aes_req_ctx *rctx = aead_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = aead_request_ctx_dma(req);
u32 tag_out[AES_BLOCK_WORDS];
u32 tag_in[AES_BLOCK_WORDS];
int nents;
@@ -836,7 +836,7 @@ static int dthe_aead_setauthsize(struct crypto_aead *tfm, unsigned int authsize)
static int dthe_aead_do_fallback(struct aead_request *req)
{
struct dthe_tfm_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
- struct dthe_aes_req_ctx *rctx = aead_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = aead_request_ctx_dma(req);
SYNC_AEAD_REQUEST_ON_STACK(subreq, ctx->aead_fb);
@@ -852,7 +852,7 @@ static int dthe_aead_do_fallback(struct aead_request *req)
static void dthe_aead_dma_in_callback(void *data)
{
struct aead_request *req = (struct aead_request *)data;
- struct dthe_aes_req_ctx *rctx = aead_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = aead_request_ctx_dma(req);
complete(&rctx->aes_compl);
}
@@ -861,7 +861,7 @@ static int dthe_aead_run(struct crypto_engine *engine, void *areq)
{
struct aead_request *req = container_of(areq, struct aead_request, base);
struct dthe_tfm_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
- struct dthe_aes_req_ctx *rctx = aead_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = aead_request_ctx_dma(req);
struct dthe_data *dev_data = rctx->dev_data;
unsigned int cryptlen = req->cryptlen;
@@ -1140,7 +1140,7 @@ static int dthe_aead_run(struct crypto_engine *engine, void *areq)
static int dthe_aead_crypt(struct aead_request *req)
{
struct dthe_tfm_ctx *ctx = crypto_aead_ctx(crypto_aead_reqtfm(req));
- struct dthe_aes_req_ctx *rctx = aead_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = aead_request_ctx_dma(req);
struct dthe_data *dev_data;
struct crypto_engine *engine;
unsigned int cryptlen = req->cryptlen;
@@ -1212,7 +1212,7 @@ static int dthe_aead_crypt(struct aead_request *req)
static int dthe_aead_encrypt(struct aead_request *req)
{
- struct dthe_aes_req_ctx *rctx = aead_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = aead_request_ctx_dma(req);
rctx->enc = 1;
return dthe_aead_crypt(req);
@@ -1220,7 +1220,7 @@ static int dthe_aead_encrypt(struct aead_request *req)
static int dthe_aead_decrypt(struct aead_request *req)
{
- struct dthe_aes_req_ctx *rctx = aead_request_ctx(req);
+ struct dthe_aes_req_ctx *rctx = aead_request_ctx_dma(req);
rctx->enc = 0;
return dthe_aead_crypt(req);
@@ -1246,7 +1246,8 @@ static struct skcipher_engine_alg cipher_algs[] = {
.cra_alignmask = AES_BLOCK_SIZE - 1,
.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct dthe_tfm_ctx),
- .cra_reqsize = sizeof(struct dthe_aes_req_ctx),
+ .cra_reqsize = sizeof(struct dthe_aes_req_ctx) +
+ CRYPTO_DMA_PADDING,
.cra_module = THIS_MODULE,
},
.op.do_one_request = dthe_aes_run,
@@ -1271,7 +1272,8 @@ static struct skcipher_engine_alg cipher_algs[] = {
.cra_alignmask = AES_BLOCK_SIZE - 1,
.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct dthe_tfm_ctx),
- .cra_reqsize = sizeof(struct dthe_aes_req_ctx),
+ .cra_reqsize = sizeof(struct dthe_aes_req_ctx) +
+ CRYPTO_DMA_PADDING,
.cra_module = THIS_MODULE,
},
.op.do_one_request = dthe_aes_run,
@@ -1296,7 +1298,8 @@ static struct skcipher_engine_alg cipher_algs[] = {
CRYPTO_ALG_NEED_FALLBACK,
.cra_blocksize = 1,
.cra_ctxsize = sizeof(struct dthe_tfm_ctx),
- .cra_reqsize = sizeof(struct dthe_aes_req_ctx),
+ .cra_reqsize = sizeof(struct dthe_aes_req_ctx) +
+ CRYPTO_DMA_PADDING,
.cra_module = THIS_MODULE,
},
.op.do_one_request = dthe_aes_run,
@@ -1321,7 +1324,8 @@ static struct skcipher_engine_alg cipher_algs[] = {
.cra_alignmask = AES_BLOCK_SIZE - 1,
.cra_blocksize = AES_BLOCK_SIZE,
.cra_ctxsize = sizeof(struct dthe_tfm_ctx),
- .cra_reqsize = sizeof(struct dthe_aes_req_ctx),
+ .cra_reqsize = sizeof(struct dthe_aes_req_ctx) +
+ CRYPTO_DMA_PADDING,
.cra_module = THIS_MODULE,
},
.op.do_one_request = dthe_aes_run,
@@ -1349,7 +1353,8 @@ static struct aead_engine_alg aead_algs[] = {
CRYPTO_ALG_NEED_FALLBACK,
.cra_blocksize = 1,
.cra_ctxsize = sizeof(struct dthe_tfm_ctx),
- .cra_reqsize = sizeof(struct dthe_aes_req_ctx),
+ .cra_reqsize = sizeof(struct dthe_aes_req_ctx) +
+ CRYPTO_DMA_PADDING,
.cra_module = THIS_MODULE,
},
.op.do_one_request = dthe_aead_run,
@@ -1374,7 +1379,8 @@ static struct aead_engine_alg aead_algs[] = {
CRYPTO_ALG_NEED_FALLBACK,
.cra_blocksize = 1,
.cra_ctxsize = sizeof(struct dthe_tfm_ctx),
- .cra_reqsize = sizeof(struct dthe_aes_req_ctx),
+ .cra_reqsize = sizeof(struct dthe_aes_req_ctx) +
+ CRYPTO_DMA_PADDING,
.cra_module = THIS_MODULE,
},
.op.do_one_request = dthe_aead_run,
diff --git a/drivers/crypto/ti/dthev2-common.h b/drivers/crypto/ti/dthev2-common.h
index 0e2f5bc07afe1..e2600447f217a 100644
--- a/drivers/crypto/ti/dthev2-common.h
+++ b/drivers/crypto/ti/dthev2-common.h
@@ -115,7 +115,9 @@ struct dthe_tfm_ctx {
*/
struct dthe_aes_req_ctx {
int enc;
+ __dma_from_device_group_begin();
u8 padding[2 * AES_BLOCK_SIZE];
+ __dma_from_device_group_end();
struct completion aes_compl;
struct dthe_data *dev_data;
};
--
2.34.1
next prev parent reply other threads:[~2026-09-30 11:26 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-30 11:25 [PATCH v6 00/15] Fix several issues in DTHEv2 driver T Pratham
2026-09-30 11:25 ` [PATCH v6 01/15] crypto: ti - Use list_first_entry_or_null() in dthe_get_dev() T Pratham
2026-09-30 11:25 ` [PATCH v6 02/15] crypto: ti - Fix spinlock inconsistency in DTHEv2 T Pratham
2026-09-30 11:25 ` [PATCH v6 03/15] crypto: ti - Fix potential memory corruption on highmem pages T Pratham
2026-09-30 11:25 ` [PATCH v6 04/15] crypto: ti - Fix use-after-free of dev_data on DTHEv2 driver removal T Pratham
2026-09-30 11:25 ` [PATCH v6 05/15] crypto: ti - Trim scatterlists to correct length in AES T Pratham
2026-09-30 11:25 ` T Pratham [this message]
2026-09-30 11:25 ` [PATCH v6 07/15] crypto: ti - Separate padding buffer for src and dst T Pratham
2026-09-30 11:25 ` [PATCH v6 08/15] crypto: ti - Validate sg_nents_for_len() return value in DTHEv2 AES T Pratham
2026-09-30 11:25 ` [PATCH v6 09/15] crypto: ti - Validate sg_nents_for_len() return value in DTHEv2 AEAD T Pratham
2026-09-30 11:25 ` [PATCH v6 10/15] crypto: ti - Terminate DMA on all error paths in AES to clear descriptors T Pratham
2026-09-30 11:25 ` [PATCH v6 11/15] crypto: ti - Terminate DMA on all error paths in AEAD " T Pratham
2026-09-30 11:25 ` [PATCH v6 12/15] crypto: ti - Do AEAD software fallback on only ENOMEM T Pratham
2026-09-30 11:25 ` [PATCH v6 13/15] crypto: ti - Correct AEAD tag operations against dma cache invalidation T Pratham
2026-09-30 11:25 ` [PATCH v6 14/15] crypto: ti - Change lengths in AES to u64 to avoid potential overflows T Pratham
2026-09-30 11:25 ` [PATCH v6 15/15] crypto: ti - Change lengths in AEAD " T Pratham
2026-09-30 13:03 ` [PATCH v6 00/15] Fix several issues in DTHEv2 driver T Pratham
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260930112533.1593952-7-t-pratham@ti.com \
--to=t-pratham@ti.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m-chawdhry@ti.com \
--cc=praneeth@ti.com \
--cc=sebin.francis@ti.com \
--cc=vishalm@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®