Skip to content

Commit

Permalink
crypto: user - split user space crypto stat structures
Browse files Browse the repository at this point in the history 
It is cleaner to have each stat in their own structures.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Corentin Labbe authored and Herbert Xu committed Dec 7, 2018
1 parent 6e8e72c commit 7f0a9d5
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 48 deletions.
20 changes: 10 additions & 10 deletions crypto/crypto_user_stat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct crypto_dump_info {

static int crypto_report_aead(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat raead;
struct crypto_stat_aead raead;
u64 v64;

memset(&raead, 0, sizeof(raead));
Expand All @@ -56,7 +56,7 @@ static int crypto_report_aead(struct sk_buff *skb, struct crypto_alg *alg)

static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat rcipher;
struct crypto_stat_cipher rcipher;
u64 v64;

memset(&rcipher, 0, sizeof(rcipher));
Expand All @@ -79,7 +79,7 @@ static int crypto_report_cipher(struct sk_buff *skb, struct crypto_alg *alg)

static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat rcomp;
struct crypto_stat_compress rcomp;
u64 v64;

memset(&rcomp, 0, sizeof(rcomp));
Expand All @@ -101,7 +101,7 @@ static int crypto_report_comp(struct sk_buff *skb, struct crypto_alg *alg)

static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat racomp;
struct crypto_stat_compress racomp;
u64 v64;

memset(&racomp, 0, sizeof(racomp));
Expand All @@ -123,7 +123,7 @@ static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)

static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat rakcipher;
struct crypto_stat_akcipher rakcipher;
u64 v64;

memset(&rakcipher, 0, sizeof(rakcipher));
Expand All @@ -150,7 +150,7 @@ static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)

static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat rkpp;
struct crypto_stat_kpp rkpp;
u64 v;

memset(&rkpp, 0, sizeof(rkpp));
Expand All @@ -171,7 +171,7 @@ static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)

static int crypto_report_ahash(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat rhash;
struct crypto_stat_hash rhash;
u64 v64;

memset(&rhash, 0, sizeof(rhash));
Expand All @@ -190,7 +190,7 @@ static int crypto_report_ahash(struct sk_buff *skb, struct crypto_alg *alg)

static int crypto_report_shash(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat rhash;
struct crypto_stat_hash rhash;
u64 v64;

memset(&rhash, 0, sizeof(rhash));
Expand All @@ -209,7 +209,7 @@ static int crypto_report_shash(struct sk_buff *skb, struct crypto_alg *alg)

static int crypto_report_rng(struct sk_buff *skb, struct crypto_alg *alg)
{
struct crypto_stat rrng;
struct crypto_stat_rng rrng;
u64 v64;

memset(&rrng, 0, sizeof(rrng));
Expand Down Expand Up @@ -248,7 +248,7 @@ static int crypto_reportstat_one(struct crypto_alg *alg,
if (nla_put_u32(skb, CRYPTOCFGA_PRIORITY_VAL, alg->cra_priority))
goto nla_put_failure;
if (alg->cra_flags & CRYPTO_ALG_LARVAL) {
struct crypto_stat rl;
struct crypto_stat_larval rl;

memset(&rl, 0, sizeof(rl));
strscpy(rl.type, "larval", sizeof(rl.type));
Expand Down
100 changes: 62 additions & 38 deletions include/uapi/linux/cryptouser.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,45 +76,69 @@ struct crypto_user_alg {
__u32 cru_flags;
};

struct crypto_stat {
char type[CRYPTO_MAX_NAME];
union {
__u64 stat_encrypt_cnt;
__u64 stat_compress_cnt;
__u64 stat_generate_cnt;
__u64 stat_hash_cnt;
__u64 stat_setsecret_cnt;
};
union {
__u64 stat_encrypt_tlen;
__u64 stat_compress_tlen;
__u64 stat_generate_tlen;
__u64 stat_hash_tlen;
};
union {
__u64 stat_akcipher_err_cnt;
__u64 stat_cipher_err_cnt;
__u64 stat_compress_err_cnt;
__u64 stat_aead_err_cnt;
__u64 stat_hash_err_cnt;
__u64 stat_rng_err_cnt;
__u64 stat_kpp_err_cnt;
};
union {
__u64 stat_decrypt_cnt;
__u64 stat_decompress_cnt;
__u64 stat_seed_cnt;
__u64 stat_generate_public_key_cnt;
};
union {
__u64 stat_decrypt_tlen;
__u64 stat_decompress_tlen;
};
union {
__u64 stat_verify_cnt;
__u64 stat_compute_shared_secret_cnt;
};
struct crypto_stat_aead {
char type[CRYPTO_MAX_NAME];
__u64 stat_encrypt_cnt;
__u64 stat_encrypt_tlen;
__u64 stat_decrypt_cnt;
__u64 stat_decrypt_tlen;
__u64 stat_aead_err_cnt;
};

struct crypto_stat_akcipher {
char type[CRYPTO_MAX_NAME];
__u64 stat_encrypt_cnt;
__u64 stat_encrypt_tlen;
__u64 stat_decrypt_cnt;
__u64 stat_decrypt_tlen;
__u64 stat_verify_cnt;
__u64 stat_sign_cnt;
__u64 stat_akcipher_err_cnt;
};

struct crypto_stat_cipher {
char type[CRYPTO_MAX_NAME];
__u64 stat_encrypt_cnt;
__u64 stat_encrypt_tlen;
__u64 stat_decrypt_cnt;
__u64 stat_decrypt_tlen;
__u64 stat_cipher_err_cnt;
};

struct crypto_stat_compress {
char type[CRYPTO_MAX_NAME];
__u64 stat_compress_cnt;
__u64 stat_compress_tlen;
__u64 stat_decompress_cnt;
__u64 stat_decompress_tlen;
__u64 stat_compress_err_cnt;
};

struct crypto_stat_hash {
char type[CRYPTO_MAX_NAME];
__u64 stat_hash_cnt;
__u64 stat_hash_tlen;
__u64 stat_hash_err_cnt;
};

struct crypto_stat_kpp {
char type[CRYPTO_MAX_NAME];
__u64 stat_setsecret_cnt;
__u64 stat_generate_public_key_cnt;
__u64 stat_compute_shared_secret_cnt;
__u64 stat_kpp_err_cnt;
};

struct crypto_stat_rng {
char type[CRYPTO_MAX_NAME];
__u64 stat_generate_cnt;
__u64 stat_generate_tlen;
__u64 stat_seed_cnt;
__u64 stat_rng_err_cnt;
};

struct crypto_stat_larval {
char type[CRYPTO_MAX_NAME];
};

struct crypto_report_larval {
Expand Down

0 comments on commit 7f0a9d5

Please sign in to comment.