Convert cryptostats to a counter_u64 array.
The global counters were not SMP-friendly. Use per-CPU counters instead. Reviewed by: jhb Sponsored by: Rubicon Communications, LLC (Netgate) Differential Revision: https://reviews.freebsd.org/D25466
This commit is contained in:
parent
7a3f60e7f5
commit
7290cb47fc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=362814
@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
|
|||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/systm.h>
|
#include <sys/systm.h>
|
||||||
#include <sys/eventhandler.h>
|
#include <sys/counter.h>
|
||||||
#include <sys/kernel.h>
|
#include <sys/kernel.h>
|
||||||
#include <sys/kthread.h>
|
#include <sys/kthread.h>
|
||||||
#include <sys/linker.h>
|
#include <sys/linker.h>
|
||||||
@ -232,9 +232,31 @@ static int crypto_kinvoke(struct cryptkop *krp);
|
|||||||
static void crypto_task_invoke(void *ctx, int pending);
|
static void crypto_task_invoke(void *ctx, int pending);
|
||||||
static void crypto_batch_enqueue(struct cryptop *crp);
|
static void crypto_batch_enqueue(struct cryptop *crp);
|
||||||
|
|
||||||
static struct cryptostats cryptostats;
|
static counter_u64_t cryptostats[sizeof(struct cryptostats) / sizeof(uint64_t)];
|
||||||
SYSCTL_STRUCT(_kern_crypto, OID_AUTO, stats, CTLFLAG_RW, &cryptostats,
|
SYSCTL_COUNTER_U64_ARRAY(_kern_crypto, OID_AUTO, stats, CTLFLAG_RW,
|
||||||
cryptostats, "Crypto system statistics");
|
cryptostats, nitems(cryptostats),
|
||||||
|
"Crypto system statistics");
|
||||||
|
|
||||||
|
#define CRYPTOSTAT_INC(stat) do { \
|
||||||
|
counter_u64_add( \
|
||||||
|
cryptostats[offsetof(struct cryptostats, stat) / sizeof(uint64_t)],\
|
||||||
|
1); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
|
static void
|
||||||
|
cryptostats_init(void *arg __unused)
|
||||||
|
{
|
||||||
|
COUNTER_ARRAY_ALLOC(cryptostats, nitems(cryptostats), M_WAITOK);
|
||||||
|
}
|
||||||
|
SYSINIT(cryptostats_init, SI_SUB_COUNTER, SI_ORDER_ANY, cryptostats_init, NULL);
|
||||||
|
|
||||||
|
static void
|
||||||
|
cryptostats_fini(void *arg __unused)
|
||||||
|
{
|
||||||
|
COUNTER_ARRAY_FREE(cryptostats, nitems(cryptostats));
|
||||||
|
}
|
||||||
|
SYSUNINIT(cryptostats_fini, SI_SUB_COUNTER, SI_ORDER_ANY, cryptostats_fini,
|
||||||
|
NULL);
|
||||||
|
|
||||||
/* Try to avoid directly exposing the key buffer as a symbol */
|
/* Try to avoid directly exposing the key buffer as a symbol */
|
||||||
static struct keybuf *keybuf;
|
static struct keybuf *keybuf;
|
||||||
@ -1399,7 +1421,7 @@ crypto_dispatch(struct cryptop *crp)
|
|||||||
crp_sanity(crp);
|
crp_sanity(crp);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
cryptostats.cs_ops++;
|
CRYPTOSTAT_INC(cs_ops);
|
||||||
|
|
||||||
crp->crp_retw_id = ((uintptr_t)crp->crp_session) % crypto_workers_num;
|
crp->crp_retw_id = ((uintptr_t)crp->crp_session) % crypto_workers_num;
|
||||||
|
|
||||||
@ -1460,7 +1482,7 @@ crypto_kdispatch(struct cryptkop *krp)
|
|||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
cryptostats.cs_kops++;
|
CRYPTOSTAT_INC(cs_kops);
|
||||||
|
|
||||||
krp->krp_cap = NULL;
|
krp->krp_cap = NULL;
|
||||||
error = crypto_kinvoke(krp);
|
error = crypto_kinvoke(krp);
|
||||||
@ -1767,7 +1789,7 @@ crypto_done(struct cryptop *crp)
|
|||||||
("crypto_done: op already done, flags 0x%x", crp->crp_flags));
|
("crypto_done: op already done, flags 0x%x", crp->crp_flags));
|
||||||
crp->crp_flags |= CRYPTO_F_DONE;
|
crp->crp_flags |= CRYPTO_F_DONE;
|
||||||
if (crp->crp_etype != 0)
|
if (crp->crp_etype != 0)
|
||||||
cryptostats.cs_errs++;
|
CRYPTOSTAT_INC(cs_errs);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* CBIMM means unconditionally do the callback immediately;
|
* CBIMM means unconditionally do the callback immediately;
|
||||||
@ -1839,7 +1861,7 @@ crypto_kdone(struct cryptkop *krp)
|
|||||||
struct cryptocap *cap;
|
struct cryptocap *cap;
|
||||||
|
|
||||||
if (krp->krp_status != 0)
|
if (krp->krp_status != 0)
|
||||||
cryptostats.cs_kerrs++;
|
CRYPTOSTAT_INC(cs_kerrs);
|
||||||
CRYPTO_DRIVER_LOCK();
|
CRYPTO_DRIVER_LOCK();
|
||||||
cap = krp->krp_cap;
|
cap = krp->krp_cap;
|
||||||
KASSERT(cap->cc_koperations > 0, ("cc_koperations == 0"));
|
KASSERT(cap->cc_koperations > 0, ("cc_koperations == 0"));
|
||||||
@ -1979,7 +2001,7 @@ crypto_proc(void)
|
|||||||
*/
|
*/
|
||||||
cap->cc_qblocked = 1;
|
cap->cc_qblocked = 1;
|
||||||
TAILQ_INSERT_HEAD(&crp_q, submit, crp_next);
|
TAILQ_INSERT_HEAD(&crp_q, submit, crp_next);
|
||||||
cryptostats.cs_blocks++;
|
CRYPTOSTAT_INC(cs_blocks);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2016,7 +2038,7 @@ crypto_proc(void)
|
|||||||
*/
|
*/
|
||||||
krp->krp_cap->cc_kqblocked = 1;
|
krp->krp_cap->cc_kqblocked = 1;
|
||||||
TAILQ_INSERT_HEAD(&crp_kq, krp, krp_next);
|
TAILQ_INSERT_HEAD(&crp_kq, krp, krp_next);
|
||||||
cryptostats.cs_kblocks++;
|
CRYPTOSTAT_INC(cs_kblocks);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2038,7 +2060,7 @@ crypto_proc(void)
|
|||||||
crp_sleep = 0;
|
crp_sleep = 0;
|
||||||
if (cryptoproc == NULL)
|
if (cryptoproc == NULL)
|
||||||
break;
|
break;
|
||||||
cryptostats.cs_intrs++;
|
CRYPTOSTAT_INC(cs_intrs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CRYPTO_Q_UNLOCK();
|
CRYPTO_Q_UNLOCK();
|
||||||
@ -2099,7 +2121,7 @@ crypto_ret_proc(struct crypto_ret_worker *ret_worker)
|
|||||||
"crypto_ret_wait", 0);
|
"crypto_ret_wait", 0);
|
||||||
if (ret_worker->cryptoretproc == NULL)
|
if (ret_worker->cryptoretproc == NULL)
|
||||||
break;
|
break;
|
||||||
cryptostats.cs_rets++;
|
CRYPTOSTAT_INC(cs_rets);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
CRYPTO_RETW_UNLOCK(ret_worker);
|
CRYPTO_RETW_UNLOCK(ret_worker);
|
||||||
|
@ -327,14 +327,14 @@ struct crypt_kop {
|
|||||||
#define CIOCCRYPTAEAD _IOWR('c', 109, struct crypt_aead)
|
#define CIOCCRYPTAEAD _IOWR('c', 109, struct crypt_aead)
|
||||||
|
|
||||||
struct cryptostats {
|
struct cryptostats {
|
||||||
u_int32_t cs_ops; /* symmetric crypto ops submitted */
|
uint64_t cs_ops; /* symmetric crypto ops submitted */
|
||||||
u_int32_t cs_errs; /* symmetric crypto ops that failed */
|
uint64_t cs_errs; /* symmetric crypto ops that failed */
|
||||||
u_int32_t cs_kops; /* asymetric/key ops submitted */
|
uint64_t cs_kops; /* asymetric/key ops submitted */
|
||||||
u_int32_t cs_kerrs; /* asymetric/key ops that failed */
|
uint64_t cs_kerrs; /* asymetric/key ops that failed */
|
||||||
u_int32_t cs_intrs; /* crypto swi thread activations */
|
uint64_t cs_intrs; /* crypto swi thread activations */
|
||||||
u_int32_t cs_rets; /* crypto return thread activations */
|
uint64_t cs_rets; /* crypto return thread activations */
|
||||||
u_int32_t cs_blocks; /* symmetric op driver block */
|
uint64_t cs_blocks; /* symmetric op driver block */
|
||||||
u_int32_t cs_kblocks; /* symmetric op driver block */
|
uint64_t cs_kblocks; /* symmetric op driver block */
|
||||||
};
|
};
|
||||||
|
|
||||||
#ifdef _KERNEL
|
#ifdef _KERNEL
|
||||||
|
Loading…
Reference in New Issue
Block a user