From owner-svn-src-releng@FreeBSD.ORG Thu Mar 28 05:55:29 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 289A2B76; Thu, 28 Mar 2013 05:55:29 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 020429E3; Thu, 28 Mar 2013 05:55:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2S5tSGS016549; Thu, 28 Mar 2013 05:55:28 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2S5tSDj016548; Thu, 28 Mar 2013 05:55:28 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201303280555.r2S5tSDj016548@svn.freebsd.org> From: Xin LI Date: Thu, 28 Mar 2013 05:55:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248810 - releng/8.4 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 05:55:29 -0000 Author: delphij Date: Thu Mar 28 05:55:28 2013 New Revision: 248810 URL: http://svnweb.freebsd.org/changeset/base/248810 Log: Copy stable/8 to releng/8.4 as part of 8.4-RELEASE release cycle. Approved by: re (kib) Added: - copied from r248809, stable/8/ Directory Properties: releng/8.4/ (props changed) From owner-svn-src-releng@FreeBSD.ORG Thu Mar 28 06:51:31 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id AA588A2D; Thu, 28 Mar 2013 06:51:31 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 8E37EFCC; Thu, 28 Mar 2013 06:51:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2S6pUOk034288; Thu, 28 Mar 2013 06:51:30 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2S6pTLM034281; Thu, 28 Mar 2013 06:51:29 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201303280651.r2S6pTLM034281@svn.freebsd.org> From: Xin LI Date: Thu, 28 Mar 2013 06:51:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248817 - releng/8.4/crypto/openssl/ssl X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 06:51:31 -0000 Author: delphij Date: Thu Mar 28 06:51:29 2013 New Revision: 248817 URL: http://svnweb.freebsd.org/changeset/base/248817 Log: MFS r248816: MFV r248595: - Integrate OpenSSL revisions fb092ef4fca897344daf7189526f5f26be6487ce, a93cc7c57333f4538cbcdedd2e961a5a38caa52d, and 76c61a5d1adb92388f39e585e4af860a20feb9bb. This removes the newly added orig_len field of SSL3_RECORD and restored ABI. Approved by: re (kib) Modified: releng/8.4/crypto/openssl/ssl/d1_pkt.c releng/8.4/crypto/openssl/ssl/s3_cbc.c releng/8.4/crypto/openssl/ssl/s3_enc.c releng/8.4/crypto/openssl/ssl/s3_pkt.c releng/8.4/crypto/openssl/ssl/ssl3.h releng/8.4/crypto/openssl/ssl/ssl_locl.h releng/8.4/crypto/openssl/ssl/t1_enc.c Directory Properties: releng/8.4/crypto/openssl/ (props changed) Modified: releng/8.4/crypto/openssl/ssl/d1_pkt.c ============================================================================== --- releng/8.4/crypto/openssl/ssl/d1_pkt.c Thu Mar 28 06:48:06 2013 (r248816) +++ releng/8.4/crypto/openssl/ssl/d1_pkt.c Thu Mar 28 06:51:29 2013 (r248817) @@ -330,8 +330,8 @@ dtls1_process_record(SSL *s) int i,al; int enc_err; SSL_SESSION *sess; - SSL3_RECORD *rr; - unsigned int mac_size; + SSL3_RECORD *rr; + unsigned int mac_size, orig_len; unsigned char md[EVP_MAX_MD_SIZE]; rr= &(s->s3->rrec); @@ -362,7 +362,7 @@ dtls1_process_record(SSL *s) /* decrypt in place in 'rr->input' */ rr->data=rr->input; - rr->orig_len=rr->length; + orig_len=rr->length; enc_err = s->method->ssl3_enc->enc(s,0); /* enc_err is: @@ -399,10 +399,10 @@ printf("\n"); * therefore we can safely process the record in a different * amount of time if it's too short to possibly contain a MAC. */ - if (rr->orig_len < mac_size || + if (orig_len < mac_size || /* CBC records must have a padding length byte too. */ (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE && - rr->orig_len < mac_size+1)) + orig_len < mac_size+1)) { al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_DTLS1_PROCESS_RECORD,SSL_R_LENGTH_TOO_SHORT); @@ -417,12 +417,12 @@ printf("\n"); * without leaking the contents of the padding bytes. * */ mac = mac_tmp; - ssl3_cbc_copy_mac(mac_tmp, rr, mac_size); + ssl3_cbc_copy_mac(mac_tmp, rr, mac_size, orig_len); rr->length -= mac_size; } else { - /* In this case there's no padding, so |rec->orig_len| + /* In this case there's no padding, so |orig_len| * equals |rec->length| and we checked that there's * enough bytes for |mac_size| above. */ rr->length -= mac_size; Modified: releng/8.4/crypto/openssl/ssl/s3_cbc.c ============================================================================== --- releng/8.4/crypto/openssl/ssl/s3_cbc.c Thu Mar 28 06:48:06 2013 (r248816) +++ releng/8.4/crypto/openssl/ssl/s3_cbc.c Thu Mar 28 06:51:29 2013 (r248817) @@ -116,7 +116,9 @@ int ssl3_cbc_remove_padding(const SSL* s good = constant_time_ge(rec->length, padding_length+overhead); /* SSLv3 requires that the padding is minimal. */ good &= constant_time_ge(block_size, padding_length+1); - rec->length -= good & (padding_length+1); + padding_length = good & (padding_length+1); + rec->length -= padding_length; + rec->type |= padding_length<<8; /* kludge: pass padding length */ return (int)((good & 1) | (~good & -1)); } @@ -202,7 +204,9 @@ int tls1_cbc_remove_padding(const SSL* s good <<= sizeof(good)*8-1; good = DUPLICATE_MSB_TO_ALL(good); - rec->length -= good & (padding_length+1); + padding_length = good & (padding_length+1); + rec->length -= padding_length; + rec->type |= padding_length<<8; /* kludge: pass padding length */ /* We can always safely skip the explicit IV. We check at the beginning * of this function that the record has at least enough space for the @@ -217,7 +221,6 @@ int tls1_cbc_remove_padding(const SSL* s rec->data += block_size; rec->input += block_size; rec->length -= block_size; - rec->orig_len -= block_size; } return (int)((good & 1) | (~good & -1)); @@ -245,7 +248,7 @@ int tls1_cbc_remove_padding(const SSL* s */ void ssl3_cbc_copy_mac(unsigned char* out, const SSL3_RECORD *rec, - unsigned md_size) + unsigned md_size,unsigned orig_len) { #if defined(CBC_MAC_ROTATE_IN_PLACE) unsigned char rotated_mac_buf[EVP_MAX_MD_SIZE*2]; @@ -264,7 +267,7 @@ void ssl3_cbc_copy_mac(unsigned char* ou unsigned div_spoiler; unsigned rotate_offset; - OPENSSL_assert(rec->orig_len >= md_size); + OPENSSL_assert(orig_len >= md_size); OPENSSL_assert(md_size <= EVP_MAX_MD_SIZE); #if defined(CBC_MAC_ROTATE_IN_PLACE) @@ -272,8 +275,8 @@ void ssl3_cbc_copy_mac(unsigned char* ou #endif /* This information is public so it's safe to branch based on it. */ - if (rec->orig_len > md_size + 255 + 1) - scan_start = rec->orig_len - (md_size + 255 + 1); + if (orig_len > md_size + 255 + 1) + scan_start = orig_len - (md_size + 255 + 1); /* div_spoiler contains a multiple of md_size that is used to cause the * modulo operation to be constant time. Without this, the time varies * based on the amount of padding when running on Intel chips at least. @@ -286,9 +289,9 @@ void ssl3_cbc_copy_mac(unsigned char* ou rotate_offset = (div_spoiler + mac_start - scan_start) % md_size; memset(rotated_mac, 0, md_size); - for (i = scan_start; i < rec->orig_len;) + for (i = scan_start; i < orig_len;) { - for (j = 0; j < md_size && i < rec->orig_len; i++, j++) + for (j = 0; j < md_size && i < orig_len; i++, j++) { unsigned char mac_started = constant_time_ge(i, mac_start); unsigned char mac_ended = constant_time_ge(i, mac_end); Modified: releng/8.4/crypto/openssl/ssl/s3_enc.c ============================================================================== --- releng/8.4/crypto/openssl/ssl/s3_enc.c Thu Mar 28 06:48:06 2013 (r248816) +++ releng/8.4/crypto/openssl/ssl/s3_enc.c Thu Mar 28 06:51:29 2013 (r248817) @@ -504,8 +504,6 @@ int ssl3_enc(SSL *s, int send) EVP_Cipher(ds,rec->data,rec->input,l); - rec->orig_len = rec->length; - if (s->read_hash != NULL) mac_size = EVP_MD_size(s->read_hash); @@ -587,7 +585,7 @@ int ssl3_mac(SSL *ssl, unsigned char *md EVP_MD_CTX md_ctx; const EVP_MD *hash; unsigned char *p,rec_char; - size_t md_size; + size_t md_size, orig_len; int npad; if (send) @@ -608,6 +606,10 @@ int ssl3_mac(SSL *ssl, unsigned char *md md_size=EVP_MD_size(hash); npad=(48/md_size)*md_size; + /* kludge: ssl3_cbc_remove_padding passes padding length in rec->type */ + orig_len = rec->length+md_size+((unsigned int)rec->type>>8); + rec->type &= 0xff; + if (!send && EVP_CIPHER_CTX_mode(ssl->enc_read_ctx) == EVP_CIPH_CBC_MODE && ssl3_cbc_record_digest_supported(hash)) @@ -639,7 +641,7 @@ int ssl3_mac(SSL *ssl, unsigned char *md hash, md, &md_size, header, rec->input, - rec->length + md_size, rec->orig_len, + rec->length + md_size, orig_len, mac_sec, md_size, 1 /* is SSLv3 */); } Modified: releng/8.4/crypto/openssl/ssl/s3_pkt.c ============================================================================== --- releng/8.4/crypto/openssl/ssl/s3_pkt.c Thu Mar 28 06:48:06 2013 (r248816) +++ releng/8.4/crypto/openssl/ssl/s3_pkt.c Thu Mar 28 06:51:29 2013 (r248817) @@ -246,7 +246,7 @@ static int ssl3_get_record(SSL *s) unsigned char *p; unsigned char md[EVP_MAX_MD_SIZE]; short version; - unsigned mac_size; + unsigned mac_size, orig_len; size_t extra; rr= &(s->s3->rrec); @@ -351,7 +351,7 @@ again: /* decrypt in place in 'rr->input' */ rr->data=rr->input; - rr->orig_len=rr->length; + orig_len=rr->length; enc_err = s->method->ssl3_enc->enc(s,0); /* enc_err is: @@ -387,10 +387,10 @@ printf("\n"); * therefore we can safely process the record in a different * amount of time if it's too short to possibly contain a MAC. */ - if (rr->orig_len < mac_size || + if (orig_len < mac_size || /* CBC records must have a padding length byte too. */ (EVP_CIPHER_CTX_mode(s->enc_read_ctx) == EVP_CIPH_CBC_MODE && - rr->orig_len < mac_size+1)) + orig_len < mac_size+1)) { al=SSL_AD_DECODE_ERROR; SSLerr(SSL_F_SSL3_GET_RECORD,SSL_R_LENGTH_TOO_SHORT); @@ -405,12 +405,12 @@ printf("\n"); * without leaking the contents of the padding bytes. * */ mac = mac_tmp; - ssl3_cbc_copy_mac(mac_tmp, rr, mac_size); + ssl3_cbc_copy_mac(mac_tmp, rr, mac_size, orig_len); rr->length -= mac_size; } else { - /* In this case there's no padding, so |rec->orig_len| + /* In this case there's no padding, so |orig_len| * equals |rec->length| and we checked that there's * enough bytes for |mac_size| above. */ rr->length -= mac_size; Modified: releng/8.4/crypto/openssl/ssl/ssl3.h ============================================================================== --- releng/8.4/crypto/openssl/ssl/ssl3.h Thu Mar 28 06:48:06 2013 (r248816) +++ releng/8.4/crypto/openssl/ssl/ssl3.h Thu Mar 28 06:51:29 2013 (r248817) @@ -304,10 +304,6 @@ typedef struct ssl3_record_st /*r */ unsigned char *comp; /* only used with decompression - malloc()ed */ /*r */ unsigned long epoch; /* epoch number, needed by DTLS1 */ /*r */ PQ_64BIT seq_num; /* sequence number, needed by DTLS1 */ -/*rw*/ unsigned int orig_len; /* How many bytes were available before padding - was removed? This is used to implement the - MAC check in constant time for CBC records. - */ } SSL3_RECORD; typedef struct ssl3_buffer_st Modified: releng/8.4/crypto/openssl/ssl/ssl_locl.h ============================================================================== --- releng/8.4/crypto/openssl/ssl/ssl_locl.h Thu Mar 28 06:48:06 2013 (r248816) +++ releng/8.4/crypto/openssl/ssl/ssl_locl.h Thu Mar 28 06:51:29 2013 (r248817) @@ -1015,7 +1015,7 @@ int ssl_parse_clienthello_renegotiate_ex /* s3_cbc.c */ void ssl3_cbc_copy_mac(unsigned char* out, const SSL3_RECORD *rec, - unsigned md_size); + unsigned md_size,unsigned orig_len); int ssl3_cbc_remove_padding(const SSL* s, SSL3_RECORD *rec, unsigned block_size, Modified: releng/8.4/crypto/openssl/ssl/t1_enc.c ============================================================================== --- releng/8.4/crypto/openssl/ssl/t1_enc.c Thu Mar 28 06:48:06 2013 (r248816) +++ releng/8.4/crypto/openssl/ssl/t1_enc.c Thu Mar 28 06:51:29 2013 (r248817) @@ -689,7 +689,7 @@ int tls1_mac(SSL *ssl, unsigned char *md SSL3_RECORD *rec; unsigned char *mac_sec,*seq; const EVP_MD *hash; - size_t md_size; + size_t md_size, orig_len; int i; HMAC_CTX hmac; unsigned char header[13]; @@ -727,6 +727,10 @@ int tls1_mac(SSL *ssl, unsigned char *md else memcpy(header, seq, 8); + /* kludge: tls1_cbc_remove_padding passes padding length in rec->type */ + orig_len = rec->length+md_size+((unsigned int)rec->type>>8); + rec->type &= 0xff; + header[8]=rec->type; header[9]=(unsigned char)(ssl->version>>8); header[10]=(unsigned char)(ssl->version); @@ -745,7 +749,7 @@ int tls1_mac(SSL *ssl, unsigned char *md hash, md, &md_size, header, rec->input, - rec->length + md_size, rec->orig_len, + rec->length + md_size, orig_len, ssl->s3->read_mac_secret, EVP_MD_size(ssl->read_hash), 0 /* not SSLv3 */); @@ -764,7 +768,7 @@ int tls1_mac(SSL *ssl, unsigned char *md ssl->enc_read_ctx, hash, &hmac, rec->input, - rec->length, rec->orig_len); + rec->length, orig_len); #endif } From owner-svn-src-releng@FreeBSD.ORG Thu Mar 28 10:08:59 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 49DA957D; Thu, 28 Mar 2013 10:08:59 +0000 (UTC) (envelope-from ae@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 3C4ADB49; Thu, 28 Mar 2013 10:08:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2SA8w8D092420; Thu, 28 Mar 2013 10:08:58 GMT (envelope-from ae@svn.freebsd.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2SA8wNF092418; Thu, 28 Mar 2013 10:08:58 GMT (envelope-from ae@svn.freebsd.org) Message-Id: <201303281008.r2SA8wNF092418@svn.freebsd.org> From: "Andrey V. Elsukov" Date: Thu, 28 Mar 2013 10:08:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248823 - releng/8.4/sys/netinet6 X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 10:08:59 -0000 Author: ae Date: Thu Mar 28 10:08:58 2013 New Revision: 248823 URL: http://svnweb.freebsd.org/changeset/base/248823 Log: MFstable/8 r248822: Take the inpcb rlock before calculating checksum, it was accidentally moved in r191672. Approved by: re (glebius) Modified: releng/8.4/sys/netinet6/raw_ip6.c Directory Properties: releng/8.4/sys/ (props changed) releng/8.4/sys/netinet6/ (props changed) Modified: releng/8.4/sys/netinet6/raw_ip6.c ============================================================================== --- releng/8.4/sys/netinet6/raw_ip6.c Thu Mar 28 09:51:37 2013 (r248822) +++ releng/8.4/sys/netinet6/raw_ip6.c Thu Mar 28 10:08:58 2013 (r248823) @@ -195,6 +195,7 @@ rip6_input(struct mbuf **mp, int *offp, &ip6->ip6_dst) != 0) continue; } + INP_RLOCK(in6p); if (in6p->in6p_cksum != -1) { V_rip6stat.rip6s_isum++; if (in6_cksum(m, proto, *offp, @@ -204,7 +205,6 @@ rip6_input(struct mbuf **mp, int *offp, continue; } } - INP_RLOCK(in6p); /* * If this raw socket has multicast state, and we * have received a multicast, check if this socket From owner-svn-src-releng@FreeBSD.ORG Thu Mar 28 13:45:46 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id E3BFCE84; Thu, 28 Mar 2013 13:45:46 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id D6595894; Thu, 28 Mar 2013 13:45:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2SDjkEE058003; Thu, 28 Mar 2013 13:45:46 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2SDjkBb058002; Thu, 28 Mar 2013 13:45:46 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201303281345.r2SDjkBb058002@svn.freebsd.org> From: Dag-Erling Smørgrav Date: Thu, 28 Mar 2013 13:45:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248829 - releng/8.4/crypto/openssh X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 13:45:47 -0000 Author: des Date: Thu Mar 28 13:45:45 2013 New Revision: 248829 URL: http://svnweb.freebsd.org/changeset/base/248829 Log: MFH (r248465): revert upstream decommissioning of authorized_keys2 Approved by: re (marius@) Modified: releng/8.4/crypto/openssh/sshd_config Directory Properties: releng/8.4/crypto/openssh/ (props changed) Modified: releng/8.4/crypto/openssh/sshd_config ============================================================================== --- releng/8.4/crypto/openssh/sshd_config Thu Mar 28 13:38:02 2013 (r248828) +++ releng/8.4/crypto/openssh/sshd_config Thu Mar 28 13:45:45 2013 (r248829) @@ -50,8 +50,7 @@ #PubkeyAuthentication yes # The default is to check both .ssh/authorized_keys and .ssh/authorized_keys2 -# but this is overridden so installations will only check .ssh/authorized_keys -AuthorizedKeysFile .ssh/authorized_keys +#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 #AuthorizedPrincipalsFile none From owner-svn-src-releng@FreeBSD.ORG Thu Mar 28 15:04:04 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 0D1D48C8; Thu, 28 Mar 2013 15:04:04 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F368FD9D; Thu, 28 Mar 2013 15:04:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2SF43WX082760; Thu, 28 Mar 2013 15:04:03 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2SF43ha082757; Thu, 28 Mar 2013 15:04:03 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201303281504.r2SF43ha082757@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 28 Mar 2013 15:04:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248833 - in releng/8.4/sys: fs/tmpfs ufs/ufs X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 15:04:04 -0000 Author: kib Date: Thu Mar 28 15:04:03 2013 New Revision: 248833 URL: http://svnweb.freebsd.org/changeset/base/248833 Log: MFC r248422: Remove negative name cache entry pointing to the target name, which could be instantiated while tdvp was unlocked. Approved by: re (marius) Modified: releng/8.4/sys/fs/tmpfs/tmpfs_vnops.c releng/8.4/sys/ufs/ufs/ufs_vnops.c Directory Properties: releng/8.4/sys/ (props changed) releng/8.4/sys/fs/ (props changed) releng/8.4/sys/ufs/ (props changed) Modified: releng/8.4/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- releng/8.4/sys/fs/tmpfs/tmpfs_vnops.c Thu Mar 28 14:39:50 2013 (r248832) +++ releng/8.4/sys/fs/tmpfs/tmpfs_vnops.c Thu Mar 28 15:04:03 2013 (r248833) @@ -1282,6 +1282,7 @@ tmpfs_rename(struct vop_rename_args *v) cache_purge(fvp); if (tvp != NULL) cache_purge(tvp); + cache_purge_negative(tdvp); error = 0; Modified: releng/8.4/sys/ufs/ufs/ufs_vnops.c ============================================================================== --- releng/8.4/sys/ufs/ufs/ufs_vnops.c Thu Mar 28 14:39:50 2013 (r248832) +++ releng/8.4/sys/ufs/ufs/ufs_vnops.c Thu Mar 28 15:04:03 2013 (r248833) @@ -1538,6 +1538,7 @@ relock: cache_purge(fvp); if (tvp) cache_purge(tvp); + cache_purge_negative(tdvp); unlockout: vput(fdvp); From owner-svn-src-releng@FreeBSD.ORG Thu Mar 28 18:06:09 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id EE0D16A9; Thu, 28 Mar 2013 18:06:09 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C7B409B8; Thu, 28 Mar 2013 18:06:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2SI69af046574; Thu, 28 Mar 2013 18:06:09 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2SI69TZ046573; Thu, 28 Mar 2013 18:06:09 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201303281806.r2SI69TZ046573@svn.freebsd.org> From: Sean Bruno Date: Thu, 28 Mar 2013 18:06:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248841 - releng/8.4/sys/dev/ciss X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 18:06:10 -0000 Author: sbruno Date: Thu Mar 28 18:06:09 2013 New Revision: 248841 URL: http://svnweb.freebsd.org/changeset/base/248841 Log: MFC r247279 The 5300 series ciss(4) board does not work in performant mode with our currnet initialization sequence. Set it to simple mode only so that systems can be updated from stable/7 to newer installations. At some point, we should figure out why we cannot initialize performant mode on this board. PR: kern/153361 Reviewed by: scottl Approved by: re (marius@) Modified: releng/8.4/sys/dev/ciss/ciss.c Directory Properties: releng/8.4/sys/ (props changed) releng/8.4/sys/dev/ (props changed) releng/8.4/sys/dev/ciss/ (props changed) Modified: releng/8.4/sys/dev/ciss/ciss.c ============================================================================== --- releng/8.4/sys/dev/ciss/ciss.c Thu Mar 28 18:03:39 2013 (r248840) +++ releng/8.4/sys/dev/ciss/ciss.c Thu Mar 28 18:06:09 2013 (r248841) @@ -281,6 +281,7 @@ TUNABLE_INT("hw.ciss.force_interrupt", & #define CISS_BOARD_SA5 1 #define CISS_BOARD_SA5B 2 #define CISS_BOARD_NOMSI (1<<4) +#define CISS_BOARD_SIMPLE (1<<5) static struct { @@ -289,7 +290,8 @@ static struct int flags; char *desc; } ciss_vendor_data[] = { - { 0x0e11, 0x4070, CISS_BOARD_SA5|CISS_BOARD_NOMSI, "Compaq Smart Array 5300" }, + { 0x0e11, 0x4070, CISS_BOARD_SA5|CISS_BOARD_NOMSI|CISS_BOARD_SIMPLE, + "Compaq Smart Array 5300" }, { 0x0e11, 0x4080, CISS_BOARD_SA5B|CISS_BOARD_NOMSI, "Compaq Smart Array 5i" }, { 0x0e11, 0x4082, CISS_BOARD_SA5B|CISS_BOARD_NOMSI, "Compaq Smart Array 532" }, { 0x0e11, 0x4083, CISS_BOARD_SA5B|CISS_BOARD_NOMSI, "HP Smart Array 5312" }, @@ -681,8 +683,15 @@ ciss_init_pci(struct ciss_softc *sc) supported_methods = CISS_TRANSPORT_METHOD_PERF; break; default: - supported_methods = sc->ciss_cfg->supported_methods; - break; + /* + * Override the capabilities of the BOARD and specify SIMPLE + * MODE + */ + if (ciss_vendor_data[i].flags & CISS_BOARD_SIMPLE) + supported_methods = CISS_TRANSPORT_METHOD_SIMPLE; + else + supported_methods = sc->ciss_cfg->supported_methods; + break; } setup: From owner-svn-src-releng@FreeBSD.ORG Thu Mar 28 20:35:39 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 36532E5; Thu, 28 Mar 2013 20:35:39 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 1895C1B5; Thu, 28 Mar 2013 20:35:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2SKZcQe091286; Thu, 28 Mar 2013 20:35:38 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2SKZcIt091281; Thu, 28 Mar 2013 20:35:38 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201303282035.r2SKZcIt091281@svn.freebsd.org> From: Xin LI Date: Thu, 28 Mar 2013 20:35:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248850 - in releng/8.4: . release share/examples/cvsup sys/sys X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Mar 2013 20:35:39 -0000 Author: delphij Date: Thu Mar 28 20:35:37 2013 New Revision: 248850 URL: http://svnweb.freebsd.org/changeset/base/248850 Log: Version bumps after releng/8.4 branch: Makefile: * Update the CVS branch tag. release/Makefile: * Update RELEASETAG and SVNBRANCH. share/examples/cvsup/standard-supfile: * Update to have "make update" pull from RELENG_8_4. sys/sys/param.h: * Update __FreeBSD_version to 804000 to reflect releng/8.4 has been branched. Approved by: re (rodrigc) Modified: releng/8.4/Makefile.inc1 releng/8.4/release/Makefile releng/8.4/share/examples/cvsup/standard-supfile releng/8.4/sys/sys/param.h Modified: releng/8.4/Makefile.inc1 ============================================================================== --- releng/8.4/Makefile.inc1 Thu Mar 28 20:33:07 2013 (r248849) +++ releng/8.4/Makefile.inc1 Thu Mar 28 20:35:37 2013 (r248850) @@ -92,7 +92,7 @@ CLEANDIR= cleandir .endif CVS?= cvs -CVSFLAGS?= -r RELENG_8 -P -d -I! +CVSFLAGS?= -r RELENG_8_4 -P -d -I! SVN?= svn SVNFLAGS?= -r HEAD SUP?= /usr/bin/csup Modified: releng/8.4/release/Makefile ============================================================================== --- releng/8.4/release/Makefile Thu Mar 28 20:33:07 2013 (r248849) +++ releng/8.4/release/Makefile Thu Mar 28 20:35:37 2013 (r248850) @@ -33,7 +33,7 @@ BUILDNAME?=${BASE}-${DATE}-SNAP # #CHROOTDIR=/junk/release # If this is a -stable snapshot, then set -#RELEASETAG=RELENG_8 +#RELEASETAG=RELENG_8_4 # # To test a release with a source tree containing patches and # other work. This tree will get copied instead of getting the @@ -72,7 +72,7 @@ BUILDNAME?=${BASE}-${DATE}-SNAP # # Subversion branch to build for src. If this is not set then it is # automatically computed from RELEASETAG. -#SVNBRANCH=stable/8 +#SVNBRANCH=releng/8.4 # # Non-zero if ${RELEASETAG} is in the form "RELENG_ver_RELEASE"; we # are building an official release. Otherwise, we are building for Modified: releng/8.4/share/examples/cvsup/standard-supfile ============================================================================== --- releng/8.4/share/examples/cvsup/standard-supfile Thu Mar 28 20:33:07 2013 (r248849) +++ releng/8.4/share/examples/cvsup/standard-supfile Thu Mar 28 20:35:37 2013 (r248850) @@ -46,7 +46,7 @@ *default host=CHANGE_THIS.FreeBSD.org *default base=/var/db *default prefix=/usr -*default release=cvs tag=RELENG_8 +*default release=cvs tag=RELENG_8_4 *default delete use-rel-suffix # If you seem to be limited by CPU rather than network or disk bandwidth, try Modified: releng/8.4/sys/sys/param.h ============================================================================== --- releng/8.4/sys/sys/param.h Thu Mar 28 20:33:07 2013 (r248849) +++ releng/8.4/sys/sys/param.h Thu Mar 28 20:35:37 2013 (r248850) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 803501 /* Master, propagated to newvers */ +#define __FreeBSD_version 804000 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-releng@FreeBSD.ORG Fri Mar 29 00:32:32 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 5E222B7A; Fri, 29 Mar 2013 00:32:32 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 38523D68; Fri, 29 Mar 2013 00:32:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2T0WWM1065539; Fri, 29 Mar 2013 00:32:32 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2T0WWe7065538; Fri, 29 Mar 2013 00:32:32 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201303290032.r2T0WWe7065538@svn.freebsd.org> From: Pyun YongHyeon Date: Fri, 29 Mar 2013 00:32:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248860 - releng/8.4/sys/dev/bge X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 00:32:32 -0000 Author: yongari Date: Fri Mar 29 00:32:31 2013 New Revision: 248860 URL: http://svnweb.freebsd.org/changeset/base/248860 Log: MFC r248226: r241438 broke IPMI access on Sun Fire X2200 M2(BCM5715). Fix the IPMI regression by sending BGE_FW_DRV_STATE_UNLOAD to ASF/IPMI firmware in driver attach phase. Sending heartheat to ASF/IPMI is enabled only after upping interface so setting driver state to BGE_FW_DRV_STATE_START in attach phase broke IPMI access. While I'm here, add NVRAM arbitration lock before performing controller reset. ASF/IPMI firmware may be able to access the NVRAM while controller reset is in progress. Without the arbitration lock before resetting the controller, ASF/IPMI may not initialize properly. Approved by: re (glebius) Modified: releng/8.4/sys/dev/bge/if_bge.c Directory Properties: releng/8.4/sys/ (props changed) releng/8.4/sys/dev/ (props changed) releng/8.4/sys/dev/bge/ (props changed) Modified: releng/8.4/sys/dev/bge/if_bge.c ============================================================================== --- releng/8.4/sys/dev/bge/if_bge.c Fri Mar 29 00:22:43 2013 (r248859) +++ releng/8.4/sys/dev/bge/if_bge.c Fri Mar 29 00:32:31 2013 (r248860) @@ -3637,15 +3637,15 @@ bge_attach(device_t dev) } bge_stop_fw(sc); - bge_sig_pre_reset(sc, BGE_RESET_START); + bge_sig_pre_reset(sc, BGE_RESET_SHUTDOWN); if (bge_reset(sc)) { device_printf(sc->bge_dev, "chip reset failed\n"); error = ENXIO; goto fail; } - bge_sig_legacy(sc, BGE_RESET_START); - bge_sig_post_reset(sc, BGE_RESET_START); + bge_sig_legacy(sc, BGE_RESET_SHUTDOWN); + bge_sig_post_reset(sc, BGE_RESET_SHUTDOWN); if (bge_chipinit(sc)) { device_printf(sc->bge_dev, "chip initialization failed\n"); @@ -3998,6 +3998,20 @@ bge_reset(struct bge_softc *sc) } else write_op = bge_writereg_ind; + if (sc->bge_asicrev != BGE_ASICREV_BCM5700 && + sc->bge_asicrev != BGE_ASICREV_BCM5701) { + CSR_WRITE_4(sc, BGE_NVRAM_SWARB, BGE_NVRAMSWARB_SET1); + for (i = 0; i < 8000; i++) { + if (CSR_READ_4(sc, BGE_NVRAM_SWARB) & + BGE_NVRAMSWARB_GNT1) + break; + DELAY(20); + } + if (i == 8000) { + if (bootverbose) + device_printf(dev, "NVRAM lock timedout!\n"); + } + } /* Take APE lock when performing reset. */ bge_ape_lock(sc, BGE_APE_LOCK_GRC); From owner-svn-src-releng@FreeBSD.ORG Fri Mar 29 02:14:59 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 1B991AD5; Fri, 29 Mar 2013 02:14:59 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id F1FC734E; Fri, 29 Mar 2013 02:14:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2T2EwQu000106; Fri, 29 Mar 2013 02:14:58 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2T2Ewmu000102; Fri, 29 Mar 2013 02:14:58 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201303290214.r2T2Ewmu000102@svn.freebsd.org> From: Bryan Venteicher Date: Fri, 29 Mar 2013 02:14:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248862 - in releng/8.4/sys: amd64/conf conf i386/conf X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 02:14:59 -0000 Author: bryanv Date: Fri Mar 29 02:14:57 2013 New Revision: 248862 URL: http://svnweb.freebsd.org/changeset/base/248862 Log: MFC 247870: Remove the virtio dependency entry for the VirtIO device drivers. This will prevent the kernel from linking if the device driver are included without the virtio module. Remove pci and scbus for the same reason. Also explain the relationship and necessity of the virtio and virtio_pci modules. Currently in FreeBSD, we only support VirtIO PCI, but it could be replaced with a different interface (like MMIO) and the device (network, block, etc) will still function. Approved by: re (marius@) Modified: releng/8.4/sys/amd64/conf/NOTES releng/8.4/sys/conf/files.amd64 releng/8.4/sys/conf/files.i386 releng/8.4/sys/i386/conf/NOTES Directory Properties: releng/8.4/sys/ (props changed) releng/8.4/sys/amd64/ (props changed) releng/8.4/sys/conf/ (props changed) releng/8.4/sys/i386/ (props changed) Modified: releng/8.4/sys/amd64/conf/NOTES ============================================================================== --- releng/8.4/sys/amd64/conf/NOTES Fri Mar 29 02:09:46 2013 (r248861) +++ releng/8.4/sys/amd64/conf/NOTES Fri Mar 29 02:14:57 2013 (r248862) @@ -424,6 +424,13 @@ options SAFE_RNDTEST # enable rndtest s # # VirtIO support +# +# The virtio entry provides a generic bus for use by the device drivers. +# It must be combined with an interface that communicates with the host. +# Multiple such interfaces defined by the VirtIO specification. FreeBSD +# only has support for PCI. Therefore, virtio_pci must be statically +# compiled in or loaded as a module for the device drivers to function. +# device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI Interface device vtnet # VirtIO Ethernet device Modified: releng/8.4/sys/conf/files.amd64 ============================================================================== --- releng/8.4/sys/conf/files.amd64 Fri Mar 29 02:09:46 2013 (r248861) +++ releng/8.4/sys/conf/files.amd64 Fri Mar 29 02:14:57 2013 (r248862) @@ -357,11 +357,11 @@ dev/virtio/virtio.c optional virtio dev/virtio/virtqueue.c optional virtio dev/virtio/virtio_bus_if.m optional virtio dev/virtio/virtio_if.m optional virtio -dev/virtio/pci/virtio_pci.c optional virtio_pci virtio pci -dev/virtio/network/if_vtnet.c optional vtnet virtio -dev/virtio/block/virtio_blk.c optional virtio_blk virtio -dev/virtio/balloon/virtio_balloon.c optional virtio_balloon virtio -dev/virtio/scsi/virtio_scsi.c optional virtio_scsi virtio scbus +dev/virtio/pci/virtio_pci.c optional virtio_pci +dev/virtio/network/if_vtnet.c optional vtnet +dev/virtio/block/virtio_blk.c optional virtio_blk +dev/virtio/balloon/virtio_balloon.c optional virtio_balloon +dev/virtio/scsi/virtio_scsi.c optional virtio_scsi isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/link_elf_obj.c standard Modified: releng/8.4/sys/conf/files.i386 ============================================================================== --- releng/8.4/sys/conf/files.i386 Fri Mar 29 02:09:46 2013 (r248861) +++ releng/8.4/sys/conf/files.i386 Fri Mar 29 02:14:57 2013 (r248862) @@ -362,11 +362,11 @@ dev/virtio/virtio.c optional virtio dev/virtio/virtqueue.c optional virtio dev/virtio/virtio_bus_if.m optional virtio dev/virtio/virtio_if.m optional virtio -dev/virtio/pci/virtio_pci.c optional virtio_pci virtio pci -dev/virtio/network/if_vtnet.c optional vtnet virtio -dev/virtio/block/virtio_blk.c optional virtio_blk virtio -dev/virtio/balloon/virtio_balloon.c optional virtio_balloon virtio -dev/virtio/scsi/virtio_scsi.c optional virtio_scsi virtio scbus +dev/virtio/pci/virtio_pci.c optional virtio_pci +dev/virtio/network/if_vtnet.c optional vtnet +dev/virtio/block/virtio_blk.c optional virtio_blk +dev/virtio/balloon/virtio_balloon.c optional virtio_balloon +dev/virtio/scsi/virtio_scsi.c optional virtio_scsi i386/acpica/OsdEnvironment.c optional acpi i386/acpica/acpi_machdep.c optional acpi i386/acpica/acpi_wakeup.c optional acpi Modified: releng/8.4/sys/i386/conf/NOTES ============================================================================== --- releng/8.4/sys/i386/conf/NOTES Fri Mar 29 02:09:46 2013 (r248861) +++ releng/8.4/sys/i386/conf/NOTES Fri Mar 29 02:14:57 2013 (r248862) @@ -766,6 +766,13 @@ device glxsb # AMD Geode LX Security B # # VirtIO support +# +# The virtio entry provides a generic bus for use by the device drivers. +# It must be combined with an interface that communicates with the host. +# Multiple such interfaces defined by the VirtIO specification. FreeBSD +# only has support for PCI. Therefore, virtio_pci must be statically +# compiled in or loaded as a module for the device drivers to function. +# device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI Interface device vtnet # VirtIO Ethernet device From owner-svn-src-releng@FreeBSD.ORG Fri Mar 29 21:26:33 2013 Return-Path: Delivered-To: svn-src-releng@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id CC35296C; Fri, 29 Mar 2013 21:26:33 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A495AB56; Fri, 29 Mar 2013 21:26:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2TLQX15044159; Fri, 29 Mar 2013 21:26:33 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2TLQXjD044158; Fri, 29 Mar 2013 21:26:33 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201303292126.r2TLQXjD044158@svn.freebsd.org> From: Glen Barber Date: Fri, 29 Mar 2013 21:26:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r248919 - releng/8.4/release/doc/en_US.ISO8859-1/hardware X-SVN-Group: releng MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the release engineering / security commits to the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Mar 2013 21:26:33 -0000 Author: gjb (doc,ports committer) Date: Fri Mar 29 21:26:33 2013 New Revision: 248919 URL: http://svnweb.freebsd.org/changeset/base/248919 Log: MFC r248857: - Update hardware notes to reflect that amd64 is no longer "young" - Bump copyright year Approved by: re (delphij) Modified: releng/8.4/release/doc/en_US.ISO8859-1/hardware/article.xml Directory Properties: releng/8.4/release/doc/ (props changed) releng/8.4/release/doc/en_US.ISO8859-1/hardware/ (props changed) Modified: releng/8.4/release/doc/en_US.ISO8859-1/hardware/article.xml ============================================================================== --- releng/8.4/release/doc/en_US.ISO8859-1/hardware/article.xml Fri Mar 29 21:23:47 2013 (r248918) +++ releng/8.4/release/doc/en_US.ISO8859-1/hardware/article.xml Fri Mar 29 21:26:33 2013 (r248919) @@ -31,6 +31,7 @@ 2010 2011 2012 + 2013 The &os; Documentation Project @@ -135,20 +136,13 @@ to &intel; EM64T as 64-bit extension technology or IA-32e. - The largest tested memory configuration to date is 64GB. - SMP support has been recently completed and is reasonably - robust. + Both Uniprocessor (UP) and Symmetric Multi-processor (SMP) + configurations are supported. In many respects, &os;/&arch.amd64; is similar to - &os;/&arch.i386;, in terms of drivers supported. There may be - some issues with 64-bit cleanliness in some (particularly - older) drivers. Generally, drivers that already function - correctly on other 64-bit platforms should work. - - &os;/&arch.amd64; is a very young platform on &os;. While - the core &os; kernel and base system components are generally - fairly robust, there are likely to still be rough edges, - particularly with third party packages. + &os;/&arch.i386;, in terms of drivers supported. Generally, + drivers that already function correctly on other 64-bit + platforms should work.