From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:48:24 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1510CF4; Mon, 8 Sep 2014 04:48:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE792CDE for ; Mon, 8 Sep 2014 04:48:23 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B94B219D8 for ; Mon, 8 Sep 2014 04:48:23 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884mNWM019755 for ; Mon, 8 Sep 2014 04:48:23 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884mN1e019752 for perforce@freebsd.org; Mon, 8 Sep 2014 04:48:23 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:48:23 GMT Message-Id: <201409080448.s884mN1e019752@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198590 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:48:24 -0000 http://p4web.freebsd.org/@@1198590?ac=10 Change 1198590 by jmg@jmg_carbon2 on 2014/08/11 21:11:42 save my work on trying to make xform.c be local to the software, but apparently via's padlock uses the software which IMO it shouldn't, at least not with out a proper public interface... Affected files ... .. //depot/projects/opencrypto/sys/crypto/via/padlock.h#2 edit .. //depot/projects/opencrypto/sys/crypto/via/padlock_hash.c#3 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#4 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#4 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#4 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.h#2 edit .. //depot/projects/opencrypto/sys/opencrypto/xform.c#5 edit .. //depot/projects/opencrypto/sys/opencrypto/xform.h#5 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/via/padlock.h#2 (text+ko) ==== @@ -64,12 +64,17 @@ #define cw_filler2 __field.filler2 #define cw_filler3 __field.filler3 +struct auth_hash_comb { + struct auth_hash axf; + struct auth_hash_funcs axff; +}; + struct padlock_session { union padlock_cw ses_cw __aligned(16); uint32_t ses_ekey[4 * (RIJNDAEL_MAXNR + 1) + 4] __aligned(16); /* 128 bit aligned */ uint32_t ses_dkey[4 * (RIJNDAEL_MAXNR + 1) + 4] __aligned(16); /* 128 bit aligned */ uint8_t ses_iv[16] __aligned(16); /* 128 bit aligned */ - struct auth_hash *ses_axf; + struct auth_hash_comb *ses_axfc; uint8_t *ses_ictx; uint8_t *ses_octx; int ses_mlen; ==== //depot/projects/opencrypto/sys/crypto/via/padlock_hash.c#3 (text+ko) ==== @@ -80,17 +80,21 @@ static void padlock_sha1_final(uint8_t *hash, struct padlock_sha_ctx *ctx); static void padlock_sha256_final(uint8_t *hash, struct padlock_sha_ctx *ctx); -static struct auth_hash padlock_hmac_sha1 = { - CRYPTO_SHA1_HMAC, "HMAC-SHA1", - 20, SHA1_HASH_LEN, SHA1_HMAC_BLOCK_LEN, sizeof(struct padlock_sha_ctx), - (void (*)(void *))padlock_sha_init, NULL, NULL, - (int (*)(void *, const uint8_t *, uint16_t))padlock_sha_update, - (void (*)(uint8_t *, void *))padlock_sha1_final +static struct auth_hash_comb padlock_hmac_sha1 = { + { CRYPTO_SHA1_HMAC, "HMAC-SHA1", + 20, SHA1_HASH_LEN, SHA1_HMAC_BLOCK_LEN, + sizeof(struct padlock_sha_ctx), }, + { (void (*)(void *))padlock_sha_init, NULL, NULL, + (int (*)(void *, const uint8_t *, uint16_t))padlock_sha_update, + (void (*)(uint8_t *, void *))padlock_sha1_final }, }; static struct auth_hash padlock_hmac_sha256 = { CRYPTO_SHA2_256_HMAC, "HMAC-SHA2-256", 32, SHA2_256_HASH_LEN, SHA2_256_HMAC_BLOCK_LEN, sizeof(struct padlock_sha_ctx), +}; + +static struct auth_hash_funcs padlock_hmac_sha256_funcs = { (void (*)(void *))padlock_sha_init, NULL, NULL, (int (*)(void *, const uint8_t *, uint16_t))padlock_sha_update, (void (*)(uint8_t *, void *))padlock_sha256_final @@ -243,11 +247,15 @@ static void padlock_hash_key_setup(struct padlock_session *ses, caddr_t key, int klen) { + struct auth_hash_comb *axfc; struct auth_hash *axf; + struct auth_hash_funcs *axff; int i; klen /= 8; - axf = ses->ses_axf; + axfc = ses->ses_axfc; + axf = &axfc->axf; + axff = &axfc->axff; /* * Try to free contexts before using them, because @@ -260,16 +268,16 @@ for (i = 0; i < klen; i++) key[i] ^= HMAC_IPAD_VAL; - axf->Init(ses->ses_ictx); - axf->Update(ses->ses_ictx, key, klen); - axf->Update(ses->ses_ictx, hmac_ipad_buffer, axf->blocksize - klen); + axff->Init(ses->ses_ictx); + axff->Update(ses->ses_ictx, key, klen); + axff->Update(ses->ses_ictx, hmac_ipad_buffer, axf->blocksize - klen); for (i = 0; i < klen; i++) key[i] ^= (HMAC_IPAD_VAL ^ HMAC_OPAD_VAL); - axf->Init(ses->ses_octx); - axf->Update(ses->ses_octx, key, klen); - axf->Update(ses->ses_octx, hmac_opad_buffer, axf->blocksize - klen); + axff->Init(ses->ses_octx); + axff->Update(ses->ses_octx, key, klen); + axff->Update(ses->ses_octx, hmac_opad_buffer, axf->blocksize - klen); for (i = 0; i < klen; i++) key[i] ^= HMAC_OPAD_VAL; @@ -287,7 +295,7 @@ union authctx ctx; int error; - axf = ses->ses_axf; + axfc = ses->ses_axfc; padlock_copy_ctx(axf, ses->ses_ictx, &ctx); error = crypto_apply(flags, buf, crd->crd_skip, crd->crd_len, ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#4 (text+ko) ==== @@ -271,9 +271,9 @@ struct mtx lock; /* for op submission */ u_int32_t cipher; - struct enc_xform *txform; + const struct enc_xform *txform; u_int32_t mac; - struct auth_hash *thash; + const struct auth_hash *thash; caddr_t key; int keylen; @@ -322,8 +322,8 @@ static int csedelete(struct fcrypt *, struct csession *); static struct csession *cseadd(struct fcrypt *, struct csession *); static struct csession *csecreate(struct fcrypt *, u_int64_t, caddr_t, - u_int64_t, caddr_t, u_int64_t, u_int32_t, u_int32_t, struct enc_xform *, - struct auth_hash *); + u_int64_t, caddr_t, u_int64_t, u_int32_t, u_int32_t, + const struct enc_xform *, const struct auth_hash *); static int csefree(struct csession *); static int cryptodev_op(struct csession *, struct crypt_op *, @@ -391,8 +391,8 @@ struct session_op *sop; struct crypt_op *cop; struct crypt_aead *caead; - struct enc_xform *txform = NULL; - struct auth_hash *thash = NULL; + const struct enc_xform *txform = NULL; + const struct auth_hash *thash = NULL; struct crypt_kop *kop; u_int64_t sid; u_int32_t ses; @@ -418,96 +418,25 @@ } else #endif sop = (struct session_op *)data; - switch (sop->cipher) { - case 0: - break; - case CRYPTO_DES_CBC: - txform = &enc_xform_des; - break; - case CRYPTO_3DES_CBC: - txform = &enc_xform_3des; - break; - case CRYPTO_BLF_CBC: - txform = &enc_xform_blf; - break; - case CRYPTO_CAST_CBC: - txform = &enc_xform_cast5; - break; - case CRYPTO_SKIPJACK_CBC: - txform = &enc_xform_skipjack; - break; - case CRYPTO_AES_CBC: - txform = &enc_xform_rijndael128; - break; - case CRYPTO_AES_XTS: - txform = &enc_xform_aes_xts; - break; - case CRYPTO_NULL_CBC: - txform = &enc_xform_null; - break; - case CRYPTO_ARC4: - txform = &enc_xform_arc4; - break; - case CRYPTO_CAMELLIA_CBC: - txform = &enc_xform_camellia; - break; - case CRYPTO_AES_ICM: - txform = &enc_xform_aes_icm; - break; - case CRYPTO_AES_NIST_GCM_16: - txform = &enc_xform_aes_nist_gcm; - break; - - default: - CRYPTDEB("invalid cipher"); - return (EINVAL); + if (sop->cipher != 0) { + if (CRYPTO_ALGO_VALID(sop->cipher) && + oc_enc_xform_array[sop->cipher].type == + sop->cipher) { + txform = &oc_enc_xform_array[sop->cipher]; + } else { + CRYPTDEB("invalid cipher"); + return (EINVAL); + } } - switch (sop->mac) { - case 0: - break; - case CRYPTO_MD5_HMAC: - thash = &auth_hash_hmac_md5; - break; - case CRYPTO_SHA1_HMAC: - thash = &auth_hash_hmac_sha1; - break; - case CRYPTO_SHA2_256_HMAC: - thash = &auth_hash_hmac_sha2_256; - break; - case CRYPTO_SHA2_384_HMAC: - thash = &auth_hash_hmac_sha2_384; - break; - case CRYPTO_SHA2_512_HMAC: - thash = &auth_hash_hmac_sha2_512; - break; - case CRYPTO_RIPEMD160_HMAC: - thash = &auth_hash_hmac_ripemd_160; - break; - case CRYPTO_AES_128_NIST_GMAC: - thash = &auth_hash_nist_gmac_aes_128; - break; - case CRYPTO_AES_192_NIST_GMAC: - thash = &auth_hash_nist_gmac_aes_192; - break; - case CRYPTO_AES_256_NIST_GMAC: - thash = &auth_hash_nist_gmac_aes_256; - break; - -#ifdef notdef - case CRYPTO_MD5: - thash = &auth_hash_md5; - break; - case CRYPTO_SHA1: - thash = &auth_hash_sha1; - break; -#endif - case CRYPTO_NULL_HMAC: - thash = &auth_hash_null; - break; - default: - CRYPTDEB("invalid mac"); - return (EINVAL); + if (sop->mac != 0) { + if (CRYPTO_ALGO_VALID(sop->cipher) && + oc_auth_hash_array[sop->cipher].type == sop->mac) { + thash = &oc_auth_hash_array[sop->cipher]; + } else { + CRYPTDEB("invalid hash"); + return (EINVAL); + } } bzero(&crie, sizeof(crie)); @@ -1266,7 +1195,7 @@ struct csession * csecreate(struct fcrypt *fcr, u_int64_t sid, caddr_t key, u_int64_t keylen, caddr_t mackey, u_int64_t mackeylen, u_int32_t cipher, u_int32_t mac, - struct enc_xform *txform, struct auth_hash *thash) + const struct enc_xform *txform, const struct auth_hash *thash) { struct csession *cse; ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#4 (text+ko) ==== @@ -140,6 +140,9 @@ #define CRYPTO_AES_256_NIST_GMAC 28 /* auth side */ #define CRYPTO_ALGORITHM_MAX 28 /* Keep updated - see below */ +#define CRYPTO_ALGO_VALID(x) ((x) >= CRYPTO_ALGORITHM_MIN && \ + (x) <= CRYPTO_ALGORITHM_MAX) + /* Algorithm flags */ #define CRYPTO_ALG_FLAG_SUPPORTED 0x01 /* Algorithm is supported */ #define CRYPTO_ALG_FLAG_RNG_ENABLE 0x02 /* Has HW RNG for DH/DSA */ ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#4 (text+ko) ==== @@ -84,10 +84,12 @@ { unsigned char iv[EALG_MAX_BLOCK_LEN], blk[EALG_MAX_BLOCK_LEN], *idat; unsigned char *ivp, piv[EALG_MAX_BLOCK_LEN]; - struct enc_xform *exf; + const struct enc_xform *exf; + const struct enc_xform_funcs *exff; int i, k, j, blks; exf = sw->sw_exf; + exff = &oc_enc_xform_funcs[exf->type]; blks = exf->blocksize; /* Check for non-padded data */ @@ -120,8 +122,8 @@ int error; if (sw->sw_kschedule) - exf->zerokey(&(sw->sw_kschedule)); - error = exf->setkey(&sw->sw_kschedule, + exff->zerokey(&(sw->sw_kschedule)); + error = exff->setkey(&sw->sw_kschedule, crd->crd_key, crd->crd_klen / 8); if (error) return (error); @@ -133,8 +135,8 @@ * xforms that provide a reinit method perform all IV * handling themselves. */ - if (exf->reinit) - exf->reinit(sw->sw_kschedule, iv); + if (exff->reinit != NULL) + exff->reinit(sw->sw_kschedule, iv); if (flags & CRYPTO_F_IMBUF) { struct mbuf *m = (struct mbuf *) buf; @@ -155,12 +157,12 @@ m_copydata(m, k, blks, blk); /* Actual encryption/decryption */ - if (exf->reinit) { + if (exff->reinit != NULL) { if (crd->crd_flags & CRD_F_ENCRYPT) { - exf->encrypt(sw->sw_kschedule, + exff->encrypt(sw->sw_kschedule, blk); } else { - exf->decrypt(sw->sw_kschedule, + exff->decrypt(sw->sw_kschedule, blk); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { @@ -168,7 +170,7 @@ for (j = 0; j < blks; j++) blk[j] ^= ivp[j]; - exf->encrypt(sw->sw_kschedule, blk); + exff->encrypt(sw->sw_kschedule, blk); /* * Keep encrypted block for XOR'ing @@ -186,7 +188,7 @@ else bcopy(blk, iv, blks); - exf->decrypt(sw->sw_kschedule, blk); + exff->decrypt(sw->sw_kschedule, blk); /* XOR with previous block */ for (j = 0; j < blks; j++) @@ -233,12 +235,12 @@ idat = mtod(m, unsigned char *) + k; while (m->m_len >= k + blks && i > 0) { - if (exf->reinit) { + if (exff->reinit != NULL) { if (crd->crd_flags & CRD_F_ENCRYPT) { - exf->encrypt(sw->sw_kschedule, + exff->encrypt(sw->sw_kschedule, idat); } else { - exf->decrypt(sw->sw_kschedule, + exff->decrypt(sw->sw_kschedule, idat); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { @@ -246,7 +248,7 @@ for (j = 0; j < blks; j++) idat[j] ^= ivp[j]; - exf->encrypt(sw->sw_kschedule, idat); + exff->encrypt(sw->sw_kschedule, idat); ivp = idat; } else { /* decrypt */ /* @@ -258,7 +260,7 @@ else bcopy(idat, iv, blks); - exf->decrypt(sw->sw_kschedule, idat); + exff->decrypt(sw->sw_kschedule, idat); /* XOR with previous block/IV */ for (j = 0; j < blks; j++) @@ -297,12 +299,12 @@ cuio_copydata(uio, k, blks, blk); /* Actual encryption/decryption */ - if (exf->reinit) { + if (exff->reinit != NULL) { if (crd->crd_flags & CRD_F_ENCRYPT) { - exf->encrypt(sw->sw_kschedule, + exff->encrypt(sw->sw_kschedule, blk); } else { - exf->decrypt(sw->sw_kschedule, + exff->decrypt(sw->sw_kschedule, blk); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { @@ -310,7 +312,7 @@ for (j = 0; j < blks; j++) blk[j] ^= ivp[j]; - exf->encrypt(sw->sw_kschedule, blk); + exff->encrypt(sw->sw_kschedule, blk); /* * Keep encrypted block for XOR'ing @@ -328,7 +330,7 @@ else bcopy(blk, iv, blks); - exf->decrypt(sw->sw_kschedule, blk); + exff->decrypt(sw->sw_kschedule, blk); /* XOR with previous block */ for (j = 0; j < blks; j++) @@ -363,12 +365,12 @@ idat = (char *)iov->iov_base + k; while (iov->iov_len >= k + blks && i > 0) { - if (exf->reinit) { + if (exff->reinit != NULL) { if (crd->crd_flags & CRD_F_ENCRYPT) { - exf->encrypt(sw->sw_kschedule, + exff->encrypt(sw->sw_kschedule, idat); } else { - exf->decrypt(sw->sw_kschedule, + exff->decrypt(sw->sw_kschedule, idat); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { @@ -376,7 +378,7 @@ for (j = 0; j < blks; j++) idat[j] ^= ivp[j]; - exf->encrypt(sw->sw_kschedule, idat); + exff->encrypt(sw->sw_kschedule, idat); ivp = idat; } else { /* decrypt */ /* @@ -388,7 +390,7 @@ else bcopy(idat, iv, blks); - exf->decrypt(sw->sw_kschedule, idat); + exff->decrypt(sw->sw_kschedule, idat); /* XOR with previous block/IV */ for (j = 0; j < blks; j++) @@ -412,13 +414,13 @@ return 0; /* Done with iovec encryption/decryption */ } else { /* contiguous buffer */ - if (exf->reinit) { + if (exff->reinit != NULL) { for (i = crd->crd_skip; i < crd->crd_skip + crd->crd_len; i += blks) { if (crd->crd_flags & CRD_F_ENCRYPT) - exf->encrypt(sw->sw_kschedule, buf + i); + exff->encrypt(sw->sw_kschedule, buf + i); else - exf->decrypt(sw->sw_kschedule, buf + i); + exff->decrypt(sw->sw_kschedule, buf + i); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { for (i = crd->crd_skip; @@ -430,7 +432,7 @@ else for (k = 0; k < blks; k++) buf[i + k] ^= buf[i + k - blks]; - exf->encrypt(sw->sw_kschedule, buf + i); + exff->encrypt(sw->sw_kschedule, buf + i); } } else { /* Decrypt */ /* @@ -439,7 +441,7 @@ */ for (i = crd->crd_skip + crd->crd_len - blks; i >= crd->crd_skip; i -= blks) { - exf->decrypt(sw->sw_kschedule, buf + i); + exff->decrypt(sw->sw_kschedule, buf + i); /* XOR with the IV/previous block, as appropriate */ if (i == crd->crd_skip) @@ -459,11 +461,13 @@ } static void -swcr_authprepare(struct auth_hash *axf, struct swcr_data *sw, u_char *key, +swcr_authprepare(const struct auth_hash *axf, struct swcr_data *sw, u_char *key, int klen) { + const struct auth_hash_funcs *axff; int k; + axff = &oc_auth_hash_funcs[axf->type]; klen /= 8; switch (axf->type) { @@ -477,16 +481,16 @@ for (k = 0; k < klen; k++) key[k] ^= HMAC_IPAD_VAL; - axf->Init(sw->sw_ictx); - axf->Update(sw->sw_ictx, key, klen); - axf->Update(sw->sw_ictx, hmac_ipad_buffer, axf->blocksize - klen); + axff->Init(sw->sw_ictx); + axff->Update(sw->sw_ictx, key, klen); + axff->Update(sw->sw_ictx, hmac_ipad_buffer, axf->blocksize - klen); for (k = 0; k < klen; k++) key[k] ^= (HMAC_IPAD_VAL ^ HMAC_OPAD_VAL); - axf->Init(sw->sw_octx); - axf->Update(sw->sw_octx, key, klen); - axf->Update(sw->sw_octx, hmac_opad_buffer, axf->blocksize - klen); + axff->Init(sw->sw_octx); + axff->Update(sw->sw_octx, key, klen); + axff->Update(sw->sw_octx, hmac_opad_buffer, axf->blocksize - klen); for (k = 0; k < klen; k++) key[k] ^= HMAC_OPAD_VAL; @@ -508,9 +512,9 @@ sw->sw_klen = klen; bcopy(key, sw->sw_octx, klen); - axf->Init(sw->sw_ictx); - axf->Update(sw->sw_ictx, key, klen); - axf->Final(buf, sw->sw_ictx); + axff->Init(sw->sw_ictx); + axff->Update(sw->sw_ictx, key, klen); + axff->Final(buf, sw->sw_ictx); break; } default: @@ -527,7 +531,8 @@ int flags) { unsigned char aalg[HASH_MAX_LEN]; - struct auth_hash *axf; + const struct auth_hash *axf; + const struct auth_hash_funcs *axff; union authctx ctx; int err; @@ -535,6 +540,7 @@ return EINVAL; axf = sw->sw_axf; + axff = &oc_auth_hash_funcs[axf->type]; if (crd->crd_flags & CRD_F_KEY_EXPLICIT) swcr_authprepare(axf, sw, crd->crd_key, crd->crd_klen); @@ -542,7 +548,7 @@ bcopy(sw->sw_ictx, &ctx, axf->ctxsize); err = crypto_apply(flags, buf, crd->crd_skip, crd->crd_len, - (int (*)(void *, void *, unsigned int))axf->Update, (caddr_t)&ctx); + (int (*)(void *, void *, unsigned int))axff->Update, (caddr_t)&ctx); if (err) return err; @@ -556,10 +562,10 @@ if (sw->sw_octx == NULL) return EINVAL; - axf->Final(aalg, &ctx); + axff->Final(aalg, &ctx); bcopy(sw->sw_octx, &ctx, axf->ctxsize); - axf->Update(&ctx, aalg, axf->hashsize); - axf->Final(aalg, &ctx); + axff->Update(&ctx, aalg, axf->hashsize); + axff->Final(aalg, &ctx); break; case CRYPTO_MD5_KPDK: @@ -575,12 +581,12 @@ * and let Final() do the proper, natural "algofill" * padding. */ - axf->Update(&ctx, sw->sw_octx, sw->sw_klen); - axf->Final(aalg, &ctx); + axff->Update(&ctx, sw->sw_octx, sw->sw_klen); + axff->Final(aalg, &ctx); break; case CRYPTO_NULL_HMAC: - axf->Final(aalg, &ctx); + axff->Final(aalg, &ctx); break; } @@ -604,8 +610,10 @@ union authctx ctx; struct cryptodesc *crd, *crda = NULL, *crde = NULL; struct swcr_data *sw, *swa, *swe = NULL; - struct auth_hash *axf = NULL; - struct enc_xform *exf = NULL; + const struct auth_hash *axf = NULL; + const struct auth_hash_funcs *axff = NULL; + const struct enc_xform *exf = NULL; + struct enc_xform_funcs *exff = NULL; caddr_t buf = (caddr_t)crp->crp_buf; uint32_t *blkp; int aadlen, blksz, i, ivlen, len, iskip, oskip, r; @@ -670,9 +678,11 @@ } } + axff = &oc_auth_hash_funcs[axf->type]; + /* Supply MAC with IV */ - if (axf->Reinit) - axf->Reinit(&ctx, iv, ivlen); + if (axff->Reinit != NULL) + axff->Reinit(&ctx, iv, ivlen); /* Supply MAC with AAD */ aadlen = crda->crd_len; @@ -682,12 +692,12 @@ crypto_copydata(crp->crp_flags, buf, crda->crd_skip + i, len, blk + oskip); bzero(blk + len + oskip, blksz - len - oskip); - axf->Update(&ctx, blk, blksz); + axff->Update(&ctx, blk, blksz); oskip = 0; /* reset initial output offset */ } - if (exf->reinit) - exf->reinit(swe->sw_kschedule, iv); + if (exff->reinit != NULL) + exff->reinit(swe->sw_kschedule, iv); /* Do encryption/decryption with MAC */ for (i = 0; i < crde->crd_len; i += blksz) { @@ -697,12 +707,12 @@ crypto_copydata(crp->crp_flags, buf, crde->crd_skip + i, len, blk); if (crde->crd_flags & CRD_F_ENCRYPT) { - exf->encrypt(swe->sw_kschedule, blk); - axf->Update(&ctx, blk, len); + exff->encrypt(swe->sw_kschedule, blk); + axff->Update(&ctx, blk, len); crypto_copyback(crp->crp_flags, buf, crde->crd_skip + i, len, blk); } else { - axf->Update(&ctx, blk, len); + axff->Update(&ctx, blk, len); } } @@ -717,12 +727,12 @@ *blkp = htobe32(aadlen * 8); blkp = (uint32_t *)blk + 3; *blkp = htobe32(crde->crd_len * 8); - axf->Update(&ctx, blk, blksz); + axff->Update(&ctx, blk, blksz); break; } /* Finalize MAC */ - axf->Final(aalg, &ctx); + axff->Final(aalg, &ctx); /* Validate tag */ crypto_copydata(crp->crp_flags, buf, crda->crd_inject, axf->hashsize, @@ -740,7 +750,7 @@ crypto_copydata(crp->crp_flags, buf, crde->crd_skip + i, len, blk); if (!(crde->crd_flags & CRD_F_ENCRYPT)) { - exf->decrypt(swe->sw_kschedule, blk); + exff->decrypt(swe->sw_kschedule, blk); } crypto_copyback(crp->crp_flags, buf, crde->crd_skip + i, len, blk); @@ -762,11 +772,13 @@ caddr_t buf, int flags) { u_int8_t *data, *out; - struct comp_algo *cxf; + const struct comp_algo *cxf; + const struct comp_algo_funcs *cxff; int adj; u_int32_t result; cxf = sw->sw_cxf; + cxff = &oc_comp_algo_funcs[cxf->type]; /* We must handle the whole buffer of data in one time * then if there is not all the data in the mbuf, we must @@ -779,9 +791,9 @@ crypto_copydata(flags, buf, crd->crd_skip, crd->crd_len, data); if (crd->crd_flags & CRD_F_COMP) - result = cxf->compress(data, crd->crd_len, &out); + result = cxff->compress(data, crd->crd_len, &out); else - result = cxf->decompress(data, crd->crd_len, &out); + result = cxff->decompress(data, crd->crd_len, &out); free(data, M_CRYPTO_DATA); if (result == 0) @@ -837,9 +849,11 @@ swcr_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri) { struct swcr_data **swd; - struct auth_hash *axf; - struct enc_xform *txf; - struct comp_algo *cxf; + const struct auth_hash *axf; + const struct auth_hash_funcs *axff; + const struct enc_xform *txf; + const struct enc_xform_funcs *txff; + const struct comp_algo *cxf; u_int32_t i; int error; @@ -897,46 +911,25 @@ } switch (cri->cri_alg) { + case CRYPTO_AES_NIST_GMAC: + txf = &oc_enc_xform_array[cri->cri_alg]; + (*swd)->sw_exf = txf; + break; case CRYPTO_DES_CBC: - txf = &enc_xform_des; - goto enccommon; case CRYPTO_3DES_CBC: - txf = &enc_xform_3des; - goto enccommon; case CRYPTO_BLF_CBC: - txf = &enc_xform_blf; - goto enccommon; case CRYPTO_CAST_CBC: - txf = &enc_xform_cast5; - goto enccommon; case CRYPTO_SKIPJACK_CBC: - txf = &enc_xform_skipjack; - goto enccommon; case CRYPTO_RIJNDAEL128_CBC: - txf = &enc_xform_rijndael128; - goto enccommon; case CRYPTO_AES_XTS: - txf = &enc_xform_aes_xts; - goto enccommon; case CRYPTO_AES_ICM: - txf = &enc_xform_aes_icm; - goto enccommon; case CRYPTO_AES_NIST_GCM_16: - txf = &enc_xform_aes_nist_gcm; - goto enccommon; - case CRYPTO_AES_NIST_GMAC: - txf = &enc_xform_aes_nist_gmac; - (*swd)->sw_exf = txf; - break; case CRYPTO_CAMELLIA_CBC: - txf = &enc_xform_camellia; - goto enccommon; case CRYPTO_NULL_CBC: - txf = &enc_xform_null; - goto enccommon; - enccommon: + txf = &oc_enc_xform_array[cri->cri_alg]; + txff = &oc_enc_xform_funcs[txf->type]; if (cri->cri_key != NULL) { - error = txf->setkey(&((*swd)->sw_kschedule), + error = txff->setkey(&((*swd)->sw_kschedule), cri->cri_key, cri->cri_klen / 8); if (error) { swcr_freesession_locked(dev, i); @@ -948,26 +941,13 @@ break; case CRYPTO_MD5_HMAC: - axf = &auth_hash_hmac_md5; - goto authcommon; case CRYPTO_SHA1_HMAC: - axf = &auth_hash_hmac_sha1; - goto authcommon; case CRYPTO_SHA2_256_HMAC: - axf = &auth_hash_hmac_sha2_256; - goto authcommon; case CRYPTO_SHA2_384_HMAC: - axf = &auth_hash_hmac_sha2_384; - goto authcommon; case CRYPTO_SHA2_512_HMAC: - axf = &auth_hash_hmac_sha2_512; - goto authcommon; case CRYPTO_NULL_HMAC: - axf = &auth_hash_null; - goto authcommon; case CRYPTO_RIPEMD160_HMAC: - axf = &auth_hash_hmac_ripemd_160; - authcommon: + axf = &oc_auth_hash_array[cri->cri_alg]; (*swd)->sw_ictx = malloc(axf->ctxsize, M_CRYPTO_DATA, M_NOWAIT); if ((*swd)->sw_ictx == NULL) { @@ -994,12 +974,8 @@ break; case CRYPTO_MD5_KPDK: - axf = &auth_hash_key_md5; - goto auth2common; - case CRYPTO_SHA1_KPDK: - axf = &auth_hash_key_sha1; - auth2common: + axf = &oc_auth_hash_array[cri->cri_alg]; (*swd)->sw_ictx = malloc(axf->ctxsize, M_CRYPTO_DATA, M_NOWAIT); if ((*swd)->sw_ictx == NULL) { @@ -1027,12 +1003,9 @@ break; #ifdef notdef case CRYPTO_MD5: - axf = &auth_hash_md5; - goto auth3common; - case CRYPTO_SHA1: - axf = &auth_hash_sha1; auth3common: + axf = &oc_auth_hash_array[cri->cri_alg]; (*swd)->sw_ictx = malloc(axf->ctxsize, M_CRYPTO_DATA, M_NOWAIT); if ((*swd)->sw_ictx == NULL) { @@ -1048,16 +1021,10 @@ #endif case CRYPTO_AES_128_NIST_GMAC: - axf = &auth_hash_nist_gmac_aes_128; - goto auth4common; - case CRYPTO_AES_192_NIST_GMAC: - axf = &auth_hash_nist_gmac_aes_192; - goto auth4common; - case CRYPTO_AES_256_NIST_GMAC: - axf = &auth_hash_nist_gmac_aes_256; - auth4common: + axf = &oc_auth_hash_array[cri->cri_alg]; + axff = &oc_auth_hash_funcs[axf->type]; (*swd)->sw_ictx = malloc(axf->ctxsize, M_CRYPTO_DATA, M_NOWAIT); if ((*swd)->sw_ictx == NULL) { @@ -1065,14 +1032,14 @@ rw_runlock(&swcr_sessions_lock); return ENOBUFS; } - axf->Init((*swd)->sw_ictx); - axf->Setkey((*swd)->sw_ictx, cri->cri_key, + axff->Init((*swd)->sw_ictx); + axff->Setkey((*swd)->sw_ictx, cri->cri_key, cri->cri_klen / 8); (*swd)->sw_axf = axf; break; case CRYPTO_DEFLATE_COMP: - cxf = &comp_algo_deflate; + cxf = &oc_comp_algo_array[cri->cri_alg]; (*swd)->sw_cxf = cxf; break; default: @@ -1107,9 +1074,10 @@ swcr_freesession_locked(device_t dev, u_int64_t tid) { struct swcr_data *swd; - struct enc_xform *txf; - struct auth_hash *axf; - struct comp_algo *cxf; + const struct enc_xform *txf; + const struct enc_xform_funcs *txff; + const struct auth_hash *axf; + const struct comp_algo *cxf; u_int32_t sid = CRYPTO_SESID2LID(tid); if (sid > swcr_sesnum || swcr_sessions == NULL || @@ -1137,9 +1105,10 @@ case CRYPTO_CAMELLIA_CBC: case CRYPTO_NULL_CBC: txf = swd->sw_exf; + txff = &oc_enc_xform_funcs[txf->type]; if (swd->sw_kschedule) - txf->zerokey(&(swd->sw_kschedule)); + txff->zerokey(&(swd->sw_kschedule)); break; case CRYPTO_MD5_HMAC: ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.h#2 (text+ko) ==== @@ -34,15 +34,15 @@ u_int8_t *SW_octx; u_int16_t SW_klen; u_int16_t SW_mlen; - struct auth_hash *SW_axf; + const struct auth_hash *SW_axf; } SWCR_AUTH; struct { u_int8_t *SW_kschedule; - struct enc_xform *SW_exf; + const struct enc_xform *SW_exf; } SWCR_ENC; struct { u_int32_t SW_size; - struct comp_algo *SW_cxf; + const struct comp_algo *SW_cxf; } SWCR_COMP; } SWCR_UN; ==== //depot/projects/opencrypto/sys/opencrypto/xform.c#5 (text+ko) ==== @@ -150,234 +150,264 @@ MALLOC_DEFINE(M_XDATA, "xform", "xform data buffers"); /* Encryption instances */ -struct enc_xform enc_xform_null = { - CRYPTO_NULL_CBC, "NULL", - /* NB: blocksize of 4 is to generate a properly aligned ESP header */ - NULL_BLOCK_LEN, 0, 256, /* 2048 bits, max key */ - null_encrypt, - null_decrypt, - null_setkey, - null_zerokey, - NULL, +const struct enc_xform oc_enc_xform_array[CRYPTO_ALGORITHM_MAX + 1] = { + [CRYPTO_NULL_CBC] = { + CRYPTO_NULL_CBC, "NULL", + /* NB: blocksize of 4 is to generate a properly aligned ESP header */ + NULL_BLOCK_LEN, 0, 256, /* 2048 bits, max key */ + }, + [CRYPTO_DES_CBC] = { + CRYPTO_DES_CBC, "DES", + DES_BLOCK_LEN, 8, 8, + }, + [CRYPTO_3DES_CBC] = { + CRYPTO_3DES_CBC, "3DES", + DES3_BLOCK_LEN, 24, 24, + }, + [CRYPTO_BLF_CBC] = { + CRYPTO_BLF_CBC, "Blowfish", + BLOWFISH_BLOCK_LEN, 5, 56 /* 448 bits, max key */, + }, + [CRYPTO_CAST_CBC] = { + CRYPTO_CAST_CBC, "CAST-128", + CAST128_BLOCK_LEN, 5, 16, + }, + [CRYPTO_SKIPJACK_CBC] = { + CRYPTO_SKIPJACK_CBC, "Skipjack", + SKIPJACK_BLOCK_LEN, 10, 10, + }, + [CRYPTO_RIJNDAEL128_CBC] = { + CRYPTO_RIJNDAEL128_CBC, "Rijndael-128/AES", + RIJNDAEL128_BLOCK_LEN, 16, 32, + }, + [CRYPTO_AES_ICM] = { + CRYPTO_AES_ICM, "AES-ICM", + RIJNDAEL128_BLOCK_LEN, 16, 32, + }, + [CRYPTO_AES_NIST_GCM_16] = { + CRYPTO_AES_NIST_GCM_16, "AES-GCM", + 1, 16, 32, + }, + [CRYPTO_AES_NIST_GMAC] = { + CRYPTO_AES_NIST_GMAC, "AES-GMAC", + 1, 16, 32, + }, + [CRYPTO_AES_XTS] = { + CRYPTO_AES_XTS, "AES-XTS", + RIJNDAEL128_BLOCK_LEN, 32, 64, + }, + [CRYPTO_ARC4] = { + CRYPTO_ARC4, "ARC4", + 1, 1, 32, + }, + [CRYPTO_CAMELLIA_CBC] = { + CRYPTO_CAMELLIA_CBC, "Camellia", + CAMELLIA_BLOCK_LEN, 8, 32, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:48:25 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A840DC8; Mon, 8 Sep 2014 04:48:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DBEE6CDF for ; Mon, 8 Sep 2014 04:48:23 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C84DB19D9 for ; Mon, 8 Sep 2014 04:48:23 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884mNrX019761 for ; Mon, 8 Sep 2014 04:48:23 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884mNox019758 for perforce@freebsd.org; Mon, 8 Sep 2014 04:48:23 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:48:23 GMT Message-Id: <201409080448.s884mNox019758@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198591 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:48:25 -0000 http://p4web.freebsd.org/@@1198591?ac=10 Change 1198591 by jmg@jmg_carbon2 on 2014/08/11 21:14:53 back out previous change so that I can continue working... Affected files ... .. //depot/projects/opencrypto/sys/crypto/via/padlock.h#3 edit .. //depot/projects/opencrypto/sys/crypto/via/padlock_hash.c#4 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#5 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#5 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.h#3 edit .. //depot/projects/opencrypto/sys/opencrypto/xform.c#6 edit .. //depot/projects/opencrypto/sys/opencrypto/xform.h#6 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/via/padlock.h#3 (text+ko) ==== @@ -64,17 +64,12 @@ #define cw_filler2 __field.filler2 #define cw_filler3 __field.filler3 -struct auth_hash_comb { - struct auth_hash axf; - struct auth_hash_funcs axff; -}; - struct padlock_session { union padlock_cw ses_cw __aligned(16); uint32_t ses_ekey[4 * (RIJNDAEL_MAXNR + 1) + 4] __aligned(16); /* 128 bit aligned */ uint32_t ses_dkey[4 * (RIJNDAEL_MAXNR + 1) + 4] __aligned(16); /* 128 bit aligned */ uint8_t ses_iv[16] __aligned(16); /* 128 bit aligned */ - struct auth_hash_comb *ses_axfc; + struct auth_hash *ses_axf; uint8_t *ses_ictx; uint8_t *ses_octx; int ses_mlen; ==== //depot/projects/opencrypto/sys/crypto/via/padlock_hash.c#4 (text+ko) ==== @@ -80,21 +80,17 @@ static void padlock_sha1_final(uint8_t *hash, struct padlock_sha_ctx *ctx); static void padlock_sha256_final(uint8_t *hash, struct padlock_sha_ctx *ctx); -static struct auth_hash_comb padlock_hmac_sha1 = { - { CRYPTO_SHA1_HMAC, "HMAC-SHA1", - 20, SHA1_HASH_LEN, SHA1_HMAC_BLOCK_LEN, - sizeof(struct padlock_sha_ctx), }, - { (void (*)(void *))padlock_sha_init, NULL, NULL, - (int (*)(void *, const uint8_t *, uint16_t))padlock_sha_update, - (void (*)(uint8_t *, void *))padlock_sha1_final }, +static struct auth_hash padlock_hmac_sha1 = { + CRYPTO_SHA1_HMAC, "HMAC-SHA1", + 20, SHA1_HASH_LEN, SHA1_HMAC_BLOCK_LEN, sizeof(struct padlock_sha_ctx), + (void (*)(void *))padlock_sha_init, NULL, NULL, + (int (*)(void *, const uint8_t *, uint16_t))padlock_sha_update, + (void (*)(uint8_t *, void *))padlock_sha1_final }; static struct auth_hash padlock_hmac_sha256 = { CRYPTO_SHA2_256_HMAC, "HMAC-SHA2-256", 32, SHA2_256_HASH_LEN, SHA2_256_HMAC_BLOCK_LEN, sizeof(struct padlock_sha_ctx), -}; - -static struct auth_hash_funcs padlock_hmac_sha256_funcs = { (void (*)(void *))padlock_sha_init, NULL, NULL, (int (*)(void *, const uint8_t *, uint16_t))padlock_sha_update, (void (*)(uint8_t *, void *))padlock_sha256_final @@ -247,15 +243,11 @@ static void padlock_hash_key_setup(struct padlock_session *ses, caddr_t key, int klen) { - struct auth_hash_comb *axfc; struct auth_hash *axf; - struct auth_hash_funcs *axff; int i; klen /= 8; - axfc = ses->ses_axfc; - axf = &axfc->axf; - axff = &axfc->axff; + axf = ses->ses_axf; /* * Try to free contexts before using them, because @@ -268,16 +260,16 @@ for (i = 0; i < klen; i++) key[i] ^= HMAC_IPAD_VAL; - axff->Init(ses->ses_ictx); - axff->Update(ses->ses_ictx, key, klen); - axff->Update(ses->ses_ictx, hmac_ipad_buffer, axf->blocksize - klen); + axf->Init(ses->ses_ictx); + axf->Update(ses->ses_ictx, key, klen); + axf->Update(ses->ses_ictx, hmac_ipad_buffer, axf->blocksize - klen); for (i = 0; i < klen; i++) key[i] ^= (HMAC_IPAD_VAL ^ HMAC_OPAD_VAL); - axff->Init(ses->ses_octx); - axff->Update(ses->ses_octx, key, klen); - axff->Update(ses->ses_octx, hmac_opad_buffer, axf->blocksize - klen); + axf->Init(ses->ses_octx); + axf->Update(ses->ses_octx, key, klen); + axf->Update(ses->ses_octx, hmac_opad_buffer, axf->blocksize - klen); for (i = 0; i < klen; i++) key[i] ^= HMAC_OPAD_VAL; @@ -295,7 +287,7 @@ union authctx ctx; int error; - axfc = ses->ses_axfc; + axf = ses->ses_axf; padlock_copy_ctx(axf, ses->ses_ictx, &ctx); error = crypto_apply(flags, buf, crd->crd_skip, crd->crd_len, ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#5 (text+ko) ==== @@ -271,9 +271,9 @@ struct mtx lock; /* for op submission */ u_int32_t cipher; - const struct enc_xform *txform; + struct enc_xform *txform; u_int32_t mac; - const struct auth_hash *thash; + struct auth_hash *thash; caddr_t key; int keylen; @@ -322,8 +322,8 @@ static int csedelete(struct fcrypt *, struct csession *); static struct csession *cseadd(struct fcrypt *, struct csession *); static struct csession *csecreate(struct fcrypt *, u_int64_t, caddr_t, - u_int64_t, caddr_t, u_int64_t, u_int32_t, u_int32_t, - const struct enc_xform *, const struct auth_hash *); + u_int64_t, caddr_t, u_int64_t, u_int32_t, u_int32_t, struct enc_xform *, + struct auth_hash *); static int csefree(struct csession *); static int cryptodev_op(struct csession *, struct crypt_op *, @@ -391,8 +391,8 @@ struct session_op *sop; struct crypt_op *cop; struct crypt_aead *caead; - const struct enc_xform *txform = NULL; - const struct auth_hash *thash = NULL; + struct enc_xform *txform = NULL; + struct auth_hash *thash = NULL; struct crypt_kop *kop; u_int64_t sid; u_int32_t ses; @@ -418,25 +418,96 @@ } else #endif sop = (struct session_op *)data; - if (sop->cipher != 0) { - if (CRYPTO_ALGO_VALID(sop->cipher) && - oc_enc_xform_array[sop->cipher].type == - sop->cipher) { - txform = &oc_enc_xform_array[sop->cipher]; - } else { - CRYPTDEB("invalid cipher"); - return (EINVAL); - } + switch (sop->cipher) { + case 0: + break; + case CRYPTO_DES_CBC: + txform = &enc_xform_des; + break; + case CRYPTO_3DES_CBC: + txform = &enc_xform_3des; + break; + case CRYPTO_BLF_CBC: + txform = &enc_xform_blf; + break; + case CRYPTO_CAST_CBC: + txform = &enc_xform_cast5; + break; + case CRYPTO_SKIPJACK_CBC: + txform = &enc_xform_skipjack; + break; + case CRYPTO_AES_CBC: + txform = &enc_xform_rijndael128; + break; + case CRYPTO_AES_XTS: + txform = &enc_xform_aes_xts; + break; + case CRYPTO_NULL_CBC: + txform = &enc_xform_null; + break; + case CRYPTO_ARC4: + txform = &enc_xform_arc4; + break; + case CRYPTO_CAMELLIA_CBC: + txform = &enc_xform_camellia; + break; + case CRYPTO_AES_ICM: + txform = &enc_xform_aes_icm; + break; + case CRYPTO_AES_NIST_GCM_16: + txform = &enc_xform_aes_nist_gcm; + break; + + default: + CRYPTDEB("invalid cipher"); + return (EINVAL); } - if (sop->mac != 0) { - if (CRYPTO_ALGO_VALID(sop->cipher) && - oc_auth_hash_array[sop->cipher].type == sop->mac) { - thash = &oc_auth_hash_array[sop->cipher]; - } else { - CRYPTDEB("invalid hash"); - return (EINVAL); - } + switch (sop->mac) { + case 0: + break; + case CRYPTO_MD5_HMAC: + thash = &auth_hash_hmac_md5; + break; + case CRYPTO_SHA1_HMAC: + thash = &auth_hash_hmac_sha1; + break; + case CRYPTO_SHA2_256_HMAC: + thash = &auth_hash_hmac_sha2_256; + break; + case CRYPTO_SHA2_384_HMAC: + thash = &auth_hash_hmac_sha2_384; + break; + case CRYPTO_SHA2_512_HMAC: + thash = &auth_hash_hmac_sha2_512; + break; + case CRYPTO_RIPEMD160_HMAC: + thash = &auth_hash_hmac_ripemd_160; + break; + case CRYPTO_AES_128_NIST_GMAC: + thash = &auth_hash_nist_gmac_aes_128; + break; + case CRYPTO_AES_192_NIST_GMAC: + thash = &auth_hash_nist_gmac_aes_192; + break; + case CRYPTO_AES_256_NIST_GMAC: + thash = &auth_hash_nist_gmac_aes_256; + break; + +#ifdef notdef + case CRYPTO_MD5: + thash = &auth_hash_md5; + break; + case CRYPTO_SHA1: + thash = &auth_hash_sha1; + break; +#endif + case CRYPTO_NULL_HMAC: + thash = &auth_hash_null; + break; + default: + CRYPTDEB("invalid mac"); + return (EINVAL); } bzero(&crie, sizeof(crie)); @@ -1195,7 +1266,7 @@ struct csession * csecreate(struct fcrypt *fcr, u_int64_t sid, caddr_t key, u_int64_t keylen, caddr_t mackey, u_int64_t mackeylen, u_int32_t cipher, u_int32_t mac, - const struct enc_xform *txform, const struct auth_hash *thash) + struct enc_xform *txform, struct auth_hash *thash) { struct csession *cse; ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#5 (text+ko) ==== @@ -84,12 +84,10 @@ { unsigned char iv[EALG_MAX_BLOCK_LEN], blk[EALG_MAX_BLOCK_LEN], *idat; unsigned char *ivp, piv[EALG_MAX_BLOCK_LEN]; - const struct enc_xform *exf; - const struct enc_xform_funcs *exff; + struct enc_xform *exf; int i, k, j, blks; exf = sw->sw_exf; - exff = &oc_enc_xform_funcs[exf->type]; blks = exf->blocksize; /* Check for non-padded data */ @@ -122,8 +120,8 @@ int error; if (sw->sw_kschedule) - exff->zerokey(&(sw->sw_kschedule)); - error = exff->setkey(&sw->sw_kschedule, + exf->zerokey(&(sw->sw_kschedule)); + error = exf->setkey(&sw->sw_kschedule, crd->crd_key, crd->crd_klen / 8); if (error) return (error); @@ -135,8 +133,8 @@ * xforms that provide a reinit method perform all IV * handling themselves. */ - if (exff->reinit != NULL) - exff->reinit(sw->sw_kschedule, iv); + if (exf->reinit) + exf->reinit(sw->sw_kschedule, iv); if (flags & CRYPTO_F_IMBUF) { struct mbuf *m = (struct mbuf *) buf; @@ -157,12 +155,12 @@ m_copydata(m, k, blks, blk); /* Actual encryption/decryption */ - if (exff->reinit != NULL) { + if (exf->reinit) { if (crd->crd_flags & CRD_F_ENCRYPT) { - exff->encrypt(sw->sw_kschedule, + exf->encrypt(sw->sw_kschedule, blk); } else { - exff->decrypt(sw->sw_kschedule, + exf->decrypt(sw->sw_kschedule, blk); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { @@ -170,7 +168,7 @@ for (j = 0; j < blks; j++) blk[j] ^= ivp[j]; - exff->encrypt(sw->sw_kschedule, blk); + exf->encrypt(sw->sw_kschedule, blk); /* * Keep encrypted block for XOR'ing @@ -188,7 +186,7 @@ else bcopy(blk, iv, blks); - exff->decrypt(sw->sw_kschedule, blk); + exf->decrypt(sw->sw_kschedule, blk); /* XOR with previous block */ for (j = 0; j < blks; j++) @@ -235,12 +233,12 @@ idat = mtod(m, unsigned char *) + k; while (m->m_len >= k + blks && i > 0) { - if (exff->reinit != NULL) { + if (exf->reinit) { if (crd->crd_flags & CRD_F_ENCRYPT) { - exff->encrypt(sw->sw_kschedule, + exf->encrypt(sw->sw_kschedule, idat); } else { - exff->decrypt(sw->sw_kschedule, + exf->decrypt(sw->sw_kschedule, idat); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { @@ -248,7 +246,7 @@ for (j = 0; j < blks; j++) idat[j] ^= ivp[j]; - exff->encrypt(sw->sw_kschedule, idat); + exf->encrypt(sw->sw_kschedule, idat); ivp = idat; } else { /* decrypt */ /* @@ -260,7 +258,7 @@ else bcopy(idat, iv, blks); - exff->decrypt(sw->sw_kschedule, idat); + exf->decrypt(sw->sw_kschedule, idat); /* XOR with previous block/IV */ for (j = 0; j < blks; j++) @@ -299,12 +297,12 @@ cuio_copydata(uio, k, blks, blk); /* Actual encryption/decryption */ - if (exff->reinit != NULL) { + if (exf->reinit) { if (crd->crd_flags & CRD_F_ENCRYPT) { - exff->encrypt(sw->sw_kschedule, + exf->encrypt(sw->sw_kschedule, blk); } else { - exff->decrypt(sw->sw_kschedule, + exf->decrypt(sw->sw_kschedule, blk); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { @@ -312,7 +310,7 @@ for (j = 0; j < blks; j++) blk[j] ^= ivp[j]; - exff->encrypt(sw->sw_kschedule, blk); + exf->encrypt(sw->sw_kschedule, blk); /* * Keep encrypted block for XOR'ing @@ -330,7 +328,7 @@ else bcopy(blk, iv, blks); - exff->decrypt(sw->sw_kschedule, blk); + exf->decrypt(sw->sw_kschedule, blk); /* XOR with previous block */ for (j = 0; j < blks; j++) @@ -365,12 +363,12 @@ idat = (char *)iov->iov_base + k; while (iov->iov_len >= k + blks && i > 0) { - if (exff->reinit != NULL) { + if (exf->reinit) { if (crd->crd_flags & CRD_F_ENCRYPT) { - exff->encrypt(sw->sw_kschedule, + exf->encrypt(sw->sw_kschedule, idat); } else { - exff->decrypt(sw->sw_kschedule, + exf->decrypt(sw->sw_kschedule, idat); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { @@ -378,7 +376,7 @@ for (j = 0; j < blks; j++) idat[j] ^= ivp[j]; - exff->encrypt(sw->sw_kschedule, idat); + exf->encrypt(sw->sw_kschedule, idat); ivp = idat; } else { /* decrypt */ /* @@ -390,7 +388,7 @@ else bcopy(idat, iv, blks); - exff->decrypt(sw->sw_kschedule, idat); + exf->decrypt(sw->sw_kschedule, idat); /* XOR with previous block/IV */ for (j = 0; j < blks; j++) @@ -414,13 +412,13 @@ return 0; /* Done with iovec encryption/decryption */ } else { /* contiguous buffer */ - if (exff->reinit != NULL) { + if (exf->reinit) { for (i = crd->crd_skip; i < crd->crd_skip + crd->crd_len; i += blks) { if (crd->crd_flags & CRD_F_ENCRYPT) - exff->encrypt(sw->sw_kschedule, buf + i); + exf->encrypt(sw->sw_kschedule, buf + i); else - exff->decrypt(sw->sw_kschedule, buf + i); + exf->decrypt(sw->sw_kschedule, buf + i); } } else if (crd->crd_flags & CRD_F_ENCRYPT) { for (i = crd->crd_skip; @@ -432,7 +430,7 @@ else for (k = 0; k < blks; k++) buf[i + k] ^= buf[i + k - blks]; - exff->encrypt(sw->sw_kschedule, buf + i); + exf->encrypt(sw->sw_kschedule, buf + i); } } else { /* Decrypt */ /* @@ -441,7 +439,7 @@ */ for (i = crd->crd_skip + crd->crd_len - blks; i >= crd->crd_skip; i -= blks) { - exff->decrypt(sw->sw_kschedule, buf + i); + exf->decrypt(sw->sw_kschedule, buf + i); /* XOR with the IV/previous block, as appropriate */ if (i == crd->crd_skip) @@ -461,13 +459,11 @@ } static void -swcr_authprepare(const struct auth_hash *axf, struct swcr_data *sw, u_char *key, +swcr_authprepare(struct auth_hash *axf, struct swcr_data *sw, u_char *key, int klen) { - const struct auth_hash_funcs *axff; int k; - axff = &oc_auth_hash_funcs[axf->type]; klen /= 8; switch (axf->type) { @@ -481,16 +477,16 @@ for (k = 0; k < klen; k++) key[k] ^= HMAC_IPAD_VAL; - axff->Init(sw->sw_ictx); - axff->Update(sw->sw_ictx, key, klen); - axff->Update(sw->sw_ictx, hmac_ipad_buffer, axf->blocksize - klen); + axf->Init(sw->sw_ictx); + axf->Update(sw->sw_ictx, key, klen); + axf->Update(sw->sw_ictx, hmac_ipad_buffer, axf->blocksize - klen); for (k = 0; k < klen; k++) key[k] ^= (HMAC_IPAD_VAL ^ HMAC_OPAD_VAL); - axff->Init(sw->sw_octx); - axff->Update(sw->sw_octx, key, klen); - axff->Update(sw->sw_octx, hmac_opad_buffer, axf->blocksize - klen); + axf->Init(sw->sw_octx); + axf->Update(sw->sw_octx, key, klen); + axf->Update(sw->sw_octx, hmac_opad_buffer, axf->blocksize - klen); for (k = 0; k < klen; k++) key[k] ^= HMAC_OPAD_VAL; @@ -512,9 +508,9 @@ sw->sw_klen = klen; bcopy(key, sw->sw_octx, klen); - axff->Init(sw->sw_ictx); - axff->Update(sw->sw_ictx, key, klen); - axff->Final(buf, sw->sw_ictx); + axf->Init(sw->sw_ictx); + axf->Update(sw->sw_ictx, key, klen); + axf->Final(buf, sw->sw_ictx); break; } default: @@ -531,8 +527,7 @@ int flags) { unsigned char aalg[HASH_MAX_LEN]; - const struct auth_hash *axf; - const struct auth_hash_funcs *axff; + struct auth_hash *axf; union authctx ctx; int err; @@ -540,7 +535,6 @@ return EINVAL; axf = sw->sw_axf; - axff = &oc_auth_hash_funcs[axf->type]; if (crd->crd_flags & CRD_F_KEY_EXPLICIT) swcr_authprepare(axf, sw, crd->crd_key, crd->crd_klen); @@ -548,7 +542,7 @@ bcopy(sw->sw_ictx, &ctx, axf->ctxsize); err = crypto_apply(flags, buf, crd->crd_skip, crd->crd_len, - (int (*)(void *, void *, unsigned int))axff->Update, (caddr_t)&ctx); + (int (*)(void *, void *, unsigned int))axf->Update, (caddr_t)&ctx); if (err) return err; @@ -562,10 +556,10 @@ if (sw->sw_octx == NULL) return EINVAL; - axff->Final(aalg, &ctx); + axf->Final(aalg, &ctx); bcopy(sw->sw_octx, &ctx, axf->ctxsize); - axff->Update(&ctx, aalg, axf->hashsize); - axff->Final(aalg, &ctx); + axf->Update(&ctx, aalg, axf->hashsize); + axf->Final(aalg, &ctx); break; case CRYPTO_MD5_KPDK: @@ -581,12 +575,12 @@ * and let Final() do the proper, natural "algofill" * padding. */ - axff->Update(&ctx, sw->sw_octx, sw->sw_klen); - axff->Final(aalg, &ctx); + axf->Update(&ctx, sw->sw_octx, sw->sw_klen); + axf->Final(aalg, &ctx); break; case CRYPTO_NULL_HMAC: - axff->Final(aalg, &ctx); + axf->Final(aalg, &ctx); break; } @@ -610,10 +604,8 @@ union authctx ctx; struct cryptodesc *crd, *crda = NULL, *crde = NULL; struct swcr_data *sw, *swa, *swe = NULL; - const struct auth_hash *axf = NULL; - const struct auth_hash_funcs *axff = NULL; - const struct enc_xform *exf = NULL; - struct enc_xform_funcs *exff = NULL; + struct auth_hash *axf = NULL; + struct enc_xform *exf = NULL; caddr_t buf = (caddr_t)crp->crp_buf; uint32_t *blkp; int aadlen, blksz, i, ivlen, len, iskip, oskip, r; @@ -678,11 +670,9 @@ } } - axff = &oc_auth_hash_funcs[axf->type]; - /* Supply MAC with IV */ - if (axff->Reinit != NULL) - axff->Reinit(&ctx, iv, ivlen); + if (axf->Reinit) + axf->Reinit(&ctx, iv, ivlen); /* Supply MAC with AAD */ aadlen = crda->crd_len; @@ -692,12 +682,12 @@ crypto_copydata(crp->crp_flags, buf, crda->crd_skip + i, len, blk + oskip); bzero(blk + len + oskip, blksz - len - oskip); - axff->Update(&ctx, blk, blksz); + axf->Update(&ctx, blk, blksz); oskip = 0; /* reset initial output offset */ } - if (exff->reinit != NULL) - exff->reinit(swe->sw_kschedule, iv); + if (exf->reinit) + exf->reinit(swe->sw_kschedule, iv); /* Do encryption/decryption with MAC */ for (i = 0; i < crde->crd_len; i += blksz) { @@ -707,12 +697,12 @@ crypto_copydata(crp->crp_flags, buf, crde->crd_skip + i, len, blk); if (crde->crd_flags & CRD_F_ENCRYPT) { - exff->encrypt(swe->sw_kschedule, blk); - axff->Update(&ctx, blk, len); + exf->encrypt(swe->sw_kschedule, blk); + axf->Update(&ctx, blk, len); crypto_copyback(crp->crp_flags, buf, crde->crd_skip + i, len, blk); } else { - axff->Update(&ctx, blk, len); + axf->Update(&ctx, blk, len); } } @@ -727,12 +717,12 @@ *blkp = htobe32(aadlen * 8); blkp = (uint32_t *)blk + 3; *blkp = htobe32(crde->crd_len * 8); - axff->Update(&ctx, blk, blksz); + axf->Update(&ctx, blk, blksz); break; } /* Finalize MAC */ - axff->Final(aalg, &ctx); + axf->Final(aalg, &ctx); /* Validate tag */ crypto_copydata(crp->crp_flags, buf, crda->crd_inject, axf->hashsize, @@ -750,7 +740,7 @@ crypto_copydata(crp->crp_flags, buf, crde->crd_skip + i, len, blk); if (!(crde->crd_flags & CRD_F_ENCRYPT)) { - exff->decrypt(swe->sw_kschedule, blk); + exf->decrypt(swe->sw_kschedule, blk); } crypto_copyback(crp->crp_flags, buf, crde->crd_skip + i, len, blk); @@ -772,13 +762,11 @@ caddr_t buf, int flags) { u_int8_t *data, *out; - const struct comp_algo *cxf; - const struct comp_algo_funcs *cxff; + struct comp_algo *cxf; int adj; u_int32_t result; cxf = sw->sw_cxf; - cxff = &oc_comp_algo_funcs[cxf->type]; /* We must handle the whole buffer of data in one time * then if there is not all the data in the mbuf, we must @@ -791,9 +779,9 @@ crypto_copydata(flags, buf, crd->crd_skip, crd->crd_len, data); if (crd->crd_flags & CRD_F_COMP) - result = cxff->compress(data, crd->crd_len, &out); + result = cxf->compress(data, crd->crd_len, &out); else - result = cxff->decompress(data, crd->crd_len, &out); + result = cxf->decompress(data, crd->crd_len, &out); free(data, M_CRYPTO_DATA); if (result == 0) @@ -849,11 +837,9 @@ swcr_newsession(device_t dev, u_int32_t *sid, struct cryptoini *cri) { struct swcr_data **swd; - const struct auth_hash *axf; - const struct auth_hash_funcs *axff; - const struct enc_xform *txf; - const struct enc_xform_funcs *txff; - const struct comp_algo *cxf; + struct auth_hash *axf; + struct enc_xform *txf; + struct comp_algo *cxf; u_int32_t i; int error; @@ -911,25 +897,46 @@ } switch (cri->cri_alg) { - case CRYPTO_AES_NIST_GMAC: - txf = &oc_enc_xform_array[cri->cri_alg]; - (*swd)->sw_exf = txf; - break; case CRYPTO_DES_CBC: + txf = &enc_xform_des; + goto enccommon; case CRYPTO_3DES_CBC: + txf = &enc_xform_3des; + goto enccommon; case CRYPTO_BLF_CBC: + txf = &enc_xform_blf; + goto enccommon; case CRYPTO_CAST_CBC: + txf = &enc_xform_cast5; + goto enccommon; case CRYPTO_SKIPJACK_CBC: + txf = &enc_xform_skipjack; + goto enccommon; case CRYPTO_RIJNDAEL128_CBC: + txf = &enc_xform_rijndael128; + goto enccommon; case CRYPTO_AES_XTS: + txf = &enc_xform_aes_xts; + goto enccommon; case CRYPTO_AES_ICM: + txf = &enc_xform_aes_icm; + goto enccommon; case CRYPTO_AES_NIST_GCM_16: + txf = &enc_xform_aes_nist_gcm; + goto enccommon; + case CRYPTO_AES_NIST_GMAC: + txf = &enc_xform_aes_nist_gmac; + (*swd)->sw_exf = txf; + break; case CRYPTO_CAMELLIA_CBC: + txf = &enc_xform_camellia; + goto enccommon; case CRYPTO_NULL_CBC: - txf = &oc_enc_xform_array[cri->cri_alg]; - txff = &oc_enc_xform_funcs[txf->type]; + txf = &enc_xform_null; + goto enccommon; + enccommon: if (cri->cri_key != NULL) { - error = txff->setkey(&((*swd)->sw_kschedule), + error = txf->setkey(&((*swd)->sw_kschedule), cri->cri_key, cri->cri_klen / 8); if (error) { swcr_freesession_locked(dev, i); @@ -941,13 +948,26 @@ break; case CRYPTO_MD5_HMAC: + axf = &auth_hash_hmac_md5; + goto authcommon; case CRYPTO_SHA1_HMAC: + axf = &auth_hash_hmac_sha1; + goto authcommon; case CRYPTO_SHA2_256_HMAC: + axf = &auth_hash_hmac_sha2_256; + goto authcommon; case CRYPTO_SHA2_384_HMAC: + axf = &auth_hash_hmac_sha2_384; + goto authcommon; case CRYPTO_SHA2_512_HMAC: + axf = &auth_hash_hmac_sha2_512; + goto authcommon; case CRYPTO_NULL_HMAC: + axf = &auth_hash_null; + goto authcommon; case CRYPTO_RIPEMD160_HMAC: - axf = &oc_auth_hash_array[cri->cri_alg]; + axf = &auth_hash_hmac_ripemd_160; + authcommon: (*swd)->sw_ictx = malloc(axf->ctxsize, M_CRYPTO_DATA, M_NOWAIT); if ((*swd)->sw_ictx == NULL) { @@ -974,8 +994,12 @@ break; case CRYPTO_MD5_KPDK: + axf = &auth_hash_key_md5; + goto auth2common; + case CRYPTO_SHA1_KPDK: - axf = &oc_auth_hash_array[cri->cri_alg]; + axf = &auth_hash_key_sha1; + auth2common: (*swd)->sw_ictx = malloc(axf->ctxsize, M_CRYPTO_DATA, M_NOWAIT); if ((*swd)->sw_ictx == NULL) { @@ -1003,9 +1027,12 @@ break; #ifdef notdef case CRYPTO_MD5: + axf = &auth_hash_md5; + goto auth3common; + case CRYPTO_SHA1: + axf = &auth_hash_sha1; auth3common: - axf = &oc_auth_hash_array[cri->cri_alg]; (*swd)->sw_ictx = malloc(axf->ctxsize, M_CRYPTO_DATA, M_NOWAIT); if ((*swd)->sw_ictx == NULL) { @@ -1021,10 +1048,16 @@ #endif case CRYPTO_AES_128_NIST_GMAC: + axf = &auth_hash_nist_gmac_aes_128; + goto auth4common; + case CRYPTO_AES_192_NIST_GMAC: + axf = &auth_hash_nist_gmac_aes_192; + goto auth4common; + case CRYPTO_AES_256_NIST_GMAC: - axf = &oc_auth_hash_array[cri->cri_alg]; - axff = &oc_auth_hash_funcs[axf->type]; + axf = &auth_hash_nist_gmac_aes_256; + auth4common: (*swd)->sw_ictx = malloc(axf->ctxsize, M_CRYPTO_DATA, M_NOWAIT); if ((*swd)->sw_ictx == NULL) { @@ -1032,14 +1065,14 @@ rw_runlock(&swcr_sessions_lock); return ENOBUFS; } - axff->Init((*swd)->sw_ictx); - axff->Setkey((*swd)->sw_ictx, cri->cri_key, + axf->Init((*swd)->sw_ictx); + axf->Setkey((*swd)->sw_ictx, cri->cri_key, cri->cri_klen / 8); (*swd)->sw_axf = axf; break; case CRYPTO_DEFLATE_COMP: - cxf = &oc_comp_algo_array[cri->cri_alg]; + cxf = &comp_algo_deflate; (*swd)->sw_cxf = cxf; break; default: @@ -1074,10 +1107,9 @@ swcr_freesession_locked(device_t dev, u_int64_t tid) { struct swcr_data *swd; - const struct enc_xform *txf; - const struct enc_xform_funcs *txff; - const struct auth_hash *axf; - const struct comp_algo *cxf; + struct enc_xform *txf; + struct auth_hash *axf; + struct comp_algo *cxf; u_int32_t sid = CRYPTO_SESID2LID(tid); if (sid > swcr_sesnum || swcr_sessions == NULL || @@ -1105,10 +1137,9 @@ case CRYPTO_CAMELLIA_CBC: case CRYPTO_NULL_CBC: txf = swd->sw_exf; - txff = &oc_enc_xform_funcs[txf->type]; if (swd->sw_kschedule) - txff->zerokey(&(swd->sw_kschedule)); + txf->zerokey(&(swd->sw_kschedule)); break; case CRYPTO_MD5_HMAC: ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.h#3 (text+ko) ==== @@ -34,15 +34,15 @@ u_int8_t *SW_octx; u_int16_t SW_klen; u_int16_t SW_mlen; - const struct auth_hash *SW_axf; + struct auth_hash *SW_axf; } SWCR_AUTH; struct { u_int8_t *SW_kschedule; - const struct enc_xform *SW_exf; + struct enc_xform *SW_exf; } SWCR_ENC; struct { u_int32_t SW_size; - const struct comp_algo *SW_cxf; + struct comp_algo *SW_cxf; } SWCR_COMP; } SWCR_UN; ==== //depot/projects/opencrypto/sys/opencrypto/xform.c#6 (text+ko) ==== @@ -150,262 +150,232 @@ MALLOC_DEFINE(M_XDATA, "xform", "xform data buffers"); /* Encryption instances */ -const struct enc_xform oc_enc_xform_array[CRYPTO_ALGORITHM_MAX + 1] = { - [CRYPTO_NULL_CBC] = { - CRYPTO_NULL_CBC, "NULL", - /* NB: blocksize of 4 is to generate a properly aligned ESP header */ - NULL_BLOCK_LEN, 0, 256, /* 2048 bits, max key */ - }, - [CRYPTO_DES_CBC] = { - CRYPTO_DES_CBC, "DES", - DES_BLOCK_LEN, 8, 8, - }, - [CRYPTO_3DES_CBC] = { - CRYPTO_3DES_CBC, "3DES", - DES3_BLOCK_LEN, 24, 24, - }, - [CRYPTO_BLF_CBC] = { - CRYPTO_BLF_CBC, "Blowfish", - BLOWFISH_BLOCK_LEN, 5, 56 /* 448 bits, max key */, - }, - [CRYPTO_CAST_CBC] = { - CRYPTO_CAST_CBC, "CAST-128", - CAST128_BLOCK_LEN, 5, 16, - }, - [CRYPTO_SKIPJACK_CBC] = { - CRYPTO_SKIPJACK_CBC, "Skipjack", - SKIPJACK_BLOCK_LEN, 10, 10, - }, - [CRYPTO_RIJNDAEL128_CBC] = { - CRYPTO_RIJNDAEL128_CBC, "Rijndael-128/AES", - RIJNDAEL128_BLOCK_LEN, 16, 32, - }, - [CRYPTO_AES_ICM] = { - CRYPTO_AES_ICM, "AES-ICM", - RIJNDAEL128_BLOCK_LEN, 16, 32, - }, - [CRYPTO_AES_NIST_GCM_16] = { - CRYPTO_AES_NIST_GCM_16, "AES-GCM", - 1, 16, 32, - }, - [CRYPTO_AES_NIST_GMAC] = { - CRYPTO_AES_NIST_GMAC, "AES-GMAC", - 1, 16, 32, - }, - [CRYPTO_AES_XTS] = { - CRYPTO_AES_XTS, "AES-XTS", - RIJNDAEL128_BLOCK_LEN, 32, 64, - }, - [CRYPTO_ARC4] = { - CRYPTO_ARC4, "ARC4", - 1, 1, 32, - }, - [CRYPTO_CAMELLIA_CBC] = { - CRYPTO_CAMELLIA_CBC, "Camellia", - CAMELLIA_BLOCK_LEN, 8, 32, - }, +struct enc_xform enc_xform_null = { + CRYPTO_NULL_CBC, "NULL", + /* NB: blocksize of 4 is to generate a properly aligned ESP header */ + NULL_BLOCK_LEN, 0, 256, /* 2048 bits, max key */ + null_encrypt, + null_decrypt, + null_setkey, + null_zerokey, + NULL, +}; + +struct enc_xform enc_xform_des = { + CRYPTO_DES_CBC, "DES", + DES_BLOCK_LEN, 8, 8, + des1_encrypt, + des1_decrypt, + des1_setkey, + des1_zerokey, + NULL, +}; + +struct enc_xform enc_xform_3des = { + CRYPTO_3DES_CBC, "3DES", + DES3_BLOCK_LEN, 24, 24, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:48:30 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 680DBFB0; Mon, 8 Sep 2014 04:48:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E57F2ED7 for ; Mon, 8 Sep 2014 04:48:29 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CAC3119EC for ; Mon, 8 Sep 2014 04:48:29 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884mT7k019836 for ; Mon, 8 Sep 2014 04:48:29 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884mTtJ019833 for perforce@freebsd.org; Mon, 8 Sep 2014 04:48:29 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:48:29 GMT Message-Id: <201409080448.s884mTtJ019833@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198601 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:48:30 -0000 http://p4web.freebsd.org/@@1198601?ac=10 Change 1198601 by jmg@jmg_carbon2 on 2014/08/12 07:02:13 update the list of cipher we support.. This was missing _XTS... add the ones we now support... Affected files ... .. //depot/projects/opencrypto/share/man/man9/crypto.9#2 edit Differences ... ==== //depot/projects/opencrypto/share/man/man9/crypto.9#2 (text+ko) ==== @@ -17,7 +17,7 @@ .\" .\" $FreeBSD: head/share/man/man9/crypto.9 267936 2014-06-26 21:44:30Z bapt $ .\" -.Dd April 18, 2014 +.Dd August 12, 2014 .Dt CRYPTO 9 .Os .Sh NAME @@ -175,17 +175,26 @@ Currently supported algorithms are: .Pp .Bl -tag -width ".Dv CRYPTO_RIPEMD160_HMAC" -compact +.It Dv CRYPTO_AES_128_NIST_GMAC +.It Dv CRYPTO_AES_192_NIST_GMAC +.It Dv CRYPTO_AES_256_NIST_GMAC .It Dv CRYPTO_AES_CBC +.It Dv CRYPTO_AES_ICM +.It Dv CRYPTO_AES_NIST_GCM_16 +.It Dv CRYPTO_AES_NIST_GMAC +.It Dv CRYPTO_AES_XTS .It Dv CRYPTO_ARC4 .It Dv CRYPTO_BLF_CBC .It Dv CRYPTO_CAMELLIA_CBC .It Dv CRYPTO_CAST_CBC +.It Dv CRYPTO_DEFLATE_COMP .It Dv CRYPTO_DES_CBC .It Dv CRYPTO_3DES_CBC -.It Dv CRYPTO_SKIPJACK_CBC .It Dv CRYPTO_MD5 .It Dv CRYPTO_MD5_HMAC .It Dv CRYPTO_MD5_KPDK +.It Dv CRYPTO_NULL_HMAC +.It Dv CRYPTO_NULL_CBC .It Dv CRYPTO_RIPEMD160_HMAC .It Dv CRYPTO_SHA1 .It Dv CRYPTO_SHA1_HMAC @@ -193,8 +202,7 @@ .It Dv CRYPTO_SHA2_256_HMAC .It Dv CRYPTO_SHA2_384_HMAC .It Dv CRYPTO_SHA2_512_HMAC -.It Dv CRYPTO_NULL_HMAC -.It Dv CRYPTO_NULL_CBC +.It Dv CRYPTO_SKIPJACK_CBC .El .It Va cri_klen Specifies the length of the key in bits, for variable-size key From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:48:30 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 290DCEDA; Mon, 8 Sep 2014 04:48:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFA46ED1 for ; Mon, 8 Sep 2014 04:48:29 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ACFAA19E7 for ; Mon, 8 Sep 2014 04:48:29 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884mTsT019830 for ; Mon, 8 Sep 2014 04:48:29 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884mTQ5019827 for perforce@freebsd.org; Mon, 8 Sep 2014 04:48:29 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:48:29 GMT Message-Id: <201409080448.s884mTQ5019827@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198600 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:48:30 -0000 http://p4web.freebsd.org/@@1198600?ac=10 Change 1198600 by jmg@jmg_carbon2 on 2014/08/12 06:47:01 fix spelling.. Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/xform.c#7 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/xform.c#7 (text+ko) ==== @@ -692,7 +692,7 @@ rijndaelEncrypt(ctx->ac_ek, ctx->ac_nr, ctx->ac_block, keystream); for (i = 0; i < AESICM_BLOCKSIZE; i++) data[i] ^= keystream[i]; - explicite_bzero(keystream, sizeof(keystream)); + explicit_bzero(keystream, sizeof(keystream)); /* increment counter */ for (i = AESICM_BLOCKSIZE - 1; From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:48:44 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3F1B8267; Mon, 8 Sep 2014 04:48:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F303A264 for ; Mon, 8 Sep 2014 04:48:43 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DDB6E1A19 for ; Mon, 8 Sep 2014 04:48:43 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884mhjk020067 for ; Mon, 8 Sep 2014 04:48:43 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884meOY020056 for perforce@freebsd.org; Mon, 8 Sep 2014 04:48:40 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:48:40 GMT Message-Id: <201409080448.s884meOY020056@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1198632 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:48:44 -0000 http://p4web.freebsd.org/@@1198632?ac=10 Change 1198632 by jhb@jhb_jhbbsd on 2014/08/12 19:36:24 IFC @1198630 Affected files ... .. //depot/projects/smpng/share/man/man9/BUF_ISLOCKED.9#5 integrate .. //depot/projects/smpng/share/man/man9/BUF_LOCK.9#3 integrate .. //depot/projects/smpng/share/man/man9/BUF_LOCKFREE.9#3 integrate .. //depot/projects/smpng/share/man/man9/BUF_LOCKINIT.9#3 integrate .. //depot/projects/smpng/share/man/man9/BUF_RECURSED.9#4 integrate .. //depot/projects/smpng/share/man/man9/BUF_TIMELOCK.9#3 integrate .. //depot/projects/smpng/share/man/man9/BUF_UNLOCK.9#3 integrate .. //depot/projects/smpng/share/man/man9/BUS_CONFIG_INTR.9#3 integrate .. //depot/projects/smpng/share/man/man9/BUS_SETUP_INTR.9#6 integrate .. //depot/projects/smpng/share/man/man9/CTASSERT.9#4 integrate .. //depot/projects/smpng/share/man/man9/DB_COMMAND.9#6 integrate .. //depot/projects/smpng/share/man/man9/DECLARE_GEOM_CLASS.9#4 integrate .. //depot/projects/smpng/share/man/man9/DECLARE_MODULE.9#3 integrate .. //depot/projects/smpng/share/man/man9/DEVICE_ATTACH.9#3 integrate .. //depot/projects/smpng/share/man/man9/DEVICE_IDENTIFY.9#3 integrate .. //depot/projects/smpng/share/man/man9/DEV_MODULE.9#4 integrate .. //depot/projects/smpng/share/man/man9/DRIVER_MODULE.9#5 integrate .. //depot/projects/smpng/share/man/man9/EVENTHANDLER.9#9 integrate .. //depot/projects/smpng/share/man/man9/KASSERT.9#4 integrate .. //depot/projects/smpng/share/man/man9/LOCK_PROFILING.9#6 integrate .. //depot/projects/smpng/share/man/man9/MODULE_DEPEND.9#3 integrate .. //depot/projects/smpng/share/man/man9/MODULE_VERSION.9#3 integrate .. //depot/projects/smpng/share/man/man9/Makefile#45 integrate .. //depot/projects/smpng/share/man/man9/PCBGROUP.9#1 branch .. //depot/projects/smpng/share/man/man9/SDT.9#4 integrate .. //depot/projects/smpng/share/man/man9/SYSCALL_MODULE.9#3 integrate .. //depot/projects/smpng/share/man/man9/SYSINIT.9#4 integrate .. //depot/projects/smpng/share/man/man9/VFS_SET.9#4 integrate .. //depot/projects/smpng/share/man/man9/VOP_GETVOBJECT.9#5 delete .. //depot/projects/smpng/share/man/man9/VOP_INACTIVE.9#4 integrate .. //depot/projects/smpng/share/man/man9/alq.9#4 integrate .. //depot/projects/smpng/share/man/man9/atomic.9#7 integrate .. //depot/projects/smpng/share/man/man9/bus_activate_resource.9#3 integrate .. //depot/projects/smpng/share/man/man9/bus_alloc_resource.9#4 integrate .. //depot/projects/smpng/share/man/man9/bus_child_present.9#3 integrate .. //depot/projects/smpng/share/man/man9/bus_release_resource.9#4 integrate .. //depot/projects/smpng/share/man/man9/bus_set_resource.9#3 integrate .. //depot/projects/smpng/share/man/man9/cd.9#5 integrate .. //depot/projects/smpng/share/man/man9/config_intrhook.9#3 integrate .. //depot/projects/smpng/share/man/man9/crypto.9#7 integrate .. //depot/projects/smpng/share/man/man9/devstat.9#5 integrate .. //depot/projects/smpng/share/man/man9/domain.9#4 integrate .. //depot/projects/smpng/share/man/man9/eventtimers.9#6 integrate .. //depot/projects/smpng/share/man/man9/fail.9#10 integrate .. //depot/projects/smpng/share/man/man9/firmware.9#6 integrate .. //depot/projects/smpng/share/man/man9/fpu_kern.9#1 branch .. //depot/projects/smpng/share/man/man9/g_access.9#3 integrate .. //depot/projects/smpng/share/man/man9/g_attach.9#3 integrate .. //depot/projects/smpng/share/man/man9/g_bio.9#3 integrate .. //depot/projects/smpng/share/man/man9/g_consumer.9#3 integrate .. //depot/projects/smpng/share/man/man9/g_data.9#3 integrate .. //depot/projects/smpng/share/man/man9/g_event.9#3 integrate .. //depot/projects/smpng/share/man/man9/g_geom.9#4 integrate .. //depot/projects/smpng/share/man/man9/g_provider.9#3 integrate .. //depot/projects/smpng/share/man/man9/g_provider_by_name.9#3 integrate .. //depot/projects/smpng/share/man/man9/g_wither_geom.9#4 integrate .. //depot/projects/smpng/share/man/man9/get_cyclecount.9#6 integrate .. //depot/projects/smpng/share/man/man9/getnewvnode.9#3 integrate .. //depot/projects/smpng/share/man/man9/groupmember.9#3 integrate .. //depot/projects/smpng/share/man/man9/hhook.9#6 integrate .. //depot/projects/smpng/share/man/man9/ieee80211_radiotap.9#7 integrate .. //depot/projects/smpng/share/man/man9/ifnet.9#13 integrate .. //depot/projects/smpng/share/man/man9/insmntque.9#4 integrate .. //depot/projects/smpng/share/man/man9/kernel_mount.9#5 integrate .. //depot/projects/smpng/share/man/man9/khelp.9#5 integrate .. //depot/projects/smpng/share/man/man9/kqueue.9#6 integrate .. //depot/projects/smpng/share/man/man9/kthread.9#6 integrate .. //depot/projects/smpng/share/man/man9/lock.9#8 integrate .. //depot/projects/smpng/share/man/man9/mbchain.9#4 integrate .. //depot/projects/smpng/share/man/man9/mbpool.9#4 integrate .. //depot/projects/smpng/share/man/man9/mbuf.9#10 integrate .. //depot/projects/smpng/share/man/man9/mbuf_tags.9#5 integrate .. //depot/projects/smpng/share/man/man9/mdchain.9#4 integrate .. //depot/projects/smpng/share/man/man9/memguard.9#6 integrate .. //depot/projects/smpng/share/man/man9/microtime.9#3 integrate .. //depot/projects/smpng/share/man/man9/microuptime.9#4 integrate .. //depot/projects/smpng/share/man/man9/mod_cc.9#4 integrate .. //depot/projects/smpng/share/man/man9/module.9#4 integrate .. //depot/projects/smpng/share/man/man9/namei.9#8 integrate .. //depot/projects/smpng/share/man/man9/osd.9#5 integrate .. //depot/projects/smpng/share/man/man9/pbuf.9#3 integrate .. //depot/projects/smpng/share/man/man9/pci.9#7 integrate .. //depot/projects/smpng/share/man/man9/pfind.9#4 integrate .. //depot/projects/smpng/share/man/man9/pgfind.9#4 integrate .. //depot/projects/smpng/share/man/man9/pmap.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_activate.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_change_wiring.9#3 delete .. //depot/projects/smpng/share/man/man9/pmap_clear_modify.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_copy.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_enter.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_extract.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_growkernel.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_init.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_is_modified.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_is_prefaultable.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_map.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_mincore.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_object_init_pt.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_page_exists_quick.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_page_init.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_page_protect.9#3 delete .. //depot/projects/smpng/share/man/man9/pmap_pinit.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_protect.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_qenter.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_release.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_remove.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_resident_count.9#3 integrate .. //depot/projects/smpng/share/man/man9/pmap_unwire.9#1 branch .. //depot/projects/smpng/share/man/man9/pmap_zero_page.9#3 integrate .. //depot/projects/smpng/share/man/man9/pseudofs.9#4 integrate .. //depot/projects/smpng/share/man/man9/redzone.9#3 integrate .. //depot/projects/smpng/share/man/man9/resource_int_value.9#3 integrate .. //depot/projects/smpng/share/man/man9/rman.9#6 integrate .. //depot/projects/smpng/share/man/man9/sbuf.9#10 integrate .. //depot/projects/smpng/share/man/man9/selrecord.9#4 integrate .. //depot/projects/smpng/share/man/man9/signal.9#4 integrate .. //depot/projects/smpng/share/man/man9/sleep.9#9 integrate .. //depot/projects/smpng/share/man/man9/socket.9#4 integrate .. //depot/projects/smpng/share/man/man9/sysctl.9#8 integrate .. //depot/projects/smpng/share/man/man9/sysctl_add_oid.9#5 integrate .. //depot/projects/smpng/share/man/man9/sysctl_ctx_init.9#5 integrate .. //depot/projects/smpng/share/man/man9/taskqueue.9#13 integrate .. //depot/projects/smpng/share/man/man9/timeout.9#10 integrate .. //depot/projects/smpng/share/man/man9/tvtohz.9#3 integrate .. //depot/projects/smpng/share/man/man9/ucred.9#4 integrate .. //depot/projects/smpng/share/man/man9/uidinfo.9#3 integrate .. //depot/projects/smpng/share/man/man9/usbdi.9#10 integrate .. //depot/projects/smpng/share/man/man9/utopia.9#3 integrate .. //depot/projects/smpng/share/man/man9/vaccess_acl_nfs4.9#4 integrate .. //depot/projects/smpng/share/man/man9/vflush.9#4 integrate .. //depot/projects/smpng/share/man/man9/vfs_busy.9#5 integrate .. //depot/projects/smpng/share/man/man9/vfs_getnewfsid.9#3 integrate .. //depot/projects/smpng/share/man/man9/vfs_getopt.9#4 integrate .. //depot/projects/smpng/share/man/man9/vfs_getvfs.9#3 integrate .. //depot/projects/smpng/share/man/man9/vfs_mountedfrom.9#4 integrate .. //depot/projects/smpng/share/man/man9/vfs_rootmountalloc.9#3 integrate .. //depot/projects/smpng/share/man/man9/vfs_timestamp.9#3 integrate .. //depot/projects/smpng/share/man/man9/vfs_unbusy.9#4 integrate .. //depot/projects/smpng/share/man/man9/vfsconf.9#4 integrate .. //depot/projects/smpng/share/man/man9/vgone.9#4 integrate .. //depot/projects/smpng/share/man/man9/vhold.9#3 integrate .. //depot/projects/smpng/share/man/man9/vinvalbuf.9#4 integrate .. //depot/projects/smpng/share/man/man9/vm_fault_prefault.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map.9#5 integrate .. //depot/projects/smpng/share/man/man9/vm_map_check_protection.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_create.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_delete.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_entry_resize_free.9#4 integrate .. //depot/projects/smpng/share/man/man9/vm_map_find.9#5 integrate .. //depot/projects/smpng/share/man/man9/vm_map_findspace.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_inherit.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_init.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_insert.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_lock.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_lookup.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_madvise.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_max.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_protect.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_remove.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_simplify_entry.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_stack.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_submap.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_sync.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_map_wire.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_page_aflag.9#4 integrate .. //depot/projects/smpng/share/man/man9/vm_page_alloc.9#7 integrate .. //depot/projects/smpng/share/man/man9/vm_page_bits.9#5 integrate .. //depot/projects/smpng/share/man/man9/vm_page_busy.9#2 integrate .. //depot/projects/smpng/share/man/man9/vm_page_cache.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_page_deactivate.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_page_dontneed.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_page_free.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_page_grab.9#5 integrate .. //depot/projects/smpng/share/man/man9/vm_page_hold.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_page_insert.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_page_lookup.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_page_rename.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_page_wire.9#3 integrate .. //depot/projects/smpng/share/man/man9/vm_set_page_size.9#4 integrate .. //depot/projects/smpng/share/man/man9/vn_fullpath.9#3 integrate .. //depot/projects/smpng/share/man/man9/vn_isdisk.9#3 integrate .. //depot/projects/smpng/share/man/man9/vnode.9#8 integrate .. //depot/projects/smpng/share/man/man9/watchdog.9#5 integrate .. //depot/projects/smpng/share/man/man9/zero_copy.9#3 delete .. //depot/projects/smpng/share/man/man9/zone.9#8 integrate .. //depot/projects/smpng/sys/Makefile#32 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_machdep.c#22 integrate .. //depot/projects/smpng/sys/amd64/acpica/acpi_wakecode.S#12 integrate .. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#17 integrate .. //depot/projects/smpng/sys/amd64/amd64/exception.S#37 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#32 integrate .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#53 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#125 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#96 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_watchdog.c#8 integrate .. //depot/projects/smpng/sys/amd64/amd64/mpboot.S#6 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#138 integrate .. //depot/projects/smpng/sys/amd64/amd64/sys_machdep.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/trap.c#95 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#113 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#78 integrate .. //depot/projects/smpng/sys/amd64/conf/VT#3 delete .. //depot/projects/smpng/sys/amd64/include/cpu.h#17 integrate .. //depot/projects/smpng/sys/amd64/include/fpu.h#12 integrate .. //depot/projects/smpng/sys/amd64/include/sf_buf.h#6 integrate .. //depot/projects/smpng/sys/amd64/include/vmm.h#12 integrate .. //depot/projects/smpng/sys/amd64/include/vmm_dev.h#9 integrate .. //depot/projects/smpng/sys/amd64/include/vmm_instruction_emul.h#6 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#58 integrate .. //depot/projects/smpng/sys/amd64/pci/pci_cfgreg.c#18 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.c#8 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmcs.h#10 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#15 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_msr.c#3 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx_msr.h#3 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vatpic.c#2 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vlapic.c#10 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vlapic.h#7 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm.c#12 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_dev.c#11 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_host.c#3 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#10 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_ioport.c#2 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_ioport.h#2 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_ktr.h#4 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_stat.c#7 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_stat.h#7 integrate .. //depot/projects/smpng/sys/amd64/vmm/x86.c#10 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep-v6.c#9 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#43 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc.c#34 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm10.S#6 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_arm9.S#9 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv5.S#5 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv6.S#5 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_armv7.S#6 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_pj4b.S#6 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_xscale.S#9 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_xscale_c3.S#6 integrate .. //depot/projects/smpng/sys/arm/arm/dump_machdep.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#21 integrate .. //depot/projects/smpng/sys/arm/arm/exception.S#16 integrate .. //depot/projects/smpng/sys/arm/arm/fusu.S#16 integrate .. //depot/projects/smpng/sys/arm/arm/generic_timer.c#5 integrate .. //depot/projects/smpng/sys/arm/arm/gic.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#28 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#33 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#52 integrate .. //depot/projects/smpng/sys/arm/arm/mpcore_timer.c#8 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#23 integrate .. //depot/projects/smpng/sys/arm/arm/pl190.c#4 integrate .. //depot/projects/smpng/sys/arm/arm/pl310.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/platform.c#2 integrate .. //depot/projects/smpng/sys/arm/arm/pmap-v6.c#14 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#80 integrate .. //depot/projects/smpng/sys/arm/arm/setstack.s#5 integrate .. //depot/projects/smpng/sys/arm/arm/support.S#20 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#48 integrate .. //depot/projects/smpng/sys/arm/at91/board_tsc4370.c#5 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#36 integrate .. //depot/projects/smpng/sys/arm/at91/if_macb.c#6 integrate .. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_bsc.c#4 integrate .. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_intr.c#4 integrate .. //depot/projects/smpng/sys/arm/broadcom/bcm2835/files.bcm2835#9 integrate .. //depot/projects/smpng/sys/arm/cavium/cns11xx/if_ece.c#2 integrate .. //depot/projects/smpng/sys/arm/conf/AC100#8 delete .. //depot/projects/smpng/sys/arm/conf/APALIS-IMX6#1 branch .. //depot/projects/smpng/sys/arm/conf/ARNDALE#5 integrate .. //depot/projects/smpng/sys/arm/conf/ARNDALE-OCTA#1 branch .. //depot/projects/smpng/sys/arm/conf/BEAGLEBONE#11 integrate .. //depot/projects/smpng/sys/arm/conf/CHROMEBOOK#2 integrate .. //depot/projects/smpng/sys/arm/conf/CHROMEBOOK-PEACH-PIT#1 branch .. //depot/projects/smpng/sys/arm/conf/CHROMEBOOK-PEACH-PIT.hints#1 branch .. //depot/projects/smpng/sys/arm/conf/CHROMEBOOK-SNOW#1 branch .. //depot/projects/smpng/sys/arm/conf/CHROMEBOOK-SPRING#1 branch .. //depot/projects/smpng/sys/arm/conf/EXYNOS5.common#1 branch .. //depot/projects/smpng/sys/arm/conf/EXYNOS5250#1 branch .. //depot/projects/smpng/sys/arm/conf/EXYNOS5250.common#2 delete .. //depot/projects/smpng/sys/arm/conf/EXYNOS5420#1 branch .. //depot/projects/smpng/sys/arm/conf/IMX6#2 integrate .. //depot/projects/smpng/sys/arm/conf/PANDABOARD#9 integrate .. //depot/projects/smpng/sys/arm/conf/RADXA#4 integrate .. //depot/projects/smpng/sys/arm/conf/RADXA-LITE#1 branch .. //depot/projects/smpng/sys/arm/conf/RK3188#1 branch .. //depot/projects/smpng/sys/arm/conf/RPI-B#11 integrate .. //depot/projects/smpng/sys/arm/conf/VYBRID#2 integrate .. //depot/projects/smpng/sys/arm/conf/ZEDBOARD#6 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#5 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#6 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx6#5 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/i2c.c#4 delete .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_gpio.c#5 delete .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ipuv3_fbd.c#5 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatop.c#4 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_ccmreg.h#3 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_machdep.c#4 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_mp.c#2 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx_gpio.c#1 branch .. //depot/projects/smpng/sys/arm/freescale/imx/imx_i2c.c#1 branch .. //depot/projects/smpng/sys/arm/freescale/imx/imx_sdhci.c#4 integrate .. //depot/projects/smpng/sys/arm/freescale/vybrid/files.vybrid#4 integrate .. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_adc.c#1 branch .. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_adc.h#1 branch .. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_i2c.c#2 integrate .. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_spi.c#1 branch .. //depot/projects/smpng/sys/arm/include/asm.h#12 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#41 integrate .. //depot/projects/smpng/sys/arm/include/counter.h#3 integrate .. //depot/projects/smpng/sys/arm/include/cpu.h#14 integrate .. //depot/projects/smpng/sys/arm/include/cpufunc.h#25 integrate .. //depot/projects/smpng/sys/arm/include/elf.h#15 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#20 integrate .. //depot/projects/smpng/sys/arm/include/pl310.h#4 integrate .. //depot/projects/smpng/sys/arm/include/sf_buf.h#7 integrate .. //depot/projects/smpng/sys/arm/include/ucontext.h#5 integrate .. //depot/projects/smpng/sys/arm/include/vmparam.h#27 integrate .. //depot/projects/smpng/sys/arm/mv/armadaxp/armadaxp_mp.c#6 integrate .. //depot/projects/smpng/sys/arm/mv/armadaxp/mptramp.S#2 integrate .. //depot/projects/smpng/sys/arm/rockchip/files.rk30xx#4 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/chrome_ec.c#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/chrome_ec.h#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/chrome_ec_spi.c#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/chrome_kb.c#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/chrome_kb.h#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_combiner.c#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_ehci.c#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_fimd.c#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_i2c.c#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_machdep.c#5 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_mct.c#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_mp.c#3 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_pad.c#2 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_pmu.c#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_pmu.h#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_spi.c#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_usb_phy.c#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos5_xhci.c#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos_uart.c#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/exynos_uart.h#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/files.exynos5#4 integrate .. //depot/projects/smpng/sys/arm/samsung/exynos/std.exynos5#3 delete .. //depot/projects/smpng/sys/arm/samsung/exynos/std.exynos5250#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/std.exynos5420#1 branch .. //depot/projects/smpng/sys/arm/samsung/exynos/uart.c#2 delete .. //depot/projects/smpng/sys/arm/samsung/exynos/uart.h#2 delete .. //depot/projects/smpng/sys/arm/tegra/files.tegra2#5 delete .. //depot/projects/smpng/sys/arm/tegra/std.tegra2#5 delete .. //depot/projects/smpng/sys/arm/tegra/tegra2_common.c#2 delete .. //depot/projects/smpng/sys/arm/tegra/tegra2_machdep.c#7 delete .. //depot/projects/smpng/sys/arm/ti/aintc.c#5 integrate .. //depot/projects/smpng/sys/arm/ti/am335x/am335x_lcd.c#4 integrate .. //depot/projects/smpng/sys/arm/ti/am335x/am335x_prcm.c#8 integrate .. //depot/projects/smpng/sys/arm/ti/am335x/am335x_pwm.c#4 integrate .. //depot/projects/smpng/sys/arm/ti/am335x/am335x_scm_padconf.c#5 integrate .. //depot/projects/smpng/sys/arm/ti/omap4/omap4_prcm_clks.c#8 integrate .. //depot/projects/smpng/sys/arm/ti/omap4/omap4_scm_padconf.c#4 integrate .. //depot/projects/smpng/sys/arm/ti/ti_adc.c#2 integrate .. //depot/projects/smpng/sys/arm/ti/ti_adcreg.h#2 integrate .. //depot/projects/smpng/sys/arm/ti/ti_adcvar.h#2 integrate .. //depot/projects/smpng/sys/arm/ti/ti_gpio.c#7 integrate .. //depot/projects/smpng/sys/arm/ti/ti_i2c.c#6 integrate .. //depot/projects/smpng/sys/arm/ti/ti_prcm.c#4 integrate .. //depot/projects/smpng/sys/arm/ti/ti_smc.S#3 integrate .. //depot/projects/smpng/sys/arm/versatile/versatile_clcd.c#4 integrate .. //depot/projects/smpng/sys/arm/xilinx/zy7_slcr.c#3 integrate .. //depot/projects/smpng/sys/arm/xilinx/zy7_slcr.h#2 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/ep80219_machdep.c#22 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq31244_machdep.c#41 integrate .. //depot/projects/smpng/sys/arm/xscale/i8134x/crb_machdep.c#20 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#26 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#23 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npe.c#12 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_qmgr.c#10 integrate .. //depot/projects/smpng/sys/arm/xscale/pxa/pxa_machdep.c#15 integrate .. //depot/projects/smpng/sys/boot/Makefile.ia64#4 delete .. //depot/projects/smpng/sys/boot/amd64/boot1.efi/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/amd64/efi/bootinfo.c#2 integrate .. //depot/projects/smpng/sys/boot/amd64/efi/main.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0/main.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0iic/main.c#6 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot0spi/main.c#8 integrate .. //depot/projects/smpng/sys/boot/arm/at91/boot2/boot2.c#11 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootiic/main.c#4 integrate .. //depot/projects/smpng/sys/boot/arm/at91/bootspi/main.c#5 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/emac.c#10 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/mci_device.h#6 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/sd-card.c#7 integrate .. //depot/projects/smpng/sys/boot/arm/at91/libat91/sd-card.h#3 integrate .. //depot/projects/smpng/sys/boot/common/Makefile.inc#21 integrate .. //depot/projects/smpng/sys/boot/common/bootstrap.h#21 integrate .. //depot/projects/smpng/sys/boot/common/install.c#1 branch .. //depot/projects/smpng/sys/boot/common/interp.c#8 integrate .. //depot/projects/smpng/sys/boot/common/interp_forth.c#7 integrate .. //depot/projects/smpng/sys/boot/common/module.c#17 integrate .. //depot/projects/smpng/sys/boot/efi/include/amd64/pe.h#2 integrate .. //depot/projects/smpng/sys/boot/efi/include/efiapi.h#9 integrate .. //depot/projects/smpng/sys/boot/efi/include/i386/pe.h#4 integrate .. //depot/projects/smpng/sys/boot/efi/include/ia64/efibind.h#7 delete .. //depot/projects/smpng/sys/boot/efi/include/ia64/pe.h#4 delete .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#17 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/Makefile#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/Makefile.inc#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/Makefile#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/apalis-imx6.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/beaglebone-black.dts#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/beaglebone.dts#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5.dtsi#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5250-arndale.dts#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5250-chromebook.dts#2 delete .. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5250-snow.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5250-spring.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5250.dtsi#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5420-arndale-octa.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5420-peach-pit.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/exynos5420.dtsi#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/imx6.dtsi#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/p2041rdb.dts#2 delete .. //depot/projects/smpng/sys/boot/fdt/dts/arm/p3041ds.dts#2 delete .. //depot/projects/smpng/sys/boot/fdt/dts/arm/p5020ds.dts#2 delete .. //depot/projects/smpng/sys/boot/fdt/dts/arm/rk3188-radxa-lite.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/wandboard-dual.dts#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/wandboard-quad.dts#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/wandboard-solo.dts#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/zedboard.dts#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/mips/Makefile#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/mips/beripad-de4.dts#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/Makefile#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/p2041rdb.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/p3041ds.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/powerpc/p5020ds.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/fdt_loader_cmd.c#8 integrate .. //depot/projects/smpng/sys/boot/ficl/ia64/sysdep.c#3 delete .. //depot/projects/smpng/sys/boot/ficl/ia64/sysdep.h#5 delete .. //depot/projects/smpng/sys/boot/ficl/loader.c#12 integrate .. //depot/projects/smpng/sys/boot/forth/brand.4th#5 integrate .. //depot/projects/smpng/sys/boot/forth/loader.conf#84 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#31 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#45 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/gptboot/gptboot.8#3 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#30 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/amd64_tramp.S#6 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#22 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/pxe.c#12 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#39 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#25 integrate .. //depot/projects/smpng/sys/boot/ia64/Makefile#8 delete .. //depot/projects/smpng/sys/boot/ia64/Makefile.inc#6 delete .. //depot/projects/smpng/sys/boot/ia64/common/Makefile#8 delete .. //depot/projects/smpng/sys/boot/ia64/common/autoload.c#3 delete .. //depot/projects/smpng/sys/boot/ia64/common/bootinfo.c#5 delete .. //depot/projects/smpng/sys/boot/ia64/common/copy.c#5 delete .. //depot/projects/smpng/sys/boot/ia64/common/devicename.c#3 delete .. //depot/projects/smpng/sys/boot/ia64/common/exec.c#8 delete .. //depot/projects/smpng/sys/boot/ia64/common/icache.c#3 delete .. //depot/projects/smpng/sys/boot/ia64/common/libia64.h#6 delete .. //depot/projects/smpng/sys/boot/ia64/efi/Makefile#11 delete .. //depot/projects/smpng/sys/boot/ia64/efi/conf.c#7 delete .. //depot/projects/smpng/sys/boot/ia64/efi/efimd.c#7 delete .. //depot/projects/smpng/sys/boot/ia64/efi/ldscript.ia64#4 delete .. //depot/projects/smpng/sys/boot/ia64/efi/main.c#7 delete .. //depot/projects/smpng/sys/boot/ia64/efi/start.S#4 delete .. //depot/projects/smpng/sys/boot/ia64/efi/version#9 delete .. //depot/projects/smpng/sys/boot/ia64/ski/Makefile#10 delete .. //depot/projects/smpng/sys/boot/ia64/ski/acpi_stub.c#7 delete .. //depot/projects/smpng/sys/boot/ia64/ski/conf.c#6 delete .. //depot/projects/smpng/sys/boot/ia64/ski/delay.c#3 delete .. //depot/projects/smpng/sys/boot/ia64/ski/efi_stub.c#6 delete .. //depot/projects/smpng/sys/boot/ia64/ski/exit.c#3 delete .. //depot/projects/smpng/sys/boot/ia64/ski/ldscript.ia64#4 delete .. //depot/projects/smpng/sys/boot/ia64/ski/libski.h#5 delete .. //depot/projects/smpng/sys/boot/ia64/ski/main.c#5 delete .. //depot/projects/smpng/sys/boot/ia64/ski/pal_stub.S#4 delete .. //depot/projects/smpng/sys/boot/ia64/ski/sal_stub.c#4 delete .. //depot/projects/smpng/sys/boot/ia64/ski/skiconsole.c#3 delete .. //depot/projects/smpng/sys/boot/ia64/ski/skifs.c#4 delete .. //depot/projects/smpng/sys/boot/ia64/ski/skiload.cmd#3 delete .. //depot/projects/smpng/sys/boot/ia64/ski/skimd.c#4 delete .. //depot/projects/smpng/sys/boot/ia64/ski/ssc.c#3 delete .. //depot/projects/smpng/sys/boot/ia64/ski/start.S#4 delete .. //depot/projects/smpng/sys/boot/ia64/ski/time.c#4 delete .. //depot/projects/smpng/sys/boot/ia64/ski/version#5 delete .. //depot/projects/smpng/sys/boot/kshim/bsd_busspace.c#1 branch .. //depot/projects/smpng/sys/boot/kshim/bsd_global.h#1 branch .. //depot/projects/smpng/sys/boot/kshim/bsd_kernel.c#1 branch .. //depot/projects/smpng/sys/boot/kshim/bsd_kernel.h#1 branch .. //depot/projects/smpng/sys/boot/kshim/kshim.mk#1 branch .. //depot/projects/smpng/sys/boot/kshim/sysinit.h#1 branch .. //depot/projects/smpng/sys/boot/libstand32/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/mips/beri/boot2/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/mips/beri/loader/Makefile#2 integrate .. //depot/projects/smpng/sys/boot/mips/beri/loader/loader.ldscript#2 integrate .. //depot/projects/smpng/sys/boot/mips/beri/loader/main.c#2 integrate .. //depot/projects/smpng/sys/boot/ofw/common/main.c#13 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#26 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/boot2.c#12 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#10 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#27 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/main.c#23 integrate .. //depot/projects/smpng/sys/boot/powerpc/ps3/main.c#5 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#13 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#25 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#42 integrate .. //depot/projects/smpng/sys/boot/uboot/common/main.c#10 integrate .. //depot/projects/smpng/sys/boot/usb/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/usb/bsd_busspace.c#2 delete .. //depot/projects/smpng/sys/boot/usb/bsd_global.h#2 delete .. //depot/projects/smpng/sys/boot/usb/bsd_kernel.c#3 delete .. //depot/projects/smpng/sys/boot/usb/bsd_kernel.h#3 delete .. //depot/projects/smpng/sys/boot/usb/bsd_usbloader_test.c#2 integrate .. //depot/projects/smpng/sys/boot/usb/storage/umass_common.c#1 branch .. //depot/projects/smpng/sys/boot/usb/storage/umass_common.h#1 branch .. //depot/projects/smpng/sys/boot/usb/storage/umass_loader.c#1 branch .. //depot/projects/smpng/sys/boot/usb/tools/Makefile#1 branch .. //depot/projects/smpng/sys/boot/usb/tools/sysinit.h#2 delete .. //depot/projects/smpng/sys/boot/usb/usb_busdma_loader.c#2 integrate .. //depot/projects/smpng/sys/boot/usb/usbcore.mk#1 branch .. //depot/projects/smpng/sys/boot/userboot/libstand/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/userboot/test/test.c#5 integrate .. //depot/projects/smpng/sys/boot/userboot/userboot/devicename.c#5 integrate .. //depot/projects/smpng/sys/boot/userboot/userboot/main.c#6 integrate .. //depot/projects/smpng/sys/boot/zfs/zfsimpl.c#20 integrate .. //depot/projects/smpng/sys/cam/ata/ata_da.c#27 integrate .. //depot/projects/smpng/sys/cam/ata/ata_pmp.c#15 integrate .. //depot/projects/smpng/sys/cam/cam.c#18 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#60 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#95 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl.c#12 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl.h#4 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend.c#6 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend.h#5 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend_block.c#10 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend_ramdisk.c#7 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_cmd_table.c#5 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_error.c#4 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_error.h#3 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend.c#5 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend.h#4 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_cam_sim.c#8 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_internal.c#8 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_iscsi.c#3 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_iscsi.h#3 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_io.h#5 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_ioctl.h#5 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_private.h#6 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_ser_table.c#4 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_tpc.c#1 branch .. //depot/projects/smpng/sys/cam/ctl/ctl_tpc.h#1 branch .. //depot/projects/smpng/sys/cam/ctl/ctl_tpc_local.c#1 branch .. //depot/projects/smpng/sys/cam/ctl/ctl_util.c#3 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_util.h#3 integrate .. //depot/projects/smpng/sys/cam/ctl/scsi_ctl.c#12 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.c#49 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#34 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#62 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#118 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.h#9 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_enc_safte.c#5 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#49 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#19 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.h#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_xpt.c#21 integrate .. //depot/projects/smpng/sys/cddl/boot/zfs/README#5 integrate .. //depot/projects/smpng/sys/cddl/boot/zfs/blkptr.c#1 branch .. //depot/projects/smpng/sys/cddl/boot/zfs/zfsimpl.h#15 integrate .. //depot/projects/smpng/sys/cddl/boot/zfs/zfssubr.c#12 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#6 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#4 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.h#8 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/time.h#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#7 delete .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/avl/avl.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/util/strtolctype.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfeature_common.h#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_ioctl_compat.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#23 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#32 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/blkptr.c#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bptree.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#22 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/ddt.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#23 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_diff.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#20 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#19 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_bookmark.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#21 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scan.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/range_tree.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sa.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#22 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#19 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/blkptr.h#1 branch .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bptree.h#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#19 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_scan.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#8 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#18 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/trim_map.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#17 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#19 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#24 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#13 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_debug.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#32 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#29 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#44 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#27 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#16 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#25 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#20 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#15 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#8 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#7 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#14 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_cddl.h#5 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_clone.c#5 delete .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_ioctl.c#10 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_load.c#10 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_sysctl.c#5 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/dtrace_unload.c#9 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/dtrace_asm.S#4 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/dtrace_isa.c#4 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/i386/dtrace_subr.c#13 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/mips/dtrace_subr.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/powerpc/dtrace_subr.c#4 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt.c#7 integrate .. //depot/projects/smpng/sys/cddl/dev/sdt/sdt.c#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.c#8 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_ioctl.h#5 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#89 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_util.h#10 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#35 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_util.h#10 integrate .. //depot/projects/smpng/sys/compat/linux/linux_futex.c#25 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#81 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#54 integrate .. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#33 integrate .. //depot/projects/smpng/sys/compat/ndis/pe_var.h#13 integrate .. //depot/projects/smpng/sys/compat/x86bios/x86bios.c#14 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#49 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#38 delete .. //depot/projects/smpng/sys/conf/NOTES#213 integrate .. //depot/projects/smpng/sys/conf/files#299 integrate .. //depot/projects/smpng/sys/conf/files.amd64#104 integrate .. //depot/projects/smpng/sys/conf/files.arm#35 integrate .. //depot/projects/smpng/sys/conf/files.i386#162 integrate .. //depot/projects/smpng/sys/conf/files.ia64#79 delete .. //depot/projects/smpng/sys/conf/files.mips#27 integrate .. //depot/projects/smpng/sys/conf/files.pc98#120 integrate .. //depot/projects/smpng/sys/conf/files.powerpc#87 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#89 integrate .. //depot/projects/smpng/sys/conf/kern.mk#43 integrate .. //depot/projects/smpng/sys/conf/kern.opts.mk#4 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#87 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#95 integrate .. //depot/projects/smpng/sys/conf/ldscript.ia64#12 delete .. //depot/projects/smpng/sys/conf/options#209 integrate .. //depot/projects/smpng/sys/conf/options.amd64#38 integrate .. //depot/projects/smpng/sys/conf/options.arm#40 integrate .. //depot/projects/smpng/sys/conf/options.i386#72 integrate .. //depot/projects/smpng/sys/conf/options.ia64#27 delete .. //depot/projects/smpng/sys/conf/options.mips#18 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#25 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_interrupts.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c#3 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c#2 integrate .. //depot/projects/smpng/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c#4 integrate .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/Makefile#5 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx.h#6 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_bstream.c#4 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_bstream.h#4 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_context.c#6 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_context.h#4 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.c#5 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_env.h#6 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_scoreboard.c#6 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_scoreboard.h#4 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.c#6 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self.h#5 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self_context.s#4 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_self_info.h#2 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_step.c#6 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_step.h#5 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_str.c#5 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_str.h#4 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_swap.c#4 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_swap.h#4 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_symbols.c#2 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_symbols.h#2 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.c#6 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_trace.h#6 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_uinfo.c#7 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_uinfo.h#4 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_utable.c#5 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/src/uwx_utable.h#5 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/Makefile#3 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/dump_context.c#3 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/dumpmyself.c#3 delete .. //depot/projects/smpng/sys/contrib/ia64/libuwx/test/primeregs.s#2 delete .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_compat.h#26 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#21 integrate .. //depot/projects/smpng/sys/contrib/ipfilter/netinet/ip_log.c#19 integrate .. //depot/projects/smpng/sys/contrib/x86emu/x86emu.c#5 integrate .. //depot/projects/smpng/sys/crypto/aesni/aesni.c#7 integrate .. //depot/projects/smpng/sys/crypto/aesni/aesni.h#7 integrate .. //depot/projects/smpng/sys/crypto/aesni/aesni_wrap.c#10 integrate .. //depot/projects/smpng/sys/crypto/via/padlock.c#19 integrate .. //depot/projects/smpng/sys/crypto/via/padlock_cipher.c#7 integrate .. //depot/projects/smpng/sys/crypto/via/padlock_hash.c#8 integrate .. //depot/projects/smpng/sys/ddb/db_command.c#51 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#58 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#44 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#144 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cpu.c#66 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_ec.c#61 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#27 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_powerres.c#29 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_timer.c#32 integrate .. //depot/projects/smpng/sys/dev/adb/adb_buttons.c#3 integrate .. //depot/projects/smpng/sys/dev/adb/adb_kbd.c#10 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#25 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#20 integrate .. //depot/projects/smpng/sys/dev/age/if_age.c#22 integrate .. //depot/projects/smpng/sys/dev/agp/agp.c#19 integrate .. //depot/projects/smpng/sys/dev/agp/agp_i810.c#20 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#28 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#25 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#36 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#35 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#29 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx.c#33 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#22 integrate .. //depot/projects/smpng/sys/dev/ale/if_ale.c#19 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#59 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#35 integrate .. //depot/projects/smpng/sys/dev/amr/amrio.h#7 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#66 integrate .. //depot/projects/smpng/sys/dev/asmc/asmc.c#11 integrate .. //depot/projects/smpng/sys/dev/asmc/asmcvar.h#7 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#122 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#64 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ati.c#10 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-promise.c#20 integrate .. //depot/projects/smpng/sys/dev/ath/ah_osdep.c#20 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah.c#25 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_decode.h#6 integrate .. //depot/projects/smpng/sys/dev/ath/ath_hal/ah_internal.h#28 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#112 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_ahb.c#10 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_debug.c#9 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#30 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbdc.c#9 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#55 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#39 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#135 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#25 integrate .. //depot/projects/smpng/sys/dev/bwn/if_bwn.c#22 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe.c#7 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe.h#4 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe_debug.c#3 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe_stats.c#4 integrate .. //depot/projects/smpng/sys/dev/bxe/ecore_reg.h#4 integrate .. //depot/projects/smpng/sys/dev/bxe/ecore_sp.h#5 integrate .. //depot/projects/smpng/sys/dev/cadence/if_cgem.c#3 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#45 integrate .. //depot/projects/smpng/sys/dev/cas/if_cas.c#17 integrate .. //depot/projects/smpng/sys/dev/cfe/cfe_console.c#9 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#76 integrate .. //depot/projects/smpng/sys/dev/ciss/cissreg.h#17 integrate .. //depot/projects/smpng/sys/dev/cpuctl/cpuctl.c#10 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#27 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_include.h#5 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#47 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#40 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#9 integrate .. //depot/projects/smpng/sys/dev/cxgbe/adapter.h#18 integrate .. //depot/projects/smpng/sys/dev/cxgbe/common/common.h#13 integrate .. //depot/projects/smpng/sys/dev/cxgbe/common/t4_hw.c#12 integrate .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu#2 delete .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt#6 integrate .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t4fw_interface.h#9 integrate .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu#2 delete .. //depot/projects/smpng/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt#3 integrate .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/cm.c#2 integrate .. //depot/projects/smpng/sys/dev/cxgbe/offload.h#12 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_main.c#24 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_netmap.c#1 branch .. //depot/projects/smpng/sys/dev/cxgbe/t4_sge.c#21 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_tracer.c#4 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_cpl_io.c#11 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_ddp.c#5 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_listen.c#9 integrate .. //depot/projects/smpng/sys/dev/cxgbe/tom/t4_tom.h#9 integrate .. //depot/projects/smpng/sys/dev/dc/dcphy.c#16 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#33 integrate .. //depot/projects/smpng/sys/dev/dc/pnphy.c#13 integrate .. //depot/projects/smpng/sys/dev/de/if_de.c#15 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#26 integrate .. //depot/projects/smpng/sys/dev/drm/ati_pcigart.c#11 integrate .. //depot/projects/smpng/sys/dev/drm/drm.h#15 integrate .. //depot/projects/smpng/sys/dev/drm/drm_drv.c#22 integrate .. //depot/projects/smpng/sys/dev/drm/drm_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sarea.h#9 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.c#12 integrate .. //depot/projects/smpng/sys/dev/drm/via_dmablit.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/drm.h#4 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_dp_iic_helper.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_drv.c#7 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_edid.c#6 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_fb_helper.c#6 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_sarea.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_sysctl.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem.c#10 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem_gtt.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_fb.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_iic.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_sdvo.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/atombios_i2c.c#2 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_device.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_i2c.c#2 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/rs690.c#2 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/rv515.c#2 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_bo_vm.c#5 integrate .. //depot/projects/smpng/sys/dev/drm2/ttm/ttm_page_alloc.c#4 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_82542.c#7 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_82571.c#15 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_82575.c#18 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_82575.h#17 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_api.c#16 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_api.h#12 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_defines.h#17 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_hw.h#17 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_i210.c#5 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_i210.h#5 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_ich8lan.c#18 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_ich8lan.h#14 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_mac.c#15 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_mac.h#9 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_manage.c#10 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_mbx.c#4 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_mbx.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_nvm.c#9 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_osdep.h#10 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_phy.c#16 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_phy.h#14 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_regs.h#17 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_vf.c#5 integrate .. //depot/projects/smpng/sys/dev/e1000/e1000_vf.h#5 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#40 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.h#15 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#47 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#22 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.h#9 integrate .. //depot/projects/smpng/sys/dev/esp/ncr53c9x.c#20 integrate .. //depot/projects/smpng/sys/dev/et/if_et.c#14 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch.c#10 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_7240.c#4 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_8216.c#4 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_8226.c#4 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_8316.c#4 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_8327.c#2 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_9340.c#2 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_phy.c#7 integrate .. //depot/projects/smpng/sys/dev/etherswitch/arswitch/arswitch_reg.c#7 integrate .. //depot/projects/smpng/sys/dev/etherswitch/rtl8366/rtl8366rb.c#6 integrate .. //depot/projects/smpng/sys/dev/etherswitch/rtl8366/rtl8366rbvar.h#3 integrate .. //depot/projects/smpng/sys/dev/fb/creator_vt.c#1 branch .. //depot/projects/smpng/sys/dev/fb/fbd.c#3 integrate .. //depot/projects/smpng/sys/dev/fb/fbreg.h#22 integrate .. //depot/projects/smpng/sys/dev/fb/vesa.c#18 integrate .. //depot/projects/smpng/sys/dev/fdt/simplebus.c#12 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#48 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#40 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#19 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#58 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#108 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#26 integrate .. //depot/projects/smpng/sys/dev/fxp/inphy.c#4 integrate .. //depot/projects/smpng/sys/dev/glxiic/glxiic.c#3 integrate .. //depot/projects/smpng/sys/dev/gpio/gpioiic.c#6 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_intr.c#22 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#35 integrate .. //depot/projects/smpng/sys/dev/hpt27xx/hpt27xx_os_bsd.c#2 integrate .. //depot/projects/smpng/sys/dev/hpt27xx/hpt27xx_osm_bsd.c#4 integrate .. //depot/projects/smpng/sys/dev/hpt27xx/os_bsd.h#5 integrate .. //depot/projects/smpng/sys/dev/hptiop/hptiop.c#18 integrate .. //depot/projects/smpng/sys/dev/hptiop/hptiop.h#8 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#28 integrate .. //depot/projects/smpng/sys/dev/hptmv/global.h#7 integrate .. //depot/projects/smpng/sys/dev/hptmv/hptproc.c#10 integrate .. //depot/projects/smpng/sys/dev/hptmv/ioctl.c#9 integrate .. //depot/projects/smpng/sys/dev/hptmv/mv.c#5 integrate .. //depot/projects/smpng/sys/dev/hptmv/osbsd.h#9 integrate .. //depot/projects/smpng/sys/dev/hptnr/hptnr_os_bsd.c#2 integrate .. //depot/projects/smpng/sys/dev/hptnr/hptnr_osm_bsd.c#3 integrate .. //depot/projects/smpng/sys/dev/hptnr/os_bsd.h#3 integrate .. //depot/projects/smpng/sys/dev/hptrr/hptrr_os_bsd.c#4 integrate .. //depot/projects/smpng/sys/dev/hptrr/hptrr_osm_bsd.c#13 integrate .. //depot/projects/smpng/sys/dev/hptrr/os_bsd.h#6 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_core.c#23 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_ia64.c#5 delete .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_intel.c#16 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_logging.c#23 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_mod.c#47 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_powerpc.c#12 integrate .. //depot/projects/smpng/sys/dev/hwpmc/pmc_events.h#21 integrate .. //depot/projects/smpng/sys/dev/i40e/README#1 branch .. //depot/projects/smpng/sys/dev/i40e/i40e.h#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_adminq.c#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_adminq.h#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_adminq_cmd.h#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_common.c#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_hmc.h#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_lan_hmc.c#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_lan_hmc.h#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_nvm.c#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_osdep.c#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_prototype.h#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_register.h#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_register_x710_int.h#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_txrx.c#2 integrate .. //depot/projects/smpng/sys/dev/i40e/i40e_type.h#2 integrate .. //depot/projects/smpng/sys/dev/i40e/if_i40e.c#2 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.c#21 integrate .. //depot/projects/smpng/sys/dev/iicbus/iic.h#8 integrate .. //depot/projects/smpng/sys/dev/iicbus/iicbus_if.m#6 integrate .. //depot/projects/smpng/sys/dev/iicbus/iiconf.h#7 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:09 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D41E43C5; Mon, 8 Sep 2014 04:49:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 03A6D3AD for ; Mon, 8 Sep 2014 04:49:09 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4E841A26 for ; Mon, 8 Sep 2014 04:49:08 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884n8Ti020164 for ; Mon, 8 Sep 2014 04:49:08 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884n8Ew020161 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:08 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:08 GMT Message-Id: <201409080449.s884n8Ew020161@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198639 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:10 -0000 http://p4web.freebsd.org/@@1198639?ac=10 Change 1198639 by jmg@jmg_carbon2 on 2014/08/13 00:33:46 fix whitespace... fix spelling.. Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#5 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#5 (text+ko) ==== @@ -109,19 +109,19 @@ #define AALG_MAX_RESULT_LEN 64 /* Keep this updated */ #define CRYPTO_ALGORITHM_MIN 1 -#define CRYPTO_DES_CBC 1 -#define CRYPTO_3DES_CBC 2 -#define CRYPTO_BLF_CBC 3 -#define CRYPTO_CAST_CBC 4 -#define CRYPTO_SKIPJACK_CBC 5 -#define CRYPTO_MD5_HMAC 6 -#define CRYPTO_SHA1_HMAC 7 -#define CRYPTO_RIPEMD160_HMAC 8 -#define CRYPTO_MD5_KPDK 9 -#define CRYPTO_SHA1_KPDK 10 -#define CRYPTO_RIJNDAEL128_CBC 11 /* 128 bit blocksize */ -#define CRYPTO_AES_CBC 11 /* 128 bit blocksize -- the same as above */ -#define CRYPTO_ARC4 12 +#define CRYPTO_DES_CBC 1 +#define CRYPTO_3DES_CBC 2 +#define CRYPTO_BLF_CBC 3 +#define CRYPTO_CAST_CBC 4 +#define CRYPTO_SKIPJACK_CBC 5 +#define CRYPTO_MD5_HMAC 6 +#define CRYPTO_SHA1_HMAC 7 +#define CRYPTO_RIPEMD160_HMAC 8 +#define CRYPTO_MD5_KPDK 9 +#define CRYPTO_SHA1_KPDK 10 +#define CRYPTO_RIJNDAEL128_CBC 11 /* 128 bit blocksize */ +#define CRYPTO_AES_CBC 11 /* 128 bit blocksize -- the same as above */ +#define CRYPTO_ARC4 12 #define CRYPTO_MD5 13 #define CRYPTO_SHA1 14 #define CRYPTO_NULL_HMAC 15 @@ -199,7 +199,7 @@ caddr_t iv; }; -/* op and flags the same as crypto_op */ +/* op and flags the same as crypt_op */ struct crypt_aead { u_int32_t ses; u_int16_t op; /* i.e. COP_ENCRYPT */ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:12 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D6E7684; Mon, 8 Sep 2014 04:49:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 95903579 for ; Mon, 8 Sep 2014 04:49:10 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7A8931A2F for ; Mon, 8 Sep 2014 04:49:10 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nAaK020225 for ; Mon, 8 Sep 2014 04:49:10 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884n9Av020219 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:09 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:09 GMT Message-Id: <201409080449.s884n9Av020219@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198649 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:12 -0000 http://p4web.freebsd.org/@@1198649?ac=10 Change 1198649 by jmg@jmg_carbon2 on 2014/08/13 04:52:06 really integrate from head, not just man... Affected files ... .. //depot/projects/opencrypto/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/include/sf_buf.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/vmm_instruction_emul.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/elf_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/generic_timer.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/gic.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/intr.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/mpcore_timer.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/nexus.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/pl190.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/pl310.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/pmap-v6.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/vm_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx51_ipuv3_fbd.c#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx6_ccmreg.h#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx6_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/arm/include/pl310.h#2 integrate .. //depot/projects/opencrypto/sys/arm/include/sf_buf.h#2 integrate .. //depot/projects/opencrypto/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/chrome_ec.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/chrome_ec_spi.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/chrome_kb.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_combiner.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_ehci.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_fimd.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_i2c.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_mct.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_pad.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_pmu.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_spi.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_usb_phy.c#2 integrate .. //depot/projects/opencrypto/sys/arm/samsung/exynos/exynos5_xhci.c#2 integrate .. //depot/projects/opencrypto/sys/arm/xscale/ixp425/if_npe.c#2 integrate .. //depot/projects/opencrypto/sys/boot/common/Makefile.inc#2 integrate .. //depot/projects/opencrypto/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/opencrypto/sys/boot/common/install.c#1 branch .. //depot/projects/opencrypto/sys/boot/common/module.c#2 integrate .. //depot/projects/opencrypto/sys/boot/kshim/bsd_busspace.c#1 branch .. //depot/projects/opencrypto/sys/boot/kshim/bsd_global.h#1 branch .. //depot/projects/opencrypto/sys/boot/kshim/bsd_kernel.c#1 branch .. //depot/projects/opencrypto/sys/boot/kshim/bsd_kernel.h#1 branch .. //depot/projects/opencrypto/sys/boot/kshim/kshim.mk#1 branch .. //depot/projects/opencrypto/sys/boot/kshim/sysinit.h#1 branch .. //depot/projects/opencrypto/sys/boot/usb/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/usb/bsd_busspace.c#2 delete .. //depot/projects/opencrypto/sys/boot/usb/bsd_global.h#2 delete .. //depot/projects/opencrypto/sys/boot/usb/bsd_kernel.c#2 delete .. //depot/projects/opencrypto/sys/boot/usb/bsd_kernel.h#2 delete .. //depot/projects/opencrypto/sys/boot/usb/tools/Makefile#1 branch .. //depot/projects/opencrypto/sys/boot/usb/tools/sysinit.h#2 delete .. //depot/projects/opencrypto/sys/boot/usb/usbcore.mk#1 branch .. //depot/projects/opencrypto/sys/boot/userboot/userboot/devicename.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_backend_block.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_cmd_table.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_private.h#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_ser_table.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_tpc.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_util.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_util.h#2 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_all.c#2 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_all.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/opencrypto/sys/conf/Makefile.arm#2 integrate .. //depot/projects/opencrypto/sys/conf/files#4 integrate .. //depot/projects/opencrypto/sys/conf/files.arm#2 integrate .. //depot/projects/opencrypto/sys/conf/files.i386#3 integrate .. //depot/projects/opencrypto/sys/conf/files.mips#2 integrate .. //depot/projects/opencrypto/sys/conf/files.pc98#2 integrate .. //depot/projects/opencrypto/sys/conf/files.powerpc#2 integrate .. //depot/projects/opencrypto/sys/conf/files.sparc64#2 integrate .. //depot/projects/opencrypto/sys/conf/kern.opts.mk#2 integrate .. //depot/projects/opencrypto/sys/conf/kern.post.mk#2 integrate .. //depot/projects/opencrypto/sys/conf/kmod.mk#2 integrate .. //depot/projects/opencrypto/sys/conf/options#2 integrate .. //depot/projects/opencrypto/sys/conf/options.arm#2 integrate .. //depot/projects/opencrypto/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_power.c#2 integrate .. //depot/projects/opencrypto/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv.c#2 integrate .. //depot/projects/opencrypto/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_reset.c#2 integrate .. //depot/projects/opencrypto/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/opencrypto/sys/dev/acpica/acpi_cpu.c#2 integrate .. //depot/projects/opencrypto/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/opencrypto/sys/dev/acpica/acpi_timer.c#2 integrate .. //depot/projects/opencrypto/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/amr/amr.c#2 integrate .. //depot/projects/opencrypto/sys/dev/an/if_an.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ata/chipsets/ata-promise.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ath/ath_hal/ah.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ath/ath_hal/ah_decode.h#2 integrate .. //depot/projects/opencrypto/sys/dev/ath/ath_hal/ah_internal.h#2 integrate .. //depot/projects/opencrypto/sys/dev/ath/if_ath.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/common/common.h#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/common/t4_hw.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/t4_main.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/i915/i915_gem.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/ttm/ttm_bo_vm.c#2 integrate .. //depot/projects/opencrypto/sys/dev/esp/ncr53c9x.c#2 integrate .. //depot/projects/opencrypto/sys/dev/fb/creator_vt.c#1 branch .. //depot/projects/opencrypto/sys/dev/fb/fbd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/fdt/simplebus.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hpt27xx/hpt27xx_os_bsd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hpt27xx/hpt27xx_osm_bsd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hpt27xx/os_bsd.h#2 integrate .. //depot/projects/opencrypto/sys/dev/hptiop/hptiop.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptiop/hptiop.h#2 integrate .. //depot/projects/opencrypto/sys/dev/hptmv/entry.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptmv/global.h#2 integrate .. //depot/projects/opencrypto/sys/dev/hptmv/hptproc.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptmv/ioctl.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptmv/mv.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptmv/osbsd.h#2 integrate .. //depot/projects/opencrypto/sys/dev/hptnr/hptnr_os_bsd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptnr/hptnr_osm_bsd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptnr/os_bsd.h#2 integrate .. //depot/projects/opencrypto/sys/dev/hptrr/hptrr_os_bsd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptrr/hptrr_osm_bsd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptrr/os_bsd.h#2 integrate .. //depot/projects/opencrypto/sys/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/opencrypto/sys/dev/nfe/if_nfe.c#2 integrate .. //depot/projects/opencrypto/sys/dev/oce/oce_mbox.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ofw/ofwbus.c#2 integrate .. //depot/projects/opencrypto/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/at91dci_atmelarm.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/at91dci_fdt.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/saf1761_otg.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/gadget/g_audio.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/quirk/usb_quirk.h#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/serial/umcs.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/template/usb_template.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/template/usb_template_phone.c#1 branch .. //depot/projects/opencrypto/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/usb_msctest.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/usb_msctest.h#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/colors/vt_termcolors.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/colors/vt_termcolors.h#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/efifb/efifb.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/fb/vt_early_fb.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/fb/vt_fb.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/fb/vt_fb.h#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/ofwfb/ofwfb.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/vga/vt_vga.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt.h#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt_buf.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt_core.c#2 integrate .. //depot/projects/opencrypto/sys/dev/xen/blkfront/blkfront.c#2 integrate .. //depot/projects/opencrypto/sys/dev/xen/console/xencons_ring.c#2 integrate .. //depot/projects/opencrypto/sys/fs/ext2fs/ext2_dir.h#2 integrate .. //depot/projects/opencrypto/sys/fs/nfsserver/nfs_nfsdsocket.c#2 integrate .. //depot/projects/opencrypto/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/opencrypto/sys/geom/cache/g_cache.c#2 integrate .. //depot/projects/opencrypto/sys/geom/journal/g_journal.c#2 integrate .. //depot/projects/opencrypto/sys/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/imx6sl-clock.h#2 integrate .. //depot/projects/opencrypto/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/vm_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/i386/include/sf_buf.h#2 integrate .. //depot/projects/opencrypto/sys/i386/include/vmparam.h#2 integrate .. //depot/projects/opencrypto/sys/i386/xen/pmap.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_exit.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_proc.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_time.c#2 integrate .. //depot/projects/opencrypto/sys/kern/subr_sfbuf.c#1 branch .. //depot/projects/opencrypto/sys/kern/subr_taskqueue.c#2 integrate .. //depot/projects/opencrypto/sys/kern/subr_witness.c#2 integrate .. //depot/projects/opencrypto/sys/kern/sys_process.c#2 integrate .. //depot/projects/opencrypto/sys/kern/uipc_socket.c#2 integrate .. //depot/projects/opencrypto/sys/kern/uipc_syscalls.c#2 integrate .. //depot/projects/opencrypto/sys/kern/uipc_usrreq.c#2 integrate .. //depot/projects/opencrypto/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/opencrypto/sys/kern/vfs_cache.c#2 integrate .. //depot/projects/opencrypto/sys/kern/vfs_init.c#2 integrate .. //depot/projects/opencrypto/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/opencrypto/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/opencrypto/sys/mips/include/sf_buf.h#2 integrate .. //depot/projects/opencrypto/sys/mips/include/vmparam.h#2 integrate .. //depot/projects/opencrypto/sys/mips/mips/pmap.c#2 integrate .. //depot/projects/opencrypto/sys/mips/mips/vm_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/modules/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/acl_nfs4/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/acl_posix1e/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/aic7xxx/ahc/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/alq/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/an/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/arcnet/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cam/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/carp/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cc/cc_cdg/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cc/cc_chd/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cc/cc_cubic/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cc/cc_hd/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cc/cc_htcp/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cc/cc_vegas/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cxgb/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cxgb/cxgb/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cxgb/iw_cxgb/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cxgb/tom/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cxgbe/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cxgbe/if_cxgbe/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cxgbe/iw_cxgbe/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/cxgbe/tom/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/dpt/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/drm/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/drm2/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/drm2/radeonkms/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/dtrace/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/dummynet/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/em/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/en/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/ep/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/fatm/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/firewire/fwip/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/hatm/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/i40e/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/ibcore/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_bridge/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_disc/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_faith/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_gif/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_gre/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_lagg/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_stf/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_tap/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/if_tun/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/igb/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/ip6_mroute_mod/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/ip_mroute_mod/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/ipdivert/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/ipfilter/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/ipfw/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/ipoib/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/ixgbe/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/khelp/h_ertt/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/krpc/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/linux/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/lmc/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/mlx4/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/mlx4ib/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/mlxen/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/mthca/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/netgraph/gif/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/netgraph/iface/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/netgraph/ipfw/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/netgraph/netflow/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/nfscl/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/nfsclient/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/nfslockd/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/nfsserver/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/patm/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/pf/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/pflog/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/pfsync/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/siftr/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/smbfs/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/snc/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/sound/driver/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/trm/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/usb/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/usb/template/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/virtio/network/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/vmware/vmxnet3/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/vx/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/wlan/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/wlan_acl/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/wlan_amrr/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/wlan_ccmp/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/wlan_rssadapt/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/wlan_tkip/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/wlan_wep/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/wlan_xauth/Makefile#2 integrate .. //depot/projects/opencrypto/sys/net/if_lagg.c#2 integrate .. //depot/projects/opencrypto/sys/net/if_lagg.h#2 integrate .. //depot/projects/opencrypto/sys/net/if_stf.c#2 integrate .. //depot/projects/opencrypto/sys/net/if_stf.h#2 integrate .. //depot/projects/opencrypto/sys/net/if_vlan.c#2 integrate .. //depot/projects/opencrypto/sys/net80211/ieee80211.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/cc/cc.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/igmp.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/igmp_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/in_gif.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/in_gif.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_carp.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_carp.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_encap.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_gre.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_gre.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_icmp.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_input.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_mroute.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/pim_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/raw_ip.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_asconf.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_auth.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_auth.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_input.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_output.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_pcb.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_pcb.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_peeloff.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_structs.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctputil.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_input.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/udp_usrreq.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/udp_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_gif.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_proto.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_forward.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/opencrypto/sys/netinet6/raw_ip6.c#2 integrate .. //depot/projects/opencrypto/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/opencrypto/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/opencrypto/sys/netipsec/xform.h#2 integrate .. //depot/projects/opencrypto/sys/netipsec/xform_ipip.c#2 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/if_pfsync.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/linux_radix.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/aim/mmu_oea.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/aim/mmu_oea64.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/booke/pmap.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/include/sf_buf.h#2 delete .. //depot/projects/opencrypto/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/opencrypto/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/opencrypto/sys/powerpc/powerpc/pmap_dispatch.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/powerpc/vm_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/ps3/ps3_syscons.c#2 integrate .. //depot/projects/opencrypto/sys/sparc64/include/vmparam.h#2 integrate .. //depot/projects/opencrypto/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/opencrypto/sys/sparc64/sparc64/vm_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/sys/bus.h#2 integrate .. //depot/projects/opencrypto/sys/sys/exec.h#2 integrate .. //depot/projects/opencrypto/sys/sys/fbio.h#2 integrate .. //depot/projects/opencrypto/sys/sys/mount.h#2 integrate .. //depot/projects/opencrypto/sys/sys/proc.h#2 integrate .. //depot/projects/opencrypto/sys/sys/protosw.h#2 integrate .. //depot/projects/opencrypto/sys/sys/sf_buf.h#2 integrate .. //depot/projects/opencrypto/sys/sys/syscallsubr.h#2 integrate .. //depot/projects/opencrypto/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/opencrypto/sys/ufs/ffs/softdep.h#2 integrate .. //depot/projects/opencrypto/sys/vm/pmap.h#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_fault.c#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_kern.c#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_object.h#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_page.c#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_page.h#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_pager.h#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_phys.c#2 integrate .. //depot/projects/opencrypto/sys/x86/acpica/madt.c#2 integrate .. //depot/projects/opencrypto/sys/x86/include/acpica_machdep.h#2 integrate .. //depot/projects/opencrypto/sys/x86/include/init.h#2 integrate .. //depot/projects/opencrypto/sys/x86/isa/atpic.c#2 integrate .. //depot/projects/opencrypto/sys/x86/x86/local_apic.c#2 integrate .. //depot/projects/opencrypto/sys/x86/xen/pvcpu_enum.c#2 integrate .. //depot/projects/opencrypto/sys/x86/xen/xen_intr.c#2 integrate .. //depot/projects/opencrypto/sys/x86/xen/xen_nexus.c#2 integrate .. //depot/projects/opencrypto/sys/xen/xen_intr.h#2 integrate Differences ... ==== //depot/projects/opencrypto/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 269051 2014-07-24 10:12:22Z marius $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 269759 2014-08-09 17:13:02Z alc $"); /* * Manages physical address maps. @@ -4116,9 +4116,9 @@ * or lose information. That is, this routine must actually * insert this page into the given map NOW. */ -void -pmap_enter(pmap_t pmap, vm_offset_t va, vm_prot_t access, vm_page_t m, - vm_prot_t prot, boolean_t wired) +int +pmap_enter(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, + u_int flags, int8_t psind __unused) { struct rwlock *lock; pd_entry_t *pde; @@ -4127,6 +4127,7 @@ pv_entry_t pv; vm_paddr_t opa, pa; vm_page_t mpte, om; + boolean_t nosleep; PG_A = pmap_accessed_bit(pmap); PG_G = pmap_global_bit(pmap); @@ -4143,18 +4144,18 @@ va >= kmi.clean_eva, ("pmap_enter: managed mapping within the clean submap")); if ((m->oflags & VPO_UNMANAGED) == 0 && !vm_page_xbusied(m)) - VM_OBJECT_ASSERT_WLOCKED(m->object); + VM_OBJECT_ASSERT_LOCKED(m->object); pa = VM_PAGE_TO_PHYS(m); newpte = (pt_entry_t)(pa | PG_A | PG_V); - if ((access & VM_PROT_WRITE) != 0) + if ((flags & VM_PROT_WRITE) != 0) newpte |= PG_M; if ((prot & VM_PROT_WRITE) != 0) newpte |= PG_RW; KASSERT((newpte & (PG_M | PG_RW)) != PG_M, - ("pmap_enter: access includes VM_PROT_WRITE but prot doesn't")); + ("pmap_enter: flags includes VM_PROT_WRITE but prot doesn't")); if ((prot & VM_PROT_EXECUTE) == 0) newpte |= pg_nx; - if (wired) + if ((flags & PMAP_ENTER_WIRED) != 0) newpte |= PG_W; if (va < VM_MAXUSER_ADDRESS) newpte |= PG_U; @@ -4196,7 +4197,15 @@ * Here if the pte page isn't mapped, or if it has been * deallocated. */ - mpte = _pmap_allocpte(pmap, pmap_pde_pindex(va), &lock); + nosleep = (flags & PMAP_ENTER_NOSLEEP) != 0; + mpte = _pmap_allocpte(pmap, pmap_pde_pindex(va), + nosleep ? NULL : &lock); + if (mpte == NULL && nosleep) { + KASSERT(lock == NULL, ("lock leaked for nosleep")); + PMAP_UNLOCK(pmap); + rw_runlock(&pvh_global_lock); + return (KERN_RESOURCE_SHORTAGE); + } goto retry; } else panic("pmap_enter: invalid page directory va=%#lx", va); @@ -4328,6 +4337,7 @@ rw_wunlock(lock); rw_runlock(&pvh_global_lock); PMAP_UNLOCK(pmap); + return (KERN_SUCCESS); } /* @@ -4693,58 +4703,6 @@ } /* - * Routine: pmap_change_wiring - * Function: Change the wiring attribute for a map/virtual-address - * pair. - * In/out conditions: - * The mapping must already exist in the pmap. - */ -void -pmap_change_wiring(pmap_t pmap, vm_offset_t va, boolean_t wired) -{ - pd_entry_t *pde; - pt_entry_t *pte; - boolean_t pv_lists_locked; - - pv_lists_locked = FALSE; - - /* - * Wiring is not a hardware characteristic so there is no need to - * invalidate TLB. - */ -retry: - PMAP_LOCK(pmap); - pde = pmap_pde(pmap, va); - if ((*pde & PG_PS) != 0) { - if (!wired != ((*pde & PG_W) == 0)) { - if (!pv_lists_locked) { - pv_lists_locked = TRUE; - if (!rw_try_rlock(&pvh_global_lock)) { - PMAP_UNLOCK(pmap); - rw_rlock(&pvh_global_lock); - goto retry; - } - } - if (!pmap_demote_pde(pmap, pde, va)) - panic("pmap_change_wiring: demotion failed"); - } else - goto out; - } - pte = pmap_pde_to_pte(pde, va); - if (wired && (*pte & PG_W) == 0) { - pmap->pm_stats.wired_count++; - atomic_set_long(pte, PG_W); - } else if (!wired && (*pte & PG_W) != 0) { - pmap->pm_stats.wired_count--; - atomic_clear_long(pte, PG_W); - } -out: - if (pv_lists_locked) - rw_runlock(&pvh_global_lock); - PMAP_UNLOCK(pmap); -} - -/* * Clear the wired attribute from the mappings for the specified range of * addresses in the given pmap. Every valid mapping within that range * must have the wired attribute set. In contrast, invalid mappings ==== //depot/projects/opencrypto/sys/amd64/include/sf_buf.h#2 (text+ko) ==== @@ -23,48 +23,29 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/sf_buf.h 255289 2013-09-06 05:37:49Z glebius $ + * $FreeBSD: head/sys/amd64/include/sf_buf.h 269577 2014-08-05 09:44:10Z glebius $ */ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include -#include -#include - /* * On this machine, the only purpose for which sf_buf is used is to implement * an opaque pointer required by the machine-independent parts of the kernel. * That pointer references the vm_page that is "mapped" by the sf_buf. The * actual mapping is provided by the direct virtual-to-physical mapping. */ -struct sf_buf; - -static inline struct sf_buf * -sf_buf_alloc(struct vm_page *m, int pri) -{ - - return ((struct sf_buf *)m); -} - -static inline void -sf_buf_free(struct sf_buf *sf) -{ -} - -static __inline vm_offset_t +static inline vm_offset_t sf_buf_kva(struct sf_buf *sf) { return (PHYS_TO_DMAP(VM_PAGE_TO_PHYS((vm_page_t)sf))); } -static __inline vm_page_t +static inline vm_page_t sf_buf_page(struct sf_buf *sf) { return ((vm_page_t)sf); } - #endif /* !_MACHINE_SF_BUF_H_ */ ==== //depot/projects/opencrypto/sys/amd64/vmm/vmm_instruction_emul.c#2 (text+ko) ==== @@ -24,11 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 269108 2014-07-26 02:51:46Z neel $ + * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 269700 2014-08-08 03:49:01Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 269108 2014-07-26 02:51:46Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 269700 2014-08-08 03:49:01Z neel $"); #ifdef _KERNEL #include @@ -82,6 +82,10 @@ .op_byte = 0xB6, .op_type = VIE_OP_TYPE_MOVZX, }, + [0xB7] = { + .op_byte = 0xB7, + .op_type = VIE_OP_TYPE_MOVZX, + }, [0xBE] = { .op_byte = 0xBE, .op_type = VIE_OP_TYPE_MOVSX, @@ -505,6 +509,25 @@ /* write the result */ error = vie_update_register(vm, vcpuid, reg, val, size); break; + case 0xB7: + /* + * MOV and zero extend word from mem (ModRM:r/m) to + * reg (ModRM:reg). + * + * 0F B7/r movzx r32, r/m16 + * REX.W + 0F B7/r movzx r64, r/m16 + */ + error = memread(vm, vcpuid, gpa, &val, 2, arg); + if (error) + return (error); + + reg = gpr_map[vie->reg]; + + /* zero-extend word */ + val = (uint16_t)val; + + error = vie_update_register(vm, vcpuid, reg, val, size); + break; case 0xBE: /* * MOV and sign extend byte from mem (ModRM:r/m) to ==== //depot/projects/opencrypto/sys/arm/arm/elf_machdep.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/elf_machdep.c 264994 2014-04-27 00:46:01Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/elf_machdep.c 269767 2014-08-09 22:51:26Z imp $"); #include #include @@ -120,6 +120,34 @@ { } +/* + * It is possible for the compiler to emit relocations for unaligned data. + * We handle this situation with these inlines. + */ +#define RELOC_ALIGNED_P(x) \ + (((uintptr_t)(x) & (sizeof(void *) - 1)) == 0) + +static __inline Elf_Addr +load_ptr(Elf_Addr *where) +{ + Elf_Addr res; + + if (RELOC_ALIGNED_P(where)) + return *where; + memcpy(&res, where, sizeof(res)); + return (res); +} + +static __inline void +store_ptr(Elf_Addr *where, Elf_Addr val) +{ + if (RELOC_ALIGNED_P(where)) + *where = val; + else + memcpy(where, &val, sizeof(val)); +} +#undef RELOC_ALIGNED_P + /* Process one elf relocation with addend. */ static int @@ -137,7 +165,7 @@ case ELF_RELOC_REL: rel = (const Elf_Rel *)data; where = (Elf_Addr *) (relocbase + rel->r_offset); - addend = *where; + addend = load_ptr(where); rtype = ELF_R_TYPE(rel->r_info); symidx = ELF_R_SYM(rel->r_info); break; @@ -155,8 +183,8 @@ if (local) { if (rtype == R_ARM_RELATIVE) { /* A + B */ addr = elf_relocaddr(lf, relocbase + addend); - if (*where != addr) - *where = addr; + if (load_ptr(where) != addr) + store_ptr(where, addr); } return (0); } @@ -170,7 +198,7 @@ addr = lookup(lf, symidx, 1); if (addr == 0) return -1; - *where += addr; + store_ptr(where, addr + load_ptr(where)); break; case R_ARM_COPY: /* none */ @@ -185,7 +213,7 @@ case R_ARM_JUMP_SLOT: addr = lookup(lf, symidx, 1); if (addr) { - *where = addr; + store_ptr(where, addr); return (0); } return (-1); ==== //depot/projects/opencrypto/sys/arm/arm/generic_timer.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/generic_timer.c 264065 2014-04-03 05:48:56Z br $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/generic_timer.c 269605 2014-08-05 18:51:51Z ian $"); #include #include @@ -343,7 +343,8 @@ static devclass_t arm_tmr_devclass; -DRIVER_MODULE(timer, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0); +EARLY_DRIVER_MODULE(timer, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0, + BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); void DELAY(int usec) ==== //depot/projects/opencrypto/sys/arm/arm/gic.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/gic.c 267389 2014-06-12 11:41:04Z br $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/gic.c 269605 2014-08-05 18:51:51Z ian $"); #include #include @@ -264,7 +264,8 @@ static devclass_t arm_gic_devclass; -DRIVER_MODULE(gic, simplebus, arm_gic_driver, arm_gic_devclass, 0, 0); +EARLY_DRIVER_MODULE(gic, simplebus, arm_gic_driver, arm_gic_devclass, 0, 0, + BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); static void gic_post_filter(void *arg) ==== //depot/projects/opencrypto/sys/arm/arm/intr.c#2 (text+ko) ==== @@ -37,10 +37,11 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/intr.c 266621 2014-05-24 16:21:16Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/intr.c 269646 2014-08-06 21:27:15Z ian $"); #include #include #include +#include #include #include #include @@ -75,8 +76,8 @@ * assumptions of vmstat(8) and the kdb "show intrcnt" command, the two * consumers of this data. */ -void -arm_intrnames_init(void) +static void +intr_init(void *unused) { int i; @@ -86,6 +87,8 @@ } } +SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL); + void arm_setup_irqhandler(const char *name, driver_filter_t *filt, void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) ==== //depot/projects/opencrypto/sys/arm/arm/machdep.c#2 (text+ko) ==== @@ -49,7 +49,7 @@ #include "opt_timer.h" #include -__FBSDID("$FreeBSD: head/sys/arm/arm/machdep.c 266301 2014-05-17 11:27:36Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/machdep.c 269646 2014-08-06 21:27:15Z ian $"); #include #include @@ -1278,7 +1278,6 @@ init_proc0(kernelstack.pv_va); - arm_intrnames_init(); arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); pmap_bootstrap(freemempos, &kernel_l1pt); msgbufp = (void *)msgbufpv.pv_va; ==== //depot/projects/opencrypto/sys/arm/arm/mpcore_timer.c#2 (text+ko) ==== @@ -43,7 +43,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/mpcore_timer.c 264094 2014-04-04 00:00:05Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/mpcore_timer.c 269605 2014-08-05 18:51:51Z ian $"); #include #include @@ -382,7 +382,8 @@ static devclass_t arm_tmr_devclass; -DRIVER_MODULE(mp_tmr, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0); +EARLY_DRIVER_MODULE(mp_tmr, simplebus, arm_tmr_driver, arm_tmr_devclass, 0, 0, + BUS_PASS_TIMER + BUS_PASS_ORDER_MIDDLE); /* * Handle a change in clock frequency. The mpcore timer runs at half the CPU ==== //depot/projects/opencrypto/sys/arm/arm/nexus.c#2 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 261513 2014-02-05 14:44:22Z nwhitehorn $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 269606 2014-08-05 19:06:45Z ian $"); #include #include @@ -125,7 +125,12 @@ nexus_methods, 1 /* no softc */ }; +#ifdef ARM_DEVICE_MULTIPASS +EARLY_DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0, + BUS_PASS_BUS + BUS_PASS_ORDER_EARLY); +#else DRIVER_MODULE(nexus, root, nexus_driver, nexus_devclass, 0, 0); +#endif static int nexus_probe(device_t dev) ==== //depot/projects/opencrypto/sys/arm/arm/pl190.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/pl190.c 261410 2014-02-02 19:17:28Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/pl190.c 269605 2014-08-05 18:51:51Z ian $"); #include #include @@ -152,7 +152,8 @@ static devclass_t pl190_intc_devclass; -DRIVER_MODULE(intc, simplebus, pl190_intc_driver, pl190_intc_devclass, 0, 0); +EARLY_DRIVER_MODULE(intc, simplebus, pl190_intc_driver, pl190_intc_devclass, + 0, 0, BUS_PASS_INTERRUPT + BUS_PASS_ORDER_MIDDLE); int arm_get_next_irq(int last_irq) ==== //depot/projects/opencrypto/sys/arm/arm/pl310.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/pl310.c 265870 2014-05-11 04:24:57Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/pl310.c 269598 2014-08-05 17:39:58Z ian $"); #include #include #include @@ -378,6 +378,44 @@ g_l2cache_size = g_way_size * g_ways_assoc; } +/* + * Setup interrupt handling. This is done only if the cache controller is + * disabled, for debugging. We set counters so when a cache event happens we'll + * get interrupted and be warned that something is wrong, because no cache + * events should happen if we're disabled. + */ +static void +pl310_config_intr(void *arg) +{ + struct pl310_softc * sc; + + sc = arg; + + /* activate the interrupt */ + bus_setup_intr(sc->sc_dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, + pl310_filter, NULL, sc, &sc->sc_irq_h); + + /* Cache Line Eviction for Counter 0 */ + pl310_write4(sc, PL310_EVENT_COUNTER0_CONF, + EVENT_COUNTER_CONF_INCR | EVENT_COUNTER_CONF_CO); + /* Data Read Request for Counter 1 */ + pl310_write4(sc, PL310_EVENT_COUNTER1_CONF, + EVENT_COUNTER_CONF_INCR | EVENT_COUNTER_CONF_DRREQ); + + /* Enable and clear pending interrupts */ + pl310_write4(sc, PL310_INTR_CLEAR, INTR_MASK_ECNTR); + pl310_write4(sc, PL310_INTR_MASK, INTR_MASK_ALL); + + /* Enable counters and reset C0 and C1 */ + pl310_write4(sc, PL310_EVENT_COUNTER_CTRL, + EVENT_COUNTER_CTRL_ENABLED | + EVENT_COUNTER_CTRL_C0_RESET | + EVENT_COUNTER_CTRL_C1_RESET); + + config_intrhook_disestablish(sc->sc_ich); + free(sc->sc_ich, M_DEVBUF); +} + static int pl310_probe(device_t dev) { @@ -416,10 +454,6 @@ pl310_softc = sc; mtx_init(&sc->sc_mtx, "pl310lock", NULL, MTX_SPIN); - /* activate the interrupt */ - bus_setup_intr(dev, sc->sc_irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - pl310_filter, NULL, sc, &sc->sc_irq_h); - cache_id = pl310_read4(sc, PL310_CACHE_ID); sc->sc_rtl_revision = (cache_id >> CACHE_ID_RELEASE_SHIFT) & CACHE_ID_RELEASE_MASK; @@ -466,28 +500,14 @@ if (bootverbose) pl310_print_config(sc); } else { - /* - * Set counters so when cache event happens we'll get interrupt - * and be warned that something is off. - */ - - /* Cache Line Eviction for Counter 0 */ - pl310_write4(sc, PL310_EVENT_COUNTER0_CONF, - EVENT_COUNTER_CONF_INCR | EVENT_COUNTER_CONF_CO); - /* Data Read Request for Counter 1 */ - pl310_write4(sc, PL310_EVENT_COUNTER1_CONF, - EVENT_COUNTER_CONF_INCR | EVENT_COUNTER_CONF_DRREQ); - - /* Enable and clear pending interrupts */ - pl310_write4(sc, PL310_INTR_CLEAR, INTR_MASK_ECNTR); - pl310_write4(sc, PL310_INTR_MASK, INTR_MASK_ALL); - - /* Enable counters and reset C0 and C1 */ - pl310_write4(sc, PL310_EVENT_COUNTER_CTRL, - EVENT_COUNTER_CTRL_ENABLED | - EVENT_COUNTER_CTRL_C0_RESET | - EVENT_COUNTER_CTRL_C1_RESET); - + malloc(sizeof(*sc->sc_ich), M_DEVBUF, M_WAITOK); + sc->sc_ich->ich_func = pl310_config_intr; + sc->sc_ich->ich_arg = sc; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:11 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92599590; Mon, 8 Sep 2014 04:49:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F0FE1461 for ; Mon, 8 Sep 2014 04:49:09 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BDC431A2D for ; Mon, 8 Sep 2014 04:49:09 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884n9dc020209 for ; Mon, 8 Sep 2014 04:49:09 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884n900020206 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:09 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:09 GMT Message-Id: <201409080449.s884n900020206@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198647 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:11 -0000 http://p4web.freebsd.org/@@1198647?ac=10 Change 1198647 by jmg@jmg_carbon2 on 2014/08/13 04:45:06 sync up w/ head... Affected files ... .. //depot/projects/opencrypto/share/man/man3/pthread.3#2 integrate .. //depot/projects/opencrypto/share/man/man9/vm_page_busy.9#2 integrate Differences ... ==== //depot/projects/opencrypto/share/man/man3/pthread.3#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man3/pthread.3 235286 2012-05-11 20:06:46Z gjb $ +.\" $FreeBSD: head/share/man/man3/pthread.3 269871 2014-08-12 12:44:52Z gavin $ .\" -.Dd January 8, 2010 +.Dd August 12, 2014 .Dt PTHREAD 3 .Os .Sh NAME @@ -344,13 +344,13 @@ .Fa "const struct timespec *abstime" .Fc .Xc -Wait no longer than the specified time for a condition -and lock the specified mutex. +Unlock the specified mutex, wait no longer than the specified time for +a condition, and then relock the mutex. .It Xo .Ft int .Fn pthread_cond_wait "pthread_cond_t *" "pthread_mutex_t *mutex" .Xc -Wait for a condition and lock the specified mutex. +Unlock the specified mutex, wait for a condition, and relock the mutex. .El .Ss Read/Write Lock Routines .Bl -tag -width indent ==== //depot/projects/opencrypto/share/man/man9/vm_page_busy.9#2 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/vm_page_busy.9 254174 2013-08-10 06:37:53Z joel $ +.\" $FreeBSD: head/share/man/man9/vm_page_busy.9 269824 2014-08-11 18:26:57Z jhb $ .Dd August 07, 2013 .Dt VM_PAGE_BUSY 9 .Os @@ -95,7 +95,7 @@ For example, when a thread wants to access or update page contents without a lock held the page is shared busied. .Pp -Before busing a page the vm_object lock must be held. +Before busying a page the vm_object lock must be held. The same rule applies when a page is unbusied. This makes the vm_object lock a real busy interlock. .Pp From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:10 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1CD0249B; Mon, 8 Sep 2014 04:49:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B2DE3AE for ; Mon, 8 Sep 2014 04:49:09 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E4F361A27 for ; Mon, 8 Sep 2014 04:49:08 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884n8MS020170 for ; Mon, 8 Sep 2014 04:49:08 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884n8HJ020167 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:08 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:08 GMT Message-Id: <201409080449.s884n8HJ020167@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198640 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:10 -0000 http://p4web.freebsd.org/@@1198640?ac=10 Change 1198640 by jmg@jmg_carbon2 on 2014/08/13 00:36:09 Bring in NetBSD's man page since it is much more useful than ours.. add the new AEAD ioctl that I added for testing GCM... Affected files ... .. //depot/projects/opencrypto/share/man/man4/crypto.4#2 edit Differences ... ==== //depot/projects/opencrypto/share/man/man4/crypto.4#2 (text+ko) ==== @@ -1,8 +1,15 @@ -.\" $OpenBSD: crypto.4,v 1.4 2002/09/12 07:15:03 deraadt Exp $ +.\" $NetBSD: crypto.4,v 1.24 2014/01/27 21:23:59 pgoyette Exp $ .\" -.\" Copyright (c) 2001 Theo de Raadt +.\" Copyright (c) 2008 The NetBSD Foundation, Inc. +.\" Copyright (c) 2014 The FreeBSD Foundation .\" All rights reserved. .\" +.\" Portions of this documentation were writen by John-Mark Gurney +.\" under sponsorship from the FreeBSD Foundation. +.\" +.\" This code is derived from software contributed to The NetBSD Foundation +.\" by Coyote Point Systems, Inc. +.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -11,99 +18,354 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. The name of the author may not be used to endorse or promote products -.\" derived from this software without specific prior written permission. .\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -.\" DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, -.\" INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -.\" SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -.\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +.\" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man4/crypto.4 263110 2014-03-13 16:19:36Z jmg $ +.\" +.\" +.\" Copyright (c) 2004 +.\" Jonathan Stone . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY Jonathan Stone AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL Jonathan Stone OR THE VOICES IN HIS HEAD +.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +.\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd September 7, 2010 +.Dd August 12, 2014 .Dt CRYPTO 4 .Os .Sh NAME .Nm crypto , .Nm cryptodev -.Nd hardware crypto access driver +.Nd user-mode access to hardware-accelerated cryptography .Sh SYNOPSIS .Cd device crypto .Cd device cryptodev +.Pp +.In sys/ioctl.h +.In sys/time.h +.In crypto/cryptodev.h .Sh DESCRIPTION The .Nm -driver provides a device-independent framework to support -cryptographic operations in the kernel. +driver gives user-mode applications access to hardware-accelerated +cryptographic transforms, as implemented by the +.Xr opencrypto 9 +in-kernel interface. +.Pp The -.Nm cryptodev -driver provides userland applications access to this support -through the .Pa /dev/crypto -device. -This node primarily operates in an +special device provides an +.Xr ioctl 2 +based interface. +User-mode applications should open the special device, +then issue .Xr ioctl 2 -based model, permitting a variety of applications to query device capabilities, -submit transactions, and get results. +calls on the descriptor. +User-mode access to +.Pa /dev/crypto +is controlled by three +.Xr sysctl 8 +variables, +.Ic kern.userasymcrypto +and +.Ic kern.cryptodevallowsoft . +See +.Xr sysctl 7 +for additional details. .Pp -If -.Ar count -given in the specification, and is greater than 0, a maximum of one +The .Nm -device is created. +device provides two distinct modes of operation: one mode for +symmetric-keyed cryptographic requests, and a second mode for +both asymmetric-key (public-key/private-key) requests, and for +modular arithmetic (for Diffie-Hellman key exchange and other +cryptographic protocols). +The two modes are described separately below. +.Sh THEORY OF OPERATION +Regardless of whether symmetric-key or asymmetric-key operations are +to be performed, use of the device requires a basic series of steps: +.Pp +.Bl -enum +.It +Open a file descriptor for the device. +See +.Xr open 2 . +.It +If any symmetric operation will be performed, +create one session, with +.Dv CIOCGSESSION . +Most applications will require at least one symmetric session. +Since cipher and MAC keys are tied to sessions, many +applications will require more. +Asymmetric operations do not use sessions. +.It +Submit requests, synchronously with +.Dv CIOCCRYPT +(symmetric) +or +.Dv CIOCKEY +(asymmetric). +.It +Destroy one session with +.Dv CIOCFSESSION . +.It +Close the device with +.Xr close 2 . +.El +.Sh SYMMETRIC-KEY OPERATION +The symmetric-key operation mode provides a context-based API +to traditional symmetric-key encryption (or privacy) algorithms, +or to keyed and unkeyed one-way hash (HMAC and MAC) algorithms. +The symmetric-key mode also permits fused operation, +where the hardware performs both a privacy algorithm and an integrity-check +algorithm in a single pass over the data: either a fused +encrypt/HMAC-generate operation, or a fused HMAC-verify/decrypt operation. +.Pp +To use symmetric mode, you must first create a session specifying +the algorithm(s) and key(s) to use; then issue encrypt or decrypt +requests against the session. +.Ss Algorithms +For a list of supported algorithms, see +.Xr crypto 9 . +.Ss IOCTL Request Descriptions +.\" +.Bl -tag -width CIOCGSESSION +.\" +.It Dv CRIOGET Fa int *fd +This operation is deprecated and will be removed after +.Nx 5.0 . +It clones the fd argument to +.Xr ioctl 2 , +yielding a new file descriptor for the creation of sessions. +Because the device now clones on open, this operation is unnecessary. +.\" +.It Dv CIOCGSESSION Fa struct session_op *sessp +.Bd -literal +struct session_op { + u_int32_t cipher; /* e.g. CRYPTO_DES_CBC */ + u_int32_t mac; /* e.g. CRYPTO_MD5_HMAC */ + + u_int32_t keylen; /* cipher key */ + void * key; + int mackeylen; /* mac key */ + void * mackey; + + u_int32_t ses; /* returns: ses # */ +}; + +.Ed +Create a new cryptographic session on a file descriptor for the device; +that is, a persistent object specific to the chosen +privacy algorithm, integrity algorithm, and keys specified in +.Fa sessp . +The special value 0 for either privacy or integrity +is reserved to indicate that the indicated operation (privacy or integrity) +is not desired for this session. +.Pp +Multiple sessions may be bound to a single file descriptor. +The session ID returned in +.Fa sessp-\*[Gt]ses +is supplied as a required field in the symmetric-operation structure +.Fa crypt_op +for future encryption or hashing requests. +.\" .Pp +.\" This implementation will never return a session ID of 0 for a successful +.\" creation of a session, which is a +.\" .Nx +.\" extension. +.Pp +For non-zero symmetric-key privacy algorithms, the privacy algorithm +must be specified in +.Fa sessp-\*[Gt]cipher , +the key length in +.Fa sessp-\*[Gt]keylen , +and the key value in the octets addressed by +.Fa sessp-\*[Gt]key . +.Pp +For keyed one-way hash algorithms, the one-way hash must be specified +in +.Fa sessp-\*[Gt]mac , +the key length in +.Fa sessp-\*[Gt]mackey , +and the key value in the octets addressed by +.Fa sessp-\*[Gt]mackeylen . +.\" .Pp -The following +Support for a specific combination of fused privacy and +integrity-check algorithms depends on whether the underlying +hardware supports that combination. +Not all combinations are supported +by all hardware, even if the hardware supports each operation as a +stand-alone non-fused operation. +.It Dv CIOCCRYPT Fa struct crypt_op *cr_op +.Bd -literal +struct crypt_op { + u_int32_t ses; + u_int16_t op; /* e.g. COP_ENCRYPT */ + u_int16_t flags; + u_int len; + caddr_t src, dst; + caddr_t mac; /* must be large enough for result */ + caddr_t iv; +}; + +.Ed +Request a symmetric-key (or hash) operation. +The file descriptor argument to .Xr ioctl 2 -calls apply only to the -.Nm -devices: -.Bl -tag -width ".Dv CIOCGSESSION" -.It Dv CIOCGSESSION -Setup a new crypto session for a new type of operation. -.It Dv CIOCFSESSION -Free a previously established session. -.It Dv CIOCCRYPT -Perform a crypto operation against a previously setup session. +must have been bound to a valid session. +To encrypt, set +.Fa cr_op-\*[Gt]op +to +.Dv COP_ENCRYPT . +To decrypt, set +.Fa cr_op-\*[Gt]op +to +.Dv COP_DECRYPT . +The field +.Fa cr_op-\*[Gt]len +supplies the length of the input buffer; the fields +.Fa cr_op-\*[Gt]src , +.Fa cr_op-\*[Gt]dst , +.Fa cr_op-\*[Gt]mac , +.Fa cr_op-\*[Gt]iv +supply the addresses of the input buffer, output buffer, +one-way hash, and initialization vector, respectively. +.It Dv CIOCCRYPTAEAD Fa struct crypt_aead *cr_aead +.Bd -literal +struct crypt_aead { + u_int32_t ses; + u_int16_t op; /* e.g. COP_ENCRYPT */ + u_int16_t flags; + u_int len; + u_int aadlen; + u_int ivlen; + caddr_t src, dst; + caddr_t aad; + caddr_t tag; /* must be large enough for result */ + caddr_t iv; +}; + +.Ed +The +.Dv CIOCCRYPTAEAD +is similar to the +.Dv CIOCCRYPT +but provides additional data in +.Fa cr_aead-\*[Gt]aad +to include in the authentication mode. +.It Dv CIOCFSESSION Fa u_int32_t ses_id +Destroys the /dev/crypto session associated with the file-descriptor +argument. +.It Dv CIOCNFSESSION Fa struct crypt_sfop *sfop ; +.Bd -literal +struct crypt_sfop { + size_t count; + u_int32_t *sesid; +}; + +.Ed +Destroys the +.Fa sfop-\*[Gt]count +sessions specified by the +.Fa sfop +array of session identifiers. .El -.Sh FEATURES -Depending on hardware being present, the following symmetric and -asymmetric cryptographic features are potentially available from -.Pa /dev/crypto : +.\" +.Sh ASYMMETRIC-KEY OPERATION +.Ss Asymmetric-key algorithms +Contingent upon hardware support, the following asymmetric +(public-key/private-key; or key-exchange subroutine) operations may +also be available: .Pp -.Bl -tag -width ".Dv CRYPTO_RIPEMD160_HMAC" -offset indent -compact -.It Dv CRYPTO_DES_CBC -.It Dv CRYPTO_3DES_CBC -.It Dv CRYPTO_BLF_CBC -.It Dv CRYPTO_CAMELLIA_CBC -.It Dv CRYPTO_CAST_CBC -.It Dv CRYPTO_SKIPJACK_CBC -.It Dv CRYPTO_MD5_HMAC -.It Dv CRYPTO_SHA1_HMAC -.It Dv CRYPTO_RIPEMD160_HMAC -.It Dv CRYPTO_MD5_KPDK -.It Dv CRYPTO_SHA1_KPDK -.It Dv CRYPTO_AES_CBC -.It Dv CRYPTO_ARC4 -.It Dv CRYPTO_MD5 -.It Dv CRYPTO_SHA1 -.It Dv CRK_MOD_EXP -.It Dv CRK_MOD_EXP_CRT -.It Dv CRK_DSA_SIGN -.It Dv CRK_DSA_VERIFY -.It Dv CRK_DH_COMPUTE_KEY +.Bl -column "CRK_DH_COMPUTE_KEY" "Input parameter" "Output parameter" -offset indent -compact +.It Em "Algorithm" Ta "Input parameter" Ta "Output parameter" +.It Em " " Ta "Count" Ta "Count" +.It Dv CRK_MOD_EXP Ta 3 Ta 1 +.It Dv CRK_MOD_EXP_CRT Ta 6 Ta 1 +.It Dv CRK_DSA_SIGN Ta 5 Ta 2 +.It Dv CRK_DSA_VERIFY Ta 7 Ta 0 +.It Dv CRK_DH_COMPUTE_KEY Ta 3 Ta 1 .El -.Sh FILES -.Bl -tag -width ".Pa /dev/crypto" -compact -.It Pa /dev/crypto -crypto access device +.Pp +See below for discussion of the input and output parameter counts. +.Ss Asymmetric-key commands +.Bl -tag -width CIOCKEY +.It Dv CIOCASYMFEAT Fa int *feature_mask +Returns a bitmask of supported asymmetric-key operations. +Each of the above-listed asymmetric operations is present +if and only if the bit position numbered by the code for that operation +is set. +For example, +.Dv CRK_MOD_EXP +is available if and only if the bit +.Pq 1 \*[Lt]\*[Lt] Dv CRK_MOD_EXP +is set. +.It Dv CIOCKEY Fa struct crypt_kop *kop +.Bd -literal +struct crypt_kop { + u_int crk_op; /* e.g. CRK_MOD_EXP */ + u_int crk_status; /* return status */ + u_short crk_iparams; /* # of input params */ + u_short crk_oparams; /* # of output params */ + u_int crk_pad1; + struct crparam crk_param[CRK_MAXPARAM]; +}; + +/* Bignum parameter, in packed bytes. */ +struct crparam { + void * crp_p; + u_int crp_nbits; +}; + +.Ed +Performs an asymmetric-key operation from the list above. +The specific operation is supplied in +.Fa kop-\*[Gt]crk_op ; +final status for the operation is returned in +.Fa kop-\*[Gt]crk_status . +The number of input arguments and the number of output arguments +is specified in +.Fa kop-\*[Gt]crk_iparams +and +.Fa kop-\*[Gt]crk_iparams , +respectively. +The field +.Fa crk_param[] +must be filled in with exactly +.Fa kop-\*[Gt]crk_iparams + kop-\*[Gt]crk_oparams +arguments, each encoded as a +.Fa struct crparam +(address, bitlength) pair. +.Pp +The semantics of these arguments are currently undocumented. .El .Sh SEE ALSO .Xr aesni 4 , @@ -123,3 +385,24 @@ .Nm driver was imported to .Fx 5.0 . +.Sh BUGS +Error checking and reporting is weak. +.Pp +The values specified for symmetric-key key sizes to +.Dv CIOCGSESSION +must exactly match the values expected by +.Xr opencrypto 9 . +The output buffer and MAC buffers supplied to +.Dv CIOCCRYPT +must follow whether privacy or integrity algorithms were specified for +session: if you request a +.No non- Ns Dv NULL +algorithm, you must supply a suitably-sized buffer. +.Pp +The scheme for passing arguments for asymmetric requests is baroque. +.Pp +The naming inconsistency between +.Dv CRIOGET +and the various +.Dv CIOC Ns \&* +names is an unfortunate historical artifact. From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:21 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E9B64864; Mon, 8 Sep 2014 04:49:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 317307CB for ; Mon, 8 Sep 2014 04:49:16 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 89C981A59 for ; Mon, 8 Sep 2014 04:49:15 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nFoV020451 for ; Mon, 8 Sep 2014 04:49:15 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nFVU020447 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:15 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:15 GMT Message-Id: <201409080449.s884nFVU020447@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198683 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:21 -0000 http://p4web.freebsd.org/@@1198683?ac=10 Change 1198683 by jmg@jmg_carbon2 on 2014/08/13 18:51:53 integrate @1198682 Affected files ... .. //depot/projects/opencrypto/sys/conf/options#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_exec.c#2 integrate .. //depot/projects/opencrypto/sys/kern/uipc_shm.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp.h#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_uio.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctputil.c#3 integrate .. //depot/projects/opencrypto/sys/vm/vm_glue.c#2 integrate Differences ... ==== //depot/projects/opencrypto/sys/conf/options#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/conf/options 269459 2014-08-03 05:00:43Z imp $ +# $FreeBSD: head/sys/conf/options 269945 2014-08-13 15:50:16Z tuexen $ # # On the handling of kernel options # @@ -457,6 +457,7 @@ SCTP_USE_PERCPU_STAT opt_sctp.h # Use per cpu stats. SCTP_MCORE_INPUT opt_sctp.h # Have multiple input threads for input mbufs SCTP_LOCAL_TRACE_BUF opt_sctp.h # Use tracebuffer exported via sysctl +SCTP_DETAILED_STR_STATS opt_sctp.h # Use per PR-SCTP policy stream stats # # # ==== //depot/projects/opencrypto/sys/kern/kern_exec.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/kern/kern_exec.c 268636 2014-07-14 22:40:46Z mjg $"); +__FBSDID("$FreeBSD: head/sys/kern/kern_exec.c 269907 2014-08-13 05:44:08Z kib $"); #include "opt_capsicum.h" #include "opt_hwpmc_hooks.h" @@ -993,6 +993,7 @@ vm_page_xunbusy(ma[0]); vm_page_lock(ma[0]); vm_page_hold(ma[0]); + vm_page_activate(ma[0]); vm_page_unlock(ma[0]); VM_OBJECT_WUNLOCK(object); ==== //depot/projects/opencrypto/sys/kern/uipc_shm.c#2 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/kern/uipc_shm.c 269409 2014-08-01 23:29:04Z rpaulo $"); +__FBSDID("$FreeBSD: head/sys/kern/uipc_shm.c 269907 2014-08-13 05:44:08Z kib $"); #include "opt_capsicum.h" #include "opt_ktrace.h" @@ -197,6 +197,12 @@ vm_page_xunbusy(m); vm_page_lock(m); vm_page_hold(m); + if (m->queue == PQ_NONE) { + vm_page_deactivate(m); + } else { + /* Requeue to maintain LRU ordering. */ + vm_page_requeue(m); + } vm_page_unlock(m); VM_OBJECT_WUNLOCK(obj); error = uiomove_fromphys(&m, offset, tlen, uio); @@ -208,12 +214,6 @@ } vm_page_lock(m); vm_page_unhold(m); - if (m->queue == PQ_NONE) { - vm_page_deactivate(m); - } else { - /* Requeue to maintain LRU ordering. */ - vm_page_requeue(m); - } vm_page_unlock(m); return (error); ==== //depot/projects/opencrypto/sys/netinet/sctp.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/netinet/sctp.h 269858 2014-08-12 11:30:16Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp.h 269945 2014-08-13 15:50:16Z tuexen $"); #ifndef _NETINET_SCTP_H_ #define _NETINET_SCTP_H_ @@ -140,6 +140,8 @@ #define SCTP_GET_ASSOC_NUMBER 0x00000104 /* ro */ #define SCTP_GET_ASSOC_ID_LIST 0x00000105 /* ro */ #define SCTP_TIMEOUTS 0x00000106 +#define SCTP_PR_STREAM_STATUS 0x00000107 +#define SCTP_PR_ASSOC_STATUS 0x00000108 /* * user socket options: BSD implementation specific ==== //depot/projects/opencrypto/sys/netinet/sctp_input.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 269858 2014-08-12 11:30:16Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 269945 2014-08-13 15:50:16Z tuexen $"); #include #include @@ -1469,6 +1469,11 @@ int spec_flag = 0; uint32_t how_indx; +#if defined(SCTP_DETAILED_STR_STATS) + int j; + +#endif + net = *netp; /* I know that the TCB is non-NULL from the caller */ asoc = &stcb->asoc; @@ -1931,6 +1936,15 @@ sctp_report_all_outbound(stcb, 0, 1, SCTP_SO_LOCKED); for (i = 0; i < stcb->asoc.streamoutcnt; i++) { stcb->asoc.strmout[i].chunks_on_queues = 0; +#if defined(SCTP_DETAILED_STR_STATS) + for (j = 0; j < SCTP_PR_SCTP_MAX + 1; j++) { + asoc->strmout[i].abandoned_sent[j] = 0; + asoc->strmout[i].abandoned_unsent[j] = 0; + } +#else + asoc->strmout[i].abandoned_sent[0] = 0; + asoc->strmout[i].abandoned_unsent[0] = 0; +#endif stcb->asoc.strmout[i].stream_no = i; stcb->asoc.strmout[i].next_sequence_send = 0; stcb->asoc.strmout[i].last_msg_incomplete = 0; ==== //depot/projects/opencrypto/sys/netinet/sctp_output.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 269858 2014-08-12 11:30:16Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_output.c 269945 2014-08-13 15:50:16Z tuexen $"); #include #include @@ -3618,6 +3618,11 @@ struct sctp_stream_out *tmp_str; unsigned int i; +#if defined(SCTP_DETAILED_STR_STATS) + int j; + +#endif + /* Default is NOT correct */ SCTPDBG(SCTP_DEBUG_OUTPUT1, "Ok, default:%d pre_open:%d\n", stcb->asoc.streamoutcnt, stcb->asoc.pre_open_streams); @@ -3638,6 +3643,15 @@ TAILQ_INIT(&stcb->asoc.strmout[i].outqueue); stcb->asoc.strmout[i].chunks_on_queues = 0; stcb->asoc.strmout[i].next_sequence_send = 0; +#if defined(SCTP_DETAILED_STR_STATS) + for (j = 0; j < SCTP_PR_SCTP_MAX + 1; j++) { + stcb->asoc.strmout[i].abandoned_sent[j] = 0; + stcb->asoc.strmout[i].abandoned_unsent[j] = 0; + } +#else + stcb->asoc.strmout[i].abandoned_sent[0] = 0; + stcb->asoc.strmout[i].abandoned_unsent[0] = 0; +#endif stcb->asoc.strmout[i].stream_no = i; stcb->asoc.strmout[i].last_msg_incomplete = 0; stcb->asoc.ss_functions.sctp_ss_init_stream(&stcb->asoc.strmout[i], NULL); @@ -11923,6 +11937,11 @@ struct sctp_stream_queue_pending *sp, *nsp; int i; +#if defined(SCTP_DETAILED_STR_STATS) + int j; + +#endif + oldstream = stcb->asoc.strmout; /* get some more */ SCTP_MALLOC(stcb->asoc.strmout, struct sctp_stream_out *, @@ -11968,6 +11987,15 @@ for (i = stcb->asoc.streamoutcnt; i < (stcb->asoc.streamoutcnt + adding_o); i++) { TAILQ_INIT(&stcb->asoc.strmout[i].outqueue); stcb->asoc.strmout[i].chunks_on_queues = 0; +#if defined(SCTP_DETAILED_STR_STATS) + for (j = 0; j < SCTP_PR_SCTP_MAX + 1; j++) { + stcb->asoc.strmout[i].abandoned_sent[j] = 0; + stcb->asoc.strmout[i].abandoned_unsent[j] = 0; + } +#else + stcb->asoc.strmout[i].abandoned_sent[0] = 0; + stcb->asoc.strmout[i].abandoned_unsent[0] = 0; +#endif stcb->asoc.strmout[i].next_sequence_send = 0x0; stcb->asoc.strmout[i].stream_no = i; stcb->asoc.strmout[i].last_msg_incomplete = 0; ==== //depot/projects/opencrypto/sys/netinet/sctp_structs.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/netinet/sctp_structs.h 269858 2014-08-12 11:30:16Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_structs.h 269945 2014-08-13 15:50:16Z tuexen $"); #ifndef _NETINET_SCTP_STRUCTS_H_ #define _NETINET_SCTP_STRUCTS_H_ @@ -587,6 +587,14 @@ struct sctp_streamhead outqueue; union scheduling_parameters ss_params; uint32_t chunks_on_queues; +#if defined(SCTP_DETAILED_STR_STATS) + uint32_t abandoned_unsent[SCTP_PR_SCTP_MAX + 1]; + uint32_t abandoned_sent[SCTP_PR_SCTP_MAX + 1]; +#else + /* Only the aggregation */ + uint32_t abandoned_unsent[1]; + uint32_t abandoned_sent[1]; +#endif uint16_t stream_no; uint16_t next_sequence_send; /* next one I expect to send out */ uint8_t last_msg_incomplete; @@ -1211,6 +1219,8 @@ uint32_t timoshutdownack; struct timeval start_time; struct timeval discontinuity_time; + uint64_t abandoned_unsent[SCTP_PR_SCTP_MAX + 1]; + uint64_t abandoned_sent[SCTP_PR_SCTP_MAX + 1]; }; #endif ==== //depot/projects/opencrypto/sys/netinet/sctp_uio.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/netinet/sctp_uio.h 268990 2014-07-22 19:54:22Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_uio.h 269945 2014-08-13 15:50:16Z tuexen $"); #ifndef _NETINET_SCTP_UIO_H_ #define _NETINET_SCTP_UIO_H_ @@ -249,18 +249,23 @@ SCTP_SACK_IMMEDIATELY)) != 0) /* for the endpoint */ -/* The lower byte is an enumeration of PR-SCTP policies */ +/* The lower four bits is an enumeration of PR-SCTP policies */ #define SCTP_PR_SCTP_NONE 0x0000/* Reliable transfer */ #define SCTP_PR_SCTP_TTL 0x0001/* Time based PR-SCTP */ #define SCTP_PR_SCTP_BUF 0x0002/* Buffer based PR-SCTP */ #define SCTP_PR_SCTP_RTX 0x0003/* Number of retransmissions based PR-SCTP */ +#define SCTP_PR_SCTP_MAX SCTP_PR_SCTP_RTX +#define SCTP_PR_SCTP_ALL 0x000f/* Used for aggregated stats */ #define PR_SCTP_POLICY(x) ((x) & 0x0f) -#define PR_SCTP_ENABLED(x) (PR_SCTP_POLICY(x) != SCTP_PR_SCTP_NONE) +#define PR_SCTP_ENABLED(x) ((PR_SCTP_POLICY(x) != SCTP_PR_SCTP_NONE) && \ + (PR_SCTP_POLICY(x) != SCTP_PR_SCTP_ALL)) #define PR_SCTP_TTL_ENABLED(x) (PR_SCTP_POLICY(x) == SCTP_PR_SCTP_TTL) #define PR_SCTP_BUF_ENABLED(x) (PR_SCTP_POLICY(x) == SCTP_PR_SCTP_BUF) #define PR_SCTP_RTX_ENABLED(x) (PR_SCTP_POLICY(x) == SCTP_PR_SCTP_RTX) -#define PR_SCTP_INVALID_POLICY(x) (PR_SCTP_POLICY(x) > SCTP_PR_SCTP_RTX) +#define PR_SCTP_INVALID_POLICY(x) (PR_SCTP_POLICY(x) > SCTP_PR_SCTP_MAX) +#define PR_SCTP_VALID_POLICY(x) (PR_SCTP_POLICY(x) <= SCTP_PR_SCTP_MAX) + /* Stat's */ struct sctp_pcbinfo { uint32_t ep_count; @@ -719,6 +724,14 @@ uint16_t sue_port; }; +struct sctp_prstatus { + sctp_assoc_t sprstat_assoc_id; + uint16_t sprstat_sid; + uint16_t sprstat_policy; + uint64_t sprstat_abandoned_unsent; + uint64_t sprstat_abandoned_sent; +}; + struct sctp_cwnd_args { struct sctp_nets *net; /* network to *//* FIXME: LP64 issue */ uint32_t cwnd_new_value;/* cwnd in k */ ==== //depot/projects/opencrypto/sys/netinet/sctp_usrreq.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/netinet/sctp_usrreq.c 269858 2014-08-12 11:30:16Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctp_usrreq.c 269945 2014-08-13 15:50:16Z tuexen $"); #include #include @@ -3510,6 +3510,72 @@ } break; } + case SCTP_PR_STREAM_STATUS: + { + struct sctp_prstatus *sprstat; + uint16_t sid; + uint16_t policy; + + SCTP_CHECK_AND_CAST(sprstat, optval, struct sctp_prstatus, *optsize); + SCTP_FIND_STCB(inp, stcb, sprstat->sprstat_assoc_id); + + sid = sprstat->sprstat_sid; + policy = sprstat->sprstat_policy; +#if defined(SCTP_DETAILED_STR_STATS) + if ((stcb != NULL) && + (policy != SCTP_PR_SCTP_NONE) && + (sid < stcb->asoc.streamoutcnt) && + ((policy == SCTP_PR_SCTP_ALL) || + (PR_SCTP_VALID_POLICY(policy)))) { +#else + if ((stcb != NULL) && + (policy != SCTP_PR_SCTP_NONE) && + (sid < stcb->asoc.streamoutcnt) && + (policy == SCTP_PR_SCTP_ALL)) { +#endif + if (policy == SCTP_PR_SCTP_ALL) { + sprstat->sprstat_abandoned_unsent = stcb->asoc.strmout[sid].abandoned_unsent[0]; + sprstat->sprstat_abandoned_sent = stcb->asoc.strmout[sid].abandoned_sent[0]; + } else { + sprstat->sprstat_abandoned_unsent = stcb->asoc.strmout[sid].abandoned_unsent[policy]; + sprstat->sprstat_abandoned_sent = stcb->asoc.strmout[sid].abandoned_sent[policy]; + } + SCTP_TCB_UNLOCK(stcb); + *optsize = sizeof(struct sctp_prstatus); + } else { + SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); + error = EINVAL; + } + break; + } + case SCTP_PR_ASSOC_STATUS: + { + struct sctp_prstatus *sprstat; + uint16_t policy; + + SCTP_CHECK_AND_CAST(sprstat, optval, struct sctp_prstatus, *optsize); + SCTP_FIND_STCB(inp, stcb, sprstat->sprstat_assoc_id); + + policy = sprstat->sprstat_policy; + if ((stcb != NULL) && + (policy != SCTP_PR_SCTP_NONE) && + ((policy == SCTP_PR_SCTP_ALL) || + (PR_SCTP_VALID_POLICY(policy)))) { + if (policy == SCTP_PR_SCTP_ALL) { + sprstat->sprstat_abandoned_unsent = stcb->asoc.abandoned_unsent[0]; + sprstat->sprstat_abandoned_sent = stcb->asoc.abandoned_sent[0]; + } else { + sprstat->sprstat_abandoned_unsent = stcb->asoc.abandoned_unsent[policy]; + sprstat->sprstat_abandoned_sent = stcb->asoc.abandoned_sent[policy]; + } + SCTP_TCB_UNLOCK(stcb); + *optsize = sizeof(struct sctp_prstatus); + } else { + SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, EINVAL); + error = EINVAL; + } + break; + } default: SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP_USRREQ, ENOPROTOOPT); error = ENOPROTOOPT; ==== //depot/projects/opencrypto/sys/netinet/sctputil.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 269858 2014-08-12 11:30:16Z tuexen $"); +__FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 269945 2014-08-13 15:50:16Z tuexen $"); #include #include @@ -896,6 +896,11 @@ */ int i; +#if defined(SCTP_DETAILED_STR_STATS) + int j; + +#endif + asoc = &stcb->asoc; /* init all variables to a known value. */ SCTP_SET_STATE(&stcb->asoc, SCTP_STATE_INUSE); @@ -1056,6 +1061,15 @@ asoc->strmout[i].next_sequence_send = 0x0; TAILQ_INIT(&asoc->strmout[i].outqueue); asoc->strmout[i].chunks_on_queues = 0; +#if defined(SCTP_DETAILED_STR_STATS) + for (j = 0; j < SCTP_PR_SCTP_MAX + 1; j++) { + asoc->strmout[i].abandoned_sent[j] = 0; + asoc->strmout[i].abandoned_unsent[j] = 0; + } +#else + asoc->strmout[i].abandoned_sent[0] = 0; + asoc->strmout[i].abandoned_unsent[0] = 0; +#endif asoc->strmout[i].stream_no = i; asoc->strmout[i].last_msg_incomplete = 0; asoc->ss_functions.sctp_ss_init_stream(&asoc->strmout[i], NULL); @@ -1111,6 +1125,10 @@ asoc->timoshutdownack = 0; (void)SCTP_GETTIME_TIMEVAL(&asoc->start_time); asoc->discontinuity_time = asoc->start_time; + for (i = 0; i < SCTP_PR_SCTP_MAX + 1; i++) { + asoc->abandoned_unsent[i] = 0; + asoc->abandoned_sent[i] = 0; + } /* * sa_ignore MEMLEAK {memory is put in the assoc mapping array and * freed later when the association is freed. @@ -4713,6 +4731,21 @@ stream = tp1->rec.data.stream_number; seq = tp1->rec.data.stream_seq; + if (sent || !(tp1->rec.data.rcv_flags & SCTP_DATA_FIRST_FRAG)) { + stcb->asoc.abandoned_sent[0]++; + stcb->asoc.abandoned_sent[PR_SCTP_POLICY(tp1->flags)]++; + stcb->asoc.strmout[stream].abandoned_sent[0]++; +#if defined(SCTP_DETAILED_STR_STATS) + stcb->asoc.strmout[stream].abandoned_sent[PR_SCTP_POLICY(tp1->flags)]++; +#endif + } else { + stcb->asoc.abandoned_unsent[0]++; + stcb->asoc.abandoned_unsent[PR_SCTP_POLICY(tp1->flags)]++; + stcb->asoc.strmout[stream].abandoned_unsent[0]++; +#if defined(SCTP_DETAILED_STR_STATS) + stcb->asoc.strmout[stream].abandoned_unsent[PR_SCTP_POLICY(tp1->flags)]++; +#endif + } do { ret_sz += tp1->book_size; if (tp1->data != NULL) { ==== //depot/projects/opencrypto/sys/vm/vm_glue.c#2 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/vm/vm_glue.c 267548 2014-06-16 18:15:27Z attilio $"); +__FBSDID("$FreeBSD: head/sys/vm/vm_glue.c 269907 2014-08-13 05:44:08Z kib $"); #include "opt_vm.h" #include "opt_kstack_pages.h" @@ -251,6 +251,7 @@ vm_page_xunbusy(m); vm_page_lock(m); vm_page_hold(m); + vm_page_activate(m); vm_page_unlock(m); out: VM_OBJECT_WUNLOCK(object); From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:25 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DAEAD9D7; Mon, 8 Sep 2014 04:49:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D54AD7FE for ; Mon, 8 Sep 2014 04:49:17 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 95C4F1A6B for ; Mon, 8 Sep 2014 04:49:17 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nHfR020568 for ; Mon, 8 Sep 2014 04:49:17 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nHJC020565 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:17 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:17 GMT Message-Id: <201409080449.s884nHJC020565@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198701 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:25 -0000 http://p4web.freebsd.org/@@1198701?ac=10 Change 1198701 by jmg@jmg_carbon2 on 2014/08/14 07:39:04 spell crd_alg properly instead of checking the length... properly only free an allocation when allocated by using the common cleanup code... don't need to zero auth data buffer, it's associated data and not confidential... add some comments... Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#3 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#3 (text+ko) ==== @@ -328,7 +328,7 @@ } /* CBC & XTS can only handle full blocks for now */ - if ((enccrd->crd_len == CRYPTO_AES_CBC || enccrd->crd_len == + if ((enccrd->crd_alg == CRYPTO_AES_CBC || enccrd->crd_alg == CRYPTO_AES_XTS) && (enccrd->crd_len % AES_BLOCK_LEN) != 0) { error = EINVAL; goto out; @@ -442,6 +442,9 @@ printf("%02hhx", ptr[i]); } +/* + * authcrd contains the associated date. + */ static int aesni_cipher_process(struct aesni_session *ses, struct cryptodesc *enccrd, struct cryptodesc *authcrd, struct cryptop *crp) @@ -463,10 +466,8 @@ authallocated = 0; if (authcrd != NULL) { authbuf = aesni_cipher_alloc(authcrd, crp, &authallocated); - if (authbuf == NULL) { - free(buf, M_AESNI); - return (ENOMEM); - } + if (authbuf == NULL) + goto out1; } td = curthread; @@ -574,7 +575,7 @@ crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip, enccrd->crd_len, buf); - /* OpenBSD doesn't copy this back. */ + /* OpenBSD doesn't copy this back. Why not? */ if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0) crypto_copydata(crp->crp_flags, crp->crp_buf, enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN, @@ -592,9 +593,7 @@ bzero(buf, enccrd->crd_len); free(buf, M_AESNI); } - if (authallocated) { - bzero(authbuf, authcrd->crd_len); + if (authallocated) free(authbuf, M_AESNI); - } return (error); } From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:25 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2394CAAD; Mon, 8 Sep 2014 04:49:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D543E7FD for ; Mon, 8 Sep 2014 04:49:17 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B2D7E1A6D for ; Mon, 8 Sep 2014 04:49:17 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nHDJ020574 for ; Mon, 8 Sep 2014 04:49:17 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nHo7020571 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:17 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:17 GMT Message-Id: <201409080449.s884nHo7020571@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198702 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:25 -0000 http://p4web.freebsd.org/@@1198702?ac=10 Change 1198702 by jmg@jmg_carbon2 on 2014/08/14 07:41:58 comment what this arg is.. Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#6 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#6 (text+ko) ==== @@ -67,7 +67,7 @@ SDT_PROVIDER_DECLARE(opencrypto); -SDT_PROBE_DEFINE1(opencrypto, dev, ioctl, error, "int"); +SDT_PROBE_DEFINE1(opencrypto, dev, ioctl, error, "int"/*line number*/); #ifdef COMPAT_FREEBSD32 #include From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:31 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05389C44; Mon, 8 Sep 2014 04:49:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D136485E for ; Mon, 8 Sep 2014 04:49:20 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A22FA1A8C for ; Mon, 8 Sep 2014 04:49:20 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nKgK020734 for ; Mon, 8 Sep 2014 04:49:20 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nKsM020731 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:20 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:20 GMT Message-Id: <201409080449.s884nKsM020731@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198726 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:31 -0000 http://p4web.freebsd.org/@@1198726?ac=10 Change 1198726 by jmg@jmg_carbon2 on 2014/08/14 18:38:42 white space fix ups.. Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#6 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#6 (text+ko) ==== @@ -336,11 +336,11 @@ #define CRD_F_KEY_EXPLICIT 0x10 /* Key explicitly provided */ struct cryptoini CRD_INI; /* Initialization/context data */ -#define crd_esn CRD_INI.cri_esn -#define crd_iv CRD_INI.cri_iv -#define crd_key CRD_INI.cri_key -#define crd_alg CRD_INI.cri_alg -#define crd_klen CRD_INI.cri_klen +#define crd_esn CRD_INI.cri_esn +#define crd_iv CRD_INI.cri_iv +#define crd_key CRD_INI.cri_key +#define crd_alg CRD_INI.cri_alg +#define crd_klen CRD_INI.cri_klen struct cryptodesc *crd_next; }; @@ -365,9 +365,9 @@ */ int crp_flags; -#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 */ +#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 */ #define CRYPTO_F_BATCH 0x0008 /* Batch op if possible */ #define CRYPTO_F_CBIMM 0x0010 /* Do callback immediately */ #define CRYPTO_F_DONE 0x0020 /* Operation completed */ @@ -382,12 +382,12 @@ struct bintime crp_tstamp; /* performance time stamp */ }; -#define CRYPTO_BUF_CONTIG 0x0 -#define CRYPTO_BUF_IOV 0x1 -#define CRYPTO_BUF_MBUF 0x2 +#define CRYPTO_BUF_CONTIG 0x0 +#define CRYPTO_BUF_IOV 0x1 +#define CRYPTO_BUF_MBUF 0x2 -#define CRYPTO_OP_DECRYPT 0x0 -#define CRYPTO_OP_ENCRYPT 0x1 +#define CRYPTO_OP_DECRYPT 0x0 +#define CRYPTO_OP_ENCRYPT 0x1 /* * Hints passed to process methods. @@ -422,9 +422,9 @@ extern int crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int hard); extern int crypto_freesession(u_int64_t sid); -#define CRYPTOCAP_F_HARDWARE CRYPTO_FLAG_HARDWARE -#define CRYPTOCAP_F_SOFTWARE CRYPTO_FLAG_SOFTWARE -#define CRYPTOCAP_F_SYNC 0x04000000 /* operates synchronously */ +#define CRYPTOCAP_F_HARDWARE CRYPTO_FLAG_HARDWARE +#define CRYPTOCAP_F_SOFTWARE CRYPTO_FLAG_SOFTWARE +#define CRYPTOCAP_F_SYNC 0x04000000 /* operates synchronously */ extern int32_t crypto_get_driverid(device_t dev, int flags); extern int crypto_find_driver(const char *); extern device_t crypto_find_device_byhid(int hid); From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:31 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4239AD1C; Mon, 8 Sep 2014 04:49:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D685A862 for ; Mon, 8 Sep 2014 04:49:20 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C3CC51A8D for ; Mon, 8 Sep 2014 04:49:20 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nKIx020740 for ; Mon, 8 Sep 2014 04:49:20 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nKra020737 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:20 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:20 GMT Message-Id: <201409080449.s884nKra020737@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198727 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:31 -0000 http://p4web.freebsd.org/@@1198727?ac=10 Change 1198727 by jmg@jmg_carbon2 on 2014/08/14 18:52:00 use FreeBSD instead of Id... Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/gfmult.c#2 edit .. //depot/projects/opencrypto/sys/opencrypto/gfmult.h#2 edit .. //depot/projects/opencrypto/sys/opencrypto/gmac.c#4 edit .. //depot/projects/opencrypto/sys/opencrypto/gmac.h#5 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/gfmult.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $FreeBSD$ * */ ==== //depot/projects/opencrypto/sys/opencrypto/gfmult.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $FreeBSD$ * */ ==== //depot/projects/opencrypto/sys/opencrypto/gmac.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $FreeBSD$ * */ ==== //depot/projects/opencrypto/sys/opencrypto/gmac.h#5 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $FreeBSD$ * */ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:33 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 38303F14; Mon, 8 Sep 2014 04:49:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E5FA967 for ; Mon, 8 Sep 2014 04:49:22 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E21D61A95 for ; Mon, 8 Sep 2014 04:49:21 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nLlj020786 for ; Mon, 8 Sep 2014 04:49:21 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nLTm020783 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:21 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:21 GMT Message-Id: <201409080449.s884nLTm020783@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198734 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:33 -0000 http://p4web.freebsd.org/@@1198734?ac=10 Change 1198734 by jmg@jmg_carbon2 on 2014/08/14 19:42:12 put MacOSX compat stuff under ifdef __APPLE__ use enc/dec for reading/writing instead of hand rolled versions... assume that __APPLE__ is always on a non-strict alignment machine since I don't know how to check for this on MacOSX... update a comment.. Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/gfmult.h#3 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/gfmult.h#3 (text+ko) ==== @@ -32,10 +32,10 @@ #ifndef _GFMULT_H_ #define _GFMULT_H_ -#if 0 +#ifdef __APPLE__ #define __aligned(x) __attribute__((__aligned__(x))) -#define be64toh(x) __builtin_bswap64(x) -#define htobe64(x) __builtin_bswap64(x) +#define be64dec(buf) __builtin_bswap64(*(uint64_t *)buf) +#define be64enc(buf, x) (*(uint64_t *)buf = __builtin_bswap64(x)) #else #include #endif @@ -49,8 +49,8 @@ #define REQ_ALIGN (16 * 4) /* - * These are the values striped across cache lines. Note that the indexes - * are bit reversed to make accessing easier. + * The rows are striped across cache lines. Note that the indexes + * are bit reversed to make accesses quicker. */ struct gf128table { uint32_t a[16] __aligned(REQ_ALIGN); /* bits 0 - 31 */ @@ -83,38 +83,15 @@ #define GF128_EQ(a, b) ((((a).v[0] ^ (b).v[0]) | \ ((a).v[1] ^ (b).v[1])) == 0) -static inline uint64_t -gf128_getuint64_t(const uint8_t *buf) -{ -#ifdef __NO_STRICT_ALIGNMENT - return *(uint64_t *)buf; -#else - uint64_t tmp; - - bcopy(buf, &tmp, sizeof tmp); - return tmp; -#endif -} - -static inline void -gf128_putuint64_t(uint64_t val, uint8_t *buf) -{ -#ifdef __NO_STRICT_ALIGNMENT - *(uint64_t *)buf = val; -#else - bcopy(&val, buf, sizeof val); -#endif -} - static inline struct gf128 gf128_read(const uint8_t *buf) { struct gf128 r; - r.v[0] = be64toh(gf128_getuint64_t(buf)); + r.v[0] = be64dec(buf); buf += sizeof(uint64_t); - r.v[1] = be64toh(gf128_getuint64_t(buf)); + r.v[1] = be64dec(buf); return r; } @@ -124,10 +101,10 @@ { uint64_t tmp; - gf128_putuint64_t(htobe64(v.v[0]), buf); + be64enc(buf, v.v[0]); buf += sizeof tmp; - gf128_putuint64_t(htobe64(v.v[1]), buf); + be64enc(buf, v.v[1]); } static inline struct gf128 __pure /* XXX - __pure2 instead */ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:33 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 79E47FEA; Mon, 8 Sep 2014 04:49:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F29A96D for ; Mon, 8 Sep 2014 04:49:22 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1D59A1A96 for ; Mon, 8 Sep 2014 04:49:22 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nLI6020799 for ; Mon, 8 Sep 2014 04:49:21 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nL4N020796 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:21 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:21 GMT Message-Id: <201409080449.s884nL4N020796@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198736 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:33 -0000 http://p4web.freebsd.org/@@1198736?ac=10 Change 1198736 by jmg@jmg_carbon2 on 2014/08/14 19:53:34 integrate from 1198731 Affected files ... .. //depot/projects/opencrypto/share/man/man4/iwn.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/iwnfw.4#2 integrate .. //depot/projects/opencrypto/sys/amd64/conf/NOTES#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/intel/vtd.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/io/vatpic.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/vmm.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/disassem.c#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_aic.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_common.c#1 branch .. //depot/projects/opencrypto/sys/arm/at91/at91_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_pit.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_pmc.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91sam9260.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91sam9260reg.h#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/files.at91#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/std.atmel#2 integrate .. //depot/projects/opencrypto/sys/arm/include/acle-compat.h#1 branch .. //depot/projects/opencrypto/sys/arm/include/param.h#2 integrate .. //depot/projects/opencrypto/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/opencrypto/sys/conf/Makefile.arm#3 integrate .. //depot/projects/opencrypto/sys/conf/files#5 integrate .. //depot/projects/opencrypto/sys/conf/kern.mk#2 integrate .. //depot/projects/opencrypto/sys/ddb/db_run.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cs/if_cs.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ixgbe/ixgbe.c#2 integrate .. //depot/projects/opencrypto/sys/i386/conf/NOTES#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/opencrypto/sys/net/pfvar.h#2 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf.c#2 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf.h#2 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf_ioctl.c#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_fault.c#3 integrate Differences ... ==== //depot/projects/opencrypto/share/man/man4/iwn.4#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man4/iwn.4 267938 2014-06-26 21:46:14Z bapt $ +.\" $FreeBSD: head/share/man/man4/iwn.4 270000 2014-08-14 19:15:20Z gavin $ .\" -.Dd May 28, 2014 +.Dd August 14, 2014 .Dt IWN 4 .Os .Sh NAME @@ -46,6 +46,8 @@ Choose one from: .Bd -ragged -offset indent .Cd "device iwn1000fw" +.Cd "device iwn105fw" +.Cd "device iwn135fw" .Cd "device iwn2000fw" .Cd "device iwn2030fw" .Cd "device iwn4965fw" @@ -70,6 +72,8 @@ .Bd -literal -offset indent if_iwn_load="YES" iwn1000fw_load="YES" +iwn105fw_load="YES" +iwn135fw_load="YES" iwn2000fw_load="YES" iwn2030fw_load="YES" iwn4965fw_load="YES" @@ -89,11 +93,13 @@ .It Intel Centrino Advanced-N 6200 .It Intel Centrino Advanced-N 6205 .It Intel Centrino Advanced-N 6230 +.It Intel Centrino Advanced-N 6235 .It Intel Centrino Advanced-N + WiMAX 6250 .It Intel Centrino Ultimate-N 6300 .It Intel Centrino Wireless-N 100 .It Intel Centrino Wireless-N 105 .It Intel Centrino Wireless-N 130 +.It Intel Centrino Wireless-N 135 .It Intel Centrino Wireless-N 1000 .It Intel Centrino Wireless-N 1030 .It Intel Centrino Wireless-N 2200 ==== //depot/projects/opencrypto/share/man/man4/iwnfw.4#2 (text+ko) ==== @@ -20,9 +20,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man4/iwnfw.4 261702 2014-02-09 22:43:16Z brueffer $ +.\" $FreeBSD: head/share/man/man4/iwnfw.4 269999 2014-08-14 19:14:24Z gavin $ .\" -.Dd February 9, 2014 +.Dd August 14, 2014 .Dt IWNFW 4 .Os .Sh NAME @@ -36,11 +36,15 @@ .Cd "device iwnfw" .Ed .Pp -This will include three firmware images inside the kernel. +This will include firmware images for all +.Xr iwn 4 +devices inside the kernel. If you want to pick only the firmware image for your network adapter choose one of the following: .Bd -ragged -offset indent .Cd "device iwn1000fw" +.Cd "device iwn105fw" +.Cd "device iwn135fw" .Cd "device iwn2000fw" .Cd "device iwn2030fw" .Cd "device iwn4965fw" @@ -57,6 +61,8 @@ .Xr loader.conf 5 : .Bd -literal -offset indent iwn1000fw_load="YES" +iwn105fw_load="YES" +iwn135fw_load="YES" iwn2000fw_load="YES" iwn2030fw_load="YES" iwn4965fw_load="YES" @@ -69,7 +75,7 @@ .Ed .Sh DESCRIPTION This module provides access to firmware sets for the -Intel Wireless WiFi Link 1000, 2000, 2030, 4965, 5000 and 6000 series of +Intel Wireless WiFi Link 105, 135, 1000, 2000, 2030, 4965, 5000 and 6000 series of IEEE 802.11n adapters. It may be statically linked into the kernel, or loaded as a module. ==== //depot/projects/opencrypto/sys/amd64/conf/NOTES#2 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: head/sys/amd64/conf/NOTES 268069 2014-07-01 00:22:54Z emaste $ +# $FreeBSD: head/sys/amd64/conf/NOTES 269992 2014-08-14 18:29:55Z gavin $ # # @@ -307,7 +307,8 @@ # Requires the ipw firmware module # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # Requires the iwi firmware module -# iwn: Intel Wireless WiFi Link 4965/1000/5000/6000 802.11 network adapters +# iwn: Intel Wireless WiFi Link 1000/105/135/2000/4965/5000/6000/6050 abgn +# 802.11 network adapters # Requires the iwn firmware module # mlx4ib: Mellanox ConnectX HCA InfiniBand # mlxen: Mellanox ConnectX HCA Ethernet @@ -347,12 +348,18 @@ # iwiibssfw: IBSS mode firmware # iwimonitorfw: Monitor mode firmware # Intel Wireless WiFi Link 4965/1000/5000/6000 series firmware: -# iwnfw: Single module to support the 4965/1000/5000/5150/6000 +# iwnfw: Single module to support all devices +# iwn1000fw: Specific module for the 1000 only +# iwn105fw: Specific module for the 105 only +# iwn135fw: Specific module for the 135 only +# iwn2000fw: Specific module for the 2000 only +# iwn2030fw: Specific module for the 2030 only # iwn4965fw: Specific module for the 4965 only -# iwn1000fw: Specific module for the 1000 only # iwn5000fw: Specific module for the 5000 only # iwn5150fw: Specific module for the 5150 only # iwn6000fw: Specific module for the 6000 only +# iwn6000g2afw: Specific module for the 6000g2a only +# iwn6000g2bfw: Specific module for the 6000g2b only # iwn6050fw: Specific module for the 6050 only # wpifw: Intel 3945ABG Wireless LAN Controller firmware @@ -365,11 +372,17 @@ device ipwibssfw device ipwmonitorfw device iwnfw +device iwn1000fw +device iwn105fw +device iwn135fw +device iwn2000fw +device iwn2030fw device iwn4965fw -device iwn1000fw device iwn5000fw device iwn5150fw device iwn6000fw +device iwn6000g2afw +device iwn6000g2bfw device iwn6050fw device wpifw ==== //depot/projects/opencrypto/sys/amd64/vmm/intel/vtd.c#2 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vtd.c 264009 2014-04-01 15:54:03Z rstone $ + * $FreeBSD: head/sys/amd64/vmm/intel/vtd.c 269962 2014-08-14 05:00:45Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vtd.c 264009 2014-04-01 15:54:03Z rstone $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vtd.c 269962 2014-08-14 05:00:45Z neel $"); #include #include @@ -448,6 +448,11 @@ ptpindex = 0; ptpshift = 0; + KASSERT(gpa + len > gpa, ("%s: invalid gpa range %#lx/%#lx", __func__, + gpa, len)); + KASSERT(gpa + len <= dom->maxaddr, ("%s: gpa range %#lx/%#lx beyond " + "domain maxaddr %#lx", __func__, gpa, len, dom->maxaddr)); + if (gpa & PAGE_MASK) panic("vtd_create_mapping: unaligned gpa 0x%0lx", gpa); ==== //depot/projects/opencrypto/sys/amd64/vmm/io/vatpic.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vatpic.c 266572 2014-05-23 05:04:50Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vatpic.c 269989 2014-08-14 18:03:38Z neel $"); #include #include @@ -195,26 +195,29 @@ atpic->mask, atpic->request, atpic->service); /* + * From Section 3.6.2, "Interrupt Modes", in the + * MPtable Specification, Version 1.4 + * * PIC interrupts are routed to both the Local APIC * and the I/O APIC to support operation in 1 of 3 * modes. * * 1. Legacy PIC Mode: the PIC effectively bypasses - * all APIC components. In mode '1' the local APIC is + * all APIC components. In this mode the local APIC is * disabled and LINT0 is reconfigured as INTR to * deliver the PIC interrupt directly to the CPU. * * 2. Virtual Wire Mode: the APIC is treated as a * virtual wire which delivers interrupts from the PIC - * to the CPU. In mode '2' LINT0 is programmed as + * to the CPU. In this mode LINT0 is programmed as * ExtINT to indicate that the PIC is the source of * the interrupt. * - * 3. Symmetric I/O Mode: PIC interrupts are fielded - * by the I/O APIC and delivered to the appropriate - * CPU. In mode '3' the I/O APIC input 0 is - * programmed as ExtINT to indicate that the PIC is - * the source of the interrupt. + * 3. Virtual Wire Mode via I/O APIC: PIC interrupts are + * fielded by the I/O APIC and delivered to the appropriate + * CPU. In this mode the I/O APIC input 0 is programmed + * as ExtINT to indicate that the PIC is the source of the + * interrupt. */ atpic->intr_raised = true; lapic_set_local_intr(vatpic->vm, -1, APIC_LVT_LINT0); ==== //depot/projects/opencrypto/sys/amd64/vmm/vmm.c#2 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/vmm.c 269109 2014-07-26 02:53:51Z neel $ + * $FreeBSD: head/sys/amd64/vmm/vmm.c 269962 2014-08-14 05:00:45Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 269109 2014-07-26 02:53:51Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 269962 2014-08-14 05:00:45Z neel $"); #include #include @@ -572,6 +572,21 @@ return (0); } +static vm_paddr_t +vm_maxmem(struct vm *vm) +{ + int i; + vm_paddr_t gpa, maxmem; + + maxmem = 0; + for (i = 0; i < vm->num_mem_segs; i++) { + gpa = vm->mem_segs[i].gpa + vm->mem_segs[i].len; + if (gpa > maxmem) + maxmem = gpa; + } + return (maxmem); +} + static void vm_gpa_unwire(struct vm *vm) { @@ -709,7 +724,7 @@ if (ppt_assigned_devices(vm) == 0) { KASSERT(vm->iommu == NULL, ("vm_assign_pptdev: iommu must be NULL")); - maxaddr = vmm_mem_maxaddr(); + maxaddr = vm_maxmem(vm); vm->iommu = iommu_create_domain(maxaddr); error = vm_gpa_wire(vm); ==== //depot/projects/opencrypto/sys/arm/arm/disassem.c#2 (text+ko) ==== @@ -48,13 +48,14 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/disassem.c 248119 2013-03-09 23:55:23Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/disassem.c 269956 2014-08-14 04:20:13Z imp $"); #include #include #include #include +#include #include /* @@ -130,7 +131,7 @@ { 0x0c500000, 0x04100000, "ldr", "daW" }, { 0x0c500000, 0x04400000, "strb", "daW" }, { 0x0c500000, 0x04500000, "ldrb", "daW" }, -#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6) +#if __ARM_ARCH >= 6 { 0xffffffff, 0xf57ff01f, "clrex", "c" }, { 0x0ff00ff0, 0x01800f90, "strex", "dmo" }, { 0x0ff00fff, 0x01900f9f, "ldrex", "do" }, ==== //depot/projects/opencrypto/sys/arm/arm/nexus.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 269606 2014-08-05 19:06:45Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -362,4 +362,3 @@ return (interrupt); } #endif - ==== //depot/projects/opencrypto/sys/arm/at91/at91.c#2 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91.c 262925 2014-03-08 06:06:50Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91.c 269960 2014-08-14 04:21:31Z imp $"); #include #include @@ -255,7 +255,7 @@ { int i; - for (i = 1; walker->name; i++, walker++) { + for (i = 0; walker->name; i++, walker++) { at91_add_child(dev, i, walker->name, walker->unit, walker->mem_base, walker->mem_len, walker->irq0, walker->irq1, walker->irq2); ==== //depot/projects/opencrypto/sys/arm/at91/at91_aic.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_aic.c 262925 2014-03-08 06:06:50Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_aic.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -176,13 +176,9 @@ static devclass_t at91_aic_devclass; #ifdef FDT -DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, + NULL, NULL, BUS_PASS_INTERRUPT); #else -DRIVER_MODULE(at91_aic, atmelarm, at91_aic_driver, at91_aic_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_aic, atmelarm, at91_aic_driver, at91_aic_devclass, + NULL, NULL, BUS_PASS_INTERRUPT); #endif -/* not yet -EARLY_DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, - NULL, NULL, BUS_PASS_INTERRUPT); -*/ ==== //depot/projects/opencrypto/sys/arm/at91/at91_machdep.c#2 (text+ko) ==== @@ -43,8 +43,10 @@ * Created : 17/09/94 */ +#include "opt_platform.h" + #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_machdep.c 265852 2014-05-10 20:03:03Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_machdep.c 269958 2014-08-14 04:21:20Z imp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -111,8 +113,12 @@ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) +extern struct bus_space at91_bs_tag; + struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; +uint32_t at91_master_clock; + /* Static device mappings. */ const struct arm_devmap_entry at91_devmap[] = { /* @@ -194,15 +200,6 @@ { 0, 0, 0, 0, 0, } }; -/* Physical and virtual addresses for some global pages */ - -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; - #ifdef LINUX_BOOT_ABI extern int membanks; extern int memstart[]; @@ -444,6 +441,16 @@ } #endif +#ifndef FDT +/* Physical and virtual addresses for some global pages */ + +struct pv_addr msgbufpv; +struct pv_addr kernelstack; +struct pv_addr systempage; +struct pv_addr irqstack; +struct pv_addr abtstack; +struct pv_addr undstack; + void * initarm(struct arm_boot_params *abp) { @@ -651,6 +658,7 @@ return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } +#endif /* * These functions are handled elsewhere, so make them nops here. ==== //depot/projects/opencrypto/sys/arm/at91/at91_pit.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pit.c 261683 2014-02-09 20:57:26Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pit.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -214,9 +214,9 @@ static devclass_t at91_pit_devclass; #ifdef FDT -DRIVER_MODULE(at91_pit, simplebus, at91_pit_driver, at91_pit_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pit, simplebus, at91_pit_driver, at91_pit_devclass, + NULL, NULL, BUS_PASS_TIMER); #else -DRIVER_MODULE(at91_pit, atmelarm, at91_pit_driver, at91_pit_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pit, atmelarm, at91_pit_driver, at91_pit_devclass, + NULL, NULL, BUS_PASS_TIMER); #endif ==== //depot/projects/opencrypto/sys/arm/at91/at91_pmc.c#2 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pmc.c 261684 2014-02-09 20:58:03Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pmc.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -709,9 +709,9 @@ static devclass_t at91_pmc_devclass; #ifdef FDT -DRIVER_MODULE(at91_pmc, simplebus, at91_pmc_driver, at91_pmc_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pmc, simplebus, at91_pmc_driver, at91_pmc_devclass, + NULL, NULL, BUS_PASS_CPU); #else -DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, + NULL, NULL, BUS_PASS_CPU); #endif ==== //depot/projects/opencrypto/sys/arm/at91/at91sam9260.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91sam9260.c 260696 2014-01-15 19:53:36Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91sam9260.c 269960 2014-08-14 04:21:31Z imp $"); #include #include @@ -103,6 +103,7 @@ static const struct cpu_devs at91_devs[] = { + DEVICE("at91_aic", AIC, 0), DEVICE("at91_pmc", PMC, 0), DEVICE("at91_wdt", WDT, 0), DEVICE("at91_rst", RSTC, 0), ==== //depot/projects/opencrypto/sys/arm/at91/at91sam9260reg.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: head/sys/arm/at91/at91sam9260reg.h 261353 2014-02-01 17:53:35Z imp $ */ +/* $FreeBSD: head/sys/arm/at91/at91sam9260reg.h 269960 2014-08-14 04:21:31Z imp $ */ #ifndef AT91SAM9260REG_H_ #define AT91SAM9260REG_H_ @@ -220,6 +220,7 @@ #define AT91SAM9260_IRQ_RSTC AT91SAM9260_IRQ_SYSTEM #define AT91SAM9260_IRQ_OHCI AT91SAM9260_IRQ_UHP #define AT91SAM9260_IRQ_NAND (-1) +#define AT91SAM9260_IRQ_AIC (-1) #define AT91SAM9260_AIC_BASE 0xffff000 #define AT91SAM9260_AIC_SIZE 0x200 ==== //depot/projects/opencrypto/sys/arm/at91/files.at91#2 (text) ==== @@ -1,30 +1,36 @@ -# $FreeBSD: head/sys/arm/at91/files.at91 262979 2014-03-10 18:10:09Z ian $ +# $FreeBSD: head/sys/arm/at91/files.at91 269957 2014-08-14 04:21:14Z imp $ arm/arm/cpufunc_asm_arm9.S standard arm/at91/at91_machdep.c standard arm/at91/at91_aic.c standard arm/at91/at91.c standard +arm/at91/at91_aic.c standard +arm/at91/at91_pio.c standard +arm/at91/at91_pmc.c standard +arm/at91/at91_smc.c standard arm/at91/at91_cfata.c optional at91_cfata +arm/at91/at91_common.c optional fdt arm/at91/at91_mci.c optional at91_mci -dev/nand/nfc_at91.c optional nand -arm/at91/at91_pio.c standard -arm/at91/at91_pmc.c standard +arm/at91/at91_pinctrl.c optional fdt arm/at91/at91_pit.c optional at91sam9 arm/at91/at91_reset.S optional at91sam9 arm/at91/at91_rst.c optional at91sam9 arm/at91/at91_rtc.c optional at91_rtc -arm/at91/at91_smc.c standard +arm/at91/at91_sdramc.c optional fdt +arm/at91/at91_shdwc.c optional fdt arm/at91/at91_spi.c optional at91_spi \ dependency "spibus_if.h" arm/at91/at91_ssc.c optional at91_ssc arm/at91/at91_st.c optional at91rm9200 -arm/at91/at91_tc.c optional at91_tc +arm/at91/at91_tcb.c optional fdt arm/at91/at91_twi.c optional at91_twi arm/at91/at91_wdt.c optional at91_wdt arm/at91/if_ate.c optional ate arm/at91/if_macb.c optional macb -arm/at91/uart_bus_at91usart.c optional uart -arm/at91/uart_cpu_at91usart.c optional uart +arm/at91/uart_bus_at91usart.c optional uart ! fdt +arm/at91/uart_cpu_at91usart.c optional uart ! fdt arm/at91/uart_dev_at91usart.c optional uart +dev/uart/uart_cpu_fdt.c optional uart fdt +dev/nand/nfc_at91.c optional nand # # All the "systems on a chip" we support # @@ -54,5 +60,7 @@ # usb # dev/usb/controller/at91dci.c optional at91_dci -dev/usb/controller/at91dci_atmelarm.c optional at91_dci -dev/usb/controller/ohci_atmelarm.c optional ohci +dev/usb/controller/at91dci_atmelarm.c optional at91_dci !fdt +dev/usb/controller/ohci_atmelarm.c optional ohci !fdt +dev/usb/controller/at91dci_fdt.c optional at91_dci fdt +dev/usb/controller/ohci_fdt.c optional ohci fdt ==== //depot/projects/opencrypto/sys/arm/at91/std.atmel#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/at91/std.atmel 239362 2012-08-18 05:48:19Z andrew $ +# $FreeBSD: head/sys/arm/at91/std.atmel 269959 2014-08-14 04:21:25Z imp $ include "../at91/std.at91sam9" @@ -11,3 +11,5 @@ # bring in the sam specific timers and such device at91sam9 + +options ARM_DEVICE_MULTIPASS ==== //depot/projects/opencrypto/sys/arm/include/param.h#2 (text+ko) ==== @@ -35,7 +35,7 @@ * SUCH DAMAGE. * * from: @(#)param.h 5.8 (Berkeley) 6/28/91 - * $FreeBSD: head/sys/arm/include/param.h 263637 2014-03-22 15:59:18Z andrew $ + * $FreeBSD: head/sys/arm/include/param.h 269956 2014-08-14 04:20:13Z imp $ */ #ifndef _ARM_INCLUDE_PARAM_H_ @@ -46,13 +46,14 @@ */ #include +#include #define STACKALIGNBYTES (8 - 1) #define STACKALIGN(p) ((u_int)(p) & ~STACKALIGNBYTES) #define __PCI_REROUTE_INTERRUPT -#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6) +#if __ARM_ARCH >= 6 #define _V6_SUFFIX "v6" #else #define _V6_SUFFIX "" @@ -64,7 +65,7 @@ #define _HF_SUFFIX "" #endif -#ifdef __ARMEB__ +#ifdef __ARM_BIG_ENDIAN #define _EB_SUFFIX "eb" #else #define _EB_SUFFIX "" ==== //depot/projects/opencrypto/sys/cam/ata/ata_da.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/cam/ata/ata_da.c 268205 2014-07-03 05:22:13Z imp $"); +__FBSDID("$FreeBSD: head/sys/cam/ata/ata_da.c 269974 2014-08-14 13:57:17Z smh $"); #include "opt_ada.h" @@ -299,10 +299,10 @@ }, { /* - * Corsair Force GT SSDs + * Corsair Force GT & GS SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ - { T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force GT*", "*" }, + { T_DIRECT, SIP_MEDIA_FIXED, "*", "Corsair Force G*", "*" }, /*quirks*/ADA_Q_4K }, { @@ -443,6 +443,14 @@ }, { /* + * Samsung 840 SSDs + * 4k optimised + */ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "Samsung SSD 840*", "*" }, + /*quirks*/ADA_Q_4K + }, + { + /* * SuperTalent TeraDrive CT SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ ==== //depot/projects/opencrypto/sys/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_da.c 267992 2014-06-28 03:56:17Z hselasky $"); +__FBSDID("$FreeBSD: head/sys/cam/scsi/scsi_da.c 269974 2014-08-14 13:57:17Z smh $"); #include @@ -967,10 +967,10 @@ }, { /* - * Corsair Force GT SSDs + * Corsair Force GT & GS SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ - { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force GT*", "*" }, + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Corsair Force G*", "*" }, /*quirks*/DA_Q_4K }, { @@ -1111,6 +1111,14 @@ }, { /* + * Samsung 840 SSDs + * 4k optimised & trim only works in 4k requests + 4k aligned + */ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "Samsung SSD 840*", "*" }, + /*quirks*/DA_Q_4K + }, + { + /* * SuperTalent TeraDrive CT SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ ==== //depot/projects/opencrypto/sys/conf/Makefile.arm#3 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: head/sys/conf/Makefile.arm 269697 2014-08-08 01:21:52Z ian $ +# $FreeBSD: head/sys/conf/Makefile.arm 269957 2014-08-14 04:21:14Z imp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600012 +%VERSREQ= 600013 STD8X16FONT?= iso ==== //depot/projects/opencrypto/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/conf/files 269567 2014-08-05 07:03:16Z hselasky $ +# $FreeBSD: head/sys/conf/files 269991 2014-08-14 18:16:27Z gavin $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1596,6 +1596,34 @@ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "iwn1000.fw" +iwn105fw.c optional iwn105fw | iwnfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn105.fw:iwn105fw -miwn105fw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwn105fw.c" +iwn105fw.fwo optional iwn105fw | iwnfw \ + dependency "iwn105.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "iwn105fw.fwo" +iwn105.fw optional iwn105fw | iwnfw \ + dependency "$S/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu" \ + compile-with "${NORMAL_FW}" \ + no-obj no-implicit-rule \ + clean "iwn105.fw" +iwn135fw.c optional iwn135fw | iwnfw \ + compile-with "${AWK} -f $S/tools/fw_stub.awk iwn135.fw:iwn135fw -miwn135fw -c${.TARGET}" \ + no-implicit-rule before-depend local \ + clean "iwn135fw.c" +iwn135fw.fwo optional iwn135fw | iwnfw \ + dependency "iwn135.fw" \ + compile-with "${NORMAL_FWO}" \ + no-implicit-rule \ + clean "iwn135fw.fwo" +iwn135.fw optional iwn135fw | iwnfw \ + dependency "$S/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu" \ + compile-with "${NORMAL_FW}" \ + no-obj no-implicit-rule \ + clean "iwn135.fw" iwn2000fw.c optional iwn2000fw | iwnfw \ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn2000.fw:iwn2000fw -miwn2000fw -c${.TARGET}" \ no-implicit-rule before-depend local \ ==== //depot/projects/opencrypto/sys/conf/kern.mk#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/conf/kern.mk 268774 2014-07-16 20:37:03Z dim $ +# $FreeBSD: head/sys/conf/kern.mk 269981 2014-08-14 16:01:46Z imp $ # # Warning flags for compiling the kernel and components of the kernel: @@ -29,14 +29,17 @@ # enough to error out the whole kernel build. Display them anyway, so there is # some incentive to fix them eventually. CWARNEXTRA?= -Wno-error-tautological-compare -Wno-error-empty-body \ - -Wno-error-parentheses-equality -Wno-error-unused-function \ - ${NO_WFORMAT} + -Wno-error-parentheses-equality -Wno-error-unused-function +.endif + +.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40300 +CWARNEXTRA?= -Wno-inline .endif # External compilers may not support our format extensions. Allow them # to be disabled. WARNING: format checking is disabled in this case. .if ${MK_FORMAT_EXTENSIONS} == "no" -NO_WFORMAT= -Wno-format +FORMAT_EXTENSIONS= -Wno-format .else FORMAT_EXTENSIONS= -fformat-extensions .endif ==== //depot/projects/opencrypto/sys/ddb/db_run.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/ddb/db_run.c 181175 2008-08-02 12:49:43Z cognet $"); +__FBSDID("$FreeBSD: head/sys/ddb/db_run.c 269982 2014-08-14 16:01:51Z imp $"); #include #include @@ -188,14 +188,14 @@ if ((db_run_mode == STEP_COUNT) || (db_run_mode == STEP_RETURN) || (db_run_mode == STEP_CALLT)) { - db_expr_t ins; - /* * We are about to execute this instruction, * so count it now. */ - - ins = db_get_value(pc, sizeof(int), FALSE); +#ifdef SOFTWARE_SSTEP + db_expr_t ins = +#endif + db_get_value(pc, sizeof(int), FALSE); db_inst_count++; db_load_count += inst_load(ins); db_store_count += inst_store(ins); ==== //depot/projects/opencrypto/sys/dev/cs/if_cs.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/dev/cs/if_cs.c 267992 2014-06-28 03:56:17Z hselasky $"); +__FBSDID("$FreeBSD: head/sys/dev/cs/if_cs.c 269980 2014-08-14 16:01:38Z imp $"); /* * @@ -264,7 +264,7 @@ uint16_t id; char chip_revision; uint16_t eeprom_buff[CHKSUM_LEN]; - int chip_type, pp_isaint, pp_isadma; + int chip_type, pp_isaint; sc->dev = dev; error = cs_alloc_port(dev, 0, CS_89x0_IO_PORTS); @@ -299,11 +299,9 @@ if (chip_type == CS8900) { pp_isaint = PP_CS8900_ISAINT; - pp_isadma = PP_CS8900_ISADMA; sc->send_cmd = TX_CS8900_AFTER_ALL; } else { pp_isaint = PP_CS8920_ISAINT; - pp_isadma = PP_CS8920_ISADMA; sc->send_cmd = TX_CS8920_AFTER_ALL; } @@ -381,17 +379,6 @@ if (!(sc->flags & CS_NO_IRQ)) cs_writereg(sc, pp_isaint, irq); - /* - * Temporary disabled - * - if (drq>0) - cs_writereg(sc, pp_isadma, drq); - else { - device_printf(dev, "incorrect drq\n",); - return (0); - } - */ - if (bootverbose) device_printf(dev, "CS89%c0%s rev %c media%s%s%s\n", chip_type == CS8900 ? '0' : '2', @@ -702,7 +689,6 @@ { struct ifnet *ifp = sc->ifp; int status, length; - struct ether_header *eh; struct mbuf *m; #ifdef CS_DEBUG @@ -746,8 +732,6 @@ bus_read_multi_2(sc->port_res, RX_FRAME_PORT, mtod(m, uint16_t *), (length + 1) >> 1); - eh = mtod(m, struct ether_header *); - #ifdef CS_DEBUG for (i=0;im_data+i))); ==== //depot/projects/opencrypto/sys/dev/ixgbe/ixgbe.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 268917 2014-07-20 08:43:53Z adrian $*/ +/*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 269972 2014-08-14 13:25:05Z smh $*/ #include "opt_inet.h" @@ -317,7 +317,7 @@ ** doing so you are on your own :) */ static int allow_unsupported_sfp = FALSE; -TUNABLE_INT("hw.ixgbe.unsupported_sfp", &allow_unsupported_sfp); +TUNABLE_INT("hw.ix.unsupported_sfp", &allow_unsupported_sfp); /* ** HW RSC control: ==== //depot/projects/opencrypto/sys/i386/conf/NOTES#2 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: head/sys/i386/conf/NOTES 268069 2014-07-01 00:22:54Z emaste $ +# $FreeBSD: head/sys/i386/conf/NOTES 269992 2014-08-14 18:29:55Z gavin $ # >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:34 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1BA06166; Mon, 8 Sep 2014 04:49:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88161987 for ; Mon, 8 Sep 2014 04:49:22 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 247271A98 for ; Mon, 8 Sep 2014 04:49:22 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nLg4020805 for ; Mon, 8 Sep 2014 04:49:21 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nLNV020802 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:21 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:21 GMT Message-Id: <201409080449.s884nLNV020802@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198737 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:34 -0000 http://p4web.freebsd.org/@@1198737?ac=10 Change 1198737 by jmg@jmg_carbon2 on 2014/08/14 19:56:43 somehow this file lost it's integration history.. readd it.. Affected files ... .. //depot/projects/opencrypto/sys/sparc64/include/sf_buf.h#2 integrate Differences ... ==== //depot/projects/opencrypto/sys/sparc64/include/sf_buf.h#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:31 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 805C3DF2; Mon, 8 Sep 2014 04:49:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0A3FF8D2 for ; Mon, 8 Sep 2014 04:49:21 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E198B1A8F for ; Mon, 8 Sep 2014 04:49:20 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nKk3020747 for ; Mon, 8 Sep 2014 04:49:20 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nKkI020744 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:20 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:20 GMT Message-Id: <201409080449.s884nKkI020744@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198728 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:31 -0000 http://p4web.freebsd.org/@@1198728?ac=10 Change 1198728 by jmg@jmg_carbon2 on 2014/08/14 18:57:09 make _mulalpha an inline as it's only used once... update comment on what platform I tested it on that it was faster... Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/gfmult.c#3 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/gfmult.c#3 (text+ko) ==== @@ -40,7 +40,7 @@ }; /* calulate v * 2 */ -static struct gf128 +static inline struct gf128 gf128_mulalpha(struct gf128 v) { uint64_t mask; @@ -167,7 +167,8 @@ * ... * 2^4 + worda[63,60]*h^4+ ... + wordd[63,60]*h * - * Passing/returning struct is .5% faster than passing in via pointer. + * Passing/returning struct is .5% faster than passing in via pointer on + * amd64. */ static struct gf128 gfmultword4(uint64_t worda, uint64_t wordb, uint64_t wordc, uint64_t wordd, From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:49:34 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95D34244; Mon, 8 Sep 2014 04:49:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A067C989 for ; Mon, 8 Sep 2014 04:49:22 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5857E1A99 for ; Mon, 8 Sep 2014 04:49:22 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nMjI020812 for ; Mon, 8 Sep 2014 04:49:22 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nM7e020809 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:22 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:22 GMT Message-Id: <201409080449.s884nM7e020809@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198738 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:49:34 -0000 http://p4web.freebsd.org/@@1198738?ac=10 Change 1198738 by jmg@jmg_carbon2 on 2014/08/14 19:59:11 apparently the resolve -am ignored the changes instead of integrating them... hopefully this will fix it.. Affected files ... .. //depot/projects/opencrypto/sys/sparc64/include/sf_buf.h#3 edit Differences ... ==== //depot/projects/opencrypto/sys/sparc64/include/sf_buf.h#3 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2003 Alan L. Cox + * Copyright (c) 2014 Gleb Smirnoff * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,37 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/sparc64/include/sf_buf.h 255318 2013-09-06 17:44:13Z glebius $ + * $FreeBSD: head/sys/sparc64/include/sf_buf.h 269782 2014-08-10 16:59:39Z kib $ */ #ifndef _MACHINE_SF_BUF_H_ #define _MACHINE_SF_BUF_H_ -#include - -struct vm_page; - -struct sf_buf { - SLIST_ENTRY(sf_buf) free_list; /* list of free buffer slots */ - struct vm_page *m; /* currently mapped page */ - vm_offset_t kva; /* va of mapping */ -}; - -struct sf_buf * sf_buf_alloc(struct vm_page *m, int flags); -void sf_buf_free(struct sf_buf *sf); - -static __inline vm_offset_t -sf_buf_kva(struct sf_buf *sf) -{ - - return (sf->kva); -} - -static __inline struct vm_page * -sf_buf_page(struct sf_buf *sf) -{ - - return (sf->m); -} +void sf_buf_map(struct sf_buf *, int); +int sf_buf_unmap(struct sf_buf *); #endif /* !_MACHINE_SF_BUF_H_ */ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:50:07 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6FAC172A; Mon, 8 Sep 2014 04:50:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D7703D9 for ; Mon, 8 Sep 2014 04:49:40 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3B8F71B37 for ; Mon, 8 Sep 2014 04:49:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884neNU021694 for ; Mon, 8 Sep 2014 04:49:40 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884neE7021690 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:40 GMT (envelope-from brooks@freebsd.org) Date: Mon, 8 Sep 2014 04:49:40 GMT Message-Id: <201409080449.s884neE7021690@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 1198871 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:50:07 -0000 http://p4web.freebsd.org/@@1198871?ac=10 Change 1198871 by brooks@brooks_vica on 2014/08/18 16:10:41 Add a new variable LIBADD which itends to replace manual setting of DPADD and LDADD thus eliminating the possiblity of getting them out of sync, allowing easier transtions between libaries, and enabling more complex linking options such as whole program analysis via LLVM-IR. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.README#2 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.libnames.mk#5 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.README#2 (text+ko) ==== @@ -228,10 +228,19 @@ For example, to load with the compatibility and utility libraries, use: - LDADD=-lutil -lcompat + LDADD=-lcompat -lutil LDFLAGS Additional loader flags. +LIBADD Replacement for LDADD and DPADD taking a list of lowercase + library names. A corresponding LIB variable must + be defined and will be added to DPADD. A MINUSL + variable will be added to LDADD if define and if not -l + will be added. For example, to use the compatibility and + utility libraries, use: + + LIBADD=compat util + LINKS The list of binary links; should be full pathnames, the linked-to file coming first, followed by the linked file. The files are hard-linked. For example, to link ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.libnames.mk#5 (text+ko) ==== @@ -177,3 +177,6 @@ LIBZFS?= ${DESTDIR}${LIBDIR}/libzfs.a LIBZFS_CORE?= ${DESTDIR}${LIBDIR}/libzfs_core.a LIBZPOOL?= ${DESTDIR}${LIBDIR}/libzpool.a + +DPADD+= ${LIBADD:@L@${LIB${L:tu}:U"No LIB${L:tu} variable defined"}@} +LDADD+= ${LIBADD:@L@${MINUSL${L:tu}:U${L:S/^/-l/}}@} From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:50:08 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7E09811; Mon, 8 Sep 2014 04:50:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EBD203E7 for ; Mon, 8 Sep 2014 04:49:40 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 90D811B39 for ; Mon, 8 Sep 2014 04:49:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nepV021707 for ; Mon, 8 Sep 2014 04:49:40 GMT (envelope-from brooks@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884neYe021704 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:40 GMT (envelope-from brooks@freebsd.org) Date: Mon, 8 Sep 2014 04:49:40 GMT Message-Id: <201409080449.s884neYe021704@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brooks@freebsd.org using -f From: Brooks Davis Subject: PERFORCE change 1198873 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:50:08 -0000 http://p4web.freebsd.org/@@1198873?ac=10 Change 1198873 by brooks@brooks_vica on 2014/08/18 17:31:06 Use LIBADD to add support for linking the IR from libraries into programs so we can instrument more of the program with SOAAP. Affected files ... .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.libnames.mk#6 edit .. //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#19 edit .. //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#20 edit Differences ... ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.libnames.mk#6 (text+ko) ==== @@ -180,3 +180,7 @@ DPADD+= ${LIBADD:@L@${LIB${L:tu}:U"No LIB${L:tu} variable defined"}@} LDADD+= ${LIBADD:@L@${MINUSL${L:tu}:U${L:S/^/-l/}}@} +.if ${MK_LLVM_INSTRUMENTED} != "no" +LLVM_LINK_ADD+= ${LIBADD:@L@${LLVM_IR_FILE_${L:tu}:U"No LLVM_IR_FILE_${L:tu} variable defined"}@} +LLVM_LDADD+= ${LIBADD:@L@${LLVM_IR_FILE_${L:tu}:U"No LLVM_NATIVE_FILE_${L:tu} variable defined"}@} +.endif ==== //depot/projects/ctsrd/tesla/src/share/mk/bsd.prog.mk#19 (text+ko) ==== @@ -80,12 +80,12 @@ ${PROG}: beforelinking .endif -${PROG}.${LLVM_IR_TYPE}-a: ${OIRS} +${PROG}.${LLVM_IR_TYPE}-a: ${OIRS} ${LLVM_LINK_ADD} @echo linking ${.TARGET} @if [ -z "${OIRS}" ]; then \ touch ${.TARGET} ;\ else \ - ${LLVM_LINK} -o ${.TARGET} ${OIRS} ;\ + ${LLVM_LINK} -o ${.TARGET} ${OIRS} ${LLVM_LINK_ADD} ;\ fi ${PROG}: ${OBJS} ==== //depot/projects/ctsrd/tesla/src/share/mk/sys.mk#20 (text+ko) ==== @@ -309,7 +309,7 @@ .po_cep.soaap_cg: ${CC} ${.IMPSRC} -L${SOAAP_LIB_DIR} -L${LLVM_BUILD_DIR}/lib \ - -lcep_rt -lprofile_rt ${LDADD} -o ${.TARGET} + -lcep_rt -lprofile_rt ${LDADD} ${LLVM_LDADD} -o ${.TARGET} .${LLVM_IR_TYPE}-a.bc_soaap_perf: ${OPT} -load ${SOAAP_LIB_DIR}/libsoaap.so -soaap \ @@ -319,7 +319,7 @@ ${LLC} -filetype=obj -o ${.TARGET} ${.IMPSRC} .po_soaap_perf.soaap_perf: - ${CC} ${.IMPSRC} ${LDADD} -o ${.TARGET} + ${CC} ${.IMPSRC} ${LDADD} ${LLVM_LDADD} -o ${.TARGET} .${LLVM_IR_TYPE}-a.ao: ${LLC} -filetype=obj -o ${.TARGET} ${.IMPSRC} From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:50:29 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A351AB5B; Mon, 8 Sep 2014 04:50:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A675574 for ; Mon, 8 Sep 2014 04:49:52 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 70AB71BC1 for ; Mon, 8 Sep 2014 04:49:52 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nqkQ022293 for ; Mon, 8 Sep 2014 04:49:52 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nq9D022290 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:52 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:49:52 GMT Message-Id: <201409080449.s884nq9D022290@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1198963 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:50:29 -0000 http://p4web.freebsd.org/@@1198963?ac=10 Change 1198963 by jmg@jmg_carbon2 on 2014/08/20 22:12:36 enable pclmul for aesni_ghash... Sponsored by: FreeBSD Foundation Found by: rrs Affected files ... .. //depot/projects/opencrypto/sys/conf/files.amd64#3 edit .. //depot/projects/opencrypto/sys/conf/files.i386#4 edit Differences ... ==== //depot/projects/opencrypto/sys/conf/files.amd64#3 (text+ko) ==== @@ -132,7 +132,7 @@ crypto/aesni/aesni.c optional aesni aesni_ghash.o optional aesni \ dependency "$S/crypto/aesni/aesni_ghash.c" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -maes ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -maes -mpclmul ${.IMPSRC}" \ no-implicit-rule \ clean "aesni_ghash.o" aesni_wrap.o optional aesni \ ==== //depot/projects/opencrypto/sys/conf/files.i386#4 (text+ko) ==== @@ -117,7 +117,7 @@ crypto/aesni/aesni.c optional aesni aesni_ghash.o optional aesni \ dependency "$S/crypto/aesni/aesni_ghash.c" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -maes ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -maes -mpclmul ${.IMPSRC}" \ no-implicit-rule \ clean "aesni_ghash.o" aesni_wrap.o optional aesni \ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:50:43 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06D86D96; Mon, 8 Sep 2014 04:50:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6B2E463C for ; Mon, 8 Sep 2014 04:49:59 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53AFD1BFD for ; Mon, 8 Sep 2014 04:49:59 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884nx5b022646 for ; Mon, 8 Sep 2014 04:49:59 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884nx76022643 for perforce@freebsd.org; Mon, 8 Sep 2014 04:49:59 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:49:59 GMT Message-Id: <201409080449.s884nx76022643@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199016 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:50:43 -0000 http://p4web.freebsd.org/@@1199016?ac=10 Change 1199016 by jhb@jhb_ralph on 2014/08/21 20:24:44 Store a timestamp in the kinfo_proc structure. Instead of storing a full timeval, just store a raw microseconds value as an int. Note that we don't care about wrapping as the point of the stamp is to compute a delta between updates. Affected files ... .. //depot/projects/smpng/sys/kern/kern_proc.c#135 edit .. //depot/projects/smpng/sys/sys/user.h#58 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_proc.c#135 (text+ko) ==== @@ -790,6 +790,7 @@ struct session *sp; struct ucred *cred; struct sigacts *ps; + struct timeval uptime; PROC_LOCK_ASSERT(p, MA_OWNED); bzero(kp, sizeof(*kp)); @@ -870,6 +871,9 @@ kp->ki_fibnum = p->p_fibnum; kp->ki_start = p->p_stats->p_start; timevaladd(&kp->ki_start, &boottime); + microuptime(&uptime); + /* Wrapping is ok as this is only used to compute deltas. */ + kp->ki_stamp = uptime.tv_sec * 1000000 + uptime.tv_usec; PROC_SLOCK(p); rufetch(p, &kp->ki_rusage); kp->ki_runtime = cputick2usec(p->p_rux.rux_runtime); ==== //depot/projects/smpng/sys/sys/user.h#58 (text+ko) ==== @@ -84,7 +84,7 @@ * it in two places: function fill_kinfo_proc in sys/kern/kern_proc.c and * function kvm_proclist in lib/libkvm/kvm_proc.c . */ -#define KI_NSPARE_INT 7 +#define KI_NSPARE_INT 6 #define KI_NSPARE_LONG 12 #define KI_NSPARE_PTR 6 @@ -187,6 +187,7 @@ */ char ki_sparestrings[50]; /* spare string space */ int ki_spareints[KI_NSPARE_INT]; /* spare room for growth */ + u_int ki_stamp; /* timestamp of record (usec) */ int ki_flag2; /* P2_* flags */ int ki_fibnum; /* Default FIB number */ u_int ki_cr_flags; /* Credential flags */ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:50:45 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7E67BEE6; Mon, 8 Sep 2014 04:50:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1CBD9665 for ; Mon, 8 Sep 2014 04:50:01 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ED2A41C0A for ; Mon, 8 Sep 2014 04:50:00 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884o0Wr022742 for ; Mon, 8 Sep 2014 04:50:00 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884o0ho022738 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:00 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:50:00 GMT Message-Id: <201409080450.s884o0ho022738@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199026 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:50:45 -0000 http://p4web.freebsd.org/@@1199026?ac=10 Change 1199026 by jhb@jhb_ralph on 2014/08/21 21:44:28 IFC @1199023 Affected files ... .. //depot/projects/smpng/share/man/man9/timeout.9#11 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#139 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#79 integrate .. //depot/projects/smpng/sys/amd64/include/param.h#35 integrate .. //depot/projects/smpng/sys/amd64/include/vmparam.h#25 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vtd.c#6 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vatpic.c#3 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm.c#13 integrate .. //depot/projects/smpng/sys/arm/arm/disassem.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/elf_machdep.c#22 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#24 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#32 integrate .. //depot/projects/smpng/sys/arm/at91/at91_aic.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/at91_common.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_machdep.c#19 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mci.c#24 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mcireg.h#6 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pinctrl.c#1 branch .. //depot/projects/smpng/sys/arm/at91/at91_pio.c#15 integrate .. //depot/projects/smpng/sys/arm/at91/at91_piovar.h#8 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pit.c#8 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pmc.c#20 integrate .. //depot/projects/smpng/sys/arm/at91/at91sam9260.c#7 integrate .. //depot/projects/smpng/sys/arm/at91/at91sam9260reg.h#7 integrate .. //depot/projects/smpng/sys/arm/at91/files.at91#17 integrate .. //depot/projects/smpng/sys/arm/at91/std.atmel#5 integrate .. //depot/projects/smpng/sys/arm/conf/HL201#12 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatop.c#5 integrate .. //depot/projects/smpng/sys/arm/include/acle-compat.h#1 branch .. //depot/projects/smpng/sys/arm/include/elf.h#16 integrate .. //depot/projects/smpng/sys/arm/include/param.h#24 integrate .. //depot/projects/smpng/sys/arm/include/platform.h#2 integrate .. //depot/projects/smpng/sys/arm/ti/ti_i2c.c#7 integrate .. //depot/projects/smpng/sys/arm/ti/ti_i2c.h#3 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/sam9260ek.dts#1 branch .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#32 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btx/Makefile#16 integrate .. //depot/projects/smpng/sys/boot/i386/btx/btxldr/Makefile#15 integrate .. //depot/projects/smpng/sys/boot/i386/btx/lib/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#40 integrate .. //depot/projects/smpng/sys/boot/mips/beri/boot2/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/mips/beri/loader/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/pc98/boot2/Makefile#27 integrate .. //depot/projects/smpng/sys/boot/pc98/btx/lib/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/pc98/loader/Makefile#28 integrate .. //depot/projects/smpng/sys/boot/sparc64/boot1/Makefile#14 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#26 integrate .. //depot/projects/smpng/sys/cam/ata/ata_da.c#28 integrate .. //depot/projects/smpng/sys/cam/ata/ata_xpt.c#24 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_iscsi.c#4 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_tpc.c#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#119 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_low.c#26 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/atomic.h#9 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#23 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#24 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#23 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#30 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/os/fm.c#2 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c#3 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt.c#8 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt.h#1 branch .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt_powerpc.c#5 delete .. //depot/projects/smpng/sys/cddl/dev/fbt/powerpc/fbt_isa.c#1 branch .. //depot/projects/smpng/sys/cddl/dev/fbt/powerpc/fbt_isa.h#1 branch .. //depot/projects/smpng/sys/cddl/dev/fbt/x86/fbt_isa.c#1 branch .. //depot/projects/smpng/sys/cddl/dev/fbt/x86/fbt_isa.h#1 branch .. //depot/projects/smpng/sys/conf/Makefile.arm#50 integrate .. //depot/projects/smpng/sys/conf/NOTES#214 integrate .. //depot/projects/smpng/sys/conf/files#300 integrate .. //depot/projects/smpng/sys/conf/kern.mk#44 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#77 integrate .. //depot/projects/smpng/sys/conf/options#210 integrate .. //depot/projects/smpng/sys/ddb/db_run.c#13 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#28 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#28 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_netmap.c#2 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#41 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#48 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#23 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#38 integrate .. //depot/projects/smpng/sys/dev/iscsi/icl.c#6 integrate .. //depot/projects/smpng/sys/dev/iscsi/icl_proxy.c#3 integrate .. //depot/projects/smpng/sys/dev/iscsi/iscsi.c#5 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#44 integrate .. //depot/projects/smpng/sys/dev/netmap/if_em_netmap.h#9 integrate .. //depot/projects/smpng/sys/dev/netmap/if_igb_netmap.h#10 integrate .. //depot/projects/smpng/sys/dev/netmap/if_lem_netmap.h#8 integrate .. //depot/projects/smpng/sys/dev/netmap/if_re_netmap.h#9 integrate .. //depot/projects/smpng/sys/dev/netmap/if_vtnet_netmap.h#1 branch .. //depot/projects/smpng/sys/dev/netmap/ixgbe_netmap.h#10 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap.c#14 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_freebsd.c#6 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_generic.c#5 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_kern.h#14 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_mbq.h#4 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_mem2.c#12 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_mem2.h#5 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_monitor.c#1 branch .. //depot/projects/smpng/sys/dev/netmap/netmap_offloadings.c#2 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_pipe.c#3 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_vale.c#5 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#141 integrate .. //depot/projects/smpng/sys/dev/pci/pci_if.m#13 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#34 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#44 integrate .. //depot/projects/smpng/sys/dev/si/si.c#31 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#53 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#192 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwn.c#9 integrate .. //depot/projects/smpng/sys/dev/virtio/network/if_vtnet.c#15 integrate .. //depot/projects/smpng/sys/dev/virtio/virtqueue.c#9 integrate .. //depot/projects/smpng/sys/dev/vt/font/vt_mouse_cursor.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/hw/vga/vt_vga.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/vt.h#6 integrate .. //depot/projects/smpng/sys/dev/vt/vt_buf.c#4 integrate .. //depot/projects/smpng/sys/dev/vt/vt_core.c#6 integrate .. //depot/projects/smpng/sys/dev/vt/vt_sysmouse.c#5 integrate .. //depot/projects/smpng/sys/fs/autofs/autofs.c#1 branch .. //depot/projects/smpng/sys/fs/autofs/autofs.h#4 branch .. //depot/projects/smpng/sys/fs/autofs/autofs_ioctl.h#1 branch .. //depot/projects/smpng/sys/fs/autofs/autofs_vfsops.c#4 branch .. //depot/projects/smpng/sys/fs/autofs/autofs_vnops.c#4 branch .. //depot/projects/smpng/sys/geom/geom_dev.c#68 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sam9260ek_common.dtsi#1 branch .. //depot/projects/smpng/sys/i386/conf/NOTES#171 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#175 integrate .. //depot/projects/smpng/sys/i386/xen/pmap.c#38 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#90 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#153 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#167 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#76 integrate .. //depot/projects/smpng/sys/kern/uipc_shm.c#23 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#158 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#122 integrate .. //depot/projects/smpng/sys/libkern/strndup.c#1 branch .. //depot/projects/smpng/sys/modules/Makefile#205 integrate .. //depot/projects/smpng/sys/modules/autofs/Makefile#4 branch .. //depot/projects/smpng/sys/modules/dtrace/fbt/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/si/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wds/Makefile#1 branch .. //depot/projects/smpng/sys/modules/wl/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#158 integrate .. //depot/projects/smpng/sys/net/if_gre.c#55 integrate .. //depot/projects/smpng/sys/net/if_stf.c#63 integrate .. //depot/projects/smpng/sys/net/netmap.h#12 integrate .. //depot/projects/smpng/sys/net/netmap_user.h#12 integrate .. //depot/projects/smpng/sys/net/paravirt.h#1 branch .. //depot/projects/smpng/sys/net/pfvar.h#6 integrate .. //depot/projects/smpng/sys/net/rtsock.c#99 integrate .. //depot/projects/smpng/sys/net/sff8436.h#1 branch .. //depot/projects/smpng/sys/net/sff8472.h#3 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_amrr.c#11 integrate .. //depot/projects/smpng/sys/netinet/cc/cc_cdg.c#3 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#38 integrate .. //depot/projects/smpng/sys/netinet/ip_carp.c#60 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#86 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#58 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#106 integrate .. //depot/projects/smpng/sys/netinet/sctp.h#28 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#53 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#64 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#37 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#41 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#56 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#64 integrate .. //depot/projects/smpng/sys/netinet6/in6_gif.c#34 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#52 integrate .. //depot/projects/smpng/sys/netinet6/ip6_mroute.c#60 integrate .. //depot/projects/smpng/sys/netipsec/keysock.c#30 integrate .. //depot/projects/smpng/sys/netipsec/keysock.h#9 integrate .. //depot/projects/smpng/sys/netpfil/pf/if_pfsync.c#10 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf.c#12 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf.h#3 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf_ioctl.c#8 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf_lb.c#7 integrate .. //depot/projects/smpng/sys/ofed/include/linux/pci.h#5 integrate .. //depot/projects/smpng/sys/powerpc/include/vmparam.h#27 integrate .. //depot/projects/smpng/sys/security/audit/audit_pipe.c#22 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#112 integrate .. //depot/projects/smpng/sys/sys/_cpuset.h#5 integrate .. //depot/projects/smpng/sys/sys/callout.h#21 integrate .. //depot/projects/smpng/sys/sys/elf_common.h#31 integrate .. //depot/projects/smpng/sys/sys/hhook.h#5 integrate .. //depot/projects/smpng/sys/sys/imgact_elf.h#21 integrate .. //depot/projects/smpng/sys/sys/khelp.h#4 integrate .. //depot/projects/smpng/sys/sys/libkern.h#37 integrate .. //depot/projects/smpng/sys/sys/mount.h#94 integrate .. //depot/projects/smpng/sys/sys/param.h#193 integrate .. //depot/projects/smpng/sys/sys/protosw.h#29 integrate .. //depot/projects/smpng/sys/sys/sf_buf.h#11 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#76 integrate .. //depot/projects/smpng/sys/sys/time.h#42 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#138 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#96 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#101 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#84 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/timeout.9#11 (text+ko) ==== @@ -27,9 +27,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/timeout.9 268817 2014-07-17 23:14:47Z delphij $ +.\" $FreeBSD: head/share/man/man9/timeout.9 270251 2014-08-20 23:29:34Z gavin $ .\" -.Dd July 17, 2014 +.Dd August 21, 2014 .Dt TIMEOUT 9 .Os .Sh NAME @@ -74,7 +74,7 @@ .Fn callout_init "struct callout *c" "int mpsafe" .Ft void .Fn callout_init_mtx "struct callout *c" "struct mtx *mtx" "int flags" -.Fn void +.Ft void .Fn callout_init_rm "struct callout *c" "struct rmlock *rm" "int flags" .Ft void .Fn callout_init_rw "struct callout *c" "struct rwlock *rw" "int flags" @@ -103,6 +103,7 @@ .Fn callout_pending "struct callout *c" .Ft int .Fn callout_active "struct callout *c" +.Ft void .Fn callout_deactivate "struct callout *c" .Sh DESCRIPTION The function ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#139 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 269759 2014-08-09 17:13:02Z alc $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 270151 2014-08-18 20:28:08Z alc $"); /* * Manages physical address maps. @@ -4201,9 +4201,10 @@ mpte = _pmap_allocpte(pmap, pmap_pde_pindex(va), nosleep ? NULL : &lock); if (mpte == NULL && nosleep) { - KASSERT(lock == NULL, ("lock leaked for nosleep")); + if (lock != NULL) + rw_wunlock(lock); + rw_runlock(&pvh_global_lock); PMAP_UNLOCK(pmap); - rw_runlock(&pvh_global_lock); return (KERN_RESOURCE_SHORTAGE); } goto retry; ==== //depot/projects/smpng/sys/amd64/conf/NOTES#79 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: head/sys/amd64/conf/NOTES 268069 2014-07-01 00:22:54Z emaste $ +# $FreeBSD: head/sys/amd64/conf/NOTES 270224 2014-08-20 16:07:17Z jhb $ # # @@ -307,7 +307,8 @@ # Requires the ipw firmware module # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters # Requires the iwi firmware module -# iwn: Intel Wireless WiFi Link 4965/1000/5000/6000 802.11 network adapters +# iwn: Intel Wireless WiFi Link 1000/105/135/2000/4965/5000/6000/6050 abgn +# 802.11 network adapters # Requires the iwn firmware module # mlx4ib: Mellanox ConnectX HCA InfiniBand # mlxen: Mellanox ConnectX HCA Ethernet @@ -347,12 +348,18 @@ # iwiibssfw: IBSS mode firmware # iwimonitorfw: Monitor mode firmware # Intel Wireless WiFi Link 4965/1000/5000/6000 series firmware: -# iwnfw: Single module to support the 4965/1000/5000/5150/6000 +# iwnfw: Single module to support all devices +# iwn1000fw: Specific module for the 1000 only +# iwn105fw: Specific module for the 105 only +# iwn135fw: Specific module for the 135 only +# iwn2000fw: Specific module for the 2000 only +# iwn2030fw: Specific module for the 2030 only # iwn4965fw: Specific module for the 4965 only -# iwn1000fw: Specific module for the 1000 only # iwn5000fw: Specific module for the 5000 only # iwn5150fw: Specific module for the 5150 only # iwn6000fw: Specific module for the 6000 only +# iwn6000g2afw: Specific module for the 6000g2a only +# iwn6000g2bfw: Specific module for the 6000g2b only # iwn6050fw: Specific module for the 6050 only # wpifw: Intel 3945ABG Wireless LAN Controller firmware @@ -365,11 +372,17 @@ device ipwibssfw device ipwmonitorfw device iwnfw +device iwn1000fw +device iwn105fw +device iwn135fw +device iwn2000fw +device iwn2030fw device iwn4965fw -device iwn1000fw device iwn5000fw device iwn5150fw device iwn6000fw +device iwn6000g2afw +device iwn6000g2bfw device iwn6050fw device wpifw @@ -508,7 +521,7 @@ device smbios device vpd device asmc -#device si +device si device tpm device padlock_rng # VIA Padlock RNG device rdrand_rng # Intel Bull Mountain RNG ==== //depot/projects/smpng/sys/amd64/include/param.h#35 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: head/sys/amd64/include/param.h 266093 2014-05-14 22:24:09Z neel $ + * $FreeBSD: head/sys/amd64/include/param.h 270223 2014-08-20 16:06:24Z jhb $ */ @@ -65,7 +65,7 @@ #if defined(SMP) || defined(KLD_MODULE) #ifndef MAXCPU -#define MAXCPU 64 +#define MAXCPU 256 #endif #else #define MAXCPU 1 ==== //depot/projects/smpng/sys/amd64/include/vmparam.h#25 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: head/sys/amd64/include/vmparam.h 257854 2013-11-08 16:25:00Z alc $ + * $FreeBSD: head/sys/amd64/include/vmparam.h 270202 2014-08-20 08:07:08Z kib $ */ @@ -87,7 +87,7 @@ * largest physical address that is accessible by ISA DMA is split * into two PHYSSEG entries. */ -#define VM_PHYSSEG_MAX 31 +#define VM_PHYSSEG_MAX 63 /* * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool ==== //depot/projects/smpng/sys/amd64/vmm/intel/vtd.c#6 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/intel/vtd.c 264009 2014-04-01 15:54:03Z rstone $ + * $FreeBSD: head/sys/amd64/vmm/intel/vtd.c 269962 2014-08-14 05:00:45Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vtd.c 264009 2014-04-01 15:54:03Z rstone $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/intel/vtd.c 269962 2014-08-14 05:00:45Z neel $"); #include #include @@ -448,6 +448,11 @@ ptpindex = 0; ptpshift = 0; + KASSERT(gpa + len > gpa, ("%s: invalid gpa range %#lx/%#lx", __func__, + gpa, len)); + KASSERT(gpa + len <= dom->maxaddr, ("%s: gpa range %#lx/%#lx beyond " + "domain maxaddr %#lx", __func__, gpa, len, dom->maxaddr)); + if (gpa & PAGE_MASK) panic("vtd_create_mapping: unaligned gpa 0x%0lx", gpa); ==== //depot/projects/smpng/sys/amd64/vmm/io/vatpic.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vatpic.c 266572 2014-05-23 05:04:50Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vatpic.c 269989 2014-08-14 18:03:38Z neel $"); #include #include @@ -195,26 +195,29 @@ atpic->mask, atpic->request, atpic->service); /* + * From Section 3.6.2, "Interrupt Modes", in the + * MPtable Specification, Version 1.4 + * * PIC interrupts are routed to both the Local APIC * and the I/O APIC to support operation in 1 of 3 * modes. * * 1. Legacy PIC Mode: the PIC effectively bypasses - * all APIC components. In mode '1' the local APIC is + * all APIC components. In this mode the local APIC is * disabled and LINT0 is reconfigured as INTR to * deliver the PIC interrupt directly to the CPU. * * 2. Virtual Wire Mode: the APIC is treated as a * virtual wire which delivers interrupts from the PIC - * to the CPU. In mode '2' LINT0 is programmed as + * to the CPU. In this mode LINT0 is programmed as * ExtINT to indicate that the PIC is the source of * the interrupt. * - * 3. Symmetric I/O Mode: PIC interrupts are fielded - * by the I/O APIC and delivered to the appropriate - * CPU. In mode '3' the I/O APIC input 0 is - * programmed as ExtINT to indicate that the PIC is - * the source of the interrupt. + * 3. Virtual Wire Mode via I/O APIC: PIC interrupts are + * fielded by the I/O APIC and delivered to the appropriate + * CPU. In this mode the I/O APIC input 0 is programmed + * as ExtINT to indicate that the PIC is the source of the + * interrupt. */ atpic->intr_raised = true; lapic_set_local_intr(vatpic->vm, -1, APIC_LVT_LINT0); ==== //depot/projects/smpng/sys/amd64/vmm/vmm.c#13 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/vmm.c 269109 2014-07-26 02:53:51Z neel $ + * $FreeBSD: head/sys/amd64/vmm/vmm.c 269962 2014-08-14 05:00:45Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 269109 2014-07-26 02:53:51Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm.c 269962 2014-08-14 05:00:45Z neel $"); #include #include @@ -572,6 +572,21 @@ return (0); } +static vm_paddr_t +vm_maxmem(struct vm *vm) +{ + int i; + vm_paddr_t gpa, maxmem; + + maxmem = 0; + for (i = 0; i < vm->num_mem_segs; i++) { + gpa = vm->mem_segs[i].gpa + vm->mem_segs[i].len; + if (gpa > maxmem) + maxmem = gpa; + } + return (maxmem); +} + static void vm_gpa_unwire(struct vm *vm) { @@ -709,7 +724,7 @@ if (ppt_assigned_devices(vm) == 0) { KASSERT(vm->iommu == NULL, ("vm_assign_pptdev: iommu must be NULL")); - maxaddr = vmm_mem_maxaddr(); + maxaddr = vm_maxmem(vm); vm->iommu = iommu_create_domain(maxaddr); error = vm_gpa_wire(vm); ==== //depot/projects/smpng/sys/arm/arm/disassem.c#7 (text+ko) ==== @@ -48,13 +48,14 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/disassem.c 248119 2013-03-09 23:55:23Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/disassem.c 269956 2014-08-14 04:20:13Z imp $"); #include #include #include #include +#include #include /* @@ -130,7 +131,7 @@ { 0x0c500000, 0x04100000, "ldr", "daW" }, { 0x0c500000, 0x04400000, "strb", "daW" }, { 0x0c500000, 0x04500000, "ldrb", "daW" }, -#if defined(__FreeBSD_ARCH_armv6__) || (defined(__ARM_ARCH) && __ARM_ARCH >= 6) +#if __ARM_ARCH >= 6 { 0xffffffff, 0xf57ff01f, "clrex", "c" }, { 0x0ff00ff0, 0x01800f90, "strex", "dmo" }, { 0x0ff00fff, 0x01900f9f, "ldrex", "do" }, ==== //depot/projects/smpng/sys/arm/arm/elf_machdep.c#22 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/elf_machdep.c 269767 2014-08-09 22:51:26Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/elf_machdep.c 270124 2014-08-18 02:45:06Z imp $"); #include #include @@ -46,6 +46,8 @@ #include #include +static boolean_t elf32_arm_abi_supported(struct image_params *); + struct sysentvec elf32_freebsd_sysvec = { .sv_size = SYS_MAXSYSCALL, .sv_table = sysent, @@ -90,29 +92,42 @@ .sysvec = &elf32_freebsd_sysvec, .interp_newpath = NULL, .brand_note = &elf32_freebsd_brandnote, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE + .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE, + .header_supported= elf32_arm_abi_supported, }; SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_FIRST, (sysinit_cfunc_t) elf32_insert_brand_entry, &freebsd_brand_info); -static Elf32_Brandinfo freebsd_brand_oinfo = { - .brand = ELFOSABI_FREEBSD, - .machine = EM_ARM, - .compat_3_brand = "FreeBSD", - .emul_path = NULL, - .interp_path = "/usr/libexec/ld-elf.so.1", - .sysvec = &elf32_freebsd_sysvec, - .interp_newpath = NULL, - .brand_note = &elf32_freebsd_brandnote, - .flags = BI_CAN_EXEC_DYN | BI_BRAND_NOTE -}; +static boolean_t +elf32_arm_abi_supported(struct image_params *imgp) +{ + const Elf_Ehdr *hdr = (const Elf_Ehdr *)imgp->image_header; -SYSINIT(oelf32, SI_SUB_EXEC, SI_ORDER_ANY, - (sysinit_cfunc_t) elf32_insert_brand_entry, - &freebsd_brand_oinfo); - +#ifdef __ARM_EABI__ + /* + * When configured for EABI, FreeBSD supports EABI vesions 4 and 5. + */ + if (EF_ARM_EABI_VERSION(hdr->e_flags) < EF_ARM_EABI_FREEBSD_MIN) { + if (bootverbose) + uprintf("Attempting to execute non EABI binary (rev %d) image %s", + EF_ARM_EABI_VERSION(hdr->e_flags), imgp->args->fname); + return (FALSE); + } +#else + /* + * When configured for OABI, that's all we do, so reject EABI binaries. + */ + if (EF_ARM_EABI_VERSION(hdr->e_flags) != EF_ARM_EABI_VERSION_UNKNOWN) { + if (bootverbose) + uprintf("Attempting to execute EABI binary (rev %d) image %s", + EF_ARM_EABI_VERSION(hdr->e_flags), imgp->args->fname); + return (FALSE); + } +#endif + return (TRUE); +} void elf32_dump_thread(struct thread *td __unused, void *dst __unused, ==== //depot/projects/smpng/sys/arm/arm/nexus.c#24 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 269606 2014-08-05 19:06:45Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -362,4 +362,3 @@ return (interrupt); } #endif - ==== //depot/projects/smpng/sys/arm/at91/at91.c#32 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91.c 262925 2014-03-08 06:06:50Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91.c 269960 2014-08-14 04:21:31Z imp $"); #include #include @@ -255,7 +255,7 @@ { int i; - for (i = 1; walker->name; i++, walker++) { + for (i = 0; walker->name; i++, walker++) { at91_add_child(dev, i, walker->name, walker->unit, walker->mem_base, walker->mem_len, walker->irq0, walker->irq1, walker->irq2); ==== //depot/projects/smpng/sys/arm/at91/at91_aic.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_aic.c 262925 2014-03-08 06:06:50Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_aic.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -176,13 +176,9 @@ static devclass_t at91_aic_devclass; #ifdef FDT -DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, + NULL, NULL, BUS_PASS_INTERRUPT); #else -DRIVER_MODULE(at91_aic, atmelarm, at91_aic_driver, at91_aic_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_aic, atmelarm, at91_aic_driver, at91_aic_devclass, + NULL, NULL, BUS_PASS_INTERRUPT); #endif -/* not yet -EARLY_DRIVER_MODULE(at91_aic, simplebus, at91_aic_driver, at91_aic_devclass, - NULL, NULL, BUS_PASS_INTERRUPT); -*/ ==== //depot/projects/smpng/sys/arm/at91/at91_machdep.c#19 (text+ko) ==== @@ -43,8 +43,10 @@ * Created : 17/09/94 */ +#include "opt_platform.h" + #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_machdep.c 265852 2014-05-10 20:03:03Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_machdep.c 270104 2014-08-17 16:53:14Z imp $"); #define _ARM32_BUS_DMA_PRIVATE #include @@ -111,8 +113,12 @@ /* this should be evenly divisable by PAGE_SIZE / L2_TABLE_SIZE_REAL (or 4) */ #define NUM_KERNEL_PTS (KERNEL_PT_AFKERNEL + KERNEL_PT_AFKERNEL_NUM) +extern struct bus_space at91_bs_tag; + struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; +extern uint32_t at91_master_clock; + /* Static device mappings. */ const struct arm_devmap_entry at91_devmap[] = { /* @@ -194,15 +200,6 @@ { 0, 0, 0, 0, 0, } }; -/* Physical and virtual addresses for some global pages */ - -struct pv_addr systempage; -struct pv_addr msgbufpv; -struct pv_addr irqstack; -struct pv_addr undstack; -struct pv_addr abtstack; -struct pv_addr kernelstack; - #ifdef LINUX_BOOT_ABI extern int membanks; extern int memstart[]; @@ -444,6 +441,16 @@ } #endif +#ifndef FDT +/* Physical and virtual addresses for some global pages */ + +struct pv_addr msgbufpv; +struct pv_addr kernelstack; +struct pv_addr systempage; +struct pv_addr irqstack; +struct pv_addr abtstack; +struct pv_addr undstack; + void * initarm(struct arm_boot_params *abp) { @@ -651,6 +658,7 @@ return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); } +#endif /* * These functions are handled elsewhere, so make them nops here. ==== //depot/projects/smpng/sys/arm/at91/at91_mci.c#24 (text+ko) ==== @@ -28,7 +28,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_mci.c 261681 2014-02-09 20:55:49Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_mci.c 270154 2014-08-18 21:04:35Z imp $"); #include #include @@ -1210,10 +1210,11 @@ */ if (cmd->opcode != 8) { device_printf(sc->dev, - "IO error; status MCI_SR = 0x%x cmd opcode = %d%s\n", - sr, cmd->opcode, + "IO error; status MCI_SR = 0x%b cmd opcode = %d%s\n", + sr, MCI_SR_BITSTRING, cmd->opcode, (cmd->opcode != 12) ? "" : (sc->flags & CMD_MULTIREAD) ? " after read" : " after write"); + /* XXX not sure RTOE needs a full reset, just a retry */ at91_mci_reset(sc); } at91_mci_next_operation(sc); ==== //depot/projects/smpng/sys/arm/at91/at91_mcireg.h#6 (text+ko) ==== @@ -24,7 +24,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: head/sys/arm/at91/at91_mcireg.h 234560 2012-04-22 00:43:32Z marius $ */ +/* $FreeBSD: head/sys/arm/at91/at91_mcireg.h 270006 2014-08-14 23:17:33Z imp $ */ #ifndef ARM_AT91_AT91_MCIREG_H #define ARM_AT91_AT91_MCIREG_H @@ -118,6 +118,30 @@ #define MCI_SR_OVRE (0x1u << 30) /* (MCI) Overrun flag */ #define MCI_SR_UNRE (0x1u << 31) /* (MCI) Underrun flag */ +/* TXRDY,DTIP,ENDTX,TXBUFE,RTOE */ + +#define MCI_SR_BITSTRING \ + "\020" \ + "\001CMDRDY" \ + "\002RXRDY" \ + "\003TXRDY" \ + "\004BLKE" \ + "\005DTIP" \ + "\006NOTBUSY" \ + "\007ENDRX" \ + "\010ENDTX" \ + "\017RXBUFF" \ + "\020TXBUFE" \ + "\021RINDE" \ + "\022RDIRE" \ + "\023RCRCE" \ + "\024RENDE" \ + "\025RTOE" \ + "\026DCRCE" \ + "\027DTOE" \ + "\037OVRE" \ + "\040UNRE" + /* -------- MCI_IER : (MCI Offset: 0x44) MCI Interrupt Enable Register -------- */ /* -------- MCI_IDR : (MCI Offset: 0x48) MCI Interrupt Disable Register -------- */ /* -------- MCI_IMR : (MCI Offset: 0x4c) MCI Interrupt Mask Register -------- */ ==== //depot/projects/smpng/sys/arm/at91/at91_pio.c#15 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pio.c 261682 2014-02-09 20:56:39Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pio.c 270025 2014-08-15 16:08:52Z imp $"); #include #include @@ -591,6 +591,17 @@ } void +at91_pio_gpio_pullup(uint32_t pio, uint32_t data_mask, int do_pullup) +{ + uint32_t *PIO = (uint32_t *)(AT91_BASE + pio); + + if (do_pullup) + PIO[PIO_PUER / 4] = data_mask; + else + PIO[PIO_PUDR / 4] = data_mask; +} + +void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt) { @@ -611,12 +622,21 @@ return (PIO[PIO_ISR / 4]); } +static void +at91_pio_new_pass(device_t dev) +{ + + device_printf(dev, "Pass %d\n", bus_current_pass); +} + static device_method_t at91_pio_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_pio_probe), DEVMETHOD(device_attach, at91_pio_attach), DEVMETHOD(device_detach, at91_pio_detach), + DEVMETHOD(bus_new_pass, at91_pio_new_pass), + DEVMETHOD_END }; @@ -626,10 +646,5 @@ sizeof(struct at91_pio_softc), }; -#ifdef FDT -DRIVER_MODULE(at91_pio, simplebus, at91_pio_driver, at91_pio_devclass, NULL, - NULL); -#else -DRIVER_MODULE(at91_pio, atmelarm, at91_pio_driver, at91_pio_devclass, NULL, - NULL); -#endif +EARLY_DRIVER_MODULE(at91_pio, at91_pinctrl, at91_pio_driver, at91_pio_devclass, + NULL, NULL, BUS_PASS_INTERRUPT); ==== //depot/projects/smpng/sys/arm/at91/at91_piovar.h#8 (text+ko) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: head/sys/arm/at91/at91_piovar.h 249232 2013-04-07 13:03:57Z hselasky $ */ +/* $FreeBSD: head/sys/arm/at91/at91_piovar.h 270025 2014-08-15 16:08:52Z imp $ */ #ifndef ARM_AT91_AT91_PIOVAR_H #define ARM_AT91_AT91_PIOVAR_H @@ -45,5 +45,6 @@ void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt); uint32_t at91_pio_gpio_clear_interrupt(uint32_t pio); +void at91_pio_gpio_pullup(uint32_t pio, uint32_t data_mask, int do_pullup); #endif /* ARM_AT91_AT91_PIOVAR_H */ ==== //depot/projects/smpng/sys/arm/at91/at91_pit.c#8 (text+ko) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pit.c 261683 2014-02-09 20:57:26Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pit.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -214,9 +214,9 @@ static devclass_t at91_pit_devclass; #ifdef FDT -DRIVER_MODULE(at91_pit, simplebus, at91_pit_driver, at91_pit_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pit, simplebus, at91_pit_driver, at91_pit_devclass, + NULL, NULL, BUS_PASS_TIMER); #else -DRIVER_MODULE(at91_pit, atmelarm, at91_pit_driver, at91_pit_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pit, atmelarm, at91_pit_driver, at91_pit_devclass, + NULL, NULL, BUS_PASS_TIMER); #endif ==== //depot/projects/smpng/sys/arm/at91/at91_pmc.c#20 (text) ==== @@ -27,7 +27,7 @@ #include "opt_platform.h" #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pmc.c 261684 2014-02-09 20:58:03Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pmc.c 269959 2014-08-14 04:21:25Z imp $"); #include #include @@ -709,9 +709,9 @@ static devclass_t at91_pmc_devclass; #ifdef FDT -DRIVER_MODULE(at91_pmc, simplebus, at91_pmc_driver, at91_pmc_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pmc, simplebus, at91_pmc_driver, at91_pmc_devclass, + NULL, NULL, BUS_PASS_CPU); #else -DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, NULL, - NULL); +EARLY_DRIVER_MODULE(at91_pmc, atmelarm, at91_pmc_driver, at91_pmc_devclass, + NULL, NULL, BUS_PASS_CPU); #endif ==== //depot/projects/smpng/sys/arm/at91/at91sam9260.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91sam9260.c 260696 2014-01-15 19:53:36Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91sam9260.c 269960 2014-08-14 04:21:31Z imp $"); #include #include @@ -103,6 +103,7 @@ static const struct cpu_devs at91_devs[] = { + DEVICE("at91_aic", AIC, 0), DEVICE("at91_pmc", PMC, 0), DEVICE("at91_wdt", WDT, 0), DEVICE("at91_rst", RSTC, 0), ==== //depot/projects/smpng/sys/arm/at91/at91sam9260reg.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: head/sys/arm/at91/at91sam9260reg.h 261353 2014-02-01 17:53:35Z imp $ */ +/* $FreeBSD: head/sys/arm/at91/at91sam9260reg.h 269960 2014-08-14 04:21:31Z imp $ */ #ifndef AT91SAM9260REG_H_ #define AT91SAM9260REG_H_ @@ -220,6 +220,7 @@ #define AT91SAM9260_IRQ_RSTC AT91SAM9260_IRQ_SYSTEM #define AT91SAM9260_IRQ_OHCI AT91SAM9260_IRQ_UHP #define AT91SAM9260_IRQ_NAND (-1) +#define AT91SAM9260_IRQ_AIC (-1) #define AT91SAM9260_AIC_BASE 0xffff000 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:50:57 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D336F267; Mon, 8 Sep 2014 04:50:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3ACB5728 for ; Mon, 8 Sep 2014 04:50:07 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 282661C41 for ; Mon, 8 Sep 2014 04:50:07 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884o7b1023101 for ; Mon, 8 Sep 2014 04:50:07 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884o6kR023098 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:07 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:50:07 GMT Message-Id: <201409080450.s884o6kR023098@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199076 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:50:58 -0000 http://p4web.freebsd.org/@@1199076?ac=10 Change 1199076 by jmg@jmg_carbon2 on 2014/08/22 20:04:05 enable SSE4 for ghash... Submitted by: rrs Sponsored by: FreeBSD Foundation Affected files ... .. //depot/projects/opencrypto/sys/modules/aesni/Makefile#3 edit Differences ... ==== //depot/projects/opencrypto/sys/modules/aesni/Makefile#3 (text+ko) ==== @@ -18,7 +18,7 @@ aesni_wrap.o: aesni_wrap.c ${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} \ - -mmmx -msse -maes ${.IMPSRC} + -mmmx -msse -msse4 -maes ${.IMPSRC} ${CTFCONVERT_CMD} .include From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:50:57 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 58E1618C; Mon, 8 Sep 2014 04:50:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B65C723 for ; Mon, 8 Sep 2014 04:50:07 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18B431C40 for ; Mon, 8 Sep 2014 04:50:07 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884o6iS023094 for ; Mon, 8 Sep 2014 04:50:06 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884o6oc023091 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:06 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:50:06 GMT Message-Id: <201409080450.s884o6oc023091@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199075 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:50:57 -0000 http://p4web.freebsd.org/@@1199075?ac=10 Change 1199075 by jmg@jmg_carbon2 on 2014/08/22 20:02:55 enable SSE4 for ghash... Pointed out by: rrs Sponsored by: FreeBSD Foundation Affected files ... .. //depot/projects/opencrypto/sys/conf/files.amd64#4 edit .. //depot/projects/opencrypto/sys/conf/files.i386#5 edit Differences ... ==== //depot/projects/opencrypto/sys/conf/files.amd64#4 (text+ko) ==== @@ -132,7 +132,7 @@ crypto/aesni/aesni.c optional aesni aesni_ghash.o optional aesni \ dependency "$S/crypto/aesni/aesni_ghash.c" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -maes -mpclmul ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}" \ no-implicit-rule \ clean "aesni_ghash.o" aesni_wrap.o optional aesni \ ==== //depot/projects/opencrypto/sys/conf/files.i386#5 (text+ko) ==== @@ -117,7 +117,7 @@ crypto/aesni/aesni.c optional aesni aesni_ghash.o optional aesni \ dependency "$S/crypto/aesni/aesni_ghash.c" \ - compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -maes -mpclmul ${.IMPSRC}" \ + compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc} ${WERROR} ${PROF} -mmmx -msse -msse4 -maes -mpclmul ${.IMPSRC}" \ no-implicit-rule \ clean "aesni_ghash.o" aesni_wrap.o optional aesni \ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:51:04 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C0724BF; Mon, 8 Sep 2014 04:51:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8D192939 for ; Mon, 8 Sep 2014 04:50:10 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3F7011C5D for ; Mon, 8 Sep 2014 04:50:10 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884o9cO023805 for ; Mon, 8 Sep 2014 04:50:09 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884o9sS023802 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:09 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:50:09 GMT Message-Id: <201409080450.s884o9sS023802@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199101 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:51:04 -0000 http://p4web.freebsd.org/@@1199101?ac=10 Change 1199101 by jhb@jhb_pippin on 2014/08/22 21:16:36 - Add a bios_smap_xattr structure. - Don't return an SMAP data for the EFI case instead of panicing. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#126 edit .. //depot/projects/smpng/sys/amd64/include/pc/bios.h#8 edit .. //depot/projects/smpng/sys/i386/include/pc/bios.h#11 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#126 (text+ko) ==== @@ -2106,6 +2106,8 @@ kmdp = preload_search_by_type("elf64 kernel"); smapbase = (struct bios_smap *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_SMAP); + if (smapbase == NULL) + return (0); smapsize = *((u_int32_t *)smapbase - 1); return (SYSCTL_OUT(req, smapbase, smapsize)); } ==== //depot/projects/smpng/sys/amd64/include/pc/bios.h#8 (text+ko) ==== @@ -51,6 +51,14 @@ u_int32_t type; } __packed; +/* Structure extended to include extended attribute field in ACPI 3.0. */ +struct bios_smap_xattr { + u_int64_t base; + u_int64_t length; + u_int32_t type; + u_int32_t xattr; +} __packed; + /* * System Management BIOS */ ==== //depot/projects/smpng/sys/i386/include/pc/bios.h#11 (text+ko) ==== @@ -221,6 +221,14 @@ u_int32_t type; } __packed; +/* Structure extended to include extended attribute field in ACPI 3.0. */ +struct bios_smap_xattr { + u_int64_t base; + u_int64_t length; + u_int32_t type; + u_int32_t xattr; +} __packed; + /* * System Management BIOS */ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:51:05 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E8625A6; Mon, 8 Sep 2014 04:51:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ECCE5948 for ; Mon, 8 Sep 2014 04:50:10 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D34E11C62 for ; Mon, 8 Sep 2014 04:50:10 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884oA1l023833 for ; Mon, 8 Sep 2014 04:50:10 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884oA0v023829 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:10 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:50:10 GMT Message-Id: <201409080450.s884oA0v023829@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199105 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:51:05 -0000 http://p4web.freebsd.org/@@1199105?ac=10 Change 1199105 by jmg@jmg_carbon2 on 2014/08/23 00:03:21 add support for ICM to aesni driver... properly initalize error when authbuf fails to allocate #if 0 out debug function... Sponsored by: FreeBSD Foundation Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#4 edit .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.h#3 edit .. //depot/projects/opencrypto/sys/crypto/aesni/aesni_wrap.c#3 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#4 (text+ko) ==== @@ -110,11 +110,12 @@ rw_init(&sc->lock, "aesni_lock"); crypto_register(sc->cid, CRYPTO_AES_CBC, 0, 0); - crypto_register(sc->cid, CRYPTO_AES_XTS, 0, 0); + crypto_register(sc->cid, CRYPTO_AES_ICM, 0, 0); crypto_register(sc->cid, CRYPTO_AES_NIST_GCM_16, 0, 0); crypto_register(sc->cid, CRYPTO_AES_128_NIST_GMAC, 0, 0); crypto_register(sc->cid, CRYPTO_AES_192_NIST_GMAC, 0, 0); crypto_register(sc->cid, CRYPTO_AES_256_NIST_GMAC, 0, 0); + crypto_register(sc->cid, CRYPTO_AES_XTS, 0, 0); return (0); } @@ -164,6 +165,7 @@ for (; cri != NULL; cri = cri->cri_next) { switch (cri->cri_alg) { case CRYPTO_AES_CBC: + case CRYPTO_AES_ICM: case CRYPTO_AES_XTS: case CRYPTO_AES_NIST_GCM_16: if (encini != NULL) { @@ -294,6 +296,7 @@ for (crd = crp->crp_desc; crd != NULL; crd = crd->crd_next) { switch (crd->crd_alg) { case CRYPTO_AES_CBC: + case CRYPTO_AES_ICM: case CRYPTO_AES_XTS: if (enccrd != NULL) { error = EINVAL; @@ -433,6 +436,7 @@ return (error); } +#if 0 static void printhexstr(uint8_t *ptr, int len) { @@ -441,6 +445,7 @@ for (i = 0; i < len; i++) printf("%02hhx", ptr[i]); } +#endif /* * authcrd contains the associated date. @@ -458,6 +463,10 @@ encflag = (enccrd->crd_flags & CRD_F_ENCRYPT) == CRD_F_ENCRYPT; + if (enccrd->crd_alg == CRYPTO_AES_ICM && + (enccrd->crd_flags & CRD_F_IV_EXPLICIT) == 0) + return (EINVAL); + buf = aesni_cipher_alloc(enccrd, crp, &allocated); if (buf == NULL) return (ENOMEM); @@ -466,8 +475,10 @@ authallocated = 0; if (authcrd != NULL) { authbuf = aesni_cipher_alloc(authcrd, crp, &authallocated); - if (authbuf == NULL) + if (authbuf == NULL) { + error = ENOMEM; goto out1; + } } td = curthread; @@ -486,6 +497,7 @@ /* XXX - validate that enccrd and authcrd have/use same key? */ switch (enccrd->crd_alg) { case CRYPTO_AES_CBC: + case CRYPTO_AES_ICM: ivlen = 16; break; case CRYPTO_AES_XTS: @@ -535,6 +547,10 @@ aesni_decrypt_cbc(ses->rounds, ses->dec_schedule, enccrd->crd_len, buf, ses->iv); break; + case CRYPTO_AES_ICM: + aesni_encrypt_icm(ses->rounds, ses->enc_schedule, + enccrd->crd_len, buf, buf, ses->iv); + break; case CRYPTO_AES_XTS: if (encflag) aesni_encrypt_xts(ses->rounds, ses->enc_schedule, ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.h#3 (text+ko) ==== @@ -88,6 +88,9 @@ size_t len, const uint8_t *from, uint8_t *to); void aesni_decrypt_ecb(int rounds, const void *key_schedule /*__aligned(16)*/, size_t len, const uint8_t *from, uint8_t *to); +void aesni_encrypt_icm(int rounds, const void *key_schedule /*__aligned(16)*/, + size_t len, const uint8_t *from, uint8_t *to, + const uint8_t iv[AES_BLOCK_LEN]); void aesni_encrypt_xts(int rounds, const void *data_schedule /*__aligned(16)*/, const void *tweak_schedule /*__aligned(16)*/, size_t len, ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni_wrap.c#3 (text+ko) ==== @@ -44,6 +44,7 @@ #include #include "aesencdec.h" +#include MALLOC_DECLARE(M_AESNI); @@ -182,6 +183,104 @@ } } +/* + * mixed endian increment, low 64bits stored in hi word to be compatible + * with _icm's BSWAP. + */ +static inline __m128i +nextc(__m128i x) +{ + const __m128i ONE = _mm_setr_epi32(0, 0, 1, 0); + const __m128i ZERO = _mm_setzero_si128(); + + x = _mm_add_epi64(x, ONE); + __m128i t = _mm_cmpeq_epi64(x, ZERO); + t = _mm_unpackhi_epi64(t, ZERO); + x = _mm_sub_epi64(x, t); + + return x; +} + +void +aesni_encrypt_icm(int rounds, const void *key_schedule, size_t len, + const uint8_t *from, uint8_t *to, const uint8_t iv[AES_BLOCK_LEN]) +{ + __m128i tot; + __m128i tmp1, tmp2, tmp3, tmp4; + __m128i tmp5, tmp6, tmp7, tmp8; + __m128i ctr1, ctr2, ctr3, ctr4; + __m128i ctr5, ctr6, ctr7, ctr8; + __m128i BSWAP_EPI64; + __m128i tout[8]; + struct blocks8 *top; + const struct blocks8 *blks; + size_t i, cnt; + + BSWAP_EPI64 = _mm_set_epi8(8,9,10,11,12,13,14,15,0,1,2,3,4,5,6,7); + + ctr1 = _mm_loadu_si128((__m128i*)iv); + ctr1 = _mm_shuffle_epi8(ctr1, BSWAP_EPI64); + + cnt = len / AES_BLOCK_LEN / 8; + for (i = 0; i < cnt; i++) { + tmp1 = _mm_shuffle_epi8(ctr1, BSWAP_EPI64); + ctr2 = nextc(ctr1); + tmp2 = _mm_shuffle_epi8(ctr2, BSWAP_EPI64); + ctr3 = nextc(ctr2); + tmp3 = _mm_shuffle_epi8(ctr3, BSWAP_EPI64); + ctr4 = nextc(ctr3); + tmp4 = _mm_shuffle_epi8(ctr4, BSWAP_EPI64); + ctr5 = nextc(ctr4); + tmp5 = _mm_shuffle_epi8(ctr5, BSWAP_EPI64); + ctr6 = nextc(ctr5); + tmp6 = _mm_shuffle_epi8(ctr6, BSWAP_EPI64); + ctr7 = nextc(ctr6); + tmp7 = _mm_shuffle_epi8(ctr7, BSWAP_EPI64); + ctr8 = nextc(ctr7); + tmp8 = _mm_shuffle_epi8(ctr8, BSWAP_EPI64); + ctr1 = nextc(ctr8); + + blks = (const struct blocks8 *)from; + top = (struct blocks8 *)to; + aesni_enc8(rounds - 1, key_schedule, tmp1, tmp2, tmp3, tmp4, + tmp5, tmp6, tmp7, tmp8, tout); + + top->blk[0] = blks->blk[0] ^ tout[0]; + top->blk[1] = blks->blk[1] ^ tout[1]; + top->blk[2] = blks->blk[2] ^ tout[2]; + top->blk[3] = blks->blk[3] ^ tout[3]; + top->blk[4] = blks->blk[4] ^ tout[4]; + top->blk[5] = blks->blk[5] ^ tout[5]; + top->blk[6] = blks->blk[6] ^ tout[6]; + top->blk[7] = blks->blk[7] ^ tout[7]; + + from += AES_BLOCK_LEN * 8; + to += AES_BLOCK_LEN * 8; + } + i *= 8; + cnt = len / AES_BLOCK_LEN; + for (; i < cnt; i++) { + tmp1 = _mm_shuffle_epi8(ctr1, BSWAP_EPI64); + ctr1 = nextc(ctr1); + + tot = aesni_enc(rounds - 1, key_schedule, tmp1); + + tot = tot ^ _mm_loadu_si128((const __m128i *)from); + _mm_storeu_si128((__m128i *)to, tot); + + from += AES_BLOCK_LEN; + to += AES_BLOCK_LEN; + } + + /* handle remaining partial round */ + if (len % AES_BLOCK_LEN != 0) { + tmp1 = _mm_shuffle_epi8(ctr1, BSWAP_EPI64); + tot = aesni_enc(rounds - 1, key_schedule, tmp1); + tot = tot ^ _mm_loadu_si128((const __m128i *)from); + memcpy(to, &tot, len % AES_BLOCK_LEN); + } +} + #define AES_XTS_BLOCKSIZE 16 #define AES_XTS_IVSIZE 8 #define AES_XTS_ALPHA 0x87 /* GF(2^128) generator polynomial */ @@ -342,6 +441,7 @@ switch (ses->algo) { case CRYPTO_AES_CBC: + case CRYPTO_AES_ICM: case CRYPTO_AES_NIST_GCM_16: switch (keylen) { case 128: @@ -354,7 +454,7 @@ ses->rounds = AES256_ROUNDS; break; default: - CRYPTDEB("invalid CBC/GCM key length"); + CRYPTDEB("invalid CBC/ICM/GCM key length"); return (EINVAL); } break; @@ -381,10 +481,9 @@ /* setup IV */ if (ses->algo == CRYPTO_AES_CBC || ses->algo == CRYPTO_AES_NIST_GCM_16) arc4rand(ses->iv, sizeof(ses->iv), 0); - else /* if (ses->algo == CRYPTO_AES_XTS) */ { + else if (ses->algo == CRYPTO_AES_XTS) aesni_set_enckey(key + keylen / 16, ses->xts_schedule, ses->rounds); - } return (0); } From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:51:05 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F03667E; Mon, 8 Sep 2014 04:51:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA930941 for ; Mon, 8 Sep 2014 04:50:10 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B9F731C61 for ; Mon, 8 Sep 2014 04:50:10 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884oANX023839 for ; Mon, 8 Sep 2014 04:50:10 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884oAxU023836 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:10 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:50:10 GMT Message-Id: <201409080450.s884oAxU023836@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199106 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:51:05 -0000 http://p4web.freebsd.org/@@1199106?ac=10 Change 1199106 by jmg@jmg_carbon2 on 2014/08/23 00:36:11 Fix various findings durning the review by Watson Ladd... Force that the IV (nonce) is provided for GCM and ICM.. using a random IV is bad as it can leak data... Make sure that we cannot go over the limits for GCM... All the limits for GCM are larger than the lengths provided, so just provide a CTASSERT that int never gets too large... Make sure we return an error when the tag does not match durning GCM decrypt... When the tag does not match we don't do the decrypt to prevent an attacker from passing bogus data to try to figure out what the cipher key is... Make sure that the user doesn't use different key sizes between the encryption and auth part for GCM... Sponsored by: FreeBSD Foundation Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#7 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#6 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#7 (text+ko) ==== @@ -904,7 +904,7 @@ struct cryptodesc *crde = NULL, *crda = NULL; int error; - if (caead->len > 256*1024-4) + if (caead->len > 256*1024-4 || caead->aadlen > 256*1024-4) return (E2BIG); if (cse->txform == NULL || cse->thash == NULL || caead->tag == NULL || ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#6 (text+ko) ==== @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -94,6 +95,10 @@ if (crd->crd_len % blks) return EINVAL; + if (crd->crd_alg == CRYPTO_AES_ICM && + (crd->crd_flags & CRD_F_IV_EXPLICIT) == 0) + return (EINVAL); + /* Initialize the IV */ if (crd->crd_flags & CRD_F_ENCRYPT) { /* IV explicitly provided ? */ @@ -590,6 +595,9 @@ return 0; } +CTASSERT(INT_MAX <= (1ll<<39) - 256); /* GCM: plain text < 2^39-256 */ +CTASSERT(INT_MAX <= (uint64_t)-1); /* GCM: associated data <= 2^64-1 */ + /* * Apply a combined encryption-authentication transformation */ @@ -646,6 +654,13 @@ if (crde == NULL || crda == NULL) return (EINVAL); + if (crde->crd_alg == CRYPTO_AES_NIST_GCM_16 && + (crde->crd_flags & CRD_F_IV_EXPLICIT) == 0) + return (EINVAL); + + if (crde->crd_klen != crda->crd_klen) + return (EINVAL); + /* Initialize the IV */ if (crde->crd_flags & CRD_F_ENCRYPT) { /* IV explicitly provided ? */ @@ -725,32 +740,36 @@ axf->Final(aalg, &ctx); /* Validate tag */ - crypto_copydata(crp->crp_flags, buf, crda->crd_inject, axf->hashsize, - uaalg); + if (!(crde->crd_flags & CRD_F_ENCRYPT)) { + crypto_copydata(crp->crp_flags, buf, crda->crd_inject, + axf->hashsize, uaalg); - r = 0; - for (i = 0; i < axf->hashsize; i++) - r |= aalg[i] ^ uaalg[i]; + r = 0; + for (i = 0; i < axf->hashsize; i++) + r |= aalg[i] ^ uaalg[i]; - if (r == 0) { - for (i = 0; i < crde->crd_len; i += blksz) { - len = MIN(crde->crd_len - i, blksz); - if (len < blksz) - bzero(blk, blksz); - crypto_copydata(crp->crp_flags, buf, - crde->crd_skip + i, len, blk); - if (!(crde->crd_flags & CRD_F_ENCRYPT)) { - exf->decrypt(swe->sw_kschedule, blk); + if (r == 0) { + /* tag matches, decrypt data */ + for (i = 0; i < crde->crd_len; i += blksz) { + len = MIN(crde->crd_len - i, blksz); + if (len < blksz) + bzero(blk, blksz); + crypto_copydata(crp->crp_flags, buf, + crde->crd_skip + i, len, blk); + if (!(crde->crd_flags & CRD_F_ENCRYPT)) { + exf->decrypt(swe->sw_kschedule, blk); + } + crypto_copyback(crp->crp_flags, buf, + crde->crd_skip + i, len, blk); } - crypto_copyback(crp->crp_flags, buf, - crde->crd_skip + i, len, blk); - } + } else + return (EBADMSG); + } else { + /* Inject the authentication data */ + crypto_copyback(crp->crp_flags, buf, crda->crd_inject, + axf->hashsize, aalg); } - /* Inject the authentication data */ - crypto_copyback(crp->crp_flags, buf, crda->crd_inject, axf->hashsize, - aalg); - return (0); } From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:51:04 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BE833EA; Mon, 8 Sep 2014 04:51:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A981938 for ; Mon, 8 Sep 2014 04:50:10 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 484E31C5E for ; Mon, 8 Sep 2014 04:50:10 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884oAMV023813 for ; Mon, 8 Sep 2014 04:50:10 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884oAPv023810 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:10 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:50:10 GMT Message-Id: <201409080450.s884oAPv023810@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199102 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:51:04 -0000 http://p4web.freebsd.org/@@1199102?ac=10 Change 1199102 by jhb@jhb_pippin on 2014/08/22 21:17:04 Fix mismerge that caused lock recursion. Affected files ... .. //depot/projects/smpng/sys/kern/kern_exec.c#154 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_exec.c#154 (text+ko) ==== @@ -614,18 +614,6 @@ VREF(binvp); /* - * Force the process to use this thread's credentials to avoid - * a race where another thread changed this process' credentials - * while we were waiting for all other threads to stop. - */ - PROC_LOCK(p); - if (td->td_ucred != p->p_ucred) { - oldcred = p->p_ucred; - p->p_ucred = crhold(td->td_ucred); - crfree(oldcred); - } - - /* * For security and other reasons, signal handlers cannot * be shared after an exec. The new process gets a copy of the old * handlers. In execsigs(), the new process will have its signals @@ -643,7 +631,19 @@ PROC_LOCK(p); if (oldsigacts) p->p_sigacts = newsigacts; + + /* + * Force the process to use this thread's credentials to avoid + * a race where another thread changed this process' credentials + * while we were waiting for all other threads to stop. + */ + if (td->td_ucred != p->p_ucred) { + oldcred = p->p_ucred; + p->p_ucred = crhold(td->td_ucred); + crfree(oldcred); + } oldcred = p->p_ucred; + /* Stop profiling */ stopprofclock(p); From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:51:16 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7950C894; Mon, 8 Sep 2014 04:51:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B6B8A3C for ; Mon, 8 Sep 2014 04:50:19 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7D28C1C9F for ; Mon, 8 Sep 2014 04:50:19 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884oJkx024655 for ; Mon, 8 Sep 2014 04:50:19 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884oJxE024652 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:19 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:50:19 GMT Message-Id: <201409080450.s884oJxE024652@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199151 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:51:16 -0000 http://p4web.freebsd.org/@@1199151?ac=10 Change 1199151 by jmg@jmg_carbon2 on 2014/08/24 02:48:49 simplify the code, don't unroll the iov, mbuf and linear bufs, instead, use the helper functions... Yes, this will probably be a bit slowerly, but, there are cleaner ways to do this... A better solution is to create a helper function that will properly pass blocks down, as the _apply function may pass partial blocks that will be continued in a future call... This can be done for both reinit'd and CBC blocked algos... Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#7 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#7 (text+ko) ==== @@ -83,7 +83,7 @@ swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf, int flags) { - unsigned char iv[EALG_MAX_BLOCK_LEN], blk[EALG_MAX_BLOCK_LEN], *idat; + unsigned char iv[EALG_MAX_BLOCK_LEN], blk[EALG_MAX_BLOCK_LEN]; unsigned char *ivp, piv[EALG_MAX_BLOCK_LEN]; struct enc_xform *exf; int i, k, j, blks; @@ -112,7 +112,7 @@ crypto_copyback(flags, buf, crd->crd_inject, blks, iv); } else { /* Decryption */ - /* IV explicitly provided ? */ + /* IV explicitly provided ? */ if (crd->crd_flags & CRD_F_IV_EXPLICIT) bcopy(crd->crd_iv, iv, blks); else { @@ -126,6 +126,7 @@ if (sw->sw_kschedule) exf->zerokey(&(sw->sw_kschedule)); + error = exf->setkey(&sw->sw_kschedule, crd->crd_key, crd->crd_klen / 8); if (error) @@ -134,333 +135,69 @@ ivp = iv; - /* - * xforms that provide a reinit method perform all IV - * handling themselves. - */ - if (exf->reinit) + if (exf->reinit) { + /* + * xforms that provide a reinit method perform all IV + * handling themselves. + */ exf->reinit(sw->sw_kschedule, iv); - if (flags & CRYPTO_F_IMBUF) { - struct mbuf *m = (struct mbuf *) buf; + for (i = crd->crd_skip; + i < crd->crd_skip + crd->crd_len; i += blks) { + crypto_copydata(flags, buf, i, blks, blk); - /* Find beginning of data */ - m = m_getptr(m, crd->crd_skip, &k); - if (m == NULL) - return EINVAL; + if (crd->crd_flags & CRD_F_ENCRYPT) + exf->encrypt(sw->sw_kschedule, blk); + else + exf->decrypt(sw->sw_kschedule, blk); - i = crd->crd_len; - - while (i > 0) { - /* - * If there's insufficient data at the end of - * an mbuf, we have to do some copying. - */ - if (m->m_len < k + blks && m->m_len != k) { - m_copydata(m, k, blks, blk); - - /* Actual encryption/decryption */ - if (exf->reinit) { - if (crd->crd_flags & CRD_F_ENCRYPT) { - exf->encrypt(sw->sw_kschedule, - blk); - } else { - exf->decrypt(sw->sw_kschedule, - blk); - } - } else if (crd->crd_flags & CRD_F_ENCRYPT) { - /* XOR with previous block */ - for (j = 0; j < blks; j++) - blk[j] ^= ivp[j]; - - exf->encrypt(sw->sw_kschedule, blk); - - /* - * Keep encrypted block for XOR'ing - * with next block - */ - bcopy(blk, iv, blks); - ivp = iv; - } else { /* decrypt */ - /* - * Keep encrypted block for XOR'ing - * with next block - */ - if (ivp == iv) - bcopy(blk, piv, blks); - else - bcopy(blk, iv, blks); - - exf->decrypt(sw->sw_kschedule, blk); - - /* XOR with previous block */ - for (j = 0; j < blks; j++) - blk[j] ^= ivp[j]; - - if (ivp == iv) - bcopy(piv, iv, blks); - else - ivp = iv; - } - - /* Copy back decrypted block */ - m_copyback(m, k, blks, blk); - - /* Advance pointer */ - m = m_getptr(m, k + blks, &k); - if (m == NULL) - return EINVAL; - - i -= blks; - - /* Could be done... */ - if (i == 0) - break; - } - - /* Skip possibly empty mbufs */ - if (k == m->m_len) { - for (m = m->m_next; m && m->m_len == 0; - m = m->m_next) - ; - k = 0; - } - - /* Sanity check */ - if (m == NULL) - return EINVAL; - - /* - * Warning: idat may point to garbage here, but - * we only use it in the while() loop, only if - * there are indeed enough data. - */ - idat = mtod(m, unsigned char *) + k; - - while (m->m_len >= k + blks && i > 0) { - if (exf->reinit) { - if (crd->crd_flags & CRD_F_ENCRYPT) { - exf->encrypt(sw->sw_kschedule, - idat); - } else { - exf->decrypt(sw->sw_kschedule, - idat); - } - } else if (crd->crd_flags & CRD_F_ENCRYPT) { - /* XOR with previous block/IV */ - for (j = 0; j < blks; j++) - idat[j] ^= ivp[j]; - - exf->encrypt(sw->sw_kschedule, idat); - ivp = idat; - } else { /* decrypt */ - /* - * Keep encrypted block to be used - * in next block's processing. - */ - if (ivp == iv) - bcopy(idat, piv, blks); - else - bcopy(idat, iv, blks); - - exf->decrypt(sw->sw_kschedule, idat); - - /* XOR with previous block/IV */ - for (j = 0; j < blks; j++) - idat[j] ^= ivp[j]; - - if (ivp == iv) - bcopy(piv, iv, blks); - else - ivp = iv; - } - - idat += blks; - k += blks; - i -= blks; - } + crypto_copyback(flags, buf, i, blks, blk); } + } else { + for (i = crd->crd_skip; + i < crd->crd_skip + crd->crd_len; i += blks) { + crypto_copydata(flags, buf, i, blks, blk); - return 0; /* Done with mbuf encryption/decryption */ - } else if (flags & CRYPTO_F_IOV) { - struct uio *uio = (struct uio *) buf; - struct iovec *iov; + if (crd->crd_flags & CRD_F_ENCRYPT) { + /* XOR with previous block */ + for (k = 0; k < blks; k++) + blk[k] ^= ivp[k]; - /* Find beginning of data */ - iov = cuio_getptr(uio, crd->crd_skip, &k); - if (iov == NULL) - return EINVAL; + exf->encrypt(sw->sw_kschedule, blk); - i = crd->crd_len; - - while (i > 0) { - /* - * If there's insufficient data at the end of - * an iovec, we have to do some copying. - */ - if (iov->iov_len < k + blks && iov->iov_len != k) { - cuio_copydata(uio, k, blks, blk); - - /* Actual encryption/decryption */ - if (exf->reinit) { - if (crd->crd_flags & CRD_F_ENCRYPT) { - exf->encrypt(sw->sw_kschedule, - blk); - } else { - exf->decrypt(sw->sw_kschedule, - blk); - } - } else if (crd->crd_flags & CRD_F_ENCRYPT) { - /* XOR with previous block */ - for (j = 0; j < blks; j++) - blk[j] ^= ivp[j]; - - exf->encrypt(sw->sw_kschedule, blk); - - /* - * Keep encrypted block for XOR'ing - * with next block - */ + /* + * Keep encrypted block for XOR'ing + * with next block + */ + bcopy(blk, iv, blks); + ivp = iv; + } else { /* decrypt */ + /* + * Keep encrypted block for XOR'ing + * with next block + */ + if (ivp == iv) + bcopy(blk, piv, blks); + else bcopy(blk, iv, blks); - ivp = iv; - } else { /* decrypt */ - /* - * Keep encrypted block for XOR'ing - * with next block - */ - if (ivp == iv) - bcopy(blk, piv, blks); - else - bcopy(blk, iv, blks); - exf->decrypt(sw->sw_kschedule, blk); + exf->decrypt(sw->sw_kschedule, blk); - /* XOR with previous block */ - for (j = 0; j < blks; j++) - blk[j] ^= ivp[j]; + /* XOR with previous block */ + for (j = 0; j < blks; j++) + blk[j] ^= ivp[j]; - if (ivp == iv) - bcopy(piv, iv, blks); - else - ivp = iv; - } - - /* Copy back decrypted block */ - cuio_copyback(uio, k, blks, blk); - - /* Advance pointer */ - iov = cuio_getptr(uio, k + blks, &k); - if (iov == NULL) - return EINVAL; - - i -= blks; - - /* Could be done... */ - if (i == 0) - break; - } - - /* - * Warning: idat may point to garbage here, but - * we only use it in the while() loop, only if - * there are indeed enough data. - */ - idat = (char *)iov->iov_base + k; - - while (iov->iov_len >= k + blks && i > 0) { - if (exf->reinit) { - if (crd->crd_flags & CRD_F_ENCRYPT) { - exf->encrypt(sw->sw_kschedule, - idat); - } else { - exf->decrypt(sw->sw_kschedule, - idat); - } - } else if (crd->crd_flags & CRD_F_ENCRYPT) { - /* XOR with previous block/IV */ - for (j = 0; j < blks; j++) - idat[j] ^= ivp[j]; - - exf->encrypt(sw->sw_kschedule, idat); - ivp = idat; - } else { /* decrypt */ - /* - * Keep encrypted block to be used - * in next block's processing. - */ - if (ivp == iv) - bcopy(idat, piv, blks); - else - bcopy(idat, iv, blks); - - exf->decrypt(sw->sw_kschedule, idat); - - /* XOR with previous block/IV */ - for (j = 0; j < blks; j++) - idat[j] ^= ivp[j]; - - if (ivp == iv) - bcopy(piv, iv, blks); - else - ivp = iv; - } - - idat += blks; - k += blks; - i -= blks; - } - if (k == iov->iov_len) { - iov++; - k = 0; - } - } - - return 0; /* Done with iovec encryption/decryption */ - } else { /* contiguous buffer */ - if (exf->reinit) { - for (i = crd->crd_skip; - i < crd->crd_skip + crd->crd_len; i += blks) { - if (crd->crd_flags & CRD_F_ENCRYPT) - exf->encrypt(sw->sw_kschedule, buf + i); + if (ivp == iv) + bcopy(piv, iv, blks); else - exf->decrypt(sw->sw_kschedule, buf + i); - } - } else if (crd->crd_flags & CRD_F_ENCRYPT) { - for (i = crd->crd_skip; - i < crd->crd_skip + crd->crd_len; i += blks) { - /* XOR with the IV/previous block, as appropriate. */ - if (i == crd->crd_skip) - for (k = 0; k < blks; k++) - buf[i + k] ^= ivp[k]; - else - for (k = 0; k < blks; k++) - buf[i + k] ^= buf[i + k - blks]; - exf->encrypt(sw->sw_kschedule, buf + i); + ivp = iv; } - } else { /* Decrypt */ - /* - * Start at the end, so we don't need to keep the encrypted - * block as the IV for the next block. - */ - for (i = crd->crd_skip + crd->crd_len - blks; - i >= crd->crd_skip; i -= blks) { - exf->decrypt(sw->sw_kschedule, buf + i); - /* XOR with the IV/previous block, as appropriate */ - if (i == crd->crd_skip) - for (k = 0; k < blks; k++) - buf[i + k] ^= ivp[k]; - else - for (k = 0; k < blks; k++) - buf[i + k] ^= buf[i + k - blks]; - } + crypto_copyback(flags, buf, i, blks, blk); } - - return 0; /* Done with contiguous buffer encryption/decryption */ } - /* Unreachable */ - return EINVAL; + return 0; } static void From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:51:55 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D213CCDB; Mon, 8 Sep 2014 04:51:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3024CD45 for ; Mon, 8 Sep 2014 04:50:39 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1A3BD1D45 for ; Mon, 8 Sep 2014 04:50:39 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884ocw0025700 for ; Mon, 8 Sep 2014 04:50:38 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884ocoN025697 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:38 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:50:38 GMT Message-Id: <201409080450.s884ocoN025697@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199310 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:51:56 -0000 http://p4web.freebsd.org/@@1199310?ac=10 Change 1199310 by jmg@jmg_carbon2 on 2014/08/25 18:30:41 check the correct register.. I didn't notice because my test machine has the CLFLUSH feature, but Intel processors don't... Found by: rrs Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#5 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#5 (text+ko) ==== @@ -84,7 +84,7 @@ return (EINVAL); } - if ((cpu_feature & CPUID2_SSE41) == 0) { + if ((cpu_feature2 & CPUID2_SSE41) == 0) { device_printf(dev, "No SSE4.1 support.\n"); return (EINVAL); } From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:02 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 96DCBE9C; Mon, 8 Sep 2014 04:52:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1C3A5FCB for ; Mon, 8 Sep 2014 04:50:46 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C10911D67 for ; Mon, 8 Sep 2014 04:50:45 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884ojhx025892 for ; Mon, 8 Sep 2014 04:50:45 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884ojvZ025889 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:45 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:50:45 GMT Message-Id: <201409080450.s884ojvZ025889@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199336 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:02 -0000 http://p4web.freebsd.org/@@1199336?ac=10 Change 1199336 by jhb@jhb_ralph on 2014/08/25 21:05:38 - Export the xattr variant of smap structures. - Export the EFI memory map. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#127 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#127 (text+ko) ==== @@ -2097,8 +2097,10 @@ smap_sysctl_handler(SYSCTL_HANDLER_ARGS) { struct bios_smap *smapbase; + struct bios_smap_xattr smap; caddr_t kmdp; - uint32_t smapsize; + uint32_t *smapattr; + int count, error, i; /* Retrieve the system memory map from the loader. */ kmdp = preload_search_by_type("elf kernel"); @@ -2108,11 +2110,44 @@ MODINFO_METADATA | MODINFOMD_SMAP); if (smapbase == NULL) return (0); - smapsize = *((u_int32_t *)smapbase - 1); - return (SYSCTL_OUT(req, smapbase, smapsize)); + smapattr = (uint32_t *) = preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_SMAP_XATTR); + count = *((u_int32_t *)smapbase - 1) / sizeof(*smapbase); + error = 0; + for (i = 0; i < count; i++) { + smap.base = smapbase[i].base; + smap.length = smapbase[i].length; + smap.type = smapbase[i].type; + if (smapattr != NULL) + smap.xattr = smapattr[i]; + else + smap.xattr = 0; + error = SYSCTL_OUT(req, &smap, sizeof(smap)); + } + return (error); } SYSCTL_PROC(_machdep, OID_AUTO, smap, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0, - smap_sysctl_handler, "S,bios_smap", "Raw BIOS SMAP data"); + smap_sysctl_handler, "S,bios_smap_xattr", "Raw BIOS SMAP data"); + +static int +efi_map_sysctl_handler(SYSCTL_HANDLER_ARGS) +{ + struct efi_map_header *efihdr; + caddr_t kmdp; + uint32_t *efisize; + + kmdp = preload_search_by_type("elf kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf64 kernel"); + efihdr = (struct efi_map_header *)preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_EFI_MAP); + if (efihdr == NULL) + return (0); + efisize = *((uint32_t *)efihdr - 1); + return (SYSCTL_OUT(req, efihdr, efisize)); +} +SYSCTL_PROC(_machdep, OID_AUTO, efi_map, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0, + efi_map_sysctl_handler, "S,efi_map_header", "Raw EFI Memory Map"); void spinlock_enter(void) From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:13 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6EED2179; Mon, 8 Sep 2014 04:52:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1257B132 for ; Mon, 8 Sep 2014 04:50:54 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D338C1D96 for ; Mon, 8 Sep 2014 04:50:53 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884orDY026187 for ; Mon, 8 Sep 2014 04:50:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884ordg026184 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:53 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:50:53 GMT Message-Id: <201409080450.s884ordg026184@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199378 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:13 -0000 http://p4web.freebsd.org/@@1199378?ac=10 Change 1199378 by jhb@jhb_jhbbsd on 2014/08/26 16:04:20 First cut at providing fake st_dev/st_ino for POSIX shm fds similar to pipes (except that they aren't allocated lazily for simplicity) Affected files ... .. //depot/projects/smpng/sys/kern/uipc_shm.c#24 edit Differences ... ==== //depot/projects/smpng/sys/kern/uipc_shm.c#24 (text+ko) ==== @@ -101,6 +101,8 @@ static struct sx shm_dict_lock; static struct mtx shm_timestamp_lock; static u_long shm_hash; +static struct unrhdr *shm_ino_unr; +static dev_t shm_dev_ino; #define SHM_HASH(fnv) (&shm_dictionary[(fnv) & shm_hash]) @@ -408,6 +410,8 @@ sb->st_uid = shmfd->shm_uid; sb->st_gid = shmfd->shm_gid; mtx_unlock(&shm_timestamp_lock); + sb->st_dev = shm_dev_ino; + sb->st_ino = shmfd->shm_ino; return (0); } @@ -539,6 +543,7 @@ shm_alloc(struct ucred *ucred, mode_t mode) { struct shmfd *shmfd; + int ino; shmfd = malloc(sizeof(*shmfd), M_SHMFD, M_WAITOK | M_ZERO); shmfd->shm_size = 0; @@ -555,6 +560,11 @@ vfs_timestamp(&shmfd->shm_birthtime); shmfd->shm_atime = shmfd->shm_mtime = shmfd->shm_ctime = shmfd->shm_birthtime; + ino = alloc_unr(shm_ino_unr); + if (ino == -1) + shmfd->shm_ino = 0; + else + shmfd->shm_ino = ino; refcount_init(&shmfd->shm_refs, 1); mtx_init(&shmfd->shm_mtx, "shmrl", NULL, MTX_DEF); rangelock_init(&shmfd->shm_rl); @@ -585,6 +595,8 @@ rangelock_destroy(&shmfd->shm_rl); mtx_destroy(&shmfd->shm_mtx); vm_object_deallocate(shmfd->shm_object); + if (shmfd->shm_ino != 0) + free_unr(shm_ino_unr, shmfd->shm_ino); free(shmfd, M_SHMFD); } } @@ -617,14 +629,18 @@ * the mappings in a hash table. */ static void -shm_dict_init(void *arg) +shm_init(void *arg) { mtx_init(&shm_timestamp_lock, "shm timestamps", NULL, MTX_DEF); sx_init(&shm_dict_lock, "shm dictionary"); shm_dictionary = hashinit(1024, M_SHMFD, &shm_hash); + shm_ino_unr = new_unrhdr(1, INT32_MAX, NULL); + KASSERT(shm_ino_unr != NULL, ("shm fake inodes not initialized")); + shm_dev_ino = devfs_alloc_cdp_inode(); + KASSERT(shm_dev_ino > 0, ("shm dev inode not initialized")); } -SYSINIT(shm_dict_init, SI_SUB_SYSV_SHM, SI_ORDER_ANY, shm_dict_init, NULL); +SYSINIT(shm_init, SI_SUB_SYSV_SHM, SI_ORDER_ANY, shm_init, NULL); static struct shmfd * shm_lookup(char *path, Fnv32_t fnv) From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:18 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A51D835D; Mon, 8 Sep 2014 04:52:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CEAE177 for ; Mon, 8 Sep 2014 04:50:56 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69EC61DAC for ; Mon, 8 Sep 2014 04:50:56 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884ou7h026324 for ; Mon, 8 Sep 2014 04:50:56 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884ouMR026321 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:56 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:50:56 GMT Message-Id: <201409080450.s884ouMR026321@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199400 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:18 -0000 http://p4web.freebsd.org/@@1199400?ac=10 Change 1199400 by jmg@jmg_carbon2 on 2014/08/26 23:26:29 add start of a new man page describing how to use the various implemented OpenCrypto modes... Sponsored by: FreeBSD Foundation Affected files ... .. //depot/projects/opencrypto/share/man/man4/crypto.4#3 edit .. //depot/projects/opencrypto/share/man/man7/crypto.7#1 add .. //depot/projects/opencrypto/share/man/man9/crypto.9#3 edit Differences ... ==== //depot/projects/opencrypto/share/man/man4/crypto.4#3 (text+ko) ==== @@ -374,6 +374,7 @@ .Xr padlock 4 , .Xr safe 4 , .Xr ubsec 4 , +.Xr crypto 7 , .Xr geli 8 , .Xr crypto 9 .Sh HISTORY ==== //depot/projects/opencrypto/share/man/man9/crypto.9#3 (text+ko) ==== @@ -650,6 +650,7 @@ .Sh SEE ALSO .Xr crypto 4 , .Xr ipsec 4 , +.Xr crypto 7 , .Xr malloc 9 , .Xr sleep 9 .Sh HISTORY From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:29 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A13D5B2; Mon, 8 Sep 2014 04:52:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CC14F3AA for ; Mon, 8 Sep 2014 04:51:01 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A26BF1DDB for ; Mon, 8 Sep 2014 04:51:01 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p1rZ026634 for ; Mon, 8 Sep 2014 04:51:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p1Ja026631 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:01 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:01 GMT Message-Id: <201409080451.s884p1Ja026631@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199442 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:29 -0000 http://p4web.freebsd.org/@@1199442?ac=10 Change 1199442 by jhb@jhb_jhbbsd on 2014/08/27 20:36:19 More error checking for mmap(). Affected files ... .. //depot/projects/smpng/sys/vm/vm_mmap.c#105 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_mmap.c#105 (text+ko) ==== @@ -213,7 +213,7 @@ addr = (vm_offset_t) uap->addr; size = uap->len; - prot = uap->prot & VM_PROT_ALL; + prot = uap->prot; flags = uap->flags; pos = uap->pos; @@ -246,6 +246,14 @@ } if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL) return (EINVAL); + if ((prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_NONE)) != 0) + return (EINVAL); + + /* Exactly one of MAP_SHARED or MAP_PRIVATE must be given. */ + if ((flags & (MAP_SHARED | MAP_PRIVATE)) == 0 || + (flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE)) + return (EINVAL); + /* * Align the file position to a page boundary, From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:31 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8689DA65; Mon, 8 Sep 2014 04:52:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 10BA03C8 for ; Mon, 8 Sep 2014 04:51:03 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D51CF1E51 for ; Mon, 8 Sep 2014 04:51:02 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p2rg026680 for ; Mon, 8 Sep 2014 04:51:02 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p2Fh026676 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:02 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:51:02 GMT Message-Id: <201409080451.s884p2Fh026676@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199449 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:31 -0000 http://p4web.freebsd.org/@@1199449?ac=10 Change 1199449 by jmg@jmg_carbon2 on 2014/08/27 22:59:03 document that we support ICM... use encflag, since we have it... directly test the return, we don't need it else where... comment out some debugging... don't copy back the IV.. if we have a block < 16 bytes, it'll panic the machine... I'm not sure if this is even useful, as the next bit of lines overwrites it... this will need more investigation... also, only copyback data if we didn't get an error (tag matched).. We only decrypt when a tag match, so we would have been leaking data to userland... Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#6 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#6 (text+ko) ==== @@ -89,7 +89,7 @@ return (EINVAL); } - device_set_desc_copy(dev, "AES-CBC,AES-XTS,AES-GCM"); + device_set_desc_copy(dev, "AES-CBC,AES-XTS,AES-GCM,AES-ICM"); return (0); } @@ -459,7 +459,6 @@ uint8_t *buf, *authbuf; int error, allocated, authallocated; int ivlen, encflag; - int r; encflag = (enccrd->crd_flags & CRD_F_ENCRYPT) == CRD_F_ENCRYPT; @@ -511,7 +510,7 @@ /* Setup ses->iv */ bzero(ses->iv, sizeof ses->iv); /*printf("crd_flags: %#x, ivlen: %d, iv: ", enccrd->crd_flags, ivlen);*/ - if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0) { + if (encflag) { if ((enccrd->crd_flags & CRD_F_IV_EXPLICIT) != 0) bcopy(enccrd->crd_iv, ses->iv, ivlen); if ((enccrd->crd_flags & CRD_F_IV_PRESENT) == 0) @@ -579,10 +578,10 @@ enccrd->crd_len, authcrd->crd_len, ivlen, ses->enc_schedule, ses->rounds); else { - r = AES_GCM_decrypt(buf, buf, authbuf, ses->iv, tag, + if (!AES_GCM_decrypt(buf, buf, authbuf, ses->iv, tag, enccrd->crd_len, authcrd->crd_len, ivlen, - ses->enc_schedule, ses->rounds); - /*printf("dec r: %d\n", r);*/ + ses->enc_schedule, ses->rounds)) + error = EBADMSG; } break; } @@ -592,12 +591,13 @@ enccrd->crd_len, buf); /* OpenBSD doesn't copy this back. Why not? */ - if ((enccrd->crd_flags & CRD_F_ENCRYPT) != 0) + /*printf("t: %d, %d, %d, %d\n", enccrd->crd_skip, enccrd->crd_len, enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN, AES_BLOCK_LEN);*/ + if (encflag && 0) crypto_copydata(crp->crp_flags, crp->crp_buf, enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN, AES_BLOCK_LEN, ses->iv); - if (authcrd != NULL) { + if (!error && authcrd != NULL) { crypto_copyback(crp->crp_flags, crp->crp_buf, authcrd->crd_inject, GMAC_DIGEST_LEN, tag); } From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:35 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 182E7C07; Mon, 8 Sep 2014 04:52:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D72165A0 for ; Mon, 8 Sep 2014 04:51:04 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 912321E6A for ; Mon, 8 Sep 2014 04:51:04 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p4Ns026785 for ; Mon, 8 Sep 2014 04:51:04 GMT (envelope-from brueffer@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p4Up026782 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:04 GMT (envelope-from brueffer@freebsd.org) Date: Mon, 8 Sep 2014 04:51:04 GMT Message-Id: <201409080451.s884p4Up026782@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to brueffer@freebsd.org using -f From: Christian Brueffer Subject: PERFORCE change 1199465 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:35 -0000 http://p4web.freebsd.org/@@1199465?ac=10 Change 1199465 by brueffer@brueffer_freefall on 2014/08/28 12:05:26 Unlock the right lock. The adist_remote_lock is not held in this place, whereas the adist_recv_list_lock lock is and is picked up during the next iteration. Submitted by: ed Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#5 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#4 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditdistd/sender.c#5 $ */ #include @@ -643,7 +643,7 @@ * we can use that. */ if (TAILQ_EMPTY(&adist_recv_list)) { - rw_unlock(&adist_remote_lock); + mtx_unlock(&adist_recv_list_lock); continue; } mtx_unlock(&adist_recv_list_lock); From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:29 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8706668C; Mon, 8 Sep 2014 04:52:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E10A63AB for ; Mon, 8 Sep 2014 04:51:01 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C55C81DDD for ; Mon, 8 Sep 2014 04:51:01 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p1it026641 for ; Mon, 8 Sep 2014 04:51:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p1xH026637 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:01 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:01 GMT Message-Id: <201409080451.s884p1xH026637@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199443 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:29 -0000 http://p4web.freebsd.org/@@1199443?ac=10 Change 1199443 by jhb@jhb_jhbbsd on 2014/08/27 20:57:57 Add machdep.bootmethod for i386/pc98. Affected files ... .. //depot/projects/smpng/sys/i386/i386/machdep.c#188 edit .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#65 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/machdep.c#188 (text+ko) ==== @@ -1639,6 +1639,10 @@ SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev, CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)"); +static char bootmethod[16] = "BIOS"; +SYSCTL_STRING(_machdep, OID_AUTO, bootmethod, CTLFLAG_RD, bootmethod, 0, + "System firmware boot method"); + /* * Initialize 386 and configure to run kernel */ ==== //depot/projects/smpng/sys/pc98/pc98/machdep.c#65 (text+ko) ==== @@ -1444,6 +1444,10 @@ SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev, CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)"); +static char bootmethod[16] = "BIOS"; +SYSCTL_STRING(_machdep, OID_AUTO, bootmethod, CTLFLAG_RD, bootmethod, 0, + "System firmware boot method"); + /* * Initialize 386 and configure to run kernel */ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:30 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4706977C; Mon, 8 Sep 2014 04:52:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8813B3B6 for ; Mon, 8 Sep 2014 04:51:02 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2CCF91E46 for ; Mon, 8 Sep 2014 04:51:02 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p1ie026660 for ; Mon, 8 Sep 2014 04:51:01 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p1MP026657 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:01 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:01 GMT Message-Id: <201409080451.s884p1MP026657@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199446 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:30 -0000 http://p4web.freebsd.org/@@1199446?ac=10 Change 1199446 by jhb@jhb_jhbbsd on 2014/08/27 21:25:58 Drop this. Affected files ... .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#66 edit Differences ... ==== //depot/projects/smpng/sys/pc98/pc98/machdep.c#66 (text+ko) ==== @@ -1444,10 +1444,6 @@ SYSCTL_ULONG(_machdep, OID_AUTO, guessed_bootdev, CTLFLAG_RD, &bootdev, 0, "Maybe the Boot device (not in struct cdev *format)"); -static char bootmethod[16] = "BIOS"; -SYSCTL_STRING(_machdep, OID_AUTO, bootmethod, CTLFLAG_RD, bootmethod, 0, - "System firmware boot method"); - /* * Initialize 386 and configure to run kernel */ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:35 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55E32CE9; Mon, 8 Sep 2014 04:52:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E7A555A2 for ; Mon, 8 Sep 2014 04:51:04 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BEFC31E6D for ; Mon, 8 Sep 2014 04:51:04 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p4PK026792 for ; Mon, 8 Sep 2014 04:51:04 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p42k026789 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:04 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:04 GMT Message-Id: <201409080451.s884p42k026789@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199466 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:35 -0000 http://p4web.freebsd.org/@@1199466?ac=10 Change 1199466 by jhb@jhb_ralph on 2014/08/28 12:34:36 Port the smap handler to i386. Affected files ... .. //depot/projects/smpng/sys/i386/i386/machdep.c#189 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/machdep.c#189 (text+ko) ==== @@ -3122,6 +3122,42 @@ pcpu->pc_acpi_id = 0xffffffff; } +static int +smap_sysctl_handler(SYSCTL_HANDLER_ARGS) +{ + struct bios_smap *smapbase; + struct bios_smap_xattr smap; + caddr_t kmdp; + uint32_t *smapattr; + int count, error, i; + + /* Retrieve the system memory map from the loader. */ + kmdp = preload_search_by_type("elf kernel"); + if (kmdp == NULL) + kmdp = preload_search_by_type("elf32 kernel"); + smapbase = (struct bios_smap *)preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_SMAP); + if (smapbase == NULL) + return (0); + smapattr = (uint32_t *) = preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_SMAP_XATTR); + count = *((u_int32_t *)smapbase - 1) / sizeof(*smapbase); + error = 0; + for (i = 0; i < count; i++) { + smap.base = smapbase[i].base; + smap.length = smapbase[i].length; + smap.type = smapbase[i].type; + if (smapattr != NULL) + smap.xattr = smapattr[i]; + else + smap.xattr = 0; + error = SYSCTL_OUT(req, &smap, sizeof(smap)); + } + return (error); +} +SYSCTL_PROC(_machdep, OID_AUTO, smap, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0, + smap_sysctl_handler, "S,bios_smap_xattr", "Raw BIOS SMAP data"); + void spinlock_enter(void) { From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:41 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B127E68; Mon, 8 Sep 2014 04:52:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A3227AF for ; Mon, 8 Sep 2014 04:51:08 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 17B121E93 for ; Mon, 8 Sep 2014 04:51:08 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p7PK026963 for ; Mon, 8 Sep 2014 04:51:07 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p7mo026960 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:07 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:51:07 GMT Message-Id: <201409080451.s884p7mo026960@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199492 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:41 -0000 http://p4web.freebsd.org/@@1199492?ac=10 Change 1199492 by jmg@jmg_carbon2 on 2014/08/29 00:27:25 This is only useful for CBC... I had it commented out as for ICM it would pass a negative offset in, since ICM allows a size smaller than AES block size... Sponsered by: FreeBSD Foundation Affected files ... .. //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#7 edit Differences ... ==== //depot/projects/opencrypto/sys/crypto/aesni/aesni.c#7 (text+ko) ==== @@ -590,12 +590,13 @@ crypto_copyback(crp->crp_flags, crp->crp_buf, enccrd->crd_skip, enccrd->crd_len, buf); - /* OpenBSD doesn't copy this back. Why not? */ + /* + * OpenBSD doesn't copy this back. This primes the IV for the next + * chain. Why do we not do it for decrypt? + */ /*printf("t: %d, %d, %d, %d\n", enccrd->crd_skip, enccrd->crd_len, enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN, AES_BLOCK_LEN);*/ - if (encflag && 0) - crypto_copydata(crp->crp_flags, crp->crp_buf, - enccrd->crd_skip + enccrd->crd_len - AES_BLOCK_LEN, - AES_BLOCK_LEN, ses->iv); + if (encflag && enccrd->crd_alg == CRYPTO_AES_CBC) + bcopy(buf + enccrd->crd_len - AES_BLOCK_LEN, ses->iv, AES_BLOCK_LEN); if (!error && authcrd != NULL) { crypto_copyback(crp->crp_flags, crp->crp_buf, From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:30 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1F6D952; Mon, 8 Sep 2014 04:52:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E570E3C1 for ; Mon, 8 Sep 2014 04:51:02 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A806F1E4E for ; Mon, 8 Sep 2014 04:51:02 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p296026673 for ; Mon, 8 Sep 2014 04:51:02 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p2Me026670 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:02 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:51:02 GMT Message-Id: <201409080451.s884p2Me026670@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199448 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:31 -0000 http://p4web.freebsd.org/@@1199448?ac=10 Change 1199448 by jmg@jmg_carbon2 on 2014/08/27 22:53:41 drop extra newline introduced in previous commit.. Affected files ... .. //depot/projects/opencrypto/sys/sys/libkern.h#3 edit Differences ... ==== //depot/projects/opencrypto/sys/sys/libkern.h#3 (text+ko) ==== @@ -81,7 +81,6 @@ void arc4rand(void *ptr, u_int len, int reseed); int bcmp(const void *, const void *, size_t); int timingsafe_bcmp(const void *, const void *, size_t); - void *bsearch(const void *, const void *, size_t, size_t, int (*)(const void *, const void *)); #ifndef HAVE_INLINE_FFS From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:30 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83CDC87B; Mon, 8 Sep 2014 04:52:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D57C53C0 for ; Mon, 8 Sep 2014 04:51:02 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 64E8A1E47 for ; Mon, 8 Sep 2014 04:51:02 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884p2kC026667 for ; Mon, 8 Sep 2014 04:51:02 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884p2T4026663 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:02 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:51:02 GMT Message-Id: <201409080451.s884p2T4026663@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199447 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:30 -0000 http://p4web.freebsd.org/@@1199447?ac=10 Change 1199447 by jmg@jmg_carbon2 on 2014/08/27 22:48:16 import OpenBSD's timingsafe_bcmp and use that for tag comparision... Affected files ... .. //depot/projects/opencrypto/sys/conf/files#6 edit .. //depot/projects/opencrypto/sys/libkern/timingsafe_bcmp.c#1 add .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#8 edit .. //depot/projects/opencrypto/sys/sys/libkern.h#2 edit Differences ... ==== //depot/projects/opencrypto/sys/conf/files#6 (text+ko) ==== @@ -3177,6 +3177,7 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard +libkern/timingsafe_bcmp.c standard net/bpf.c standard net/bpf_buffer.c optional bpf net/bpf_jitter.c optional bpf_jitter ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#8 (text+ko) ==== @@ -481,10 +481,7 @@ crypto_copydata(crp->crp_flags, buf, crda->crd_inject, axf->hashsize, uaalg); - r = 0; - for (i = 0; i < axf->hashsize; i++) - r |= aalg[i] ^ uaalg[i]; - + r = timingsafe_bcmp(aalg, uaalg, axf->hashsize); if (r == 0) { /* tag matches, decrypt data */ for (i = 0; i < crde->crd_len; i += blksz) { ==== //depot/projects/opencrypto/sys/sys/libkern.h#2 (text+ko) ==== @@ -80,6 +80,8 @@ uint32_t arc4random(void); void arc4rand(void *ptr, u_int len, int reseed); int bcmp(const void *, const void *, size_t); +int timingsafe_bcmp(const void *, const void *, size_t); + void *bsearch(const void *, const void *, size_t, size_t, int (*)(const void *, const void *)); #ifndef HAVE_INLINE_FFS From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:51 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9EAA01315; Mon, 8 Sep 2014 04:52:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 31B9F9E9 for ; Mon, 8 Sep 2014 04:51:22 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 120A81ECF for ; Mon, 8 Sep 2014 04:51:22 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pLYh027265 for ; Mon, 8 Sep 2014 04:51:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pLX5027262 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:21 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:21 GMT Message-Id: <201409080451.s884pLX5027262@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199531 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:51 -0000 http://p4web.freebsd.org/@@1199531?ac=10 Change 1199531 by jhb@jhb_ralph on 2014/08/29 17:22:48 Fix coredumps after recent changes. Affected files ... .. //depot/projects/smpng/sys/kern/imgact_elf.c#91 edit Differences ... ==== //depot/projects/smpng/sys/kern/imgact_elf.c#91 (text+ko) ==== @@ -1783,8 +1783,10 @@ KASSERT(*sizep == size, ("invalid size")); structsize = sizeof(elf_kinfo_proc_t); sbuf_bcat(sb, &structsize, sizeof(structsize)); + sx_slock(&proctree_lock); PROC_LOCK(p); kern_proc_out(p, sb, ELF_KERN_PROC_MASK); + sx_sunlock(&proctree_lock); } *sizep = size; } From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:50 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C133C1137; Mon, 8 Sep 2014 04:52:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 039B69E7 for ; Mon, 8 Sep 2014 04:51:22 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DD91A1ECD for ; Mon, 8 Sep 2014 04:51:21 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pLxg027252 for ; Mon, 8 Sep 2014 04:51:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pLCt027249 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:21 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:21 GMT Message-Id: <201409080451.s884pLCt027249@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199529 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:51 -0000 http://p4web.freebsd.org/@@1199529?ac=10 Change 1199529 by jhb@jhb_pippin on 2014/08/29 16:53:24 Compile. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#128 edit .. //depot/projects/smpng/sys/kern/uipc_shm.c#25 edit .. //depot/projects/smpng/sys/sys/mman.h#22 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#128 (text+ko) ==== @@ -2110,9 +2110,9 @@ MODINFO_METADATA | MODINFOMD_SMAP); if (smapbase == NULL) return (0); - smapattr = (uint32_t *) = preload_search_info(kmdp, + smapattr = (uint32_t *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_SMAP_XATTR); - count = *((u_int32_t *)smapbase - 1) / sizeof(*smapbase); + count = *((uint32_t *)smapbase - 1) / sizeof(*smapbase); error = 0; for (i = 0; i < count; i++) { smap.base = smapbase[i].base; @@ -2134,7 +2134,7 @@ { struct efi_map_header *efihdr; caddr_t kmdp; - uint32_t *efisize; + uint32_t efisize; kmdp = preload_search_by_type("elf kernel"); if (kmdp == NULL) ==== //depot/projects/smpng/sys/kern/uipc_shm.c#25 (text+ko) ==== @@ -49,6 +49,7 @@ #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/sys/mman.h#22 (text+ko) ==== @@ -219,6 +219,7 @@ struct timespec shm_mtime; struct timespec shm_ctime; struct timespec shm_birthtime; + ino_t shm_ino; struct label *shm_label; /* MAC label */ const char *shm_path; From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:52 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCECB13F0; Mon, 8 Sep 2014 04:52:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 420929F0 for ; Mon, 8 Sep 2014 04:51:22 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2ED891ED0 for ; Mon, 8 Sep 2014 04:51:22 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pM99027272 for ; Mon, 8 Sep 2014 04:51:22 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pMbt027269 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:22 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:22 GMT Message-Id: <201409080451.s884pMbt027269@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199532 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:52 -0000 http://p4web.freebsd.org/@@1199532?ac=10 Change 1199532 by jhb@jhb_ralph on 2014/08/29 17:49:33 Don't require MAP_SHARED or MAP_PRIVATE with MAP_ANON. Note that we can't simply for MAP_SHARED on for MAP_ANON as MAP_SHARED with MAP_ANON determines whether or not anon regions are shared with future children. Affected files ... .. //depot/projects/smpng/sys/vm/vm_mmap.c#106 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_mmap.c#106 (text+ko) ==== @@ -248,13 +248,10 @@ return (EINVAL); if ((prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_NONE)) != 0) return (EINVAL); - - /* Exactly one of MAP_SHARED or MAP_PRIVATE must be given. */ - if ((flags & (MAP_SHARED | MAP_PRIVATE)) == 0 || + if ((flags & (MAP_ANON | MAP_SHARED | MAP_PRIVATE)) == 0 || (flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE)) return (EINVAL); - /* * Align the file position to a page boundary, * and save its page offset component. From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:53 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 228C814F3; Mon, 8 Sep 2014 04:52:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 808C7A0C for ; Mon, 8 Sep 2014 04:51:23 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 303A11ED8 for ; Mon, 8 Sep 2014 04:51:23 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pMDr027304 for ; Mon, 8 Sep 2014 04:51:22 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pMEM027301 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:22 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:22 GMT Message-Id: <201409080451.s884pMEM027301@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199537 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:53 -0000 http://p4web.freebsd.org/@@1199537?ac=10 Change 1199537 by jhb@jhb_pipkin on 2014/08/29 20:59:09 Compile. Affected files ... .. //depot/projects/smpng/sys/i386/i386/machdep.c#190 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/machdep.c#190 (text+ko) ==== @@ -3139,7 +3139,7 @@ MODINFO_METADATA | MODINFOMD_SMAP); if (smapbase == NULL) return (0); - smapattr = (uint32_t *) = preload_search_info(kmdp, + smapattr = (uint32_t *)preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_SMAP_XATTR); count = *((u_int32_t *)smapbase - 1) / sizeof(*smapbase); error = 0; From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:50 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D1B81039; Mon, 8 Sep 2014 04:52:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 91B739DC for ; Mon, 8 Sep 2014 04:51:21 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5AF831ECA for ; Mon, 8 Sep 2014 04:51:21 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pLwH027233 for ; Mon, 8 Sep 2014 04:51:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pHpl027211 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:17 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:17 GMT Message-Id: <201409080451.s884pHpl027211@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199526 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:50 -0000 http://p4web.freebsd.org/@@1199526?ac=10 Change 1199526 by jhb@jhb_ralph on 2014/08/29 15:29:34 IFC @1199525 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#46 integrate .. //depot/projects/smpng/share/man/man9/sysctl_add_oid.9#6 integrate .. //depot/projects/smpng/sys/amd64/include/vmm.h#13 integrate .. //depot/projects/smpng/sys/amd64/vmm/io/vatpic.c#4 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#11 integrate .. //depot/projects/smpng/sys/amd64/vmm/x86.c#11 integrate .. //depot/projects/smpng/sys/boot/common/part.c#7 integrate .. //depot/projects/smpng/sys/cam/ata/ata_xpt.c#25 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#9 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kmem.h#10 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#33 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#24 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#20 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#6 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#4 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/fbt.c#9 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32.h#24 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#90 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#81 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#80 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#80 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#81 integrate .. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_systrace_args.c#14 integrate .. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#84 integrate .. //depot/projects/smpng/sys/conf/NOTES#215 integrate .. //depot/projects/smpng/sys/conf/files#301 integrate .. //depot/projects/smpng/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu#1 branch .. //depot/projects/smpng/sys/contrib/rdma/krping/krping.c#7 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#113 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_beacon.c#8 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_osdep.h#17 integrate .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/cm.c#3 integrate .. //depot/projects/smpng/sys/dev/cxgbe/iw_cxgbe/qp.c#2 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_fb_helper.c#7 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_drv.h#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_irq.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_opregion.c#3 integrate .. //depot/projects/smpng/sys/dev/drm2/radeon/radeon_fb.c#3 integrate .. //depot/projects/smpng/sys/dev/fb/creator_vt.c#2 integrate .. //depot/projects/smpng/sys/dev/hptnr/README#2 integrate .. //depot/projects/smpng/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu#2 integrate .. //depot/projects/smpng/sys/dev/hptnr/hptnr_config.c#2 integrate .. //depot/projects/smpng/sys/dev/hptnr/hptnr_os_bsd.c#3 integrate .. //depot/projects/smpng/sys/dev/hptnr/hptnr_osm_bsd.c#4 integrate .. //depot/projects/smpng/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu#2 integrate .. //depot/projects/smpng/sys/dev/i40e/README#2 delete .. //depot/projects/smpng/sys/dev/i40e/i40e.h#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_adminq.c#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_adminq.h#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_adminq_cmd.h#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_alloc.h#2 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_common.c#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_hmc.c#2 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_hmc.h#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_lan_hmc.c#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_lan_hmc.h#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_nvm.c#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_osdep.c#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_osdep.h#2 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_pf.h#2 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_prototype.h#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_register.h#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_register_x710_int.h#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_status.h#2 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_txrx.c#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_type.h#3 delete .. //depot/projects/smpng/sys/dev/i40e/i40e_virtchnl.h#2 delete .. //depot/projects/smpng/sys/dev/i40e/if_i40e.c#3 delete .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#37 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwnreg.h#13 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwnvar.h#18 integrate .. //depot/projects/smpng/sys/dev/ixl/README#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_adminq.c#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_adminq.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_adminq_cmd.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_alloc.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_common.c#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_hmc.c#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_hmc.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_lan_hmc.c#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_lan_hmc.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_nvm.c#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_osdep.c#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_osdep.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_prototype.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_register.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_register_x710_int.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_status.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_type.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/i40e_virtchnl.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/if_ixl.c#1 branch .. //depot/projects/smpng/sys/dev/ixl/if_ixlv.c#1 branch .. //depot/projects/smpng/sys/dev/ixl/ixl.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/ixl_pf.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/ixl_txrx.c#1 branch .. //depot/projects/smpng/sys/dev/ixl/ixlv.h#1 branch .. //depot/projects/smpng/sys/dev/ixl/ixlvc.c#1 branch .. //depot/projects/smpng/sys/dev/pci/pci.c#142 integrate .. //depot/projects/smpng/sys/dev/pci/pci_if.m#14 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#35 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#45 integrate .. //depot/projects/smpng/sys/dev/streams/streams.c#43 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#30 integrate .. //depot/projects/smpng/sys/dev/vt/hw/efifb/efifb.c#3 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_early_fb.c#4 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_fb.c#7 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_fb.h#4 integrate .. //depot/projects/smpng/sys/dev/vt/hw/ofwfb/ofwfb.c#5 integrate .. //depot/projects/smpng/sys/dev/vt/hw/vga/vt_vga.c#3 integrate .. //depot/projects/smpng/sys/dev/vt/vt.h#7 integrate .. //depot/projects/smpng/sys/dev/vt/vt_buf.c#5 integrate .. //depot/projects/smpng/sys/dev/vt/vt_core.c#7 integrate .. //depot/projects/smpng/sys/dev/xen/blkback/blkback.c#14 integrate .. //depot/projects/smpng/sys/dev/xen/netback/netback.c#14 integrate .. //depot/projects/smpng/sys/fs/autofs/autofs.c#2 integrate .. //depot/projects/smpng/sys/fs/autofs/autofs.h#5 integrate .. //depot/projects/smpng/sys/fs/autofs/autofs_vfsops.c#5 integrate .. //depot/projects/smpng/sys/fs/autofs/autofs_vnops.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#156 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#168 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#96 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#136 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#123 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#176 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#54 integrate .. //depot/projects/smpng/sys/kern/sched_4bsd.c#115 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#133 integrate .. //depot/projects/smpng/sys/kern/subr_terminal.c#5 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#41 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#159 integrate .. //depot/projects/smpng/sys/kern/vfs_lookup.c#79 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#125 integrate .. //depot/projects/smpng/sys/modules/Makefile#206 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/drm2/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/drm2/i915kms/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/i40e/Makefile#3 delete .. //depot/projects/smpng/sys/modules/iwnfw/Makefile#11 integrate .. //depot/projects/smpng/sys/modules/iwnfw/iwn100/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ixl/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ixlv/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mlx4/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/mlx4ib/Makefile#8 integrate .. //depot/projects/smpng/sys/modules/mlxen/Makefile#7 integrate .. //depot/projects/smpng/sys/netinet/in.c#90 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#34 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#93 integrate .. //depot/projects/smpng/sys/netinet6/scope6.c#24 integrate .. //depot/projects/smpng/sys/netinet6/scope6_var.h#9 integrate .. //depot/projects/smpng/sys/netpfil/ipfw/ip_fw2.c#9 integrate .. //depot/projects/smpng/sys/netpfil/ipfw/ip_fw_sockopt.c#7 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/addr.c#5 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/cm.c#2 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/device.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/iwcm.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/sa_query.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/sysfs.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/ucm.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/user_mad.c#2 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/uverbs_cmd.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/core/uverbs_main.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c#2 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mlx4/cm.c#2 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mlx4/mad.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mlx4/main.c#4 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mlx4/mr.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mlx4/qp.c#5 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c#2 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c#2 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c#2 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c#10 integrate .. //depot/projects/smpng/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/alloc.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/cmd.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/cq.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/en_netdev.c#11 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/en_rx.c#5 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/eq.c#4 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/fw.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/main.c#5 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/mcg.c#4 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/mr.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/pd.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/qp.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/reset.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/resource_tracker.c#2 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/sense.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/srq.c#3 integrate .. //depot/projects/smpng/sys/ofed/drivers/net/mlx4/xrcd.c#2 integrate .. //depot/projects/smpng/sys/ofed/include/asm/atomic-long.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/asm/atomic.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/asm/byteorder.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/asm/current.h#2 delete .. //depot/projects/smpng/sys/ofed/include/asm/fcntl.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/asm/io.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/asm/page.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/asm/pgtable.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/asm/semaphore.h#2 delete .. //depot/projects/smpng/sys/ofed/include/asm/system.h#2 delete .. //depot/projects/smpng/sys/ofed/include/asm/types.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/asm/uaccess.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/atomic.h#2 delete .. //depot/projects/smpng/sys/ofed/include/linux/bitmap.h#2 delete .. //depot/projects/smpng/sys/ofed/include/linux/bitops.h#6 integrate .. //depot/projects/smpng/sys/ofed/include/linux/cache.h#1 branch .. //depot/projects/smpng/sys/ofed/include/linux/cdev.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/clocksource.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/compat.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/compiler.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/completion.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/ctype.h#2 delete .. //depot/projects/smpng/sys/ofed/include/linux/delay.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/device.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/dma-attrs.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/dma-mapping.h#4 integrate .. //depot/projects/smpng/sys/ofed/include/linux/dmapool.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/err.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/errno.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/etherdevice.h#1 branch .. //depot/projects/smpng/sys/ofed/include/linux/ethtool.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/file.h#4 integrate .. //depot/projects/smpng/sys/ofed/include/linux/fs.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/gfp.h#6 integrate .. //depot/projects/smpng/sys/ofed/include/linux/hardirq.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/idr.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/if_arp.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/if_ether.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/if_vlan.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/in.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/in6.h#4 integrate .. //depot/projects/smpng/sys/ofed/include/linux/inet.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/inetdevice.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/init.h#2 delete .. //depot/projects/smpng/sys/ofed/include/linux/interrupt.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/io-mapping.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/io.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/ioctl.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/jiffies.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/kdev_t.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/kernel.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/kmod.h#1 branch .. //depot/projects/smpng/sys/ofed/include/linux/kobject.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/kref.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/kthread.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/ktime.h#1 branch .. //depot/projects/smpng/sys/ofed/include/linux/linux_compat.c#9 integrate .. //depot/projects/smpng/sys/ofed/include/linux/linux_idr.c#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/linux_radix.c#4 integrate .. //depot/projects/smpng/sys/ofed/include/linux/list.h#5 integrate .. //depot/projects/smpng/sys/ofed/include/linux/lockdep.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/log2.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/math64.h#1 branch .. //depot/projects/smpng/sys/ofed/include/linux/miscdevice.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/mm.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/module.h#4 integrate .. //depot/projects/smpng/sys/ofed/include/linux/moduleparam.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/mount.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/mutex.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/net.h#4 integrate .. //depot/projects/smpng/sys/ofed/include/linux/netdevice.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/notifier.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/page.h#4 integrate .. //depot/projects/smpng/sys/ofed/include/linux/pci.h#6 integrate .. //depot/projects/smpng/sys/ofed/include/linux/poll.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/radix-tree.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/random.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/rbtree.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/rtnetlink.h#2 delete .. //depot/projects/smpng/sys/ofed/include/linux/rwlock.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/rwsem.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/scatterlist.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/sched.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/semaphore.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/slab.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/socket.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/spinlock.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/stddef.h#2 delete .. //depot/projects/smpng/sys/ofed/include/linux/string.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/sysfs.h#4 integrate .. //depot/projects/smpng/sys/ofed/include/linux/timer.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/linux/types.h#4 integrate .. //depot/projects/smpng/sys/ofed/include/linux/uaccess.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/vmalloc.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/wait.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/linux/workqueue.h#5 integrate .. //depot/projects/smpng/sys/ofed/include/net/addrconf.h#2 delete .. //depot/projects/smpng/sys/ofed/include/net/arp.h#2 delete .. //depot/projects/smpng/sys/ofed/include/net/if_inet6.h#1 branch .. //depot/projects/smpng/sys/ofed/include/net/ip.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/net/ip6_route.h#2 delete .. //depot/projects/smpng/sys/ofed/include/net/ipv6.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/net/neighbour.h#2 delete .. //depot/projects/smpng/sys/ofed/include/net/netevent.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/net/tcp.h#2 integrate .. //depot/projects/smpng/sys/ofed/include/rdma/ib_umem.h#3 integrate .. //depot/projects/smpng/sys/ofed/include/rdma/ib_verbs.h#3 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3_syscons.c#6 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#31 integrate .. //depot/projects/smpng/sys/sys/file.h#46 integrate .. //depot/projects/smpng/sys/sys/lockmgr.h#34 integrate .. //depot/projects/smpng/sys/sys/syscallsubr.h#75 integrate .. //depot/projects/smpng/sys/sys/terminal.h#4 integrate .. //depot/projects/smpng/sys/sys/user.h#59 integrate .. //depot/projects/smpng/sys/sys/vnode.h#127 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_dirhash.c#42 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#53 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#102 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#103 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#46 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/man/man9/Makefile 269485 2014-08-03 20:40:51Z alc $ +# $FreeBSD: head/share/man/man9/Makefile 270740 2014-08-28 04:35:38Z hselasky $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1383,7 +1383,8 @@ sysctl.9 SYSCTL_ULONG.9 \ sysctl.9 SYSCTL_UQUAD.9 MLINKS+=sysctl_add_oid.9 sysctl_move_oid.9 \ - sysctl_add_oid.9 sysctl_remove_oid.9 + sysctl_add_oid.9 sysctl_remove_oid.9 \ + sysctl_add_oid.9 sysctl_remove_name.9 MLINKS+=sysctl_ctx_init.9 sysctl_ctx_entry_add.9 \ sysctl_ctx_init.9 sysctl_ctx_entry_del.9 \ sysctl_ctx_init.9 sysctl_ctx_entry_find.9 \ ==== //depot/projects/smpng/share/man/man9/sysctl_add_oid.9#6 (text+ko) ==== @@ -25,15 +25,16 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/sysctl_add_oid.9 269344 2014-07-31 17:18:40Z hselasky $ +.\" $FreeBSD: head/share/man/man9/sysctl_add_oid.9 270740 2014-08-28 04:35:38Z hselasky $ .\" -.Dd July 31, 2014 +.Dd August 28, 2014 .Dt SYSCTL_ADD_OID 9 .Os .Sh NAME .Nm sysctl_add_oid , .Nm sysctl_move_oid , -.Nm sysctl_remove_oid +.Nm sysctl_remove_oid , +.Nm sysctl_remove_name .Nd runtime sysctl tree manipulation .Sh SYNOPSIS .In sys/types.h @@ -62,6 +63,13 @@ .Fa "int del" .Fa "int recurse" .Fc +.Ft int +.Fo sysctl_remove_name +.Fa "struct sysctl_oid *oidp" +.Fa "const char *name" +.Fa "int del" +.Fa "int recurse" +.Fc .Sh DESCRIPTION These functions provide the interface for creating and deleting sysctl OIDs at runtime for example during the lifetime of a module. @@ -149,7 +157,25 @@ if other code sections continue to use removed subtrees. .El .Pp -Again, in most cases the programmer should use contexts, +The +.Fn sysctl_remove_name +function looks up the child node matching the +.Fa name +argument and then invokes the +.Fn sysctl_remove_oid +function on that node, passing along the +.Fa del +and +.Fa recurse +arguments. +If a node having the specified name does not exist an error code of +.Er ENOENT +is returned. +Else the error code from +.Fn sysctl_remove_oid +is returned. +.Pp +In most cases the programmer should use contexts, as described in .Xr sysctl_ctx_init 9 , to keep track of created OIDs, ==== //depot/projects/smpng/sys/amd64/include/vmm.h#13 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/vmm.h 269109 2014-07-26 02:53:51Z neel $ + * $FreeBSD: head/sys/amd64/include/vmm.h 270438 2014-08-24 02:07:34Z grehan $ */ #ifndef _VMM_H_ @@ -587,25 +587,25 @@ void vm_inject_fault(void *vm, int vcpuid, int vector, int errcode_valid, int errcode); -static void __inline +static __inline void vm_inject_ud(void *vm, int vcpuid) { vm_inject_fault(vm, vcpuid, IDT_UD, 0, 0); } -static void __inline +static __inline void vm_inject_gp(void *vm, int vcpuid) { vm_inject_fault(vm, vcpuid, IDT_GP, 1, 0); } -static void __inline +static __inline void vm_inject_ac(void *vm, int vcpuid, int errcode) { vm_inject_fault(vm, vcpuid, IDT_AC, 1, errcode); } -static void __inline +static __inline void vm_inject_ss(void *vm, int vcpuid, int errcode) { vm_inject_fault(vm, vcpuid, IDT_SS, 1, errcode); ==== //depot/projects/smpng/sys/amd64/vmm/io/vatpic.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vatpic.c 269989 2014-08-14 18:03:38Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/io/vatpic.c 270434 2014-08-23 21:16:26Z neel $"); #include #include @@ -500,13 +500,19 @@ VATPIC_LOCK(vatpic); pin = vatpic_get_highest_irrpin(atpic); - if (pin == -1) - pin = 7; if (pin == 2) { atpic = &vatpic->atpic[1]; pin = vatpic_get_highest_irrpin(atpic); } + /* + * If there are no pins active at this moment then return the spurious + * interrupt vector instead. + */ + if (pin == -1) + pin = 7; + + KASSERT(pin >= 0 && pin <= 7, ("%s: invalid pin %d", __func__, pin)); *vecptr = atpic->irq_base + pin; VATPIC_UNLOCK(vatpic); ==== //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#11 (text+ko) ==== @@ -24,11 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 269700 2014-08-08 03:49:01Z neel $ + * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270689 2014-08-27 00:53:56Z grehan $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 269700 2014-08-08 03:49:01Z neel $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270689 2014-08-27 00:53:56Z grehan $"); #ifdef _KERNEL #include @@ -65,6 +65,7 @@ VIE_OP_TYPE_MOVZX, VIE_OP_TYPE_AND, VIE_OP_TYPE_OR, + VIE_OP_TYPE_SUB, VIE_OP_TYPE_TWO_BYTE, VIE_OP_TYPE_PUSH, VIE_OP_TYPE_CMP, @@ -97,6 +98,10 @@ .op_byte = 0x0F, .op_type = VIE_OP_TYPE_TWO_BYTE }, + [0x2B] = { + .op_byte = 0x2B, + .op_type = VIE_OP_TYPE_SUB, + }, [0x3B] = { .op_byte = 0x3B, .op_type = VIE_OP_TYPE_CMP, @@ -597,18 +602,16 @@ break; case 0x81: /* - * AND mem (ModRM:r/m) with immediate and store the + * AND/OR mem (ModRM:r/m) with immediate and store the * result in mem. * - * 81 /4 and r/m16, imm16 - * 81 /4 and r/m32, imm32 - * REX.W + 81 /4 and r/m64, imm32 sign-extended to 64 + * AND: i = 4 + * OR: i = 1 + * 81 /i op r/m16, imm16 + * 81 /i op r/m32, imm32 + * REX.W + 81 /i op r/m64, imm32 sign-extended to 64 * - * Currently, only the AND operation of the 0x81 opcode - * is implemented (ModRM:reg = b100). */ - if ((vie->reg & 7) != 4) - break; /* get the first operand */ error = memread(vm, vcpuid, gpa, &val1, size, arg); @@ -616,11 +619,26 @@ break; /* - * perform the operation with the pre-fetched immediate - * operand and write the result - */ - val1 &= vie->immediate; - error = memwrite(vm, vcpuid, gpa, val1, size, arg); + * perform the operation with the pre-fetched immediate + * operand and write the result + */ + switch (vie->reg & 7) { + case 0x4: + /* modrm:reg == b100, AND */ + val1 &= vie->immediate; + break; + case 0x1: + /* modrm:reg == b001, OR */ + val1 |= vie->immediate; + break; + default: + error = EINVAL; + break; + } + if (error) + break; + + error = memwrite(vm, vcpuid, gpa, val1, size, arg); break; default: break; @@ -723,6 +741,62 @@ } static int +emulate_sub(void *vm, int vcpuid, uint64_t gpa, struct vie *vie, + mem_region_read_t memread, mem_region_write_t memwrite, void *arg) +{ + int error, size; + uint64_t nval, rflags, rflags2, val1, val2; + enum vm_reg_name reg; + + size = vie->opsize; + error = EINVAL; + + switch (vie->op.op_byte) { + case 0x2B: + /* + * SUB r/m from r and store the result in r + * + * 2B/r SUB r16, r/m16 + * 2B/r SUB r32, r/m32 + * REX.W + 2B/r SUB r64, r/m64 + */ + + /* get the first operand */ + reg = gpr_map[vie->reg]; + error = vie_read_register(vm, vcpuid, reg, &val1); + if (error) + break; + + /* get the second operand */ + error = memread(vm, vcpuid, gpa, &val2, size, arg); + if (error) + break; + + /* perform the operation and write the result */ + nval = val1 - val2; + error = vie_update_register(vm, vcpuid, reg, nval, size); + break; + default: + break; + } + + if (!error) { + rflags2 = getcc(size, val1, val2); + error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, + &rflags); + if (error) + return (error); + + rflags &= ~RFLAGS_STATUS_BITS; + rflags |= rflags2 & RFLAGS_STATUS_BITS; + error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, + rflags, 8); + } + + return (error); +} + +static int emulate_push(void *vm, int vcpuid, uint64_t mmio_gpa, struct vie *vie, struct vm_guest_paging *paging, mem_region_read_t memread, mem_region_write_t memwrite, void *arg) @@ -865,6 +939,10 @@ error = emulate_or(vm, vcpuid, gpa, vie, memread, memwrite, memarg); break; + case VIE_OP_TYPE_SUB: + error = emulate_sub(vm, vcpuid, gpa, vie, + memread, memwrite, memarg); + break; default: error = EINVAL; break; ==== //depot/projects/smpng/sys/amd64/vmm/x86.c#11 (text+ko) ==== @@ -23,16 +23,17 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/x86.c 266765 2014-05-27 19:04:38Z jhb $ + * $FreeBSD: head/sys/amd64/vmm/x86.c 270437 2014-08-24 01:10:06Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/x86.c 266765 2014-05-27 19:04:38Z jhb $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/x86.c 270437 2014-08-24 01:10:06Z neel $"); #include #include #include #include +#include #include #include @@ -45,20 +46,49 @@ #include "vmm_host.h" #include "x86.h" +SYSCTL_DECL(_hw_vmm); +static SYSCTL_NODE(_hw_vmm, OID_AUTO, topology, CTLFLAG_RD, 0, NULL); + #define CPUID_VM_HIGH 0x40000000 static const char bhyve_id[12] = "bhyve bhyve "; static uint64_t bhyve_xcpuids; +/* + * The default CPU topology is a single thread per package. + */ +static u_int threads_per_core = 1; +SYSCTL_UINT(_hw_vmm_topology, OID_AUTO, threads_per_core, CTLFLAG_RDTUN, + &threads_per_core, 0, NULL); + +static u_int cores_per_package = 1; +SYSCTL_UINT(_hw_vmm_topology, OID_AUTO, cores_per_package, CTLFLAG_RDTUN, + &cores_per_package, 0, NULL); + +static int cpuid_leaf_b = 1; +SYSCTL_INT(_hw_vmm_topology, OID_AUTO, cpuid_leaf_b, CTLFLAG_RDTUN, + &cpuid_leaf_b, 0, NULL); + +/* + * Round up to the next power of two, if necessary, and then take log2. + * Returns -1 if argument is zero. + */ +static __inline int +log2(u_int x) +{ + + return (fls(x << (1 - powerof2(x))) - 1); +} + int x86_emulate_cpuid(struct vm *vm, int vcpu_id, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx) { const struct xsave_limits *limits; uint64_t cr4; - int error, enable_invpcid; - unsigned int func, regs[4]; + int error, enable_invpcid, level, width, x2apic_id; + unsigned int func, regs[4], logical_cpus; enum x2apic_state x2apic_state; /* @@ -207,30 +237,31 @@ */ regs[3] &= ~CPUID_DS; - /* - * Disable multi-core. - */ + logical_cpus = threads_per_core * cores_per_package; regs[1] &= ~CPUID_HTT_CORES; - regs[3] &= ~CPUID_HTT; + regs[1] |= (logical_cpus & 0xff) << 16; + regs[3] |= CPUID_HTT; break; case CPUID_0000_0004: - do_cpuid(4, regs); + cpuid_count(*eax, *ecx, regs); - /* - * Do not expose topology. - * - * The maximum number of processor cores in - * this physical processor package and the - * maximum number of threads sharing this - * cache are encoded with "plus 1" encoding. - * Adding one to the value in this register - * field to obtains the actual value. - * - * Therefore 0 for both indicates 1 core per - * package and no cache sharing. - */ - regs[0] &= 0xffff8000; + if (regs[0] || regs[1] || regs[2] || regs[3]) { + regs[0] &= 0x3ff; + regs[0] |= (cores_per_package - 1) << 26; + /* + * Cache topology: + * - L1 and L2 are shared only by the logical + * processors in a single core. + * - L3 and above are shared by all logical + * processors in the package. + */ + logical_cpus = threads_per_core; + level = (regs[0] >> 5) & 0x7; + if (level >= 3) + logical_cpus *= cores_per_package; + regs[0] |= (logical_cpus - 1) << 14; + } break; case CPUID_0000_0007: @@ -284,10 +315,32 @@ /* * Processor topology enumeration */ - regs[0] = 0; - regs[1] = 0; - regs[2] = *ecx & 0xff; - regs[3] = vcpu_id; + if (*ecx == 0) { + logical_cpus = threads_per_core; + width = log2(logical_cpus); + level = CPUID_TYPE_SMT; + x2apic_id = vcpu_id; + } + + if (*ecx == 1) { + logical_cpus = threads_per_core * + cores_per_package; + width = log2(logical_cpus); + level = CPUID_TYPE_CORE; + x2apic_id = vcpu_id; + } + + if (!cpuid_leaf_b || *ecx >= 2) { + width = 0; + logical_cpus = 0; + level = 0; + x2apic_id = 0; + } + + regs[0] = width & 0x1f; + regs[1] = logical_cpus & 0xffff; + regs[2] = (level << 8) | (*ecx & 0xff); + regs[3] = x2apic_id; break; case CPUID_0000_000D: ==== //depot/projects/smpng/sys/boot/common/part.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/boot/common/part.c 263468 2014-03-21 09:29:01Z ae $"); +__FBSDID("$FreeBSD: head/sys/boot/common/part.c 270521 2014-08-25 07:15:14Z ae $"); #include #include @@ -212,8 +212,8 @@ return (-1); } } - ent = (struct gpt_ent *)tbl; - for (i = 0; i < cnt; i++, ent++) { + for (i = 0; i < cnt; i++) { + ent = (struct gpt_ent *)(tbl + i * hdr->hdr_entsz); uuid_letoh(&ent->ent_type); if (uuid_equal(&ent->ent_type, &gpt_uuid_unused, NULL)) continue; @@ -254,8 +254,8 @@ table->sectorsize); if (phdr != NULL) { /* Read the primary GPT table. */ - size = MIN(MAXTBLSZ, - phdr->hdr_entries * phdr->hdr_entsz / table->sectorsize); + size = MIN(MAXTBLSZ, (phdr->hdr_entries * phdr->hdr_entsz + + table->sectorsize - 1) / table->sectorsize); if (dread(dev, tbl, size, phdr->hdr_lba_table) == 0 && gpt_checktbl(phdr, tbl, size * table->sectorsize, table->sectors - 1) == 0) { @@ -287,8 +287,9 @@ hdr.hdr_entsz != phdr->hdr_entsz || hdr.hdr_crc_table != phdr->hdr_crc_table) { /* Read the backup GPT table. */ - size = MIN(MAXTBLSZ, phdr->hdr_entries * - phdr->hdr_entsz / table->sectorsize); + size = MIN(MAXTBLSZ, (phdr->hdr_entries * + phdr->hdr_entsz + table->sectorsize - 1) / + table->sectorsize); if (dread(dev, tbl, size, phdr->hdr_lba_table) == 0 && gpt_checktbl(phdr, tbl, size * table->sectorsize, table->sectors - 1) == 0) { @@ -302,10 +303,10 @@ table->type = PTABLE_NONE; goto out; } - ent = (struct gpt_ent *)tbl; size = MIN(hdr.hdr_entries * hdr.hdr_entsz, MAXTBLSZ * table->sectorsize); - for (i = 0; i < size / hdr.hdr_entsz; i++, ent++) { + for (i = 0; i < size / hdr.hdr_entsz; i++) { + ent = (struct gpt_ent *)(tbl + i * hdr.hdr_entsz); if (uuid_equal(&ent->ent_type, &gpt_uuid_unused, NULL)) continue; entry = malloc(sizeof(*entry)); ==== //depot/projects/smpng/sys/cam/ata/ata_xpt.c#25 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/cam/ata/ata_xpt.c 270249 2014-08-20 22:58:12Z imp $"); +__FBSDID("$FreeBSD: head/sys/cam/ata/ata_xpt.c 270327 2014-08-22 13:15:59Z imp $"); #include #include @@ -458,18 +458,12 @@ 0, 0x02); break; case PROBE_SETAN: - /* - * Only ATAPI defines this bit to mean AEN, but remember - * what transport thinks about AEN. - */ - if ((softc->caps & CTS_SATA_CAPS_H_AN) && - periph->path->device->protocol == PROTO_ATAPI) + /* Remember what transport thinks about AEN. */ + if (softc->caps & CTS_SATA_CAPS_H_AN) path->device->inq_flags |= SID_AEN; else path->device->inq_flags &= ~SID_AEN; xpt_async(AC_GETDEV_CHANGED, path, NULL); - if (periph->path->device->protocol != PROTO_ATAPI) - break; cam_fill_ataio(ataio, 1, probedone, @@ -1057,7 +1051,8 @@ } /* FALLTHROUGH */ case PROBE_SETDMAAA: - if ((ident_buf->satasupport & ATA_SUPPORT_ASYNCNOTIF) && + if (path->device->protocol != PROTO_ATA && + (ident_buf->satasupport & ATA_SUPPORT_ASYNCNOTIF) && (!(softc->caps & CTS_SATA_CAPS_H_AN)) != (!(ident_buf->sataenabled & ATA_SUPPORT_ASYNCNOTIF))) { PROBE_SET_ACTION(softc, PROBE_SETAN); @@ -1178,7 +1173,7 @@ else caps = 0; /* Remember what transport thinks about AEN. */ - if (caps & CTS_SATA_CAPS_H_AN) + if ((caps & CTS_SATA_CAPS_H_AN) && path->device->protocol != PROTO_ATA) path->device->inq_flags |= SID_AEN; else path->device->inq_flags &= ~SID_AEN; ==== //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c 263620 2014-03-22 10:26:09Z bdrewery $"); +__FBSDID("$FreeBSD: head/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c 270759 2014-08-28 19:50:08Z smh $"); #include #include @@ -126,18 +126,47 @@ } SYSINIT(kmem_size_init, SI_SUB_KMEM, SI_ORDER_ANY, kmem_size_init, NULL); -uint64_t -kmem_size(void) +/* + * The return values from kmem_free_* are only valid once the pagedaemon + * has been initialised, before then they return 0. + * + * To ensure the returns are valid the caller can use a SYSINIT with + * subsystem set to SI_SUB_KTHREAD_PAGE and an order of at least + * SI_ORDER_SECOND. + */ +u_int +kmem_free_target(void) +{ + + return (vm_cnt.v_free_target); +} + +u_int +kmem_free_min(void) +{ + + return (vm_cnt.v_free_min); +} + +u_int +kmem_free_count(void) +{ + + return (vm_cnt.v_free_count); +} + +u_int +kmem_page_count(void) { - return (kmem_size_val); + return (vm_cnt.v_page_count); } uint64_t -kmem_used(void) +kmem_size(void) { - return (vmem_size(kmem_arena, VMEM_ALLOC)); + return (kmem_size_val); } static int ==== //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kmem.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/kmem.h 262329 2014-02-22 05:13:35Z markj $ + * $FreeBSD: head/sys/cddl/compat/opensolaris/sys/kmem.h 270759 2014-08-28 19:50:08Z smh $ */ #ifndef _OPENSOLARIS_SYS_KMEM_H_ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:52:51 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 620B3123A; Mon, 8 Sep 2014 04:52:51 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D0CD9E8 for ; Mon, 8 Sep 2014 04:51:22 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id F3E0D1ECE for ; Mon, 8 Sep 2014 04:51:21 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pL5q027259 for ; Mon, 8 Sep 2014 04:51:21 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pLh6027256 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:21 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:21 GMT Message-Id: <201409080451.s884pLh6027256@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199530 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:52:51 -0000 http://p4web.freebsd.org/@@1199530?ac=10 Change 1199530 by jhb@jhb_pippin on 2014/08/29 16:53:45 Fix ki_stamp for threads. Affected files ... .. //depot/projects/smpng/sys/kern/kern_proc.c#137 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_proc.c#137 (text+ko) ==== @@ -785,12 +785,12 @@ static void fill_kinfo_proc_only(struct proc *p, struct kinfo_proc *kp) { + struct timeval uptime; struct thread *td0; struct tty *tp; struct session *sp; struct ucred *cred; struct sigacts *ps; - struct timeval uptime; /* For proc_realparent. */ sx_assert(&proctree_lock, SX_LOCKED); @@ -873,10 +873,10 @@ kp->ki_fibnum = p->p_fibnum; kp->ki_start = p->p_stats->p_start; timevaladd(&kp->ki_start, &boottime); + PROC_SLOCK(p); microuptime(&uptime); /* Wrapping is ok as this is only used to compute deltas. */ kp->ki_stamp = uptime.tv_sec * 1000000 + uptime.tv_usec; - PROC_SLOCK(p); rufetch(p, &kp->ki_rusage); kp->ki_runtime = cputick2usec(p->p_rux.rux_runtime); calcru(p, &kp->ki_rusage.ru_utime, &kp->ki_rusage.ru_stime); @@ -940,6 +940,7 @@ static void fill_kinfo_thread(struct thread *td, struct kinfo_proc *kp, int preferthread) { + struct timeval uptime; struct proc *p; p = td->td_proc; @@ -999,6 +1000,9 @@ kp->ki_pri.pri_user = td->td_user_pri; if (preferthread) { + microuptime(&uptime); + /* Wrapping is ok as this is only used to compute deltas. */ + kp->ki_stamp = uptime.tv_sec * 1000000 + uptime.tv_usec; rufetchtd(td, &kp->ki_rusage); kp->ki_runtime = cputick2usec(td->td_rux.rux_runtime); kp->ki_pctcpu = sched_pctcpu(td); From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:53:20 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AFB11920; Mon, 8 Sep 2014 04:53:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 181A1B7C for ; Mon, 8 Sep 2014 04:51:36 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EC50E1F44 for ; Mon, 8 Sep 2014 04:51:35 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pZQu028002 for ; Mon, 8 Sep 2014 04:51:35 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pZSf027999 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:35 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:35 GMT Message-Id: <201409080451.s884pZSf027999@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199643 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:53:20 -0000 http://p4web.freebsd.org/@@1199643?ac=10 Change 1199643 by jhb@jhb_pippin on 2014/09/01 13:43:29 Simplify the "fast" eventhandler stuff. The lists are left as dynamically allocated, but the fast invocations cache a pointer to the list (rather than statically allocating the list). Affected files ... .. //depot/projects/smpng/sys/kern/subr_eventhandler.c#28 edit .. //depot/projects/smpng/sys/modules/evbench/evbench.c#2 edit .. //depot/projects/smpng/sys/sys/eventhandler.h#44 edit Differences ... ==== //depot/projects/smpng/sys/kern/subr_eventhandler.c#28 (text+ko) ==== @@ -50,6 +50,8 @@ }; static struct eventhandler_list *_eventhandler_find_list(const char *name); +static struct eventhandler_list *eventhandler_list_alloc(const char *name); +static void eventhandler_list_free(struct eventhandler_list *el); /* * Initialize the eventhandler mutex and list. @@ -65,25 +67,53 @@ NULL); /* - * Initialize a pre-allocated "fast" eventhandler list. The list's - * name is set in 'el_name', but the list is otherwise uninitialized. + * Locate an existing eventhandler list with the given name. If an + * existing list is not found, create a new list. + */ +static struct eventhandler_list * +eventhandler_list_alloc(const char *name) +{ + struct eventhandler_list *list, *new_list; + + mtx_lock(&eventhandler_mutex); + list = _eventhandler_find_list(name); + if (list == NULL) { + mtx_unlock(&eventhandler_mutex); + + new_list = malloc(sizeof(struct eventhandler_list) + strlen(name) + 1, + M_EVENTHANDLER, M_WAITOK | M_ZERO); + + mtx_lock(&eventhandler_mutex); + list = _eventhandler_find_list(name); + if (list != NULL) { + free(new_list, M_EVENTHANDLER); + } else { + CTR2(KTR_EVH, "%s: creating list \"%s\"", __func__, name); + list = new_list; + list->el_name = (char *)list + sizeof(struct eventhandler_list); + strcpy(list->el_name, name); + TAILQ_INIT(&list->el_entries); + mtx_init(&list->el_lock, name, "eventhandler list", MTX_DEF); + TAILQ_INSERT_HEAD(&eventhandler_lists, list, el_link); + atomic_store_rel_int(&list->el_flags, EHL_INITTED); + } + } + mtx_unlock(&eventhandler_mutex); + return (list); +} + +/* + * Initialize a reference to a eventhandler list used for "fast" + * invocations. */ void eventhandler_fast_list_init(void *arg) { - struct eventhandler_list *list; + struct eventhandler_list_init *eli; - list = arg; - CTR2(KTR_EVH, "%s: initializing list \"%s\"", __func__, list->el_name); - TAILQ_INIT(&list->el_entries); - mtx_init(&list->el_lock, list->el_name, "eventhandler list", MTX_DEF); - atomic_store_rel_int(&list->el_flags, EHL_INITTED); - - mtx_lock(&eventhandler_mutex); - if (_eventhandler_find_list(list->el_name) != NULL) - panic("Duplicate fast eventhandler list: %s", list->el_name); - TAILQ_INSERT_HEAD(&eventhandler_lists, list, el_link); - mtx_unlock(&eventhandler_mutex); + eli = arg; + CTR2(KTR_EVH, "%s: looking up list \"%s\"", __func__, eli->eli_name); + eli->eli_list = eventhandler_list_alloc(eli->eli_name); } /* @@ -94,45 +124,13 @@ eventhandler_register_internal(struct eventhandler_list *list, const char *name, eventhandler_tag epn) { - struct eventhandler_list *new_list; struct eventhandler_entry *ep; KASSERT(eventhandler_lists_initted, ("eventhandler registered too early")); KASSERT(epn != NULL, ("%s: cannot register NULL event", __func__)); - /* lock the eventhandler lists */ - mtx_lock(&eventhandler_mutex); - - /* Do we need to find/create the list? */ - if (list == NULL) { - /* look for a matching, existing list */ - list = _eventhandler_find_list(name); - - /* Do we need to create the list? */ - if (list == NULL) { - mtx_unlock(&eventhandler_mutex); - - new_list = malloc(sizeof(struct eventhandler_list) + - strlen(name) + 1, M_EVENTHANDLER, M_WAITOK | M_ZERO); - - /* If someone else created it already, then use that one. */ - mtx_lock(&eventhandler_mutex); - list = _eventhandler_find_list(name); - if (list != NULL) { - free(new_list, M_EVENTHANDLER); - } else { - CTR2(KTR_EVH, "%s: creating list \"%s\"", __func__, name); - list = new_list; - list->el_name = (char *)list + sizeof(struct eventhandler_list); - strcpy(list->el_name, name); - TAILQ_INIT(&list->el_entries); - mtx_init(&list->el_lock, name, "eventhandler list", MTX_DEF); - TAILQ_INSERT_HEAD(&eventhandler_lists, list, el_link); - atomic_store_rel_int(&list->el_flags, EHL_INITTED); - } - } - } - mtx_unlock(&eventhandler_mutex); + if (list == NULL) + list = eventhandler_list_alloc(name); KASSERT(epn->ee_priority != EHE_DEAD_PRIORITY, ("%s: handler for %s registered with dead priority", __func__, name)); ==== //depot/projects/smpng/sys/modules/evbench/evbench.c#2 (text+ko) ==== @@ -49,9 +49,8 @@ typedef void (*evbench_fn)(void *); EVENTHANDLER_DECLARE(evbench, evbench_fn); -EVENTHANDLER_DECLARE(fast_evbench, evbench_fn); -static EVENTHANDLER_FAST_DEFINE(fast_evbench, evbench_fn); +static EVENTHANDLER_FAST_DEFINE(evbench); static SYSCTL_NODE(_debug, OID_AUTO, evbench, CTLFLAG_RD, 0, "eventhandler tree"); @@ -75,29 +74,28 @@ return; sched_pin(); - /* Invoke of "fast" list with no handlers. */ + /* "Fast" invocation with no handlers. */ start = rdtsc(); for (i = 0; i < loops; i++) - EVENTHANDLER_FAST_INVOKE(fast_evbench); + EVENTHANDLER_FAST_INVOKE(evbench); times[0] = rdtsc() - start; - /* Invoke of "slow" list with no handlers. */ + /* Default invocation with no handlers. */ start = rdtsc(); for (i = 0; i < loops; i++) EVENTHANDLER_INVOKE(evbench); times[1] = rdtsc() - start; - /* Add null handler to each list. */ - (void)EVENTHANDLER_REGISTER(fast_evbench, null_handler, NULL, 0); + /* Add null handler. */ (void)EVENTHANDLER_REGISTER(evbench, null_handler, NULL, 0); - /* Invoke of "fast" list with one handler. */ + /* "Fast" invocation with one handler. */ start = rdtsc(); for (i = 0; i < loops; i++) - EVENTHANDLER_FAST_INVOKE(fast_evbench); + EVENTHANDLER_FAST_INVOKE(evbench); times[2] = rdtsc() - start; - /* Invoke of "slow" list with one handler. */ + /* "Slow" invocation with one handler. */ start = rdtsc(); for (i = 0; i < loops; i++) EVENTHANDLER_INVOKE(evbench); @@ -133,9 +131,6 @@ load(void *arg) { - /* Add and remove a handler to the slow list to force its creation. */ - (void)EVENTHANDLER_REGISTER(evbench, null_handler, NULL, 0); - EVENTHANDLER_DEREGISTER(evbench, NULL); return (0); } @@ -143,8 +138,7 @@ unload(void *arg) { - /* Can't safely unload a "fast" list. */ - return (EBUSY); + return (0); } ==== //depot/projects/smpng/sys/sys/eventhandler.h#44 (text+ko) ==== @@ -59,6 +59,11 @@ TAILQ_HEAD(,eventhandler_entry) el_entries; }; +struct eventhandler_list_init { + char *eli_name; + struct eventhandler_list *eli_list; +}; + typedef struct eventhandler_entry *eventhandler_tag; #define EHL_LOCK(p) mtx_lock(&(p)->el_lock) @@ -98,40 +103,31 @@ } while (0) /* - * Fast handler lists require the eventhandler list be present - * at link time. They don't allow addition of entries to - * unknown eventhandler lists, ie. each list must have an - * "owner". - * - * Fast handler lists must be defined once by the owner - * of the eventhandler list, and the declaration must be in - * scope at any point the list is manipulated. - */ - -/* * Event handlers provide named lists of hooks to be invoked when a * specific event occurs. Hooks are added and removed to lists that - * are identified by name. + * are identified by name. Lists are allocated when the first hook + * is registered for an event. + * + * Invoking an event handler calls all of the hooks associated with + * the event. There are two ways to invoke an event handler: * - * There are two types of event handler lists. + * 1) The default invocation operation accepts a list name and uses an + * O(n^2) lookup to locate the list to operate on. This is + * backwards compatible with the old API, but does trigger the + * overhead of the lookup even if no hooks are registered. * - * Default, or "slow" lists allocate the list storage dynamically when - * the first hook is registered for an event. Invoking a default hook - * will always have some overhead as it uses an O(n) lookup to find - * the event handler list by name. + * 2) "Fast" invocations store a local reference to the named list + * when the containing module is loaded. This avoids the need for + * the O(n^2) lookup on each invocation. This does require + * EVENTHANDLER_FAST_DEFINE() to be invoked in the same code module + * at global scope to perform the lookup during module load. * - * "Fast" lists use statically allocated storage for the event handler - * list. As a result, they can avoid the O(n) lookup and should have - * very minimal overhead when no hooks are active. Fast lists can - * never be freed, so they cannot be used in kernel modules that - * support unloading. They must also be defined in addition to being - * declared. + * Note that both invocation methods may be used on the same list. * - * Registering a hook for an event or invoking an event requires that - * the declaration of the list is in scope. + * Registering a hook for an event or invoking an event require the + * event handler to be declared via EVENTHANDLER_DECLARE(). */ -/* "Slow" list operations. */ #define EVENTHANDLER_DECLARE(name, type) \ struct eventhandler_entry_ ## name \ { \ @@ -148,18 +144,14 @@ _EVENTHANDLER_INVOKE(name, _el , ## __VA_ARGS__); \ } while (0) -/* "Fast" list operations. */ -#define EVENTHANDLER_FAST_DECLARE(name, type) \ -extern struct eventhandler_list Xeventhandler_list_ ## name; \ -EVENTHANDLER_DECLARE(name, type) - -#define EVENTHANDLER_FAST_DEFINE(name, type) \ -struct eventhandler_list Xeventhandler_list_ ## name = { #name }; \ +#define EVENTHANDLER_FAST_DEFINE(name) \ +struct eventhandler_list_init Xeventhandler_list_ ## name = \ + { #name, NULL }; \ SYSINIT(eventhandler_list_ ##name, SI_SUB_EVENTHANDLER, SI_ORDER_SECOND, \ eventhandler_fast_list_init, &Xeventhandler_list_ ## name) #define EVENTHANDLER_FAST_INVOKE(name, ...) do { \ - struct eventhandler_list *_el = &Xeventhandler_list_ ## name ; \ + struct eventhandler_list *_el = Xeventhandler_list_ ## name.eli_list; \ \ KASSERT(_el->el_flags & EHL_INITTED, \ ("eventhandler_fast_invoke: too early")); \ @@ -169,7 +161,6 @@ } \ } while (0) -/* Operations to add and remove hooks. */ #define EVENTHANDLER_DEFINE(name, func, arg, priority) \ static eventhandler_tag name ## _tag; \ \ @@ -187,7 +178,7 @@ SYSUNINIT(name ## _evh_fini, SI_SUB_CONFIGURE, SI_ORDER_ANY, \ name ## _evh_fini, NULL) -#define EVENTHANDLER_REGISTER(name, func, arg, priority) \ +#define EVENTHANDLER_REGISTER(name, func, arg, priority) \ eventhandler_register(NULL, #name, func, arg, priority) #define EVENTHANDLER_DEREGISTER(name, tag) \ From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:53:20 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B65719F5; Mon, 8 Sep 2014 04:53:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5111DB81 for ; Mon, 8 Sep 2014 04:51:36 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3C9A81F45 for ; Mon, 8 Sep 2014 04:51:36 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884pa7K028134 for ; Mon, 8 Sep 2014 04:51:36 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884pZBt028006 for perforce@freebsd.org; Mon, 8 Sep 2014 04:51:35 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:51:35 GMT Message-Id: <201409080451.s884pZBt028006@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199644 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:53:20 -0000 http://p4web.freebsd.org/@@1199644?ac=10 Change 1199644 by jhb@jhb_pippin on 2014/09/01 13:51:59 IFC @1199642 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#129 integrate .. //depot/projects/smpng/sys/amd64/amd64/support.S#28 integrate .. //depot/projects/smpng/sys/amd64/include/pc/bios.h#9 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#12 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#34 integrate .. //depot/projects/smpng/sys/arm/conf/BEAGLEBONE#12 integrate .. //depot/projects/smpng/sys/arm/conf/CNS11XXNAS#11 integrate .. //depot/projects/smpng/sys/arm/conf/CUBIEBOARD#7 integrate .. //depot/projects/smpng/sys/arm/conf/CUBIEBOARD2#5 integrate .. //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#6 integrate .. //depot/projects/smpng/sys/arm/conf/EB9200#7 integrate .. //depot/projects/smpng/sys/arm/conf/EFIKA_MX#6 integrate .. //depot/projects/smpng/sys/arm/conf/EXYNOS5.common#2 integrate .. //depot/projects/smpng/sys/arm/conf/HL200#21 integrate .. //depot/projects/smpng/sys/arm/conf/HL201#13 integrate .. //depot/projects/smpng/sys/arm/conf/IMX53-QSB#5 integrate .. //depot/projects/smpng/sys/arm/conf/IMX6#3 integrate .. //depot/projects/smpng/sys/arm/conf/KB920X#31 integrate .. //depot/projects/smpng/sys/arm/conf/NSLU#17 integrate .. //depot/projects/smpng/sys/arm/conf/PANDABOARD#10 integrate .. //depot/projects/smpng/sys/arm/conf/QILA9G20#12 integrate .. //depot/projects/smpng/sys/arm/conf/RK3188#2 integrate .. //depot/projects/smpng/sys/arm/conf/SAM9G20EK#12 integrate .. //depot/projects/smpng/sys/arm/conf/SAM9X25EK#9 integrate .. //depot/projects/smpng/sys/arm/conf/SN9G45#8 integrate .. //depot/projects/smpng/sys/arm/conf/VYBRID#3 integrate .. //depot/projects/smpng/sys/arm/conf/WANDBOARD-DUAL#3 integrate .. //depot/projects/smpng/sys/arm/conf/WANDBOARD-QUAD#3 integrate .. //depot/projects/smpng/sys/arm/conf/WANDBOARD-SOLO#3 integrate .. //depot/projects/smpng/sys/arm/conf/ZEDBOARD#7 integrate .. //depot/projects/smpng/sys/arm/include/cpuconf.h#18 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#21 integrate .. //depot/projects/smpng/sys/cam/ata/ata_all.c#14 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#10 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/kmem.h#11 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#12 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#34 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#100 integrate .. //depot/projects/smpng/sys/conf/files#302 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#21 integrate .. //depot/projects/smpng/sys/dev/age/if_age.c#23 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#37 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#23 integrate .. //depot/projects/smpng/sys/dev/ale/if_ale.c#20 integrate .. //depot/projects/smpng/sys/dev/altera/atse/if_atse.c#4 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#40 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#136 integrate .. //depot/projects/smpng/sys/dev/bktr/CHANGELOG.TXT#8 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe.c#8 integrate .. //depot/projects/smpng/sys/dev/cas/if_cas.c#18 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#34 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#42 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#49 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#24 integrate .. //depot/projects/smpng/sys/dev/ffec/if_ffec.c#6 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#41 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#109 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#52 integrate .. //depot/projects/smpng/sys/dev/gxemul/ether/if_gx.c#4 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#43 integrate .. //depot/projects/smpng/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c#6 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#73 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#30 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#45 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#23 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixv.c#12 integrate .. //depot/projects/smpng/sys/dev/ixl/if_ixl.c#2 integrate .. //depot/projects/smpng/sys/dev/ixl/if_ixlv.c#2 integrate .. //depot/projects/smpng/sys/dev/jme/if_jme.c#20 integrate .. //depot/projects/smpng/sys/dev/le/lance.c#10 integrate .. //depot/projects/smpng/sys/dev/mii/mii.c#29 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#42 integrate .. //depot/projects/smpng/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c#3 integrate .. //depot/projects/smpng/sys/dev/netmap/netmap_kern.h#15 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#35 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#64 integrate .. //depot/projects/smpng/sys/dev/qlxgb/qla_os.c#9 integrate .. //depot/projects/smpng/sys/dev/qlxgbe/ql_os.c#6 integrate .. //depot/projects/smpng/sys/dev/qlxge/qls_os.c#5 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#106 integrate .. //depot/projects/smpng/sys/dev/rt/if_rt.c#8 integrate .. //depot/projects/smpng/sys/dev/sdhci/sdhci.c#20 integrate .. //depot/projects/smpng/sys/dev/sdhci/sdhci.h#8 integrate .. //depot/projects/smpng/sys/dev/sdhci/sdhci_fdt.c#4 integrate .. //depot/projects/smpng/sys/dev/sdhci/sdhci_if.m#4 integrate .. //depot/projects/smpng/sys/dev/sdhci/sdhci_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/sf/if_sf.c#13 integrate .. //depot/projects/smpng/sys/dev/sge/if_sge.c#11 integrate .. //depot/projects/smpng/sys/dev/sis/if_sis.c#21 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#31 integrate .. //depot/projects/smpng/sys/dev/ste/if_ste.c#15 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#26 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#47 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#39 integrate .. //depot/projects/smpng/sys/dev/virtio/network/if_vtnet.c#16 integrate .. //depot/projects/smpng/sys/dev/vr/if_vr.c#18 integrate .. //depot/projects/smpng/sys/dev/vxge/vxge.c#7 integrate .. //depot/projects/smpng/sys/i386/i386/db_disasm.c#10 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#191 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#154 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#34 integrate .. //depot/projects/smpng/sys/i386/i386/swtch.s#38 integrate .. //depot/projects/smpng/sys/i386/include/npx.h#18 integrate .. //depot/projects/smpng/sys/i386/include/pc/bios.h#12 integrate .. //depot/projects/smpng/sys/i386/include/pcb.h#21 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#81 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#92 integrate .. //depot/projects/smpng/sys/kern/sysv_shm.c#64 integrate .. //depot/projects/smpng/sys/kern/uipc_shm.c#26 integrate .. //depot/projects/smpng/sys/mips/cavium/if_octm.c#7 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/octe.c#7 integrate .. //depot/projects/smpng/sys/net/if.c#159 integrate .. //depot/projects/smpng/sys/net/if.h#62 integrate .. //depot/projects/smpng/sys/net/if_mib.c#23 integrate .. //depot/projects/smpng/sys/net/if_var.h#92 integrate .. //depot/projects/smpng/sys/net/rtsock.c#100 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#105 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#61 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf.c#13 integrate .. //depot/projects/smpng/sys/sys/ata.h#43 integrate .. //depot/projects/smpng/sys/sys/mman.h#23 integrate .. //depot/projects/smpng/sys/sys/sockio.h#25 integrate .. //depot/projects/smpng/sys/tools/fdt/make_dtb.sh#3 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#143 integrate .. //depot/projects/smpng/sys/x86/acpica/acpi_wakeup.c#7 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#129 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 268982 2014-07-22 13:58:33Z emaste $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 270828 2014-08-29 21:25:47Z jhb $"); #include "opt_atpic.h" #include "opt_compat.h" ==== //depot/projects/smpng/sys/amd64/amd64/support.S#28 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/amd64/support.S 249439 2013-04-13 15:20:33Z kib $ + * $FreeBSD: head/sys/amd64/amd64/support.S 270844 2014-08-30 15:41:07Z pfg $ */ #include "opt_ddb.h" @@ -59,7 +59,7 @@ stosb ret END(bzero) - + /* Address: %rdi */ ENTRY(pagezero) movq $-PAGE_SIZE,%rdx @@ -137,7 +137,7 @@ cld ret END(bcopy) - + /* * Note: memcpy does not support overlapping copies */ @@ -181,10 +181,10 @@ ret END(pagecopy) -/* fillw(pat, base, cnt) */ +/* fillw(pat, base, cnt) */ /* %rdi,%rsi, %rdx */ ENTRY(fillw) - movq %rdi,%rax + movq %rdi,%rax movq %rsi,%rdi movq %rdx,%rcx cld @@ -388,7 +388,7 @@ movq (%rdi),%rax movq $0,PCB_ONFAULT(%rcx) ret -END(fuword64) +END(fuword64) END(fuword) ENTRY(fuword32) ==== //depot/projects/smpng/sys/amd64/include/pc/bios.h#9 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/pc/bios.h 263009 2014-03-11 10:23:03Z royger $ + * $FreeBSD: head/sys/amd64/include/pc/bios.h 270828 2014-08-29 21:25:47Z jhb $ */ #ifndef _MACHINE_PC_BIOS_H_ ==== //depot/projects/smpng/sys/amd64/vmm/vmm_instruction_emul.c#12 (text+ko) ==== @@ -24,11 +24,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270689 2014-08-27 00:53:56Z grehan $ + * $FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270857 2014-08-30 19:59:42Z neel $ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270689 2014-08-27 00:53:56Z grehan $"); +__FBSDID("$FreeBSD: head/sys/amd64/vmm/vmm_instruction_emul.c 270857 2014-08-30 19:59:42Z neel $"); #ifdef _KERNEL #include @@ -316,46 +316,36 @@ return (error); } +#define RFLAGS_STATUS_BITS (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_V) + /* * Return the status flags that would result from doing (x - y). */ -static u_long -getcc16(uint16_t x, uint16_t y) -{ - u_long rflags; +#define GETCC(sz) \ +static u_long \ +getcc##sz(uint##sz##_t x, uint##sz##_t y) \ +{ \ + u_long rflags; \ + \ + __asm __volatile("sub %2,%1; pushfq; popq %0" : \ + "=r" (rflags), "+r" (x) : "m" (y)); \ + return (rflags); \ +} struct __hack - __asm __volatile("sub %1,%2; pushfq; popq %0" : - "=r" (rflags) : "m" (y), "r" (x)); - return (rflags); -} +GETCC(8); +GETCC(16); +GETCC(32); +GETCC(64); static u_long -getcc32(uint32_t x, uint32_t y) -{ - u_long rflags; - - __asm __volatile("sub %1,%2; pushfq; popq %0" : - "=r" (rflags) : "m" (y), "r" (x)); - return (rflags); -} - -static u_long -getcc64(uint64_t x, uint64_t y) -{ - u_long rflags; - - __asm __volatile("sub %1,%2; pushfq; popq %0" : - "=r" (rflags) : "m" (y), "r" (x)); - return (rflags); -} - -static u_long getcc(int opsize, uint64_t x, uint64_t y) { - KASSERT(opsize == 2 || opsize == 4 || opsize == 8, + KASSERT(opsize == 1 || opsize == 2 || opsize == 4 || opsize == 8, ("getcc: invalid operand size %d", opsize)); - if (opsize == 2) + if (opsize == 1) + return (getcc8(x, y)); + else if (opsize == 2) return (getcc16(x, y)); else if (opsize == 4) return (getcc32(x, y)); @@ -569,7 +559,7 @@ { int error, size; enum vm_reg_name reg; - uint64_t val1, val2; + uint64_t result, rflags, rflags2, val1, val2; size = vie->opsize; error = EINVAL; @@ -597,8 +587,8 @@ break; /* perform the operation and write the result */ - val1 &= val2; - error = vie_update_register(vm, vcpuid, reg, val1, size); + result = val1 & val2; + error = vie_update_register(vm, vcpuid, reg, result, size); break; case 0x81: /* @@ -625,11 +615,11 @@ switch (vie->reg & 7) { case 0x4: /* modrm:reg == b100, AND */ - val1 &= vie->immediate; + result = val1 & vie->immediate; break; case 0x1: /* modrm:reg == b001, OR */ - val1 |= vie->immediate; + result = val1 | vie->immediate; break; default: error = EINVAL; @@ -638,11 +628,29 @@ if (error) break; - error = memwrite(vm, vcpuid, gpa, val1, size, arg); + error = memwrite(vm, vcpuid, gpa, result, size, arg); break; default: break; } + if (error) + return (error); + + error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, &rflags); + if (error) + return (error); + + /* + * OF and CF are cleared; the SF, ZF and PF flags are set according + * to the result; AF is undefined. + * + * The updated status flags are obtained by subtracting 0 from 'result'. + */ + rflags2 = getcc(size, result, 0); + rflags &= ~RFLAGS_STATUS_BITS; + rflags |= rflags2 & (PSL_PF | PSL_Z | PSL_N); + + error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, rflags, 8); return (error); } @@ -651,7 +659,7 @@ mem_region_read_t memread, mem_region_write_t memwrite, void *arg) { int error, size; - uint64_t val1; + uint64_t val1, result, rflags, rflags2; size = vie->opsize; error = EINVAL; @@ -681,17 +689,33 @@ * perform the operation with the pre-fetched immediate * operand and write the result */ - val1 |= vie->immediate; - error = memwrite(vm, vcpuid, gpa, val1, size, arg); + result = val1 | vie->immediate; + error = memwrite(vm, vcpuid, gpa, result, size, arg); break; default: break; } + if (error) + return (error); + + error = vie_read_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, &rflags); + if (error) + return (error); + + /* + * OF and CF are cleared; the SF, ZF and PF flags are set according + * to the result; AF is undefined. + * + * The updated status flags are obtained by subtracting 0 from 'result'. + */ + rflags2 = getcc(size, result, 0); + rflags &= ~RFLAGS_STATUS_BITS; + rflags |= rflags2 & (PSL_PF | PSL_Z | PSL_N); + + error = vie_update_register(vm, vcpuid, VM_REG_GUEST_RFLAGS, rflags, 8); return (error); } -#define RFLAGS_STATUS_BITS (PSL_C | PSL_PF | PSL_AF | PSL_Z | PSL_N | PSL_V) - static int emulate_cmp(void *vm, int vcpuid, uint64_t gpa, struct vie *vie, mem_region_read_t memread, mem_region_write_t memwrite, void *arg) ==== //depot/projects/smpng/sys/arm/arm/locore.S#34 (text+ko) ==== @@ -37,9 +37,10 @@ #include #include #include +#include #include -__FBSDID("$FreeBSD: head/sys/arm/arm/locore.S 269390 2014-08-01 18:24:44Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/locore.S 270862 2014-08-30 22:21:57Z ian $"); /* What size should this really be ? It is only used by initarm() */ #define INIT_ARM_STACK_SIZE (2048 * 4) @@ -389,9 +390,9 @@ nop CPWAIT(r0) -#if defined(ARM_MMU_V6) +#if ARM_MMU_V6 bl armv6_idcache_inv_all /* Modifies r0 only */ -#elif defined(ARM_MMU_V7) +#elif ARM_MMU_V7 bl armv7_idcache_inv_all /* Modifies r0-r3, ip */ #endif ==== //depot/projects/smpng/sys/arm/conf/BEAGLEBONE#12 (text+ko) ==== @@ -18,7 +18,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/BEAGLEBONE 266647 2014-05-25 10:17:26Z andrew $ +# $FreeBSD: head/sys/arm/conf/BEAGLEBONE 270912 2014-09-01 03:49:21Z imp $ ident BEAGLEBONE @@ -116,7 +116,7 @@ #options USB_VERBOSE device musb device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) # Ethernet ==== //depot/projects/smpng/sys/arm/conf/CNS11XXNAS#11 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/CNS11XXNAS 264219 2014-04-07 05:33:30Z rpaulo $ +# $FreeBSD: head/sys/arm/conf/CNS11XXNAS 270912 2014-09-01 03:49:21Z imp $ ident CNS11XXNAS @@ -111,7 +111,7 @@ device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass device cfi ==== //depot/projects/smpng/sys/arm/conf/CUBIEBOARD#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/CUBIEBOARD 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/CUBIEBOARD 270912 2014-09-01 03:49:21Z imp $ ident CUBIEBOARD @@ -104,7 +104,7 @@ # GPIO device gpio -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass ==== //depot/projects/smpng/sys/arm/conf/CUBIEBOARD2#5 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/CUBIEBOARD2 263698 2014-03-25 01:34:39Z ganbold $ +# $FreeBSD: head/sys/arm/conf/CUBIEBOARD2 270912 2014-09-01 03:49:21Z imp $ ident CUBIEBOARD2 @@ -104,7 +104,7 @@ # GPIO device gpio -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass ==== //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/DIGI-CCWMX53 264251 2014-04-08 04:05:04Z rpaulo $ +# $FreeBSD: head/sys/arm/conf/DIGI-CCWMX53 270912 2014-09-01 03:49:21Z imp $ ident DIGI-CCWMX53 @@ -130,10 +130,10 @@ device iicbus # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. ==== //depot/projects/smpng/sys/arm/conf/EB9200#7 (text+ko) ==== @@ -10,7 +10,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/EB9200 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/EB9200 270912 2014-09-01 03:49:21Z imp $ #NO_UNIVERSE @@ -102,10 +102,10 @@ device usb # USB Bus (required) device umass # Disks/Mass storage - Requires scbus and da # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB device (gadget) support #device at91_dci # Atmel's usb device ==== //depot/projects/smpng/sys/arm/conf/EFIKA_MX#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/EFIKA_MX 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/EFIKA_MX 270912 2014-09-01 03:49:21Z imp $ ident EFIKA_MX @@ -126,10 +126,10 @@ device iicbus # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. ==== //depot/projects/smpng/sys/arm/conf/EXYNOS5.common#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/EXYNOS5.common 269369 2014-08-01 06:20:25Z br $ +# $FreeBSD: head/sys/arm/conf/EXYNOS5.common 270912 2014-09-01 03:49:21Z imp $ makeoptions MODULES_OVERRIDE="" makeoptions WITHOUT_MODULES="ahc" @@ -104,7 +104,7 @@ device xhci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass ==== //depot/projects/smpng/sys/arm/conf/HL200#21 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/HL200 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/HL200 270912 2014-09-01 03:49:21Z imp $ #NO_UNIVERSE @@ -132,10 +132,10 @@ device ural # Ralink Technology RT2500USB wireless NICs device zyd # ZyDAS zd1211/zd1211b wireless NICs # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # Wireless NIC cards device wlan # 802.11 support device wlan_wep # 802.11 WEP support ==== //depot/projects/smpng/sys/arm/conf/HL201#13 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/HL201 270103 2014-08-17 16:53:10Z imp $ +# $FreeBSD: head/sys/arm/conf/HL201 270912 2014-09-01 03:49:21Z imp $ #NO_UNIVERSE @@ -116,10 +116,10 @@ #device ural # Ralink Technology RT2500USB wireless NICs #device zyd # ZyDAS zd1211/zd1211b wireless NICs # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # Wireless NIC cards #device wlan # 802.11 support #device wlan_wep # 802.11 WEP support ==== //depot/projects/smpng/sys/arm/conf/IMX53-QSB#5 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/IMX53-QSB 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/IMX53-QSB 270912 2014-09-01 03:49:21Z imp $ ident IMX53-QSB @@ -129,10 +129,10 @@ device iicbus # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support options USB_HOST_ALIGN=64 # Align usb buffers to cache line size. ==== //depot/projects/smpng/sys/arm/conf/IMX6#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/IMX6 268977 2014-07-22 04:39:32Z br $ +# $FreeBSD: head/sys/arm/conf/IMX6 270912 2014-09-01 03:49:21Z imp $ ident IMX6 include "../freescale/imx/std.imx6" @@ -25,7 +25,7 @@ options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols -#options SCTP # Stream Control Transmission Protocol +options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists @@ -94,10 +94,10 @@ device mmcsd # SDCard disk device # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support #options USB_DEBUG # enable debug msgs ==== //depot/projects/smpng/sys/arm/conf/KB920X#31 (text) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/KB920X 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/KB920X 270912 2014-09-01 03:49:21Z imp $ #NO_UNIVERSE @@ -132,10 +132,10 @@ device ural # Ralink Technology RT2500USB wireless NICs device zyd # ZyDAS zd1211/zd1211b wireless NICs # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # Wireless NIC cards device wlan # 802.11 support device wlan_wep # 802.11 WEP support ==== //depot/projects/smpng/sys/arm/conf/NSLU#17 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/NSLU 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/NSLU 270912 2014-09-01 03:49:21Z imp $ #NO_UNIVERSE @@ -115,5 +115,5 @@ device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) ==== //depot/projects/smpng/sys/arm/conf/PANDABOARD#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/PANDABOARD 266647 2014-05-25 10:17:26Z andrew $ +# $FreeBSD: head/sys/arm/conf/PANDABOARD 270912 2014-09-01 03:49:21Z imp $ ident PANDABOARD @@ -122,7 +122,7 @@ device ohci device ehci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) # Ethernet ==== //depot/projects/smpng/sys/arm/conf/QILA9G20#12 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/QILA9G20 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/QILA9G20 270912 2014-09-01 03:49:21Z imp $ #NO_UNIVERSE @@ -117,10 +117,10 @@ device icee # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support device ohci # OHCI localbus->USB interface ==== //depot/projects/smpng/sys/arm/conf/RK3188#2 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/RK3188 266940 2014-06-01 05:02:48Z ganbold $ +# $FreeBSD: head/sys/arm/conf/RK3188 270912 2014-09-01 03:49:21Z imp $ ident RK3188 @@ -88,7 +88,7 @@ # GPIO device gpio -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass ==== //depot/projects/smpng/sys/arm/conf/SAM9G20EK#12 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/SAM9G20EK 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/SAM9G20EK 270912 2014-09-01 03:49:21Z imp $ ident SAM9G20EK @@ -119,10 +119,10 @@ device icee # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support device ohci # OHCI localbus->USB interface ==== //depot/projects/smpng/sys/arm/conf/SAM9X25EK#9 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/SAM9X25EK 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/SAM9X25EK 270912 2014-09-01 03:49:21Z imp $ #NO_UNIVERSE @@ -118,10 +118,10 @@ device icee # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support #device ohci # OHCI localbus->USB interface ==== //depot/projects/smpng/sys/arm/conf/SN9G45#8 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/SN9G45 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/SN9G45 270912 2014-09-01 03:49:21Z imp $ #NO_UNIVERSE @@ -95,10 +95,10 @@ device at91_wdt # WDT: Watchdog timer # SCSI peripherals -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device cd # CD -device pass # Passthrough device (direct SCSI access) +device pass # Passthrough device (direct ATA/SCSI access) # USB support device ohci # OHCI localbus->USB interface ==== //depot/projects/smpng/sys/arm/conf/VYBRID#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/VYBRID 269234 2014-07-29 12:44:19Z br $ +# $FreeBSD: head/sys/arm/conf/VYBRID 270912 2014-09-01 03:49:21Z imp $ ident VYBRID include "../freescale/vybrid/std.vybrid" @@ -112,7 +112,7 @@ #device ohci device umass -device scbus # SCSI bus (required for SCSI) +device scbus # SCSI bus (required for ATA/SCSI) device da # Direct Access (disks) device pass ==== //depot/projects/smpng/sys/arm/conf/WANDBOARD-DUAL#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/WANDBOARD-DUAL 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/WANDBOARD-DUAL 270879 2014-08-31 15:25:40Z ian $ #NO_UNIVERSE @@ -23,7 +23,6 @@ ident WANDBOARD-DUAL # Flattened Device Tree -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=wandboard-dual.dts ==== //depot/projects/smpng/sys/arm/conf/WANDBOARD-QUAD#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/WANDBOARD-QUAD 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/WANDBOARD-QUAD 270879 2014-08-31 15:25:40Z ian $ #NO_UNIVERSE @@ -23,7 +23,6 @@ ident WANDBOARD-QUAD # Flattened Device Tree -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=wandboard-quad.dts ==== //depot/projects/smpng/sys/arm/conf/WANDBOARD-SOLO#3 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/WANDBOARD-SOLO 265155 2014-04-30 18:02:10Z imp $ +# $FreeBSD: head/sys/arm/conf/WANDBOARD-SOLO 270879 2014-08-31 15:25:40Z ian $ #NO_UNIVERSE @@ -23,7 +23,6 @@ ident WANDBOARD-SOLO # Flattened Device Tree -options FDT options FDT_DTB_STATIC makeoptions FDT_DTS_FILE=wandboard-solo.dts ==== //depot/projects/smpng/sys/arm/conf/ZEDBOARD#7 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/ZEDBOARD 267146 2014-06-06 04:08:55Z imp $ +# $FreeBSD: head/sys/arm/conf/ZEDBOARD 270912 2014-09-01 03:49:21Z imp $ ident ZEDBOARD >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:53:44 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65BAA1D93; Mon, 8 Sep 2014 04:53:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B92F47D for ; Mon, 8 Sep 2014 04:52:20 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 11DDC1FBD for ; Mon, 8 Sep 2014 04:52:20 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qJhk029312 for ; Mon, 8 Sep 2014 04:52:19 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qJNO029308 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:19 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:52:19 GMT Message-Id: <201409080452.s884qJNO029308@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199738 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:53:44 -0000 http://p4web.freebsd.org/@@1199738?ac=10 Change 1199738 by jhb@jhb_ralph on 2014/09/03 16:38:05 Move some prototypes to headers and some other cleanups. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#54 edit .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#130 edit .. //depot/projects/smpng/sys/amd64/include/md_var.h#31 edit .. //depot/projects/smpng/sys/i386/i386/identcpu.c#81 edit .. //depot/projects/smpng/sys/i386/i386/initcpu.c#46 edit .. //depot/projects/smpng/sys/i386/i386/machdep.c#192 edit .. //depot/projects/smpng/sys/i386/i386/trap.c#143 edit .. //depot/projects/smpng/sys/i386/include/md_var.h#42 edit .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#67 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#54 (text+ko) ==== @@ -64,15 +64,8 @@ #include #include -/* XXX - should be in header file: */ -void printcpuinfo(void); -void identify_cpu(void); -void earlysetcpuclass(void); -void panicifcpuunsupported(void); - static u_int find_cpu_vendor_id(void); static void print_AMD_info(void); -static void print_AMD_assoc(int i); static void print_via_padlock_info(void); static void print_vmx_info(void); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#130 (text+ko) ==== @@ -151,10 +151,6 @@ extern u_int64_t hammer_time(u_int64_t, u_int64_t); -extern void printcpuinfo(void); /* XXX header file */ -extern void identify_cpu(void); -extern void panicifcpuunsupported(void); - #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) ==== //depot/projects/smpng/sys/amd64/include/md_var.h#31 (text+ko) ==== @@ -105,14 +105,17 @@ void gsbase_load_fault(void) __asm(__STRING(gsbase_load_fault)); void dump_add_page(vm_paddr_t); void dump_drop_page(vm_paddr_t); +void identify_cpu(void); void initializecpu(void); void initializecpucache(void); void fillw(int /*u_short*/ pat, void *base, size_t cnt); void fpstate_drop(struct thread *td); int is_physical_memory(vm_paddr_t addr); int isa_nmi(int cd); +void panicifcpuunsupported(void); void pagecopy(void *from, void *to); void pagezero(void *addr); +void printcpuinfo(void); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int ist); int user_dbreg_trap(void); void minidumpsys(struct dumperinfo *); ==== //depot/projects/smpng/sys/i386/i386/identcpu.c#81 (text+ko) ==== @@ -64,30 +64,16 @@ #define IDENTBLUE_IBMCPU 1 #define IDENTBLUE_CYRIXM2 2 -/* XXX - should be in header file: */ -void printcpuinfo(void); -void finishidentcpu(void); -void earlysetcpuclass(void); -#if defined(I586_CPU) && defined(CPU_WT_ALLOC) -void enable_K5_wt_alloc(void); -void enable_K6_wt_alloc(void); -void enable_K6_2_wt_alloc(void); -#endif -void panicifcpuunsupported(void); - static void identifycyrix(void); static void init_exthigh(void); static u_int find_cpu_vendor_id(void); static void print_AMD_info(void); static void print_INTEL_info(void); static void print_INTEL_TLB(u_int data); -static void print_AMD_assoc(int i); static void print_transmeta_info(void); static void print_via_padlock_info(void); int cpu_class; -u_int cpu_exthigh; /* Highest arg to extended CPUID */ -u_int cyrix_did; /* Device ID of Cyrix CPU */ char machine[] = MACHINE; SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "Machine class"); @@ -161,10 +147,6 @@ #endif }; -#if defined(I586_CPU) && !defined(NO_F00F_HACK) -int has_f00f_bug = 0; /* Initialized so that it can be patched. */ -#endif - static void init_exthigh(void) { ==== //depot/projects/smpng/sys/i386/i386/initcpu.c#46 (text+ko) ==== @@ -48,12 +48,6 @@ #define CPU_ENABLE_SSE #endif -#if defined(I586_CPU) && defined(CPU_WT_ALLOC) -void enable_K5_wt_alloc(void); -void enable_K6_wt_alloc(void); -void enable_K6_2_wt_alloc(void); -#endif - #ifdef I486_CPU static void init_5x86(void); static void init_bluelightning(void); @@ -81,36 +75,36 @@ */ static int hw_clflush_disable = -1; -/* Must *NOT* be BSS or locore will bzero these after setting them */ -int cpu = 0; /* Are we 386, 386sx, 486, etc? */ -u_int cpu_feature = 0; /* Feature flags */ -u_int cpu_feature2 = 0; /* Feature flags */ -u_int amd_feature = 0; /* AMD feature flags */ -u_int amd_feature2 = 0; /* AMD feature flags */ -u_int amd_pminfo = 0; /* AMD advanced power management info */ -u_int via_feature_rng = 0; /* VIA RNG features */ -u_int via_feature_xcrypt = 0; /* VIA ACE features */ -u_int cpu_high = 0; /* Highest arg to CPUID */ -u_int cpu_id = 0; /* Stepping ID */ -u_int cpu_procinfo = 0; /* HyperThreading Info / Brand Index / CLFUSH */ -u_int cpu_procinfo2 = 0; /* Multicore info */ -char cpu_vendor[20] = ""; /* CPU Origin code */ -u_int cpu_vendor_id = 0; /* CPU vendor ID */ +int cpu; /* Are we 386, 386sx, 486, etc? */ +u_int cpu_feature; /* Feature flags */ +u_int cpu_feature2; /* Feature flags */ +u_int amd_feature; /* AMD feature flags */ +u_int amd_feature2; /* AMD feature flags */ +u_int amd_pminfo; /* AMD advanced power management info */ +u_int via_feature_rng; /* VIA RNG features */ +u_int via_feature_xcrypt; /* VIA ACE features */ +u_int cpu_high; /* Highest arg to CPUID */ +u_int cpu_exthigh; /* Highest arg to extended CPUID */ +u_int cpu_id; /* Stepping ID */ +u_int cpu_procinfo; /* HyperThreading Info / Brand Index / CLFUSH */ +u_int cpu_procinfo2; /* Multicore info */ +char cpu_vendor[20]; /* CPU Origin code */ +u_int cpu_vendor_id; /* CPU vendor ID */ +#ifdef CPU_ENABLE_SSE +u_int cpu_fxsr; /* SSE enabled */ +u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ +#endif u_int cpu_clflush_line_size = 32; u_int cpu_mon_mwait_flags; /* MONITOR/MWAIT flags (CPUID.05H.ECX) */ u_int cpu_mon_min_size; /* MONITOR minimum range size, bytes */ u_int cpu_mon_max_size; /* MONITOR minimum range size, bytes */ +u_int cyrix_did; /* Device ID of Cyrix CPU */ SYSCTL_UINT(_hw, OID_AUTO, via_feature_rng, CTLFLAG_RD, &via_feature_rng, 0, "VIA RNG feature available in CPU"); SYSCTL_UINT(_hw, OID_AUTO, via_feature_xcrypt, CTLFLAG_RD, &via_feature_xcrypt, 0, "VIA xcrypt feature available in CPU"); -#ifdef CPU_ENABLE_SSE -u_int cpu_fxsr; /* SSE enabled */ -u_int cpu_mxcsr_mask; /* valid bits in mxcsr */ -#endif - #ifdef I486_CPU /* * IBM Blue Lightning ==== //depot/projects/smpng/sys/i386/i386/machdep.c#192 (text+ko) ==== @@ -180,10 +180,6 @@ extern void init386(int first); extern void dblfault_handler(void); -extern void printcpuinfo(void); /* XXX header file */ -extern void finishidentcpu(void); -extern void panicifcpuunsupported(void); - #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) @@ -1665,10 +1661,6 @@ struct region_descriptor r_gdt, r_idt; /* table descriptors */ struct mtx dt_lock; /* lock for GDT and LDT */ -#if defined(I586_CPU) && !defined(NO_F00F_HACK) -extern int has_f00f_bug; -#endif - static struct i386tss dblfault_tss; static char dblfault_stack[PAGE_SIZE]; ==== //depot/projects/smpng/sys/i386/i386/trap.c#143 (text+ko) ==== @@ -153,7 +153,7 @@ }; #if defined(I586_CPU) && !defined(NO_F00F_HACK) -extern int has_f00f_bug; +int has_f00f_bug = 0; /* Initialized so that it can be patched. */ #endif #ifdef KDB ==== //depot/projects/smpng/sys/i386/include/md_var.h#42 (text+ko) ==== @@ -56,10 +56,13 @@ extern u_int cpu_procinfo2; extern char cpu_vendor[]; extern u_int cpu_vendor_id; -extern u_int cyrix_did; extern u_int cpu_mon_mwait_flags; extern u_int cpu_mon_min_size; extern u_int cpu_mon_max_size; +extern u_int cyrix_did; +#if defined(I586_CPU) && !defined(NO_F00F_HACK) +extern int has_f00f_bug; +#endif extern char kstack[]; extern char sigcode[]; extern int szsigcode; @@ -94,15 +97,23 @@ void doreti_popl_fs_fault(void) __asm(__STRING(doreti_popl_fs_fault)); void dump_add_page(vm_paddr_t); void dump_drop_page(vm_paddr_t); -void initializecpu(void); +void finishidentcpu(void); +#if defined(I586_CPU) && defined(CPU_WT_ALLOC) +void enable_K5_wt_alloc(void); +void enable_K6_wt_alloc(void); +void enable_K6_2_wt_alloc(void); +#endif void enable_sse(void); void fillw(int /*u_short*/ pat, void *base, size_t cnt); +void initializecpu(void); void i686_pagezero(void *addr); void sse2_pagezero(void *addr); void init_AMD_Elan_sc520(void); int is_physical_memory(vm_paddr_t addr); int isa_nmi(int cd); vm_paddr_t kvtop(void *addr); +void panicifcpuunsupported(void); +void printcpuinfo(void); void setidt(int idx, alias_for_inthand_t *func, int typ, int dpl, int selec); int user_dbreg_trap(void); void minidumpsys(struct dumperinfo *); ==== //depot/projects/smpng/sys/pc98/pc98/machdep.c#67 (text+ko) ==== @@ -149,10 +149,6 @@ extern void init386(int first); extern void dblfault_handler(void); -extern void printcpuinfo(void); /* XXX header file */ -extern void finishidentcpu(void); -extern void panicifcpuunsupported(void); - #define CS_SECURE(cs) (ISPL(cs) == SEL_UPL) #define EFL_SECURE(ef, oef) ((((ef) ^ (oef)) & ~PSL_USERCHANGE) == 0) From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:53:48 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60D4C1EB4; Mon, 8 Sep 2014 04:53:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5DAB14BA for ; Mon, 8 Sep 2014 04:52:22 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 40FEC1FD0 for ; Mon, 8 Sep 2014 04:52:22 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qLSH029417 for ; Mon, 8 Sep 2014 04:52:21 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qLgG029413 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:21 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:52:21 GMT Message-Id: <201409080452.s884qLgG029413@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199754 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:53:48 -0000 http://p4web.freebsd.org/@@1199754?ac=10 Change 1199754 by jmg@jmg_carbon2 on 2014/09/03 17:48:24 after testing, I have confirmed that _GCM does not suffer the same problem that _ICM does, and it can be used on arbitrary byte boundaries... other minor formating issues wrt bits... Sponsored by: FreeBSD Foundation Affected files ... .. //depot/projects/opencrypto/share/man/man7/crypto.7#2 edit Differences ... ==== //depot/projects/opencrypto/share/man/man7/crypto.7#2 (text+ko) ==== @@ -59,7 +59,7 @@ .It IV size : 12 .It Block size : -1 (aesni), 16 (software) +1 .It Key size : 16, 24 or 32 .El @@ -91,9 +91,9 @@ This is similar to what most people call counter mode, but instead of the counter being split into a nonce and a counter part, then entire nonce is used as the initial counter. -This does mean that if a counter is required that rolls over at 32bits, +This does mean that if a counter is required that rolls over at 32 bits, the transaction need to be split into two parts where the counter rolls over. -The counter incremented as a 128bit big endian number. +The counter incremented as a 128-bit big endian number. .It Dv CRYPTO_AES_XTS .Bl -tag -width "Block size :" -compact -offset indent .It IV size : From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:53:57 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 161C4FB; Mon, 8 Sep 2014 04:53:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4DE25532 for ; Mon, 8 Sep 2014 04:52:26 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3050A1FF3 for ; Mon, 8 Sep 2014 04:52:26 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qQfG029640 for ; Mon, 8 Sep 2014 04:52:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qQtV029637 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:26 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:52:26 GMT Message-Id: <201409080452.s884qQtV029637@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199789 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:53:57 -0000 http://p4web.freebsd.org/@@1199789?ac=10 Change 1199789 by jhb@jhb_ralph on 2014/09/04 01:56:54 Trim trailing whitespace. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#55 edit .. //depot/projects/smpng/sys/i386/i386/identcpu.c#82 edit Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/identcpu.c#55 (text+ko) ==== @@ -97,11 +97,11 @@ NULL, 0, sysctl_hw_machine, "A", "Machine class"); static char cpu_model[128]; -SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, +SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, "Machine model"); static int hw_clockrate; -SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD, +SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD, &hw_clockrate, 0, "CPU instruction clock rate"); static eventhandler_tag tsc_post_tag; @@ -686,15 +686,15 @@ printf("L2 unified cache: %d kbytes", regs[2] >> 16); printf(", %d bytes/line", regs[2] & 0xff); printf(", %d lines/tag", (regs[2] >> 8) & 0x0f); - print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); + print_AMD_l2_assoc((regs[2] >> 12) & 0x0f); } /* - * Opteron Rev E shows a bug as in very rare occasions a read memory - * barrier is not performed as expected if it is followed by a - * non-atomic read-modify-write instruction. + * Opteron Rev E shows a bug as in very rare occasions a read memory + * barrier is not performed as expected if it is followed by a + * non-atomic read-modify-write instruction. * As long as that bug pops up very rarely (intensive machine usage - * on other operating systems generally generates one unexplainable + * on other operating systems generally generates one unexplainable * crash any 2 months) and as long as a model specific fix would be * impratical at this stage, print out a warning string if the broken * model and family are identified. @@ -910,7 +910,7 @@ "\012single" /* INVVPID single-context type */ "\013all" /* INVVPID all-context type */ /* INVVPID single-context-retaining-globals type */ - "\014single-globals" + "\014single-globals" ); } } ==== //depot/projects/smpng/sys/i386/i386/identcpu.c#82 (text+ko) ==== @@ -75,15 +75,15 @@ int cpu_class; char machine[] = MACHINE; -SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, +SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD, machine, 0, "Machine class"); static char cpu_model[128]; -SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, +SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, "Machine model"); static int hw_clockrate; -SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD, +SYSCTL_INT(_hw, OID_AUTO, clockrate, CTLFLAG_RD, &hw_clockrate, 0, "CPU instruction clock rate"); static eventhandler_tag tsc_post_tag; @@ -1270,7 +1270,7 @@ printf("L2 internal cache: %d kbytes", regs[2] >> 16); printf(", %d bytes/line", regs[2] & 0xff); printf(", %d lines/tag", (regs[2] >> 8) & 0x0f); - print_AMD_assoc((regs[2] >> 12) & 0x0f); + print_AMD_assoc((regs[2] >> 12) & 0x0f); } } if (((cpu_id & 0xf00) == 0x500) From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:53:59 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 94B1B3AA; Mon, 8 Sep 2014 04:53:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8638D554 for ; Mon, 8 Sep 2014 04:52:27 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 69A4B1FFD for ; Mon, 8 Sep 2014 04:52:27 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qRQc029705 for ; Mon, 8 Sep 2014 04:52:27 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qRLT029702 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:27 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:52:27 GMT Message-Id: <201409080452.s884qRLT029702@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199799 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:53:59 -0000 http://p4web.freebsd.org/@@1199799?ac=10 Change 1199799 by jhb@jhb_ralph on 2014/09/04 02:36:12 Add a merged identcpu.c. Affected files ... .. //depot/projects/smpng/sys/conf/files.amd64#105 edit .. //depot/projects/smpng/sys/conf/files.i386#163 edit .. //depot/projects/smpng/sys/conf/files.pc98#121 edit .. //depot/projects/smpng/sys/i386/i386/initcpu.c#47 edit .. //depot/projects/smpng/sys/i386/include/md_var.h#43 edit .. //depot/projects/smpng/sys/x86/x86/identcpu.c#1 add Differences ... ==== //depot/projects/smpng/sys/conf/files.amd64#105 (text+ko) ==== @@ -103,7 +103,6 @@ amd64/amd64/exception.S standard amd64/amd64/fpu.c standard amd64/amd64/gdb_machdep.c optional gdb -amd64/amd64/identcpu.c standard amd64/amd64/in_cksum.c optional inet | inet6 amd64/amd64/initcpu.c standard amd64/amd64/io.c optional io @@ -542,6 +541,7 @@ x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard x86/x86/fdt_machdep.c optional fdt +x86/x86/identcpu.c standard x86/x86/intr_machdep.c standard x86/x86/io_apic.c standard x86/x86/legacy.c standard ==== //depot/projects/smpng/sys/conf/files.i386#163 (text+ko) ==== @@ -443,7 +443,6 @@ i386/i386/gdb_machdep.c optional gdb i386/i386/geode.c optional cpu_geode i386/i386/i686_mem.c optional mem -i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/io.c optional io @@ -581,6 +580,7 @@ x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard x86/x86/fdt_machdep.c optional fdt +x86/x86/identcpu.c standard x86/x86/intr_machdep.c standard x86/x86/io_apic.c optional apic x86/x86/legacy.c optional native ==== //depot/projects/smpng/sys/conf/files.pc98#121 (text+ko) ==== @@ -140,7 +140,6 @@ i386/i386/exception.s standard i386/i386/gdb_machdep.c optional gdb i386/i386/i686_mem.c optional mem -i386/i386/identcpu.c standard i386/i386/in_cksum.c optional inet | inet6 i386/i386/initcpu.c standard i386/i386/io.c optional io @@ -248,6 +247,7 @@ x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard x86/x86/dump_machdep.c standard +x86/x86/identcpu.c standard x86/x86/intr_machdep.c standard x86/x86/io_apic.c optional apic x86/x86/legacy.c standard ==== //depot/projects/smpng/sys/i386/i386/initcpu.c#47 (text+ko) ==== @@ -95,6 +95,7 @@ u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ #endif u_int cpu_clflush_line_size = 32; +u_int cpu_stdext_feature; u_int cpu_mon_mwait_flags; /* MONITOR/MWAIT flags (CPUID.05H.ECX) */ u_int cpu_mon_min_size; /* MONITOR minimum range size, bytes */ u_int cpu_mon_max_size; /* MONITOR minimum range size, bytes */ ==== //depot/projects/smpng/sys/i386/include/md_var.h#43 (text+ko) ==== @@ -48,6 +48,7 @@ extern u_int via_feature_rng; extern u_int via_feature_xcrypt; extern u_int cpu_clflush_line_size; +extern u_int cpu_stdext_feature; extern u_int cpu_fxsr; extern u_int cpu_high; extern u_int cpu_id; From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:53:57 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 92D501D7; Mon, 8 Sep 2014 04:53:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8169F53A for ; Mon, 8 Sep 2014 04:52:26 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6E8591FF5 for ; Mon, 8 Sep 2014 04:52:26 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qQ1r029653 for ; Mon, 8 Sep 2014 04:52:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qQAQ029650 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:26 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:52:26 GMT Message-Id: <201409080452.s884qQAQ029650@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199791 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:53:57 -0000 http://p4web.freebsd.org/@@1199791?ac=10 Change 1199791 by jhb@jhb_ralph on 2014/09/04 02:02:56 - Collapse init_exthigh() down to match amd64. - Move TSC blacklists into the TSC probe code. Affected files ... .. //depot/projects/smpng/sys/i386/i386/identcpu.c#83 edit .. //depot/projects/smpng/sys/x86/x86/tsc.c#12 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/identcpu.c#83 (text+ko) ==== @@ -65,7 +65,6 @@ #define IDENTBLUE_CYRIXM2 2 static void identifycyrix(void); -static void init_exthigh(void); static u_int find_cpu_vendor_id(void); static void print_AMD_info(void); static void print_INTEL_info(void); @@ -147,28 +146,6 @@ #endif }; -static void -init_exthigh(void) -{ - static int done = 0; - u_int regs[4]; - - if (done == 0) { - if (cpu_high > 0 && - (cpu_vendor_id == CPU_VENDOR_INTEL || - cpu_vendor_id == CPU_VENDOR_AMD || - cpu_vendor_id == CPU_VENDOR_TRANSMETA || - cpu_vendor_id == CPU_VENDOR_CENTAUR || - cpu_vendor_id == CPU_VENDOR_NSC)) { - do_cpuid(0x80000000, regs); - if (regs[0] >= 0x80000000) - cpu_exthigh = regs[0]; - } - - done = 1; - } -} - void printcpuinfo(void) { @@ -180,7 +157,6 @@ strncpy(cpu_model, i386_cpus[cpu].cpu_name, sizeof (cpu_model)); /* Check for extended CPUID information and a processor name. */ - init_exthigh(); if (cpu_exthigh >= 0x80000004) { brand = cpu_brand; for (i = 0x80000002; i < 0x80000005; i++) { @@ -354,7 +330,6 @@ break; case 0x500: strcat(cpu_model, "K5 model 0"); - tsc_freq = 0; break; case 0x510: strcat(cpu_model, "K5 model 1"); @@ -553,13 +528,6 @@ switch (cpu_id & 0xff0) { case 0x540: strcpy(cpu_model, "IDT WinChip C6"); - /* - * http://www.centtech.com/c6_data_sheet.pdf - * - * I-12 RDTSC may return incoherent values in EDX:EAX - * I-13 RDTSC hangs when certain event counters are used - */ - tsc_freq = 0; break; case 0x580: strcpy(cpu_model, "IDT WinChip 2"); @@ -599,8 +567,6 @@ case 0x540: strcpy(cpu_model, "Geode SC1100"); cpu = CPU_GEODE1100; - if ((cpu_id & CPUID_STEPPING) == 0) - tsc_freq = 0; break; default: strcpy(cpu_model, "Geode/NSC unknown"); @@ -1110,10 +1076,20 @@ cpu_mon_max_size = regs[1] & CPUID5_MON_MAX_SIZE; } + if (cpu_high > 0 && + (cpu_vendor_id == CPU_VENDOR_INTEL || + cpu_vendor_id == CPU_VENDOR_AMD || + cpu_vendor_id == CPU_VENDOR_TRANSMETA || + cpu_vendor_id == CPU_VENDOR_CENTAUR || + cpu_vendor_id == CPU_VENDOR_NSC)) { + do_cpuid(0x80000000, regs); + if (regs[0] >= 0x80000000) + cpu_exthigh = regs[0]; + } + /* Detect AMD features (PTE no-execute bit, 3dnow, 64 bit mode etc) */ if (cpu_vendor_id == CPU_VENDOR_INTEL || cpu_vendor_id == CPU_VENDOR_AMD) { - init_exthigh(); if (cpu_exthigh >= 0x80000001) { do_cpuid(0x80000001, regs); amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff); @@ -1128,7 +1104,6 @@ cpu_procinfo2 = regs[2]; } } else if (cpu_vendor_id == CPU_VENDOR_CENTAUR) { - init_exthigh(); if (cpu_exthigh >= 0x80000001) { do_cpuid(0x80000001, regs); amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff); ==== //depot/projects/smpng/sys/x86/x86/tsc.c#12 (text+ko) ==== @@ -324,6 +324,39 @@ if ((cpu_feature & CPUID_TSC) == 0 || tsc_disabled) return; +#ifdef __i386__ + /* The TSC is known to be broken on certain CPUs. */ + switch (cpu_vendor_id) { + case CPU_VENDOR_AMD: + switch (cpu_id & 0xFF0) { + case 0x500: + /* K5 Model 0 */ + return; + } + break; + case CPU_VENDOR_CENTAUR: + switch (cpu_id & 0xff0) { + case 0x540: + /* + * http://www.centtech.com/c6_data_sheet.pdf + * + * I-12 RDTSC may return incoherent values in EDX:EAX + * I-13 RDTSC hangs when certain event counters are used + */ + return; + } + break; + case CPU_VENDOR_NSC: + switch (cpu_id & 0xff0) { + case 0x540: + if ((cpu_id & CPUID_STEPPING) == 0) + return; + break; + } + break; + } +#endif + probe_tsc_freq(); /* From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:53:58 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD84C2BE; Mon, 8 Sep 2014 04:53:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6CADA551 for ; Mon, 8 Sep 2014 04:52:27 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4E6FE1FFA for ; Mon, 8 Sep 2014 04:52:27 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qQgY029686 for ; Mon, 8 Sep 2014 04:52:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qQx5029683 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:26 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:52:26 GMT Message-Id: <201409080452.s884qQx5029683@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199796 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:53:59 -0000 http://p4web.freebsd.org/@@1199796?ac=10 Change 1199796 by jhb@jhb_pipkin on 2014/09/04 02:21:24 Cleanup extra newline in Intel cache info. Affected files ... .. //depot/projects/smpng/sys/i386/i386/identcpu.c#84 edit Differences ... ==== //depot/projects/smpng/sys/i386/i386/identcpu.c#84 (text+ko) ==== @@ -1327,11 +1327,9 @@ nway = 1 << (nwaycode / 2); else nway = 0; - printf("\nL2 cache: %u kbytes, %u-way associative, %u bytes/line", + printf("L2 cache: %u kbytes, %u-way associative, %u bytes/line\n", (regs[2] >> 16) & 0xffff, nway, regs[2] & 0xff); } - - printf("\n"); } static void @@ -1343,160 +1341,160 @@ default: break; case 0x1: - printf("\nInstruction TLB: 4 KB pages, 4-way set associative, 32 entries"); + printf("Instruction TLB: 4 KB pages, 4-way set associative, 32 entries\n"); break; case 0x2: - printf("\nInstruction TLB: 4 MB pages, fully associative, 2 entries"); + printf("Instruction TLB: 4 MB pages, fully associative, 2 entries\n"); break; case 0x3: - printf("\nData TLB: 4 KB pages, 4-way set associative, 64 entries"); + printf("Data TLB: 4 KB pages, 4-way set associative, 64 entries\n"); break; case 0x4: - printf("\nData TLB: 4 MB Pages, 4-way set associative, 8 entries"); + printf("Data TLB: 4 MB Pages, 4-way set associative, 8 entries\n"); break; case 0x6: - printf("\n1st-level instruction cache: 8 KB, 4-way set associative, 32 byte line size"); + printf("1st-level instruction cache: 8 KB, 4-way set associative, 32 byte line size\n"); break; case 0x8: - printf("\n1st-level instruction cache: 16 KB, 4-way set associative, 32 byte line size"); + printf("1st-level instruction cache: 16 KB, 4-way set associative, 32 byte line size\n"); break; case 0xa: - printf("\n1st-level data cache: 8 KB, 2-way set associative, 32 byte line size"); + printf("1st-level data cache: 8 KB, 2-way set associative, 32 byte line size\n"); break; case 0xc: - printf("\n1st-level data cache: 16 KB, 4-way set associative, 32 byte line size"); + printf("1st-level data cache: 16 KB, 4-way set associative, 32 byte line size\n"); break; case 0x22: - printf("\n3rd-level cache: 512 KB, 4-way set associative, sectored cache, 64 byte line size"); + printf("3rd-level cache: 512 KB, 4-way set associative, sectored cache, 64 byte line size\n"); break; case 0x23: - printf("\n3rd-level cache: 1 MB, 8-way set associative, sectored cache, 64 byte line size"); + printf("3rd-level cache: 1 MB, 8-way set associative, sectored cache, 64 byte line size\n"); break; case 0x25: - printf("\n3rd-level cache: 2 MB, 8-way set associative, sectored cache, 64 byte line size"); + printf("3rd-level cache: 2 MB, 8-way set associative, sectored cache, 64 byte line size\n"); break; case 0x29: - printf("\n3rd-level cache: 4 MB, 8-way set associative, sectored cache, 64 byte line size"); + printf("3rd-level cache: 4 MB, 8-way set associative, sectored cache, 64 byte line size\n"); break; case 0x2c: - printf("\n1st-level data cache: 32 KB, 8-way set associative, 64 byte line size"); + printf("1st-level data cache: 32 KB, 8-way set associative, 64 byte line size\n"); break; case 0x30: - printf("\n1st-level instruction cache: 32 KB, 8-way set associative, 64 byte line size"); + printf("1st-level instruction cache: 32 KB, 8-way set associative, 64 byte line size\n"); break; case 0x39: - printf("\n2nd-level cache: 128 KB, 4-way set associative, sectored cache, 64 byte line size"); + printf("2nd-level cache: 128 KB, 4-way set associative, sectored cache, 64 byte line size\n"); break; case 0x3b: - printf("\n2nd-level cache: 128 KB, 2-way set associative, sectored cache, 64 byte line size"); + printf("2nd-level cache: 128 KB, 2-way set associative, sectored cache, 64 byte line size\n"); break; case 0x3c: - printf("\n2nd-level cache: 256 KB, 4-way set associative, sectored cache, 64 byte line size"); + printf("2nd-level cache: 256 KB, 4-way set associative, sectored cache, 64 byte line size\n"); break; case 0x41: - printf("\n2nd-level cache: 128 KB, 4-way set associative, 32 byte line size"); + printf("2nd-level cache: 128 KB, 4-way set associative, 32 byte line size\n"); break; case 0x42: - printf("\n2nd-level cache: 256 KB, 4-way set associative, 32 byte line size"); + printf("2nd-level cache: 256 KB, 4-way set associative, 32 byte line size\n"); break; case 0x43: - printf("\n2nd-level cache: 512 KB, 4-way set associative, 32 byte line size"); + printf("2nd-level cache: 512 KB, 4-way set associative, 32 byte line size\n"); break; case 0x44: - printf("\n2nd-level cache: 1 MB, 4-way set associative, 32 byte line size"); + printf("2nd-level cache: 1 MB, 4-way set associative, 32 byte line size\n"); break; case 0x45: - printf("\n2nd-level cache: 2 MB, 4-way set associative, 32 byte line size"); + printf("2nd-level cache: 2 MB, 4-way set associative, 32 byte line size\n"); break; case 0x46: - printf("\n3rd-level cache: 4 MB, 4-way set associative, 64 byte line size"); + printf("3rd-level cache: 4 MB, 4-way set associative, 64 byte line size\n"); break; case 0x47: - printf("\n3rd-level cache: 8 MB, 8-way set associative, 64 byte line size"); + printf("3rd-level cache: 8 MB, 8-way set associative, 64 byte line size\n"); break; case 0x50: - printf("\nInstruction TLB: 4 KB, 2 MB or 4 MB pages, fully associative, 64 entries"); + printf("Instruction TLB: 4 KB, 2 MB or 4 MB pages, fully associative, 64 entries\n"); break; case 0x51: - printf("\nInstruction TLB: 4 KB, 2 MB or 4 MB pages, fully associative, 128 entries"); + printf("Instruction TLB: 4 KB, 2 MB or 4 MB pages, fully associative, 128 entries\n"); break; case 0x52: - printf("\nInstruction TLB: 4 KB, 2 MB or 4 MB pages, fully associative, 256 entries"); + printf("Instruction TLB: 4 KB, 2 MB or 4 MB pages, fully associative, 256 entries\n"); break; case 0x5b: - printf("\nData TLB: 4 KB or 4 MB pages, fully associative, 64 entries"); + printf("Data TLB: 4 KB or 4 MB pages, fully associative, 64 entries\n"); break; case 0x5c: - printf("\nData TLB: 4 KB or 4 MB pages, fully associative, 128 entries"); + printf("Data TLB: 4 KB or 4 MB pages, fully associative, 128 entries\n"); break; case 0x5d: - printf("\nData TLB: 4 KB or 4 MB pages, fully associative, 256 entries"); + printf("Data TLB: 4 KB or 4 MB pages, fully associative, 256 entries\n"); break; case 0x60: - printf("\n1st-level data cache: 16 KB, 8-way set associative, sectored cache, 64 byte line size"); + printf("1st-level data cache: 16 KB, 8-way set associative, sectored cache, 64 byte line size\n"); break; case 0x66: - printf("\n1st-level data cache: 8 KB, 4-way set associative, sectored cache, 64 byte line size"); + printf("1st-level data cache: 8 KB, 4-way set associative, sectored cache, 64 byte line size\n"); break; case 0x67: - printf("\n1st-level data cache: 16 KB, 4-way set associative, sectored cache, 64 byte line size"); + printf("1st-level data cache: 16 KB, 4-way set associative, sectored cache, 64 byte line size\n"); break; case 0x68: - printf("\n1st-level data cache: 32 KB, 4 way set associative, sectored cache, 64 byte line size"); + printf("1st-level data cache: 32 KB, 4 way set associative, sectored cache, 64 byte line size\n"); break; case 0x70: - printf("\nTrace cache: 12K-uops, 8-way set associative"); + printf("Trace cache: 12K-uops, 8-way set associative\n"); break; case 0x71: - printf("\nTrace cache: 16K-uops, 8-way set associative"); + printf("Trace cache: 16K-uops, 8-way set associative\n"); break; case 0x72: - printf("\nTrace cache: 32K-uops, 8-way set associative"); + printf("Trace cache: 32K-uops, 8-way set associative\n"); break; case 0x78: - printf("\n2nd-level cache: 1 MB, 4-way set associative, 64-byte line size"); + printf("2nd-level cache: 1 MB, 4-way set associative, 64-byte line size\n"); break; case 0x79: - printf("\n2nd-level cache: 128 KB, 8-way set associative, sectored cache, 64 byte line size"); + printf("2nd-level cache: 128 KB, 8-way set associative, sectored cache, 64 byte line size\n"); break; case 0x7a: - printf("\n2nd-level cache: 256 KB, 8-way set associative, sectored cache, 64 byte line size"); + printf("2nd-level cache: 256 KB, 8-way set associative, sectored cache, 64 byte line size\n"); break; case 0x7b: - printf("\n2nd-level cache: 512 KB, 8-way set associative, sectored cache, 64 byte line size"); + printf("2nd-level cache: 512 KB, 8-way set associative, sectored cache, 64 byte line size\n"); break; case 0x7c: - printf("\n2nd-level cache: 1 MB, 8-way set associative, sectored cache, 64 byte line size"); + printf("2nd-level cache: 1 MB, 8-way set associative, sectored cache, 64 byte line size\n"); break; case 0x7d: - printf("\n2nd-level cache: 2-MB, 8-way set associative, 64-byte line size"); + printf("2nd-level cache: 2-MB, 8-way set associative, 64-byte line size\n"); break; case 0x7f: - printf("\n2nd-level cache: 512-KB, 2-way set associative, 64-byte line size"); + printf("2nd-level cache: 512-KB, 2-way set associative, 64-byte line size\n"); break; case 0x82: - printf("\n2nd-level cache: 256 KB, 8-way set associative, 32 byte line size"); + printf("2nd-level cache: 256 KB, 8-way set associative, 32 byte line size\n"); break; case 0x83: - printf("\n2nd-level cache: 512 KB, 8-way set associative, 32 byte line size"); + printf("2nd-level cache: 512 KB, 8-way set associative, 32 byte line size\n"); break; case 0x84: - printf("\n2nd-level cache: 1 MB, 8-way set associative, 32 byte line size"); + printf("2nd-level cache: 1 MB, 8-way set associative, 32 byte line size\n"); break; case 0x85: - printf("\n2nd-level cache: 2 MB, 8-way set associative, 32 byte line size"); + printf("2nd-level cache: 2 MB, 8-way set associative, 32 byte line size\n"); break; case 0x86: - printf("\n2nd-level cache: 512 KB, 4-way set associative, 64 byte line size"); + printf("2nd-level cache: 512 KB, 4-way set associative, 64 byte line size\n"); break; case 0x87: - printf("\n2nd-level cache: 1 MB, 8-way set associative, 64 byte line size"); + printf("2nd-level cache: 1 MB, 8-way set associative, 64 byte line size\n"); break; case 0xb0: - printf("\nInstruction TLB: 4 KB Pages, 4-way set associative, 128 entries"); + printf("Instruction TLB: 4 KB Pages, 4-way set associative, 128 entries\n"); break; case 0xb3: - printf("\nData TLB: 4 KB Pages, 4-way set associative, 128 entries"); + printf("Data TLB: 4 KB Pages, 4-way set associative, 128 entries\n"); break; } } From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:54:06 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCA9754D; Mon, 8 Sep 2014 04:54:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D345A61 for ; Mon, 8 Sep 2014 04:52:31 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0F7E71035 for ; Mon, 8 Sep 2014 04:52:31 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qU5F029896 for ; Mon, 8 Sep 2014 04:52:30 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qUse029891 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:30 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:52:30 GMT Message-Id: <201409080452.s884qUse029891@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199828 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:54:07 -0000 http://p4web.freebsd.org/@@1199828?ac=10 Change 1199828 by jhb@jhb_ralph on 2014/09/04 18:25:40 IFC @1199824 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/identcpu.c#56 delete .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#131 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#140 integrate .. //depot/projects/smpng/sys/amd64/include/md_var.h#32 integrate .. //depot/projects/smpng/sys/arm/altera/socfpga/files.socfpga#1 branch .. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_common.c#1 branch .. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_machdep.c#1 branch .. //depot/projects/smpng/sys/arm/altera/socfpga/std.socfpga#1 branch .. //depot/projects/smpng/sys/arm/arm/nexus.c#25 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pinctrl.c#2 integrate .. //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#6 integrate .. //depot/projects/smpng/sys/arm/conf/DB-78XXX#18 integrate .. //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#17 integrate .. //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#19 integrate .. //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#7 integrate .. //depot/projects/smpng/sys/arm/conf/DOCKSTAR#10 integrate .. //depot/projects/smpng/sys/arm/conf/DREAMPLUG-1001#4 integrate .. //depot/projects/smpng/sys/arm/conf/EA3250#8 integrate .. //depot/projects/smpng/sys/arm/conf/EFIKA_MX#7 integrate .. //depot/projects/smpng/sys/arm/conf/IMX53-QSB#6 integrate .. //depot/projects/smpng/sys/arm/conf/IMX6#4 integrate .. //depot/projects/smpng/sys/arm/conf/SOCKIT#1 branch .. //depot/projects/smpng/sys/arm/conf/ZEDBOARD#8 integrate .. //depot/projects/smpng/sys/arm/freescale/fsl_ocotp.c#2 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#6 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#7 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx6#6 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_ccm.c#8 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_iomux.c#5 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx51_iomuxvar.h#3 delete .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatop.c#6 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_ccm.c#4 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_iomux.c#1 branch .. //depot/projects/smpng/sys/arm/freescale/imx/imx6_iomuxreg.h#1 branch .. //depot/projects/smpng/sys/arm/freescale/imx/imx_ccmvar.h#2 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/imx_iomuxvar.h#1 branch .. //depot/projects/smpng/sys/arm/freescale/imx/imx_sdhci.c#5 integrate .. //depot/projects/smpng/sys/arm/freescale/vybrid/vf_sai.c#2 integrate .. //depot/projects/smpng/sys/arm/include/asm.h#13 integrate .. //depot/projects/smpng/sys/arm/mv/gpio.c#15 integrate .. //depot/projects/smpng/sys/arm/rockchip/rk30xx_gpio.c#5 integrate .. //depot/projects/smpng/sys/arm/ti/ti_sdhci.c#5 integrate .. //depot/projects/smpng/sys/arm/xilinx/files.zynq7#3 integrate .. //depot/projects/smpng/sys/boot/common/module.c#18 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/cubieboard2.dts#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/socfpga-sockit.dts#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/socfpga.dtsi#1 branch .. //depot/projects/smpng/sys/boot/fdt/dts/arm/sun4i-a10.dtsi#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/sun7i-a20.dtsi#2 integrate .. //depot/projects/smpng/sys/conf/files#303 integrate .. //depot/projects/smpng/sys/conf/files.amd64#106 integrate .. //depot/projects/smpng/sys/conf/files.i386#164 integrate .. //depot/projects/smpng/sys/conf/files.pc98#122 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#56 integrate .. //depot/projects/smpng/sys/dev/cadence/if_cgem.c#4 integrate .. //depot/projects/smpng/sys/dev/cadence/if_cgem_hw.h#2 integrate .. //depot/projects/smpng/sys/dev/drm/drm_sysctl.c#13 integrate .. //depot/projects/smpng/sys/dev/fdt/fdt_clock.c#1 branch .. //depot/projects/smpng/sys/dev/fdt/fdt_clock.h#1 branch .. //depot/projects/smpng/sys/dev/fdt/fdt_clock_if.m#1 branch .. //depot/projects/smpng/sys/dev/fdt/fdt_common.c#12 integrate .. //depot/projects/smpng/sys/dev/fdt/simplebus.c#13 integrate .. //depot/projects/smpng/sys/dev/gpio/ofw_gpiobus.c#3 integrate .. //depot/projects/smpng/sys/dev/mii/e1000phy.c#36 integrate .. //depot/projects/smpng/sys/dev/mrsas/mrsas.h#2 integrate .. //depot/projects/smpng/sys/dev/mrsas/mrsas_cam.c#2 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_bus_subr.c#13 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#38 integrate .. //depot/projects/smpng/sys/dev/ofw/ofw_fdt.c#9 integrate .. //depot/projects/smpng/sys/dev/ofw/ofwbus.c#4 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#26 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.h#18 integrate .. //depot/projects/smpng/sys/dev/tsec/if_tsec_fdt.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#37 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#193 integrate .. //depot/projects/smpng/sys/dev/xen/blkfront/blkfront.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/identcpu.c#85 delete .. //depot/projects/smpng/sys/i386/i386/initcpu.c#48 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#193 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#155 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#144 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#44 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#169 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#138 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#132 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#76 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#159 integrate .. //depot/projects/smpng/sys/mips/beri/beri_simplebus.c#3 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#88 integrate .. //depot/projects/smpng/sys/netinet/ip_fastfwd.c#48 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#141 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#107 integrate .. //depot/projects/smpng/sys/netinet/tcp_reass.c#27 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#144 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf.c#14 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#68 integrate .. //depot/projects/smpng/sys/powerpc/ofw/ofw_pcibus.c#12 integrate .. //depot/projects/smpng/sys/powerpc/powermac/macio.c#27 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#56 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#102 integrate .. //depot/projects/smpng/sys/sys/param.h#194 integrate .. //depot/projects/smpng/sys/sys/proc.h#233 integrate .. //depot/projects/smpng/sys/sys/sdt.h#14 integrate .. //depot/projects/smpng/sys/x86/x86/identcpu.c#2 integrate .. //depot/projects/smpng/sys/x86/x86/tsc.c#13 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#131 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 270828 2014-08-29 21:25:47Z jhb $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 271076 2014-09-04 01:46:06Z jhb $"); #include "opt_atpic.h" #include "opt_compat.h" ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#140 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 270151 2014-08-18 20:28:08Z alc $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 270961 2014-09-02 04:11:20Z alc $"); /* * Manages physical address maps. @@ -2571,7 +2571,7 @@ * "kernel_vm_end" and the kernel page table as they were. * * The correctness of this action is based on the following - * argument: vm_map_findspace() allocates contiguous ranges of the + * argument: vm_map_insert() allocates contiguous ranges of the * kernel virtual address space. It calls this function if a range * ends after "kernel_vm_end". If the kernel is mapped between * "kernel_vm_end" and "addr", then the range cannot begin at ==== //depot/projects/smpng/sys/amd64/include/md_var.h#32 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/md_var.h 262752 2014-03-04 21:35:57Z jkim $ + * $FreeBSD: head/sys/amd64/include/md_var.h 271076 2014-09-04 01:46:06Z jhb $ */ #ifndef _MACHINE_MD_VAR_H_ ==== //depot/projects/smpng/sys/arm/arm/nexus.c#25 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 269959 2014-08-14 04:21:25Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/nexus.c 270945 2014-09-01 18:51:01Z ian $"); #include #include @@ -341,7 +341,7 @@ phandle_t intr_offset; int i, rv, interrupt, trig, pol; - intr_offset = OF_xref_phandle(iparent); + intr_offset = OF_node_from_xref(iparent); for (i = 0; i < icells; i++) intr[i] = cpu_to_fdt32(intr[i]); ==== //depot/projects/smpng/sys/arm/at91/at91_pinctrl.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pinctrl.c 270025 2014-08-15 16:08:52Z imp $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/at91_pinctrl.c 271104 2014-09-04 16:40:54Z imp $"); #include #include @@ -136,10 +136,10 @@ "assuming direct parent\n"); iparent = OF_parent(node); } - if (OF_searchencprop(OF_xref_phandle(iparent), + if (OF_searchencprop(OF_node_from_xref(iparent), "#interrupt-cells", &icells, sizeof(icells)) == -1) { - device_printf(dev, "Missing #interrupt-cells property, " - "assuming <1>\n"); + device_printf(dev, "Missing #interrupt-cells property," + " assuming <1>\n"); icells = 1; } if (icells < 1 || icells > nintr) { @@ -388,19 +388,22 @@ OF_getprop(node, "status", status, sizeof(status)); OF_getprop(node, "name", name, sizeof(name)); if (strcmp(status, "okay") != 0) { -// printf("pinctrl: omitting node %s since it isn't active\n", name); +// printf("pinctrl: skipping node %s status %s\n", name, +// status); continue; } len = OF_getencprop(node, "pinctrl-0", pinctrl, sizeof(pinctrl)); if (len <= 0) { -// printf("pinctrl: no pinctrl-0 property for node %s, omitting\n", name); +// printf("pinctrl: skipping node %s no pinctrl-0\n", +// name, status); continue; } len /= sizeof(phandle_t); printf("pinctrl: Found active node %s\n", name); for (i = 0; i < len; i++) { - scratch = OF_xref_phandle(pinctrl[i]); - npins = OF_getencprop(scratch, "atmel,pins", pins, sizeof(pins)); + scratch = OF_node_from_xref(pinctrl[i]); + npins = OF_getencprop(scratch, "atmel,pins", pins, + sizeof(pins)); if (npins <= 0) { printf("We're doing it wrong %s\n", name); continue; @@ -408,29 +411,40 @@ memset(name, 0, sizeof(name)); OF_getprop(scratch, "name", name, sizeof(name)); npins /= (4 * 4); - printf("----> need to cope with %d more pins for %s\n", npins, name); + printf("----> need to cope with %d more pins for %s\n", + npins, name); for (j = 0; j < npins; j++) { uint32_t unit = pins[j * 4]; uint32_t pin = pins[j * 4 + 1]; uint32_t periph = pins[j * 4 + 2]; uint32_t flags = pins[j * 4 + 3]; - uint32_t pio = (0xfffffff & sc->ranges[0].bus) + 0x200 * unit; - printf("P%c%d %s %#x\n", unit + 'A', pin, periphs[periph], - flags); + uint32_t pio; + + pio = (0xfffffff & sc->ranges[0].bus) + + 0x200 * unit; + printf("P%c%d %s %#x\n", unit + 'A', pin, + periphs[periph], flags); switch (periph) { case 0: at91_pio_use_gpio(pio, 1u << pin); - at91_pio_gpio_pullup(pio, 1u << pin, !!(flags & 1)); - at91_pio_gpio_high_z(pio, 1u << pin, !!(flags & 2)); - at91_pio_gpio_set_deglitch(pio, 1u << pin, !!(flags & 4)); - // at91_pio_gpio_pulldown(pio, 1u << pin, !!(flags & 8)); - // at91_pio_gpio_dis_schmidt(pio, 1u << pin, !!(flags & 16)); + at91_pio_gpio_pullup(pio, 1u << pin, + !!(flags & 1)); + at91_pio_gpio_high_z(pio, 1u << pin, + !!(flags & 2)); + at91_pio_gpio_set_deglitch(pio, + 1u << pin, !!(flags & 4)); +// at91_pio_gpio_pulldown(pio, 1u << pin, +// !!(flags & 8)); +// at91_pio_gpio_dis_schmidt(pio, +// 1u << pin, !!(flags & 16)); break; case 1: - at91_pio_use_periph_a(pio, 1u << pin, flags); + at91_pio_use_periph_a(pio, 1u << pin, + flags); break; case 2: - at91_pio_use_periph_b(pio, 1u << pin, flags); + at91_pio_use_periph_b(pio, 1u << pin, + flags); break; } } @@ -493,8 +507,8 @@ static devclass_t at91_pinctrl_devclass; -EARLY_DRIVER_MODULE(at91_pinctrl, simplebus, at91_pinctrl_driver, at91_pinctrl_devclass, - NULL, NULL, BUS_PASS_BUS); +EARLY_DRIVER_MODULE(at91_pinctrl, simplebus, at91_pinctrl_driver, + at91_pinctrl_devclass, NULL, NULL, BUS_PASS_BUS); /* * dummy driver to force pass BUS_PASS_PINMUX to happen. @@ -520,5 +534,5 @@ static devclass_t at91_pingroup_devclass; -EARLY_DRIVER_MODULE(at91_pingroup, at91_pinctrl, at91_pingroup_driver, at91_pingroup_devclass, - NULL, NULL, BUS_PASS_PINMUX); +EARLY_DRIVER_MODULE(at91_pingroup, at91_pinctrl, at91_pingroup_driver, + at91_pingroup_devclass, NULL, NULL, BUS_PASS_PINMUX); ==== //depot/projects/smpng/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * */ #include -__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c 261410 2014-02-02 19:17:28Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c 270948 2014-09-01 19:20:34Z ian $"); #include #include @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/smpng/sys/arm/conf/DB-78XXX#18 (text+ko) ==== @@ -1,7 +1,7 @@ # # Custom kernel for Marvell DB-78xx boards. # -# $FreeBSD: head/sys/arm/conf/DB-78XXX 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/DB-78XXX 271050 2014-09-03 19:37:41Z ian $ # ident DB-88F78XX @@ -44,7 +44,7 @@ options ALT_BREAK_TO_DEBUGGER options DDB #options DEADLKRES # Enable the deadlock resolver -options DIAGNOSTIC +#options DIAGNOSTIC #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB ==== //depot/projects/smpng/sys/arm/conf/DB-88F5XXX#17 (text+ko) ==== @@ -1,7 +1,7 @@ # # Custom kernel for Marvell DB-88F5xxx boards. # -# $FreeBSD: head/sys/arm/conf/DB-88F5XXX 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/DB-88F5XXX 271050 2014-09-03 19:37:41Z ian $ # ident DB-88F5XXX @@ -43,7 +43,7 @@ options ALT_BREAK_TO_DEBUGGER options DDB #options DEADLKRES # Enable the deadlock resolver -options DIAGNOSTIC +#options DIAGNOSTIC #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB ==== //depot/projects/smpng/sys/arm/conf/DB-88F6XXX#19 (text+ko) ==== @@ -1,7 +1,7 @@ # # Custom kernel for Marvell DB-88F6xxx boards. # -# $FreeBSD: head/sys/arm/conf/DB-88F6XXX 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/DB-88F6XXX 271050 2014-09-03 19:37:41Z ian $ # ident DB-88F6XXX @@ -44,7 +44,7 @@ options ALT_BREAK_TO_DEBUGGER options DDB #options DEADLKRES # Enable the deadlock resolver -options DIAGNOSTIC +#options DIAGNOSTIC #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB ==== //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#7 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/DIGI-CCWMX53 270912 2014-09-01 03:49:21Z imp $ +# $FreeBSD: head/sys/arm/conf/DIGI-CCWMX53 271101 2014-09-04 14:59:27Z ian $ ident DIGI-CCWMX53 @@ -120,8 +120,6 @@ device imxata options ATA_STATIC_ID # Static device numbering -device iomux # IO Multiplexor - device gpio device gpioled ==== //depot/projects/smpng/sys/arm/conf/DOCKSTAR#10 (text+ko) ==== @@ -1,7 +1,7 @@ # # Custom kernel for Seagate DockStar (Marvell SheevaPlug based) devices. # -# $FreeBSD: head/sys/arm/conf/DOCKSTAR 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/DOCKSTAR 271050 2014-09-03 19:37:41Z ian $ # # http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html # @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/DOCKSTAR 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/DOCKSTAR 271050 2014-09-03 19:37:41Z ian $ # ident DOCKSTAR @@ -145,7 +145,7 @@ options ALT_BREAK_TO_DEBUGGER options DDB options KDB -options DIAGNOSTIC +#options DIAGNOSTIC options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles ==== //depot/projects/smpng/sys/arm/conf/DREAMPLUG-1001#4 (text+ko) ==== @@ -18,7 +18,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/DREAMPLUG-1001 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/DREAMPLUG-1001 271050 2014-09-03 19:37:41Z ian $ # ident DREAMPLUG-1001 @@ -153,7 +153,7 @@ options ALT_BREAK_TO_DEBUGGER options DDB options KDB -options DIAGNOSTIC +#options DIAGNOSTIC options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS # Enable checks to detect deadlocks and cycles ==== //depot/projects/smpng/sys/arm/conf/EA3250#8 (text+ko) ==== @@ -1,7 +1,7 @@ # # Custom kernel for EA3250 boards. # -# $FreeBSD: head/sys/arm/conf/EA3250 263301 2014-03-18 14:41:18Z imp $ +# $FreeBSD: head/sys/arm/conf/EA3250 271050 2014-09-03 19:37:41Z ian $ # ident EA3250 @@ -44,7 +44,7 @@ options ALT_BREAK_TO_DEBUGGER options DDB #options DEADLKRES # Enable the deadlock resolver -options DIAGNOSTIC +#options DIAGNOSTIC #options INVARIANTS # Enable calls of extra sanity checking #options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options KDB ==== //depot/projects/smpng/sys/arm/conf/EFIKA_MX#7 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/EFIKA_MX 270912 2014-09-01 03:49:21Z imp $ +# $FreeBSD: head/sys/arm/conf/EFIKA_MX 271101 2014-09-04 14:59:27Z ian $ ident EFIKA_MX @@ -116,8 +116,6 @@ device imxata options ATA_STATIC_ID # Static device numbering -device iomux # IO Multiplexor - device gpio device gpioled ==== //depot/projects/smpng/sys/arm/conf/IMX53-QSB#6 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/IMX53-QSB 270912 2014-09-01 03:49:21Z imp $ +# $FreeBSD: head/sys/arm/conf/IMX53-QSB 271101 2014-09-04 14:59:27Z ian $ ident IMX53-QSB @@ -119,8 +119,6 @@ #device imxata #options ATA_STATIC_ID # Static device numbering -device iomux # IO Multiplexor - device gpio device gpioled ==== //depot/projects/smpng/sys/arm/conf/IMX6#4 (text+ko) ==== @@ -15,7 +15,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/IMX6 270912 2014-09-01 03:49:21Z imp $ +# $FreeBSD: head/sys/arm/conf/IMX6 271101 2014-09-04 14:59:27Z ian $ ident IMX6 include "../freescale/imx/std.imx6" @@ -80,7 +80,6 @@ device ether # Ethernet support device miibus # Required for ethernet device bpf # Berkeley packet filter (required for DHCP) -#device iomux # IO Multiplexor # General-purpose input/output device gpio ==== //depot/projects/smpng/sys/arm/conf/ZEDBOARD#8 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/arm/conf/ZEDBOARD 270912 2014-09-01 03:49:21Z imp $ +# $FreeBSD: head/sys/arm/conf/ZEDBOARD 271046 2014-09-03 17:51:03Z ian $ ident ZEDBOARD @@ -72,8 +72,9 @@ device loop device random device ether -device if_cgem # Zynq-7000 gig ethernet device +device cgem # Zynq-7000 gig ethernet device device mii +device e1000phy device pty device uart device gpio ==== //depot/projects/smpng/sys/arm/freescale/fsl_ocotp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/freescale/fsl_ocotp.c 261957 2014-02-16 03:30:22Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/freescale/fsl_ocotp.c 270955 2014-09-02 02:54:55Z ian $"); /* * Access to the Freescale i.MX6 On-Chip One-Time-Programmable Memory @@ -200,5 +200,6 @@ static devclass_t ocotp_devclass; -DRIVER_MODULE(ocotp, simplebus, ocotp_driver, ocotp_devclass, 0, 0); +EARLY_DRIVER_MODULE(ocotp, simplebus, ocotp_driver, ocotp_devclass, 0, 0, + BUS_PASS_CPU + BUS_PASS_ORDER_FIRST); ==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/freescale/imx/files.imx51 268973 2014-07-22 03:59:14Z br $ +# $FreeBSD: head/sys/arm/freescale/imx/files.imx51 271100 2014-09-04 14:57:04Z ian $ arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_armv5.S standard @@ -19,7 +19,7 @@ arm/freescale/imx/tzic.c standard # IOMUX - external pins multiplexor -arm/freescale/imx/imx51_iomux.c optional iomux +arm/freescale/imx/imx51_iomux.c standard # GPIO arm/freescale/imx/imx_gpio.c optional gpio ==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx53#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/freescale/imx/files.imx53 268973 2014-07-22 03:59:14Z br $ +# $FreeBSD: head/sys/arm/freescale/imx/files.imx53 271100 2014-09-04 14:57:04Z ian $ arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_armv5.S standard @@ -22,7 +22,7 @@ arm/freescale/imx/tzic.c standard # IOMUX - external pins multiplexor -arm/freescale/imx/imx51_iomux.c optional iomux +arm/freescale/imx/imx51_iomux.c standard # GPIO arm/freescale/imx/imx_gpio.c optional gpio ==== //depot/projects/smpng/sys/arm/freescale/imx/files.imx6#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/arm/freescale/imx/files.imx6 268977 2014-07-22 04:39:32Z br $ +# $FreeBSD: head/sys/arm/freescale/imx/files.imx6 271100 2014-09-04 14:57:04Z ian $ # # Standard ARM support. @@ -19,11 +19,12 @@ arm/arm/mpcore_timer.c standard arm/freescale/fsl_ocotp.c standard arm/freescale/imx/imx6_anatop.c standard -arm/freescale/imx/imx_common.c standard arm/freescale/imx/imx6_ccm.c standard +arm/freescale/imx/imx6_iomux.c standard arm/freescale/imx/imx6_machdep.c standard arm/freescale/imx/imx6_mp.c optional smp arm/freescale/imx/imx6_pl310.c standard +arm/freescale/imx/imx_common.c standard arm/freescale/imx/imx_machdep.c standard arm/freescale/imx/imx_gpt.c standard arm/freescale/imx/imx_gpio.c optional gpio @@ -51,6 +52,4 @@ # # Not ready yet... # -#arm/freescale/imx/imx51_iomux.c optional iomux -#dev/ata/chipsets/ata-fsl.c optional imxata #arm/freescale/imx/imx51_ipuv3.c optional sc ==== //depot/projects/smpng/sys/arm/freescale/imx/imx51_ccm.c#8 (text+ko) ==== @@ -59,7 +59,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_ccm.c 264977 2014-04-26 16:48:09Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_ccm.c 271055 2014-09-03 21:45:39Z ian $"); #include #include @@ -580,3 +580,10 @@ return (imx51_get_clock(IMX51CLK_UART_CLK_ROOT)); } + +uint32_t +imx_ccm_ahb_hz(void) +{ + + return (imx51_get_clock(IMX51CLK_AHB_CLK_ROOT)); +} ==== //depot/projects/smpng/sys/arm/freescale/imx/imx51_iomux.c#5 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_iomux.c 261410 2014-02-02 19:17:28Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx51_iomux.c 271100 2014-09-04 14:57:04Z ian $"); #include #include @@ -74,8 +74,8 @@ #include #include -#include -#include +#include +#include "imx51_iomuxreg.h" #define IOMUX_WRITE(_sc, _r, _v) \ @@ -176,45 +176,58 @@ iomux_set_pad_sub(iomuxsc, pin, config); } -#ifdef notyet -void -iomux_set_input(unsigned int input, unsigned int config) +static uint32_t +iomux_get_pad_config_sub(struct iomux_softc *sc, uint32_t pin) +{ + bus_size_t pad_reg = IOMUX_PIN_TO_PAD_ADDRESS(pin); + uint32_t result; + + result = IOMUX_READ(sc, pad_reg); + + return(result); +} + +unsigned int +iomux_get_pad_config(unsigned int pin) +{ + + return(iomux_get_pad_config_sub(iomuxsc, pin)); +} + +uint32_t +imx_iomux_gpr_get(u_int regnum) { - bus_size_t input_ctl_reg = input; - bus_space_write_4(iomuxsc->iomux_memt, iomuxsc->iomux_memh, - input_ctl_reg, config); + KASSERT(iomuxsc != NULL, ("imx_iomux_gpr_get() called before attach")); + KASSERT(regnum >= 0 && regnum <= 1, + ("imx_iomux_gpr_get bad regnum %u", regnum)); + return (IOMUX_READ(iomuxsc, IOMUXC_GPR0 + regnum)); } -#endif void -iomux_mux_config(const struct iomux_conf *conflist) +imx_iomux_gpr_set(u_int regnum, uint32_t val) { - int i; - if (iomuxsc == NULL) - return; - for (i = 0; conflist[i].pin != IOMUX_CONF_EOT; i++) { - iomux_set_pad_sub(iomuxsc, conflist[i].pin, conflist[i].pad); - iomux_set_function_sub(iomuxsc, conflist[i].pin, - conflist[i].mux); - } + KASSERT(iomuxsc != NULL, ("imx_iomux_gpr_set() called before attach")); + KASSERT(regnum >= 0 && regnum <= 1, + ("imx_iomux_gpr_set bad regnum %u", regnum)); + IOMUX_WRITE(iomuxsc, IOMUXC_GPR0 + regnum, val); } -#ifdef notyet void -iomux_input_config(const struct iomux_input_conf *conflist) +imx_iomux_gpr_set_masked(u_int regnum, uint32_t clrbits, uint32_t setbits) { - int i; + uint32_t val; + + KASSERT(iomuxsc != NULL, + ("imx_iomux_gpr_set_masked called before attach")); + KASSERT(regnum >= 0 && regnum <= 1, + ("imx_iomux_gpr_set_masked bad regnum %u", regnum)); - if (iomuxsc == NULL) - return; - for (i = 0; conflist[i].inout != -1; i++) { - iomux_set_inout(iomuxsc, conflist[i].inout, - conflist[i].inout_mode); - } + val = IOMUX_READ(iomuxsc, IOMUXC_GPR0 + regnum); + val = (val & ~clrbits) | setbits; + IOMUX_WRITE(iomuxsc, IOMUXC_GPR0 + regnum, val); } -#endif static device_method_t imx_iomux_methods[] = { DEVMETHOD(device_probe, iomux_probe), @@ -232,5 +245,5 @@ static devclass_t imx_iomux_devclass; EARLY_DRIVER_MODULE(imx_iomux, simplebus, imx_iomux_driver, - imx_iomux_devclass, 0, 0, BUS_PASS_BUS - 1); + imx_iomux_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_LATE); ==== //depot/projects/smpng/sys/arm/freescale/imx/imx6_anatop.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_anatop.c 270065 2014-08-16 20:44:45Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_anatop.c 270956 2014-09-02 02:56:43Z ian $"); /* * Analog PLL and power regulator driver for Freescale i.MX6 family of SoCs. @@ -88,6 +88,8 @@ struct imx6_anatop_softc { device_t dev; struct resource *res[2]; + struct intr_config_hook + intr_setup_hook; uint32_t cpu_curmhz; uint32_t cpu_curmv; uint32_t cpu_minmhz; @@ -610,10 +612,22 @@ "Throttle CPU when exceeding this temperature"); } +static void +intr_setup(void *arg) +{ + struct imx6_anatop_softc *sc; + + sc = arg; + bus_setup_intr(sc->dev, sc->res[IRQRES], INTR_TYPE_MISC | INTR_MPSAFE, + tempmon_intr, NULL, sc, &sc->temp_intrhand); + config_intrhook_disestablish(&sc->intr_setup_hook); +} + static int imx6_anatop_detach(device_t dev) { + /* This device can never detach. */ return (EBUSY); } @@ -633,10 +647,9 @@ goto out; } - err = bus_setup_intr(dev, sc->res[IRQRES], INTR_TYPE_MISC | INTR_MPSAFE, - tempmon_intr, NULL, sc, &sc->temp_intrhand); - if (err != 0) - goto out; + sc->intr_setup_hook.ich_func = intr_setup; + sc->intr_setup_hook.ich_arg = sc; + config_intrhook_establish(&sc->intr_setup_hook); SYSCTL_ADD_UINT(device_get_sysctl_ctx(sc->dev), SYSCTL_CHILDREN(device_get_sysctl_tree(sc->dev)), @@ -713,5 +726,6 @@ static devclass_t imx6_anatop_devclass; -DRIVER_MODULE(imx6_anatop, simplebus, imx6_anatop_driver, imx6_anatop_devclass, 0, 0); +EARLY_DRIVER_MODULE(imx6_anatop, simplebus, imx6_anatop_driver, + imx6_anatop_devclass, 0, 0, BUS_PASS_CPU + BUS_PASS_ORDER_FIRST + 1); ==== //depot/projects/smpng/sys/arm/freescale/imx/imx6_ccm.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_ccm.c 264977 2014-04-26 16:48:09Z ian $"); +__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx6_ccm.c 271055 2014-09-03 21:45:39Z ian $"); /* * Clocks and power control driver for Freescale i.MX6 family of SoCs. @@ -238,6 +238,12 @@ return (80000000); } +uint32_t +imx_ccm_ahb_hz(void) +{ + return (132000000); +} + static device_method_t ccm_methods[] = { /* Device interface */ DEVMETHOD(device_probe, ccm_probe), ==== //depot/projects/smpng/sys/arm/freescale/imx/imx_ccmvar.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/arm/freescale/imx/imx_ccmvar.h 264977 2014-04-26 16:48:09Z ian $ + * $FreeBSD: head/sys/arm/freescale/imx/imx_ccmvar.h 271055 2014-09-03 21:45:39Z ian $ */ #ifndef IMX_CCMVAR_H @@ -47,6 +47,7 @@ uint32_t imx_ccm_perclk_hz(void); uint32_t imx_ccm_sdhci_hz(void); uint32_t imx_ccm_uart_hz(void); +uint32_t imx_ccm_ahb_hz(void); void imx_ccm_usb_enable(device_t _usbdev); void imx_ccm_usbphy_enable(device_t _phydev); ==== //depot/projects/smpng/sys/arm/freescale/imx/imx_sdhci.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * */ #include -__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx_sdhci.c 267171 2014-06-06 16:37:42Z kevlo $"); +__FBSDID("$FreeBSD: head/sys/arm/freescale/imx/imx_sdhci.c 270948 2014-09-01 19:20:34Z ian $"); /* * SDHCI driver glue for Freescale i.MX SoC family. @@ -45,6 +45,7 @@ #include #include #include +#include #include #include ==== //depot/projects/smpng/sys/arm/freescale/vybrid/vf_sai.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/freescale/vybrid/vf_sai.c 261987 2014-02-16 19:21:44Z br $"); +__FBSDID("$FreeBSD: head/sys/arm/freescale/vybrid/vf_sai.c 270945 2014-09-01 18:51:01Z ian $"); #include #include @@ -430,7 +430,7 @@ OF_getprop(node, "edma-mux-group", &dts_value, len); edma_mux_group = fdt32_to_cpu(dts_value); OF_getprop(node, "edma-controller", &dts_value, len); - edma_node = OF_xref_phandle(fdt32_to_cpu(dts_value)); + edma_node = OF_node_from_xref(fdt32_to_cpu(dts_value)); if ((len = OF_getproplen(edma_node, "device-id")) <= 0) { return (ENXIO); ==== //depot/projects/smpng/sys/arm/include/asm.h#13 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 * - * $FreeBSD: head/sys/arm/include/asm.h 269390 2014-08-01 18:24:44Z ian $ + * $FreeBSD: head/sys/arm/include/asm.h 270930 2014-09-01 14:57:04Z ian $ */ #ifndef _MACHINE_ASM_H_ @@ -53,7 +53,7 @@ # define _ALIGN_TEXT .align 0 #endif -#ifdef __ARM_EABI__ +#if defined(__ARM_EABI__) && !defined(_STANDALONE) #define STOP_UNWINDING .cantunwind #define _FNSTART .fnstart #define _FNEND .fnend ==== //depot/projects/smpng/sys/arm/mv/gpio.c#15 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/arm/mv/gpio.c 265854 2014-05-10 20:31:05Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/mv/gpio.c 270945 2014-09-01 18:51:01Z ian $"); #include #include @@ -642,7 +642,7 @@ * contain a ref. to a node defining GPIO * controller. */ - ctrl = OF_xref_phandle(fdt32_to_cpu(gpios[0])); + ctrl = OF_node_from_xref(fdt32_to_cpu(gpios[0])); if (fdt_is_compatible(ctrl, e->compat)) /* Call a handler. */ ==== //depot/projects/smpng/sys/arm/rockchip/rk30xx_gpio.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ * */ #include -__FBSDID("$FreeBSD: head/sys/arm/rockchip/rk30xx_gpio.c 265853 2014-05-10 20:26:49Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/rockchip/rk30xx_gpio.c 270945 2014-09-01 18:51:01Z ian $"); #include #include @@ -656,7 +656,7 @@ * contain a ref. to a node defining GPIO * controller. */ - ctrl = OF_xref_phandle(fdt32_to_cpu(gpios[0])); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:54:07 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70A3B63C; Mon, 8 Sep 2014 04:54:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9CF95B0C for ; Mon, 8 Sep 2014 04:52:31 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5C3A91038 for ; Mon, 8 Sep 2014 04:52:31 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qVKO029915 for ; Mon, 8 Sep 2014 04:52:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qVrQ029912 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:31 GMT (envelope-from jhb@freebsd.org) Date: Mon, 8 Sep 2014 04:52:31 GMT Message-Id: <201409080452.s884qVrQ029912@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1199831 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:54:07 -0000 http://p4web.freebsd.org/@@1199831?ac=10 Change 1199831 by jhb@jhb_ralph on 2014/09/04 18:29:43 Don't hold a write lock on the pcbinfo for SYN packets. Submitted by: Julien Charbon Affected files ... .. //depot/projects/smpng/sys/netinet/tcp_input.c#163 edit .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#98 edit Differences ... ==== //depot/projects/smpng/sys/netinet/tcp_input.c#163 (text+ko) ==== @@ -748,12 +748,12 @@ /* * Locate pcb for segment; if we're likely to add or remove a - * connection then first acquire pcbinfo lock. There are two cases + * connection then first acquire pcbinfo lock. There are three cases * where we might discover later we need a write lock despite the - * flags: ACKs moving a connection out of the syncache, and ACKs for - * a connection in TIMEWAIT. + * flags: ACKs moving a connection out of the syncache, ACKs for a + * connection in TIMEWAIT and SYNs not targeting a listening socket. */ - if ((thflags & (TH_SYN | TH_FIN | TH_RST)) != 0) { + if ((thflags & (TH_FIN | TH_RST)) != 0) { INP_INFO_WLOCK(&V_tcbinfo); ti_locked = TI_WLOCKED; } else @@ -982,10 +982,11 @@ * now be in TIMEWAIT. */ #ifdef INVARIANTS - if ((thflags & (TH_SYN | TH_FIN | TH_RST)) != 0) + if ((thflags & (TH_FIN | TH_RST)) != 0) INP_INFO_WLOCK_ASSERT(&V_tcbinfo); #endif - if (tp->t_state != TCPS_ESTABLISHED) { + if (!((tp->t_state == TCPS_ESTABLISHED && (thflags & TH_SYN) == 0) || + (tp->t_state == TCPS_LISTEN && (thflags & TH_SYN)))) { if (ti_locked == TI_UNLOCKED) { if (INP_INFO_TRY_WLOCK(&V_tcbinfo) == 0) { in_pcbref(inp); @@ -1026,17 +1027,13 @@ /* * When the socket is accepting connections (the INPCB is in LISTEN * state) we look into the SYN cache if this is a new connection - * attempt or the completion of a previous one. Because listen - * sockets are never in TCPS_ESTABLISHED, the V_tcbinfo lock will be - * held in this case. + * attempt or the completion of a previous one. */ if (so->so_options & SO_ACCEPTCONN) { struct in_conninfo inc; KASSERT(tp->t_state == TCPS_LISTEN, ("%s: so accepting but " "tp not listening", __func__)); - INP_INFO_WLOCK_ASSERT(&V_tcbinfo); - bzero(&inc, sizeof(inc)); #ifdef INET6 if (isipv6) { @@ -1059,6 +1056,8 @@ * socket appended to the listen queue in SYN_RECEIVED state. */ if ((thflags & (TH_RST|TH_ACK|TH_SYN)) == TH_ACK) { + + INP_INFO_WLOCK_ASSERT(&V_tcbinfo); /* * Parse the TCP options here because * syncookies need access to the reflected @@ -1339,8 +1338,12 @@ syncache_add(&inc, &to, th, inp, &so, m, NULL, NULL); /* * Entry added to syncache and mbuf consumed. - * Everything already unlocked by syncache_add(). + * Only the listen socket is unlocked by syncache_add(). */ + if (ti_locked == TI_WLOCKED) { + INP_INFO_WUNLOCK(&V_tcbinfo); + ti_locked = TI_UNLOCKED; + } INP_INFO_UNLOCK_ASSERT(&V_tcbinfo); return (IPPROTO_DONE); } else if (tp->t_state == TCPS_LISTEN) { ==== //depot/projects/smpng/sys/netinet/tcp_syncache.c#98 (text+ko) ==== @@ -1118,7 +1118,6 @@ struct syncache scs; struct ucred *cred; - INP_INFO_WLOCK_ASSERT(&V_tcbinfo); INP_WLOCK_ASSERT(inp); /* listen socket */ KASSERT((th->th_flags & (TH_RST|TH_ACK|TH_SYN)) == TH_SYN, ("%s: unexpected tcp flags", __func__)); @@ -1149,13 +1148,11 @@ #ifdef MAC if (mac_syncache_init(&maclabel) != 0) { INP_WUNLOCK(inp); - INP_INFO_WUNLOCK(&V_tcbinfo); goto done; } else mac_syncache_create(maclabel, inp); #endif INP_WUNLOCK(inp); - INP_INFO_WUNLOCK(&V_tcbinfo); /* * Remember the IP options, if any. From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:54:22 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78BA7892; Mon, 8 Sep 2014 04:54:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 13E62E4A for ; Mon, 8 Sep 2014 04:52:40 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B16CF10BA for ; Mon, 8 Sep 2014 04:52:39 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qdt0030295 for ; Mon, 8 Sep 2014 04:52:39 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qdER030292 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:39 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:52:39 GMT Message-Id: <201409080452.s884qdER030292@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199888 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:54:22 -0000 http://p4web.freebsd.org/@@1199888?ac=10 Change 1199888 by jmg@jmg_carbon2 on 2014/09/05 17:25:29 commit this code before I delete it all, incase I want to go back to it... I've decided that the best way forward is to convert everything to an iov, and have all the code operate on an iov... This eliminates some of the crazy abstraction that his code has, eliminates extra function callls, and will be useful for expanding to the aesni driver.. Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/criov.c#2 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#7 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#9 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/criov.c#2 (text+ko) ==== @@ -159,6 +159,13 @@ } void +buf_copyback(caddr_t buf, int off, int size, caddr_t in) +{ + + bcopy(in, buf + off, size); +} + +void crypto_copyback(int flags, caddr_t buf, int off, int size, caddr_t in) { @@ -196,3 +203,46 @@ error = (*f)(arg, buf + off, len); return (error); } + +void +crypto_mbuftoiovec(struct mbuf *mbuf, struct iovec **iovptr, int *cnt, + int *allocated) +{ + struct iovec *iov; + struct mbuf *m, *mtmp; + int i, j; + + *allocated = 0; + iov = *iovptr; + if (iov == NULL) + *cnt = 0; + + m = mbuf; + i = 0; + while (m != NULL) { + if (i == *cnt) { + /* we need to allocate a larger array */ + j = 1; + mtmp = m; + while ((mtmp = mtmp->m_next) != NULL) + j++; + iov = malloc(sizeof *iov * (i + j), M_TEMP, M_WAITOK); + *allocated = 1; + *cnt = i + j; + memcpy(iov, *iovptr, sizeof *iov * i); + } + + iov[i].iov_base = m->m_data; + iov[i].iov_len = m->m_len; + + i++; + m = m->m_next; + } + + if (*allocated) + KASSERT(*cnt == i, ("did not allocate correct amount: %d != %d", + *cnt, i)); + + *iovptr = iov; + *cnt = i; +} ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#7 (text+ko) ==== @@ -463,6 +463,11 @@ extern int cuio_apply(struct uio *uio, int off, int len, int (*f)(void *, void *, u_int), void *arg); +extern void buf_copyback(caddr_t buf, int off, int len, caddr_t in); + +extern void crypto_mbuftoiovec(struct mbuf *mbuf, struct iovec **iovptr, + int *cnt, int *allocated); + extern void crypto_copyback(int flags, caddr_t buf, int off, int size, caddr_t in); extern void crypto_copydata(int flags, caddr_t buf, int off, int size, ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#9 (text+ko) ==== @@ -76,6 +76,111 @@ static int swcr_freesession(device_t dev, u_int64_t tid); static int swcr_freesession_locked(device_t dev, u_int64_t tid); +typedef void (*copybackfun_t)(void *, int, int, caddr_t); + +struct blkdata { + void (*fun)(caddr_t, u_int8_t *); + caddr_t arg; + uint8_t blk[EALG_MAX_BLOCK_LEN]; + int blksize; + int blkoff; + int cnt; + void (*copyback)(void *, int, int, caddr_t); + void *copybackarg; +}; + +struct cbcdata { + struct blkdata bd; + void (*fun)(caddr_t, u_int8_t *); + caddr_t arg; + uint8_t iv[EALG_MAX_BLOCK_LEN]; +}; + +static int +blkdata(void *arg, void *dataarg, u_int len) +{ + uint8_t *data; + struct blkdata *bd; + int blksize; + int cnt; + + data = (uint8_t *)dataarg; + bd = (struct blkdata *)arg; + blksize = bd->blksize; + + /* process remaining from before */ + if (bd->cnt) { + cnt = MIN(blksize - bd->cnt, len); + memcpy(&bd->blk[bd->cnt], data, cnt); + bd->cnt += cnt; + + if (bd->cnt == blksize) { + bd->fun(bd->arg, bd->blk); + bd->copyback(bd->copybackarg, bd->blkoff, blksize, + bd->blk); + bd->blkoff += blksize; + bd->cnt = 0; + } else + return 0; + + len -= cnt; + data += cnt; + } + + while (len >= blksize) { + bd->fun(bd->arg, data); + + len -= blksize; + data += blksize; + bd->blkoff += blksize; + } + + /* keep the remaining around for the next call */ + if (len) { + bd->cnt = len; + memcpy(bd->blk, data, len); + } + + return 0; +} + +static void +cbcencdata(caddr_t arg, uint8_t *in) +{ + struct cbcdata *cd; + int i; + + cd = (struct cbcdata *)arg; + + for (i = 0; i < cd->bd.blksize; i++) { + in[i] ^= cd->iv[i]; + } + + cd->fun(cd->arg, in); + + bcopy(in, cd->iv, cd->bd.blksize); +} + +static void +cbcdecdata(caddr_t arg, uint8_t *in) +{ + uint8_t oiv[EALG_MAX_BLOCK_LEN]; + struct cbcdata *cd; + int i; + + cd = (struct cbcdata *)arg; + + bcopy(in, oiv, cd->bd.blksize); + + cd->fun(cd->arg, in); + + for (i = 0; i < cd->bd.blksize; i++) { + in[i] ^= cd->iv[i]; + } + + bcopy(oiv, cd->iv, cd->bd.blksize); +} + /* * Apply a symmetric encryption/decryption algorithm. */ @@ -83,10 +188,11 @@ swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf, int flags) { - unsigned char iv[EALG_MAX_BLOCK_LEN], blk[EALG_MAX_BLOCK_LEN]; - unsigned char *ivp, piv[EALG_MAX_BLOCK_LEN]; + struct cbcdata cd; + struct blkdata bd; + unsigned char iv[EALG_MAX_BLOCK_LEN]; struct enc_xform *exf; - int i, k, j, blks; + int blks; exf = sw->sw_exf; blks = exf->blocksize; @@ -133,7 +239,20 @@ return (error); } - ivp = iv; + bd = (struct blkdata){}; + bd.fun = (crd->crd_flags & CRD_F_ENCRYPT) ? exf->encrypt : + exf->decrypt; + bd.arg = sw->sw_kschedule; + bd.blksize = blks; + bd.blkoff = crd->crd_skip; + if ((flags & CRYPTO_F_IMBUF) != 0) + bd.copyback = (copybackfun_t)m_copyback; + else if ((flags & CRYPTO_F_IOV) != 0) + bd.copyback = (copybackfun_t)cuio_copyback; + else + bd.copyback = (copybackfun_t)buf_copyback; + + bd.copybackarg = buf; if (exf->reinit) { /* @@ -142,59 +261,20 @@ */ exf->reinit(sw->sw_kschedule, iv); - for (i = crd->crd_skip; - i < crd->crd_skip + crd->crd_len; i += blks) { - crypto_copydata(flags, buf, i, blks, blk); - - if (crd->crd_flags & CRD_F_ENCRYPT) - exf->encrypt(sw->sw_kschedule, blk); - else - exf->decrypt(sw->sw_kschedule, blk); - - crypto_copyback(flags, buf, i, blks, blk); - } + crypto_apply(flags, buf, crd->crd_skip, crd->crd_len, blkdata, + &bd); } else { - for (i = crd->crd_skip; - i < crd->crd_skip + crd->crd_len; i += blks) { - crypto_copydata(flags, buf, i, blks, blk); + cd.bd = bd; - if (crd->crd_flags & CRD_F_ENCRYPT) { - /* XOR with previous block */ - for (k = 0; k < blks; k++) - blk[k] ^= ivp[k]; + cd.fun = bd.fun; + cd.arg = bd.arg; - exf->encrypt(sw->sw_kschedule, blk); + cd.bd.fun = (crd->crd_flags & CRD_F_ENCRYPT) ? cbcencdata : + cbcdecdata; + cd.bd.arg = (caddr_t)&cd; - /* - * Keep encrypted block for XOR'ing - * with next block - */ - bcopy(blk, iv, blks); - ivp = iv; - } else { /* decrypt */ - /* - * Keep encrypted block for XOR'ing - * with next block - */ - if (ivp == iv) - bcopy(blk, piv, blks); - else - bcopy(blk, iv, blks); - - exf->decrypt(sw->sw_kschedule, blk); - - /* XOR with previous block */ - for (j = 0; j < blks; j++) - blk[j] ^= ivp[j]; - - if (ivp == iv) - bcopy(piv, iv, blks); - else - ivp = iv; - } - - crypto_copyback(flags, buf, i, blks, blk); - } + crypto_apply(flags, buf, crd->crd_skip, crd->crd_len, blkdata, + &cd); } return 0; From owner-p4-projects@FreeBSD.ORG Mon Sep 8 04:54:24 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2ECD982; Mon, 8 Sep 2014 04:54:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6998E5D for ; Mon, 8 Sep 2014 04:52:40 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5CA4B10C3 for ; Mon, 8 Sep 2014 04:52:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884qe4U030334 for ; Mon, 8 Sep 2014 04:52:40 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884qeqJ030331 for perforce@freebsd.org; Mon, 8 Sep 2014 04:52:40 GMT (envelope-from jmg@freebsd.org) Date: Mon, 8 Sep 2014 04:52:40 GMT Message-Id: <201409080452.s884qeqJ030331@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1199894 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Sep 2014 04:54:24 -0000 http://p4web.freebsd.org/@@1199894?ac=10 Change 1199894 by jmg@jmg_carbon2 on 2014/09/05 18:57:07 convert everything down to an iov and operate on that... This imports the latest iov code from OpenBSD which includes a bug fix if the number of iov's is more than one... This also includes a minor optimizations by using two iv buffers and switching between the two instead of always copying... add ivsize for handling here so we don't copy too much data, which might not exist... Affected files ... .. //depot/projects/opencrypto/sys/opencrypto/criov.c#3 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#8 edit .. //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#10 edit .. //depot/projects/opencrypto/sys/opencrypto/xform.c#8 edit .. //depot/projects/opencrypto/sys/opencrypto/xform.h#7 edit Differences ... ==== //depot/projects/opencrypto/sys/opencrypto/criov.c#3 (text+ko) ==== @@ -99,35 +99,31 @@ } /* - * Return a pointer to iov/offset of location in iovec list. + * Return the index and offset of location in iovec list. */ -struct iovec * +int cuio_getptr(struct uio *uio, int loc, int *off) { - struct iovec *iov = uio->uio_iov; - int iol = uio->uio_iovcnt; + int ind, len; - while (loc >= 0) { - /* Normal end of search */ - if (loc < iov->iov_len) { + ind = 0; + while (loc >= 0 && ind < uio->uio_iovcnt) { + len = uio->uio_iov[ind].iov_len; + if (len > loc) { *off = loc; - return (iov); + return (ind); } + loc -= len; + ind++; + } - loc -= iov->iov_len; - if (iol == 0) { - if (loc == 0) { - /* Point at the end of valid data */ - *off = iov->iov_len; - return (iov); - } else - return (NULL); - } else { - iov++, iol--; - } - } + if (ind > 0 && loc == 0) { + ind--; + *off = uio->uio_iov[ind].iov_len; + return (ind); + } - return (NULL); + return (-1); } /* @@ -159,13 +155,6 @@ } void -buf_copyback(caddr_t buf, int off, int size, caddr_t in) -{ - - bcopy(in, buf + off, size); -} - -void crypto_copyback(int flags, caddr_t buf, int off, int size, caddr_t in) { @@ -205,7 +194,7 @@ } void -crypto_mbuftoiovec(struct mbuf *mbuf, struct iovec **iovptr, int *cnt, +crypto_mbuftoiov(struct mbuf *mbuf, struct iovec **iovptr, int *cnt, int *allocated) { struct iovec *iov; @@ -226,7 +215,8 @@ mtmp = m; while ((mtmp = mtmp->m_next) != NULL) j++; - iov = malloc(sizeof *iov * (i + j), M_TEMP, M_WAITOK); + iov = malloc(sizeof *iov * (i + j), M_CRYPTO_DATA, + M_WAITOK); *allocated = 1; *cnt = i + j; memcpy(iov, *iovptr, sizeof *iov * i); ==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.h#8 (text+ko) ==== @@ -459,13 +459,13 @@ struct uio; extern void cuio_copydata(struct uio* uio, int off, int len, caddr_t cp); extern void cuio_copyback(struct uio* uio, int off, int len, caddr_t cp); -extern struct iovec *cuio_getptr(struct uio *uio, int loc, int *off); +extern int cuio_getptr(struct uio *uio, int loc, int *off); extern int cuio_apply(struct uio *uio, int off, int len, int (*f)(void *, void *, u_int), void *arg); -extern void buf_copyback(caddr_t buf, int off, int len, caddr_t in); - -extern void crypto_mbuftoiovec(struct mbuf *mbuf, struct iovec **iovptr, +struct mbuf; +struct iovec; +extern void crypto_mbuftoiov(struct mbuf *mbuf, struct iovec **iovptr, int *cnt, int *allocated); extern void crypto_copyback(int flags, caddr_t buf, int off, int size, ==== //depot/projects/opencrypto/sys/opencrypto/cryptosoft.c#10 (text+ko) ==== @@ -76,111 +76,6 @@ static int swcr_freesession(device_t dev, u_int64_t tid); static int swcr_freesession_locked(device_t dev, u_int64_t tid); -typedef void (*copybackfun_t)(void *, int, int, caddr_t); - -struct blkdata { - void (*fun)(caddr_t, u_int8_t *); - caddr_t arg; - uint8_t blk[EALG_MAX_BLOCK_LEN]; - int blksize; - int blkoff; - int cnt; - void (*copyback)(void *, int, int, caddr_t); - void *copybackarg; -}; - -struct cbcdata { - struct blkdata bd; - void (*fun)(caddr_t, u_int8_t *); - caddr_t arg; - uint8_t iv[EALG_MAX_BLOCK_LEN]; -}; - -static int -blkdata(void *arg, void *dataarg, u_int len) -{ - uint8_t *data; - struct blkdata *bd; - int blksize; - int cnt; - - data = (uint8_t *)dataarg; - bd = (struct blkdata *)arg; - blksize = bd->blksize; - - /* process remaining from before */ - if (bd->cnt) { - cnt = MIN(blksize - bd->cnt, len); - memcpy(&bd->blk[bd->cnt], data, cnt); - bd->cnt += cnt; - - if (bd->cnt == blksize) { - bd->fun(bd->arg, bd->blk); - bd->copyback(bd->copybackarg, bd->blkoff, blksize, - bd->blk); - bd->blkoff += blksize; - bd->cnt = 0; - } else - return 0; - - len -= cnt; - data += cnt; - } - - while (len >= blksize) { - bd->fun(bd->arg, data); - - len -= blksize; - data += blksize; - bd->blkoff += blksize; - } - - /* keep the remaining around for the next call */ - if (len) { - bd->cnt = len; - memcpy(bd->blk, data, len); - } - - return 0; -} - -static void -cbcencdata(caddr_t arg, uint8_t *in) -{ - struct cbcdata *cd; - int i; - - cd = (struct cbcdata *)arg; - - for (i = 0; i < cd->bd.blksize; i++) { - in[i] ^= cd->iv[i]; - } - - cd->fun(cd->arg, in); - - bcopy(in, cd->iv, cd->bd.blksize); -} - -static void -cbcdecdata(caddr_t arg, uint8_t *in) -{ - uint8_t oiv[EALG_MAX_BLOCK_LEN]; - struct cbcdata *cd; - int i; - - cd = (struct cbcdata *)arg; - - bcopy(in, oiv, cd->bd.blksize); - - cd->fun(cd->arg, in); - - for (i = 0; i < cd->bd.blksize; i++) { - in[i] ^= cd->iv[i]; - } - - bcopy(oiv, cd->iv, cd->bd.blksize); -} - /* * Apply a symmetric encryption/decryption algorithm. */ @@ -188,14 +83,21 @@ swcr_encdec(struct cryptodesc *crd, struct swcr_data *sw, caddr_t buf, int flags) { - struct cbcdata cd; - struct blkdata bd; - unsigned char iv[EALG_MAX_BLOCK_LEN]; + unsigned char iv[EALG_MAX_BLOCK_LEN], blk[EALG_MAX_BLOCK_LEN], *idat; + unsigned char *ivp, *nivp, iv2[EALG_MAX_BLOCK_LEN]; struct enc_xform *exf; - int blks; + int i, j, k, blks, ind, count, ivlen; + struct uio *uio, uiolcl; + struct iovec iovlcl[4]; + struct iovec *iov; + int iovcnt, iovalloc; + int error; + + error = 0; exf = sw->sw_exf; blks = exf->blocksize; + ivlen = exf->ivsize; /* Check for non-padded data */ if (crd->crd_len % blks) @@ -209,21 +111,21 @@ if (crd->crd_flags & CRD_F_ENCRYPT) { /* IV explicitly provided ? */ if (crd->crd_flags & CRD_F_IV_EXPLICIT) - bcopy(crd->crd_iv, iv, blks); + bcopy(crd->crd_iv, iv, ivlen); else - arc4rand(iv, blks, 0); + arc4rand(iv, ivlen, 0); /* Do we need to write the IV */ if (!(crd->crd_flags & CRD_F_IV_PRESENT)) - crypto_copyback(flags, buf, crd->crd_inject, blks, iv); + crypto_copyback(flags, buf, crd->crd_inject, ivlen, iv); } else { /* Decryption */ /* IV explicitly provided ? */ if (crd->crd_flags & CRD_F_IV_EXPLICIT) - bcopy(crd->crd_iv, iv, blks); + bcopy(crd->crd_iv, iv, ivlen); else { /* Get IV off buf */ - crypto_copydata(flags, buf, crd->crd_inject, blks, iv); + crypto_copydata(flags, buf, crd->crd_inject, ivlen, iv); } } @@ -239,20 +141,23 @@ return (error); } - bd = (struct blkdata){}; - bd.fun = (crd->crd_flags & CRD_F_ENCRYPT) ? exf->encrypt : - exf->decrypt; - bd.arg = sw->sw_kschedule; - bd.blksize = blks; - bd.blkoff = crd->crd_skip; - if ((flags & CRYPTO_F_IMBUF) != 0) - bd.copyback = (copybackfun_t)m_copyback; - else if ((flags & CRYPTO_F_IOV) != 0) - bd.copyback = (copybackfun_t)cuio_copyback; - else - bd.copyback = (copybackfun_t)buf_copyback; - - bd.copybackarg = buf; + iov = iovlcl; + iovcnt = nitems(iovlcl); + iovalloc = 0; + uio = &uiolcl; + if ((flags & CRYPTO_F_IMBUF) != 0) { + crypto_mbuftoiov((struct mbuf *)buf, &iov, &iovcnt, + &iovalloc); + uio->uio_iov = iov; + uio->uio_iovcnt = iovcnt; + } else if ((flags & CRYPTO_F_IOV) != 0) + uio = (struct uio *)buf; + else { + iov[0].iov_base = buf; + iov[0].iov_len = crd->crd_skip + crd->crd_len; + uio->uio_iov = iov; + uio->uio_iovcnt = 1; + } if (exf->reinit) { /* @@ -260,24 +165,151 @@ * handling themselves. */ exf->reinit(sw->sw_kschedule, iv); + } + + count = crd->crd_skip; + ind = cuio_getptr(uio, count, &k); + if (ind == -1) { + error = EINVAL; + goto out; + } + + i = crd->crd_len; + + while (i > 0) { + /* + * If there's insufficient data at the end of + * an iovec, we have to do some copying. + */ + if (uio->uio_iov[ind].iov_len < k + blks && + uio->uio_iov[ind].iov_len != k) { + cuio_copydata(uio, count, blks, blk); + + /* Actual encryption/decryption */ + if (exf->reinit) { + if (crd->crd_flags & CRD_F_ENCRYPT) { + exf->encrypt(sw->sw_kschedule, + blk); + } else { + exf->decrypt(sw->sw_kschedule, + blk); + } + } else if (crd->crd_flags & CRD_F_ENCRYPT) { + /* XOR with previous block */ + for (j = 0; j < blks; j++) + blk[j] ^= ivp[j]; + + exf->encrypt(sw->sw_kschedule, blk); + + /* + * Keep encrypted block for XOR'ing + * with next block + */ + bcopy(blk, iv, blks); + ivp = iv; + } else { /* decrypt */ + /* + * Keep encrypted block for XOR'ing + * with next block + */ + nivp = (ivp == iv) ? iv2 : iv; + bcopy(blk, nivp, blks); + + exf->decrypt(sw->sw_kschedule, blk); + + /* XOR with previous block */ + for (j = 0; j < blks; j++) + blk[j] ^= ivp[j]; + + ivp = nivp; + } + + /* Copy back decrypted block */ + cuio_copyback(uio, count, blks, blk); + + count += blks; + + /* Advance pointer */ + ind = cuio_getptr(uio, count, &k); + if (ind == -1) { + error = EINVAL; + goto out; + } + + i -= blks; + + /* Could be done... */ + if (i == 0) + break; + } + + /* + * Warning: idat may point to garbage here, but + * we only use it in the while() loop, only if + * there are indeed enough data. + */ + idat = (char *)uio->uio_iov[ind].iov_base + k; - crypto_apply(flags, buf, crd->crd_skip, crd->crd_len, blkdata, - &bd); - } else { - cd.bd = bd; + while (uio->uio_iov[ind].iov_len >= k + blks && i > 0) { + if (exf->reinit) { + if (crd->crd_flags & CRD_F_ENCRYPT) { + exf->encrypt(sw->sw_kschedule, + idat); + } else { + exf->decrypt(sw->sw_kschedule, + idat); + } + } else if (crd->crd_flags & CRD_F_ENCRYPT) { + /* XOR with previous block/IV */ + for (j = 0; j < blks; j++) + idat[j] ^= ivp[j]; + + exf->encrypt(sw->sw_kschedule, idat); + ivp = idat; + } else { /* decrypt */ + /* + * Keep encrypted block to be used + * in next block's processing. + */ + nivp = (ivp == iv) ? iv2 : iv; + bcopy(idat, nivp, blks); + + exf->decrypt(sw->sw_kschedule, idat); + + /* XOR with previous block/IV */ + for (j = 0; j < blks; j++) + idat[j] ^= ivp[j]; - cd.fun = bd.fun; - cd.arg = bd.arg; + ivp = nivp; + } - cd.bd.fun = (crd->crd_flags & CRD_F_ENCRYPT) ? cbcencdata : - cbcdecdata; - cd.bd.arg = (caddr_t)&cd; + idat += blks; + count += blks; + k += blks; + i -= blks; + } - crypto_apply(flags, buf, crd->crd_skip, crd->crd_len, blkdata, - &cd); + /* + * Advance to the next iov if the end of the current iov + * is aligned with the end of a cipher block. + * Note that the code is equivalent to calling: + * ind = cuio_getptr(uio, count, &k); + */ + if (i > 0 && k == uio->uio_iov[ind].iov_len) { + k = 0; + ind++; + if (ind >= uio->uio_iovcnt) { + error = EINVAL; + goto out; + } + } } - return 0; +out: + if (iovalloc) + free(iov, M_CRYPTO_DATA); + + return (error); } static void ==== //depot/projects/opencrypto/sys/opencrypto/xform.c#8 (text+ko) ==== @@ -153,7 +153,7 @@ struct enc_xform enc_xform_null = { CRYPTO_NULL_CBC, "NULL", /* NB: blocksize of 4 is to generate a properly aligned ESP header */ - NULL_BLOCK_LEN, 0, 256, /* 2048 bits, max key */ + NULL_BLOCK_LEN, NULL_BLOCK_LEN, 0, 256, /* 2048 bits, max key */ null_encrypt, null_decrypt, null_setkey, @@ -163,7 +163,7 @@ struct enc_xform enc_xform_des = { CRYPTO_DES_CBC, "DES", - DES_BLOCK_LEN, 8, 8, + DES_BLOCK_LEN, DES_BLOCK_LEN, 8, 8, des1_encrypt, des1_decrypt, des1_setkey, @@ -173,7 +173,7 @@ struct enc_xform enc_xform_3des = { CRYPTO_3DES_CBC, "3DES", - DES3_BLOCK_LEN, 24, 24, + DES3_BLOCK_LEN, DES3_BLOCK_LEN, 24, 24, des3_encrypt, des3_decrypt, des3_setkey, @@ -183,7 +183,7 @@ struct enc_xform enc_xform_blf = { CRYPTO_BLF_CBC, "Blowfish", - BLOWFISH_BLOCK_LEN, 5, 56 /* 448 bits, max key */, + BLOWFISH_BLOCK_LEN, BLOWFISH_BLOCK_LEN, 5, 56 /* 448 bits, max key */, blf_encrypt, blf_decrypt, blf_setkey, @@ -193,7 +193,7 @@ struct enc_xform enc_xform_cast5 = { CRYPTO_CAST_CBC, "CAST-128", - CAST128_BLOCK_LEN, 5, 16, + CAST128_BLOCK_LEN, CAST128_BLOCK_LEN, 5, 16, cast5_encrypt, cast5_decrypt, cast5_setkey, @@ -203,7 +203,7 @@ struct enc_xform enc_xform_skipjack = { CRYPTO_SKIPJACK_CBC, "Skipjack", - SKIPJACK_BLOCK_LEN, 10, 10, + SKIPJACK_BLOCK_LEN, SKIPJACK_BLOCK_LEN, 10, 10, skipjack_encrypt, skipjack_decrypt, skipjack_setkey, skipjack_zerokey, @@ -212,7 +212,7 @@ struct enc_xform enc_xform_rijndael128 = { CRYPTO_RIJNDAEL128_CBC, "Rijndael-128/AES", - RIJNDAEL128_BLOCK_LEN, 16, 32, + RIJNDAEL128_BLOCK_LEN, RIJNDAEL128_BLOCK_LEN, 16, 32, rijndael128_encrypt, rijndael128_decrypt, rijndael128_setkey, @@ -222,7 +222,7 @@ struct enc_xform enc_xform_aes_icm = { CRYPTO_AES_ICM, "AES-ICM", - RIJNDAEL128_BLOCK_LEN, 16, 32, + RIJNDAEL128_BLOCK_LEN, RIJNDAEL128_BLOCK_LEN, 16, 32, aes_icm_crypt, aes_icm_crypt, aes_icm_setkey, @@ -232,7 +232,7 @@ struct enc_xform enc_xform_aes_nist_gcm = { CRYPTO_AES_NIST_GCM_16, "AES-GCM", - 1, 16, 32, + 1, 12, 16, 32, aes_icm_crypt, aes_icm_crypt, aes_icm_setkey, @@ -242,7 +242,7 @@ struct enc_xform enc_xform_aes_nist_gmac = { CRYPTO_AES_NIST_GMAC, "AES-GMAC", - 1, 16, 32, + 1, 12, 16, 32, NULL, NULL, NULL, @@ -252,7 +252,7 @@ struct enc_xform enc_xform_aes_xts = { CRYPTO_AES_XTS, "AES-XTS", - RIJNDAEL128_BLOCK_LEN, 32, 64, + RIJNDAEL128_BLOCK_LEN, 8, 32, 64, aes_xts_encrypt, aes_xts_decrypt, aes_xts_setkey, @@ -262,7 +262,7 @@ struct enc_xform enc_xform_arc4 = { CRYPTO_ARC4, "ARC4", - 1, 1, 32, + 1, 1, 1, 32, NULL, NULL, NULL, @@ -272,7 +272,7 @@ struct enc_xform enc_xform_camellia = { CRYPTO_CAMELLIA_CBC, "Camellia", - CAMELLIA_BLOCK_LEN, 8, 32, + CAMELLIA_BLOCK_LEN, CAMELLIA_BLOCK_LEN, 8, 32, cml_encrypt, cml_decrypt, cml_setkey, ==== //depot/projects/opencrypto/sys/opencrypto/xform.h#7 (text+ko) ==== @@ -58,6 +58,7 @@ int type; char *name; u_int16_t blocksize; + u_int16_t ivsize; u_int16_t minkey, maxkey; void (*encrypt) (caddr_t, u_int8_t *); void (*decrypt) (caddr_t, u_int8_t *); From owner-p4-projects@FreeBSD.ORG Tue Sep 9 17:40:48 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C14C5DFC; Tue, 9 Sep 2014 17:40:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82C13DFA for ; Tue, 9 Sep 2014 17:40:48 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6B2E2D45 for ; Tue, 9 Sep 2014 17:40:48 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s89HemJx036609 for ; Tue, 9 Sep 2014 17:40:48 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s89HeiUl036098 for perforce@freebsd.org; Tue, 9 Sep 2014 17:40:44 GMT (envelope-from jmg@freebsd.org) Date: Tue, 9 Sep 2014 17:40:44 GMT Message-Id: <201409091740.s89HeiUl036098@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1200029 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Sep 2014 17:40:49 -0000 http://p4web.freebsd.org/@@1200029?ac=10 Change 1200029 by jmg@jmg_carbon2 on 2014/09/09 17:40:39 integrate 1200028 Affected files ... .. //depot/projects/opencrypto/share/man/man4/Makefile#2 integrate .. //depot/projects/opencrypto/share/man/man4/altera_atse.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/atkbd.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/filemon.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/ip.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/iwn.4#3 integrate .. //depot/projects/opencrypto/share/man/man4/iwnfw.4#3 integrate .. //depot/projects/opencrypto/share/man/man4/kbdmux.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/splash.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/ukbd.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/uled.4#1 branch .. //depot/projects/opencrypto/share/man/man4/urtwn.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/vkbd.4#2 integrate .. //depot/projects/opencrypto/share/man/man4/vt.4#2 integrate .. //depot/projects/opencrypto/share/man/man5/Makefile#2 integrate .. //depot/projects/opencrypto/share/man/man5/autofs.5#1 branch .. //depot/projects/opencrypto/share/man/man5/rc.conf.5#2 integrate .. //depot/projects/opencrypto/share/man/man5/src.conf.5#2 integrate .. //depot/projects/opencrypto/share/man/man7/hier.7#2 integrate .. //depot/projects/opencrypto/share/man/man8/nanobsd.8#2 integrate .. //depot/projects/opencrypto/share/man/man9/Makefile#2 integrate .. //depot/projects/opencrypto/share/man/man9/sysctl.9#2 integrate .. //depot/projects/opencrypto/share/man/man9/sysctl_add_oid.9#2 integrate .. //depot/projects/opencrypto/share/man/man9/timeout.9#2 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/cpu_switch.S#2 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/fpu.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/genassym.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/identcpu.c#2 delete .. //depot/projects/opencrypto/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/mp_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/pmap.c#3 integrate .. //depot/projects/opencrypto/sys/amd64/amd64/support.S#2 integrate .. //depot/projects/opencrypto/sys/amd64/conf/GENERIC#2 integrate .. //depot/projects/opencrypto/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/opencrypto/sys/amd64/include/fpu.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/include/param.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/include/pc/bios.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/include/pcb.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/include/vmm.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/include/vmparam.h#2 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/io/vatpic.c#3 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/vmm_instruction_emul.c#3 integrate .. //depot/projects/opencrypto/sys/amd64/vmm/x86.c#2 integrate .. //depot/projects/opencrypto/sys/arm/altera/socfpga/files.socfpga#1 branch .. //depot/projects/opencrypto/sys/arm/altera/socfpga/socfpga_common.c#1 branch .. //depot/projects/opencrypto/sys/arm/altera/socfpga/socfpga_common.h#1 branch .. //depot/projects/opencrypto/sys/arm/altera/socfpga/socfpga_machdep.c#1 branch .. //depot/projects/opencrypto/sys/arm/altera/socfpga/socfpga_manager.c#1 branch .. //depot/projects/opencrypto/sys/arm/altera/socfpga/std.socfpga#1 branch .. //depot/projects/opencrypto/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/opencrypto/sys/arm/arm/generic_timer.c#3 integrate .. //depot/projects/opencrypto/sys/arm/arm/gic.c#3 integrate .. //depot/projects/opencrypto/sys/arm/arm/locore.S#2 integrate .. //depot/projects/opencrypto/sys/arm/arm/nexus.c#4 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_common.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_machdep.c#3 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_mci.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_pinctrl.c#1 branch .. //depot/projects/opencrypto/sys/arm/at91/at91_pio.c#2 integrate .. //depot/projects/opencrypto/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/opencrypto/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/BEAGLEBONE#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/CNS11XXNAS#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/CUBIEBOARD#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/CUBIEBOARD2#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/DIGI-CCWMX53#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/DOCKSTAR#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/DREAMPLUG-1001#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/EA3250#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/EB9200#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/EFIKA_MX#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/EXYNOS5.common#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/HL200#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/HL201#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/IMX53#1 branch .. //depot/projects/opencrypto/sys/arm/conf/IMX53-QSB#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/IMX6#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/KB920X#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/NSLU#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/PANDABOARD#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/QILA9G20#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/RK3188#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/SAM9G20EK#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/SAM9X25EK#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/SN9G45#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/SOCKIT#1 branch .. //depot/projects/opencrypto/sys/arm/conf/VYBRID#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/WANDBOARD-DUAL#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/WANDBOARD-QUAD#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/WANDBOARD-SOLO#2 integrate .. //depot/projects/opencrypto/sys/arm/conf/ZEDBOARD#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/fsl_ocotp.c#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/files.imx51#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/files.imx53#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/files.imx6#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx51_ccm.c#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx51_iomux.c#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx51_iomuxvar.h#2 delete .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx6_anatop.c#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx6_ccm.c#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx6_iomux.c#1 branch .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx6_iomuxreg.h#1 branch .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx_ccmvar.h#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx_iomuxvar.h#1 branch .. //depot/projects/opencrypto/sys/arm/freescale/imx/imx_sdhci.c#2 integrate .. //depot/projects/opencrypto/sys/arm/freescale/vybrid/vf_sai.c#2 integrate .. //depot/projects/opencrypto/sys/arm/include/asm.h#2 integrate .. //depot/projects/opencrypto/sys/arm/include/atomic.h#2 integrate .. //depot/projects/opencrypto/sys/arm/include/cpuconf.h#2 integrate .. //depot/projects/opencrypto/sys/arm/include/elf.h#2 integrate .. //depot/projects/opencrypto/sys/arm/include/intr.h#2 integrate .. //depot/projects/opencrypto/sys/arm/include/platform.h#2 integrate .. //depot/projects/opencrypto/sys/arm/mv/gpio.c#2 integrate .. //depot/projects/opencrypto/sys/arm/rockchip/rk30xx_gpio.c#2 integrate .. //depot/projects/opencrypto/sys/arm/ti/ti_i2c.c#2 integrate .. //depot/projects/opencrypto/sys/arm/ti/ti_i2c.h#2 integrate .. //depot/projects/opencrypto/sys/arm/ti/ti_sdhci.c#2 integrate .. //depot/projects/opencrypto/sys/arm/xilinx/files.zynq7#2 integrate .. //depot/projects/opencrypto/sys/boot/arm/uboot/help.uboot#2 integrate .. //depot/projects/opencrypto/sys/boot/common/module.c#3 integrate .. //depot/projects/opencrypto/sys/boot/common/part.c#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/cubieboard2.dts#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/imx6.dtsi#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/sam9260ek.dts#1 branch .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/socfpga-sockit.dts#1 branch .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/socfpga.dtsi#1 branch .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/sun4i-a10.dtsi#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/sun7i-a20.dtsi#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/wandboard-dual.dts#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/wandboard-quad.dts#2 integrate .. //depot/projects/opencrypto/sys/boot/fdt/dts/arm/wandboard-solo.dts#2 integrate .. //depot/projects/opencrypto/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/i386/btx/btx/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/i386/btx/btxldr/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/i386/btx/lib/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/mips/beri/boot2/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/mips/beri/loader/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/pc98/boot2/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/pc98/btx/lib/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/pc98/loader/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/sparc64/boot1/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/sparc64/loader/Makefile#2 integrate .. //depot/projects/opencrypto/sys/boot/uboot/common/main.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ata/ata_da.c#3 integrate .. //depot/projects/opencrypto/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl.c#3 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl.h#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_backend_block.c#3 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_frontend_iscsi.c#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_io.h#2 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_private.h#3 integrate .. //depot/projects/opencrypto/sys/cam/ctl/ctl_tpc.c#3 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/opencrypto/sys/cam/scsi/scsi_low.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/os/fm.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate .. //depot/projects/opencrypto/sys/cddl/contrib/opensolaris/uts/sparc/dtrace/fasttrap_isa.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/dev/fbt/fbt.c#2 integrate .. //depot/projects/opencrypto/sys/cddl/dev/fbt/fbt.h#1 branch .. //depot/projects/opencrypto/sys/cddl/dev/fbt/fbt_powerpc.c#2 delete .. //depot/projects/opencrypto/sys/cddl/dev/fbt/powerpc/fbt_isa.c#1 branch .. //depot/projects/opencrypto/sys/cddl/dev/fbt/powerpc/fbt_isa.h#1 branch .. //depot/projects/opencrypto/sys/cddl/dev/fbt/x86/fbt_isa.c#1 branch .. //depot/projects/opencrypto/sys/cddl/dev/fbt/x86/fbt_isa.h#1 branch .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_proto.h#2 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_syscall.h#2 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_syscalls.c#2 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_sysent.c#2 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/freebsd32_systrace_args.c#2 integrate .. //depot/projects/opencrypto/sys/compat/freebsd32/syscalls.master#2 integrate .. //depot/projects/opencrypto/sys/compat/linprocfs/linprocfs.c#2 integrate .. //depot/projects/opencrypto/sys/conf/NOTES#2 integrate .. //depot/projects/opencrypto/sys/conf/files#7 integrate .. //depot/projects/opencrypto/sys/conf/files.amd64#5 integrate .. //depot/projects/opencrypto/sys/conf/files.i386#6 integrate .. //depot/projects/opencrypto/sys/conf/files.pc98#3 integrate .. //depot/projects/opencrypto/sys/conf/options#4 integrate .. //depot/projects/opencrypto/sys/contrib/dev/iwn/iwlwifi-100-39.31.5.1.fw.uu#1 branch .. //depot/projects/opencrypto/sys/contrib/rdma/krping/krping.c#2 integrate .. //depot/projects/opencrypto/sys/dev/acpica/acpi.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ae/if_ae.c#2 integrate .. //depot/projects/opencrypto/sys/dev/age/if_age.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/opencrypto/sys/dev/ahci/ahci_pci.c#1 branch .. //depot/projects/opencrypto/sys/dev/ahci/ahciem.c#2 integrate .. //depot/projects/opencrypto/sys/dev/alc/if_alc.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ale/if_ale.c#2 integrate .. //depot/projects/opencrypto/sys/dev/altera/atse/if_atse.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ath/if_ath.c#3 integrate .. //depot/projects/opencrypto/sys/dev/ath/if_ath_beacon.c#2 integrate .. //depot/projects/opencrypto/sys/dev/bce/if_bce.c#2 integrate .. //depot/projects/opencrypto/sys/dev/bfe/if_bfe.c#2 integrate .. //depot/projects/opencrypto/sys/dev/bge/if_bge.c#2 integrate .. //depot/projects/opencrypto/sys/dev/bktr/CHANGELOG.TXT#2 integrate .. //depot/projects/opencrypto/sys/dev/bxe/bxe.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cadence/if_cgem.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cadence/if_cgem_hw.h#2 integrate .. //depot/projects/opencrypto/sys/dev/cas/if_cas.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgb/cxgb_osdep.h#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/iw_cxgbe/cm.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/iw_cxgbe/qp.c#2 integrate .. //depot/projects/opencrypto/sys/dev/cxgbe/t4_netmap.c#2 integrate .. //depot/projects/opencrypto/sys/dev/dc/if_dc.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm/drm_sysctl.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/drm_fb_helper.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/i915/i915_drv.h#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/i915/i915_irq.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/i915/intel_opregion.c#2 integrate .. //depot/projects/opencrypto/sys/dev/drm2/radeon/radeon_fb.c#2 integrate .. //depot/projects/opencrypto/sys/dev/e1000/if_em.c#2 integrate .. //depot/projects/opencrypto/sys/dev/e1000/if_igb.c#2 integrate .. //depot/projects/opencrypto/sys/dev/e1000/if_lem.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ep/if_ep.c#2 integrate .. //depot/projects/opencrypto/sys/dev/fb/creator_vt.c#2 integrate .. //depot/projects/opencrypto/sys/dev/fdt/fdt_clock.c#1 branch .. //depot/projects/opencrypto/sys/dev/fdt/fdt_clock.h#1 branch .. //depot/projects/opencrypto/sys/dev/fdt/fdt_clock_if.m#1 branch .. //depot/projects/opencrypto/sys/dev/fdt/fdt_common.c#2 integrate .. //depot/projects/opencrypto/sys/dev/fdt/simplebus.c#3 integrate .. //depot/projects/opencrypto/sys/dev/ffec/if_ffec.c#2 integrate .. //depot/projects/opencrypto/sys/dev/firewire/if_fwe.c#2 integrate .. //depot/projects/opencrypto/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/opencrypto/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/opencrypto/sys/dev/gpio/ofw_gpiobus.c#2 integrate .. //depot/projects/opencrypto/sys/dev/gxemul/ether/if_gx.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptnr/README#2 integrate .. //depot/projects/opencrypto/sys/dev/hptnr/amd64-elf.hptnr_lib.o.uu#2 integrate .. //depot/projects/opencrypto/sys/dev/hptnr/hptnr_config.c#2 integrate .. //depot/projects/opencrypto/sys/dev/hptnr/hptnr_os_bsd.c#3 integrate .. //depot/projects/opencrypto/sys/dev/hptnr/hptnr_osm_bsd.c#3 integrate .. //depot/projects/opencrypto/sys/dev/hptnr/i386-elf.hptnr_lib.o.uu#2 integrate .. //depot/projects/opencrypto/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/i40e/README#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_adminq.c#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_adminq.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_adminq_cmd.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_alloc.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_common.c#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_hmc.c#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_hmc.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_lan_hmc.c#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_lan_hmc.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_nvm.c#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_osdep.c#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_osdep.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_pf.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_prototype.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_register.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_register_x710_int.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_status.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_txrx.c#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_type.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/i40e_virtchnl.h#2 delete .. //depot/projects/opencrypto/sys/dev/i40e/if_i40e.c#2 delete .. //depot/projects/opencrypto/sys/dev/if_ndis/if_ndis.c#2 integrate .. //depot/projects/opencrypto/sys/dev/iscsi/icl.c#2 integrate .. //depot/projects/opencrypto/sys/dev/iscsi/icl_proxy.c#2 integrate .. //depot/projects/opencrypto/sys/dev/iscsi/iscsi.c#2 integrate .. //depot/projects/opencrypto/sys/dev/iwn/if_iwn.c#3 integrate .. //depot/projects/opencrypto/sys/dev/iwn/if_iwnreg.h#2 integrate .. //depot/projects/opencrypto/sys/dev/iwn/if_iwnvar.h#2 integrate .. //depot/projects/opencrypto/sys/dev/ixgb/if_ixgb.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/opencrypto/sys/dev/ixgbe/ixgbe.h#2 integrate .. //depot/projects/opencrypto/sys/dev/ixgbe/ixv.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ixl/README#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_adminq.c#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_adminq.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_adminq_cmd.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_alloc.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_common.c#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_hmc.c#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_hmc.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_lan_hmc.c#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_lan_hmc.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_nvm.c#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_osdep.c#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_osdep.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_prototype.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_register.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_register_x710_int.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_status.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_type.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/i40e_virtchnl.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/if_ixl.c#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/if_ixlv.c#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/ixl.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/ixl_pf.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/ixl_txrx.c#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/ixlv.h#1 branch .. //depot/projects/opencrypto/sys/dev/ixl/ixlvc.c#1 branch .. //depot/projects/opencrypto/sys/dev/jme/if_jme.c#2 integrate .. //depot/projects/opencrypto/sys/dev/le/lance.c#2 integrate .. //depot/projects/opencrypto/sys/dev/mii/e1000phy.c#2 integrate .. //depot/projects/opencrypto/sys/dev/mii/mii.c#2 integrate .. //depot/projects/opencrypto/sys/dev/mrsas/mrsas.h#2 integrate .. //depot/projects/opencrypto/sys/dev/mrsas/mrsas_cam.c#2 integrate .. //depot/projects/opencrypto/sys/dev/msk/if_msk.c#2 integrate .. //depot/projects/opencrypto/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/if_em_netmap.h#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/if_igb_netmap.h#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/if_lem_netmap.h#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/if_re_netmap.h#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/if_vtnet_netmap.h#1 branch .. //depot/projects/opencrypto/sys/dev/netmap/ixgbe_netmap.h#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap.c#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_freebsd.c#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_generic.c#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_kern.h#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_mbq.h#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_mem2.c#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_mem2.h#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_monitor.c#1 branch .. //depot/projects/opencrypto/sys/dev/netmap/netmap_offloadings.c#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_pipe.c#2 integrate .. //depot/projects/opencrypto/sys/dev/netmap/netmap_vale.c#2 integrate .. //depot/projects/opencrypto/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/opencrypto/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ofw/ofw_bus_subr.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ofw/ofw_console.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ofw/ofw_fdt.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ofw/ofwbus.c#3 integrate .. //depot/projects/opencrypto/sys/dev/ofw/openfirm.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ofw/openfirm.h#2 integrate .. //depot/projects/opencrypto/sys/dev/pci/pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/opencrypto/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/opencrypto/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/opencrypto/sys/dev/qlxgb/qla_os.c#2 integrate .. //depot/projects/opencrypto/sys/dev/qlxgbe/ql_os.c#2 integrate .. //depot/projects/opencrypto/sys/dev/qlxge/qls_os.c#2 integrate .. //depot/projects/opencrypto/sys/dev/re/if_re.c#2 integrate .. //depot/projects/opencrypto/sys/dev/rt/if_rt.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sdhci/sdhci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sdhci/sdhci.h#2 integrate .. //depot/projects/opencrypto/sys/dev/sdhci/sdhci_fdt.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sdhci/sdhci_if.m#2 integrate .. //depot/projects/opencrypto/sys/dev/sdhci/sdhci_pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sf/if_sf.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sge/if_sge.c#2 integrate .. //depot/projects/opencrypto/sys/dev/si/si.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sis/if_sis.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sk/if_sk.c#2 integrate .. //depot/projects/opencrypto/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/opencrypto/sys/dev/ste/if_ste.c#2 integrate .. //depot/projects/opencrypto/sys/dev/stge/if_stge.c#2 integrate .. //depot/projects/opencrypto/sys/dev/streams/streams.c#2 integrate .. //depot/projects/opencrypto/sys/dev/tsec/if_tsec_fdt.c#2 integrate .. //depot/projects/opencrypto/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/misc/uled.c#1 branch .. //depot/projects/opencrypto/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/quirk/usb_quirk.c#3 integrate .. //depot/projects/opencrypto/sys/dev/usb/uled_ioctl.h#1 branch .. //depot/projects/opencrypto/sys/dev/usb/usbdevs#3 integrate .. //depot/projects/opencrypto/sys/dev/usb/wlan/if_run.c#2 integrate .. //depot/projects/opencrypto/sys/dev/usb/wlan/if_urtwn.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/opencrypto/sys/dev/virtio/network/if_vtnet.c#2 integrate .. //depot/projects/opencrypto/sys/dev/virtio/virtqueue.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vr/if_vr.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/font/vt_mouse_cursor.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/efifb/efifb.c#3 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/fb/vt_early_fb.c#3 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/fb/vt_fb.c#3 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/fb/vt_fb.h#3 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/ofwfb/ofwfb.c#3 integrate .. //depot/projects/opencrypto/sys/dev/vt/hw/vga/vt_vga.c#3 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt.h#3 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt_buf.c#3 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt_core.c#3 integrate .. //depot/projects/opencrypto/sys/dev/vt/vt_sysmouse.c#2 integrate .. //depot/projects/opencrypto/sys/dev/vxge/vxge.c#2 integrate .. //depot/projects/opencrypto/sys/dev/xen/blkback/blkback.c#2 integrate .. //depot/projects/opencrypto/sys/dev/xen/blkfront/blkfront.c#3 integrate .. //depot/projects/opencrypto/sys/dev/xen/netback/netback.c#2 integrate .. //depot/projects/opencrypto/sys/fs/autofs/autofs.c#1 branch .. //depot/projects/opencrypto/sys/fs/autofs/autofs.h#1 branch .. //depot/projects/opencrypto/sys/fs/autofs/autofs_ioctl.h#1 branch .. //depot/projects/opencrypto/sys/fs/autofs/autofs_vfsops.c#1 branch .. //depot/projects/opencrypto/sys/fs/autofs/autofs_vnops.c#1 branch .. //depot/projects/opencrypto/sys/fs/nfs/nfsm_subs.h#2 integrate .. //depot/projects/opencrypto/sys/gdb/gdb_int.h#2 integrate .. //depot/projects/opencrypto/sys/gdb/gdb_main.c#2 integrate .. //depot/projects/opencrypto/sys/gdb/gdb_packet.c#2 integrate .. //depot/projects/opencrypto/sys/geom/eli/g_eli_crypto.c#2 integrate .. //depot/projects/opencrypto/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/opencrypto/sys/geom/eli/g_eli_privacy.c#2 integrate .. //depot/projects/opencrypto/sys/geom/geom_dev.c#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9261.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9261ek.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9rl.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9rlek.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_can.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_isi.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_lcd.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-apf51.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-apf51dev.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-babbage.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-digi-connectcore-jsk.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-digi-connectcore-som.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-eukrea-cpuimx51.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-eukrea-mbimxsd51-baseboard.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-pinfunc.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-ard.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-evk.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-m53.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-m53evk.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-mba53.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-pinfunc.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-qsb-common.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-qsb.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-qsrb.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-smd.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tqma53.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tx53-x03x.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tx53-x13x.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tx53.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-voipac-bsb.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-voipac-dmm-668.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-aristainetos_4.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-aristainetos_7.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-cubox-i.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-dfi-fs700-m60.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw51xx.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw52xx.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw53xx.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw54xx.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-hummingboard.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-nitrogen6x.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-phytec-pbab01.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-phytec-pfla02.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-pinfunc.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-rex-basic.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-riotboard.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-sabreauto.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-sabrelite.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-sabresd.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-tx6dl-comtft.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-tx6u-801x.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-tx6u-811x.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-wandboard-revb1.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-wandboard.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-arm2.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-cm-fx6.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-cubox-i.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-dfi-fs700-m60.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-dmo-edmqmx6.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gk802.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw51xx.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw52xx.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw53xx.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw5400-a.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw54xx.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-nitrogen6x.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-phytec-pbab01.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-phytec-pfla02.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-pinfunc.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-rex-pro.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sabreauto.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sabrelite.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sabresd.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sbc6x.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1010-comtft.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1010.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1020-comtft.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1020.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1110.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-udoo.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-wandboard-revb1.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-wandboard.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-aristainetos.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-cubox-i.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-dfi-fs700-m60.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw51xx.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw52xx.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw53xx.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw54xx.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-nitrogen6x.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-phytec-pfla02.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-rex.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-sabreauto.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-sabrelite.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-sabresd.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-tx6.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-wandboard-revb1.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-wandboard-revc1.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-wandboard.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sl-evk.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sl-pinfunc.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sl.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sx-sdb.dts#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sx.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/skeleton64.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/vf610.dtsi#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clk/ti-dra7-atl.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/at91.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/bcm21664.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/bcm281xx.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/berlin2.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/berlin2q.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/clps711x-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/exynos-audss-clk.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/exynos3250.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/exynos4.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/exynos5250.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/exynos5260-clk.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/exynos5410.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/exynos5420.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/exynos5440.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/hi3620-clock.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/hip04-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/hix5hd2-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/imx1-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/imx21-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/imx27-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/imx6sl-clock.h#3 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8960.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8974.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8960.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/r7s72100-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/r8a7779-clock.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/r8a7790-clock.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/r8a7791-clock.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/rk3066a-cru.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/rk3288-cru.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/s3c2410.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/s3c2412.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/s3c2443.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/s5pv210-audss.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/s5pv210.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/stih415-clks.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/stih416-clks.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/tegra114-car.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/tegra124-car.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/clock/vf610-clock.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/dma/nbpfaxi.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/mfd/as3722.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/mfd/palmas.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/phy/phy-miphy365x.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/pinctrl/am43xx.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/pinctrl/dra.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/pinctrl/omap.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/reset-controller/stih415-resets.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/reset-controller/stih416-resets.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/reset/altr,rst-mgr.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-apq8084.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-ipq806x.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8960.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-apq8084.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8960.h#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/soc/qcom,gsbi.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/sound/tlv320aic31xx-micbias.h#1 branch .. //depot/projects/opencrypto/sys/gnu/dts/include/dt-bindings/spmi/spmi.h#1 branch .. //depot/projects/opencrypto/sys/i386/conf/GENERIC#2 integrate .. //depot/projects/opencrypto/sys/i386/conf/NOTES#3 integrate .. //depot/projects/opencrypto/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/identcpu.c#2 delete .. //depot/projects/opencrypto/sys/i386/i386/initcpu.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/mp_machdep.c#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/pmap.c#3 integrate .. //depot/projects/opencrypto/sys/i386/i386/support.s#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/swtch.s#2 integrate .. //depot/projects/opencrypto/sys/i386/i386/trap.c#2 integrate .. //depot/projects/opencrypto/sys/i386/include/md_var.h#2 integrate .. //depot/projects/opencrypto/sys/i386/include/npx.h#2 integrate .. //depot/projects/opencrypto/sys/i386/include/pc/bios.h#2 integrate .. //depot/projects/opencrypto/sys/i386/include/pcb.h#2 integrate .. //depot/projects/opencrypto/sys/i386/isa/npx.c#2 integrate .. //depot/projects/opencrypto/sys/i386/xen/pmap.c#3 integrate .. //depot/projects/opencrypto/sys/kern/imgact_binmisc.c#2 integrate .. //depot/projects/opencrypto/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/opencrypto/sys/kern/imgact_shell.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_descrip.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_exit.c#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_jail.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_lock.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_proc.c#3 integrate .. //depot/projects/opencrypto/sys/kern/kern_prot.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_sig.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_synch.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_thread.c#2 integrate .. //depot/projects/opencrypto/sys/kern/kern_umtx.c#2 integrate .. //depot/projects/opencrypto/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/opencrypto/sys/kern/sched_ule.c#2 integrate .. //depot/projects/opencrypto/sys/kern/subr_terminal.c#2 integrate .. //depot/projects/opencrypto/sys/kern/sys_socket.c#2 integrate .. //depot/projects/opencrypto/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/opencrypto/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/opencrypto/sys/kern/uipc_shm.c#3 integrate .. //depot/projects/opencrypto/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/opencrypto/sys/kern/vfs_bio.c#3 integrate .. //depot/projects/opencrypto/sys/kern/vfs_lookup.c#2 integrate .. //depot/projects/opencrypto/sys/kern/vfs_mount.c#3 integrate .. //depot/projects/opencrypto/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/opencrypto/sys/libkern/memmem.c#1 branch .. //depot/projects/opencrypto/sys/libkern/strndup.c#1 branch .. //depot/projects/opencrypto/sys/mips/beri/beri_simplebus.c#2 integrate .. //depot/projects/opencrypto/sys/mips/cavium/if_octm.c#2 integrate .. //depot/projects/opencrypto/sys/mips/cavium/octe/octe.c#2 integrate .. //depot/projects/opencrypto/sys/mips/conf/WZR-300HP#2 integrate .. //depot/projects/opencrypto/sys/mips/conf/WZR-300HP.hints#2 integrate .. //depot/projects/opencrypto/sys/mips/include/sf_buf.h#3 integrate .. //depot/projects/opencrypto/sys/mips/include/vmparam.h#3 integrate .. //depot/projects/opencrypto/sys/modules/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/ahci/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/aic7xxx/ahc/ahc_eisa/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/autofs/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/drm2/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/drm2/i915kms/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/dtrace/fbt/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/i40e/Makefile#3 delete .. //depot/projects/opencrypto/sys/modules/if_gif/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/iwnfw/Makefile#2 integrate .. //depot/projects/opencrypto/sys/modules/iwnfw/iwn100/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/ixl/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/ixlv/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/mlx4/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/mlx4ib/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/mlxen/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/si/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/usb/Makefile#3 integrate .. //depot/projects/opencrypto/sys/modules/usb/uled/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/wds/Makefile#1 branch .. //depot/projects/opencrypto/sys/modules/wl/Makefile#1 branch .. //depot/projects/opencrypto/sys/net/if.c#2 integrate .. //depot/projects/opencrypto/sys/net/if.h#2 integrate .. //depot/projects/opencrypto/sys/net/if_gre.c#2 integrate .. //depot/projects/opencrypto/sys/net/if_mib.c#2 integrate .. //depot/projects/opencrypto/sys/net/if_stf.c#3 integrate .. //depot/projects/opencrypto/sys/net/if_var.h#2 integrate .. //depot/projects/opencrypto/sys/net/if_vlan.c#3 integrate .. //depot/projects/opencrypto/sys/net/netisr.h#2 integrate .. //depot/projects/opencrypto/sys/net/netmap.h#2 integrate .. //depot/projects/opencrypto/sys/net/netmap_user.h#2 integrate .. //depot/projects/opencrypto/sys/net/paravirt.h#1 branch .. //depot/projects/opencrypto/sys/net/rtsock.c#2 integrate .. //depot/projects/opencrypto/sys/net/sff8436.h#1 branch .. //depot/projects/opencrypto/sys/net/sff8472.h#2 integrate .. //depot/projects/opencrypto/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/cc/cc_cdg.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/if_ether.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/in.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/in.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/in_gif.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/in_pcb.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/in_rss.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/in_rss.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/in_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_carp.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/ip_fastfwd.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_input.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/ip_mroute.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/ip_output.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/ip_var.h#3 integrate .. //depot/projects/opencrypto/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_constants.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_os_bsd.h#2 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_output.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/opencrypto/sys/netinet/sctp_usrreq.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/sctputil.c#4 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/tcp_syncache.c#2 integrate .. //depot/projects/opencrypto/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/in6.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_src.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/in6_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_mroute.c#3 integrate .. //depot/projects/opencrypto/sys/netinet6/ip6_output.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/scope6.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/opencrypto/sys/netinet6/sctp6_usrreq.c#2 integrate .. //depot/projects/opencrypto/sys/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/opencrypto/sys/netipsec/keysock.c#2 integrate .. //depot/projects/opencrypto/sys/netipsec/keysock.h#2 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw2.c#2 integrate .. //depot/projects/opencrypto/sys/netpfil/ipfw/ip_fw_sockopt.c#2 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/if_pfsync.c#3 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf.c#3 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf.h#3 integrate .. //depot/projects/opencrypto/sys/netpfil/pf/pf_lb.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/addr.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/cm.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/device.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/iwcm.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/sa_query.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/sysfs.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/ucm.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/user_mad.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/uverbs_cmd.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/core/uverbs_main.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mlx4/alias_GUID.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mlx4/cm.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mlx4/mad.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mlx4/main.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mlx4/mlx4_ib.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mlx4/mr.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mlx4/qp.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mlx4/sysfs.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mthca/mthca_allocator.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mthca/mthca_main.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mthca/mthca_provider.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/hw/mthca/mthca_reset.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/ulp/ipoib/ipoib_main.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/infiniband/ulp/sdp/sdp.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/alloc.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/cmd.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/cq.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/en_netdev.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/en_rx.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/eq.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/fw.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/main.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/mcg.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/mr.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/pd.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/qp.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/reset.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/resource_tracker.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/sense.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/srq.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/drivers/net/mlx4/xrcd.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/asm/atomic-long.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/asm/atomic.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/asm/byteorder.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/asm/current.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/asm/fcntl.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/asm/io.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/asm/page.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/asm/pgtable.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/asm/semaphore.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/asm/system.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/asm/types.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/asm/uaccess.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/atomic.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/bitmap.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/bitops.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/cache.h#1 branch .. //depot/projects/opencrypto/sys/ofed/include/linux/cdev.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/clocksource.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/compat.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/compiler.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/completion.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/ctype.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/delay.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/device.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/dma-attrs.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/dma-mapping.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/dmapool.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/err.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/errno.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/etherdevice.h#1 branch .. //depot/projects/opencrypto/sys/ofed/include/linux/ethtool.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/file.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/fs.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/gfp.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/hardirq.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/idr.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/if_arp.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/if_ether.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/if_vlan.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/in.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/in6.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/inet.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/inetdevice.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/init.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/interrupt.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/io-mapping.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/io.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/ioctl.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/jiffies.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/kdev_t.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/kernel.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/kmod.h#1 branch .. //depot/projects/opencrypto/sys/ofed/include/linux/kobject.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/kref.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/kthread.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/ktime.h#1 branch .. //depot/projects/opencrypto/sys/ofed/include/linux/linux_compat.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/linux_idr.c#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/linux_radix.c#3 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/list.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/lockdep.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/log2.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/math64.h#1 branch .. //depot/projects/opencrypto/sys/ofed/include/linux/miscdevice.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/mm.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/module.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/moduleparam.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/mount.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/mutex.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/net.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/netdevice.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/notifier.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/page.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/pci.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/poll.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/radix-tree.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/random.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/rbtree.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/rtnetlink.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/rwlock.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/rwsem.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/scatterlist.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/sched.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/semaphore.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/slab.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/socket.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/spinlock.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/stddef.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/linux/string.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/sysfs.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/timer.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/types.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/uaccess.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/vmalloc.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/wait.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/linux/workqueue.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/net/addrconf.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/net/arp.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/net/if_inet6.h#1 branch .. //depot/projects/opencrypto/sys/ofed/include/net/ip.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/net/ip6_route.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/net/ipv6.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/net/neighbour.h#2 delete .. //depot/projects/opencrypto/sys/ofed/include/net/netevent.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/net/tcp.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/rdma/ib_umem.h#2 integrate .. //depot/projects/opencrypto/sys/ofed/include/rdma/ib_verbs.h#2 integrate .. //depot/projects/opencrypto/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/opencrypto/sys/powerpc/ofw/ofw_pcibus.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/powermac/macio.c#2 integrate .. //depot/projects/opencrypto/sys/powerpc/ps3/ps3_syscons.c#3 integrate .. //depot/projects/opencrypto/sys/security/audit/audit_pipe.c#2 integrate .. //depot/projects/opencrypto/sys/sparc64/include/vmparam.h#3 integrate .. //depot/projects/opencrypto/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/opencrypto/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/opencrypto/sys/sys/_cpuset.h#2 integrate .. //depot/projects/opencrypto/sys/sys/ata.h#2 integrate .. //depot/projects/opencrypto/sys/sys/callout.h#2 integrate .. //depot/projects/opencrypto/sys/sys/cdefs.h#2 integrate .. //depot/projects/opencrypto/sys/sys/elf_common.h#2 integrate .. //depot/projects/opencrypto/sys/sys/file.h#2 integrate .. //depot/projects/opencrypto/sys/sys/hhook.h#2 integrate .. //depot/projects/opencrypto/sys/sys/imgact.h#2 integrate .. //depot/projects/opencrypto/sys/sys/imgact_elf.h#2 integrate .. //depot/projects/opencrypto/sys/sys/khelp.h#2 integrate .. //depot/projects/opencrypto/sys/sys/libkern.h#4 integrate .. //depot/projects/opencrypto/sys/sys/lockmgr.h#2 integrate .. //depot/projects/opencrypto/sys/sys/mbuf.h#2 integrate .. //depot/projects/opencrypto/sys/sys/mman.h#2 integrate .. //depot/projects/opencrypto/sys/sys/mount.h#3 integrate .. //depot/projects/opencrypto/sys/sys/param.h#2 integrate .. //depot/projects/opencrypto/sys/sys/proc.h#3 integrate .. //depot/projects/opencrypto/sys/sys/protosw.h#3 integrate .. //depot/projects/opencrypto/sys/sys/sdt.h#2 integrate .. //depot/projects/opencrypto/sys/sys/sf_buf.h#3 integrate .. //depot/projects/opencrypto/sys/sys/socketvar.h#2 integrate .. //depot/projects/opencrypto/sys/sys/sockio.h#2 integrate .. //depot/projects/opencrypto/sys/sys/syscallsubr.h#3 integrate .. //depot/projects/opencrypto/sys/sys/terminal.h#2 integrate .. //depot/projects/opencrypto/sys/sys/time.h#2 integrate .. //depot/projects/opencrypto/sys/sys/user.h#2 integrate .. //depot/projects/opencrypto/sys/sys/vnode.h#2 integrate .. //depot/projects/opencrypto/sys/tools/fdt/make_dtb.sh#2 integrate .. //depot/projects/opencrypto/sys/ufs/ffs/ffs_vfsops.c#2 integrate .. //depot/projects/opencrypto/sys/ufs/ufs/ufs_dirhash.c#2 integrate .. //depot/projects/opencrypto/sys/ufs/ufs/ufs_quota.c#2 integrate .. //depot/projects/opencrypto/sys/ufs/ufs/ufs_vnops.c#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_fault.c#4 integrate .. //depot/projects/opencrypto/sys/vm/vm_map.c#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_map.h#2 integrate .. //depot/projects/opencrypto/sys/vm/vm_page.c#3 integrate .. //depot/projects/opencrypto/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/opencrypto/sys/x86/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/opencrypto/sys/x86/include/fpu.h#2 integrate .. //depot/projects/opencrypto/sys/x86/include/specialreg.h#2 integrate .. //depot/projects/opencrypto/sys/x86/x86/identcpu.c#1 branch .. //depot/projects/opencrypto/sys/x86/x86/tsc.c#2 integrate Differences ... ==== //depot/projects/opencrypto/share/man/man4/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: head/share/man/man4/Makefile 266474 2014-05-20 19:55:06Z jimharris $ +# $FreeBSD: head/share/man/man4/Makefile 271159 2014-09-05 11:25:58Z kevlo $ .include @@ -527,6 +527,7 @@ uhso.4 \ uipaq.4 \ ukbd.4 \ + uled.4 \ ulpt.4 \ umass.4 \ umcs.4 \ ==== //depot/projects/opencrypto/share/man/man4/altera_atse.4#2 (text+ko) ==== @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2013 SRI International +.\" Copyright (c) 2013-2014 SRI International .\" All rights reserved. .\" .\" This software was developed by SRI International and the University of @@ -27,9 +27,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man4/altera_atse.4 257656 2013-11-04 21:28:36Z joel $ +.\" $FreeBSD: head/share/man/man4/altera_atse.4 270268 2014-08-21 12:50:11Z bz $ .\" -.Dd October 18, 2013 +.Dd May 21, 2014 .Dt ALTERA_ATSE 4 .Os .Sh NAME @@ -66,6 +66,25 @@ .Nm driver supports the Ethernet MegaCore as described in version 11.1 of Altera's documentation when the device is configured with internal FIFOs. +.Sh MAC SELECTION +The default MAC address for each +.Nm +interface is derived from a value stored in +.Xr cfi 4 +flash. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Sep 10 00:22:18 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 613395E0; Wed, 10 Sep 2014 00:22:18 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0C5FB5DA for ; Wed, 10 Sep 2014 00:22:18 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id E98F0E9D for ; Wed, 10 Sep 2014 00:22:17 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A0MHbe055708 for ; Wed, 10 Sep 2014 00:22:17 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8A0MHXh055705 for perforce@freebsd.org; Wed, 10 Sep 2014 00:22:17 GMT (envelope-from jmg@freebsd.org) Date: Wed, 10 Sep 2014 00:22:17 GMT Message-Id: <201409100022.s8A0MHXh055705@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1200051 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 00:22:18 -0000 http://p4web.freebsd.org/@@1200051?ac=10 Change 1200051 by jmg@jmg_carbon2 on 2014/09/10 00:21:29 remaining part of integration.. Affected files ... .. //depot/projects/opencrypto/sys/gnu/dts/arm/animeo_ip.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-ariag25.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-cosino.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-cosino_mega2560.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-foxg20.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-qil_a9260.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-sama5d3_xplained.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200_pqfp.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9260.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9263.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9263ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g15.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g15ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek_2mmc.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek_common.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g25.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g25ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g35.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g35ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g45.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9m10g45ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9n12.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9n12ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x25.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x25ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x35.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x35ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_macb0.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_macb1.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_usart3.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5cm.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5ek.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/ethernut5.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/evk-pro3.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/ge863-pro3.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/kizbox.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/mpa1600.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/pm9g45.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d31.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d31ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d33.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d33ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d34.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d34ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d35.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d35ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d36.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d36ek.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_can.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_emac.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_gmac.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_lcd.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_mci2.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_tcb1.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_uart.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xcm.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xdm.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xmb.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/skeleton.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9260.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9260_common.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9263.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9g20.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9260.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9260_common.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9263.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20.dts#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20_common.dtsi#2 integrate .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20_lpw.dts#2 integrate Differences ... ==== //depot/projects/opencrypto/sys/gnu/dts/arm/animeo_ip.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91-ariag25.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91-cosino.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91-cosino_mega2560.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91-foxg20.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91-qil_a9260.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91-sama5d3_xplained.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200_pqfp.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9260.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9263.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9263ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g15.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g15ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek_2mmc.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek_common.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g25.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g25ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g35.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g35ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g45.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9m10g45ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9n12.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9n12ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x25.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x25ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x35.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x35ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_macb0.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_macb1.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_usart3.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5cm.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5ek.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/ethernut5.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/evk-pro3.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/ge863-pro3.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/kizbox.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/mpa1600.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/pm9g45.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d31.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d31ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d33.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d33ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d34.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d34ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d35.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d35ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d36.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d36ek.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_can.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_emac.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_gmac.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_lcd.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_mci2.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_tcb1.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_uart.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xcm.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xdm.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xmb.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/skeleton.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9260.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9260_common.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9263.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9g20.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9260.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9260_common.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9263.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20.dts#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20_common.dtsi#2 (text+ko) ==== ==== //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20_lpw.dts#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed Sep 10 00:31:29 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D5B7860; Wed, 10 Sep 2014 00:31:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DB01E85E for ; Wed, 10 Sep 2014 00:31:28 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA343F92 for ; Wed, 10 Sep 2014 00:31:28 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A0VRNp057564 for ; Wed, 10 Sep 2014 00:31:27 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8A0VRKZ057561 for perforce@freebsd.org; Wed, 10 Sep 2014 00:31:27 GMT (envelope-from jmg@freebsd.org) Date: Wed, 10 Sep 2014 00:31:27 GMT Message-Id: <201409100031.s8A0VRKZ057561@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1200052 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 00:31:29 -0000 http://p4web.freebsd.org/@@1200052?ac=10 Change 1200052 by jmg@jmg_carbon2 on 2014/09/10 00:30:48 to lazy to figure out how to fix this.. just reintegrate this.. Affected files ... .. //depot/projects/opencrypto/sys/gnu/dts/arm/animeo_ip.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-ariag25.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-cosino.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-cosino_mega2560.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-foxg20.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-qil_a9260.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-sama5d3_xplained.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200_pqfp.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9260.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9261.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9261ek.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9263.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9263ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g15.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g15ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek_2mmc.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek_common.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g25.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g25ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g35.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g35ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g45.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9m10g45ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9n12.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9n12ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9rl.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9rlek.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x25.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x25ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x35.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x35ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_can.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_isi.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_lcd.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_macb0.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_macb1.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_usart3.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5cm.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5ek.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/ethernut5.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/evk-pro3.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/ge863-pro3.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-apf51.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-apf51dev.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-babbage.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-digi-connectcore-jsk.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-digi-connectcore-som.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-eukrea-cpuimx51.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-eukrea-mbimxsd51-baseboard.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-pinfunc.h#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-ard.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-evk.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-m53.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-m53evk.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-mba53.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-pinfunc.h#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-qsb-common.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-qsb.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-qsrb.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-smd.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tqma53.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tx53-x03x.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tx53-x13x.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tx53.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-voipac-bsb.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-voipac-dmm-668.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-aristainetos_4.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-aristainetos_7.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-cubox-i.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-dfi-fs700-m60.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw51xx.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw52xx.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw53xx.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw54xx.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-hummingboard.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-nitrogen6x.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-phytec-pbab01.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-phytec-pfla02.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-pinfunc.h#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-rex-basic.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-riotboard.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-sabreauto.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-sabrelite.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-sabresd.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-tx6dl-comtft.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-tx6u-801x.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-tx6u-811x.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-wandboard-revb1.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-wandboard.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-arm2.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-cm-fx6.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-cubox-i.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-dfi-fs700-m60.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-dmo-edmqmx6.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gk802.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw51xx.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw52xx.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw53xx.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw5400-a.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw54xx.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-nitrogen6x.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-phytec-pbab01.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-phytec-pfla02.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-pinfunc.h#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-rex-pro.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sabreauto.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sabrelite.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sabresd.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sbc6x.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1010-comtft.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1010.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1020-comtft.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1020.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1110.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-udoo.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-wandboard-revb1.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-wandboard.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-aristainetos.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-cubox-i.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-dfi-fs700-m60.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw51xx.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw52xx.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw53xx.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw54xx.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-nitrogen6x.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-phytec-pfla02.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-rex.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-sabreauto.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-sabrelite.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-sabresd.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-tx6.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-wandboard-revb1.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-wandboard-revc1.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-wandboard.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sl-evk.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sl-pinfunc.h#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sl.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sx-sdb.dts#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sx.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/kizbox.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/mpa1600.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/pm9g45.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d31.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d31ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d33.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d33ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d34.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d34ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d35.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d35ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d36.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d36ek.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_can.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_emac.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_gmac.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_lcd.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_mci2.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_tcb1.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_uart.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xcm.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xdm.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xmb.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/skeleton.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/skeleton64.dtsi#2 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9260.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9260_common.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9263.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9g20.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9260.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9260_common.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9263.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20_common.dtsi#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20_lpw.dts#3 delete .. //depot/projects/opencrypto/sys/gnu/dts/arm/vf610.dtsi#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 10 00:33:30 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C1E399B0; Wed, 10 Sep 2014 00:33:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6AC1F9AE for ; Wed, 10 Sep 2014 00:33:30 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3AF6CFAE for ; Wed, 10 Sep 2014 00:33:30 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A0XURT058279 for ; Wed, 10 Sep 2014 00:33:30 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8A0XU2N058276 for perforce@freebsd.org; Wed, 10 Sep 2014 00:33:30 GMT (envelope-from jmg@freebsd.org) Date: Wed, 10 Sep 2014 00:33:30 GMT Message-Id: <201409100033.s8A0XU2N058276@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1200053 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 00:33:31 -0000 http://p4web.freebsd.org/@@1200053?ac=10 Change 1200053 by jmg@jmg_carbon2 on 2014/09/10 00:32:55 hopefully this fixes things... rebranch these files... Affected files ... .. //depot/projects/opencrypto/sys/gnu/dts/arm/animeo_ip.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-ariag25.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-cosino.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-cosino_mega2560.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-foxg20.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-qil_a9260.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91-sama5d3_xplained.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200_pqfp.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91rm9200ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9260.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9261.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9261ek.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9263.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9263ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g15.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g15ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek_2mmc.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g20ek_common.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g25.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g25ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g35.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g35ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9g45.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9m10g45ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9n12.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9n12ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9rl.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9rlek.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x25.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x25ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x35.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x35ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_can.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_isi.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_lcd.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_macb0.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_macb1.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5_usart3.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5cm.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/at91sam9x5ek.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/ethernut5.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/evk-pro3.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/ge863-pro3.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-apf51.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-apf51dev.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-babbage.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-digi-connectcore-jsk.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-digi-connectcore-som.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-eukrea-cpuimx51.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-eukrea-mbimxsd51-baseboard.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51-pinfunc.h#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx51.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-ard.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-evk.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-m53.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-m53evk.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-mba53.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-pinfunc.h#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-qsb-common.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-qsb.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-qsrb.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-smd.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tqma53.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tx53-x03x.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tx53-x13x.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-tx53.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-voipac-bsb.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53-voipac-dmm-668.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx53.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-aristainetos_4.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-aristainetos_7.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-cubox-i.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-dfi-fs700-m60.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw51xx.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw52xx.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw53xx.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-gw54xx.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-hummingboard.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-nitrogen6x.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-phytec-pbab01.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-phytec-pfla02.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-pinfunc.h#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-rex-basic.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-riotboard.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-sabreauto.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-sabrelite.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-sabresd.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-tx6dl-comtft.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-tx6u-801x.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-tx6u-811x.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-wandboard-revb1.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl-wandboard.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6dl.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-arm2.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-cm-fx6.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-cubox-i.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-dfi-fs700-m60.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-dmo-edmqmx6.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gk802.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw51xx.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw52xx.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw53xx.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw5400-a.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-gw54xx.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-nitrogen6x.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-phytec-pbab01.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-phytec-pfla02.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-pinfunc.h#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-rex-pro.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sabreauto.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sabrelite.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sabresd.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-sbc6x.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1010-comtft.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1010.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1020-comtft.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1020.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-tx6q-1110.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-udoo.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-wandboard-revb1.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q-wandboard.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6q.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-aristainetos.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-cubox-i.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-dfi-fs700-m60.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw51xx.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw52xx.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw53xx.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-gw54xx.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-nitrogen6x.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-phytec-pfla02.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-rex.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-sabreauto.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-sabrelite.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-sabresd.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-tx6.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-wandboard-revb1.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-wandboard-revc1.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl-wandboard.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6qdl.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sl-evk.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sl-pinfunc.h#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sl.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sx-sdb.dts#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/imx6sx.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/kizbox.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/mpa1600.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/pm9g45.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d31.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d31ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d33.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d33ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d34.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d34ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d35.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d35ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d36.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d36ek.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_can.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_emac.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_gmac.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_lcd.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_mci2.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_tcb1.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3_uart.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xcm.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xdm.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/sama5d3xmb.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/skeleton.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/skeleton64.dtsi#3 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9260.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9260_common.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9263.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/tny_a9g20.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9260.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9260_common.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9263.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20_common.dtsi#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/usb_a9g20_lpw.dts#4 branch .. //depot/projects/opencrypto/sys/gnu/dts/arm/vf610.dtsi#3 branch Differences ... From owner-p4-projects@FreeBSD.ORG Wed Sep 10 06:38:06 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 27B597CB; Wed, 10 Sep 2014 06:38:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF9477C9 for ; Wed, 10 Sep 2014 06:38:05 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B1E68EFA for ; Wed, 10 Sep 2014 06:38:05 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8A6c5ax087895 for ; Wed, 10 Sep 2014 06:38:05 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8A6c5Jo087891 for perforce@freebsd.org; Wed, 10 Sep 2014 06:38:05 GMT (envelope-from jmg@freebsd.org) Date: Wed, 10 Sep 2014 06:38:05 GMT Message-Id: <201409100638.s8A6c5Jo087891@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1200063 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 06:38:06 -0000 http://p4web.freebsd.org/@@1200063?ac=10 Change 1200063 by jmg@jmg_carbon2 on 2014/09/10 06:37:44 forgot to install this.. Affected files ... .. //depot/projects/opencrypto/share/man/man7/Makefile#2 edit Differences ... ==== //depot/projects/opencrypto/share/man/man7/Makefile#2 (text+ko) ==== @@ -9,6 +9,7 @@ bsd.snmpmod.mk.7 \ build.7 \ clocks.7 \ + crypto.7 \ c99.7 \ development.7 \ environ.7 \ From owner-p4-projects@FreeBSD.ORG Wed Sep 10 20:22:09 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 70FB05B5; Wed, 10 Sep 2014 20:22:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32E735B3 for ; Wed, 10 Sep 2014 20:22:09 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1F1208A8 for ; Wed, 10 Sep 2014 20:22:09 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8AKM8kO001137 for ; Wed, 10 Sep 2014 20:22:08 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8AKM8fN001134 for perforce@freebsd.org; Wed, 10 Sep 2014 20:22:08 GMT (envelope-from jhb@freebsd.org) Date: Wed, 10 Sep 2014 20:22:08 GMT Message-Id: <201409102022.s8AKM8fN001134@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200099 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Sep 2014 20:22:09 -0000 http://p4web.freebsd.org/@@1200099?ac=10 Change 1200099 by jhb@jhb_ralph on 2014/09/10 20:21:43 Move this earlier and compare against uap->prot to avoid implicit truncation. Affected files ... .. //depot/projects/smpng/sys/vm/vm_mmap.c#107 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_mmap.c#107 (text+ko) ==== @@ -211,6 +211,9 @@ struct vmspace *vms = td->td_proc->p_vmspace; cap_rights_t rights; + if ((uap->prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_NONE)) != 0) + return (EINVAL); + addr = (vm_offset_t) uap->addr; size = uap->len; prot = uap->prot; @@ -246,8 +249,6 @@ } if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL) return (EINVAL); - if ((prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_NONE)) != 0) - return (EINVAL); if ((flags & (MAP_ANON | MAP_SHARED | MAP_PRIVATE)) == 0 || (flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE)) return (EINVAL); From owner-p4-projects@FreeBSD.ORG Thu Sep 11 03:27:54 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E4760A96; Thu, 11 Sep 2014 03:27:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A5F51A94 for ; Thu, 11 Sep 2014 03:27:53 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 919E9313 for ; Thu, 11 Sep 2014 03:27:53 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8B3RrCs012383 for ; Thu, 11 Sep 2014 03:27:53 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8B3Rr8d012380 for perforce@freebsd.org; Thu, 11 Sep 2014 03:27:53 GMT (envelope-from jhb@freebsd.org) Date: Thu, 11 Sep 2014 03:27:53 GMT Message-Id: <201409110327.s8B3Rr8d012380@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200113 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Sep 2014 03:27:54 -0000 http://p4web.freebsd.org/@@1200113?ac=10 Change 1200113 by jhb@jhb_pippin on 2014/09/11 03:27:14 Typo. Affected files ... .. //depot/projects/smpng/sys/sys/eventhandler.h#45 edit Differences ... ==== //depot/projects/smpng/sys/sys/eventhandler.h#45 (text+ko) ==== @@ -124,7 +124,7 @@ * * Note that both invocation methods may be used on the same list. * - * Registering a hook for an event or invoking an event require the + * Registering a hook for an event or invoking an event requires the * event handler to be declared via EVENTHANDLER_DECLARE(). */ From owner-p4-projects@FreeBSD.ORG Fri Sep 12 18:42:41 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E6CD177C; Fri, 12 Sep 2014 18:42:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A9B3A77A for ; Fri, 12 Sep 2014 18:42:40 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9525F960 for ; Fri, 12 Sep 2014 18:42:40 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CIgelT032070 for ; Fri, 12 Sep 2014 18:42:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8CIgeik032067 for perforce@freebsd.org; Fri, 12 Sep 2014 18:42:40 GMT (envelope-from jhb@freebsd.org) Date: Fri, 12 Sep 2014 18:42:40 GMT Message-Id: <201409121842.s8CIgeik032067@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200166 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 18:42:41 -0000 http://p4web.freebsd.org/@@1200166?ac=10 Change 1200166 by jhb@jhb_ralph on 2014/09/12 18:42:05 Tweaks. Affected files ... .. //depot/projects/smpng/sys/vm/vm_mmap.c#108 edit Differences ... ==== //depot/projects/smpng/sys/vm/vm_mmap.c#108 (text+ko) ==== @@ -203,17 +203,14 @@ struct vnode *vp; vm_offset_t addr; vm_size_t size, pageoff; - vm_prot_t cap_maxprot, prot, maxprot; + vm_prot_t cap_maxprot, maxprot; void *handle; objtype_t handle_type; - int align, error, flags; + int align, error, flags, prot; off_t pos; struct vmspace *vms = td->td_proc->p_vmspace; cap_rights_t rights; - if ((uap->prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC | PROT_NONE)) != 0) - return (EINVAL); - addr = (vm_offset_t) uap->addr; size = uap->len; prot = uap->prot; @@ -252,6 +249,9 @@ if ((flags & (MAP_ANON | MAP_SHARED | MAP_PRIVATE)) == 0 || (flags & (MAP_SHARED | MAP_PRIVATE)) == (MAP_SHARED | MAP_PRIVATE)) return (EINVAL); + if (prot != PROT_NONE && + (prot & ~(PROT_READ | PROT_WRITE | PROT_EXEC)) != 0) + return (EINVAL); /* * Align the file position to a page boundary, @@ -421,6 +421,8 @@ map: td->td_fpop = fp; maxprot &= cap_maxprot; + + /* This relies on VM_PROT_* matching PROT_*. */ error = vm_mmap(&vms->vm_map, &addr, size, prot, maxprot, flags, handle_type, handle, pos); td->td_fpop = NULL; From owner-p4-projects@FreeBSD.ORG Fri Sep 12 21:49:04 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB7AEF17; Fri, 12 Sep 2014 21:49:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9C124F15 for ; Fri, 12 Sep 2014 21:49:03 +0000 (UTC) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 8581FDEF for ; Fri, 12 Sep 2014 21:49:03 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s8CLn3Sv092134 for ; Fri, 12 Sep 2014 21:49:03 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s8CLn2hl092130 for perforce@freebsd.org; Fri, 12 Sep 2014 21:49:02 GMT (envelope-from jhb@freebsd.org) Date: Fri, 12 Sep 2014 21:49:02 GMT Message-Id: <201409122149.s8CLn2hl092130@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin Subject: PERFORCE change 1200180 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Sep 2014 21:49:04 -0000 http://p4web.freebsd.org/@@1200180?ac=10 Change 1200180 by jhb@jhb_ralph on 2014/09/12 21:48:29 IFC @1200179 Affected files ... .. //depot/projects/smpng/share/man/man9/VOP_GETPAGES.9#7 integrate .. //depot/projects/smpng/share/man/man9/ifnet.9#14 integrate .. //depot/projects/smpng/share/man/man9/sysctl.9#9 integrate .. //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#38 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#33 integrate .. //depot/projects/smpng/sys/amd64/amd64/genassym.c#42 integrate .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#132 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#97 integrate .. //depot/projects/smpng/sys/amd64/conf/GENERIC#114 integrate .. //depot/projects/smpng/sys/amd64/include/fpu.h#13 integrate .. //depot/projects/smpng/sys/amd64/include/pcb.h#28 integrate .. //depot/projects/smpng/sys/amd64/include/vmm.h#14 integrate .. //depot/projects/smpng/sys/amd64/vmm/intel/vmx.c#16 integrate .. //depot/projects/smpng/sys/amd64/vmm/vmm.c#14 integrate .. //depot/projects/smpng/sys/arm/altera/socfpga/files.socfpga#2 integrate .. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_common.c#2 integrate .. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_common.h#1 branch .. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_l3regs.h#1 branch .. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_manager.c#1 branch .. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_rstmgr.c#1 branch .. //depot/projects/smpng/sys/arm/altera/socfpga/socfpga_rstmgr.h#1 branch .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_sheeva.S#7 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_xscale.S#10 integrate .. //depot/projects/smpng/sys/arm/arm/cpufunc_asm_xscale_c3.S#7 integrate .. //depot/projects/smpng/sys/arm/arm/exception.S#17 integrate .. //depot/projects/smpng/sys/arm/arm/fiq.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/generic_timer.c#6 integrate .. //depot/projects/smpng/sys/arm/arm/gic.c#9 integrate .. //depot/projects/smpng/sys/arm/arm/locore.S#35 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#53 integrate .. //depot/projects/smpng/sys/arm/arm/minidump_machdep.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/mp_machdep.c#9 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#26 integrate .. //depot/projects/smpng/sys/arm/arm/pmap-v6.c#15 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#81 integrate .. //depot/projects/smpng/sys/arm/arm/trap.c#43 integrate .. //depot/projects/smpng/sys/arm/arm/undefined.c#24 integrate .. //depot/projects/smpng/sys/arm/arm/vm_machdep.c#49 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#33 integrate .. //depot/projects/smpng/sys/arm/at91/at91_aic.c#3 integrate .. //depot/projects/smpng/sys/arm/cavium/cns11xx/econa.c#2 integrate .. //depot/projects/smpng/sys/arm/conf/DIGI-CCWMX53#8 integrate .. //depot/projects/smpng/sys/arm/conf/IMX53#1 branch .. //depot/projects/smpng/sys/arm/conf/IMX53-QSB#7 integrate .. //depot/projects/smpng/sys/arm/freescale/imx/files.imx51#7 integrate .. //depot/projects/smpng/sys/arm/include/armreg.h#23 integrate .. //depot/projects/smpng/sys/arm/include/asm.h#14 integrate .. //depot/projects/smpng/sys/arm/include/atomic.h#42 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#48 integrate .. //depot/projects/smpng/sys/arm/s3c2xx0/s3c24x0.c#7 integrate .. //depot/projects/smpng/sys/arm/versatile/files.versatile#3 integrate .. //depot/projects/smpng/sys/arm/versatile/if_smc_fdt.c#4 delete .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_intr.h#6 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_timer.c#16 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#19 integrate .. //depot/projects/smpng/sys/arm/xscale/i8134x/i81342.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#19 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci.c#13 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_timer.c#5 integrate .. //depot/projects/smpng/sys/arm/xscale/pxa/pxa_icu.c#4 integrate .. //depot/projects/smpng/sys/arm/xscale/pxa/pxa_timer.c#3 integrate .. //depot/projects/smpng/sys/boot/amd64/efi/bootinfo.c#3 integrate .. //depot/projects/smpng/sys/boot/amd64/efi/conf.c#2 integrate .. //depot/projects/smpng/sys/boot/arm/uboot/help.uboot#3 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/Makefile#18 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/imx6.dtsi#3 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/socfpga.dtsi#2 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/wandboard-dual.dts#3 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/wandboard-quad.dts#3 integrate .. //depot/projects/smpng/sys/boot/fdt/dts/arm/wandboard-solo.dts#3 integrate .. //depot/projects/smpng/sys/boot/ficl/loader.c#13 integrate .. //depot/projects/smpng/sys/boot/forth/pcibios.4th#1 branch .. //depot/projects/smpng/sys/boot/i386/libi386/biospci.c#8 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/comconsole.c#10 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/libi386.h#23 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#41 integrate .. //depot/projects/smpng/sys/boot/i386/loader/main.c#26 integrate .. //depot/projects/smpng/sys/boot/uboot/common/main.c#11 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl.c#13 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl.h#5 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend_block.c#11 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend.c#6 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_frontend_iscsi.c#5 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_io.h#6 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_private.h#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#35 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#120 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#14 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#20 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#45 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#21 integrate .. //depot/projects/smpng/sys/conf/NOTES#216 integrate .. //depot/projects/smpng/sys/conf/files#304 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#145 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#38 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.h#15 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci_pci.c#1 branch .. //depot/projects/smpng/sys/dev/ahci/ahciem.c#6 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#22 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#34 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#34 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#40 integrate .. //depot/projects/smpng/sys/dev/cxgbe/common/t4_regs.h#4 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_main.c#25 integrate .. //depot/projects/smpng/sys/dev/cxgbe/t4_netmap.c#3 integrate .. //depot/projects/smpng/sys/dev/iscsi/iscsi.c#6 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#38 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwnreg.h#14 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#46 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixv.c#13 integrate .. //depot/projects/smpng/sys/dev/mvs/mvs.c#16 integrate .. //depot/projects/smpng/sys/dev/mvs/mvs_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/mvs/mvs_soc.c#12 integrate .. //depot/projects/smpng/sys/dev/nmdm/nmdm.c#40 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.c#27 integrate .. //depot/projects/smpng/sys/dev/ofw/openfirm.h#19 integrate .. //depot/projects/smpng/sys/dev/siis/siis.c#23 integrate .. //depot/projects/smpng/sys/dev/smc/if_smc_fdt.c#1 branch .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#54 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/misc/uled.c#1 branch .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#38 integrate .. //depot/projects/smpng/sys/dev/usb/uled_ioctl.h#1 branch .. //depot/projects/smpng/sys/dev/usb/usbdevs#194 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwn.c#10 integrate .. //depot/projects/smpng/sys/dev/vt/hw/ofwfb/ofwfb.c#6 integrate .. //depot/projects/smpng/sys/dev/vt/hw/vga/vt_vga.c#4 integrate .. //depot/projects/smpng/sys/dev/vt/logo/logo_freebsd.c#2 integrate .. //depot/projects/smpng/sys/dev/vt/vt.h#8 integrate .. //depot/projects/smpng/sys/dev/vt/vt_buf.c#6 integrate .. //depot/projects/smpng/sys/dev/vt/vt_consolectl.c#5 integrate .. //depot/projects/smpng/sys/dev/vt/vt_core.c#8 integrate .. //depot/projects/smpng/sys/fs/ext2fs/ext2_vnops.c#14 integrate .. //depot/projects/smpng/sys/fs/fuse/fuse_vnops.c#5 integrate .. //depot/projects/smpng/sys/fs/nfs/nfsm_subs.h#4 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#42 integrate .. //depot/projects/smpng/sys/gdb/gdb_int.h#5 integrate .. //depot/projects/smpng/sys/gdb/gdb_main.c#12 integrate .. //depot/projects/smpng/sys/gdb/gdb_packet.c#7 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_crypto.c#10 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_integrity.c#8 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli_privacy.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_map.c#4 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/animeo_ip.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91-ariag25.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91-cosino.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91-cosino_mega2560.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91-foxg20.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91-qil_a9260.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91-sama5d3_xplained.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91rm9200.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91rm9200_pqfp.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91rm9200ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9260.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9261.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9261ek.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9263.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9263ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g15.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g15ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g20.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g20ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g20ek_2mmc.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g20ek_common.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g25.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g25ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g35.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g35ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9g45.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9m10g45ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9n12.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9n12ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9rl.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9rlek.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x25.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x25ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x35.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x35ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x5.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x5_can.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x5_isi.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x5_lcd.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x5_macb0.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x5_macb1.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x5_usart3.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x5cm.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/at91sam9x5ek.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/ethernut5.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/evk-pro3.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/ge863-pro3.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/imx51-apf51.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx51-apf51dev.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx51-babbage.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx51-digi-connectcore-jsk.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx51-digi-connectcore-som.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx51-eukrea-cpuimx51.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx51-eukrea-mbimxsd51-baseboard.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx51-pinfunc.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx51.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-ard.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-evk.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-m53.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-m53evk.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-mba53.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-pinfunc.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-qsb-common.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-qsb.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-qsrb.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-smd.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-tqma53.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-tx53-x03x.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-tx53-x13x.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-tx53.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-voipac-bsb.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53-voipac-dmm-668.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx53.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-aristainetos_4.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-aristainetos_7.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-cubox-i.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-dfi-fs700-m60.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-gw51xx.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-gw52xx.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-gw53xx.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-gw54xx.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-hummingboard.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-nitrogen6x.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-phytec-pbab01.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-phytec-pfla02.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-pinfunc.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-rex-basic.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-riotboard.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-sabreauto.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-sabrelite.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-sabresd.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-tx6dl-comtft.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-tx6u-801x.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-tx6u-811x.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-wandboard-revb1.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl-wandboard.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6dl.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-arm2.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-cm-fx6.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-cubox-i.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-dfi-fs700-m60.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-dmo-edmqmx6.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-gk802.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-gw51xx.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-gw52xx.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-gw53xx.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-gw5400-a.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-gw54xx.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-nitrogen6x.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-phytec-pbab01.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-phytec-pfla02.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-pinfunc.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-rex-pro.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-sabreauto.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-sabrelite.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-sabresd.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-sbc6x.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-tx6q-1010-comtft.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-tx6q-1010.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-tx6q-1020-comtft.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-tx6q-1020.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-tx6q-1110.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-udoo.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-wandboard-revb1.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q-wandboard.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6q.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-aristainetos.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-cubox-i.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-dfi-fs700-m60.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-gw51xx.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-gw52xx.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-gw53xx.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-gw54xx.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-nitrogen6x.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-phytec-pfla02.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-rex.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-sabreauto.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-sabrelite.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-sabresd.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-tx6.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-wandboard-revb1.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-wandboard-revc1.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl-wandboard.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6qdl.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6sl-evk.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6sl-pinfunc.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6sl.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6sx-sdb.dts#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/imx6sx.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/kizbox.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/mpa1600.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/pm9g45.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sam9260ek_common.dtsi#2 delete .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d31.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d31ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d33.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d33ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d34.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d34ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d35.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d35ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d36.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d36ek.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3_can.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3_emac.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3_gmac.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3_lcd.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3_mci2.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3_tcb1.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3_uart.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3xcm.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3xdm.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/sama5d3xmb.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/skeleton.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/skeleton64.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/arm/tny_a9260.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/tny_a9260_common.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/tny_a9263.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/tny_a9g20.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/usb_a9260.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/usb_a9260_common.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/usb_a9263.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/usb_a9g20.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/usb_a9g20_common.dtsi#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/usb_a9g20_lpw.dts#2 integrate .. //depot/projects/smpng/sys/gnu/dts/arm/vf610.dtsi#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clk/ti-dra7-atl.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/at91.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/bcm21664.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/bcm281xx.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/berlin2.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/berlin2q.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/clps711x-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/exynos-audss-clk.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/exynos3250.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/exynos4.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/exynos5250.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/exynos5260-clk.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/exynos5410.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/exynos5420.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/exynos5440.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/hi3620-clock.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/hip04-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/hix5hd2-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/imx1-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/imx21-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/imx27-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/imx6qdl-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/imx6sl-clock.h#3 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/imx6sx-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/lsi,axm5516-clks.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-apq8084.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-ipq806x.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8960.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/qcom,gcc-msm8974.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-apq8084.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/qcom,mmcc-msm8960.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/r7s72100-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/r8a7779-clock.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/r8a7790-clock.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/r8a7791-clock.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/rk3066a-cru.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru-common.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/rk3188-cru.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/rk3288-cru.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/s3c2410.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/s3c2412.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/s3c2443.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/s5pv210-audss.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/s5pv210.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/stih415-clks.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/stih416-clks.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/tegra114-car.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/tegra124-car.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/clock/vf610-clock.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/dma/nbpfaxi.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/mfd/as3722.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/mfd/palmas.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/phy/phy-miphy365x.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/pinctrl/am43xx.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/pinctrl/dra.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/pinctrl/omap.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/pinctrl/pinctrl-tegra-xusb.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/reset-controller/stih415-resets.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/reset-controller/stih416-resets.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/reset/altr,rst-mgr.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-apq8084.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-ipq806x.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/reset/qcom,gcc-msm8960.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-apq8084.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/reset/qcom,mmcc-msm8960.h#2 integrate .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/soc/qcom,gsbi.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/sound/tlv320aic31xx-micbias.h#1 branch .. //depot/projects/smpng/sys/gnu/dts/include/dt-bindings/spmi/spmi.h#1 branch .. //depot/projects/smpng/sys/i386/conf/GENERIC#143 integrate .. //depot/projects/smpng/sys/i386/i386/initcpu.c#49 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#194 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#156 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#45 integrate .. //depot/projects/smpng/sys/i386/include/pcb.h#22 integrate .. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#33 integrate .. //depot/projects/smpng/sys/kern/imgact_binmisc.c#2 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_descrip.c#157 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#81 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#100 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#144 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#82 integrate .. //depot/projects/smpng/sys/kern/sys_procdesc.c#9 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#35 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#77 integrate .. //depot/projects/smpng/sys/kern/uipc_mqueue.c#41 integrate .. //depot/projects/smpng/sys/kern/uipc_sem.c#43 integrate .. //depot/projects/smpng/sys/kern/uipc_shm.c#27 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#160 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#80 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#53 integrate .. //depot/projects/smpng/sys/libkern/memmem.c#1 branch .. //depot/projects/smpng/sys/mips/conf/WZR-300HP#3 integrate .. //depot/projects/smpng/sys/mips/conf/WZR-300HP.hints#3 integrate .. //depot/projects/smpng/sys/mips/include/sf_buf.h#7 integrate .. //depot/projects/smpng/sys/mips/include/vmparam.h#16 integrate .. //depot/projects/smpng/sys/modules/ahci/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/if_gif/Makefile#14 integrate .. //depot/projects/smpng/sys/modules/usb/Makefile#36 integrate .. //depot/projects/smpng/sys/modules/usb/uled/Makefile#1 branch .. //depot/projects/smpng/sys/net/if.c#160 integrate .. //depot/projects/smpng/sys/net/if_var.h#93 integrate .. //depot/projects/smpng/sys/net/netisr.h#21 integrate .. //depot/projects/smpng/sys/net/route.c#74 integrate .. //depot/projects/smpng/sys/net/rtsock.c#101 integrate .. //depot/projects/smpng/sys/netinet/in.h#66 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#122 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#84 integrate .. //depot/projects/smpng/sys/netinet/in_pcbgroup.c#5 integrate .. //depot/projects/smpng/sys/netinet/in_rss.c#4 integrate .. //depot/projects/smpng/sys/netinet/in_rss.h#4 integrate .. //depot/projects/smpng/sys/netinet/in_var.h#40 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#135 integrate .. //depot/projects/smpng/sys/netinet/ip_options.c#26 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#142 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#59 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#36 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#39 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#54 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#44 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#65 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#62 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#35 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.h#25 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#57 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#65 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.c#33 integrate .. //depot/projects/smpng/sys/netinet/tcp_hostcache.h#3 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#164 integrate .. //depot/projects/smpng/sys/netinet/tcp_reass.c#28 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#99 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#102 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#116 integrate .. //depot/projects/smpng/sys/netinet6/in6.c#94 integrate .. //depot/projects/smpng/sys/netinet6/in6.h#36 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#79 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#21 integrate .. //depot/projects/smpng/sys/netinet6/in6_src.c#62 integrate .. //depot/projects/smpng/sys/netinet6/in6_var.h#34 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#92 integrate .. //depot/projects/smpng/sys/netinet6/nd6.c#86 integrate .. //depot/projects/smpng/sys/netinet6/scope6.c#25 integrate .. //depot/projects/smpng/sys/netinet6/scope6_var.h#10 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#34 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#74 integrate .. //depot/projects/smpng/sys/netpfil/pf/pf_ioctl.c#9 integrate .. //depot/projects/smpng/sys/ofed/include/linux/linux_compat.c#10 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#38 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#69 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#63 integrate .. //depot/projects/smpng/sys/sys/cdefs.h#57 integrate .. //depot/projects/smpng/sys/sys/file.h#47 integrate .. //depot/projects/smpng/sys/sys/imgact.h#24 integrate .. //depot/projects/smpng/sys/sys/libkern.h#38 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#103 integrate .. //depot/projects/smpng/sys/sys/param.h#195 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#132 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#60 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#54 integrate .. //depot/projects/smpng/sys/vm/vm_reserv.c#19 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#93 integrate .. //depot/projects/smpng/sys/x86/acpica/acpi_wakeup.c#8 integrate .. //depot/projects/smpng/sys/x86/include/fpu.h#3 integrate .. //depot/projects/smpng/sys/x86/include/specialreg.h#11 integrate .. //depot/projects/smpng/sys/x86/x86/identcpu.c#3 integrate .. //depot/projects/smpng/sys/x86/x86/local_apic.c#25 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/VOP_GETPAGES.9#7 (text+ko) ==== @@ -27,9 +27,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/VOP_GETPAGES.9 254138 2013-08-09 11:11:11Z attilio $ +.\" $FreeBSD: head/share/man/man9/VOP_GETPAGES.9 271455 2014-09-12 08:33:53Z glebius $ .\" -.Dd September 27, 2003 +.Dd September 12, 2014 .Dt VOP_GETPAGES 9 .Os .Sh NAME @@ -41,9 +41,9 @@ .In sys/vnode.h .In vm/vm.h .Ft int -.Fn VOP_GETPAGES "struct vnode *vp" "vm_page_t *ma" "int count" "int reqpage" "vm_ooffset_t offset" +.Fn VOP_GETPAGES "struct vnode *vp" "vm_page_t *ma" "int count" "int reqpage" .Ft int -.Fn VOP_PUTPAGES "struct vnode *vp" "vm_page_t *ma" "int count" "int sync" "int *rtvals" "vm_ooffset_t offset" +.Fn VOP_PUTPAGES "struct vnode *vp" "vm_page_t *ma" "int count" "int sync" "int *rtvals" .Sh DESCRIPTION The .Fn VOP_GETPAGES @@ -81,8 +81,6 @@ .It Fa reqpage The index in the page array of the requested page; i.e., the one page which the implementation of this method must handle. -.It Fa offset -Offset in the file at which the mapped pages begin. .El .Pp The status of the @@ -156,7 +154,7 @@ .Sh SEE ALSO .Xr vm_object_pip_wakeup 9 , .Xr vm_page_free 9 , -.Xr vm_pagge_sunbusy 9 , +.Xr vm_page_sunbusy 9 , .Xr vm_page_undirty 9 , .Xr vm_page_xunbusy 9 , .Xr vnode 9 ==== //depot/projects/smpng/share/man/man9/ifnet.9#14 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/ifnet.9 269243 2014-07-29 15:01:29Z glebius $ +.\" $FreeBSD: head/share/man/man9/ifnet.9 271438 2014-09-11 20:21:03Z asomers $ .\" .Dd July 29, 2014 .Dt IFNET 9 @@ -77,9 +77,9 @@ .Ft "struct ifaddr *" .Fn ifa_ifwithaddr "struct sockaddr *addr" .Ft "struct ifaddr *" -.Fn ifa_ifwithdstaddr "struct sockaddr *addr" +.Fn ifa_ifwithdstaddr "struct sockaddr *addr" "int fib" .Ft "struct ifaddr *" -.Fn ifa_ifwithnet "struct sockaddr *addr" "int ignore_ptp" +.Fn ifa_ifwithnet "struct sockaddr *addr" "int ignore_ptp" "int fib" .Ft "struct ifaddr *" .Fn ifaof_ifpforaddr "struct sockaddr *addr" "struct ifnet *ifp" .Ft void @@ -1389,7 +1389,16 @@ remote .Pq Dq destination address is -.Fa addr . +.Fa addr +and a fib is +.Fa fib . +If +.Fa fib +is +.Dv RT_ALL_FIBS , +then the first interface address matching +.Fa addr +will be returned. .Pp .Fn ifa_ifwithnet returns the most specific interface address which matches the @@ -1401,7 +1410,10 @@ if one is found. If .Fa ignore_ptp -is true, skip point-to-point interface addresses. +is true, skip point-to-point interface addresses. The +.Fa fib +parameter is handled the same way as by +.Fn ifa_ifwithdstaddr . .Pp .Fn ifaof_ifpforaddr returns the most specific address configured on interface ==== //depot/projects/smpng/share/man/man9/sysctl.9#9 (text) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/sysctl.9 269439 2014-08-02 18:37:08Z hselasky $ +.\" $FreeBSD: head/share/man/man9/sysctl.9 271314 2014-09-09 14:31:56Z joel $ .\" .Dd July 31, 2014 .Dt SYSCTL 9 @@ -105,7 +105,7 @@ .Fa "void *ptr" .Fa "intptr_t len" .Fa "const char *format" -.Fa "const char *descr +.Fa "const char *descr" .Fc .Ft struct sysctl_oid * .Fo SYSCTL_ADD_PROC @@ -505,49 +505,6 @@ .It Dv CTLFLAG_DYN Dynamically created OIDs automatically get this flag set. .El -.Sh SECURITY CONSIDERATIONS -When creating new sysctls, careful attention should be paid to the security -implications of the monitoring or management interface being created. -Most sysctls present in the kernel are read-only or writable only by the -superuser. -Sysctls exporting extensive information on system data structures and -operation, especially those implemented using procedures, will wish to -implement access control to limit the undesired exposure of information about -other processes, network connections, etc. -.Pp -The following top level sysctl name spaces are commonly used: -.Bl -tag -width ".Va regression" -.It Va compat -Compatibility layer information. -.It Va debug -Debugging information. -Various name spaces exist under -.Va debug . -.It Va hw -Hardware and device driver information. -.It Va kern -Kernel behavior tuning; generally deprecated in favor of more specific -name spaces. -.It Va machdep -Machine-dependent configuration parameters. -.It Va net -Network subsystem. -Various protocols have name spaces under -.Va net . -.It Va regression -Regression test configuration and information. -.It Va security -Security and security-policy configuration and information. -.It Va sysctl -Reserved name space for the implementation of sysctl. -.It Va user -Configuration settings relating to user application behavior. -Generally, configuring applications using kernel sysctls is discouraged. -.It Va vfs -Virtual file system configuration and information. -.It Va vm -Virtual memory subsystem configuration and information. -.El .Sh EXAMPLES Sample use of .Fn SYSCTL_DECL @@ -702,3 +659,46 @@ .Pp This man page was written by .An Robert N. M. Watson . +.Sh SECURITY CONSIDERATIONS +When creating new sysctls, careful attention should be paid to the security +implications of the monitoring or management interface being created. +Most sysctls present in the kernel are read-only or writable only by the +superuser. +Sysctls exporting extensive information on system data structures and +operation, especially those implemented using procedures, will wish to +implement access control to limit the undesired exposure of information about +other processes, network connections, etc. +.Pp +The following top level sysctl name spaces are commonly used: +.Bl -tag -width ".Va regression" +.It Va compat +Compatibility layer information. +.It Va debug +Debugging information. +Various name spaces exist under +.Va debug . +.It Va hw +Hardware and device driver information. +.It Va kern +Kernel behavior tuning; generally deprecated in favor of more specific +name spaces. +.It Va machdep +Machine-dependent configuration parameters. +.It Va net +Network subsystem. +Various protocols have name spaces under +.Va net . +.It Va regression +Regression test configuration and information. +.It Va security +Security and security-policy configuration and information. +.It Va sysctl +Reserved name space for the implementation of sysctl. +.It Va user +Configuration settings relating to user application behavior. +Generally, configuring applications using kernel sysctls is discouraged. +.It Va vfs +Virtual file system configuration and information. +.It Va vm +Virtual memory subsystem configuration and information. +.El ==== //depot/projects/smpng/sys/amd64/amd64/cpu_switch.S#38 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/amd64/cpu_switch.S 262752 2014-03-04 21:35:57Z jkim $ + * $FreeBSD: head/sys/amd64/amd64/cpu_switch.S 271192 2014-09-06 15:23:28Z jhb $ */ #include @@ -399,10 +399,6 @@ rdmsr movl %eax,PCB_SFMASK(%rdi) movl %edx,PCB_SFMASK+4(%rdi) - movl xsave_mask,%eax - movl %eax,PCB_XSMASK(%rdi) - movl xsave_mask+4,%eax - movl %eax,PCB_XSMASK+4(%rdi) sgdt PCB_GDT(%rdi) sidt PCB_IDT(%rdi) @@ -467,12 +463,9 @@ movl PCB_SFMASK(%rdi),%eax wrmsr - /* Restore CR0 except for FPU mode. */ + /* Restore CR0, CR2, CR4 and CR3. */ movq PCB_CR0(%rdi),%rax - andq $~(CR0_EM | CR0_TS),%rax movq %rax,%cr0 - - /* Restore CR2, CR4 and CR3. */ movq PCB_CR2(%rdi),%rax movq %rax,%cr2 movq PCB_CR4(%rdi),%rax @@ -510,26 +503,6 @@ movq PCB_DR7(%rdi),%rax movq %rax,%dr7 - /* Restore FPU state. */ - fninit - movq PCB_FPUSUSPEND(%rdi),%rbx - movq PCB_XSMASK(%rdi),%rax - testq %rax,%rax - jz 1f - movq %rax,%rdx - shrq $32,%rdx - movl $XCR0,%ecx - xsetbv - xrstor (%rbx) - jmp 2f -1: - fxrstor (%rbx) -2: - - /* Reload CR0. */ - movq PCB_CR0(%rdi),%rax - movq %rax,%cr0 - /* Restore other callee saved registers. */ movq PCB_R15(%rdi),%r15 movq PCB_R14(%rdi),%r14 ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#33 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 267767 2014-06-23 07:37:54Z kib $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 271192 2014-09-06 15:23:28Z jhb $"); #include #include @@ -173,6 +173,20 @@ load_cr0(cr0); } +void +fpuresume(void *addr) +{ + u_long cr0; + + cr0 = rcr0(); + stop_emulating(); + fninit(); + if (use_xsave) + load_xcr(XCR0, xsave_mask); + fpurestore(addr); + load_cr0(cr0); +} + /* * Enable XSAVE if supported and allowed by user. * Calculate the xsave_mask. ==== //depot/projects/smpng/sys/amd64/amd64/genassym.c#42 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/genassym.c 263002 2014-03-11 10:07:01Z royger $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/genassym.c 271192 2014-09-06 15:23:28Z jhb $"); #include "opt_compat.h" #include "opt_hwpmc_hooks.h" @@ -163,8 +163,6 @@ ASSYM(PCB_LSTAR, offsetof(struct pcb, pcb_lstar)); ASSYM(PCB_CSTAR, offsetof(struct pcb, pcb_cstar)); ASSYM(PCB_SFMASK, offsetof(struct pcb, pcb_sfmask)); -ASSYM(PCB_XSMASK, offsetof(struct pcb, pcb_xsmask)); -ASSYM(PCB_FPUSUSPEND, offsetof(struct pcb, pcb_fpususpend)); ASSYM(PCB_SIZE, sizeof(struct pcb)); ASSYM(PCB_FULL_IRET, PCB_FULL_IRET); ASSYM(PCB_DBREGS, PCB_DBREGS); ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#132 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 271076 2014-09-04 01:46:06Z jhb $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/machdep.c 271149 2014-09-05 01:06:45Z pfg $"); #include "opt_atpic.h" #include "opt_compat.h" @@ -250,9 +250,11 @@ if (sysenv != NULL) { if (strncmp(sysenv, "MacBook1,1", 10) == 0 || strncmp(sysenv, "MacBook3,1", 10) == 0 || + strncmp(sysenv, "MacBook4,1", 10) == 0 || strncmp(sysenv, "MacBookPro1,1", 13) == 0 || strncmp(sysenv, "MacBookPro1,2", 13) == 0 || strncmp(sysenv, "MacBookPro3,1", 13) == 0 || + strncmp(sysenv, "MacBookPro4,1", 13) == 0 || strncmp(sysenv, "Macmini1,1", 10) == 0) { if (bootverbose) printf("Disabling LEGACY_USB_EN bit on " ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#97 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: head/sys/amd64/amd64/mp_machdep.c 267526 2014-06-16 08:43:03Z royger $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/mp_machdep.c 271409 2014-09-10 21:37:47Z jhb $"); #include "opt_cpu.h" #include "opt_ddb.h" @@ -103,7 +103,7 @@ void *dpcpu; struct pcb stoppcbs[MAXCPU]; -struct pcb **susppcbs; +struct susppcb **susppcbs; /* Variables needed for SMP tlb shootdown. */ vm_offset_t smp_tlb_addr2; @@ -725,7 +725,7 @@ /* set up CPU registers and state */ cpu_setregs(); - /* set up SSE/NX registers */ + /* set up SSE/NX */ initializecpu(); /* set up FPU state on the AP */ @@ -1467,11 +1467,12 @@ mtx_assert(&smp_ipi_mtx, MA_NOTOWNED); cpu = PCPU_GET(cpuid); - if (savectx(susppcbs[cpu])) { - fpususpend(susppcbs[cpu]->pcb_fpususpend); + if (savectx(&susppcbs[cpu]->sp_pcb)) { + fpususpend(susppcbs[cpu]->sp_fpususpend); wbinvd(); CPU_SET_ATOMIC(cpu, &suspended_cpus); } else { + fpuresume(susppcbs[cpu]->sp_fpususpend); pmap_init_pat(); initializecpu(); PCPU_SET(switchtime, 0); ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#114 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: head/sys/amd64/conf/GENERIC 268045 2014-06-30 16:18:38Z emaste $ +# $FreeBSD: head/sys/amd64/conf/GENERIC 271137 2014-09-04 21:06:33Z markj $ cpu HAMMER ident GENERIC @@ -164,6 +164,7 @@ device ida # Compaq Smart RAID device mfi # LSI MegaRAID SAS device mlx # Mylex DAC960 family +device mrsas # LSI/Avago MegaRAID SAS/SATA, 6Gb/s and 12Gb/s #XXX pointer/int warnings #device pst # Promise Supertrak SX6000 device twe # 3ware ATA RAID ==== //depot/projects/smpng/sys/amd64/include/fpu.h#13 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD: head/sys/amd64/include/fpu.h 267767 2014-06-23 07:37:54Z kib $ + * $FreeBSD: head/sys/amd64/include/fpu.h 271192 2014-09-06 15:23:28Z jhb $ */ /* @@ -58,6 +58,7 @@ int fpugetregs(struct thread *td); void fpuinit(void); void fpurestore(void *addr); +void fpuresume(void *addr); void fpusave(void *addr); int fpusetregs(struct thread *td, struct savefpu *addr, char *xfpustate, size_t xfpustate_size); ==== //depot/projects/smpng/sys/amd64/include/pcb.h#28 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD: head/sys/amd64/include/pcb.h 258660 2013-11-26 19:38:42Z kib $ + * $FreeBSD: head/sys/amd64/include/pcb.h 271192 2014-09-06 15:23:28Z jhb $ */ #ifndef _AMD64_PCB_H_ @@ -97,14 +97,18 @@ register_t pcb_lstar; register_t pcb_cstar; register_t pcb_sfmask; - register_t pcb_xsmask; + + struct savefpu *pcb_save; - /* fpu context for suspend/resume */ - void *pcb_fpususpend; + uint64_t pcb_pad[5]; +}; - struct savefpu *pcb_save; +/* Per-CPU state saved during suspend and resume. */ +struct susppcb { + struct pcb sp_pcb; - uint64_t pcb_pad[3]; + /* fpu context for suspend/resume */ + void *sp_fpususpend; }; #endif ==== //depot/projects/smpng/sys/amd64/include/vmm.h#14 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/include/vmm.h 270438 2014-08-24 02:07:34Z grehan $ + * $FreeBSD: head/sys/amd64/include/vmm.h 271451 2014-09-12 06:15:20Z neel $ */ #ifndef _VMM_H_ @@ -82,6 +82,7 @@ VM_REG_GUEST_PDPTE1, VM_REG_GUEST_PDPTE2, VM_REG_GUEST_PDPTE3, >>> TRUNCATED FOR MAIL (1000 lines) <<<