| Message ID | 1502724094-23305-6-git-send-email-gilad@benyossef.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Mon, 14 Aug 2017 18:21:15 +0300 Gilad Ben-Yossef <gilad@benyossef.com> wrote: > Invoking a possibly async. crypto op and waiting for completion > while correctly handling backlog processing is a common task > in the crypto API implementation and outside users of it. > > This patch adds a generic implementation for doing so in > preparation for using it across the board instead of hand > rolled versions. > > Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> > CC: Eric Biggers <ebiggers3@gmail.com> One really trivial point inline I happened to notice. > --- > crypto/api.c | 13 +++++++++++++ > include/linux/crypto.h | 41 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 54 insertions(+) > > diff --git a/crypto/api.c b/crypto/api.c > index 941cd4c..2a2479d 100644 > --- a/crypto/api.c > +++ b/crypto/api.c > @@ -24,6 +24,7 @@ > #include <linux/sched/signal.h> > #include <linux/slab.h> > #include <linux/string.h> > +#include <linux/completion.h> > #include "internal.h" > > LIST_HEAD(crypto_alg_list); > @@ -595,5 +596,17 @@ int crypto_has_alg(const char *name, u32 type, u32 mask) > } > EXPORT_SYMBOL_GPL(crypto_has_alg); > > +void crypto_req_done(struct crypto_async_request *req, int err) > +{ > + struct crypto_wait *wait = req->data; > + > + if (err == -EINPROGRESS) > + return; > + > + wait->err = err; > + complete(&wait->completion); > +} > +EXPORT_SYMBOL_GPL(crypto_req_done); > + > MODULE_DESCRIPTION("Cryptographic core API"); > MODULE_LICENSE("GPL"); > diff --git a/include/linux/crypto.h b/include/linux/crypto.h > index 84da997..bb00186 100644 > --- a/include/linux/crypto.h > +++ b/include/linux/crypto.h > @@ -24,6 +24,7 @@ > #include <linux/slab.h> > #include <linux/string.h> > #include <linux/uaccess.h> > +#include <linux/completion.h> > > /* > * Autoloaded crypto modules should only use a prefixed name to avoid allowing > @@ -468,6 +469,45 @@ struct crypto_alg { > } CRYPTO_MINALIGN_ATTR; > > /* > + * A helper struct for waiting for completion of async crypto ops > + */ > +struct crypto_wait { > + struct completion completion; > + int err; > +}; > + > +/* > + * Macro for declaring a crypto op async wait object on stack > + */ > +#define DECLARE_CRYPTO_WAIT(_wait) \ > + struct crypto_wait _wait = { \ > + COMPLETION_INITIALIZER_ONSTACK((_wait).completion), 0 } > + > +/* > + * Async ops completion helper functioons > + */ > +void crypto_req_done(struct crypto_async_request *req, int err); > + > +static inline int crypto_wait_req(int err, struct crypto_wait *wait) > +{ > + switch (err) { > + case -EINPROGRESS: > + case -EBUSY: > + wait_for_completion(&wait->completion); > + reinit_completion(&wait->completion); > + err = wait->err; > + break; > + }; > + > + return err; > +} > + > +static inline void crypto_init_wait(struct crypto_wait *wait) > +{ > + init_completion(&wait->completion); > +} > + > +/* > * Algorithm registration interface. > */ > int crypto_register_alg(struct crypto_alg *alg); > @@ -1604,5 +1644,6 @@ static inline int crypto_comp_decompress(struct crypto_comp *tfm, > src, slen, dst, dlen); > } > > + Trivial observation. Shouldn't have this bonus blank line inserted here. > #endif /* _LINUX_CRYPTO_H */ > -- To unsubscribe from this list: send the line "unsubscribe linux-fscrypt" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Aug 15, 2017 at 5:23 AM, Jonathan Cameron <Jonathan.Cameron@huawei.com> wrote: > On Mon, 14 Aug 2017 18:21:15 +0300 > Gilad Ben-Yossef <gilad@benyossef.com> wrote: > >> Invoking a possibly async. crypto op and waiting for completion >> while correctly handling backlog processing is a common task >> in the crypto API implementation and outside users of it. >> >> This patch adds a generic implementation for doing so in >> preparation for using it across the board instead of hand >> rolled versions. > > Trivial observation. Shouldn't have this bonus blank line inserted here. > >> #endif /* _LINUX_CRYPTO_H */ >> > Indeed. Will be fixed. Thanks, Gilad
diff --git a/crypto/api.c b/crypto/api.c index 941cd4c..2a2479d 100644 --- a/crypto/api.c +++ b/crypto/api.c @@ -24,6 +24,7 @@ #include <linux/sched/signal.h> #include <linux/slab.h> #include <linux/string.h> +#include <linux/completion.h> #include "internal.h" LIST_HEAD(crypto_alg_list); @@ -595,5 +596,17 @@ int crypto_has_alg(const char *name, u32 type, u32 mask) } EXPORT_SYMBOL_GPL(crypto_has_alg); +void crypto_req_done(struct crypto_async_request *req, int err) +{ + struct crypto_wait *wait = req->data; + + if (err == -EINPROGRESS) + return; + + wait->err = err; + complete(&wait->completion); +} +EXPORT_SYMBOL_GPL(crypto_req_done); + MODULE_DESCRIPTION("Cryptographic core API"); MODULE_LICENSE("GPL"); diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 84da997..bb00186 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -24,6 +24,7 @@ #include <linux/slab.h> #include <linux/string.h> #include <linux/uaccess.h> +#include <linux/completion.h> /* * Autoloaded crypto modules should only use a prefixed name to avoid allowing @@ -468,6 +469,45 @@ struct crypto_alg { } CRYPTO_MINALIGN_ATTR; /* + * A helper struct for waiting for completion of async crypto ops + */ +struct crypto_wait { + struct completion completion; + int err; +}; + +/* + * Macro for declaring a crypto op async wait object on stack + */ +#define DECLARE_CRYPTO_WAIT(_wait) \ + struct crypto_wait _wait = { \ + COMPLETION_INITIALIZER_ONSTACK((_wait).completion), 0 } + +/* + * Async ops completion helper functioons + */ +void crypto_req_done(struct crypto_async_request *req, int err); + +static inline int crypto_wait_req(int err, struct crypto_wait *wait) +{ + switch (err) { + case -EINPROGRESS: + case -EBUSY: + wait_for_completion(&wait->completion); + reinit_completion(&wait->completion); + err = wait->err; + break; + }; + + return err; +} + +static inline void crypto_init_wait(struct crypto_wait *wait) +{ + init_completion(&wait->completion); +} + +/* * Algorithm registration interface. */ int crypto_register_alg(struct crypto_alg *alg); @@ -1604,5 +1644,6 @@ static inline int crypto_comp_decompress(struct crypto_comp *tfm, src, slen, dst, dlen); } + #endif /* _LINUX_CRYPTO_H */
Invoking a possibly async. crypto op and waiting for completion while correctly handling backlog processing is a common task in the crypto API implementation and outside users of it. This patch adds a generic implementation for doing so in preparation for using it across the board instead of hand rolled versions. Signed-off-by: Gilad Ben-Yossef <gilad@benyossef.com> CC: Eric Biggers <ebiggers3@gmail.com> --- crypto/api.c | 13 +++++++++++++ include/linux/crypto.h | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+)