Module Name: src
Committed By: knakahara
Date: Thu Jun 15 12:41:18 UTC 2017
Modified Files:
src/sys/opencrypto: cryptodev.c cryptodev.h
Log Message:
Divide crp_devflags from crp_flags to write exclusively.
CRYPTO_F_DQRETQ(new name is CRYPTODEV_F_RET) is used by cryptodev.c only.
It should be divided to other member.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.36 -r1.37 src/sys/opencrypto/cryptodev.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.94 src/sys/opencrypto/cryptodev.c:1.95
--- src/sys/opencrypto/cryptodev.c:1.94 Thu Jun 8 09:49:46 2017
+++ src/sys/opencrypto/cryptodev.c Thu Jun 15 12:41:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.94 2017/06/08 09:49:46 knakahara Exp $ */
+/* $NetBSD: cryptodev.c,v 1.95 2017/06/15 12:41:18 knakahara Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.94 2017/06/08 09:49:46 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.95 2017/06/15 12:41:18 knakahara Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -689,7 +689,7 @@ eagain:
goto bail;
}
- while (!(crp->crp_flags & CRYPTO_F_DQRETQ)) {
+ while (!(crp->crp_devflags & CRYPTODEV_F_RET)) {
DPRINTF("cse->sid[%d]: sleeping on cv %p for crp %p\n",
(uint32_t)cse->sid, &crp->crp_cv, crp);
cv_wait(&crp->crp_cv, &cryptodev_mtx); /* XXX cv_wait_sig? */
@@ -763,7 +763,7 @@ cryptodev_cb(void *op)
mutex_enter(&cryptodev_mtx);
}
if (error != 0 || (crp->crp_flags & CRYPTO_F_DONE)) {
- crp->crp_flags |= CRYPTO_F_DQRETQ;
+ crp->crp_devflags |= CRYPTODEV_F_RET;
cv_signal(&crp->crp_cv);
}
mutex_exit(&cryptodev_mtx);
@@ -800,7 +800,7 @@ cryptodevkey_cb(void *op)
struct cryptkop *krp = op;
mutex_enter(&cryptodev_mtx);
- krp->krp_flags |= CRYPTO_F_DQRETQ;
+ krp->krp_devflags |= CRYPTODEV_F_RET;
cv_signal(&krp->krp_cv);
mutex_exit(&cryptodev_mtx);
return 0;
@@ -915,7 +915,7 @@ cryptodev_key(struct crypt_kop *kop)
}
mutex_enter(&cryptodev_mtx);
- while (!(krp->krp_flags & CRYPTO_F_DQRETQ)) {
+ while (!(krp->krp_devflags & CRYPTODEV_F_RET)) {
cv_wait(&krp->krp_cv, &cryptodev_mtx); /* XXX cv_wait_sig? */
}
mutex_exit(&cryptodev_mtx);
Index: src/sys/opencrypto/cryptodev.h
diff -u src/sys/opencrypto/cryptodev.h:1.36 src/sys/opencrypto/cryptodev.h:1.37
--- src/sys/opencrypto/cryptodev.h:1.36 Tue Jun 6 01:48:33 2017
+++ src/sys/opencrypto/cryptodev.h Thu Jun 15 12:41:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.h,v 1.36 2017/06/06 01:48:33 knakahara Exp $ */
+/* $NetBSD: cryptodev.h,v 1.37 2017/06/15 12:41:18 knakahara Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $ */
/* $OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $ */
@@ -461,8 +461,10 @@ struct cryptop {
* should always check and use the new
* value on future requests.
*/
- int crp_flags; /* Note: must hold mutext to modify */
-
+ int crp_flags; /*
+ * other than crypto.c must not write
+ * after crypto_dispatch().
+ */
#define CRYPTO_F_IMBUF 0x0001 /* Input/output are mbuf chains */
#define CRYPTO_F_IOV 0x0002 /* Input/output are uio */
#define CRYPTO_F_REL 0x0004 /* Must return data in same place */
@@ -473,7 +475,9 @@ struct cryptop {
#define CRYPTO_F_ONRETQ 0x0080 /* Request is on return queue */
#define CRYPTO_F_USER 0x0100 /* Request is in user context */
#define CRYPTO_F_MORE 0x0200 /* more data to follow */
-#define CRYPTO_F_DQRETQ 0x0400 /* Dequeued from crp_ret_{,k}q */
+
+ int crp_devflags; /* other than cryptodev.c must not use. */
+#define CRYPTODEV_F_RET 0x0001 /* return from crypto.c to cryptodev.c */
void * crp_buf; /* Data to be processed */
void * crp_opaque; /* Opaque pointer, passed along */
@@ -528,6 +532,7 @@ struct cryptkop {
struct crparam krp_param[CRK_MAXPARAM]; /* kvm */
int (*krp_callback)(struct cryptkop *);
int krp_flags; /* same values as crp_flags */
+ int krp_devflags; /* same values as crp_devflags */
kcondvar_t krp_cv;
struct fcrypt *fcrp;
struct crparam crk_param[CRK_MAXPARAM];
