crypto: Implement a generic crypto statistics
v3 cover crypto: Implement a generic crypto statistics
This patch is a try to implement a generic crypto driver statistics. The goal is to have an "ifconfig" for crypto device.
Some driver tried to implement this via a debugfs interface.
This serie do it directly in the crypto API and give access to stats via the crypto_user(netlink) API.
Then an userspace tool will collect information via netlink. Note that this userspace tool is heavily copied from libkcapi and if Stephan Mueller agree, I will made a PR for adding getstat to it unless tools/crypto is the good place for it.
Example of output:pkcs1pad(rsa-sun8i-ce,sha1) Akcipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Sign: 0
Verify: 5
Errors: 0cryptd(__xts-aes-ce) cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
xts-aes-ce cipher
Encrypt: 17 bytes: 4384
Decrypt: 17 bytes: 4384
Errors: 0cryptd(__ctr-aes-ce) cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
ctr-aes-ce cipher
Encrypt: 19 bytes: 5551
Decrypt: 19 bytes: 5551
Errors: 0cryptd(__cbc-aes-ce) cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
cbc-aes-ce cipher
Encrypt: 19 bytes: 3040
Decrypt: 19 bytes: 3040
Errors: 0cryptd(__ecb-aes-ce) cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
ecb-aes-ce cipher
Encrypt: 14 bytes: 2624
Decrypt: 14 bytes: 2624
Errors: 0
cbcmac-aes-ce Hash
Hash: 20 bytes: 1244
Errors: 0
xcbc-aes-ce Hash
Hash: 28 bytes: 543
Errors: 0
cmac-aes-ce Hash
Hash: 36 bytes: 1472
Errors: 0
__xts-aes-ce cipher
Encrypt: 17 bytes: 4384
Decrypt: 17 bytes: 4384
Errors: 0
ctr-aes-ce cipher
Encrypt: 19 bytes: 5551
Decrypt: 19 bytes: 5551
Errors: 0
__ctr-aes-ce cipher
Encrypt: 19 bytes: 5551
Decrypt: 19 bytes: 5551
Errors: 0
__cbc-aes-ce cipher
Encrypt: 19 bytes: 3040
Decrypt: 19 bytes: 3040
Errors: 0
__ecb-aes-ce cipher
Encrypt: 14 bytes: 2624
Decrypt: 14 bytes: 2624
Errors: 0
rsa-sun8i-ce Akcipher
Encrypt: 7 bytes: 232
Decrypt: 6 bytes: 1152
Sign: 0
Verify: 5
Errors: 0sun8i_ce_rng RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0ecb(des3_ede-generic) cipher
Encrypt: 24 bytes: 4584
Decrypt: 24 bytes: 4584
Errors: 0
ecb-des3-sun8i-ce cipher
Encrypt: 18 bytes: 3072
Decrypt: 18 bytes: 3072
Errors: 0
cbc(des3_ede-generic) cipher
Encrypt: 14 bytes: 5104
Decrypt: 14 bytes: 5104
Errors: 0aes-ce cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
des3_ede-generic cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
des-generic cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
aes-arm64 cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
crc32c-arm64-ce Hash
Hash: 92 bytes: 20649
Errors: 0
cbc-des3-sun8i-ce cipher
Encrypt: 10 bytes: 3488
Decrypt: 10 bytes: 3488
Errors: 0
crc32-arm64-ce Hash
Hash: 92 bytes: 20649
Errors: 0
ecb-aes-sun8i-ce cipher
Encrypt: 18 bytes: 3168
Decrypt: 18 bytes: 3168
Errors: 0
cbc-aes-sun8i-ce cipher
Encrypt: 24 bytes: 3712
Decrypt: 24 bytes: 3712
Errors: 0
sha256-ce Hash
Hash: 26 bytes: 8860
Errors: 0
sha224-ce Hash
Hash: 26 bytes: 8860
Errors: 0
cts(cbc-aes-sun8i-ce) cipher
Encrypt: 24 bytes: 956
Decrypt: 24 bytes: 956
Errors: 0
sha224-arm64-neon Hash
Hash: 26 bytes: 8860
Errors: 0
sha256-arm64-neon Hash
Hash: 26 bytes: 8860
Errors: 0
sha224-arm64 Hash
Hash: 26 bytes: 8860
Errors: 0
sha256-arm64 Hash
Hash: 26 bytes: 8860
Errors: 0
ctr-aes-sun8i-ce cipher
Encrypt: 24 bytes: 6738
Decrypt: 24 bytes: 6738
Errors: 0
sha1-ce Hash
Hash: 28 bytes: 9191
Errors: 0ecdh-generic KPP
Setsecret: 4
Generate public key: 3
Compute_shared_secret: 4
Errors: 0
ghash-generic Hash
Hash: 32 bytes: 4358
Errors: 0jitterentropy_rng RNG
Seed: 0
Generate: 1 bytes: 48
Errors: 0drbg_nopr_hmac_sha256 RNG
Seed: 5
Generate: 9 bytes: 1056
Errors: 0drbg_nopr_hmac_sha512 RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_nopr_hmac_sha384 RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_nopr_hmac_sha1 RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_pr_hmac_sha256 RNG
Seed: 4
Generate: 8 bytes: 1024
Errors: 0drbg_pr_hmac_sha512 RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_pr_hmac_sha384 RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_pr_hmac_sha1 RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0
crct10dif-generic Hash
Hash: 24 bytes: 19893
Errors: 0
crc32c-generic Hash
Hash: 92 bytes: 20649
Errors: 0aes-generic cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
sha224-generic Hash
Hash: 26 bytes: 8860
Errors: 0
sha256-generic Hash
Hash: 26 bytes: 8860
Errors: 0
sha1-generic Hash
Hash: 28 bytes: 9191
Errors: 0digest_null-generic Hash
Hash: 0 bytes: 0
Errors: 0
compress_null-generic Compress
Compress: 0 bytes: 0
Decompress: 0 bytes: 0
Errors: 0
ecb-cipher_null cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
cipher_null-generic cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
rsa-generic Akcipher
Encrypt: 17 bytes: 2832
Decrypt: 9 bytes: 1920
Sign: 0
Verify: 36
Errors: 0Futur possible additions:
- Add a "number of needed fallback" statistics.
- statistics for maximum request size
Please let me know your opinions about it
Regards
Changes since v2:
- added documentation on new struct crypto_alg members.
Changes since v1:
- Do not use anymore CRYPTO_MSG_GETALG and added a dedicated CRYPTO_MSG_GETSTAT
Changes since RFC:
- Use cryptouser(netlink) instead of /sys
- Use atomic_t instead of unsigned long
- moved stat code into dedicated inline function
- spelling fixes
Corentin Labbe (2):
crypto: Implement a generic crypto statistics
crypto: tools: Add cryptostat userspace
crypto/Kconfig | 11 +
crypto/Makefile | 1 +
crypto/ahash.c | 21 +-
crypto/algapi.c | 8 +
crypto/{crypto_user.c => crypto_user_base.c} | 9 +-
crypto/crypto_user_stat.c | 463 +++++++++++++++++++++++++++
crypto/rng.c | 1 +
include/crypto/acompress.h | 38 ++-
include/crypto/aead.h | 51 ++-
include/crypto/akcipher.h | 76 ++++-
include/crypto/hash.h | 32 +-
include/crypto/internal/cryptouser.h | 8 +
include/crypto/kpp.h | 51 ++-
include/crypto/rng.h | 29 +-
include/crypto/skcipher.h | 44 ++-
include/linux/crypto.h | 110 ++++++-
include/uapi/linux/cryptouser.h | 52 +++
tools/crypto/getstat.c | 294 +++++++++++++++++
18 files changed, 1264 insertions(+), 35 deletions(-)
rename crypto/{crypto_user.c => crypto_user_base.c} (97%)
create mode 100644 crypto/crypto_user_stat.c
create mode 100644 include/crypto/internal/cryptouser.h
create mode 100644 tools/crypto/getstat.cSignature · 1 line
2.16.4
PATCH v3 1/2 crypto: Implement a generic crypto statistics
This patch implement a generic way to get statistics about all crypto usages.
---
crypto/Kconfig | 11 +
crypto/Makefile | 1 +
crypto/ahash.c | 21 +-
crypto/algapi.c | 8 +
crypto/{crypto_user.c => crypto_user_base.c} | 9 +-
crypto/crypto_user_stat.c | 463 +++++++++++++++++++++++++++
crypto/rng.c | 1 +
include/crypto/acompress.h | 38 ++-
include/crypto/aead.h | 51 ++-
include/crypto/akcipher.h | 76 ++++-
include/crypto/hash.h | 32 +-
include/crypto/internal/cryptouser.h | 8 +
include/crypto/kpp.h | 51 ++-
include/crypto/rng.h | 29 +-
include/crypto/skcipher.h | 44 ++-
include/linux/crypto.h | 110 ++++++-
include/uapi/linux/cryptouser.h | 52 +++
17 files changed, 970 insertions(+), 35 deletions(-)
rename crypto/{crypto_user.c => crypto_user_base.c} (97%)
create mode 100644 crypto/crypto_user_stat.c
create mode 100644 include/crypto/internal/cryptouser.hcrypto/Kconfig +11 -0
@@ -1799,6 +1799,17 @@ config CRYPTO_USER_API_AEAD This option enables the user-spaces interface for AEAD cipher algorithms. +config CRYPTO_STATS + bool "Crypto usage statistics for User-space" + help + This option enables the gathering of crypto stats. + This will collect: + - encrypt/decrypt size and numbers of symmeric operations + - compress/decompress size and numbers of compress operations + - size and numbers of hash operations + - encrypt/decrypt/sign/verify numbers for asymmetric operations + - generate/seed numbers for rng operations + config CRYPTO_HASH_INFO bool
crypto/Makefile +1 -0
@@ -54,6 +54,7 @@ cryptomgr-y := algboss.o testmgr.o obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o obj-$(CONFIG_CRYPTO_USER) += crypto_user.o +crypto_user-y := crypto_user_base.o crypto_user_stat.o obj-$(CONFIG_CRYPTO_CMAC) += cmac.o obj-$(CONFIG_CRYPTO_HMAC) += hmac.o obj-$(CONFIG_CRYPTO_VMAC) += vmac.o
crypto/ahash.c +16 -5
@@ -364,24 +364,35 @@ static int crypto_ahash_op(struct ahash_request *req,int crypto_ahash_final (struct ahash_request *req) { -return crypto_ahash_op (req,crypto_ahash_reqtfm (req)->final); +int ret; + + ret =crypto_ahash_op (req,crypto_ahash_reqtfm (req)->final); +crypto_stat_ahash_final (req, ret); +return ret; }EXPORT_SYMBOL_GPL (crypto_ahash_final);int crypto_ahash_finup (struct ahash_request *req) { -return crypto_ahash_op (req,crypto_ahash_reqtfm (req)->finup); +int ret; + + ret =crypto_ahash_op (req,crypto_ahash_reqtfm (req)->finup); +crypto_stat_ahash_final (req, ret); +return ret; }EXPORT_SYMBOL_GPL (crypto_ahash_finup);int crypto_ahash_digest (struct ahash_request *req) {struct crypto_ahash *tfm =crypto_ahash_reqtfm (req); +int ret;if (crypto_ahash_get_flags (tfm) &CRYPTO_TFM_NEED_KEY ) -return -ENOKEY ; - -return crypto_ahash_op (req, tfm->digest); + ret = -ENOKEY ; +else + ret =crypto_ahash_op (req, tfm->digest); +crypto_stat_ahash_final (req, ret); +return ret; }EXPORT_SYMBOL_GPL (crypto_ahash_digest);
crypto/algapi.c +8 -0
@@ -258,6 +258,14 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg)list_add (&alg->cra_list, &crypto_alg_list);list_add (&larval->alg.cra_list, &crypto_alg_list); +atomic_set (&alg->encrypt_cnt,0 ); +atomic_set (&alg->decrypt_cnt,0 ); +atomic64_set (&alg->encrypt_tlen,0 ); +atomic64_set (&alg->decrypt_tlen,0 ); +atomic_set (&alg->verify_cnt,0 ); +atomic_set (&alg->cipher_err_cnt,0 ); +atomic_set (&alg->sign_cnt,0 ); + out:return larval;
crypto/crypto_user_base.c renamed from crypto/crypto_user.c +7 -2
@@ -29,6 +29,7 @@#include <crypto/internal/rng.h> #include <crypto/akcipher.h> #include <crypto/kpp.h> +#include <crypto/internal/cryptouser.h> #include "internal.h"
@@ -37,7 +38,7 @@static DEFINE_MUTEX (crypto_cfg_mutex);/* The crypto netlink socket */ -static struct sock *crypto_nlsk; +struct sock *crypto_nlsk;struct crypto_dump_info {struct sk_buff *in_skb;
@@ -46,7 +47,7 @@ struct crypto_dump_info {u16 nlmsg_flags; }; -static struct crypto_alg *crypto_alg_match (struct crypto_user_alg *p,int exact) +struct crypto_alg *crypto_alg_match (struct crypto_user_alg *p,int exact) {struct crypto_alg *q, *alg =NULL ;
@@ -461,6 +462,7 @@ static const int crypto_msg_min[CRYPTO_NR_MSGTYPES] = { [CRYPTO_MSG_UPDATEALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), [CRYPTO_MSG_GETALG - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), [CRYPTO_MSG_DELRNG - CRYPTO_MSG_BASE] = 0, + [CRYPTO_MSG_GETSTAT - CRYPTO_MSG_BASE] = MSGSIZE(crypto_user_alg), };static const struct nla_policy crypto_policy[CRYPTOCFGA_MAX +1 ] = {
@@ -481,6 +483,9 @@ static const struct crypto_link { .dump = crypto_dump_report, .done = crypto_dump_report_done}, [CRYPTO_MSG_DELRNG - CRYPTO_MSG_BASE] = { .doit = crypto_del_rng }, + [CRYPTO_MSG_GETSTAT - CRYPTO_MSG_BASE] = { .doit = crypto_reportstat, + .dump = crypto_dump_reportstat, + .done = crypto_dump_reportstat_done}, }; static int crypto_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
crypto/crypto_user_stat.c new file +463 -0
463 lines not on this page · raw message
crypto/rng.c +1 -0
@@ -50,6 +50,7 @@ int crypto_rng_reset(struct crypto_rng *tfm, const u8 *seed, unsigned int slen) } err =crypto_rng_alg (tfm)->seed (tfm, seed, slen); +crypto_stat_rng_seed (tfm, err); out:kzfree (buf);return err;
include/crypto/acompress.h +36 -2
@@ -234,6 +234,34 @@ static inline void acomp_request_set_params(struct acomp_req *req, req->flags |=CRYPTO_ACOMP_ALLOC_OUTPUT ; } +static inline void crypto_stat_compress (struct acomp_req *req,int ret) +{ +#ifdef CONFIG_CRYPTO_STATS +struct crypto_acomp *tfm =crypto_acomp_reqtfm (req); + +if (ret && ret != -EINPROGRESS && ret != -EBUSY ) { +atomic_inc (&tfm->base.__crt_alg->compress_err_cnt); + }else { +atomic_inc (&tfm->base.__crt_alg->compress_cnt); +atomic64_add (req->slen, &tfm->base.__crt_alg->compress_tlen); + } +#endif +} + +static inline void crypto_stat_decompress (struct acomp_req *req,int ret) +{ +#ifdef CONFIG_CRYPTO_STATS +struct crypto_acomp *tfm =crypto_acomp_reqtfm (req); + +if (ret && ret != -EINPROGRESS && ret != -EBUSY ) { +atomic_inc (&tfm->base.__crt_alg->compress_err_cnt); + }else { +atomic_inc (&tfm->base.__crt_alg->decompress_cnt); +atomic64_add (req->slen, &tfm->base.__crt_alg->decompress_tlen); + } +#endif +} +/** * crypto_acomp_compress() -- Invoke asynchronous compress operation *
@@ -246,8 +274,11 @@ static inline void acomp_request_set_params(struct acomp_req *req,static inline int crypto_acomp_compress (struct acomp_req *req) {struct crypto_acomp *tfm =crypto_acomp_reqtfm (req); +int ret; -return tfm->compress (req); + ret = tfm->compress (req); +crypto_stat_compress (req, ret); +return ret; }/**
@@ -262,8 +293,11 @@ static inline int crypto_acomp_compress(struct acomp_req *req)static inline int crypto_acomp_decompress (struct acomp_req *req) {struct crypto_acomp *tfm =crypto_acomp_reqtfm (req); +int ret; -return tfm->decompress (req); + ret = tfm->decompress (req); +crypto_stat_decompress (req, ret); +return ret; }#endif
include/crypto/aead.h +42 -9
73 lines not on this page · raw message
include/crypto/akcipher.h +72 -4
110 lines not on this page · raw message
include/crypto/hash.h +31 -1
@@ -412,6 +412,32 @@ static inline void *ahash_request_ctx(struct ahash_request *req)int crypto_ahash_setkey (struct crypto_ahash *tfm,const u8 *key,unsigned int keylen); +static inline void crypto_stat_ahash_update (struct ahash_request *req,int ret) +{ +#ifdef CONFIG_CRYPTO_STATS +struct crypto_ahash *tfm =crypto_ahash_reqtfm (req); + +if (ret && ret != -EINPROGRESS && ret != -EBUSY ) +atomic_inc (&tfm->base.__crt_alg->hash_err_cnt); +else +atomic64_add (req->nbytes, &tfm->base.__crt_alg->hash_tlen); +#endif +} + +static inline void crypto_stat_ahash_final (struct ahash_request *req,int ret) +{ +#ifdef CONFIG_CRYPTO_STATS +struct crypto_ahash *tfm =crypto_ahash_reqtfm (req); + +if (ret && ret != -EINPROGRESS && ret != -EBUSY ) { +atomic_inc (&tfm->base.__crt_alg->hash_err_cnt); + }else { +atomic_inc (&tfm->base.__crt_alg->hash_cnt); +atomic64_add (req->nbytes, &tfm->base.__crt_alg->hash_tlen); + } +#endif +} +/** * crypto_ahash_finup() - update and finalize message digest * @req: reference to the ahash_request handle that holds all information
@@ -526,7 +552,11 @@ static inline int crypto_ahash_init(struct ahash_request *req)*/ static inline int crypto_ahash_update (struct ahash_request *req) { -return crypto_ahash_reqtfm (req)->update (req); +int ret; + + ret =crypto_ahash_reqtfm (req)->update (req); +crypto_stat_ahash_update (req, ret); +return ret; }/**
include/crypto/internal/cryptouser.h new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include <net/netlink.h> + +struct crypto_alg *crypto_alg_match (struct crypto_user_alg *p,int exact); + +int crypto_dump_reportstat (struct sk_buff *skb,struct netlink_callback *cb); +int crypto_reportstat (struct sk_buff *in_skb,struct nlmsghdr *in_nlh,struct nlattr **attrs); +int crypto_dump_reportstat_done (struct netlink_callback *cb);
include/crypto/kpp.h +48 -3
78 lines not on this page · raw message
include/crypto/rng.h +28 -1
@@ -122,6 +122,29 @@ static inline void crypto_free_rng(struct crypto_rng *tfm)crypto_destroy_tfm (tfm,crypto_rng_tfm (tfm)); } +static inline void crypto_stat_rng_seed (struct crypto_rng *tfm,int ret) +{ +#ifdef CONFIG_CRYPTO_STATS +if (ret && ret != -EINPROGRESS && ret != -EBUSY ) +atomic_inc (&tfm->base.__crt_alg->rng_err_cnt); +else +atomic_inc (&tfm->base.__crt_alg->seed_cnt); +#endif +} + +static inline void crypto_stat_rng_generate (struct crypto_rng *tfm, +unsigned int dlen,int ret) +{ +#ifdef CONFIG_CRYPTO_STATS +if (ret && ret != -EINPROGRESS && ret != -EBUSY ) { +atomic_inc (&tfm->base.__crt_alg->rng_err_cnt); + }else { +atomic_inc (&tfm->base.__crt_alg->generate_cnt); +atomic64_add (dlen, &tfm->base.__crt_alg->generate_tlen); + } +#endif +} +/** * crypto_rng_generate() - get random number * @tfm: cipher handle
@@ -140,7 +163,11 @@ static inline int crypto_rng_generate(struct crypto_rng *tfm, const u8 *src, unsigned int slen, u8 *dst, unsigned int dlen) { - return crypto_rng_alg(tfm)->generate(tfm, src, slen, dst, dlen); + int ret; + + ret =crypto_rng_alg (tfm)->generate (tfm, src, slen, dst, dlen); +crypto_stat_rng_generate (tfm, dlen, ret); +return ret; }/**
include/crypto/skcipher.h +38 -6
66 lines not on this page · raw message
include/linux/crypto.h +108 -2
140 lines not on this page · raw message
include/uapi/linux/cryptouser.h +52 -0
70 lines not on this page · raw message
Signature · 1 line
2.16.4
Hi Corentin,
Quoted 54 lines · Corentin Labbe
This patch implement a generic way to get statistics about all crypto usages.
Signed-off-by Corentin Labbe <[email protected]>--- crypto/Kconfig | 11 + crypto/Makefile | 1 + crypto/ahash.c | 21 +- crypto/algapi.c | 8 + crypto/{crypto_user.c => crypto_user_base.c} | 9 +- crypto/crypto_user_stat.c | 463 +++++++++++++++++++++++++++ crypto/rng.c | 1 + include/crypto/acompress.h | 38 ++- include/crypto/aead.h | 51 ++- include/crypto/akcipher.h | 76 ++++- include/crypto/hash.h | 32 +- include/crypto/internal/cryptouser.h | 8 + include/crypto/kpp.h | 51 ++- include/crypto/rng.h | 29 +- include/crypto/skcipher.h | 44 ++- include/linux/crypto.h | 110 ++++++- include/uapi/linux/cryptouser.h | 52 +++ 17 files changed, 970 insertions(+), 35 deletions(-) rename crypto/{crypto_user.c => crypto_user_base.c} (97%) create mode 100644 crypto/crypto_user_stat.c create mode 100644 include/crypto/internal/cryptouser.hcrypto/Kconfig +11
-0@@ -1799,6 +1799,17 @@ config CRYPTO_USER_API_AEAD This option enables the user-spaces interface for AEAD cipher algorithms. +config CRYPTO_STATS + bool "Crypto usage statistics for User-space" + help + This option enables the gathering of crypto stats. + This will collect: + - encrypt/decrypt size and numbers of symmeric operations + - compress/decompress size and numbers of compress operations + - size and numbers of hash operations + - encrypt/decrypt/sign/verify numbers for asymmetric operations + - generate/seed numbers for rng operations + config CRYPTO_HASH_INFO boolcrypto/Makefile +0
-0
crypto/Makefile cryptomgr-y := algboss.o testmgr.o · line 60
Quoted 7 lines
crypto/Makefile +1
-0@@ -54,6 +54,7 @@ cryptomgr-y := algboss.o testmgr.o obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o obj-$(CONFIG_CRYPTO_USER) += crypto_user.o +crypto_user-y := crypto_user_base.o crypto_user_stat.o obj-$(CONFIG_CRYPTO_CMAC) += cmac.o obj-$(CONFIG_CRYPTO_HMAC) += hmac.o obj-$(CONFIG_CRYPTO_VMAC) += vmac.o
Why is crypto_user_stat.c always being compiled when CONFIG_CRYPTO_USER is enabled, even when CONFIG_CRYPTO_STATS is not?
When CONFIG_CRYPTO_STATS is disabled, all the crypto stat stuff should be stubbed out so that crypto_user_stat.c doesn't need to be compiled.
[...]
Quoted 72 lines
include/linux/crypto.h +57
-0@@ -454,6 +454,33 @@ struct compress_alg {* @cra_refcnt: internally used * @cra_destroy: internally used * +* All following statistics are for this crypto_alg +* @encrypt_cnt: number of encrypt requests +* @decrypt_cnt: number of decrypt requests +* @compress_cnt: number of compress requests +* @decompress_cnt: number of decompress requests +* @generate_cnt: number of RNG generate requests +* @seed_cnt: number of times the rng was seeded +* @hash_cnt: number of hash requests +* @sign_cnt: number of sign requests +* @setsecret_cnt: number of setsecrey operation +* @generate_public_key_cnt: number of generate_public_key operation +* @verify_cnt: number of verify operation +* @compute_shared_secret_cnt: number of compute_shared_secret operation +* @encrypt_tlen: total data size handled by encrypt requests +* @decrypt_tlen: total data size handled by decrypt requests +* @compress_tlen: total data size handled by compress requests +* @decompress_tlen: total data size handled by decompress requests +* @generate_tlen: total data size of generated data by the RNG +* @hash_tlen: total data size hashed +* @akcipher_err_cnt: number of error for akcipher requests +* @cipher_err_cnt: number of error for akcipher requests +* @compress_err_cnt: number of error for akcipher requests +* @aead_err_cnt: number of error for akcipher requests +* @hash_err_cnt: number of error for akcipher requests +* @rng_err_cnt: number of error for akcipher requests +* @kpp_err_cnt: number of error for akcipher requests +* * The struct crypto_alg describes a generic Crypto API algorithm and is common * for all of the transformations. Any variable not documented here shall not * be used by a cipher implementation as it is internal to the Crypto API. @@ -487,6 +514,45 @@ struct crypto_alg {void (*cra_destroy)(struct crypto_alg *alg);struct module *cra_module; + +union { +atomic_t encrypt_cnt; +atomic_t compress_cnt; +atomic_t generate_cnt; +atomic_t hash_cnt; +atomic_t setsecret_cnt; + }; +union { +atomic64_t encrypt_tlen; +atomic64_t compress_tlen; +atomic64_t generate_tlen; +atomic64_t hash_tlen; + }; +union { +atomic_t akcipher_err_cnt; +atomic_t cipher_err_cnt; +atomic_t compress_err_cnt; +atomic_t aead_err_cnt; +atomic_t hash_err_cnt; +atomic_t rng_err_cnt; +atomic_t kpp_err_cnt; + }; +union { +atomic_t decrypt_cnt; +atomic_t decompress_cnt; +atomic_t seed_cnt; +atomic_t generate_public_key_cnt; + }; +union {
include/linux/crypto.h struct crypto_alg { · line 556
Quoted 10 lines
include/linux/crypto.h +9
-0+atomic64_t decrypt_tlen; +atomic64_t decompress_tlen; + }; +union { +atomic_t verify_cnt; +atomic_t compute_shared_secret_cnt; + }; +atomic_t sign_cnt; + }CRYPTO_MINALIGN_ATTR ;
The new fields here should all be behind CONFIG_CRYPTO_STATS.
Ideally there would be zero overhead when CONFIG_CRYPTO_STATS is disabled. That's not quite the case currently.
- Eric
Quoted 157 lines · Eric Biggers
Hi Corentin,
Quoted 54 lines · Corentin Labbe
This patch implement a generic way to get statistics about all crypto usages.
Signed-off-by Corentin Labbe <[email protected]>--- crypto/Kconfig | 11 + crypto/Makefile | 1 + crypto/ahash.c | 21 +- crypto/algapi.c | 8 + crypto/{crypto_user.c => crypto_user_base.c} | 9 +- crypto/crypto_user_stat.c | 463 +++++++++++++++++++++++++++ crypto/rng.c | 1 + include/crypto/acompress.h | 38 ++- include/crypto/aead.h | 51 ++- include/crypto/akcipher.h | 76 ++++- include/crypto/hash.h | 32 +- include/crypto/internal/cryptouser.h | 8 + include/crypto/kpp.h | 51 ++- include/crypto/rng.h | 29 +- include/crypto/skcipher.h | 44 ++- include/linux/crypto.h | 110 ++++++- include/uapi/linux/cryptouser.h | 52 +++ 17 files changed, 970 insertions(+), 35 deletions(-) rename crypto/{crypto_user.c => crypto_user_base.c} (97%) create mode 100644 crypto/crypto_user_stat.c create mode 100644 include/crypto/internal/cryptouser.hcrypto/Kconfig +11
-0@@ -1799,6 +1799,17 @@ config CRYPTO_USER_API_AEAD This option enables the user-spaces interface for AEAD cipher algorithms. +config CRYPTO_STATS + bool "Crypto usage statistics for User-space" + help + This option enables the gathering of crypto stats. + This will collect: + - encrypt/decrypt size and numbers of symmeric operations + - compress/decompress size and numbers of compress operations + - size and numbers of hash operations + - encrypt/decrypt/sign/verify numbers for asymmetric operations + - generate/seed numbers for rng operations + config CRYPTO_HASH_INFO boolcrypto/Makefile +0
-0crypto/Makefile cryptomgr-y := algboss.o testmgr.o · line 60
Quoted 7 lines
crypto/Makefile +1
-0@@ -54,6 +54,7 @@ cryptomgr-y := algboss.o testmgr.o obj-$(CONFIG_CRYPTO_MANAGER2) += cryptomgr.o obj-$(CONFIG_CRYPTO_USER) += crypto_user.o +crypto_user-y := crypto_user_base.o crypto_user_stat.o obj-$(CONFIG_CRYPTO_CMAC) += cmac.o obj-$(CONFIG_CRYPTO_HMAC) += hmac.o obj-$(CONFIG_CRYPTO_VMAC) += vmac.oWhy is
crypto_user_stat.calways being compiled whenCONFIG_CRYPTO_USERis enabled, even whenCONFIG_CRYPTO_STATSis not?When
CONFIG_CRYPTO_STATSis disabled, all the crypto stat stuff should be stubbed out so thatcrypto_user_stat.cdoesn't need to be compiled.[...]
Quoted 72 lines
include/linux/crypto.h +57
-0@@ -454,6 +454,33 @@ struct compress_alg {* @cra_refcnt: internally used * @cra_destroy: internally used * +* All following statistics are for this crypto_alg +* @encrypt_cnt: number of encrypt requests +* @decrypt_cnt: number of decrypt requests +* @compress_cnt: number of compress requests +* @decompress_cnt: number of decompress requests +* @generate_cnt: number of RNG generate requests +* @seed_cnt: number of times the rng was seeded +* @hash_cnt: number of hash requests +* @sign_cnt: number of sign requests +* @setsecret_cnt: number of setsecrey operation +* @generate_public_key_cnt: number of generate_public_key operation +* @verify_cnt: number of verify operation +* @compute_shared_secret_cnt: number of compute_shared_secret operation +* @encrypt_tlen: total data size handled by encrypt requests +* @decrypt_tlen: total data size handled by decrypt requests +* @compress_tlen: total data size handled by compress requests +* @decompress_tlen: total data size handled by decompress requests +* @generate_tlen: total data size of generated data by the RNG +* @hash_tlen: total data size hashed +* @akcipher_err_cnt: number of error for akcipher requests +* @cipher_err_cnt: number of error for akcipher requests +* @compress_err_cnt: number of error for akcipher requests +* @aead_err_cnt: number of error for akcipher requests +* @hash_err_cnt: number of error for akcipher requests +* @rng_err_cnt: number of error for akcipher requests +* @kpp_err_cnt: number of error for akcipher requests +* * The struct crypto_alg describes a generic Crypto API algorithm and is common * for all of the transformations. Any variable not documented here shall not * be used by a cipher implementation as it is internal to the Crypto API. @@ -487,6 +514,45 @@ struct crypto_alg {void (*cra_destroy)(struct crypto_alg *alg);struct module *cra_module; + +union { +atomic_t encrypt_cnt; +atomic_t compress_cnt; +atomic_t generate_cnt; +atomic_t hash_cnt; +atomic_t setsecret_cnt; + }; +union { +atomic64_t encrypt_tlen; +atomic64_t compress_tlen; +atomic64_t generate_tlen; +atomic64_t hash_tlen; + }; +union { +atomic_t akcipher_err_cnt; +atomic_t cipher_err_cnt; +atomic_t compress_err_cnt; +atomic_t aead_err_cnt; +atomic_t hash_err_cnt; +atomic_t rng_err_cnt; +atomic_t kpp_err_cnt; + }; +union { +atomic_t decrypt_cnt; +atomic_t decompress_cnt; +atomic_t seed_cnt; +atomic_t generate_public_key_cnt; + }; +union {include/linux/crypto.h struct crypto_alg { · line 556
Quoted 10 lines
include/linux/crypto.h +9
-0+atomic64_t decrypt_tlen; +atomic64_t decompress_tlen; + }; +union { +atomic_t verify_cnt; +atomic_t compute_shared_secret_cnt; + }; +atomic_t sign_cnt; + }CRYPTO_MINALIGN_ATTR ;The new fields here should all be behind
CONFIG_CRYPTO_STATS.
Quoted 4 lines
Ideally there would be zero overhead when
CONFIG_CRYPTO_STATSis disabled. That's not quite the case currently.- Eric
Hello
I will address thoses problem in a followup patch.
Thanks
Quoted 64 lines · Corentin Labbe
include/uapi/linux/cryptouser.h +42
-0@@ -29,6 +29,7 @@ enum {CRYPTO_MSG_UPDATEALG ,CRYPTO_MSG_GETALG ,CRYPTO_MSG_DELRNG , +CRYPTO_MSG_GETSTAT , __CRYPTO_MSG_MAX };#define CRYPTO_MSG_MAX (__CRYPTO_MSG_MAX - 1)@@ -50,6 +51,16 @@ enum crypto_attr_type_t {CRYPTOCFGA_REPORT_AKCIPHER ,/* struct crypto_report_akcipher */ CRYPTOCFGA_REPORT_KPP ,/* struct crypto_report_kpp */ CRYPTOCFGA_REPORT_ACOMP ,/* struct crypto_report_acomp */ +CRYPTOCFGA_STAT_LARVAL ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_HASH ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_BLKCIPHER ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_AEAD ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_COMPRESS ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_RNG ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_CIPHER ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_AKCIPHER ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_KPP ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_ACOMP ,/* struct crypto_stat */ __CRYPTOCFGA_MAX #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)@@ -65,6 +76,47 @@ struct crypto_user_alg {__u32 cru_flags; }; +struct crypto_stat { +char type[CRYPTO_MAX_NAME ]; +union { +__u32 stat_encrypt_cnt; +__u32 stat_compress_cnt; +__u32 stat_generate_cnt; +__u32 stat_hash_cnt; +__u32 stat_setsecret_cnt; + }; +union { +__u64 stat_encrypt_tlen; +__u64 stat_compress_tlen; +__u64 stat_generate_tlen; +__u64 stat_hash_tlen; + }; +union { +__u32 stat_akcipher_err_cnt; +__u32 stat_cipher_err_cnt; +__u32 stat_compress_err_cnt; +__u32 stat_aead_err_cnt; +__u32 stat_hash_err_cnt; +__u32 stat_rng_err_cnt; +__u32 stat_kpp_err_cnt; + }; +union { +__u32 stat_decrypt_cnt; +__u32 stat_decompress_cnt; +__u32 stat_seed_cnt; +__u32 stat_generate_public_key_cnt; + }; +union {
include/uapi/linux/cryptouser.h struct crypto_user_alg { · line 119
Quoted 10 lines
include/uapi/linux/cryptouser.h +10
-0+__u64 stat_decrypt_tlen; +__u64 stat_decompress_tlen; + }; +union { +__u32 stat_verify_cnt; +__u32 stat_compute_shared_secret_cnt; + }; +__u32 stat_sign_cnt; +}; +
All the 32-bit fields need to be 64-bit. In some cases, UINT32_MAX crypto operations can be done in seconds.
It's also weird that everything shares the same crypto_stat structure. I think there should be a different struct for each algorithm type, like there is for the existing crypto_user algorithm reporting. In fact you are kind of already doing that since the struct is loaded full of unions. But it would be much cleaner to use actually different structures.
- Eric
Quoted 79 lines · Eric Biggers
Quoted 64 lines · Corentin Labbe
include/uapi/linux/cryptouser.h +42
-0@@ -29,6 +29,7 @@ enum {CRYPTO_MSG_UPDATEALG ,CRYPTO_MSG_GETALG ,CRYPTO_MSG_DELRNG , +CRYPTO_MSG_GETSTAT , __CRYPTO_MSG_MAX };#define CRYPTO_MSG_MAX (__CRYPTO_MSG_MAX - 1)@@ -50,6 +51,16 @@ enum crypto_attr_type_t {CRYPTOCFGA_REPORT_AKCIPHER ,/* struct crypto_report_akcipher */ CRYPTOCFGA_REPORT_KPP ,/* struct crypto_report_kpp */ CRYPTOCFGA_REPORT_ACOMP ,/* struct crypto_report_acomp */ +CRYPTOCFGA_STAT_LARVAL ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_HASH ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_BLKCIPHER ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_AEAD ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_COMPRESS ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_RNG ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_CIPHER ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_AKCIPHER ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_KPP ,/* struct crypto_stat */ +CRYPTOCFGA_STAT_ACOMP ,/* struct crypto_stat */ __CRYPTOCFGA_MAX #define CRYPTOCFGA_MAX (__CRYPTOCFGA_MAX - 1)@@ -65,6 +76,47 @@ struct crypto_user_alg {__u32 cru_flags; }; +struct crypto_stat { +char type[CRYPTO_MAX_NAME ]; +union { +__u32 stat_encrypt_cnt; +__u32 stat_compress_cnt; +__u32 stat_generate_cnt; +__u32 stat_hash_cnt; +__u32 stat_setsecret_cnt; + }; +union { +__u64 stat_encrypt_tlen; +__u64 stat_compress_tlen; +__u64 stat_generate_tlen; +__u64 stat_hash_tlen; + }; +union { +__u32 stat_akcipher_err_cnt; +__u32 stat_cipher_err_cnt; +__u32 stat_compress_err_cnt; +__u32 stat_aead_err_cnt; +__u32 stat_hash_err_cnt; +__u32 stat_rng_err_cnt; +__u32 stat_kpp_err_cnt; + }; +union { +__u32 stat_decrypt_cnt; +__u32 stat_decompress_cnt; +__u32 stat_seed_cnt; +__u32 stat_generate_public_key_cnt; + }; +union {include/uapi/linux/cryptouser.h struct crypto_user_alg { · line 119
Quoted 10 lines
include/uapi/linux/cryptouser.h +10
-0+__u64 stat_decrypt_tlen; +__u64 stat_decompress_tlen; + }; +union { +__u32 stat_verify_cnt; +__u32 stat_compute_shared_secret_cnt; + }; +__u32 stat_sign_cnt; +}; +All the 32-bit fields need to be 64-bit. In some cases,
UINT32_MAXcrypto operations can be done in seconds.
Quoted 7 lines
It's also weird that everything shares the same
crypto_statstructure. I think there should be a different struct for each algorithm type, like there is for the existingcrypto_useralgorithm reporting. In fact you are kind of already doing that since the struct is loaded full of unions. But it would be much cleaner to use actually different structures.- Eric
Hello
I agree, separate structures will be cleaner.
I will address this in a followup patch.
Thanks
Hi Corentin,
Quoted 22 lines · Corentin Labbe
crypto/crypto_user_stat.c new file +22
-0+int crypto_dump_reportstat (struct sk_buff *skb,struct netlink_callback *cb) +{ +struct crypto_alg *alg; +struct crypto_dump_info info; +int err; + +if (cb->args[0 ]) + goto out; + + cb->args[0 ] =1 ; + + info.in_skb = cb->skb; + info.out_skb = skb; + info.nlmsg_seq = cb->nlh->nlmsg_seq; + info.nlmsg_flags =NLM_F_MULTI ; + +list_for_each_entry (alg, &crypto_alg_list, cra_list) { + err =crypto_reportstat_alg (alg, &info); +if (err) + goto out_err; + } +
crypto/crypto_user_stat.c line 461
Quoted 10 lines
crypto/crypto_user_stat.c new file +10
-0+out: +return skb->len; +out_err: +return err; +} + +int crypto_dump_reportstat_done (struct netlink_callback *cb) +{ +return 0 ; +}
How did you test this part? Hint: these functions are never executed.
- Eric
Quoted 29 lines · Eric Biggers
Hi Corentin,
Quoted 26 lines · Corentin Labbe
crypto/crypto_user_stat.c new file +26
-0+int crypto_dump_reportstat (struct sk_buff *skb,struct netlink_callback *cb) +{ +struct crypto_alg *alg; +struct crypto_dump_info info; +int err; + +if (cb->args[0 ]) + goto out; + + cb->args[0 ] =1 ; + + info.in_skb = cb->skb; + info.out_skb = skb; + info.nlmsg_seq = cb->nlh->nlmsg_seq; + info.nlmsg_flags =NLM_F_MULTI ; + +list_for_each_entry (alg, &crypto_alg_list, cra_list) { + err =crypto_reportstat_alg (alg, &info); +if (err) + goto out_err; + } + +out: +return skb->len; +out_err: +return err;
Quoted 9 lines
crypto/crypto_user_stat.c line 461
Quoted 6 lines
crypto/crypto_user_stat.c new file +6
-0+} + +int crypto_dump_reportstat_done (struct netlink_callback *cb) +{ +return 0 ; +}How did you test this part? Hint: these functions are never executed.
Right, it is not used, only crypto_reportstat is used by the getstat.c example tool. And for using it, I need to do changes in crypto_user_rcv_msg().
But I am not sure if it is interesting to do so.
So I will send a patch for removing it.
Regards
PATCH v3 2/2 crypto: tools: Add cryptostat userspace
In reply to Corentin LabbeThis patch adds an userspace tool for displaying kernel crypto API statistics.
--- tools/crypto/getstat.c | 294 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 294 insertions(+) create mode 100644 tools/crypto/getstat.c
tools/crypto/getstat.c new file +294 -0
@@ -0,0 +1,294 @@ +/* Heavily copied from libkcapi 2015 - 2017, Stephan Mueller <[email protected]> */ +#include <errno.h> +#include <linux/cryptouser.h> +#include <linux/netlink.h> +#include <linux/rtnetlink.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <time.h> +#include <unistd.h> + +#define CR_RTA (x) ((struct rtattr *)(((char *)(x)) + NLMSG_ALIGN(sizeof(struct crypto_user_alg)))) + +static int get_stat (const char *drivername) +{ +struct { +struct nlmsghdr n; +struct crypto_user_alg cru; + } req; +struct sockaddr_nl nl; +int sd =0 , ret; +socklen_t addr_len; +struct iovec iov; +struct msghdr msg; +char buf[4096 ]; +struct nlmsghdr *res_n = (struct nlmsghdr *)buf; +struct crypto_user_alg *cru_res =NULL ; +int res_len =0 ; +struct rtattr *tb[CRYPTOCFGA_MAX +1 ]; +struct rtattr *rta; +struct nlmsgerr *errmsg; + +memset (&req,0 ,sizeof (req)); +memset (&buf,0 ,sizeof (buf)); +memset (&msg,0 ,sizeof (msg)); + + req.n.nlmsg_len =NLMSG_LENGTH (sizeof (req.cru)); + req.n.nlmsg_flags =NLM_F_REQUEST ; + req.n.nlmsg_type =CRYPTO_MSG_GETSTAT ; + req.n.nlmsg_seq =time (NULL ); + +strncpy (req.cru.cru_driver_name, drivername,strlen (drivername)); + + sd =socket (AF_NETLINK ,SOCK_RAW ,NETLINK_CRYPTO ); +if (sd <0 ) { +fprintf (stderr,"Netlink error: cannot open netlink socket" ); +return -errno; + } +memset (&nl,0 ,sizeof (nl)); + nl.nl_family =AF_NETLINK ; +if (bind (sd, (struct sockaddr *)&nl,sizeof (nl)) <0 ) { + ret = -errno; +fprintf (stderr,"Netlink error: cannot bind netlink socket" ); + goto out; + } + +/* sanity check that netlink socket was successfully opened */ + addr_len =sizeof (nl); +if (getsockname (sd, (struct sockaddr *)&nl, &addr_len) <0 ) { + ret = -errno; +printf ("Netlink error: cannot getsockname" ); + goto out; + } +if (addr_len !=sizeof (nl)) { + ret = -errno; +printf ("Netlink error: wrong address length %d" , addr_len); + goto out; + } +if (nl.nl_family !=AF_NETLINK ) { + ret = -errno; +printf ("Netlink error: wrong address family %d" , + nl.nl_family); + goto out; + } + +memset (&nl,0 ,sizeof (nl)); + nl.nl_family =AF_NETLINK ; + iov.iov_base = (void *)&req.n; + iov.iov_len = req.n.nlmsg_len; + msg.msg_name = &nl; + msg.msg_namelen =sizeof (nl); + msg.msg_iov = &iov; + msg.msg_iovlen =1 ; +if (sendmsg (sd, &msg,0 ) <0 ) { + ret = -errno; +printf ("Netlink error: sendmsg failed" ); + goto out; + } +memset (buf,0 ,sizeof (buf)); + iov.iov_base = buf; +while (1 ) { + iov.iov_len =sizeof (buf); + ret =recvmsg (sd, &msg,0 ); +if (ret <0 ) { +if (errno ==EINTR || errno ==EAGAIN ) +continue ; + ret = -errno; +printf ("Netlink error: netlink receive error" ); + goto out; + } +if (ret ==0 ) { + ret = -errno; +printf ("Netlink error: no data" ); + goto out; + } +if (ret >sizeof (buf)) { + ret = -errno; +printf ("Netlink error: received too much data" ); + goto out; + } +break ; + } + + ret = -EFAULT ; + res_len = res_n->nlmsg_len; +if (res_n->nlmsg_type ==NLMSG_ERROR ) { + errmsg =NLMSG_DATA (res_n); +fprintf (stderr,"Fail with %d\n" , errmsg->error); + ret = errmsg->error; + goto out; + } + +if (res_n->nlmsg_type ==CRYPTO_MSG_GETSTAT ) { + cru_res =NLMSG_DATA (res_n); + res_len -=NLMSG_SPACE (sizeof (*cru_res)); + } +if (res_len <0 ) { +printf ("Netlink error: nlmsg len %d\n" , res_len); + goto out; + } + +if (!cru_res) { + ret = -EFAULT ; +printf ("Netlink error: no cru_res\n" ); + goto out; + } + + rta =CR_RTA (cru_res); +memset (tb,0 ,sizeof (struct rtattr *) * (CRYPTOCFGA_MAX +1 )); +while (RTA_OK (rta, res_len)) { +if ((rta->rta_type <=CRYPTOCFGA_MAX ) && (!tb[rta->rta_type])) + tb[rta->rta_type] = rta; + rta =RTA_NEXT (rta, res_len); + } +if (res_len) { +printf ("Netlink error: unprocessed data %d" , + res_len); + goto out; + } + +if (tb[CRYPTOCFGA_STAT_HASH ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_HASH ]; +struct crypto_stat *rhash = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tHash\n\tHash: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rhash->stat_hash_cnt, rhash->stat_hash_tlen, + rhash->stat_hash_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_COMPRESS ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_COMPRESS ]; +struct crypto_stat *rblk = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tCompress\n\tCompress: %u bytes: %llu\n\tDecompress: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rblk->stat_compress_cnt, rblk->stat_compress_tlen, + rblk->stat_decompress_cnt, rblk->stat_decompress_tlen, + rblk->stat_compress_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_ACOMP ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_ACOMP ]; +struct crypto_stat *rcomp = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tACompress\n\tCompress: %u bytes: %llu\n\tDecompress: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rcomp->stat_compress_cnt, rcomp->stat_compress_tlen, + rcomp->stat_decompress_cnt, rcomp->stat_decompress_tlen, + rcomp->stat_compress_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_AEAD ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_AEAD ]; +struct crypto_stat *raead = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tAEAD\n\tEncrypt: %u bytes: %llu\n\tDecrypt: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + raead->stat_encrypt_cnt, raead->stat_encrypt_tlen, + raead->stat_decrypt_cnt, raead->stat_decrypt_tlen, + raead->stat_aead_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_BLKCIPHER ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_BLKCIPHER ]; +struct crypto_stat *rblk = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tCipher\n\tEncrypt: %u bytes: %llu\n\tDecrypt: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rblk->stat_encrypt_cnt, rblk->stat_encrypt_tlen, + rblk->stat_decrypt_cnt, rblk->stat_decrypt_tlen, + rblk->stat_cipher_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_AKCIPHER ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_AKCIPHER ]; +struct crypto_stat *rblk = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tAkcipher\n\tEncrypt: %u bytes: %llu\n\tDecrypt: %u bytes: %llu\n\tSign: %u\n\tVerify: %u\n\tErrors: %u\n" , + drivername, + rblk->stat_encrypt_cnt, rblk->stat_encrypt_tlen, + rblk->stat_decrypt_cnt, rblk->stat_decrypt_tlen, + rblk->stat_sign_cnt, rblk->stat_verify_cnt, + rblk->stat_akcipher_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_CIPHER ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_CIPHER ]; +struct crypto_stat *rblk = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tcipher\n\tEncrypt: %u bytes: %llu\n\tDecrypt: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rblk->stat_encrypt_cnt, rblk->stat_encrypt_tlen, + rblk->stat_decrypt_cnt, rblk->stat_decrypt_tlen, + rblk->stat_cipher_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_RNG ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_RNG ]; +struct crypto_stat *rrng = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tRNG\n\tSeed: %u\n\tGenerate: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rrng->stat_seed_cnt, + rrng->stat_generate_cnt, rrng->stat_generate_tlen, + rrng->stat_rng_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_KPP ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_KPP ]; +struct crypto_stat *rkpp = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tKPP\n\tSetsecret: %u\n\tGenerate public key: %u\n\tCompute_shared_secret: %u\n\tErrors: %u\n" , + drivername, + rkpp->stat_setsecret_cnt, + rkpp->stat_generate_public_key_cnt, + rkpp->stat_compute_shared_secret_cnt, + rkpp->stat_kpp_err_cnt); + }else { +fprintf (stderr,"%s is of an unknown algorithm\n" , drivername); + } + ret =0 ; +out: +close (sd); +return ret; +} + +int main (int argc,const char *argv[]) +{ +char buf[4096 ]; +FILE *procfd; +int i, lastspace; +int ret; + + procfd =fopen ("/proc/crypto" ,"r" ); +if (!procfd) { + ret = errno; +fprintf (stderr,"Cannot open /proc/crypto %s\n" ,strerror (errno)); +return ret; + } +if (argc >1 ) { +if (!strcmp (argv[1 ],"-h" ) || !strcmp (argv[1 ],"--help" )) { +printf ("Usage: %s [-h|--help] display this help\n" , argv[0 ]); +printf ("Usage: %s display all crypto statistics\n" , argv[0 ]); +printf ("Usage: %s drivername1 drivername2 ... = display crypto statistics about drivername1 ...\n" , argv[0 ]); +return 0 ; + } +for (i =1 ; i < argc; i++) { + ret =get_stat (argv[i]); +if (ret) { +fprintf (stderr,"Failed with %s\n" ,strerror (-ret)); +return ret; + } + } +return 0 ; + } + +while (fgets (buf,sizeof (buf), procfd)) { +if (!strncmp (buf,"driver" ,6 )) { + lastspace =0 ; + i =0 ; +while (i <strlen (buf)) { + i++; +if (buf[i] ==' ' ) + lastspace = i; + } + buf[strlen (buf) -1 ] ='\0' ; + ret =get_stat (buf + lastspace +1 ); +if (ret) { +fprintf (stderr,"Failed with %s\n" ,strerror (-ret)); + goto out; + } + } + } +out: +fclose (procfd); +return ret; +}
Signature · 1 line
2.16.4
Re: [PATCH v3 2/2] crypto: tools: Add cryptostat userspace
Quoted 4 lines · Corentin Labbe
This patch adds an userspace tool for displaying kernel crypto API statistics.
Signed-off-by Corentin Labbe <[email protected]>
How do I actually build this thing?
Quoted 308 lines
--- tools/crypto/getstat.c | 294 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 294 insertions(+) create mode 100644 tools/crypto/getstat.ctools/crypto/getstat.c new file +294
-1@@ -0,0 +1,294 @@ +/* Heavily copied from libkcapi 2015 - 2017, Stephan Mueller <[email protected]> */ +#include <errno.h> +#include <linux/cryptouser.h> +#include <linux/netlink.h> +#include <linux/rtnetlink.h> +#include <sys/types.h> +#include <sys/socket.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <time.h> +#include <unistd.h> + +#define CR_RTA (x) ((struct rtattr *)(((char *)(x)) + NLMSG_ALIGN(sizeof(struct crypto_user_alg)))) + +static int get_stat (const char *drivername) +{ +struct { +struct nlmsghdr n; +struct crypto_user_alg cru; + } req; +struct sockaddr_nl nl; +int sd =0 , ret; +socklen_t addr_len; +struct iovec iov; +struct msghdr msg; +char buf[4096 ]; +struct nlmsghdr *res_n = (struct nlmsghdr *)buf; +struct crypto_user_alg *cru_res =NULL ; +int res_len =0 ; +struct rtattr *tb[CRYPTOCFGA_MAX +1 ]; +struct rtattr *rta; +struct nlmsgerr *errmsg; + +memset (&req,0 ,sizeof (req)); +memset (&buf,0 ,sizeof (buf)); +memset (&msg,0 ,sizeof (msg)); + + req.n.nlmsg_len =NLMSG_LENGTH (sizeof (req.cru)); + req.n.nlmsg_flags =NLM_F_REQUEST ; + req.n.nlmsg_type =CRYPTO_MSG_GETSTAT ; + req.n.nlmsg_seq =time (NULL ); + +strncpy (req.cru.cru_driver_name, drivername,strlen (drivername)); + + sd =socket (AF_NETLINK ,SOCK_RAW ,NETLINK_CRYPTO ); +if (sd <0 ) { +fprintf (stderr,"Netlink error: cannot open netlink socket" ); +return -errno; + } +memset (&nl,0 ,sizeof (nl)); + nl.nl_family =AF_NETLINK ; +if (bind (sd, (struct sockaddr *)&nl,sizeof (nl)) <0 ) { + ret = -errno; +fprintf (stderr,"Netlink error: cannot bind netlink socket" ); + goto out; + } + +/* sanity check that netlink socket was successfully opened */ + addr_len =sizeof (nl); +if (getsockname (sd, (struct sockaddr *)&nl, &addr_len) <0 ) { + ret = -errno; +printf ("Netlink error: cannot getsockname" ); + goto out; + } +if (addr_len !=sizeof (nl)) { + ret = -errno; +printf ("Netlink error: wrong address length %d" , addr_len); + goto out; + } +if (nl.nl_family !=AF_NETLINK ) { + ret = -errno; +printf ("Netlink error: wrong address family %d" , + nl.nl_family); + goto out; + } + +memset (&nl,0 ,sizeof (nl)); + nl.nl_family =AF_NETLINK ; + iov.iov_base = (void *)&req.n; + iov.iov_len = req.n.nlmsg_len; + msg.msg_name = &nl; + msg.msg_namelen =sizeof (nl); + msg.msg_iov = &iov; + msg.msg_iovlen =1 ; +if (sendmsg (sd, &msg,0 ) <0 ) { + ret = -errno; +printf ("Netlink error: sendmsg failed" ); + goto out; + } +memset (buf,0 ,sizeof (buf)); + iov.iov_base = buf; +while (1 ) { + iov.iov_len =sizeof (buf); + ret =recvmsg (sd, &msg,0 ); +if (ret <0 ) { +if (errno ==EINTR || errno ==EAGAIN ) +continue ; + ret = -errno; +printf ("Netlink error: netlink receive error" ); + goto out; + } +if (ret ==0 ) { + ret = -errno; +printf ("Netlink error: no data" ); + goto out; + } +if (ret >sizeof (buf)) { + ret = -errno; +printf ("Netlink error: received too much data" ); + goto out; + } +break ; + } + + ret = -EFAULT ; + res_len = res_n->nlmsg_len; +if (res_n->nlmsg_type ==NLMSG_ERROR ) { + errmsg =NLMSG_DATA (res_n); +fprintf (stderr,"Fail with %d\n" , errmsg->error); + ret = errmsg->error; + goto out; + } + +if (res_n->nlmsg_type ==CRYPTO_MSG_GETSTAT ) { + cru_res =NLMSG_DATA (res_n); + res_len -=NLMSG_SPACE (sizeof (*cru_res)); + } +if (res_len <0 ) { +printf ("Netlink error: nlmsg len %d\n" , res_len); + goto out; + } + +if (!cru_res) { + ret = -EFAULT ; +printf ("Netlink error: no cru_res\n" ); + goto out; + } + + rta =CR_RTA (cru_res); +memset (tb,0 ,sizeof (struct rtattr *) * (CRYPTOCFGA_MAX +1 )); +while (RTA_OK (rta, res_len)) { +if ((rta->rta_type <=CRYPTOCFGA_MAX ) && (!tb[rta->rta_type])) + tb[rta->rta_type] = rta; + rta =RTA_NEXT (rta, res_len); + } +if (res_len) { +printf ("Netlink error: unprocessed data %d" , + res_len); + goto out; + } + +if (tb[CRYPTOCFGA_STAT_HASH ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_HASH ]; +struct crypto_stat *rhash = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tHash\n\tHash: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rhash->stat_hash_cnt, rhash->stat_hash_tlen, + rhash->stat_hash_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_COMPRESS ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_COMPRESS ]; +struct crypto_stat *rblk = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tCompress\n\tCompress: %u bytes: %llu\n\tDecompress: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rblk->stat_compress_cnt, rblk->stat_compress_tlen, + rblk->stat_decompress_cnt, rblk->stat_decompress_tlen, + rblk->stat_compress_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_ACOMP ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_ACOMP ]; +struct crypto_stat *rcomp = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tACompress\n\tCompress: %u bytes: %llu\n\tDecompress: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rcomp->stat_compress_cnt, rcomp->stat_compress_tlen, + rcomp->stat_decompress_cnt, rcomp->stat_decompress_tlen, + rcomp->stat_compress_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_AEAD ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_AEAD ]; +struct crypto_stat *raead = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tAEAD\n\tEncrypt: %u bytes: %llu\n\tDecrypt: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + raead->stat_encrypt_cnt, raead->stat_encrypt_tlen, + raead->stat_decrypt_cnt, raead->stat_decrypt_tlen, + raead->stat_aead_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_BLKCIPHER ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_BLKCIPHER ]; +struct crypto_stat *rblk = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tCipher\n\tEncrypt: %u bytes: %llu\n\tDecrypt: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rblk->stat_encrypt_cnt, rblk->stat_encrypt_tlen, + rblk->stat_decrypt_cnt, rblk->stat_decrypt_tlen, + rblk->stat_cipher_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_AKCIPHER ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_AKCIPHER ]; +struct crypto_stat *rblk = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tAkcipher\n\tEncrypt: %u bytes: %llu\n\tDecrypt: %u bytes: %llu\n\tSign: %u\n\tVerify: %u\n\tErrors: %u\n" , + drivername, + rblk->stat_encrypt_cnt, rblk->stat_encrypt_tlen, + rblk->stat_decrypt_cnt, rblk->stat_decrypt_tlen, + rblk->stat_sign_cnt, rblk->stat_verify_cnt, + rblk->stat_akcipher_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_CIPHER ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_CIPHER ]; +struct crypto_stat *rblk = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tcipher\n\tEncrypt: %u bytes: %llu\n\tDecrypt: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rblk->stat_encrypt_cnt, rblk->stat_encrypt_tlen, + rblk->stat_decrypt_cnt, rblk->stat_decrypt_tlen, + rblk->stat_cipher_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_RNG ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_RNG ]; +struct crypto_stat *rrng = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tRNG\n\tSeed: %u\n\tGenerate: %u bytes: %llu\n\tErrors: %u\n" , + drivername, + rrng->stat_seed_cnt, + rrng->stat_generate_cnt, rrng->stat_generate_tlen, + rrng->stat_rng_err_cnt); + }else if (tb[CRYPTOCFGA_STAT_KPP ]) { +struct rtattr *rta = tb[CRYPTOCFGA_STAT_KPP ]; +struct crypto_stat *rkpp = + (struct crypto_stat *)RTA_DATA (rta); +printf ("%s\tKPP\n\tSetsecret: %u\n\tGenerate public key: %u\n\tCompute_shared_secret: %u\n\tErrors: %u\n" , + drivername, + rkpp->stat_setsecret_cnt, + rkpp->stat_generate_public_key_cnt, + rkpp->stat_compute_shared_secret_cnt, + rkpp->stat_kpp_err_cnt); + }else { +fprintf (stderr,"%s is of an unknown algorithm\n" , drivername); + } + ret =0 ; +out: +close (sd); +return ret; +} + +int main (int argc,const char *argv[]) +{ +char buf[4096 ]; +FILE *procfd; +int i, lastspace; +int ret; + + procfd =fopen ("/proc/crypto" ,"r" ); +if (!procfd) { + ret = errno; +fprintf (stderr,"Cannot open /proc/crypto %s\n" ,strerror (errno)); +return ret; + } +if (argc >1 ) { +if (!strcmp (argv[1 ],"-h" ) || !strcmp (argv[1 ],"--help" )) { +printf ("Usage: %s [-h|--help] display this help\n" , argv[0 ]); +printf ("Usage: %s display all crypto statistics\n" , argv[0 ]); +printf ("Usage: %s drivername1 drivername2 ... = display crypto statistics about drivername1 ...\n" , argv[0 ]); +return 0 ; + } +for (i =1 ; i < argc; i++) { + ret =get_stat (argv[i]); +if (ret) { +fprintf (stderr,"Failed with %s\n" ,strerror (-ret)); +return ret; + } + } +return 0 ; + } + +while (fgets (buf,sizeof (buf), procfd)) { +if (!strncmp (buf,"driver" ,6 )) { + lastspace =0 ; + i =0 ; +while (i <strlen (buf)) { + i++; +if (buf[i] ==' ' ) + lastspace = i; + } + buf[strlen (buf) -1 ] ='\0' ; + ret =get_stat (buf + lastspace +1 ); +if (ret) { +fprintf (stderr,"Failed with %s\n" ,strerror (-ret)); + goto out; + } + } + } +out: +fclose (procfd); +return ret; +} --2.16.4
Re: [PATCH v3 2/2] crypto: tools: Add cryptostat userspace
Quoted 8 lines · Ard Biesheuvel
Quoted 4 lines · Corentin Labbe
This patch adds an userspace tool for displaying kernel crypto API statistics.
Signed-off-by Corentin Labbe <[email protected]>How do I actually build this thing?
Never mind.
Re: [PATCH v3 2/2] crypto: tools: Add cryptostat userspace
Quoted 11 lines · Ard Biesheuvel
Quoted 8 lines · Ard Biesheuvel
Quoted 4 lines · Corentin Labbe
This patch adds an userspace tool for displaying kernel crypto API statistics.
Signed-off-by Corentin Labbe <[email protected]>How do I actually build this thing?
Never mind.
Nope you are are right, this patchset clearly lack documentation.
I will send a subsequent patch with it.
Furthermore, since you seems to use cryptostat, what's your usage/opinion about it and what statistic it miss.
Regards
Re: [PATCH v3 2/2] crypto: tools: Add cryptostat userspace
Quoted 11 lines · LABBE Corentin
Quoted 10 lines · Ard Biesheuvel
Quoted 8 lines · Ard Biesheuvel
Quoted 4 lines · Corentin Labbe
This patch adds an userspace tool for displaying kernel crypto API statistics.
Signed-off-by Corentin Labbe <[email protected]>How do I actually build this thing?
Quoted 8 lines
Quoted 1 line
Never mind.
Nope you are are right, this patchset clearly lack documentation.
I will send a subsequent patch with it.
Furthermore, since you seems to use cryptostat, what's your usage/opinion about it and what statistic it miss.
To be honest, I mainly used it to check whether a certain cipher is being used at all or not, i.e., to check whether the my mac80211 interface is really using the arc4 and ccmp ciphers it allocates, or whether they are simply there as a fallback.
Herbert Xu
maintainerQuoted 289 lines · Corentin Labbe
This patch is a try to implement a generic crypto driver statistics. The goal is to have an "ifconfig" for crypto device.
Some driver tried to implement this via a debugfs interface.
This serie do it directly in the crypto API and give access to stats via the
crypto_user(netlink)API.
Then an userspace tool will collect information via netlink. Note that this userspace tool is heavily copied from libkcapi and if Stephan Mueller agree, I will made a PR for adding getstat to it unlesstools/cryptois the good place for it.Example of output:
pkcs1pad(rsa-sun8i-ce,sha1)Akcipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Sign: 0
Verify: 5
Errors: 0cryptd(__xts-aes-ce)cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
xts-aes-ce cipherEncrypt: 17 bytes: 4384 Decrypt: 17 bytes: 4384 Errors: 0
cryptd(__ctr-aes-ce)cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
ctr-aes-ce cipherEncrypt: 19 bytes: 5551 Decrypt: 19 bytes: 5551 Errors: 0
cryptd(__cbc-aes-ce)cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
cbc-aes-ce cipherEncrypt: 19 bytes: 3040 Decrypt: 19 bytes: 3040 Errors: 0
cryptd(__ecb-aes-ce)cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
ecb-aes-ce cipherEncrypt: 14 bytes: 2624 Decrypt: 14 bytes: 2624 Errors: 0 cbcmac-aes-ce Hash Hash: 20 bytes: 1244 Errors: 0 xcbc-aes-ce Hash Hash: 28 bytes: 543 Errors: 0 cmac-aes-ce Hash Hash: 36 bytes: 1472 Errors: 0 __xts-aes-ce cipher Encrypt: 17 bytes: 4384 Decrypt: 17 bytes: 4384 Errors: 0 ctr-aes-ce cipher Encrypt: 19 bytes: 5551 Decrypt: 19 bytes: 5551 Errors: 0 __ctr-aes-ce cipher Encrypt: 19 bytes: 5551 Decrypt: 19 bytes: 5551 Errors: 0 __cbc-aes-ce cipher Encrypt: 19 bytes: 3040 Decrypt: 19 bytes: 3040 Errors: 0 __ecb-aes-ce cipher Encrypt: 14 bytes: 2624 Decrypt: 14 bytes: 2624 Errors: 0 rsa-sun8i-ce Akcipher Encrypt: 7 bytes: 232 Decrypt: 6 bytes: 1152 Sign: 0 Verify: 5 Errors: 0
sun8i_ce_rngRNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0ecb(des3_ede-generic)cipherEncrypt: 24 bytes: 4584 Decrypt: 24 bytes: 4584 Errors: 0 ecb-des3-sun8i-ce cipher Encrypt: 18 bytes: 3072 Decrypt: 18 bytes: 3072 Errors: 0 cbc(des3_ede-generic) cipher Encrypt: 14 bytes: 5104 Decrypt: 14 bytes: 5104 Errors: 0aes-ce cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
des3_ede-generic cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
des-generic cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
aes-arm64 cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
crc32c-arm64-ce HashHash: 92 bytes: 20649 Errors: 0 cbc-des3-sun8i-ce cipher Encrypt: 10 bytes: 3488 Decrypt: 10 bytes: 3488 Errors: 0 crc32-arm64-ce Hash Hash: 92 bytes: 20649 Errors: 0 ecb-aes-sun8i-ce cipher Encrypt: 18 bytes: 3168 Decrypt: 18 bytes: 3168 Errors: 0 cbc-aes-sun8i-ce cipher Encrypt: 24 bytes: 3712 Decrypt: 24 bytes: 3712 Errors: 0 sha256-ce Hash Hash: 26 bytes: 8860 Errors: 0 sha224-ce Hash Hash: 26 bytes: 8860 Errors: 0 cts(cbc-aes-sun8i-ce) cipher Encrypt: 24 bytes: 956 Decrypt: 24 bytes: 956 Errors: 0 sha224-arm64-neon Hash Hash: 26 bytes: 8860 Errors: 0 sha256-arm64-neon Hash Hash: 26 bytes: 8860 Errors: 0 sha224-arm64 Hash Hash: 26 bytes: 8860 Errors: 0 sha256-arm64 Hash Hash: 26 bytes: 8860 Errors: 0 ctr-aes-sun8i-ce cipher Encrypt: 24 bytes: 6738 Decrypt: 24 bytes: 6738 Errors: 0 sha1-ce Hash Hash: 28 bytes: 9191 Errors: 0ecdh-generic KPP
Setsecret: 4
Generate public key: 3
Compute_shared_secret: 4
Errors: 0
ghash-generic HashHash: 32 bytes: 4358 Errors: 0
jitterentropy_rngRNG
Seed: 0
Generate: 1 bytes: 48
Errors: 0drbg_nopr_hmac_sha256RNGSeed: 5 Generate: 9 bytes: 1056 Errors: 0
drbg_nopr_hmac_sha512RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_nopr_hmac_sha384RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_nopr_hmac_sha1RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_pr_hmac_sha256RNGSeed: 4 Generate: 8 bytes: 1024 Errors: 0
drbg_pr_hmac_sha512RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_pr_hmac_sha384RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0drbg_pr_hmac_sha1RNG
Seed: 0
Generate: 0 bytes: 0
Errors: 0
crct10dif-generic HashHash: 24 bytes: 19893 Errors: 0 crc32c-generic Hash Hash: 92 bytes: 20649 Errors: 0aes-generic cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
sha224-generic HashHash: 26 bytes: 8860 Errors: 0 sha256-generic Hash Hash: 26 bytes: 8860 Errors: 0 sha1-generic Hash Hash: 28 bytes: 9191 Errors: 0digest_null-generic Hash
Hash: 0 bytes: 0
Errors: 0
compress_null-generic Compress
Compress: 0 bytes: 0
Decompress: 0 bytes: 0
Errors: 0
ecb-cipher_null cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
cipher_null-generic cipher
Encrypt: 0 bytes: 0
Decrypt: 0 bytes: 0
Errors: 0
rsa-generic AkcipherEncrypt: 17 bytes: 2832 Decrypt: 9 bytes: 1920 Sign: 0 Verify: 36 Errors: 0Futur possible additions:
- Add a "number of needed fallback" statistics.
- statistics for maximum request sizePlease let me know your opinions about it
Regards
Changes since v2:
- added documentation on new structcrypto_algmembers.Changes since v1:
- Do not use anymoreCRYPTO_MSG_GETALGand added a dedicatedCRYPTO_MSG_GETSTATChanges since RFC:
- Use cryptouser(netlink) instead of /sys
- Useatomic_tinstead of unsigned long
- moved stat code into dedicated inline function
- spelling fixesCorentin Labbe (2):
crypto: Implement a generic crypto statistics
crypto: tools: Add cryptostat userspacecrypto/Kconfig | 11 + crypto/Makefile | 1 + crypto/ahash.c | 21 +- crypto/algapi.c | 8 + crypto/{crypto_user.c => crypto_user_base.c} | 9 +- crypto/crypto_user_stat.c | 463 +++++++++++++++++++++++++++ crypto/rng.c | 1 + include/crypto/acompress.h | 38 ++- include/crypto/aead.h | 51 ++- include/crypto/akcipher.h | 76 ++++- include/crypto/hash.h | 32 +- include/crypto/internal/cryptouser.h | 8 + include/crypto/kpp.h | 51 ++- include/crypto/rng.h | 29 +- include/crypto/skcipher.h | 44 ++-
Quoted 8 lines
include/linux/crypto.h | 110 ++++++-
include/uapi/linux/cryptouser.h | 52 +++
tools/crypto/getstat.c | 294 +++++++++++++++++
18 files changed, 1264 insertions(+), 35 deletions(-)
rename crypto/{crypto_user.c => crypto_user_base.c} (97%)
create mode 100644 crypto/crypto_user_stat.c
create mode 100644 include/crypto/internal/cryptouser.h
create mode 100644 tools/crypto/getstat.cAll applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt