mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-12-18 22:15:46 +01:00
MFS: crypto timing support; purge usercrypto sysctl (just don't config
cryptodev or kldunload cryptodev module); crypto statistcs; remove unused alloctype field from crypto op to offset addition of the performance time stamp Supported by: Vernier Networks
This commit is contained in:
Sam Leffler
parent
e2a3ea1c45
commit
7d1853ee0e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=108587
@ -20,6 +20,7 @@
|
||||
* MERCHANTABILITY OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR
|
||||
* PURPOSE.
|
||||
*/
|
||||
#define CRYPTO_TIMING /* enable timing support */
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
@ -79,10 +80,6 @@ static struct mtx crypto_ret_q_mtx;
|
||||
static uma_zone_t cryptop_zone;
|
||||
static uma_zone_t cryptodesc_zone;
|
||||
|
||||
int crypto_usercrypto = 1; /* userland may open /dev/crypto */
|
||||
SYSCTL_INT(_kern, OID_AUTO, usercrypto, CTLFLAG_RW,
|
||||
&crypto_usercrypto, 0,
|
||||
"Enable/disable user-mode access to crypto support");
|
||||
int crypto_userasymcrypto = 1; /* userland may do asym crypto reqs */
|
||||
SYSCTL_INT(_kern, OID_AUTO, userasymcrypto, CTLFLAG_RW,
|
||||
&crypto_userasymcrypto, 0,
|
||||
@ -94,6 +91,16 @@ SYSCTL_INT(_kern, OID_AUTO, cryptodevallowsoft, CTLFLAG_RW,
|
||||
|
||||
MALLOC_DEFINE(M_CRYPTO_DATA, "crypto", "crypto session records");
|
||||
|
||||
static struct cryptostats cryptostats;
|
||||
SYSCTL_STRUCT(_kern, OID_AUTO, crypto_stats, CTLFLAG_RW, &cryptostats,
|
||||
cryptostats, "Crypto system statistics");
|
||||
|
||||
#ifdef CRYPTO_TIMING
|
||||
static int crypto_timing = 0;
|
||||
SYSCTL_INT(_debug, OID_AUTO, crypto_timing, CTLFLAG_RW,
|
||||
&crypto_timing, 0, "Enable/disable crypto timing support");
|
||||
#endif
|
||||
|
||||
static void
|
||||
crypto_init(void)
|
||||
{
|
||||
@ -558,6 +565,13 @@ crypto_dispatch(struct cryptop *crp)
|
||||
struct cryptocap *cap;
|
||||
int wasempty;
|
||||
|
||||
cryptostats.cs_ops++;
|
||||
|
||||
#ifdef CRYPTO_TIMING
|
||||
if (crypto_timing)
|
||||
binuptime(&crp->crp_tstamp);
|
||||
#endif
|
||||
|
||||
CRYPTO_Q_LOCK();
|
||||
wasempty = TAILQ_EMPTY(&crp_q);
|
||||
TAILQ_INSERT_TAIL(&crp_q, crp, crp_next);
|
||||
@ -583,6 +597,8 @@ crypto_kdispatch(struct cryptkop *krp)
|
||||
struct cryptocap *cap;
|
||||
int wasempty;
|
||||
|
||||
cryptostats.cs_kops++;
|
||||
|
||||
CRYPTO_Q_LOCK();
|
||||
wasempty = TAILQ_EMPTY(&crp_kq);
|
||||
TAILQ_INSERT_TAIL(&crp_kq, krp, krp_next);
|
||||
@ -642,6 +658,32 @@ crypto_kinvoke(struct cryptkop *krp, int hint)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CRYPTO_TIMING
|
||||
static void
|
||||
crypto_tstat(struct cryptotstat *ts, struct bintime *bt)
|
||||
{
|
||||
struct bintime now, delta;
|
||||
struct timespec t;
|
||||
uint64_t u;
|
||||
|
||||
binuptime(&now);
|
||||
u = now.frac;
|
||||
delta.frac = now.frac - bt->frac;
|
||||
delta.sec = now.sec - bt->sec;
|
||||
if (u < delta.frac)
|
||||
delta.sec--;
|
||||
bintime2timespec(&delta, &t);
|
||||
timespecadd(&ts->acc, &t);
|
||||
if (timespeccmp(&t, &ts->min, <))
|
||||
ts->min = t;
|
||||
if (timespeccmp(&t, &ts->max, >))
|
||||
ts->max = t;
|
||||
ts->count++;
|
||||
|
||||
*bt = now;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Dispatch a crypto request to the appropriate crypto devices.
|
||||
*/
|
||||
@ -651,6 +693,10 @@ crypto_invoke(struct cryptop *crp, int hint)
|
||||
u_int32_t hid;
|
||||
int (*process)(void*, struct cryptop *, int);
|
||||
|
||||
#ifdef CRYPTO_TIMING
|
||||
if (crypto_timing)
|
||||
crypto_tstat(&cryptostats.cs_invoke, &crp->crp_tstamp);
|
||||
#endif
|
||||
mtx_assert(&crypto_q_mtx, MA_OWNED);
|
||||
|
||||
/* Sanity checks. */
|
||||
@ -752,6 +798,12 @@ crypto_done(struct cryptop *crp)
|
||||
{
|
||||
int wasempty;
|
||||
|
||||
if (crp->crp_etype != 0)
|
||||
cryptostats.cs_errs++;
|
||||
#ifdef CRYPTO_TIMING
|
||||
if (crypto_timing)
|
||||
crypto_tstat(&cryptostats.cs_done, &crp->crp_tstamp);
|
||||
#endif
|
||||
CRYPTO_RETQ_LOCK();
|
||||
wasempty = TAILQ_EMPTY(&crp_ret_q);
|
||||
TAILQ_INSERT_TAIL(&crp_ret_q, crp, crp_next);
|
||||
@ -769,6 +821,8 @@ crypto_kdone(struct cryptkop *krp)
|
||||
{
|
||||
int wasempty;
|
||||
|
||||
if (krp->krp_status != 0)
|
||||
cryptostats.cs_kerrs++;
|
||||
CRYPTO_RETQ_LOCK();
|
||||
wasempty = TAILQ_EMPTY(&crp_ret_kq);
|
||||
TAILQ_INSERT_TAIL(&crp_ret_kq, krp, krp_next);
|
||||
@ -883,6 +937,7 @@ crypto_proc(void)
|
||||
/* XXX validate sid again? */
|
||||
crypto_drivers[SESID2HID(submit->crp_sid)].cc_qblocked = 1;
|
||||
TAILQ_INSERT_HEAD(&crp_q, submit, crp_next);
|
||||
cryptostats.cs_blocks++;
|
||||
}
|
||||
}
|
||||
|
||||
@ -912,6 +967,7 @@ crypto_proc(void)
|
||||
/* XXX validate sid again? */
|
||||
crypto_drivers[krp->krp_hid].cc_kqblocked = 1;
|
||||
TAILQ_INSERT_HEAD(&crp_kq, krp, krp_next);
|
||||
cryptostats.cs_kblocks++;
|
||||
}
|
||||
}
|
||||
|
||||
@ -929,6 +985,7 @@ crypto_proc(void)
|
||||
* and some become blocked while others do not.
|
||||
*/
|
||||
msleep(&crp_q, &crypto_q_mtx, PWAIT, "crypto_wait", 0);
|
||||
cryptostats.cs_intrs++;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -979,8 +1036,22 @@ crypto_ret_proc(void)
|
||||
/*
|
||||
* Run callbacks unlocked.
|
||||
*/
|
||||
if (crpt != NULL)
|
||||
crpt->crp_callback(crpt);
|
||||
if (crpt != NULL) {
|
||||
#ifdef CRYPTO_TIMING
|
||||
if (crypto_timing) {
|
||||
/*
|
||||
* NB: We must copy the timestamp before
|
||||
* doing the callback as the cryptop is
|
||||
* likely to be reclaimed.
|
||||
*/
|
||||
struct bintime t = crpt->crp_tstamp;
|
||||
crypto_tstat(&cryptostats.cs_cb, &t);
|
||||
crpt->crp_callback(crpt);
|
||||
crypto_tstat(&cryptostats.cs_finis, &t);
|
||||
} else
|
||||
#endif
|
||||
crpt->crp_callback(crpt);
|
||||
}
|
||||
if (krpt != NULL)
|
||||
krpt->krp_callback(krpt);
|
||||
CRYPTO_RETQ_LOCK();
|
||||
@ -991,6 +1062,7 @@ crypto_ret_proc(void)
|
||||
*/
|
||||
msleep(&crp_ret_q, &crypto_ret_q_mtx, PWAIT,
|
||||
"crypto_ret_wait", 0);
|
||||
cryptostats.cs_rets++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -694,8 +694,6 @@ csefree(struct csession *cse)
|
||||
static int
|
||||
cryptoopen(dev_t dev, int oflags, int devtype, struct thread *td)
|
||||
{
|
||||
if (crypto_usercrypto == 0)
|
||||
return (ENXIO);
|
||||
return (0);
|
||||
}
|
||||
|
||||
|
||||
@ -175,6 +175,34 @@ struct crypt_kop {
|
||||
|
||||
#define CIOCASYMFEAT _IOR('c', 105, u_int32_t)
|
||||
|
||||
struct cryptotstat {
|
||||
struct timespec acc; /* total accumulated time */
|
||||
struct timespec min; /* min time */
|
||||
struct timespec max; /* max time */
|
||||
u_int32_t count; /* number of observations */
|
||||
};
|
||||
|
||||
struct cryptostats {
|
||||
u_int32_t cs_ops; /* symmetric crypto ops submitted */
|
||||
u_int32_t cs_errs; /* symmetric crypto ops that failed */
|
||||
u_int32_t cs_kops; /* asymetric/key ops submitted */
|
||||
u_int32_t cs_kerrs; /* asymetric/key ops that failed */
|
||||
u_int32_t cs_intrs; /* crypto swi thread activations */
|
||||
u_int32_t cs_rets; /* crypto return thread activations */
|
||||
u_int32_t cs_blocks; /* symmetric op driver block */
|
||||
u_int32_t cs_kblocks; /* symmetric op driver block */
|
||||
/*
|
||||
* When CRYPTO_TIMING is defined at compile time and the
|
||||
* sysctl debug.crypto is set to 1, the crypto system will
|
||||
* accumulate statistics about how long it takes to process
|
||||
* crypto requests at various points during processing.
|
||||
*/
|
||||
struct cryptotstat cs_invoke; /* crypto_dipsatch -> crypto_invoke */
|
||||
struct cryptotstat cs_done; /* crypto_invoke -> crypto_done */
|
||||
struct cryptotstat cs_cb; /* crypto_done -> callback */
|
||||
struct cryptotstat cs_finis; /* callback -> callback return */
|
||||
};
|
||||
|
||||
#ifdef _KERNEL
|
||||
/* Standard initialization structure beginning */
|
||||
struct cryptoini {
|
||||
@ -217,7 +245,6 @@ struct cryptop {
|
||||
u_int64_t crp_sid; /* Session ID */
|
||||
int crp_ilen; /* Input data total length */
|
||||
int crp_olen; /* Result total length */
|
||||
int crp_alloctype; /* Type of buf to allocate if needed */
|
||||
|
||||
int crp_etype; /*
|
||||
* Error type (zero means no error).
|
||||
@ -243,6 +270,7 @@ struct cryptop {
|
||||
int (*crp_callback)(struct cryptop *); /* Callback function */
|
||||
|
||||
caddr_t crp_mac;
|
||||
struct bintime crp_tstamp; /* performance time stamp */
|
||||
};
|
||||
|
||||
#define CRYPTO_BUF_CONTIG 0x0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user