linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Corentin Labbe <clabbe@baylibre.com>
To: davem@davemloft.net, ebiggers@kernel.org,
	herbert@gondor.apana.org.au, nhorman@tuxdriver.com
Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org,
	Corentin Labbe <clabbe@baylibre.com>
Subject: [PATCH v2 01/11] crypto: move crypto_alg_get/crypto_alg_put to linux/crypto.h
Date: Mon, 19 Nov 2018 19:53:20 +0000	[thread overview]
Message-ID: <1542657210-37739-2-git-send-email-clabbe@baylibre.com> (raw)
In-Reply-To: <1542657210-37739-1-git-send-email-clabbe@baylibre.com>

Since we will need crypto_alg_get/crypto_alg_put for "locking"
crypto_alg when updating stats, we need it to be via linux/crypto.h

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
---
 crypto/internal.h      | 12 ------------
 include/linux/crypto.h | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/crypto/internal.h b/crypto/internal.h
index ef769b5e8ad3..d81f033aeb5c 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -91,18 +91,6 @@ unsigned int crypto_alg_extsize(struct crypto_alg *alg);
 int crypto_type_has_alg(const char *name, const struct crypto_type *frontend,
 			u32 type, u32 mask);
 
-static inline struct crypto_alg *crypto_alg_get(struct crypto_alg *alg)
-{
-	refcount_inc(&alg->cra_refcnt);
-	return alg;
-}
-
-static inline void crypto_alg_put(struct crypto_alg *alg)
-{
-	if (refcount_dec_and_test(&alg->cra_refcnt) && alg->cra_destroy)
-		alg->cra_destroy(alg);
-}
-
 static inline int crypto_tmpl_get(struct crypto_template *tmpl)
 {
 	return try_module_get(tmpl->module);
diff --git a/include/linux/crypto.h b/include/linux/crypto.h
index 3634ad6fe202..ac8f4168a831 100644
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
@@ -607,6 +607,18 @@ int crypto_unregister_algs(struct crypto_alg *algs, int count);
  */
 int crypto_has_alg(const char *name, u32 type, u32 mask);
 
+static inline struct crypto_alg *crypto_alg_get(struct crypto_alg *alg)
+{
+	refcount_inc(&alg->cra_refcnt);
+	return alg;
+}
+
+static inline void crypto_alg_put(struct crypto_alg *alg)
+{
+	if (refcount_dec_and_test(&alg->cra_refcnt) && alg->cra_destroy)
+		alg->cra_destroy(alg);
+}
+
 /*
  * Transforms: user-instantiated objects which encapsulate algorithms
  * and core processing logic.  Managed via crypto_alloc_*() and
-- 
2.18.1


  reply	other threads:[~2018-11-19 19:53 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-19 19:53 [PATCH v2 00/11] crypto: crypto_user_stat: misc enhancement Corentin Labbe
2018-11-19 19:53 ` Corentin Labbe [this message]
2018-11-19 20:25   ` [PATCH v2 01/11] crypto: move crypto_alg_get/crypto_alg_put to linux/crypto.h Ard Biesheuvel
2018-11-20  3:10     ` Herbert Xu
2018-11-20  5:46       ` LABBE Corentin
2018-11-20  5:48         ` Herbert Xu
2018-11-19 19:53 ` [PATCH v2 02/11] crypto: crypto_user_stat: made crypto_user_stat optional Corentin Labbe
2018-11-19 19:53 ` [PATCH v2 03/11] crypto: CRYPTO_STATS should depend on CRYPTO_USER Corentin Labbe
2018-11-19 19:53 ` [PATCH v2 04/11] crypto: crypto_user_stat: convert all stats from u32 to u64 Corentin Labbe
2018-11-19 19:53 ` [PATCH v2 05/11] crypto: crypto_user_stat: split user space crypto stat structures Corentin Labbe
2018-11-19 19:53 ` [PATCH v2 06/11] crypto: tool: getstat: convert user space example to the new crypto_user_stat uapi Corentin Labbe
2018-11-19 19:53 ` [PATCH v2 07/11] crypto: crypto_user_stat: fix use_after_free of struct xxx_request Corentin Labbe
2018-11-19 19:53 ` [PATCH v2 08/11] crypto: crypto_user_stat: Fix invalid stat reporting Corentin Labbe
2018-11-19 19:53 ` [PATCH v2 09/11] crypto: crypto_user_stat: remove intermediate variable Corentin Labbe
2018-11-19 19:53 ` [PATCH v2 10/11] crypto: crypto_user_stat: Split stats in multiple structures Corentin Labbe
2018-11-19 19:53 ` [PATCH v2 11/11] crypto: crypto_user_stat: rename err_cnt parameter Corentin Labbe

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=1542657210-37739-2-git-send-email-clabbe@baylibre.com \
    --to=clabbe@baylibre.com \
    --cc=davem@davemloft.net \
    --cc=ebiggers@kernel.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nhorman@tuxdriver.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;
as well as URLs for NNTP newsgroup(s).