Use the fpu_kern_enter() interface to properly separate usermode FPU

context from in-kernel execution of padlock instructions and to handle
spurious FPUDNA exceptions that sometime are raised when doing padlock
calculations.

Globally mark crypto(9) kthread as using FPU.

Reviewed by:	pjd
Hardware provided by:	Sentex Communications
Tested by:	  pho
PR:    amd64/135014
MFC after:    1 month

4 files changed, 34 insertions, 3 deletions

diff --git a/sys/crypto/via/padlock.c b/sys/crypto/via/padlock.c
index ccb0595ef6fc..77e059bf1eb2 100644
--- a/sys/crypto/via/padlock.c
+++ b/sys/crypto/via/padlock.c
@@ -169,6 +169,7 @@ padlock_newsession(device_t dev, uint32_t *sidp, struct cryptoini *cri)
 	struct padlock_softc *sc = device_get_softc(dev);
 	struct padlock_session *ses = NULL;
 	struct cryptoini *encini, *macini;
+	struct thread *td;
 	int error;
 
 	if (sidp == NULL || cri == NULL)
@@ -236,7 +237,12 @@ padlock_newsession(device_t dev, uint32_t *sidp, struct cryptoini *cri)
 	}
 
 	if (macini != NULL) {
-		error = padlock_hash_setup(ses, macini);
+		td = curthread;
+		error = fpu_kern_enter(td, &ses->ses_fpu_ctx, FPU_KERN_NORMAL);
+		if (error == 0) {
+			error = padlock_hash_setup(ses, macini);
+			fpu_kern_leave(td, &ses->ses_fpu_ctx);
+		}
 		if (error != 0) {
 			padlock_freesession_one(sc, ses, 0);
 			return (error);
diff --git a/sys/crypto/via/padlock.h b/sys/crypto/via/padlock.h
index 7d928ba1719c..c8ee9bd46153 100644
--- a/sys/crypto/via/padlock.h
+++ b/sys/crypto/via/padlock.h
@@ -32,6 +32,12 @@
 #include <opencrypto/cryptodev.h>
 #include <crypto/rijndael/rijndael.h>
 
+#if defined(__i386__)
+#include <machine/npx.h>
+#elif defined(__amd64__)
+#include <machine/fpu.h>
+#endif
+
 union padlock_cw {
 	uint64_t raw;
 	struct {
@@ -70,6 +76,7 @@ struct padlock_session {
 	int		ses_used;
 	uint32_t	ses_id;
 	TAILQ_ENTRY(padlock_session) ses_next;
+	struct fpu_kern_ctx ses_fpu_ctx;
 };
 
 #define	PADLOCK_ALIGN(p)	(void *)(roundup2((uintptr_t)(p), 16))
diff --git a/sys/crypto/via/padlock_cipher.c b/sys/crypto/via/padlock_cipher.c
index 8195584c71e7..0ae26c8a6985 100644
--- a/sys/crypto/via/padlock_cipher.c
+++ b/sys/crypto/via/padlock_cipher.c
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/module.h>
 #include <sys/malloc.h>
 #include <sys/libkern.h>
+#include <sys/pcpu.h>
 #include <sys/uio.h>
 
 #include <opencrypto/cryptodev.h>
@@ -201,9 +202,10 @@ padlock_cipher_process(struct padlock_session *ses, struct cryptodesc *enccrd,
     struct cryptop *crp)
 {
 	union padlock_cw *cw;
+	struct thread *td;
 	u_char *buf, *abuf;
 	uint32_t *key;
-	int allocated;
+	int allocated, error;
 
 	buf = padlock_cipher_alloc(enccrd, crp, &allocated);
 	if (buf == NULL)
@@ -247,9 +249,16 @@ padlock_cipher_process(struct padlock_session *ses, struct cryptodesc *enccrd,
 		    enccrd->crd_len, abuf);
 	}
 
+	td = curthread;
+	error = fpu_kern_enter(td, &ses->ses_fpu_ctx, FPU_KERN_NORMAL);
+	if (error != 0)
+		goto out;
+
 	padlock_cbc(abuf, abuf, enccrd->crd_len / AES_BLOCK_LEN, key, cw,
 	    ses->ses_iv);
 
+	fpu_kern_leave(td, &ses->ses_fpu_ctx);
+
 	if (allocated) {
 		crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip,
 		    enccrd->crd_len, abuf);
@@ -262,9 +271,10 @@ padlock_cipher_process(struct padlock_session *ses, struct cryptodesc *enccrd,
 		    AES_BLOCK_LEN, ses->ses_iv);
 	}
 
+ out:
 	if (allocated) {
 		bzero(buf, enccrd->crd_len + 16);
 		free(buf, M_PADLOCK);
 	}
-	return (0);
+	return (error);
 }
diff --git a/sys/crypto/via/padlock_hash.c b/sys/crypto/via/padlock_hash.c
index 71f956e52908..58c58b2243fc 100644
--- a/sys/crypto/via/padlock_hash.c
+++ b/sys/crypto/via/padlock_hash.c
@@ -34,12 +34,14 @@ __FBSDID("$FreeBSD$");
 #include <sys/malloc.h>
 #include <sys/libkern.h>
 #include <sys/endian.h>
+#include <sys/pcpu.h>
 #if defined(__amd64__) || (defined(__i386__) && !defined(PC98))
 #include <machine/cpufunc.h>
 #include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 #endif
+#include <machine/pcb.h>
 
 #include <opencrypto/cryptodev.h>
 #include <opencrypto/cryptosoft.h> /* for hmac_ipad_buffer and hmac_opad_buffer */
@@ -363,12 +365,18 @@ int
 padlock_hash_process(struct padlock_session *ses, struct cryptodesc *maccrd,
     struct cryptop *crp)
 {
+	struct thread *td;
 	int error;
 
+	td = curthread;
+	error = fpu_kern_enter(td, &ses->ses_fpu_ctx, FPU_KERN_NORMAL);
+	if (error != 0)
+		return (error);
 	if ((maccrd->crd_flags & CRD_F_KEY_EXPLICIT) != 0)
 		padlock_hash_key_setup(ses, maccrd->crd_key, maccrd->crd_klen);
 
 	error = padlock_authcompute(ses, maccrd, crp->crp_buf, crp->crp_flags);
+	fpu_kern_leave(td, &ses->ses_fpu_ctx);
 	return (error);
 }