From: "Herbert Xu" <herbert@gondor•apana.org.au>
To: Linux Crypto Mailing List <linux-crypto@vger•kernel.org>,
David Ahern <dsahern@kernel•org>,
Eric Dumazet <edumazet@google•com>,
Paolo Abeni <pabeni@redhat•com>, Jakub Kicinski <kuba@kernel•org>,
"David S. Miller" <davem@davemloft•net>,
Dmitry Safonov <dima@arista•com>,
Andy Lutomirski <luto@amacapital•net>,
Ard Biesheuvel <ardb@kernel•org>,
Bob Gilligan <gilligan@arista•com>,
Dan Carpenter <error27@gmail•com>,
David Laight <David.Laight@aculab•com>,
Dmitry Safonov <0x7f454c46@gmail•com>,
Eric Biggers <ebiggers@kernel•org>,
"Eric W. Biederman" <ebiederm@xmission•com>,
Francesco Ruggeri <fruggeri05@gmail•com>,
Hideaki YOSHIFUJI <yoshfuji@linux-ipv6•org>,
Ivan Delalande <colona@arista•com>,
Leonard Crestez <cdleonard@gmail•com>,
Salam Noureddine <noureddine@arista•com>,
netdev@vger•kernel.org
Subject: [PATCH 2/6] crypto: api - Add crypto_clone_tfm
Date: Thu, 13 Apr 2023 14:24:17 +0800 [thread overview]
Message-ID: <E1pmqNV-00FNVI-Fs@formenos.hmeau.com> (raw)
In-Reply-To: ZDefxOq6Ax0JeTRH@gondor.apana.org.au
This patch adds the helper crypto_clone_tfm. The purpose is to
allocate a tfm object with GFP_ATOMIC. As we cannot sleep, the
object has to be cloned from an existing tfm object.
This allows code paths that cannot otherwise allocate a crypto_tfm
object to do so. Once a new tfm has been obtained its key could
then be changed without impacting other users.
Signed-off-by: Herbert Xu <herbert@gondor•apana.org.au>
---
crypto/api.c | 59 +++++++++++++++++++++++++++++++++++++++++++++---------
crypto/internal.h | 2 +
2 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/crypto/api.c b/crypto/api.c
index f509d73fa682..d375e8cd770d 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -488,28 +488,44 @@ struct crypto_tfm *crypto_alloc_base(const char *alg_name, u32 type, u32 mask)
}
EXPORT_SYMBOL_GPL(crypto_alloc_base);
-void *crypto_create_tfm_node(struct crypto_alg *alg,
- const struct crypto_type *frontend,
- int node)
+static void *crypto_alloc_tfmmem(struct crypto_alg *alg,
+ const struct crypto_type *frontend, int node,
+ gfp_t gfp)
{
- char *mem;
- struct crypto_tfm *tfm = NULL;
+ struct crypto_tfm *tfm;
unsigned int tfmsize;
unsigned int total;
- int err = -ENOMEM;
+ char *mem;
tfmsize = frontend->tfmsize;
total = tfmsize + sizeof(*tfm) + frontend->extsize(alg);
- mem = kzalloc_node(total, GFP_KERNEL, node);
+ mem = kzalloc_node(total, gfp, node);
if (mem == NULL)
- goto out_err;
+ return ERR_PTR(-ENOMEM);
tfm = (struct crypto_tfm *)(mem + tfmsize);
tfm->__crt_alg = alg;
tfm->node = node;
refcount_set(&tfm->refcnt, 1);
+ return mem;
+}
+
+void *crypto_create_tfm_node(struct crypto_alg *alg,
+ const struct crypto_type *frontend,
+ int node)
+{
+ struct crypto_tfm *tfm;
+ char *mem;
+ int err;
+
+ mem = crypto_alloc_tfmmem(alg, frontend, node, GFP_KERNEL);
+ if (IS_ERR(mem))
+ goto out;
+
+ tfm = (struct crypto_tfm *)(mem + frontend->tfmsize);
+
err = frontend->init_tfm(tfm);
if (err)
goto out_free_tfm;
@@ -525,13 +541,38 @@ void *crypto_create_tfm_node(struct crypto_alg *alg,
if (err == -EAGAIN)
crypto_shoot_alg(alg);
kfree(mem);
-out_err:
mem = ERR_PTR(err);
out:
return mem;
}
EXPORT_SYMBOL_GPL(crypto_create_tfm_node);
+void *crypto_clone_tfm(const struct crypto_type *frontend,
+ struct crypto_tfm *otfm)
+{
+ struct crypto_alg *alg = otfm->__crt_alg;
+ struct crypto_tfm *tfm;
+ char *mem;
+
+ mem = ERR_PTR(-ESTALE);
+ if (unlikely(!crypto_mod_get(alg)))
+ goto out;
+
+ mem = crypto_alloc_tfmmem(alg, frontend, otfm->node, GFP_ATOMIC);
+ if (IS_ERR(mem)) {
+ crypto_mod_put(alg);
+ goto out;
+ }
+
+ tfm = (struct crypto_tfm *)(mem + frontend->tfmsize);
+ tfm->crt_flags = otfm->crt_flags;
+ tfm->exit = otfm->exit;
+
+out:
+ return mem;
+}
+EXPORT_SYMBOL_GPL(crypto_clone_tfm);
+
struct crypto_alg *crypto_find_alg(const char *alg_name,
const struct crypto_type *frontend,
u32 type, u32 mask)
diff --git a/crypto/internal.h b/crypto/internal.h
index 5eee009ee494..8dd746b1130b 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -106,6 +106,8 @@ struct crypto_tfm *__crypto_alloc_tfm(struct crypto_alg *alg, u32 type,
u32 mask);
void *crypto_create_tfm_node(struct crypto_alg *alg,
const struct crypto_type *frontend, int node);
+void *crypto_clone_tfm(const struct crypto_type *frontend,
+ struct crypto_tfm *otfm);
static inline void *crypto_create_tfm(struct crypto_alg *alg,
const struct crypto_type *frontend)
next prev parent reply other threads:[~2023-04-13 6:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-13 6:23 [PATCH 0/6] crypto: api - Add support for cloning tfms Herbert Xu
2023-04-13 6:24 ` [PATCH 1/6] crypto: api - Add crypto_tfm_get Herbert Xu
2023-04-18 12:27 ` Simon Horman
2023-04-13 6:24 ` Herbert Xu [this message]
2023-04-18 12:28 ` [PATCH 2/6] crypto: api - Add crypto_clone_tfm Simon Horman
2023-04-13 6:24 ` [PATCH 3/6] crypto: hash - Add crypto_clone_ahash/shash Herbert Xu
2023-04-18 12:29 ` Simon Horman
2023-04-13 6:24 ` [PATCH 4/6] crypto: hmac - Add support for cloning Herbert Xu
2023-04-13 6:24 ` [PATCH 5/6] crypto: cryptd - Convert hash to use modern init_tfm/exit_tfm Herbert Xu
2023-04-18 12:30 ` Simon Horman
2023-04-13 6:24 ` [PATCH 6/6] crypto: cryptd - Add support for cloning hashes Herbert Xu
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=E1pmqNV-00FNVI-Fs@formenos.hmeau.com \
--to=herbert@gondor$(echo .)apana.org.au \
--cc=0x7f454c46@gmail$(echo .)com \
--cc=David.Laight@aculab$(echo .)com \
--cc=ardb@kernel$(echo .)org \
--cc=cdleonard@gmail$(echo .)com \
--cc=colona@arista$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=dima@arista$(echo .)com \
--cc=dsahern@kernel$(echo .)org \
--cc=ebiederm@xmission$(echo .)com \
--cc=ebiggers@kernel$(echo .)org \
--cc=edumazet@google$(echo .)com \
--cc=error27@gmail$(echo .)com \
--cc=fruggeri05@gmail$(echo .)com \
--cc=gilligan@arista$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-crypto@vger$(echo .)kernel.org \
--cc=luto@amacapital$(echo .)net \
--cc=netdev@vger$(echo .)kernel.org \
--cc=noureddine@arista$(echo .)com \
--cc=pabeni@redhat$(echo .)com \
--cc=yoshfuji@linux-ipv6$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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