1*59c8e88eSDag-Erling Smørgrav--- test021.left.txt 2*59c8e88eSDag-Erling Smørgrav+++ test021.right.txt 3*59c8e88eSDag-Erling Smørgrav@@ -1,4 +1,4 @@ 4*59c8e88eSDag-Erling Smørgrav-/* $OpenBSD: softraid_crypto.c,v 1.91 2013/03/31 15:44:52 jsing Exp $ */ 5*59c8e88eSDag-Erling Smørgrav+/* $OpenBSD: softraid_crypto.c,v 1.139 2020/07/13 00:06:22 kn Exp $ */ 6*59c8e88eSDag-Erling Smørgrav /* 7*59c8e88eSDag-Erling Smørgrav * Copyright (c) 2007 Marco Peereboom <marco@peereboom.us> 8*59c8e88eSDag-Erling Smørgrav * Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org> 9*59c8e88eSDag-Erling Smørgrav@@ -25,7 +25,6 @@ 10*59c8e88eSDag-Erling Smørgrav #include <sys/buf.h> 11*59c8e88eSDag-Erling Smørgrav #include <sys/device.h> 12*59c8e88eSDag-Erling Smørgrav #include <sys/ioctl.h> 13*59c8e88eSDag-Erling Smørgrav-#include <sys/proc.h> 14*59c8e88eSDag-Erling Smørgrav #include <sys/malloc.h> 15*59c8e88eSDag-Erling Smørgrav #include <sys/pool.h> 16*59c8e88eSDag-Erling Smørgrav #include <sys/kernel.h> 17*59c8e88eSDag-Erling Smørgrav@@ -34,6 +33,7 @@ 18*59c8e88eSDag-Erling Smørgrav #include <sys/queue.h> 19*59c8e88eSDag-Erling Smørgrav #include <sys/fcntl.h> 20*59c8e88eSDag-Erling Smørgrav #include <sys/disklabel.h> 21*59c8e88eSDag-Erling Smørgrav+#include <sys/vnode.h> 22*59c8e88eSDag-Erling Smørgrav #include <sys/mount.h> 23*59c8e88eSDag-Erling Smørgrav #include <sys/sensors.h> 24*59c8e88eSDag-Erling Smørgrav #include <sys/stat.h> 25*59c8e88eSDag-Erling Smørgrav@@ -42,7 +42,6 @@ 26*59c8e88eSDag-Erling Smørgrav #include <sys/dkio.h> 27*59c8e88eSDag-Erling Smørgrav 28*59c8e88eSDag-Erling Smørgrav #include <crypto/cryptodev.h> 29*59c8e88eSDag-Erling Smørgrav-#include <crypto/cryptosoft.h> 30*59c8e88eSDag-Erling Smørgrav #include <crypto/rijndael.h> 31*59c8e88eSDag-Erling Smørgrav #include <crypto/md5.h> 32*59c8e88eSDag-Erling Smørgrav #include <crypto/sha1.h> 33*59c8e88eSDag-Erling Smørgrav@@ -54,7 +53,6 @@ 34*59c8e88eSDag-Erling Smørgrav #include <scsi/scsi_disk.h> 35*59c8e88eSDag-Erling Smørgrav 36*59c8e88eSDag-Erling Smørgrav #include <dev/softraidvar.h> 37*59c8e88eSDag-Erling Smørgrav-#include <dev/rndvar.h> 38*59c8e88eSDag-Erling Smørgrav 39*59c8e88eSDag-Erling Smørgrav /* 40*59c8e88eSDag-Erling Smørgrav * The per-I/O data that we need to preallocate. We cannot afford to allow I/O 41*59c8e88eSDag-Erling Smørgrav@@ -62,18 +60,15 @@ 42*59c8e88eSDag-Erling Smørgrav * because we assert that only one ccb per WU will ever be active. 43*59c8e88eSDag-Erling Smørgrav */ 44*59c8e88eSDag-Erling Smørgrav struct sr_crypto_wu { 45*59c8e88eSDag-Erling Smørgrav- TAILQ_ENTRY(sr_crypto_wu) cr_link; 46*59c8e88eSDag-Erling Smørgrav+ struct sr_workunit cr_wu; /* Must be first. */ 47*59c8e88eSDag-Erling Smørgrav struct uio cr_uio; 48*59c8e88eSDag-Erling Smørgrav struct iovec cr_iov; 49*59c8e88eSDag-Erling Smørgrav struct cryptop *cr_crp; 50*59c8e88eSDag-Erling Smørgrav- struct cryptodesc *cr_descs; 51*59c8e88eSDag-Erling Smørgrav- struct sr_workunit *cr_wu; 52*59c8e88eSDag-Erling Smørgrav void *cr_dmabuf; 53*59c8e88eSDag-Erling Smørgrav }; 54*59c8e88eSDag-Erling Smørgrav 55*59c8e88eSDag-Erling Smørgrav 56*59c8e88eSDag-Erling Smørgrav-struct sr_crypto_wu *sr_crypto_wu_get(struct sr_workunit *, int); 57*59c8e88eSDag-Erling Smørgrav-void sr_crypto_wu_put(struct sr_crypto_wu *); 58*59c8e88eSDag-Erling Smørgrav+struct sr_crypto_wu *sr_crypto_prepare(struct sr_workunit *, int); 59*59c8e88eSDag-Erling Smørgrav int sr_crypto_create_keys(struct sr_discipline *); 60*59c8e88eSDag-Erling Smørgrav int sr_crypto_get_kdf(struct bioc_createraid *, 61*59c8e88eSDag-Erling Smørgrav struct sr_discipline *); 62*59c8e88eSDag-Erling Smørgrav@@ -92,12 +87,11 @@ 63*59c8e88eSDag-Erling Smørgrav struct bioc_discipline *); 64*59c8e88eSDag-Erling Smørgrav int sr_crypto_meta_opt_handler(struct sr_discipline *, 65*59c8e88eSDag-Erling Smørgrav struct sr_meta_opt_hdr *); 66*59c8e88eSDag-Erling Smørgrav-int sr_crypto_write(struct cryptop *); 67*59c8e88eSDag-Erling Smørgrav+void sr_crypto_write(struct cryptop *); 68*59c8e88eSDag-Erling Smørgrav int sr_crypto_rw(struct sr_workunit *); 69*59c8e88eSDag-Erling Smørgrav-int sr_crypto_rw2(struct sr_workunit *, struct sr_crypto_wu *); 70*59c8e88eSDag-Erling Smørgrav+int sr_crypto_dev_rw(struct sr_workunit *, struct sr_crypto_wu *); 71*59c8e88eSDag-Erling Smørgrav void sr_crypto_done(struct sr_workunit *); 72*59c8e88eSDag-Erling Smørgrav-int sr_crypto_read(struct cryptop *); 73*59c8e88eSDag-Erling Smørgrav-void sr_crypto_finish_io(struct sr_workunit *); 74*59c8e88eSDag-Erling Smørgrav+void sr_crypto_read(struct cryptop *); 75*59c8e88eSDag-Erling Smørgrav void sr_crypto_calculate_check_hmac_sha1(u_int8_t *, int, 76*59c8e88eSDag-Erling Smørgrav u_int8_t *, int, u_char *); 77*59c8e88eSDag-Erling Smørgrav void sr_crypto_hotplug(struct sr_discipline *, struct disk *, int); 78*59c8e88eSDag-Erling Smørgrav@@ -113,6 +107,7 @@ 79*59c8e88eSDag-Erling Smørgrav int i; 80*59c8e88eSDag-Erling Smørgrav 81*59c8e88eSDag-Erling Smørgrav /* Fill out discipline members. */ 82*59c8e88eSDag-Erling Smørgrav+ sd->sd_wu_size = sizeof(struct sr_crypto_wu); 83*59c8e88eSDag-Erling Smørgrav sd->sd_type = SR_MD_CRYPTO; 84*59c8e88eSDag-Erling Smørgrav strlcpy(sd->sd_name, "CRYPTO", sizeof(sd->sd_name)); 85*59c8e88eSDag-Erling Smørgrav sd->sd_capabilities = SR_CAP_SYSTEM_DISK | SR_CAP_AUTO_ASSEMBLE; 86*59c8e88eSDag-Erling Smørgrav@@ -143,8 +138,14 @@ 87*59c8e88eSDag-Erling Smørgrav sr_error(sd->sd_sc, "%s requires exactly one chunk", 88*59c8e88eSDag-Erling Smørgrav sd->sd_name); 89*59c8e88eSDag-Erling Smørgrav goto done; 90*59c8e88eSDag-Erling Smørgrav- } 91*59c8e88eSDag-Erling Smørgrav+ } 92*59c8e88eSDag-Erling Smørgrav 93*59c8e88eSDag-Erling Smørgrav+ if (coerced_size > SR_CRYPTO_MAXSIZE) { 94*59c8e88eSDag-Erling Smørgrav+ sr_error(sd->sd_sc, "%s exceeds maximum size (%lli > %llu)", 95*59c8e88eSDag-Erling Smørgrav+ sd->sd_name, coerced_size, SR_CRYPTO_MAXSIZE); 96*59c8e88eSDag-Erling Smørgrav+ goto done; 97*59c8e88eSDag-Erling Smørgrav+ } 98*59c8e88eSDag-Erling Smørgrav+ 99*59c8e88eSDag-Erling Smørgrav /* Create crypto optional metadata. */ 100*59c8e88eSDag-Erling Smørgrav omi = malloc(sizeof(struct sr_meta_opt_item), M_DEVBUF, 101*59c8e88eSDag-Erling Smørgrav M_WAITOK | M_ZERO); 102*59c8e88eSDag-Erling Smørgrav@@ -208,7 +209,7 @@ 103*59c8e88eSDag-Erling Smørgrav 104*59c8e88eSDag-Erling Smørgrav if (data != NULL) { 105*59c8e88eSDag-Erling Smørgrav /* Kernel already has mask key. */ 106*59c8e88eSDag-Erling Smørgrav- bcopy(data, sd->mds.mdd_crypto.scr_maskkey, 107*59c8e88eSDag-Erling Smørgrav+ memcpy(sd->mds.mdd_crypto.scr_maskkey, data, 108*59c8e88eSDag-Erling Smørgrav sizeof(sd->mds.mdd_crypto.scr_maskkey)); 109*59c8e88eSDag-Erling Smørgrav } else if (bc->bc_key_disk != NODEV) { 110*59c8e88eSDag-Erling Smørgrav /* Read the mask key from the key disk. */ 111*59c8e88eSDag-Erling Smørgrav@@ -248,117 +249,69 @@ 112*59c8e88eSDag-Erling Smørgrav } 113*59c8e88eSDag-Erling Smørgrav 114*59c8e88eSDag-Erling Smørgrav struct sr_crypto_wu * 115*59c8e88eSDag-Erling Smørgrav-sr_crypto_wu_get(struct sr_workunit *wu, int encrypt) 116*59c8e88eSDag-Erling Smørgrav+sr_crypto_prepare(struct sr_workunit *wu, int encrypt) 117*59c8e88eSDag-Erling Smørgrav { 118*59c8e88eSDag-Erling Smørgrav struct scsi_xfer *xs = wu->swu_xs; 119*59c8e88eSDag-Erling Smørgrav struct sr_discipline *sd = wu->swu_dis; 120*59c8e88eSDag-Erling Smørgrav struct sr_crypto_wu *crwu; 121*59c8e88eSDag-Erling Smørgrav struct cryptodesc *crd; 122*59c8e88eSDag-Erling Smørgrav int flags, i, n; 123*59c8e88eSDag-Erling Smørgrav- daddr64_t blk = 0; 124*59c8e88eSDag-Erling Smørgrav+ daddr_t blkno; 125*59c8e88eSDag-Erling Smørgrav u_int keyndx; 126*59c8e88eSDag-Erling Smørgrav 127*59c8e88eSDag-Erling Smørgrav- DNPRINTF(SR_D_DIS, "%s: sr_crypto_wu_get wu: %p encrypt: %d\n", 128*59c8e88eSDag-Erling Smørgrav+ DNPRINTF(SR_D_DIS, "%s: sr_crypto_prepare wu %p encrypt %d\n", 129*59c8e88eSDag-Erling Smørgrav DEVNAME(sd->sd_sc), wu, encrypt); 130*59c8e88eSDag-Erling Smørgrav 131*59c8e88eSDag-Erling Smørgrav- mtx_enter(&sd->mds.mdd_crypto.scr_mutex); 132*59c8e88eSDag-Erling Smørgrav- if ((crwu = TAILQ_FIRST(&sd->mds.mdd_crypto.scr_wus)) != NULL) 133*59c8e88eSDag-Erling Smørgrav- TAILQ_REMOVE(&sd->mds.mdd_crypto.scr_wus, crwu, cr_link); 134*59c8e88eSDag-Erling Smørgrav- mtx_leave(&sd->mds.mdd_crypto.scr_mutex); 135*59c8e88eSDag-Erling Smørgrav- if (crwu == NULL) 136*59c8e88eSDag-Erling Smørgrav- panic("sr_crypto_wu_get: out of wus"); 137*59c8e88eSDag-Erling Smørgrav- 138*59c8e88eSDag-Erling Smørgrav+ crwu = (struct sr_crypto_wu *)wu; 139*59c8e88eSDag-Erling Smørgrav crwu->cr_uio.uio_iovcnt = 1; 140*59c8e88eSDag-Erling Smørgrav crwu->cr_uio.uio_iov->iov_len = xs->datalen; 141*59c8e88eSDag-Erling Smørgrav if (xs->flags & SCSI_DATA_OUT) { 142*59c8e88eSDag-Erling Smørgrav crwu->cr_uio.uio_iov->iov_base = crwu->cr_dmabuf; 143*59c8e88eSDag-Erling Smørgrav- bcopy(xs->data, crwu->cr_uio.uio_iov->iov_base, xs->datalen); 144*59c8e88eSDag-Erling Smørgrav+ memcpy(crwu->cr_uio.uio_iov->iov_base, xs->data, xs->datalen); 145*59c8e88eSDag-Erling Smørgrav } else 146*59c8e88eSDag-Erling Smørgrav crwu->cr_uio.uio_iov->iov_base = xs->data; 147*59c8e88eSDag-Erling Smørgrav 148*59c8e88eSDag-Erling Smørgrav- if (xs->cmdlen == 10) 149*59c8e88eSDag-Erling Smørgrav- blk = _4btol(((struct scsi_rw_big *)xs->cmd)->addr); 150*59c8e88eSDag-Erling Smørgrav- else if (xs->cmdlen == 16) 151*59c8e88eSDag-Erling Smørgrav- blk = _8btol(((struct scsi_rw_16 *)xs->cmd)->addr); 152*59c8e88eSDag-Erling Smørgrav- else if (xs->cmdlen == 6) 153*59c8e88eSDag-Erling Smørgrav- blk = _3btol(((struct scsi_rw *)xs->cmd)->addr); 154*59c8e88eSDag-Erling Smørgrav- 155*59c8e88eSDag-Erling Smørgrav+ blkno = wu->swu_blk_start; 156*59c8e88eSDag-Erling Smørgrav n = xs->datalen >> DEV_BSHIFT; 157*59c8e88eSDag-Erling Smørgrav 158*59c8e88eSDag-Erling Smørgrav /* 159*59c8e88eSDag-Erling Smørgrav * We preallocated enough crypto descs for up to MAXPHYS of I/O. 160*59c8e88eSDag-Erling Smørgrav- * Since there may be less than that we need to tweak the linked list 161*59c8e88eSDag-Erling Smørgrav+ * Since there may be less than that we need to tweak the amount 162*59c8e88eSDag-Erling Smørgrav * of crypto desc structures to be just long enough for our needs. 163*59c8e88eSDag-Erling Smørgrav */ 164*59c8e88eSDag-Erling Smørgrav- crd = crwu->cr_descs; 165*59c8e88eSDag-Erling Smørgrav- for (i = 0; i < ((MAXPHYS >> DEV_BSHIFT) - n); i++) { 166*59c8e88eSDag-Erling Smørgrav- crd = crd->crd_next; 167*59c8e88eSDag-Erling Smørgrav- KASSERT(crd); 168*59c8e88eSDag-Erling Smørgrav- } 169*59c8e88eSDag-Erling Smørgrav- crwu->cr_crp->crp_desc = crd; 170*59c8e88eSDag-Erling Smørgrav+ KASSERT(crwu->cr_crp->crp_ndescalloc >= n); 171*59c8e88eSDag-Erling Smørgrav+ crwu->cr_crp->crp_ndesc = n; 172*59c8e88eSDag-Erling Smørgrav flags = (encrypt ? CRD_F_ENCRYPT : 0) | 173*59c8e88eSDag-Erling Smørgrav CRD_F_IV_PRESENT | CRD_F_IV_EXPLICIT; 174*59c8e88eSDag-Erling Smørgrav 175*59c8e88eSDag-Erling Smørgrav- /* Select crypto session based on block number */ 176*59c8e88eSDag-Erling Smørgrav- keyndx = blk >> SR_CRYPTO_KEY_BLKSHIFT; 177*59c8e88eSDag-Erling Smørgrav- if (keyndx >= SR_CRYPTO_MAXKEYS) 178*59c8e88eSDag-Erling Smørgrav- goto unwind; 179*59c8e88eSDag-Erling Smørgrav+ /* 180*59c8e88eSDag-Erling Smørgrav+ * Select crypto session based on block number. 181*59c8e88eSDag-Erling Smørgrav+ * 182*59c8e88eSDag-Erling Smørgrav+ * XXX - this does not handle the case where the read/write spans 183*59c8e88eSDag-Erling Smørgrav+ * across a different key blocks (e.g. 0.5TB boundary). Currently 184*59c8e88eSDag-Erling Smørgrav+ * this is already broken by the use of scr_key[0] below. 185*59c8e88eSDag-Erling Smørgrav+ */ 186*59c8e88eSDag-Erling Smørgrav+ keyndx = blkno >> SR_CRYPTO_KEY_BLKSHIFT; 187*59c8e88eSDag-Erling Smørgrav crwu->cr_crp->crp_sid = sd->mds.mdd_crypto.scr_sid[keyndx]; 188*59c8e88eSDag-Erling Smørgrav- if (crwu->cr_crp->crp_sid == (u_int64_t)-1) 189*59c8e88eSDag-Erling Smørgrav- goto unwind; 190*59c8e88eSDag-Erling Smørgrav 191*59c8e88eSDag-Erling Smørgrav+ crwu->cr_crp->crp_opaque = crwu; 192*59c8e88eSDag-Erling Smørgrav crwu->cr_crp->crp_ilen = xs->datalen; 193*59c8e88eSDag-Erling Smørgrav crwu->cr_crp->crp_alloctype = M_DEVBUF; 194*59c8e88eSDag-Erling Smørgrav+ crwu->cr_crp->crp_flags = CRYPTO_F_IOV | CRYPTO_F_NOQUEUE; 195*59c8e88eSDag-Erling Smørgrav crwu->cr_crp->crp_buf = &crwu->cr_uio; 196*59c8e88eSDag-Erling Smørgrav- for (i = 0, crd = crwu->cr_crp->crp_desc; crd; 197*59c8e88eSDag-Erling Smørgrav- i++, blk++, crd = crd->crd_next) { 198*59c8e88eSDag-Erling Smørgrav+ for (i = 0; i < crwu->cr_crp->crp_ndesc; i++, blkno++) { 199*59c8e88eSDag-Erling Smørgrav+ crd = &crwu->cr_crp->crp_desc[i]; 200*59c8e88eSDag-Erling Smørgrav crd->crd_skip = i << DEV_BSHIFT; 201*59c8e88eSDag-Erling Smørgrav crd->crd_len = DEV_BSIZE; 202*59c8e88eSDag-Erling Smørgrav crd->crd_inject = 0; 203*59c8e88eSDag-Erling Smørgrav crd->crd_flags = flags; 204*59c8e88eSDag-Erling Smørgrav- crd->crd_alg = CRYPTO_AES_XTS; 205*59c8e88eSDag-Erling Smørgrav- 206*59c8e88eSDag-Erling Smørgrav- switch (sd->mds.mdd_crypto.scr_meta->scm_alg) { 207*59c8e88eSDag-Erling Smørgrav- case SR_CRYPTOA_AES_XTS_128: 208*59c8e88eSDag-Erling Smørgrav- crd->crd_klen = 256; 209*59c8e88eSDag-Erling Smørgrav- break; 210*59c8e88eSDag-Erling Smørgrav- case SR_CRYPTOA_AES_XTS_256: 211*59c8e88eSDag-Erling Smørgrav- crd->crd_klen = 512; 212*59c8e88eSDag-Erling Smørgrav- break; 213*59c8e88eSDag-Erling Smørgrav- default: 214*59c8e88eSDag-Erling Smørgrav- goto unwind; 215*59c8e88eSDag-Erling Smørgrav- } 216*59c8e88eSDag-Erling Smørgrav+ crd->crd_alg = sd->mds.mdd_crypto.scr_alg; 217*59c8e88eSDag-Erling Smørgrav+ crd->crd_klen = sd->mds.mdd_crypto.scr_klen; 218*59c8e88eSDag-Erling Smørgrav crd->crd_key = sd->mds.mdd_crypto.scr_key[0]; 219*59c8e88eSDag-Erling Smørgrav- bcopy(&blk, crd->crd_iv, sizeof(blk)); 220*59c8e88eSDag-Erling Smørgrav+ memcpy(crd->crd_iv, &blkno, sizeof(blkno)); 221*59c8e88eSDag-Erling Smørgrav } 222*59c8e88eSDag-Erling Smørgrav- crwu->cr_wu = wu; 223*59c8e88eSDag-Erling Smørgrav- crwu->cr_crp->crp_opaque = crwu; 224*59c8e88eSDag-Erling Smørgrav 225*59c8e88eSDag-Erling Smørgrav return (crwu); 226*59c8e88eSDag-Erling Smørgrav- 227*59c8e88eSDag-Erling Smørgrav-unwind: 228*59c8e88eSDag-Erling Smørgrav- /* steal the descriptors back from the cryptop */ 229*59c8e88eSDag-Erling Smørgrav- crwu->cr_crp->crp_desc = NULL; 230*59c8e88eSDag-Erling Smørgrav- 231*59c8e88eSDag-Erling Smørgrav- return (NULL); 232*59c8e88eSDag-Erling Smørgrav-} 233*59c8e88eSDag-Erling Smørgrav- 234*59c8e88eSDag-Erling Smørgrav-void 235*59c8e88eSDag-Erling Smørgrav-sr_crypto_wu_put(struct sr_crypto_wu *crwu) 236*59c8e88eSDag-Erling Smørgrav-{ 237*59c8e88eSDag-Erling Smørgrav- struct cryptop *crp = crwu->cr_crp; 238*59c8e88eSDag-Erling Smørgrav- struct sr_workunit *wu = crwu->cr_wu; 239*59c8e88eSDag-Erling Smørgrav- struct sr_discipline *sd = wu->swu_dis; 240*59c8e88eSDag-Erling Smørgrav- 241*59c8e88eSDag-Erling Smørgrav- DNPRINTF(SR_D_DIS, "%s: sr_crypto_wu_put crwu: %p\n", 242*59c8e88eSDag-Erling Smørgrav- DEVNAME(wu->swu_dis->sd_sc), crwu); 243*59c8e88eSDag-Erling Smørgrav- 244*59c8e88eSDag-Erling Smørgrav- /* steal the descriptors back from the cryptop */ 245*59c8e88eSDag-Erling Smørgrav- crp->crp_desc = NULL; 246*59c8e88eSDag-Erling Smørgrav- 247*59c8e88eSDag-Erling Smørgrav- mtx_enter(&sd->mds.mdd_crypto.scr_mutex); 248*59c8e88eSDag-Erling Smørgrav- TAILQ_INSERT_TAIL(&sd->mds.mdd_crypto.scr_wus, crwu, cr_link); 249*59c8e88eSDag-Erling Smørgrav- mtx_leave(&sd->mds.mdd_crypto.scr_mutex); 250*59c8e88eSDag-Erling Smørgrav } 251*59c8e88eSDag-Erling Smørgrav 252*59c8e88eSDag-Erling Smørgrav int 253*59c8e88eSDag-Erling Smørgrav@@ -386,9 +339,8 @@ 254*59c8e88eSDag-Erling Smørgrav if (sizeof(sd->mds.mdd_crypto.scr_meta->scm_kdfhint) < 255*59c8e88eSDag-Erling Smørgrav kdfinfo->genkdf.len) 256*59c8e88eSDag-Erling Smørgrav goto out; 257*59c8e88eSDag-Erling Smørgrav- bcopy(&kdfinfo->genkdf, 258*59c8e88eSDag-Erling Smørgrav- sd->mds.mdd_crypto.scr_meta->scm_kdfhint, 259*59c8e88eSDag-Erling Smørgrav- kdfinfo->genkdf.len); 260*59c8e88eSDag-Erling Smørgrav+ memcpy(sd->mds.mdd_crypto.scr_meta->scm_kdfhint, 261*59c8e88eSDag-Erling Smørgrav+ &kdfinfo->genkdf, kdfinfo->genkdf.len); 262*59c8e88eSDag-Erling Smørgrav } 263*59c8e88eSDag-Erling Smørgrav 264*59c8e88eSDag-Erling Smørgrav /* copy mask key to run-time meta data */ 265*59c8e88eSDag-Erling Smørgrav@@ -396,7 +348,7 @@ 266*59c8e88eSDag-Erling Smørgrav if (sizeof(sd->mds.mdd_crypto.scr_maskkey) < 267*59c8e88eSDag-Erling Smørgrav sizeof(kdfinfo->maskkey)) 268*59c8e88eSDag-Erling Smørgrav goto out; 269*59c8e88eSDag-Erling Smørgrav- bcopy(&kdfinfo->maskkey, sd->mds.mdd_crypto.scr_maskkey, 270*59c8e88eSDag-Erling Smørgrav+ memcpy(sd->mds.mdd_crypto.scr_maskkey, &kdfinfo->maskkey, 271*59c8e88eSDag-Erling Smørgrav sizeof(kdfinfo->maskkey)); 272*59c8e88eSDag-Erling Smørgrav } 273*59c8e88eSDag-Erling Smørgrav 274*59c8e88eSDag-Erling Smørgrav@@ -404,7 +356,7 @@ 275*59c8e88eSDag-Erling Smørgrav rv = 0; 276*59c8e88eSDag-Erling Smørgrav out: 277*59c8e88eSDag-Erling Smørgrav explicit_bzero(kdfinfo, bc->bc_opaque_size); 278*59c8e88eSDag-Erling Smørgrav- free(kdfinfo, M_DEVBUF); 279*59c8e88eSDag-Erling Smørgrav+ free(kdfinfo, M_DEVBUF, bc->bc_opaque_size); 280*59c8e88eSDag-Erling Smørgrav 281*59c8e88eSDag-Erling Smørgrav return (rv); 282*59c8e88eSDag-Erling Smørgrav } 283*59c8e88eSDag-Erling Smørgrav@@ -424,7 +376,7 @@ 284*59c8e88eSDag-Erling Smørgrav rv = 0; 285*59c8e88eSDag-Erling Smørgrav break; 286*59c8e88eSDag-Erling Smørgrav default: 287*59c8e88eSDag-Erling Smørgrav- DNPRINTF(SR_D_DIS, "%s: unsupported encryption algorithm %u\n", 288*59c8e88eSDag-Erling Smørgrav+ DNPRINTF(SR_D_DIS, "%s: unsupported encryption algorithm %d\n", 289*59c8e88eSDag-Erling Smørgrav "softraid", alg); 290*59c8e88eSDag-Erling Smørgrav rv = -1; 291*59c8e88eSDag-Erling Smørgrav goto out; 292*59c8e88eSDag-Erling Smørgrav@@ -450,7 +402,7 @@ 293*59c8e88eSDag-Erling Smørgrav rv = 0; 294*59c8e88eSDag-Erling Smørgrav break; 295*59c8e88eSDag-Erling Smørgrav default: 296*59c8e88eSDag-Erling Smørgrav- DNPRINTF(SR_D_DIS, "%s: unsupported encryption algorithm %u\n", 297*59c8e88eSDag-Erling Smørgrav+ DNPRINTF(SR_D_DIS, "%s: unsupported encryption algorithm %d\n", 298*59c8e88eSDag-Erling Smørgrav "softraid", alg); 299*59c8e88eSDag-Erling Smørgrav rv = -1; 300*59c8e88eSDag-Erling Smørgrav goto out; 301*59c8e88eSDag-Erling Smørgrav@@ -615,6 +567,17 @@ 302*59c8e88eSDag-Erling Smørgrav sr_error(sd->sd_sc, "incorrect key or passphrase"); 303*59c8e88eSDag-Erling Smørgrav rv = EPERM; 304*59c8e88eSDag-Erling Smørgrav goto out; 305*59c8e88eSDag-Erling Smørgrav+ } 306*59c8e88eSDag-Erling Smørgrav+ 307*59c8e88eSDag-Erling Smørgrav+ /* Copy new KDF hint to metadata, if supplied. */ 308*59c8e88eSDag-Erling Smørgrav+ if (kdfinfo2->flags & SR_CRYPTOKDF_HINT) { 309*59c8e88eSDag-Erling Smørgrav+ if (kdfinfo2->genkdf.len > 310*59c8e88eSDag-Erling Smørgrav+ sizeof(sd->mds.mdd_crypto.scr_meta->scm_kdfhint)) 311*59c8e88eSDag-Erling Smørgrav+ goto out; 312*59c8e88eSDag-Erling Smørgrav+ explicit_bzero(sd->mds.mdd_crypto.scr_meta->scm_kdfhint, 313*59c8e88eSDag-Erling Smørgrav+ sizeof(sd->mds.mdd_crypto.scr_meta->scm_kdfhint)); 314*59c8e88eSDag-Erling Smørgrav+ memcpy(sd->mds.mdd_crypto.scr_meta->scm_kdfhint, 315*59c8e88eSDag-Erling Smørgrav+ &kdfinfo2->genkdf, kdfinfo2->genkdf.len); 316*59c8e88eSDag-Erling Smørgrav } 317*59c8e88eSDag-Erling Smørgrav 318*59c8e88eSDag-Erling Smørgrav /* Mask the disk keys. */ 319*59c8e88eSDag-Erling Smørgrav@@ -630,7 +593,7 @@ 320*59c8e88eSDag-Erling Smørgrav sizeof(sd->mds.mdd_crypto.scr_key), check_digest); 321*59c8e88eSDag-Erling Smørgrav 322*59c8e88eSDag-Erling Smørgrav /* Copy new encrypted key and HMAC to metadata. */ 323*59c8e88eSDag-Erling Smørgrav- bcopy(check_digest, sd->mds.mdd_crypto.scr_meta->chk_hmac_sha1.sch_mac, 324*59c8e88eSDag-Erling Smørgrav+ memcpy(sd->mds.mdd_crypto.scr_meta->chk_hmac_sha1.sch_mac, check_digest, 325*59c8e88eSDag-Erling Smørgrav sizeof(sd->mds.mdd_crypto.scr_meta->chk_hmac_sha1.sch_mac)); 326*59c8e88eSDag-Erling Smørgrav 327*59c8e88eSDag-Erling Smørgrav rv = 0; /* Success */ 328*59c8e88eSDag-Erling Smørgrav@@ -638,7 +601,7 @@ 329*59c8e88eSDag-Erling Smørgrav out: 330*59c8e88eSDag-Erling Smørgrav if (p) { 331*59c8e88eSDag-Erling Smørgrav explicit_bzero(p, ksz); 332*59c8e88eSDag-Erling Smørgrav- free(p, M_DEVBUF); 333*59c8e88eSDag-Erling Smørgrav+ free(p, M_DEVBUF, ksz); 334*59c8e88eSDag-Erling Smørgrav } 335*59c8e88eSDag-Erling Smørgrav 336*59c8e88eSDag-Erling Smørgrav explicit_bzero(check_digest, sizeof(check_digest)); 337*59c8e88eSDag-Erling Smørgrav@@ -686,7 +649,7 @@ 338*59c8e88eSDag-Erling Smørgrav DNPRINTF(SR_D_META,"%s: sr_crypto_create_key_disk cannot " 339*59c8e88eSDag-Erling Smørgrav "open %s\n", DEVNAME(sc), devname); 340*59c8e88eSDag-Erling Smørgrav vput(vn); 341*59c8e88eSDag-Erling Smørgrav- goto fail; 342*59c8e88eSDag-Erling Smørgrav+ goto done; 343*59c8e88eSDag-Erling Smørgrav } 344*59c8e88eSDag-Erling Smørgrav open = 1; /* close dev on error */ 345*59c8e88eSDag-Erling Smørgrav 346*59c8e88eSDag-Erling Smørgrav@@ -696,19 +659,12 @@ 347*59c8e88eSDag-Erling Smørgrav FREAD, NOCRED, curproc)) { 348*59c8e88eSDag-Erling Smørgrav DNPRINTF(SR_D_META, "%s: sr_crypto_create_key_disk ioctl " 349*59c8e88eSDag-Erling Smørgrav "failed\n", DEVNAME(sc)); 350*59c8e88eSDag-Erling Smørgrav- VOP_CLOSE(vn, FREAD | FWRITE, NOCRED, curproc); 351*59c8e88eSDag-Erling Smørgrav- vput(vn); 352*59c8e88eSDag-Erling Smørgrav- goto fail; 353*59c8e88eSDag-Erling Smørgrav+ goto done; 354*59c8e88eSDag-Erling Smørgrav } 355*59c8e88eSDag-Erling Smørgrav- if (label.d_secsize != DEV_BSIZE) { 356*59c8e88eSDag-Erling Smørgrav- sr_error(sc, "%s has unsupported sector size (%d)", 357*59c8e88eSDag-Erling Smørgrav- devname, label.d_secsize); 358*59c8e88eSDag-Erling Smørgrav- goto fail; 359*59c8e88eSDag-Erling Smørgrav- } 360*59c8e88eSDag-Erling Smørgrav if (label.d_partitions[part].p_fstype != FS_RAID) { 361*59c8e88eSDag-Erling Smørgrav- sr_error(sc, "%s partition not of type RAID (%d)\n", 362*59c8e88eSDag-Erling Smørgrav+ sr_error(sc, "%s partition not of type RAID (%d)", 363*59c8e88eSDag-Erling Smørgrav devname, label.d_partitions[part].p_fstype); 364*59c8e88eSDag-Erling Smørgrav- goto fail; 365*59c8e88eSDag-Erling Smørgrav+ goto done; 366*59c8e88eSDag-Erling Smørgrav } 367*59c8e88eSDag-Erling Smørgrav 368*59c8e88eSDag-Erling Smørgrav /* 369*59c8e88eSDag-Erling Smørgrav@@ -728,7 +684,7 @@ 370*59c8e88eSDag-Erling Smørgrav km->scmi.scm_size = 0; 371*59c8e88eSDag-Erling Smørgrav km->scmi.scm_coerced_size = 0; 372*59c8e88eSDag-Erling Smørgrav strlcpy(km->scmi.scm_devname, devname, sizeof(km->scmi.scm_devname)); 373*59c8e88eSDag-Erling Smørgrav- bcopy(&sd->sd_meta->ssdi.ssd_uuid, &km->scmi.scm_uuid, 374*59c8e88eSDag-Erling Smørgrav+ memcpy(&km->scmi.scm_uuid, &sd->sd_meta->ssdi.ssd_uuid, 375*59c8e88eSDag-Erling Smørgrav sizeof(struct sr_uuid)); 376*59c8e88eSDag-Erling Smørgrav 377*59c8e88eSDag-Erling Smørgrav sr_checksum(sc, km, &km->scm_checksum, 378*59c8e88eSDag-Erling Smørgrav@@ -745,7 +701,7 @@ 379*59c8e88eSDag-Erling Smørgrav sm->ssdi.ssd_version = SR_META_VERSION; 380*59c8e88eSDag-Erling Smørgrav sm->ssd_ondisk = 0; 381*59c8e88eSDag-Erling Smørgrav sm->ssdi.ssd_vol_flags = 0; 382*59c8e88eSDag-Erling Smørgrav- bcopy(&sd->sd_meta->ssdi.ssd_uuid, &sm->ssdi.ssd_uuid, 383*59c8e88eSDag-Erling Smørgrav+ memcpy(&sm->ssdi.ssd_uuid, &sd->sd_meta->ssdi.ssd_uuid, 384*59c8e88eSDag-Erling Smørgrav sizeof(struct sr_uuid)); 385*59c8e88eSDag-Erling Smørgrav sm->ssdi.ssd_chunk_no = 1; 386*59c8e88eSDag-Erling Smørgrav sm->ssdi.ssd_volid = SR_KEYDISK_VOLID; 387*59c8e88eSDag-Erling Smørgrav@@ -785,7 +741,7 @@ 388*59c8e88eSDag-Erling Smørgrav omi->omi_som->som_type = SR_OPT_KEYDISK; 389*59c8e88eSDag-Erling Smørgrav omi->omi_som->som_length = sizeof(struct sr_meta_keydisk); 390*59c8e88eSDag-Erling Smørgrav skm = (struct sr_meta_keydisk *)omi->omi_som; 391*59c8e88eSDag-Erling Smørgrav- bcopy(sd->mds.mdd_crypto.scr_maskkey, &skm->skm_maskkey, 392*59c8e88eSDag-Erling Smørgrav+ memcpy(&skm->skm_maskkey, sd->mds.mdd_crypto.scr_maskkey, 393*59c8e88eSDag-Erling Smørgrav sizeof(skm->skm_maskkey)); 394*59c8e88eSDag-Erling Smørgrav SLIST_INSERT_HEAD(&fakesd->sd_meta_opt, omi, omi_link); 395*59c8e88eSDag-Erling Smørgrav fakesd->sd_meta->ssdi.ssd_opt_no++; 396*59c8e88eSDag-Erling Smørgrav@@ -799,19 +755,16 @@ 397*59c8e88eSDag-Erling Smørgrav goto done; 398*59c8e88eSDag-Erling Smørgrav 399*59c8e88eSDag-Erling Smørgrav fail: 400*59c8e88eSDag-Erling Smørgrav- if (key_disk) 401*59c8e88eSDag-Erling Smørgrav- free(key_disk, M_DEVBUF); 402*59c8e88eSDag-Erling Smørgrav+ free(key_disk, M_DEVBUF, sizeof(struct sr_chunk)); 403*59c8e88eSDag-Erling Smørgrav key_disk = NULL; 404*59c8e88eSDag-Erling Smørgrav 405*59c8e88eSDag-Erling Smørgrav done: 406*59c8e88eSDag-Erling Smørgrav- if (omi) 407*59c8e88eSDag-Erling Smørgrav- free(omi, M_DEVBUF); 408*59c8e88eSDag-Erling Smørgrav+ free(omi, M_DEVBUF, sizeof(struct sr_meta_opt_item)); 409*59c8e88eSDag-Erling Smørgrav if (fakesd && fakesd->sd_vol.sv_chunks) 410*59c8e88eSDag-Erling Smørgrav- free(fakesd->sd_vol.sv_chunks, M_DEVBUF); 411*59c8e88eSDag-Erling Smørgrav- if (fakesd) 412*59c8e88eSDag-Erling Smørgrav- free(fakesd, M_DEVBUF); 413*59c8e88eSDag-Erling Smørgrav- if (sm) 414*59c8e88eSDag-Erling Smørgrav- free(sm, M_DEVBUF); 415*59c8e88eSDag-Erling Smørgrav+ free(fakesd->sd_vol.sv_chunks, M_DEVBUF, 416*59c8e88eSDag-Erling Smørgrav+ sizeof(struct sr_chunk *)); 417*59c8e88eSDag-Erling Smørgrav+ free(fakesd, M_DEVBUF, sizeof(struct sr_discipline)); 418*59c8e88eSDag-Erling Smørgrav+ free(sm, M_DEVBUF, sizeof(struct sr_metadata)); 419*59c8e88eSDag-Erling Smørgrav if (open) { 420*59c8e88eSDag-Erling Smørgrav VOP_CLOSE(vn, FREAD | FWRITE, NOCRED, curproc); 421*59c8e88eSDag-Erling Smørgrav vput(vn); 422*59c8e88eSDag-Erling Smørgrav@@ -855,7 +808,7 @@ 423*59c8e88eSDag-Erling Smørgrav sr_error(sc, "cannot open key disk %s", devname); 424*59c8e88eSDag-Erling Smørgrav goto done; 425*59c8e88eSDag-Erling Smørgrav } 426*59c8e88eSDag-Erling Smørgrav- if (VOP_OPEN(vn, FREAD | FWRITE, NOCRED, curproc)) { 427*59c8e88eSDag-Erling Smørgrav+ if (VOP_OPEN(vn, FREAD, NOCRED, curproc)) { 428*59c8e88eSDag-Erling Smørgrav DNPRINTF(SR_D_META,"%s: sr_crypto_read_key_disk cannot " 429*59c8e88eSDag-Erling Smørgrav "open %s\n", DEVNAME(sc), devname); 430*59c8e88eSDag-Erling Smørgrav vput(vn); 431*59c8e88eSDag-Erling Smørgrav@@ -869,17 +822,10 @@ 432*59c8e88eSDag-Erling Smørgrav NOCRED, curproc)) { 433*59c8e88eSDag-Erling Smørgrav DNPRINTF(SR_D_META, "%s: sr_crypto_read_key_disk ioctl " 434*59c8e88eSDag-Erling Smørgrav "failed\n", DEVNAME(sc)); 435*59c8e88eSDag-Erling Smørgrav- VOP_CLOSE(vn, FREAD | FWRITE, NOCRED, curproc); 436*59c8e88eSDag-Erling Smørgrav- vput(vn); 437*59c8e88eSDag-Erling Smørgrav goto done; 438*59c8e88eSDag-Erling Smørgrav } 439*59c8e88eSDag-Erling Smørgrav- if (label.d_secsize != DEV_BSIZE) { 440*59c8e88eSDag-Erling Smørgrav- sr_error(sc, "%s has unsupported sector size (%d)", 441*59c8e88eSDag-Erling Smørgrav- devname, label.d_secsize); 442*59c8e88eSDag-Erling Smørgrav- goto done; 443*59c8e88eSDag-Erling Smørgrav- } 444*59c8e88eSDag-Erling Smørgrav if (label.d_partitions[part].p_fstype != FS_RAID) { 445*59c8e88eSDag-Erling Smørgrav- sr_error(sc, "%s partition not of type RAID (%d)\n", 446*59c8e88eSDag-Erling Smørgrav+ sr_error(sc, "%s partition not of type RAID (%d)", 447*59c8e88eSDag-Erling Smørgrav devname, label.d_partitions[part].p_fstype); 448*59c8e88eSDag-Erling Smørgrav goto done; 449*59c8e88eSDag-Erling Smørgrav } 450*59c8e88eSDag-Erling Smørgrav@@ -887,7 +833,7 @@ 451*59c8e88eSDag-Erling Smørgrav /* 452*59c8e88eSDag-Erling Smørgrav * Read and validate key disk metadata. 453*59c8e88eSDag-Erling Smørgrav */ 454*59c8e88eSDag-Erling Smørgrav- sm = malloc(SR_META_SIZE * 512, M_DEVBUF, M_WAITOK | M_ZERO); 455*59c8e88eSDag-Erling Smørgrav+ sm = malloc(SR_META_SIZE * DEV_BSIZE, M_DEVBUF, M_WAITOK | M_ZERO); 456*59c8e88eSDag-Erling Smørgrav if (sr_meta_native_read(sd, dev, sm, NULL)) { 457*59c8e88eSDag-Erling Smørgrav sr_error(sc, "native bootprobe could not read native metadata"); 458*59c8e88eSDag-Erling Smørgrav goto done; 459*59c8e88eSDag-Erling Smørgrav@@ -911,7 +857,7 @@ 460*59c8e88eSDag-Erling Smørgrav key_disk->src_vn = vn; 461*59c8e88eSDag-Erling Smørgrav key_disk->src_size = 0; 462*59c8e88eSDag-Erling Smørgrav 463*59c8e88eSDag-Erling Smørgrav- bcopy((struct sr_meta_chunk *)(sm + 1), &key_disk->src_meta, 464*59c8e88eSDag-Erling Smørgrav+ memcpy(&key_disk->src_meta, (struct sr_meta_chunk *)(sm + 1), 465*59c8e88eSDag-Erling Smørgrav sizeof(key_disk->src_meta)); 466*59c8e88eSDag-Erling Smørgrav 467*59c8e88eSDag-Erling Smørgrav /* Read mask key from optional metadata. */ 468*59c8e88eSDag-Erling Smørgrav@@ -920,13 +866,12 @@ 469*59c8e88eSDag-Erling Smørgrav omh = omi->omi_som; 470*59c8e88eSDag-Erling Smørgrav if (omh->som_type == SR_OPT_KEYDISK) { 471*59c8e88eSDag-Erling Smørgrav skm = (struct sr_meta_keydisk *)omh; 472*59c8e88eSDag-Erling Smørgrav- bcopy(&skm->skm_maskkey, 473*59c8e88eSDag-Erling Smørgrav- sd->mds.mdd_crypto.scr_maskkey, 474*59c8e88eSDag-Erling Smørgrav+ memcpy(sd->mds.mdd_crypto.scr_maskkey, &skm->skm_maskkey, 475*59c8e88eSDag-Erling Smørgrav sizeof(sd->mds.mdd_crypto.scr_maskkey)); 476*59c8e88eSDag-Erling Smørgrav } else if (omh->som_type == SR_OPT_CRYPTO) { 477*59c8e88eSDag-Erling Smørgrav /* Original keydisk format with key in crypto area. */ 478*59c8e88eSDag-Erling Smørgrav- bcopy(omh + sizeof(struct sr_meta_opt_hdr), 479*59c8e88eSDag-Erling Smørgrav- sd->mds.mdd_crypto.scr_maskkey, 480*59c8e88eSDag-Erling Smørgrav+ memcpy(sd->mds.mdd_crypto.scr_maskkey, 481*59c8e88eSDag-Erling Smørgrav+ omh + sizeof(struct sr_meta_opt_hdr), 482*59c8e88eSDag-Erling Smørgrav sizeof(sd->mds.mdd_crypto.scr_maskkey)); 483*59c8e88eSDag-Erling Smørgrav } 484*59c8e88eSDag-Erling Smørgrav } 485*59c8e88eSDag-Erling Smørgrav@@ -934,15 +879,13 @@ 486*59c8e88eSDag-Erling Smørgrav open = 0; 487*59c8e88eSDag-Erling Smørgrav 488*59c8e88eSDag-Erling Smørgrav done: 489*59c8e88eSDag-Erling Smørgrav- for (omi = SLIST_FIRST(&som); omi != SLIST_END(&som); omi = omi_next) { 490*59c8e88eSDag-Erling Smørgrav+ for (omi = SLIST_FIRST(&som); omi != NULL; omi = omi_next) { 491*59c8e88eSDag-Erling Smørgrav omi_next = SLIST_NEXT(omi, omi_link); 492*59c8e88eSDag-Erling Smørgrav- if (omi->omi_som) 493*59c8e88eSDag-Erling Smørgrav- free(omi->omi_som, M_DEVBUF); 494*59c8e88eSDag-Erling Smørgrav- free(omi, M_DEVBUF); 495*59c8e88eSDag-Erling Smørgrav+ free(omi->omi_som, M_DEVBUF, 0); 496*59c8e88eSDag-Erling Smørgrav+ free(omi, M_DEVBUF, sizeof(struct sr_meta_opt_item)); 497*59c8e88eSDag-Erling Smørgrav } 498*59c8e88eSDag-Erling Smørgrav 499*59c8e88eSDag-Erling Smørgrav- if (sm) 500*59c8e88eSDag-Erling Smørgrav- free(sm, M_DEVBUF); 501*59c8e88eSDag-Erling Smørgrav+ free(sm, M_DEVBUF, SR_META_SIZE * DEV_BSIZE); 502*59c8e88eSDag-Erling Smørgrav 503*59c8e88eSDag-Erling Smørgrav if (vn && open) { 504*59c8e88eSDag-Erling Smørgrav VOP_CLOSE(vn, FREAD, NOCRED, curproc); 505*59c8e88eSDag-Erling Smørgrav@@ -950,18 +893,45 @@ 506*59c8e88eSDag-Erling Smørgrav } 507*59c8e88eSDag-Erling Smørgrav 508*59c8e88eSDag-Erling Smørgrav return key_disk; 509*59c8e88eSDag-Erling Smørgrav+} 510*59c8e88eSDag-Erling Smørgrav+ 511*59c8e88eSDag-Erling Smørgrav+static void 512*59c8e88eSDag-Erling Smørgrav+sr_crypto_free_sessions(struct sr_discipline *sd) 513*59c8e88eSDag-Erling Smørgrav+{ 514*59c8e88eSDag-Erling Smørgrav+ u_int i; 515*59c8e88eSDag-Erling Smørgrav+ 516*59c8e88eSDag-Erling Smørgrav+ for (i = 0; i < SR_CRYPTO_MAXKEYS; i++) { 517*59c8e88eSDag-Erling Smørgrav+ if (sd->mds.mdd_crypto.scr_sid[i] != (u_int64_t)-1) { 518*59c8e88eSDag-Erling Smørgrav+ crypto_freesession(sd->mds.mdd_crypto.scr_sid[i]); 519*59c8e88eSDag-Erling Smørgrav+ sd->mds.mdd_crypto.scr_sid[i] = (u_int64_t)-1; 520*59c8e88eSDag-Erling Smørgrav+ } 521*59c8e88eSDag-Erling Smørgrav+ } 522*59c8e88eSDag-Erling Smørgrav } 523*59c8e88eSDag-Erling Smørgrav 524*59c8e88eSDag-Erling Smørgrav int 525*59c8e88eSDag-Erling Smørgrav sr_crypto_alloc_resources(struct sr_discipline *sd) 526*59c8e88eSDag-Erling Smørgrav { 527*59c8e88eSDag-Erling Smørgrav- struct cryptoini cri; 528*59c8e88eSDag-Erling Smørgrav+ struct sr_workunit *wu; 529*59c8e88eSDag-Erling Smørgrav struct sr_crypto_wu *crwu; 530*59c8e88eSDag-Erling Smørgrav+ struct cryptoini cri; 531*59c8e88eSDag-Erling Smørgrav u_int num_keys, i; 532*59c8e88eSDag-Erling Smørgrav 533*59c8e88eSDag-Erling Smørgrav DNPRINTF(SR_D_DIS, "%s: sr_crypto_alloc_resources\n", 534*59c8e88eSDag-Erling Smørgrav DEVNAME(sd->sd_sc)); 535*59c8e88eSDag-Erling Smørgrav 536*59c8e88eSDag-Erling Smørgrav+ sd->mds.mdd_crypto.scr_alg = CRYPTO_AES_XTS; 537*59c8e88eSDag-Erling Smørgrav+ switch (sd->mds.mdd_crypto.scr_meta->scm_alg) { 538*59c8e88eSDag-Erling Smørgrav+ case SR_CRYPTOA_AES_XTS_128: 539*59c8e88eSDag-Erling Smørgrav+ sd->mds.mdd_crypto.scr_klen = 256; 540*59c8e88eSDag-Erling Smørgrav+ break; 541*59c8e88eSDag-Erling Smørgrav+ case SR_CRYPTOA_AES_XTS_256: 542*59c8e88eSDag-Erling Smørgrav+ sd->mds.mdd_crypto.scr_klen = 512; 543*59c8e88eSDag-Erling Smørgrav+ break; 544*59c8e88eSDag-Erling Smørgrav+ default: 545*59c8e88eSDag-Erling Smørgrav+ sr_error(sd->sd_sc, "unknown crypto algorithm"); 546*59c8e88eSDag-Erling Smørgrav+ return (EINVAL); 547*59c8e88eSDag-Erling Smørgrav+ } 548*59c8e88eSDag-Erling Smørgrav+ 549*59c8e88eSDag-Erling Smørgrav for (i = 0; i < SR_CRYPTO_MAXKEYS; i++) 550*59c8e88eSDag-Erling Smørgrav sd->mds.mdd_crypto.scr_sid[i] = (u_int64_t)-1; 551*59c8e88eSDag-Erling Smørgrav 552*59c8e88eSDag-Erling Smørgrav@@ -979,61 +949,34 @@ 553*59c8e88eSDag-Erling Smørgrav } 554*59c8e88eSDag-Erling Smørgrav 555*59c8e88eSDag-Erling Smørgrav /* 556*59c8e88eSDag-Erling Smørgrav- * For each wu allocate the uio, iovec and crypto structures. 557*59c8e88eSDag-Erling Smørgrav- * these have to be allocated now because during runtime we can't 558*59c8e88eSDag-Erling Smørgrav- * fail an allocation without failing the io (which can cause real 559*59c8e88eSDag-Erling Smørgrav+ * For each work unit allocate the uio, iovec and crypto structures. 560*59c8e88eSDag-Erling Smørgrav+ * These have to be allocated now because during runtime we cannot 561*59c8e88eSDag-Erling Smørgrav+ * fail an allocation without failing the I/O (which can cause real 562*59c8e88eSDag-Erling Smørgrav * problems). 563*59c8e88eSDag-Erling Smørgrav */ 564*59c8e88eSDag-Erling Smørgrav- mtx_init(&sd->mds.mdd_crypto.scr_mutex, IPL_BIO); 565*59c8e88eSDag-Erling Smørgrav- TAILQ_INIT(&sd->mds.mdd_crypto.scr_wus); 566*59c8e88eSDag-Erling Smørgrav- for (i = 0; i < sd->sd_max_wu; i++) { 567*59c8e88eSDag-Erling Smørgrav- crwu = malloc(sizeof(*crwu), M_DEVBUF, 568*59c8e88eSDag-Erling Smørgrav- M_WAITOK | M_ZERO | M_CANFAIL); 569*59c8e88eSDag-Erling Smørgrav- if (crwu == NULL) 570*59c8e88eSDag-Erling Smørgrav- return (ENOMEM); 571*59c8e88eSDag-Erling Smørgrav- /* put it on the list now so if we fail it'll be freed */ 572*59c8e88eSDag-Erling Smørgrav- mtx_enter(&sd->mds.mdd_crypto.scr_mutex); 573*59c8e88eSDag-Erling Smørgrav- TAILQ_INSERT_TAIL(&sd->mds.mdd_crypto.scr_wus, crwu, cr_link); 574*59c8e88eSDag-Erling Smørgrav- mtx_leave(&sd->mds.mdd_crypto.scr_mutex); 575*59c8e88eSDag-Erling Smørgrav- 576*59c8e88eSDag-Erling Smørgrav+ TAILQ_FOREACH(wu, &sd->sd_wu, swu_next) { 577*59c8e88eSDag-Erling Smørgrav+ crwu = (struct sr_crypto_wu *)wu; 578*59c8e88eSDag-Erling Smørgrav crwu->cr_uio.uio_iov = &crwu->cr_iov; 579*59c8e88eSDag-Erling Smørgrav crwu->cr_dmabuf = dma_alloc(MAXPHYS, PR_WAITOK); 580*59c8e88eSDag-Erling Smørgrav crwu->cr_crp = crypto_getreq(MAXPHYS >> DEV_BSHIFT); 581*59c8e88eSDag-Erling Smørgrav if (crwu->cr_crp == NULL) 582*59c8e88eSDag-Erling Smørgrav return (ENOMEM); 583*59c8e88eSDag-Erling Smørgrav- /* steal the list of cryptodescs */ 584*59c8e88eSDag-Erling Smørgrav- crwu->cr_descs = crwu->cr_crp->crp_desc; 585*59c8e88eSDag-Erling Smørgrav- crwu->cr_crp->crp_desc = NULL; 586*59c8e88eSDag-Erling Smørgrav } 587*59c8e88eSDag-Erling Smørgrav 588*59c8e88eSDag-Erling Smørgrav- bzero(&cri, sizeof(cri)); 589*59c8e88eSDag-Erling Smørgrav- cri.cri_alg = CRYPTO_AES_XTS; 590*59c8e88eSDag-Erling Smørgrav- switch (sd->mds.mdd_crypto.scr_meta->scm_alg) { 591*59c8e88eSDag-Erling Smørgrav- case SR_CRYPTOA_AES_XTS_128: 592*59c8e88eSDag-Erling Smørgrav- cri.cri_klen = 256; 593*59c8e88eSDag-Erling Smørgrav- break; 594*59c8e88eSDag-Erling Smørgrav- case SR_CRYPTOA_AES_XTS_256: 595*59c8e88eSDag-Erling Smørgrav- cri.cri_klen = 512; 596*59c8e88eSDag-Erling Smørgrav- break; 597*59c8e88eSDag-Erling Smørgrav- default: 598*59c8e88eSDag-Erling Smørgrav- return (EINVAL); 599*59c8e88eSDag-Erling Smørgrav- } 600*59c8e88eSDag-Erling Smørgrav+ memset(&cri, 0, sizeof(cri)); 601*59c8e88eSDag-Erling Smørgrav+ cri.cri_alg = sd->mds.mdd_crypto.scr_alg; 602*59c8e88eSDag-Erling Smørgrav+ cri.cri_klen = sd->mds.mdd_crypto.scr_klen; 603*59c8e88eSDag-Erling Smørgrav 604*59c8e88eSDag-Erling Smørgrav- /* Allocate a session for every 2^SR_CRYPTO_KEY_BLKSHIFT blocks */ 605*59c8e88eSDag-Erling Smørgrav- num_keys = sd->sd_meta->ssdi.ssd_size >> SR_CRYPTO_KEY_BLKSHIFT; 606*59c8e88eSDag-Erling Smørgrav- if (num_keys >= SR_CRYPTO_MAXKEYS) 607*59c8e88eSDag-Erling Smørgrav+ /* Allocate a session for every 2^SR_CRYPTO_KEY_BLKSHIFT blocks. */ 608*59c8e88eSDag-Erling Smørgrav+ num_keys = ((sd->sd_meta->ssdi.ssd_size - 1) >> 609*59c8e88eSDag-Erling Smørgrav+ SR_CRYPTO_KEY_BLKSHIFT) + 1; 610*59c8e88eSDag-Erling Smørgrav+ if (num_keys > SR_CRYPTO_MAXKEYS) 611*59c8e88eSDag-Erling Smørgrav return (EFBIG); 612*59c8e88eSDag-Erling Smørgrav- for (i = 0; i <= num_keys; i++) { 613*59c8e88eSDag-Erling Smørgrav+ for (i = 0; i < num_keys; i++) { 614*59c8e88eSDag-Erling Smørgrav cri.cri_key = sd->mds.mdd_crypto.scr_key[i]; 615*59c8e88eSDag-Erling Smørgrav if (crypto_newsession(&sd->mds.mdd_crypto.scr_sid[i], 616*59c8e88eSDag-Erling Smørgrav &cri, 0) != 0) { 617*59c8e88eSDag-Erling Smørgrav- for (i = 0; 618*59c8e88eSDag-Erling Smørgrav- sd->mds.mdd_crypto.scr_sid[i] != (u_int64_t)-1; 619*59c8e88eSDag-Erling Smørgrav- i++) { 620*59c8e88eSDag-Erling Smørgrav- crypto_freesession( 621*59c8e88eSDag-Erling Smørgrav- sd->mds.mdd_crypto.scr_sid[i]); 622*59c8e88eSDag-Erling Smørgrav- sd->mds.mdd_crypto.scr_sid[i] = (u_int64_t)-1; 623*59c8e88eSDag-Erling Smørgrav- } 624*59c8e88eSDag-Erling Smørgrav+ sr_crypto_free_sessions(sd); 625*59c8e88eSDag-Erling Smørgrav return (EINVAL); 626*59c8e88eSDag-Erling Smørgrav } 627*59c8e88eSDag-Erling Smørgrav } 628*59c8e88eSDag-Erling Smørgrav@@ -1046,39 +989,30 @@ 629*59c8e88eSDag-Erling Smørgrav void 630*59c8e88eSDag-Erling Smørgrav sr_crypto_free_resources(struct sr_discipline *sd) 631*59c8e88eSDag-Erling Smørgrav { 632*59c8e88eSDag-Erling Smørgrav+ struct sr_workunit *wu; 633*59c8e88eSDag-Erling Smørgrav struct sr_crypto_wu *crwu; 634*59c8e88eSDag-Erling Smørgrav- u_int i; 635*59c8e88eSDag-Erling Smørgrav 636*59c8e88eSDag-Erling Smørgrav DNPRINTF(SR_D_DIS, "%s: sr_crypto_free_resources\n", 637*59c8e88eSDag-Erling Smørgrav DEVNAME(sd->sd_sc)); 638*59c8e88eSDag-Erling Smørgrav 639*59c8e88eSDag-Erling Smørgrav if (sd->mds.mdd_crypto.key_disk != NULL) { 640*59c8e88eSDag-Erling Smørgrav- explicit_bzero(sd->mds.mdd_crypto.key_disk, sizeof 641*59c8e88eSDag-Erling Smørgrav- sd->mds.mdd_crypto.key_disk); 642*59c8e88eSDag-Erling Smørgrav- free(sd->mds.mdd_crypto.key_disk, M_DEVBUF); 643*59c8e88eSDag-Erling Smørgrav+ explicit_bzero(sd->mds.mdd_crypto.key_disk, 644*59c8e88eSDag-Erling Smørgrav+ sizeof(*sd->mds.mdd_crypto.key_disk)); 645*59c8e88eSDag-Erling Smørgrav+ free(sd->mds.mdd_crypto.key_disk, M_DEVBUF, 646*59c8e88eSDag-Erling Smørgrav+ sizeof(*sd->mds.mdd_crypto.key_disk)); 647*59c8e88eSDag-Erling Smørgrav } 648*59c8e88eSDag-Erling Smørgrav 649*59c8e88eSDag-Erling Smørgrav sr_hotplug_unregister(sd, sr_crypto_hotplug); 650*59c8e88eSDag-Erling Smørgrav 651*59c8e88eSDag-Erling Smørgrav- for (i = 0; sd->mds.mdd_crypto.scr_sid[i] != (u_int64_t)-1; i++) { 652*59c8e88eSDag-Erling Smørgrav- crypto_freesession(sd->mds.mdd_crypto.scr_sid[i]); 653*59c8e88eSDag-Erling Smørgrav- sd->mds.mdd_crypto.scr_sid[i] = (u_int64_t)-1; 654*59c8e88eSDag-Erling Smørgrav- } 655*59c8e88eSDag-Erling Smørgrav+ sr_crypto_free_sessions(sd); 656*59c8e88eSDag-Erling Smørgrav 657*59c8e88eSDag-Erling Smørgrav- mtx_enter(&sd->mds.mdd_crypto.scr_mutex); 658*59c8e88eSDag-Erling Smørgrav- while ((crwu = TAILQ_FIRST(&sd->mds.mdd_crypto.scr_wus)) != NULL) { 659*59c8e88eSDag-Erling Smørgrav- TAILQ_REMOVE(&sd->mds.mdd_crypto.scr_wus, crwu, cr_link); 660*59c8e88eSDag-Erling Smørgrav- 661*59c8e88eSDag-Erling Smørgrav- if (crwu->cr_dmabuf != NULL) 662*59c8e88eSDag-Erling Smørgrav+ TAILQ_FOREACH(wu, &sd->sd_wu, swu_next) { 663*59c8e88eSDag-Erling Smørgrav+ crwu = (struct sr_crypto_wu *)wu; 664*59c8e88eSDag-Erling Smørgrav+ if (crwu->cr_dmabuf) 665*59c8e88eSDag-Erling Smørgrav dma_free(crwu->cr_dmabuf, MAXPHYS); 666*59c8e88eSDag-Erling Smørgrav- if (crwu->cr_crp) { 667*59c8e88eSDag-Erling Smørgrav- /* twiddle cryptoreq back */ 668*59c8e88eSDag-Erling Smørgrav- crwu->cr_crp->crp_desc = crwu->cr_descs; 669*59c8e88eSDag-Erling Smørgrav+ if (crwu->cr_crp) 670*59c8e88eSDag-Erling Smørgrav crypto_freereq(crwu->cr_crp); 671*59c8e88eSDag-Erling Smørgrav- } 672*59c8e88eSDag-Erling Smørgrav- free(crwu, M_DEVBUF); 673*59c8e88eSDag-Erling Smørgrav } 674*59c8e88eSDag-Erling Smørgrav- mtx_leave(&sd->mds.mdd_crypto.scr_mutex); 675*59c8e88eSDag-Erling Smørgrav 676*59c8e88eSDag-Erling Smørgrav sr_wu_free(sd); 677*59c8e88eSDag-Erling Smørgrav sr_ccb_free(sd); 678*59c8e88eSDag-Erling Smørgrav@@ -1165,65 +1099,60 @@ 679*59c8e88eSDag-Erling Smørgrav sr_crypto_rw(struct sr_workunit *wu) 680*59c8e88eSDag-Erling Smørgrav { 681*59c8e88eSDag-Erling Smørgrav struct sr_crypto_wu *crwu; 682*59c8e88eSDag-Erling Smørgrav- int s, rv = 0; 683*59c8e88eSDag-Erling Smørgrav+ daddr_t blkno; 684*59c8e88eSDag-Erling Smørgrav+ int rv = 0; 685*59c8e88eSDag-Erling Smørgrav 686*59c8e88eSDag-Erling Smørgrav- DNPRINTF(SR_D_DIS, "%s: sr_crypto_rw wu: %p\n", 687*59c8e88eSDag-Erling Smørgrav+ DNPRINTF(SR_D_DIS, "%s: sr_crypto_rw wu %p\n", 688*59c8e88eSDag-Erling Smørgrav DEVNAME(wu->swu_dis->sd_sc), wu); 689*59c8e88eSDag-Erling Smørgrav 690*59c8e88eSDag-Erling Smørgrav- if (wu->swu_xs->flags & SCSI_DATA_OUT) { 691*59c8e88eSDag-Erling Smørgrav- crwu = sr_crypto_wu_get(wu, 1); 692*59c8e88eSDag-Erling Smørgrav- if (crwu == NULL) 693*59c8e88eSDag-Erling Smørgrav- return (1); 694*59c8e88eSDag-Erling Smørgrav+ if (sr_validate_io(wu, &blkno, "sr_crypto_rw")) 695*59c8e88eSDag-Erling Smørgrav+ return (1); 696*59c8e88eSDag-Erling Smørgrav+ 697*59c8e88eSDag-Erling Smørgrav+ if (wu->swu_xs->flags & SCSI_DATA_OUT) { 698*59c8e88eSDag-Erling Smørgrav+ crwu = sr_crypto_prepare(wu, 1); 699*59c8e88eSDag-Erling Smørgrav crwu->cr_crp->crp_callback = sr_crypto_write; 700*59c8e88eSDag-Erling Smørgrav- s = splvm(); 701*59c8e88eSDag-Erling Smørgrav- if (crypto_invoke(crwu->cr_crp)) 702*59c8e88eSDag-Erling Smørgrav- rv = 1; 703*59c8e88eSDag-Erling Smørgrav- else 704*59c8e88eSDag-Erling Smørgrav+ rv = crypto_dispatch(crwu->cr_crp); 705*59c8e88eSDag-Erling Smørgrav+ if (rv == 0) 706*59c8e88eSDag-Erling Smørgrav rv = crwu->cr_crp->crp_etype; 707*59c8e88eSDag-Erling Smørgrav- splx(s); 708*59c8e88eSDag-Erling Smørgrav } else 709*59c8e88eSDag-Erling Smørgrav- rv = sr_crypto_rw2(wu, NULL); 710*59c8e88eSDag-Erling Smørgrav+ rv = sr_crypto_dev_rw(wu, NULL); 711*59c8e88eSDag-Erling Smørgrav 712*59c8e88eSDag-Erling Smørgrav return (rv); 713*59c8e88eSDag-Erling Smørgrav } 714*59c8e88eSDag-Erling Smørgrav 715*59c8e88eSDag-Erling Smørgrav-int 716*59c8e88eSDag-Erling Smørgrav+void 717*59c8e88eSDag-Erling Smørgrav sr_crypto_write(struct cryptop *crp) 718*59c8e88eSDag-Erling Smørgrav { 719*59c8e88eSDag-Erling Smørgrav struct sr_crypto_wu *crwu = crp->crp_opaque; 720*59c8e88eSDag-Erling Smørgrav- struct sr_workunit *wu = crwu->cr_wu; 721*59c8e88eSDag-Erling Smørgrav+ struct sr_workunit *wu = &crwu->cr_wu; 722*59c8e88eSDag-Erling Smørgrav int s; 723*59c8e88eSDag-Erling Smørgrav 724*59c8e88eSDag-Erling Smørgrav- DNPRINTF(SR_D_INTR, "%s: sr_crypto_write: wu %x xs: %x\n", 725*59c8e88eSDag-Erling Smørgrav+ DNPRINTF(SR_D_INTR, "%s: sr_crypto_write: wu %p xs: %p\n", 726*59c8e88eSDag-Erling Smørgrav DEVNAME(wu->swu_dis->sd_sc), wu, wu->swu_xs); 727*59c8e88eSDag-Erling Smørgrav 728*59c8e88eSDag-Erling Smørgrav if (crp->crp_etype) { 729*59c8e88eSDag-Erling Smørgrav /* fail io */ 730*59c8e88eSDag-Erling Smørgrav wu->swu_xs->error = XS_DRIVER_STUFFUP; 731*59c8e88eSDag-Erling Smørgrav s = splbio(); 732*59c8e88eSDag-Erling Smørgrav- sr_crypto_finish_io(wu); 733*59c8e88eSDag-Erling Smørgrav+ sr_scsi_done(wu->swu_dis, wu->swu_xs); 734*59c8e88eSDag-Erling Smørgrav splx(s); 735*59c8e88eSDag-Erling Smørgrav } 736*59c8e88eSDag-Erling Smørgrav 737*59c8e88eSDag-Erling Smørgrav- return (sr_crypto_rw2(wu, crwu)); 738*59c8e88eSDag-Erling Smørgrav+ sr_crypto_dev_rw(wu, crwu); 739*59c8e88eSDag-Erling Smørgrav } 740*59c8e88eSDag-Erling Smørgrav 741*59c8e88eSDag-Erling Smørgrav int 742*59c8e88eSDag-Erling Smørgrav-sr_crypto_rw2(struct sr_workunit *wu, struct sr_crypto_wu *crwu) 743*59c8e88eSDag-Erling Smørgrav+sr_crypto_dev_rw(struct sr_workunit *wu, struct sr_crypto_wu *crwu) 744*59c8e88eSDag-Erling Smørgrav { 745*59c8e88eSDag-Erling Smørgrav struct sr_discipline *sd = wu->swu_dis; 746*59c8e88eSDag-Erling Smørgrav struct scsi_xfer *xs = wu->swu_xs; 747*59c8e88eSDag-Erling Smørgrav struct sr_ccb *ccb; 748*59c8e88eSDag-Erling Smørgrav struct uio *uio; 749*59c8e88eSDag-Erling Smørgrav- int s; 750*59c8e88eSDag-Erling Smørgrav- daddr64_t blk; 751*59c8e88eSDag-Erling Smørgrav+ daddr_t blkno; 752*59c8e88eSDag-Erling Smørgrav 753*59c8e88eSDag-Erling Smørgrav- if (sr_validate_io(wu, &blk, "sr_crypto_rw2")) 754*59c8e88eSDag-Erling Smørgrav- goto bad; 755*59c8e88eSDag-Erling Smørgrav+ blkno = wu->swu_blk_start; 756*59c8e88eSDag-Erling Smørgrav 757*59c8e88eSDag-Erling Smørgrav- blk += sd->sd_meta->ssd_data_offset; 758*59c8e88eSDag-Erling Smørgrav- 759*59c8e88eSDag-Erling Smørgrav- ccb = sr_ccb_rw(sd, 0, blk, xs->datalen, xs->data, xs->flags, 0); 760*59c8e88eSDag-Erling Smørgrav+ ccb = sr_ccb_rw(sd, 0, blkno, xs->datalen, xs->data, xs->flags, 0); 761*59c8e88eSDag-Erling Smørgrav if (!ccb) { 762*59c8e88eSDag-Erling Smørgrav /* should never happen but handle more gracefully */ 763*59c8e88eSDag-Erling Smørgrav printf("%s: %s: too many ccbs queued\n", 764*59c8e88eSDag-Erling Smørgrav@@ -1236,17 +1165,10 @@ 765*59c8e88eSDag-Erling Smørgrav ccb->ccb_opaque = crwu; 766*59c8e88eSDag-Erling Smørgrav } 767*59c8e88eSDag-Erling Smørgrav sr_wu_enqueue_ccb(wu, ccb); 768*59c8e88eSDag-Erling Smørgrav+ sr_schedule_wu(wu); 769*59c8e88eSDag-Erling Smørgrav 770*59c8e88eSDag-Erling Smørgrav- s = splbio(); 771*59c8e88eSDag-Erling Smørgrav- 772*59c8e88eSDag-Erling Smørgrav- if (sr_check_io_collision(wu)) 773*59c8e88eSDag-Erling Smørgrav- goto queued; 774*59c8e88eSDag-Erling Smørgrav- 775*59c8e88eSDag-Erling Smørgrav- sr_raid_startwu(wu); 776*59c8e88eSDag-Erling Smørgrav- 777*59c8e88eSDag-Erling Smørgrav-queued: 778*59c8e88eSDag-Erling Smørgrav- splx(s); 779*59c8e88eSDag-Erling Smørgrav return (0); 780*59c8e88eSDag-Erling Smørgrav+ 781*59c8e88eSDag-Erling Smørgrav bad: 782*59c8e88eSDag-Erling Smørgrav /* wu is unwound by sr_wu_put */ 783*59c8e88eSDag-Erling Smørgrav if (crwu) 784*59c8e88eSDag-Erling Smørgrav@@ -1259,77 +1181,39 @@ 785*59c8e88eSDag-Erling Smørgrav { 786*59c8e88eSDag-Erling Smørgrav struct scsi_xfer *xs = wu->swu_xs; 787*59c8e88eSDag-Erling Smørgrav struct sr_crypto_wu *crwu; 788*59c8e88eSDag-Erling Smørgrav- struct sr_ccb *ccb; 789*59c8e88eSDag-Erling Smørgrav int s; 790*59c8e88eSDag-Erling Smørgrav 791*59c8e88eSDag-Erling Smørgrav /* If this was a successful read, initiate decryption of the data. */ 792*59c8e88eSDag-Erling Smørgrav if (ISSET(xs->flags, SCSI_DATA_IN) && xs->error == XS_NOERROR) { 793*59c8e88eSDag-Erling Smørgrav- /* only fails on implementation error */ 794*59c8e88eSDag-Erling Smørgrav- crwu = sr_crypto_wu_get(wu, 0); 795*59c8e88eSDag-Erling Smørgrav- if (crwu == NULL) 796*59c8e88eSDag-Erling Smørgrav- panic("sr_crypto_intr: no wu"); 797*59c8e88eSDag-Erling Smørgrav+ crwu = sr_crypto_prepare(wu, 0); 798*59c8e88eSDag-Erling Smørgrav crwu->cr_crp->crp_callback = sr_crypto_read; 799*59c8e88eSDag-Erling Smørgrav- ccb = TAILQ_FIRST(&wu->swu_ccb); 800*59c8e88eSDag-Erling Smørgrav- if (ccb == NULL) 801*59c8e88eSDag-Erling Smørgrav- panic("sr_crypto_done: no ccbs on workunit"); 802*59c8e88eSDag-Erling Smørgrav- ccb->ccb_opaque = crwu; 803*59c8e88eSDag-Erling Smørgrav- DNPRINTF(SR_D_INTR, "%s: sr_crypto_intr: crypto_invoke %p\n", 804*59c8e88eSDag-Erling Smørgrav+ DNPRINTF(SR_D_INTR, "%s: sr_crypto_done: crypto_dispatch %p\n", 805*59c8e88eSDag-Erling Smørgrav DEVNAME(wu->swu_dis->sd_sc), crwu->cr_crp); 806*59c8e88eSDag-Erling Smørgrav- s = splvm(); 807*59c8e88eSDag-Erling Smørgrav- crypto_invoke(crwu->cr_crp); 808*59c8e88eSDag-Erling Smørgrav- splx(s); 809*59c8e88eSDag-Erling Smørgrav+ crypto_dispatch(crwu->cr_crp); 810*59c8e88eSDag-Erling Smørgrav return; 811*59c8e88eSDag-Erling Smørgrav } 812*59c8e88eSDag-Erling Smørgrav 813*59c8e88eSDag-Erling Smørgrav s = splbio(); 814*59c8e88eSDag-Erling Smørgrav- sr_crypto_finish_io(wu); 815*59c8e88eSDag-Erling Smørgrav+ sr_scsi_done(wu->swu_dis, wu->swu_xs); 816*59c8e88eSDag-Erling Smørgrav splx(s); 817*59c8e88eSDag-Erling Smørgrav } 818*59c8e88eSDag-Erling Smørgrav 819*59c8e88eSDag-Erling Smørgrav void 820*59c8e88eSDag-Erling Smørgrav-sr_crypto_finish_io(struct sr_workunit *wu) 821*59c8e88eSDag-Erling Smørgrav-{ 822*59c8e88eSDag-Erling Smørgrav- struct sr_discipline *sd = wu->swu_dis; 823*59c8e88eSDag-Erling Smørgrav- struct scsi_xfer *xs = wu->swu_xs; 824*59c8e88eSDag-Erling Smørgrav- struct sr_ccb *ccb; 825*59c8e88eSDag-Erling Smørgrav-#ifdef SR_DEBUG 826*59c8e88eSDag-Erling Smørgrav- struct sr_softc *sc = sd->sd_sc; 827*59c8e88eSDag-Erling Smørgrav-#endif /* SR_DEBUG */ 828*59c8e88eSDag-Erling Smørgrav- 829*59c8e88eSDag-Erling Smørgrav- splassert(IPL_BIO); 830*59c8e88eSDag-Erling Smørgrav- 831*59c8e88eSDag-Erling Smørgrav- DNPRINTF(SR_D_INTR, "%s: sr_crypto_finish_io: wu %x xs: %x\n", 832*59c8e88eSDag-Erling Smørgrav- DEVNAME(sc), wu, xs); 833*59c8e88eSDag-Erling Smørgrav- 834*59c8e88eSDag-Erling Smørgrav- if (wu->swu_cb_active == 1) 835*59c8e88eSDag-Erling Smørgrav- panic("%s: sr_crypto_finish_io", DEVNAME(sd->sd_sc)); 836*59c8e88eSDag-Erling Smørgrav- TAILQ_FOREACH(ccb, &wu->swu_ccb, ccb_link) { 837*59c8e88eSDag-Erling Smørgrav- if (ccb->ccb_opaque == NULL) 838*59c8e88eSDag-Erling Smørgrav- continue; 839*59c8e88eSDag-Erling Smørgrav- sr_crypto_wu_put(ccb->ccb_opaque); 840*59c8e88eSDag-Erling Smørgrav- } 841*59c8e88eSDag-Erling Smørgrav- 842*59c8e88eSDag-Erling Smørgrav- sr_scsi_done(sd, xs); 843*59c8e88eSDag-Erling Smørgrav-} 844*59c8e88eSDag-Erling Smørgrav- 845*59c8e88eSDag-Erling Smørgrav-int 846*59c8e88eSDag-Erling Smørgrav sr_crypto_read(struct cryptop *crp) 847*59c8e88eSDag-Erling Smørgrav { 848*59c8e88eSDag-Erling Smørgrav struct sr_crypto_wu *crwu = crp->crp_opaque; 849*59c8e88eSDag-Erling Smørgrav- struct sr_workunit *wu = crwu->cr_wu; 850*59c8e88eSDag-Erling Smørgrav+ struct sr_workunit *wu = &crwu->cr_wu; 851*59c8e88eSDag-Erling Smørgrav int s; 852*59c8e88eSDag-Erling Smørgrav 853*59c8e88eSDag-Erling Smørgrav- DNPRINTF(SR_D_INTR, "%s: sr_crypto_read: wu %x xs: %x\n", 854*59c8e88eSDag-Erling Smørgrav+ DNPRINTF(SR_D_INTR, "%s: sr_crypto_read: wu %p xs: %p\n", 855*59c8e88eSDag-Erling Smørgrav DEVNAME(wu->swu_dis->sd_sc), wu, wu->swu_xs); 856*59c8e88eSDag-Erling Smørgrav 857*59c8e88eSDag-Erling Smørgrav if (crp->crp_etype) 858*59c8e88eSDag-Erling Smørgrav wu->swu_xs->error = XS_DRIVER_STUFFUP; 859*59c8e88eSDag-Erling Smørgrav 860*59c8e88eSDag-Erling Smørgrav s = splbio(); 861*59c8e88eSDag-Erling Smørgrav- sr_crypto_finish_io(wu); 862*59c8e88eSDag-Erling Smørgrav+ sr_scsi_done(wu->swu_dis, wu->swu_xs); 863*59c8e88eSDag-Erling Smørgrav splx(s); 864*59c8e88eSDag-Erling Smørgrav- 865*59c8e88eSDag-Erling Smørgrav- return (0); 866*59c8e88eSDag-Erling Smørgrav } 867*59c8e88eSDag-Erling Smørgrav 868*59c8e88eSDag-Erling Smørgrav void 869