summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/sys
diff options
context:
space:
mode:
authorkrishna <none@none>2007-03-28 17:57:31 -0700
committerkrishna <none@none>2007-03-28 17:57:31 -0700
commitc1a9a9c34efaa6bfab9cee1552b209991ee2c929 (patch)
tree054345f4f7b819fd59921c5d5d43982d1b457e6a /usr/src/uts/common/sys
parent4bd2082ff2d009263265d7de938de336894b6009 (diff)
downloadillumos-gate-c1a9a9c34efaa6bfab9cee1552b209991ee2c929.tar.gz
6533554 crypto_buffer_check() is still expensive
Diffstat (limited to 'usr/src/uts/common/sys')
-rw-r--r--usr/src/uts/common/sys/crypto/impl.h1
-rw-r--r--usr/src/uts/common/sys/proc.h2
-rw-r--r--usr/src/uts/common/sys/project.h4
3 files changed, 5 insertions, 2 deletions
diff --git a/usr/src/uts/common/sys/crypto/impl.h b/usr/src/uts/common/sys/crypto/impl.h
index 43196f3660..c362502c5d 100644
--- a/usr/src/uts/common/sys/crypto/impl.h
+++ b/usr/src/uts/common/sys/crypto/impl.h
@@ -496,7 +496,6 @@ typedef struct crypto_minor {
kcf_provider_desc_t **cm_provider_array;
uint_t cm_provider_count;
crypto_provider_session_t *cm_provider_session;
- kproject_t *cm_projp;
} crypto_minor_t;
/* resource control framework handle used by /dev/crypto */
diff --git a/usr/src/uts/common/sys/proc.h b/usr/src/uts/common/sys/proc.h
index 671761f35e..a6320da055 100644
--- a/usr/src/uts/common/sys/proc.h
+++ b/usr/src/uts/common/sys/proc.h
@@ -343,6 +343,8 @@ typedef struct proc {
kmutex_t p_splock;
rctl_qty_t p_locked_mem; /* locked memory charged to proc */
/* protected by p_lock */
+ rctl_qty_t p_crypto_mem; /* /dev/crypto memory charged to proc */
+ /* protected by p_lock */
} proc_t;
#define PROC_T /* headers relying on proc_t are OK */
diff --git a/usr/src/uts/common/sys/project.h b/usr/src/uts/common/sys/project.h
index 15a0bf2193..53dc2df61d 100644
--- a/usr/src/uts/common/sys/project.h
+++ b/usr/src/uts/common/sys/project.h
@@ -53,7 +53,8 @@ typedef struct kproject_data { /* Datum protected by: */
rctl_qty_t kpd_locked_mem; /* zone_rctl_lock */
rctl_qty_t kpd_locked_mem_ctl; /* kpj_rctls->rcs_lock */
rctl_qty_t kpd_contract; /* contract_lock */
- rctl_qty_t kpd_crypto_mem; /* crypto_rctl_lock */
+ kmutex_t kpd_crypto_lock;
+ rctl_qty_t kpd_crypto_mem; /* kpd_crypto_lock above */
rctl_qty_t kpd_crypto_mem_ctl; /* kpj_rctls->rcs_lock */
kstat_t *kpd_lockedmem_kstat; /* locked memory kstat */
@@ -103,6 +104,7 @@ extern kproject_t *proj0p;
extern rctl_hndl_t rc_project_nlwps;
extern rctl_hndl_t rc_project_ntasks;
extern rctl_hndl_t rc_project_locked_mem;
+extern rctl_hndl_t rc_project_crypto_mem;
#endif /* _KERNEL */
#ifdef __cplusplus