From owner-svn-src-releng@FreeBSD.ORG Sun Dec 22 20:31:41 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 196F8A96; Sun, 22 Dec 2013 20:31:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 04D5016ED; Sun, 22 Dec 2013 20:31:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMKVewQ017621; Sun, 22 Dec 2013 20:31:40 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMKVeeA017620; Sun, 22 Dec 2013 20:31:40 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201312222031.rBMKVeeA017620@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sun, 22 Dec 2013 20:31:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259738 - releng/10.0/sys/cddl/contrib/opensolaris/uts/common/fs/zfs 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.17 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: Sun, 22 Dec 2013 20:31:41 -0000 Author: pjd Date: Sun Dec 22 20:31:40 2013 New Revision: 259738 URL: http://svnweb.freebsd.org/changeset/base/259738 Log: MFC r259734: MFV r258923: 4188 assertion failed in dmu_tx_hold_free(): dn_datablkshift != 0 illumos/illumos-gate@bb411a08b05466bfe0c7095b6373bbc1587e259a Approved by: re (gjb) Modified: releng/10.0/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c ============================================================================== --- releng/10.0/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Dec 22 20:29:59 2013 (r259737) +++ releng/10.0/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c Sun Dec 22 20:31:40 2013 (r259738) @@ -635,9 +635,16 @@ dmu_tx_hold_free(dmu_tx_t *tx, uint64_t uint64_t start = off >> shift; uint64_t end = (off + len) >> shift; - ASSERT(dn->dn_datablkshift != 0); ASSERT(dn->dn_indblkshift != 0); + /* + * dnode_reallocate() can result in an object with indirect + * blocks having an odd data block size. In this case, + * just check the single block. + */ + if (dn->dn_datablkshift == 0) + start = end = 0; + zio = zio_root(tx->tx_pool->dp_spa, NULL, NULL, ZIO_FLAG_CANFAIL); for (uint64_t i = start; i <= end; i++) { From owner-svn-src-releng@FreeBSD.ORG Sun Dec 22 22:20:18 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 867C83FE; Sun, 22 Dec 2013 22:20:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 72E3D1D80; Sun, 22 Dec 2013 22:20:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMMKIX0055438; Sun, 22 Dec 2013 22:20:18 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMMKI54055437; Sun, 22 Dec 2013 22:20:18 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201312222220.rBMMKI54055437@svn.freebsd.org> From: Warner Losh Date: Sun, 22 Dec 2013 22:20:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259746 - releng/10.0/sys/arm/at91 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.17 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: Sun, 22 Dec 2013 22:20:18 -0000 Author: imp Date: Sun Dec 22 22:20:17 2013 New Revision: 259746 URL: http://svnweb.freebsd.org/changeset/base/259746 Log: Merge from stable/10 r259380: MFC r259038, r259039: Bump the maximum VM space from 3 * memory size to a fixed 256MB. That's all we have room for since we map the hardware registers starting at 0xd0000000. This allows my 64MB AT91SAM9G20 to boot again after the unmmaped I/O changes were MFC'd at r251897. Other subplatforms may need similar treatment. Although not strictly required to boot a 64MB board, bump vm_max_virtual_address to be KERNVIRTADDR + 256MB. This allows some future shock protection since the KVA requirements have gone up since the unmapped changes have gone in, as well as preventing us from overlapping with the hardware devices, which we map at 0xd0000000, which we'd hit with anything more than 85MB... Approved by: re@ (gjb@) Modified: releng/10.0/sys/arm/at91/at91_machdep.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/arm/at91/at91_machdep.c ============================================================================== --- releng/10.0/sys/arm/at91/at91_machdep.c Sun Dec 22 21:53:08 2013 (r259745) +++ releng/10.0/sys/arm/at91/at91_machdep.c Sun Dec 22 22:20:17 2013 (r259746) @@ -631,7 +631,8 @@ initarm(struct arm_boot_params *abp) pmap_curmaxkvaddr = afterkern + L1_S_SIZE * (KERNEL_PT_KERN_NUM - 1); arm_dump_avail_init(memsize, sizeof(dump_avail)/sizeof(dump_avail[0])); - vm_max_kernel_address = KERNVIRTADDR + 3 * memsize; + /* Always use the 256MB of KVA we have available between the kernel and devices */ + vm_max_kernel_address = KERNVIRTADDR + (256 << 20); pmap_bootstrap(freemempos, &kernel_l1pt); msgbufp = (void*)msgbufpv.pv_va; msgbufinit(msgbufp, msgbufsize); From owner-svn-src-releng@FreeBSD.ORG Sun Dec 22 22:24:18 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DC0B46CF; Sun, 22 Dec 2013 22:24:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC6451DE5; Sun, 22 Dec 2013 22:24:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMMOHc6057886; Sun, 22 Dec 2013 22:24:17 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMMOHOH057885; Sun, 22 Dec 2013 22:24:17 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201312222224.rBMMOHOH057885@svn.freebsd.org> From: Warner Losh Date: Sun, 22 Dec 2013 22:24:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259747 - releng/10.0/sys/arm/at91 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.17 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: Sun, 22 Dec 2013 22:24:18 -0000 Author: imp Date: Sun Dec 22 22:24:17 2013 New Revision: 259747 URL: http://svnweb.freebsd.org/changeset/base/259747 Log: Merge from stable/10 r259381: MFC r259212, r259220: Fix one race and one fence post error. When the TX buffer was completely full, we'd not complete any of the mbufs due to the fence post error (this creates a large leak). When this is fixed, we still leak, but at a much smaller rate due to a race between ateintr and atestart_locked as well as an asymmetry where atestart_locked is called from elsewhere. Ensure that we free in-flight packets that have completed there as well. Also remove needless check for NULL on mb, checked earlier in the loop and simplify a redundant if. Approved by: re@ (gjb@) Modified: releng/10.0/sys/arm/at91/if_ate.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/arm/at91/if_ate.c ============================================================================== --- releng/10.0/sys/arm/at91/if_ate.c Sun Dec 22 22:20:17 2013 (r259746) +++ releng/10.0/sys/arm/at91/if_ate.c Sun Dec 22 22:24:17 2013 (r259747) @@ -946,10 +946,8 @@ ate_intr(void *xsc) } while (!done); - if (mb != NULL) { - ifp->if_ipackets++; - (*ifp->if_input)(ifp, mb); - } + ifp->if_ipackets++; + (*ifp->if_input)(ifp, mb); } } @@ -973,16 +971,14 @@ ate_intr(void *xsc) sc->tx_descs[sc->txtail + 1].status |= ETHB_TX_USED; } - while (sc->txtail != sc->txhead && - sc->tx_descs[sc->txtail].status & ETHB_TX_USED ) { - + while ((sc->tx_descs[sc->txtail].status & ETHB_TX_USED) && + sc->sent_mbuf[sc->txtail] != NULL) { bus_dmamap_sync(sc->mtag, sc->tx_map[sc->txtail], BUS_DMASYNC_POSTWRITE); bus_dmamap_unload(sc->mtag, sc->tx_map[sc->txtail]); m_freem(sc->sent_mbuf[sc->txtail]); sc->tx_descs[sc->txtail].addr = 0; sc->sent_mbuf[sc->txtail] = NULL; - ifp->if_opackets++; sc->txtail = NEXT_TX_IDX(sc, sc->txtail); } @@ -1117,12 +1113,10 @@ atestart_locked(struct ifnet *ifp) * xmit packets. We use OACTIVE to indicate "we can stuff more * into our buffers (clear) or not (set)." */ - if (!sc->is_emacb) { - /* RM9200 has only two hardware entries */ - if (!sc->is_emacb && (RD4(sc, ETH_TSR) & ETH_TSR_BNQ) == 0) { - ifp->if_drv_flags |= IFF_DRV_OACTIVE; - return; - } + /* RM9200 has only two hardware entries */ + if (!sc->is_emacb && (RD4(sc, ETH_TSR) & ETH_TSR_BNQ) == 0) { + ifp->if_drv_flags |= IFF_DRV_OACTIVE; + return; } IFQ_DRV_DEQUEUE(&ifp->if_snd, m); @@ -1145,6 +1139,21 @@ atestart_locked(struct ifnet *ifp) m_freem(m); continue; } + + /* + * There's a small race between the loop in ate_intr finishing + * and the check above to see if the packet was finished, as well + * as when atestart gets called via other paths. Lose the race + * gracefully and free the mbuf... + */ + if (sc->sent_mbuf[sc->txhead] != NULL) { + bus_dmamap_sync(sc->mtag, sc->tx_map[sc->txtail], + BUS_DMASYNC_POSTWRITE); + bus_dmamap_unload(sc->mtag, sc->tx_map[sc->txtail]); + m_free(sc->sent_mbuf[sc->txhead]); + ifp->if_opackets++; + } + sc->sent_mbuf[sc->txhead] = m; bus_dmamap_sync(sc->mtag, sc->tx_map[sc->txhead], From owner-svn-src-releng@FreeBSD.ORG Sun Dec 22 22:31:40 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E26890D; Sun, 22 Dec 2013 22:31:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 404221E68; Sun, 22 Dec 2013 22:31:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMMVef0061112; Sun, 22 Dec 2013 22:31:40 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMMVeql061111; Sun, 22 Dec 2013 22:31:40 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201312222231.rBMMVeql061111@svn.freebsd.org> From: Warner Losh Date: Sun, 22 Dec 2013 22:31:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259748 - releng/10.0/sys/arm/at91 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.17 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: Sun, 22 Dec 2013 22:31:40 -0000 Author: imp Date: Sun Dec 22 22:31:39 2013 New Revision: 259748 URL: http://svnweb.freebsd.org/changeset/base/259748 Log: Direct commit: not relevant to other branches. Fix mountroot> prompt eating most of the characters by not enabling RXRDY interrupts in the attach routine. Instead, defer this until the first interrupt we see after the device is opened. Given the console use case, we're guaranteed to get a TXRDY interrupt before any reads are posted due to boot messages, which makes this work. The real fix is to use cngrab/cnungrab function pointers to disable RXRDY interrupts while grabbed. However, that touches the MI uart code, so was disallowed for 10.0 due to the lateness of the hour this fix was proposed. It works for mountroot, the most common atmel kernel prompt use cases, but wouldn't work for GELI since it prompts later in the boot process. Approved by: re@ (gjb@) Modified: releng/10.0/sys/arm/at91/uart_dev_at91usart.c Modified: releng/10.0/sys/arm/at91/uart_dev_at91usart.c ============================================================================== --- releng/10.0/sys/arm/at91/uart_dev_at91usart.c Sun Dec 22 22:24:17 2013 (r259747) +++ releng/10.0/sys/arm/at91/uart_dev_at91usart.c Sun Dec 22 22:31:39 2013 (r259748) @@ -72,6 +72,7 @@ struct at91_usart_softc { uint32_t flags; #define HAS_TIMEOUT 0x1 #define USE_RTS0_WORKAROUND 0x2 +#define NEEDS_RXRDY 0x4 bus_dma_tag_t rx_tag; struct at91_usart_rx ping_pong[2]; struct at91_usart_rx *ping; @@ -490,7 +491,13 @@ at91_usart_bus_attach(struct uart_softc WR4(&sc->sc_bas, USART_IER, USART_CSR_TIMEOUT | USART_CSR_RXBUFF | USART_CSR_ENDRX); } else { - WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); + /* + * Defer turning on the RXRDY bit until we're opened. This is to make the + * mountroot prompt work before we've opened the console. This is a workaround + * for not being able to change the UART interface for the 10.0 release. + */ + atsc->flags |= NEEDS_RXRDY; + /* WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); */ } WR4(&sc->sc_bas, USART_IER, USART_CSR_RXBRK | USART_DCE_CHANGE_BITS); @@ -612,6 +619,12 @@ at91_usart_bus_ipend(struct uart_softc * uart_lock(sc->sc_hwmtx); csr = RD4(&sc->sc_bas, USART_CSR); + /* Kludge -- Enable the RXRDY we deferred in attach */ + if (sc->sc_opened && (atsc->flags & NEEDS_RXRDY)) { + WR4(&sc->sc_bas, USART_IER, USART_CSR_RXRDY); + atsc->flags &= ~NEEDS_RXRDY; + } + if (csr & USART_CSR_OVRE) { WR4(&sc->sc_bas, USART_CR, USART_CR_RSTSTA); ipend |= SER_INT_OVERRUN; From owner-svn-src-releng@FreeBSD.ORG Sun Dec 22 22:47:23 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E1E12BD8; Sun, 22 Dec 2013 22:47:23 +0000 (UTC) Received: from h2.funkthat.com (gate2.funkthat.com [208.87.223.18]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 853E21EF6; Sun, 22 Dec 2013 22:47:20 +0000 (UTC) Received: from h2.funkthat.com (localhost [127.0.0.1]) by h2.funkthat.com (8.14.3/8.14.3) with ESMTP id rBMMlJGO006528 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 22 Dec 2013 14:47:19 -0800 (PST) (envelope-from jmg@h2.funkthat.com) Received: (from jmg@localhost) by h2.funkthat.com (8.14.3/8.14.3/Submit) id rBMMlJC3006527; Sun, 22 Dec 2013 14:47:19 -0800 (PST) (envelope-from jmg) Date: Sun, 22 Dec 2013 14:47:18 -0800 From: John-Mark Gurney To: Warner Losh Subject: Re: svn commit: r259748 - releng/10.0/sys/arm/at91 Message-ID: <20131222224718.GO99167@funkthat.com> References: <201312222231.rBMMVeql061111@svn.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201312222231.rBMMVeql061111@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Operating-System: FreeBSD 7.2-RELEASE i386 X-PGP-Fingerprint: 54BA 873B 6515 3F10 9E88 9322 9CB1 8F74 6D3F A396 X-Files: The truth is out there X-URL: http://resnet.uoregon.edu/~gurney_j/ X-Resume: http://resnet.uoregon.edu/~gurney_j/resume.html X-to-the-FBI-CIA-and-NSA: HI! HOW YA DOIN? can i haz chizburger? X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.2 (h2.funkthat.com [127.0.0.1]); Sun, 22 Dec 2013 14:47:19 -0800 (PST) Cc: svn-src-releng@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 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: Sun, 22 Dec 2013 22:47:24 -0000 Warner Losh wrote this message on Sun, Dec 22, 2013 at 22:31 +0000: > The real fix is to use cngrab/cnungrab function pointers to disable > RXRDY interrupts while grabbed. However, that touches the MI uart > code, so was disallowed for 10.0 due to the lateness of the hour this > fix was proposed. It works for mountroot, the most common atmel kernel > prompt use cases, but wouldn't work for GELI since it prompts later in > the boot process. Hmmm, good point about geli, there have been complaints that the geli prompt gets garbled by other output (and I'm anoyed by it too)... Can we solve this w/ grab? How would the console code know the other writers don't have the console grabed? Maybe by thread? -- John-Mark Gurney Voice: +1 415 225 5579 "All that I will do, has been done, All that I have, has not." From owner-svn-src-releng@FreeBSD.ORG Sun Dec 22 23:31: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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E85F794A; Sun, 22 Dec 2013 23:31:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C827111DB; Sun, 22 Dec 2013 23:31:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMNV4I7082559; Sun, 22 Dec 2013 23:31:04 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMNV4w0082558; Sun, 22 Dec 2013 23:31:04 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201312222331.rBMNV4w0082558@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Sun, 22 Dec 2013 23:31:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259752 - releng/10.0/sys/dev/pci 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.17 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: Sun, 22 Dec 2013 23:31:05 -0000 Author: dumbbell Date: Sun Dec 22 23:31:04 2013 New Revision: 259752 URL: http://svnweb.freebsd.org/changeset/base/259752 Log: Merge from stable/10, r259741: vga_pci: Improve boot display detection The previous code was checking the "VGA Enable" bit on the video card's parent PCI-to-PCI bridge only. This didn't work for the case where the video card is attached to the root PCI bus (ie. the card has no parent PCI-to-PCI bridge). Now, the new code: 1. checks the "VGA Enable" bit on the parent bridge only if it's a PCI-to-PCI bridge; 2. always checks the "I/O" and "Memory address space decoding" bits on the video card itself. However, vendor-specific bits are not used. This fixes the use of many integrated Radeon cards: without this patch, we fail to detect them as the boot display and, when radeonkms looks for the Video BIOS, it skips the shadow copy made by the System BIOS. It then fails to fully initialize the card, because the shadow copy is the only way to read the Video BIOS in these situations. A workaround was to force the boot display selection using the "hw.pci.default_vgapci_unit" tunable. A previous version of this patch added a new function doing the checks. Now, the vga_pci_is_boot_display() function is used to perform the checks (only until the boot display is found) and return if the given device is the boot display or not. Furthermore, vga_pci_attach() logs "Boot video device" if the card being attached it the Chosen One: vgapci0: [...] vgapci0: Boot video device Reviewed by: kib@, jhb@ (both a previous version) Tested by: lunatic_ (#freebsd-xorg, integrated Radeon card, xmj (#freebsd-xorg, i915+NVIDIA cards) Approved by: re (gjb) Modified: releng/10.0/sys/dev/pci/vga_pci.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/dev/pci/vga_pci.c ============================================================================== --- releng/10.0/sys/dev/pci/vga_pci.c Sun Dec 22 23:08:33 2013 (r259751) +++ releng/10.0/sys/dev/pci/vga_pci.c Sun Dec 22 23:31:04 2013 (r259752) @@ -81,16 +81,58 @@ SYSCTL_INT(_hw_pci, OID_AUTO, default_vg int vga_pci_is_boot_display(device_t dev) { + int unit; + device_t pcib; + uint16_t config; + + /* Check that the given device is a video card */ + if ((pci_get_class(dev) != PCIC_DISPLAY && + (pci_get_class(dev) != PCIC_OLD || + pci_get_subclass(dev) != PCIS_OLD_VGA))) + return (0); + + unit = device_get_unit(dev); + + if (vga_pci_default_unit >= 0) { + /* + * The boot display device was determined by a previous + * call to this function, or the user forced it using + * the hw.pci.default_vgapci_unit tunable. + */ + return (vga_pci_default_unit == unit); + } /* - * Return true if the given device is the default display used - * at boot time. + * The primary video card used as a boot display must have the + * "I/O" and "Memory Address Space Decoding" bits set in its + * Command register. + * + * Furthermore, if the card is attached to a bridge, instead of + * the root PCI bus, the bridge must have the "VGA Enable" bit + * set in its Control register. */ - return ( - (pci_get_class(dev) == PCIC_DISPLAY || - (pci_get_class(dev) == PCIC_OLD && - pci_get_subclass(dev) == PCIS_OLD_VGA)) && - device_get_unit(dev) == vga_pci_default_unit); + + pcib = device_get_parent(device_get_parent(dev)); + if (device_get_devclass(device_get_parent(pcib)) == + devclass_find("pci")) { + /* + * The parent bridge is a PCI-to-PCI bridge: check the + * value of the "VGA Enable" bit. + */ + config = pci_read_config(pcib, PCIR_BRIDGECTL_1, 2); + if ((config & PCIB_BCR_VGA_ENABLE) == 0) + return (0); + } + + config = pci_read_config(dev, PCIR_COMMAND, 2); + if ((config & (PCIM_CMD_PORTEN | PCIM_CMD_MEMEN)) == 0) + return (0); + + /* This video card is the boot display: record its unit number. */ + vga_pci_default_unit = unit; + device_set_flags(dev, 1); + + return (1); } void * @@ -159,9 +201,6 @@ vga_pci_unmap_bios(device_t dev, void *b static int vga_pci_probe(device_t dev) { - device_t bdev; - int unit; - uint16_t bctl; switch (pci_get_class(dev)) { case PCIC_DISPLAY: @@ -175,13 +214,7 @@ vga_pci_probe(device_t dev) } /* Probe default display. */ - unit = device_get_unit(dev); - bdev = device_get_parent(device_get_parent(dev)); - bctl = pci_read_config(bdev, PCIR_BRIDGECTL_1, 2); - if (vga_pci_default_unit < 0 && (bctl & PCIB_BCR_VGA_ENABLE) != 0) - vga_pci_default_unit = unit; - if (vga_pci_default_unit == unit) - device_set_flags(dev, 1); + vga_pci_is_boot_display(dev); device_set_desc(dev, "VGA-compatible display"); return (BUS_PROBE_GENERIC); @@ -197,6 +230,10 @@ vga_pci_attach(device_t dev) device_add_child(dev, "drm", -1); device_add_child(dev, "drmn", -1); bus_generic_attach(dev); + + if (vga_pci_is_boot_display(dev)) + device_printf(dev, "Boot video device\n"); + return (0); } From owner-svn-src-releng@FreeBSD.ORG Sun Dec 22 23:41:15 2013 Return-Path: Delivered-To: svn-src-releng@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 E3F95CBB; Sun, 22 Dec 2013 23:41:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C3B401288; Sun, 22 Dec 2013 23:41:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMNfFHI086149; Sun, 22 Dec 2013 23:41:15 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMNfF9h086144; Sun, 22 Dec 2013 23:41:15 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201312222341.rBMNfF9h086144@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Sun, 22 Dec 2013 23:41:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259754 - in releng/10.0/sys/dev/drm2: radeon ttm 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.17 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: Sun, 22 Dec 2013 23:41:16 -0000 Author: dumbbell Date: Sun Dec 22 23:41:14 2013 New Revision: 259754 URL: http://svnweb.freebsd.org/changeset/base/259754 Log: Merge from stable/10, r259742: drm/ttm, drm/radeon: Replace EINTR/ERESTART by ERESTARTSYS... ... for msleep/cv_*wait() return values, where wait_event*() is used on Linux. ERESTARTSYS is the return code expected by callers when the operation was interrupted. For instance, this is the case of radeon_cs_ioctl() (radeon_cs.c): if an error occurs, and the code isn't ERESTARTSYS (eg. EINTR), it logs an error. Note that ERESTARTSYS is defined as ERESTART, but this keeps callers' code close to Linux. Submitted by: avg@ (previous version) Approved by: re (gjb) Modified: releng/10.0/sys/dev/drm2/radeon/radeon_fence.c releng/10.0/sys/dev/drm2/radeon/radeon_sa.c releng/10.0/sys/dev/drm2/ttm/ttm_bo.c releng/10.0/sys/dev/drm2/ttm/ttm_lock.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/dev/drm2/radeon/radeon_fence.c ============================================================================== --- releng/10.0/sys/dev/drm2/radeon/radeon_fence.c Sun Dec 22 23:33:27 2013 (r259753) +++ releng/10.0/sys/dev/drm2/radeon/radeon_fence.c Sun Dec 22 23:41:14 2013 (r259754) @@ -321,6 +321,8 @@ static int radeon_fence_wait_seq(struct &rdev->fence_queue_mtx, timeout); } + if (r == EINTR) + r = ERESTARTSYS; if (r != 0) { if (r == EWOULDBLOCK) { signaled = @@ -334,7 +336,7 @@ static int radeon_fence_wait_seq(struct mtx_unlock(&rdev->fence_queue_mtx); } radeon_irq_kms_sw_irq_put(rdev, ring); - if (unlikely(r == EINTR || r == ERESTART)) { + if (unlikely(r == ERESTARTSYS)) { return -r; } CTR2(KTR_DRM, "radeon fence: wait end (ring=%d, seq=%d)", @@ -514,6 +516,8 @@ static int radeon_fence_wait_any_seq(str &rdev->fence_queue_mtx, timeout); } + if (r == EINTR) + r = ERESTARTSYS; if (r != 0) { if (r == EWOULDBLOCK) { signaled = @@ -531,7 +535,7 @@ static int radeon_fence_wait_any_seq(str radeon_irq_kms_sw_irq_put(rdev, i); } } - if (unlikely(r == EINTR || r == ERESTART)) { + if (unlikely(r == ERESTARTSYS)) { return -r; } CTR2(KTR_DRM, "radeon fence: wait end (ring=%d, target_seq=%d)", Modified: releng/10.0/sys/dev/drm2/radeon/radeon_sa.c ============================================================================== --- releng/10.0/sys/dev/drm2/radeon/radeon_sa.c Sun Dec 22 23:33:27 2013 (r259753) +++ releng/10.0/sys/dev/drm2/radeon/radeon_sa.c Sun Dec 22 23:41:14 2013 (r259754) @@ -363,6 +363,8 @@ int radeon_sa_bo_new(struct radeon_devic while (!radeon_sa_event(sa_manager, size, align)) { r = -cv_wait_sig(&sa_manager->wq, &sa_manager->wq_lock); + if (r == -EINTR) + r = -ERESTARTSYS; if (r != 0) break; } Modified: releng/10.0/sys/dev/drm2/ttm/ttm_bo.c ============================================================================== --- releng/10.0/sys/dev/drm2/ttm/ttm_bo.c Sun Dec 22 23:33:27 2013 (r259753) +++ releng/10.0/sys/dev/drm2/ttm/ttm_bo.c Sun Dec 22 23:41:14 2013 (r259754) @@ -147,6 +147,8 @@ ttm_bo_wait_unreserved_locked(struct ttm } while (ttm_bo_is_reserved(bo)) { ret = -msleep(bo, &bo->glob->lru_lock, flags, wmsg, 0); + if (ret == -EINTR) + ret = -ERESTARTSYS; if (ret != 0) break; } Modified: releng/10.0/sys/dev/drm2/ttm/ttm_lock.c ============================================================================== --- releng/10.0/sys/dev/drm2/ttm/ttm_lock.c Sun Dec 22 23:33:27 2013 (r259753) +++ releng/10.0/sys/dev/drm2/ttm/ttm_lock.c Sun Dec 22 23:41:14 2013 (r259754) @@ -107,6 +107,8 @@ ttm_read_lock(struct ttm_lock *lock, boo mtx_lock(&lock->lock); while (!__ttm_read_lock(lock)) { ret = msleep(lock, &lock->lock, flags, wmsg, 0); + if (ret == EINTR) + ret = ERESTARTSYS; if (ret != 0) break; } @@ -151,6 +153,8 @@ int ttm_read_trylock(struct ttm_lock *lo mtx_lock(&lock->lock); while (!__ttm_read_trylock(lock, &locked)) { ret = msleep(lock, &lock->lock, flags, wmsg, 0); + if (ret == EINTR) + ret = ERESTARTSYS; if (ret != 0) break; } @@ -204,6 +208,8 @@ ttm_write_lock(struct ttm_lock *lock, bo /* XXXKIB: linux uses __ttm_read_lock for uninterruptible sleeps */ while (!__ttm_write_lock(lock)) { ret = msleep(lock, &lock->lock, flags, wmsg, 0); + if (ret == EINTR) + ret = ERESTARTSYS; if (interruptible && ret != 0) { lock->flags &= ~TTM_WRITE_LOCK_PENDING; wakeup(lock); @@ -280,6 +286,8 @@ int ttm_vt_lock(struct ttm_lock *lock, mtx_lock(&lock->lock); while (!__ttm_vt_lock(lock)) { ret = msleep(lock, &lock->lock, flags, wmsg, 0); + if (ret == EINTR) + ret = ERESTARTSYS; if (interruptible && ret != 0) { lock->flags &= ~TTM_VT_LOCK_PENDING; wakeup(lock); From owner-svn-src-releng@FreeBSD.ORG Sun Dec 22 23:52:11 2013 Return-Path: Delivered-To: svn-src-releng@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 BDD57E8F; Sun, 22 Dec 2013 23:52:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A907D1319; Sun, 22 Dec 2013 23:52:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBMNqBux089697; Sun, 22 Dec 2013 23:52:11 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBMNqBUE089696; Sun, 22 Dec 2013 23:52:11 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201312222352.rBMNqBUE089696@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Sun, 22 Dec 2013 23:52:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259755 - releng/10.0/sys/dev/drm2 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.17 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: Sun, 22 Dec 2013 23:52:11 -0000 Author: dumbbell Date: Sun Dec 22 23:52:11 2013 New Revision: 259755 URL: http://svnweb.freebsd.org/changeset/base/259755 Log: Merge from stable/10, r259745: drm: Lower priority of "EDID checksum is invalid" message The priority goes from "error" to "debug". Connectors are polled every 10 seconds. Reading EDID is part of this polling. However, when an invalid EDID is returned, this error message is logged. When using Newcons for instance, having a kernel message every 10 seconds is getting annoying. Now that it's a debug message, it'll be logged only if hw.dri.debug is enabled. This fix console spamming for some users. Tested by: Larry Rosenman Approved by: re (gjb) Modified: releng/10.0/sys/dev/drm2/drm_edid.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/sys/dev/drm2/drm_edid.c ============================================================================== --- releng/10.0/sys/dev/drm2/drm_edid.c Sun Dec 22 23:41:14 2013 (r259754) +++ releng/10.0/sys/dev/drm2/drm_edid.c Sun Dec 22 23:52:11 2013 (r259755) @@ -171,7 +171,7 @@ drm_edid_block_valid(u8 *raw_edid) for (i = 0; i < EDID_LENGTH; i++) csum += raw_edid[i]; if (csum) { - DRM_ERROR("EDID checksum is invalid, remainder is %d\n", csum); + DRM_DEBUG("EDID checksum is invalid, remainder is %d\n", csum); /* allow CEA to slide through, switches mangle this */ if (raw_edid[0] != 0x02) From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 01:15:55 2013 Return-Path: Delivered-To: svn-src-releng@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 A3BE784D; Mon, 23 Dec 2013 01:15:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8F9981820; Mon, 23 Dec 2013 01:15:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBN1FtGZ020015; Mon, 23 Dec 2013 01:15:55 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBN1FtJF020014; Mon, 23 Dec 2013 01:15:55 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201312230115.rBN1FtJF020014@svn.freebsd.org> From: Gleb Smirnoff Date: Mon, 23 Dec 2013 01:15:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259757 - releng/10.0/sys/netgraph 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.17 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: Mon, 23 Dec 2013 01:15:55 -0000 Author: glebius Date: Mon Dec 23 01:15:55 2013 New Revision: 259757 URL: http://svnweb.freebsd.org/changeset/base/259757 Log: Revert one line from r248885, which uncovered several bugs in processing interaction between ksocket_incoming2() and soreceive(). This is direct commit to releng/10.0. A conservative solution for releng branch. Proper fix in head is r259681. PR: 184601 Sponsored by: Nginx, Inc. Approved by: re (gjb) Modified: releng/10.0/sys/netgraph/ng_ksocket.c Modified: releng/10.0/sys/netgraph/ng_ksocket.c ============================================================================== --- releng/10.0/sys/netgraph/ng_ksocket.c Mon Dec 23 00:02:18 2013 (r259756) +++ releng/10.0/sys/netgraph/ng_ksocket.c Mon Dec 23 01:15:55 2013 (r259757) @@ -1095,7 +1095,7 @@ ng_ksocket_incoming2(node_p node, hook_p /* Read and forward available mbuf's */ auio.uio_td = NULL; - auio.uio_resid = MJUMPAGESIZE; /* XXXGL: sane limit? */ + auio.uio_resid = 1000000000; flags = MSG_DONTWAIT; while (1) { struct sockaddr *sa = NULL; From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 01:24:22 2013 Return-Path: Delivered-To: svn-src-releng@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 ED33C9B9; Mon, 23 Dec 2013 01:24:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D8D52188C; Mon, 23 Dec 2013 01:24:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBN1OLjK023325; Mon, 23 Dec 2013 01:24:21 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBN1OLMH023322; Mon, 23 Dec 2013 01:24:21 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201312230124.rBN1OLMH023322@svn.freebsd.org> From: Hiroki Sato Date: Mon, 23 Dec 2013 01:24:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259758 - in releng/10.0: . crypto/heimdal/lib/gssapi/krb5 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.17 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: Mon, 23 Dec 2013 01:24:22 -0000 Author: hrs Date: Mon Dec 23 01:24:21 2013 New Revision: 259758 URL: http://svnweb.freebsd.org/changeset/base/259758 Log: MFS r249447: Apply patch from upstream Heimdal for encoding fix RFC 4402 specifies the implementation of the gss_pseudo_random() function for the krb5 mechanism (and the C bindings therein). The implementation uses a PRF+ function that concatenates the output of individual krb5 pseudo-random operations produced with a counter and seed. The original implementation of this function in Heimdal incorrectly encoded the counter as a little-endian integer, but the RFC specifies the counter encoding as big-endian. The implementation initializes the counter to zero, so the first block of output (16 octets, for the modern AES enctypes 17 and 18) is unchanged. (RFC 4402 specifies that the counter should begin at 1, but both existing implementations begin with zero and it looks like the standard will be re-issued, with test vectors, to begin at zero.) This is upstream's commit f85652af868e64811f2b32b815d4198e7f9017f6, from 13 October, 2013: % Fix krb5's gss_pseudo_random() (n is big-endian) % % The first enctype RFC3961 prf output length's bytes are correct because % the little- and big-endian representations of unsigned zero are the % same. The second block of output was wrong because the counter was not % being encoded as big-endian. % % This change could break applications. But those applications would not % have been interoperating with other implementations anyways (in % particular: MIT's). Approved by: re (gjb) Modified: releng/10.0/UPDATING releng/10.0/crypto/heimdal/lib/gssapi/krb5/prf.c Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/UPDATING ============================================================================== --- releng/10.0/UPDATING Mon Dec 23 01:15:55 2013 (r259757) +++ releng/10.0/UPDATING Mon Dec 23 01:24:21 2013 (r259758) @@ -16,6 +16,16 @@ from older versions of FreeBSD, try WITH stable/10, and then rebuild without this option. The bootstrap process from older version of current is a bit fragile. +20131223: + The behavior of gss_pseudo_random() for the krb5 mechanism + has changed, for applications requesting a longer random string + than produced by the underlying enctype's pseudo-random() function. + In particular, the random string produced from a session key of + enctype aes256-cts-hmac-sha1-96 or aes256-cts-hmac-sha1-96 will + be different at the 17th octet and later, after this change. + The counter used in the PRF+ construction is now encoded as a + big-endian integer in accordance with RFC 4402. + 20131031: The default version of mtree is nmtree which is obtained from NetBSD. The output is generally the same, but may vary Modified: releng/10.0/crypto/heimdal/lib/gssapi/krb5/prf.c ============================================================================== --- releng/10.0/crypto/heimdal/lib/gssapi/krb5/prf.c Mon Dec 23 01:15:55 2013 (r259757) +++ releng/10.0/crypto/heimdal/lib/gssapi/krb5/prf.c Mon Dec 23 01:24:21 2013 (r259758) @@ -119,7 +119,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_ while(dol > 0) { size_t tsize; - _gsskrb5_encode_om_uint32(num, input.data); + _gsskrb5_encode_be_om_uint32(num, input.data); ret = krb5_crypto_prf(context, crypto, &input, &output); if (ret) { @@ -133,7 +133,7 @@ _gsskrb5_pseudo_random(OM_uint32 *minor_ tsize = min(dol, output.length); memcpy(p, output.data, tsize); - p += output.length; + p += tsize; dol -= tsize; krb5_data_free(&output); num++; From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 04:42:13 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3ABA6875; Mon, 23 Dec 2013 04:42:13 +0000 (UTC) Received: from mail-qa0-x235.google.com (mail-qa0-x235.google.com [IPv6:2607:f8b0:400d:c00::235]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AFD3F170A; Mon, 23 Dec 2013 04:42:09 +0000 (UTC) Received: by mail-qa0-f53.google.com with SMTP id j5so4720564qaq.12 for ; Sun, 22 Dec 2013 20:42:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=qKTcjsJISaY8S8Auhu+kVhq3p6Cf7SRNiFpcVO5hkco=; b=TWHQreh1wHEAJ7+Ae15sjflJDljotBvzaf1uJbqhUNmRZAAKo0E6WZEJ4s1hb9gfyy v1ocATZes4zwUbJRb/7zXYqa4hXtXb8u6D3NaWhwOVc27ExZeE53DVinxWrIBb65VLXd N4CURZVuA7PuhBW8CNh+jww1x7jhwKm/puhCD/fceeCBRF8dDvbAaVwjEo1LzTA95ec7 sVBDHH3BX8XIogT9ZcqmbM2zQNAhObNN0bKO8Wsv3mfuJaQ2P3BC03UxaeTJ8nPlfUjZ zpw7x511AxhA/Wyh4LyyqFbq4GtOaRT9JiJGCe+CNi5o0HR1H4zdwclSz2LKYr8TMsvD fesA== MIME-Version: 1.0 X-Received: by 10.224.16.204 with SMTP id p12mr38715469qaa.26.1387773728873; Sun, 22 Dec 2013 20:42:08 -0800 (PST) Sender: adrian.chadd@gmail.com Received: by 10.224.53.200 with HTTP; Sun, 22 Dec 2013 20:42:08 -0800 (PST) In-Reply-To: <201312222220.rBMMKI54055437@svn.freebsd.org> References: <201312222220.rBMMKI54055437@svn.freebsd.org> Date: Sun, 22 Dec 2013 20:42:08 -0800 X-Google-Sender-Auth: g9MuECEdNJ5GGAORmC-0S61Zr0k Message-ID: Subject: Re: svn commit: r259746 - releng/10.0/sys/arm/at91 From: Adrian Chadd To: Warner Losh Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-releng@freebsd.org, "svn-src-all@freebsd.org" , "src-committers@freebsd.org" X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 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: Mon, 23 Dec 2013 04:42:13 -0000 Are there any compile and/or run time checks to ensure that memory regions aren't overlapping and to bitch if they are? -a On 22 December 2013 14:20, Warner Losh wrote: > Author: imp > Date: Sun Dec 22 22:20:17 2013 > New Revision: 259746 > URL: http://svnweb.freebsd.org/changeset/base/259746 > > Log: > Merge from stable/10 r259380: > > MFC r259038, r259039: > > Bump the maximum VM space from 3 * memory size to a fixed > 256MB. That's all we have room for since we map the hardware registers > starting at 0xd0000000. This allows my 64MB AT91SAM9G20 to boot again > after the unmmaped I/O changes were MFC'd at r251897. Other > subplatforms may need similar treatment. > > Although not strictly required to boot a 64MB board, bump > vm_max_virtual_address to be KERNVIRTADDR + 256MB. This allows some > future shock protection since the KVA requirements have gone up since > the unmapped changes have gone in, as well as preventing us from > overlapping with the hardware devices, which we map at 0xd0000000, > which we'd hit with anything more than 85MB... > > Approved by: re@ (gjb@) > > Modified: > releng/10.0/sys/arm/at91/at91_machdep.c > Directory Properties: > releng/10.0/ (props changed) > > Modified: releng/10.0/sys/arm/at91/at91_machdep.c > ============================================================================== > --- releng/10.0/sys/arm/at91/at91_machdep.c Sun Dec 22 21:53:08 2013 (r259745) > +++ releng/10.0/sys/arm/at91/at91_machdep.c Sun Dec 22 22:20:17 2013 (r259746) > @@ -631,7 +631,8 @@ initarm(struct arm_boot_params *abp) > > pmap_curmaxkvaddr = afterkern + L1_S_SIZE * (KERNEL_PT_KERN_NUM - 1); > arm_dump_avail_init(memsize, sizeof(dump_avail)/sizeof(dump_avail[0])); > - vm_max_kernel_address = KERNVIRTADDR + 3 * memsize; > + /* Always use the 256MB of KVA we have available between the kernel and devices */ > + vm_max_kernel_address = KERNVIRTADDR + (256 << 20); > pmap_bootstrap(freemempos, &kernel_l1pt); > msgbufp = (void*)msgbufpv.pv_va; > msgbufinit(msgbufp, msgbufsize); From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 16:00:29 2013 Return-Path: Delivered-To: svn-src-releng@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 BCEF6414 for ; Mon, 23 Dec 2013 16:00:29 +0000 (UTC) Received: from mail-ig0-f178.google.com (mail-ig0-f178.google.com [209.85.213.178]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8544A17C2 for ; Mon, 23 Dec 2013 16:00:29 +0000 (UTC) Received: by mail-ig0-f178.google.com with SMTP id ut6so13467390igb.5 for ; Mon, 23 Dec 2013 08:00:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:mime-version:content-type:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=JpjqAuxatEvfk9S0rcqD7vsM71gsBWt149wHS2ABCic=; b=Vu7tTuEqfLAfglcX41rs9q7Md7NBmRqeV8bZrNi5xBmKGezY7XxUEOwWkIlr1Y42A8 YCvZ0I50NFgpMRwj+1PpVlO2/oLKhZZm1bcvAYfdvnCK5KMekJkZE+JfPbq1KmYB57Iz cYAKRlynMiOpbkBpxQRCEV6g7tdnnDQaoDllCcIq/V/V5ejknvEOHSSqlmTzodRpXQgA cqH1CFK0nzxCBErHjdqaE2wpB4xId7BedccRcb59Qt2SGF+JwkajO7RBovphZ+vZcEbl KQq3/8zYkUxLznnGNBbfRviZpDiX1DJB6R5SnciVMnFcI0FUGnK1mMV7+ssrrbPYcRVf ka+g== X-Gm-Message-State: ALoCoQkduzSrrN9Tthw+JviWrV/kaG3VL3ruVfh1aZvz+uFSBWd0NTxdfOcgJ9Ej8uWeMsbMtSbb X-Received: by 10.43.77.212 with SMTP id zj20mr17281344icb.5.1387814422994; Mon, 23 Dec 2013 08:00:22 -0800 (PST) Received: from fusion-mac.bsdimp.com (50-78-194-198-static.hfc.comcastbusiness.net. [50.78.194.198]) by mx.google.com with ESMTPSA id ml2sm20627234igb.10.2013.12.23.08.00.21 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 23 Dec 2013 08:00:22 -0800 (PST) Sender: Warner Losh Subject: Re: svn commit: r259748 - releng/10.0/sys/arm/at91 Mime-Version: 1.0 (Apple Message framework v1085) Content-Type: text/plain; charset=us-ascii From: Warner Losh In-Reply-To: <20131222224718.GO99167@funkthat.com> Date: Mon, 23 Dec 2013 09:00:20 -0700 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201312222231.rBMMVeql061111@svn.freebsd.org> <20131222224718.GO99167@funkthat.com> To: John-Mark Gurney X-Mailer: Apple Mail (2.1085) Cc: svn-src-releng@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Warner Losh X-BeenThere: svn-src-releng@freebsd.org X-Mailman-Version: 2.1.17 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: Mon, 23 Dec 2013 16:00:29 -0000 On Dec 22, 2013, at 3:47 PM, John-Mark Gurney wrote: > Warner Losh wrote this message on Sun, Dec 22, 2013 at 22:31 +0000: >> The real fix is to use cngrab/cnungrab function pointers to disable >> RXRDY interrupts while grabbed. However, that touches the MI uart >> code, so was disallowed for 10.0 due to the lateness of the hour = this >> fix was proposed. It works for mountroot, the most common atmel = kernel >> prompt use cases, but wouldn't work for GELI since it prompts later = in >> the boot process. >=20 > Hmmm, good point about geli, there have been complaints that the geli > prompt gets garbled by other output (and I'm anoyed by it too)... >=20 > Can we solve this w/ grab? How would the console code know the other > writers don't have the console grabed? Maybe by thread? cngrab/cnungrab was meant to toggle between userland and kernel use of = the console for input in rare cases. Contention doesn't seem to be = covered at all, but could be... Warner From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 19:04:14 2013 Return-Path: Delivered-To: svn-src-releng@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 BBA6E62F; Mon, 23 Dec 2013 19:04:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A845F1620; Mon, 23 Dec 2013 19:04:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNJ4E4j000205; Mon, 23 Dec 2013 19:04:14 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNJ4EfV000204; Mon, 23 Dec 2013 19:04:14 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312231904.rBNJ4EfV000204@svn.freebsd.org> From: Glen Barber Date: Mon, 23 Dec 2013 19:04:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259778 - releng/10.0/sys/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.17 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: Mon, 23 Dec 2013 19:04:14 -0000 Author: gjb Date: Mon Dec 23 19:04:14 2013 New Revision: 259778 URL: http://svnweb.freebsd.org/changeset/base/259778 Log: Update releng/10.0 to -RC3 as part of the 10.0-RELEASE cycle. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/sys/conf/newvers.sh Modified: releng/10.0/sys/conf/newvers.sh ============================================================================== --- releng/10.0/sys/conf/newvers.sh Mon Dec 23 18:09:10 2013 (r259777) +++ releng/10.0/sys/conf/newvers.sh Mon Dec 23 19:04:14 2013 (r259778) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="10.0" -BRANCH="RC2" +BRANCH="RC3" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 20:21: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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D1B1CE7F; Mon, 23 Dec 2013 20:21:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B1C331D74; Mon, 23 Dec 2013 20:21:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNKLkFG029218; Mon, 23 Dec 2013 20:21:46 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNKLkIO029217; Mon, 23 Dec 2013 20:21:46 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312232021.rBNKLkIO029217@svn.freebsd.org> From: Glen Barber Date: Mon, 23 Dec 2013 20:21:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259786 - releng/10.0/release/doc/en_US.ISO8859-1/relnotes 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.17 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: Mon, 23 Dec 2013 20:21:47 -0000 Author: gjb Date: Mon Dec 23 20:21:46 2013 New Revision: 259786 URL: http://svnweb.freebsd.org/changeset/base/259786 Log: MFstable10 r259277, r259494, r259577, r259768, r259783: r259277 (rodrigc): Mention BIND removal in release notes. r259494 (rodrigc): Add OFED and Mellanox items to release notes. Add release note items from Chelsio. r259577 (rodrigc): Add SVN revision numbers for Mellanox updates. Add SVN revision numbers for Chelsio updates. Indent. r259768 (rodrigc): Merge release note updates. r259783 (rodrigc): Mention jemalloc upgrade to 3.4.0 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Dec 23 20:20:46 2013 (r259785) +++ releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Dec 23 20:21:46 2013 (r259786) @@ -120,7 +120,12 @@ Kernel Changes - The maximum amount of memory the &os; kernel + The use of unmapped VMIO buffers eliminates the need to perform + TLB shootdown for mapping on buffer creation and reuse, greatly reducing the + amount of IPIs for shootdown on big-SMP machines and eliminating up to 25-30% + of the system time on i/o intensive workloads. + + The maximum amount of memory the &os; kernel can address has been increased from 1TB to 4TB. A new &man.cpuset.2; API has been added @@ -172,6 +177,73 @@ scheduler is now the default process scheduler in GENERIC kernels. + Support was added for + the new Intel on-CPU Bull Mountain random number + generator, found on IvyBridge and supposedly later CPUs, + accessible with RDRAND instruction. + + + Virtualization support + The BSD Hypervisor, &man.bhyve.8; is included + with &os;. &man.bhyve.8; requires Intel CPUs with VT-x and Extended Page Table (EPT) + support. These features are on all Nehalem models and beyond + (e.g. Nehalem and newer), but not on the lower-end Atom CPUs. + + &man.virtio.4; support has been added. &man.virtio.4; is the + name for the paravirtualization interface developed for the Linux KVM, but + since adopted to other virtual machine hypervisors (with the notable exception of Xen). + This work brings in a BSD-licensed clean-room implementation of the virtio kernel drivers + for disk IO (&man.virtio_blk.4; and &man.virtio_scsi.4;), network IO (&man.vtnet.4;), + memory ballooning (&man.virtio_balloon.4;), and PCI. + Tested with on Qemu/KVM, VirtualBox, and &man.bhyve.4;. + + Paravirtualized drivers which + support Microsoft Hyper-V have been imported and made + part of the amd64 GENERIC kernel. For i386, these drivers are not part of + GENERIC, so the following lines must be added to + /boot/loader.conf to load these drivers: + hv_ata_pci_disengage_load="YES" +hv_netsvc_load="YES" +hv_utils_load="YES" +hv_vmbus_load="YES" Alternatively, the Hyper-V drivers can be added to the i386 + kernel by adding device hyperv to the kernel config, and then + recompiling the kernel. + + The &man.vmx.4; driver has been added. + &man.vmx.4; is a VMware VMXNET3 ethernet driver ported from + OpenBSD. + + Xen PVHVM virtualization is now + part of the GENERIC kernel. + + + + + ARM support + + Raspberry PI support has been added. + Refer to these setup instructions + and quick start + guide. + + The default ABI on ARM is now the ARM EABI. This brings a number of + improvements and allows future support for VFP and Thumb-2. + + ARM support has been greatly improved, including support + for ARMv6 and ARMv7, SMP and thread-local storage (TLS). + Additionally support for some newer SoC like the MV78x60 and OMAP4 was added. + See this announcement + for further details. + + Superpages support on ARM has been added. Superpages support + provides improved performance and scalability by allowing TLB + translations to dynamically cover large physical memory regions. + All ARMv6 and ARMv7-based platforms can take advantage of this feature. + See this page + for further details. + + + Boot Loader Changes @@ -204,7 +276,7 @@ Multimedia Support - Support for version 2.0 of the USB Audio reference design + Support for version 2.0 of the USB Audio reference design has been added. New devices should support higher bandwidth, increased sampling frequency and wider dynamic range. @@ -248,27 +320,55 @@ The &man.wpi.4; driver has been updated to include a number of stability fixes. + The &man.cxgbe.4; driver has been updated to support + 40G/10G Ethernet NICs based on Chelsio's Terminator 5 (T5) ASIC. + + The iw_cxgbe driver has been added. This is an + experimental iWARP/RDMA driver + (kernel verbs only) for Chelsio's T4 and T5 based cards. + + The Open Fabrics Enterprise Distribution (OFED) and + OFED Infiniband core has been + updated to the same version as supplied by Linux version 3.7 + + The Mellanox Infiniband driver has been updated to firmware + version 2.30.3200 for ConnectX3 NICs. Support has been added for ConnectX3 VPI NICs, where + each port can be used as Infiniband 56 GB/s or Ethernet 40 GB/s. Support has been added + for dynamically loading kernel modules for Infiniband core (ibcore) and + IP over Infiniband (ipoib). + + &man.netmap.4; has been added. &man.netmap.4; is a framework for + high-performance direct-to-hardware packet IO, offering low latency and high PPS + rates to userland applications while bypassing any kernel-side packet processing. + With &man.netmap.4; it is trivially possible to fully saturate a 10 Gbps network interface with + minimal packet sizes. For more information, see: + Netmap Project. + Network Protocols - &man.carp.4; has been rewritten to make addresses + &man.carp.4; has been rewritten to make addresses more sane from the viewpoint of routing daemons such as quagga/zebra. It also brings support for a single redundant address on the subnet (carpdev), switching state with - ifconfig, better locking and using modern kernel - interfaces to allocate multicast memberships. + &man.ifconfig.8;, better locking and using modern kernel + interfaces to allocate multicast memberships. + Configuration of the CARP protocol via &man.ifconfig.8; has changed, as well as format + of CARP events submitted to &man.devd.8; has changed. See &man.carp.4; + for more information. The arpbalance feature of &man.carp.4; is currently + not supported anymore. - The &man.pf.4; firewall now supports fine-grain locking + The &man.pf.4; firewall now supports fine-grain locking and better utilization on multi-cpu machines resulting in significant improvements in performance. - Support for up to 65536 routing tables has been + Support for up to 65536 routing tables has been introduced. - Support for setting/matching differentiated services + Support for setting/matching differentiated services codepoints (DSCP) in IP header has been added to &man.ipfw.8;. @@ -290,36 +390,64 @@ The &man.hptrr.4; driver has been updated to version 1.2 from Highpoint. + &man.nvme.4; has been added and provides NVM Express support. + NVM Express is an optimized register interface, command set and feature set of + PCI Express (PCIe)-based Solid-State Drives (SSDs). For more information, + see nvmexpress.org. + File Systems - A new kernel-based iSCSI target and initiator has been + A new kernel-based iSCSI target and initiator has been added - UFS filesystems can now be enlarged with &man.growfs.8; while + UFS filesystems can now be enlarged with &man.growfs.8; while mounted read-write. This is especially useful for virtual machines, allowing the addition of more harddrive space without interruption of service. - A state of the art FUSE implementation is now part of the + A state of the art FUSE implementation is now part of the base system. It allows the use of nearly all fusefs file systems - Support for the high performance LZ4 compression algorithm - has been added to ZFS. LZ4 is usually faster and can achieve a - higher compression ratio than LZJB, the default compression - algorithm - - Support for L2ARC compression has been added to ZFS. - - ZFS will now compare the checksums of incoming writes to - the checksum of the existing on-disk data and avoid issuing any - write I/O for data that has not changed. This will reduce I/O - as well as space usage because if the old block is referenced - by a snapshot, both copies of the block are kept even though - both contain the same data. + + ZFS + + &man.bsdinstall.8; now supports installing + ZFS on the root file system. It includes a single configuration menu + that allows you to select all of the required details, including + which drives to use, what ZFS RAID level to use (taking into consideration + the selected number of drives), GPT or MBR, GELI encryption, forcing 4K sectors, + pool name, etc. + + TRIM support has been added for + ZFS. + + Support for the high performance LZ4 compression algorithm + has been added to ZFS. LZ4 is usually faster and can achieve a + higher compression ratio than LZJB, the default compression + algorithm + + Support for L2ARC compression has been added to ZFS. + + The zio nop-write improvement from Illumos + was imported into &os;. To reduce I/O, nop-write skips overwriting + data if the checksum (cryptographically secure) of new data + matches the checksum of existing data. It also saves space if + snapshots are in use. This improvement only works only on + datasets with enabled compression, disabled deduplication and + sha256 checksums. + + ZFS will now compare the checksums of incoming writes to + the checksum of the existing on-disk data and avoid issuing any + write I/O for data that has not changed. This will reduce I/O + as well as space usage because if the old block is referenced + by a snapshot, both copies of the block are kept even though + both contain the same data. + + @@ -328,6 +456,51 @@ Userland Changes + On platforms where &man.clang.1; is the default + system compiler, (such as i386, amd64, arm) GCC and GNU libstdc++ are no + longer built by default. &man.clang.1; and libc++ from LLVM are used on + these platforms by instead. GCC 4.2.1 and libstdc++ are still built + and used by default on pc98 and all other platforms where &man.clang.1; + is not the default system compiler. + + + &man.clang.1; and llvm have been updated to + version 3.3 release. Please refer to + + Clang 3.3 Release Notes. + + BIND has been replaced by &man.unbound.8; for + local dns resolution in the base system. With this change, nslookup + and dig are no longer a part of the base system. Users should + instead use &man.host.1; and &man.drill.1; Alternatively, + nslookup and dig can be obtained by installing the + dns/bind-tools port. + + sysinstall has been removed from the base system. + Auxiliary libraries and tools used by sysinstall such as libdisk, libftpio, + and sade have also been removed. sysinstall has been replaced by + &man.bsdinstall.8; and &man.bsdconfig.8;. + + &man.freebsd-version.1; has been added. This tool + makes a best effort to determine the version and patch level of + the installed kernel and userland. + + GNU patch has been removed from the base system, and replaced + by a BSD-licensed &man.patch.1; program. + + GNU sort has been removed from the base system, and replaced + by a BSD-licensed &man.sort.1; program. + + Berkely yacc (byacc) has been imported + from invisible island. + This brings bison compatibilities to &man.yacc.1; while preserving full + backwards compatibility with previous version of &man.yacc.1;. + + &man.lex.1; has been replaced by flex 2.5.37 + + &man.make.1; has been replaced with the + "Portable" BSD make tool (bmake) from NetBSD. + The &man.adduser.8; utility now supports a option to set the mode of a new user's home directory. @@ -451,6 +624,10 @@ Contributed Software + &man.jemalloc.3; has been updated to 3.4.0. + See this link. + for more details. + AMD has been updated from 6.0.10 to 6.1.5. @@ -460,29 +637,32 @@ bzip2 has been updated from 1.0.4 to 1.0.5. - CVS has been removed from the + CVS has been removed from the base system, but is still available from ports - FILE has been updated from 4.23 - to 5.03. + Subversion has been imported into the base system and + is installed as svnlite. svnlite + should only be used for checking out &os; source and committing, and does not + replace the full Subversion port. + + file has been updated to 5.11. - hostapd has been + hostapd has been updated from 0.5.8 to 0.5.10. - IPFilter has been updated from - 4.1.23 to 4.1.28. + IPFilter has been updated to 5.1.2. - less has been updated from - v408 to v429. + less has been updated to + v458. ncurses has been updated from - 5.6-20061217 to 5.6-20080503. + to 5.7-20081102. OpenSSH has been updated - from 4.5p1 to 5.1p1. + to 6.4. - OpenPAM has been updated from the - Figwort release to the Hydrangea release. + OpenPAM has been updated to + the Micrampelis release. sendmail has been updated from 8.14.1 to 8.14.7. @@ -498,29 +678,25 @@ then please run &man.tzsetup.8; to install a new /etc/localtime. - WPA Supplicant has been - updated from 0.5.8 to 0.5.10. + WPA Supplicant has been + updated to 2.0. xz has been updated from snapshot as of 12 April 2010 to 5.0.0. + &man.nvi.1; has been updated to 2.1.2. + + &man.nvi.1; supports wide character locales. + Ports/Packages Collection Infrastructure - The &man.pkg.create.1; utility now supports - . When this option is specified and a - package tarball exists, it will not be overwritten. This is - useful when multiple packages are saved with several consecutive - runs of &man.pkg.create.1; with the - options. - - The pkg_sign and pkg_check utilities for cryptographically - signing &os; packages have been removed. They were only useful - for packages compressed using &man.gzip.1;; however - &man.bzip2.1; compression has been the norm for some time - now. + The pkg_add, pkg_create, pkg_delete, pkg_info, + pkg_updating, and pkg_version utilities have been removed. + &man.pkg.7; must now be used to install binary packages. &man.pkg.7; + is the next generation &os; package manager, also referred to as "pkgng". From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 21:29:37 2013 Return-Path: Delivered-To: svn-src-releng@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 CC5222CF; Mon, 23 Dec 2013 21:29:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B7603110E; Mon, 23 Dec 2013 21:29:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNLTbSW052342; Mon, 23 Dec 2013 21:29:37 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNLTbav052340; Mon, 23 Dec 2013 21:29:37 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312232129.rBNLTbav052340@svn.freebsd.org> From: Glen Barber Date: Mon, 23 Dec 2013 21:29:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259790 - in releng/10.0/release/doc: en_US.ISO8859-1/readme share/xml 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.17 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: Mon, 23 Dec 2013 21:29:38 -0000 Author: gjb Date: Mon Dec 23 21:29:37 2013 New Revision: 259790 URL: http://svnweb.freebsd.org/changeset/base/259790 Log: MFstable10 r259788, r259789: r259788: Update FreeBSD version entity values. r259789: Switch references from -CURRENT to -STABLE. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/en_US.ISO8859-1/readme/article.xml releng/10.0/release/doc/share/xml/release.ent Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/release/doc/en_US.ISO8859-1/readme/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/readme/article.xml Mon Dec 23 21:07:02 2013 (r259789) +++ releng/10.0/release/doc/en_US.ISO8859-1/readme/article.xml Mon Dec 23 21:29:37 2013 (r259790) @@ -112,7 +112,7 @@ The basic requirements for using this &release.type; are technical proficiency with &os; and an understanding of the ongoing development process of &os; &release.branch; (as - discussed on the &a.current;). + discussed on the &a.stable;). For those more interested in doing business with &os; than in experimenting with new &os; technology, formal releases @@ -130,7 +130,7 @@ The basic requirements for using this &release.type; are technical proficiency with &os; and an understanding of the ongoing development process of &os; &release.branch; (as - discussed on the &a.current;). + discussed on the &a.stable;). For those more interested in doing business with &os; than in experimenting with new &os; technology, formal releases @@ -208,7 +208,7 @@ please send mail to the &a.questions;. If you're tracking the &release.branch; development efforts, you - must join the &a.current;, in order to + must join the &a.stable;, in order to keep abreast of recent developments and changes that may affect the way you use and maintain the system. Modified: releng/10.0/release/doc/share/xml/release.ent ============================================================================== --- releng/10.0/release/doc/share/xml/release.ent Mon Dec 23 21:07:02 2013 (r259789) +++ releng/10.0/release/doc/share/xml/release.ent Mon Dec 23 21:29:37 2013 (r259790) @@ -6,23 +6,23 @@ - + - + - + - + - + From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 22:20:01 2013 Return-Path: Delivered-To: svn-src-releng@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 63EE81EC; Mon, 23 Dec 2013 22:20:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 508251464; Mon, 23 Dec 2013 22:20:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNMK1m2070815; Mon, 23 Dec 2013 22:20:01 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNMK1rB070813; Mon, 23 Dec 2013 22:20:01 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312232220.rBNMK1rB070813@svn.freebsd.org> From: Glen Barber Date: Mon, 23 Dec 2013 22:20:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259794 - releng/10.0/release/doc/share/xml 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.17 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: Mon, 23 Dec 2013 22:20:01 -0000 Author: gjb Date: Mon Dec 23 22:20:00 2013 New Revision: 259794 URL: http://svnweb.freebsd.org/changeset/base/259794 Log: Update release.url from snapshots/ to releases/. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/share/xml/release.ent Modified: releng/10.0/release/doc/share/xml/release.ent ============================================================================== --- releng/10.0/release/doc/share/xml/release.ent Mon Dec 23 22:00:38 2013 (r259793) +++ releng/10.0/release/doc/share/xml/release.ent Mon Dec 23 22:20:00 2013 (r259794) @@ -25,7 +25,7 @@ - + From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 22:31:40 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B406A6D7; Mon, 23 Dec 2013 22:31:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F6441571; Mon, 23 Dec 2013 22:31:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNMVeWX077084; Mon, 23 Dec 2013 22:31:40 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNMVeCk077083; Mon, 23 Dec 2013 22:31:40 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312232231.rBNMVeCk077083@svn.freebsd.org> From: Glen Barber Date: Mon, 23 Dec 2013 22:31:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259797 - releng/10.0/release/doc/en_US.ISO8859-1/relnotes 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.17 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: Mon, 23 Dec 2013 22:31:40 -0000 Author: gjb Date: Mon Dec 23 22:31:40 2013 New Revision: 259797 URL: http://svnweb.freebsd.org/changeset/base/259797 Log: Add a note that the latest version of the release notes will exist on the website. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Dec 23 22:26:17 2013 (r259796) +++ releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Dec 23 22:31:40 2013 (r259797) @@ -59,6 +59,10 @@ It also provides some notes on upgrading from previous versions of &os;. + The latest, up-to-date version of the release notes are + available online at &release.url;10.0R/relnotes.html. + The &release.type; distribution to which these release notes apply represents the latest point along the &release.branch; development branch since &release.branch; was created. Information regarding pre-built, binary From owner-svn-src-releng@FreeBSD.ORG Mon Dec 23 23:50:19 2013 Return-Path: Delivered-To: svn-src-releng@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 94C2359B; Mon, 23 Dec 2013 23:50:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7F00E198A; Mon, 23 Dec 2013 23:50:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBNNoJMD003894; Mon, 23 Dec 2013 23:50:19 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBNNoJmj003893; Mon, 23 Dec 2013 23:50:19 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312232350.rBNNoJmj003893@svn.freebsd.org> From: Glen Barber Date: Mon, 23 Dec 2013 23:50:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259800 - releng/10.0/release/doc/en_US.ISO8859-1/relnotes 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.17 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: Mon, 23 Dec 2013 23:50:19 -0000 Author: gjb Date: Mon Dec 23 23:50:18 2013 New Revision: 259800 URL: http://svnweb.freebsd.org/changeset/base/259800 Log: Specify there are no security advisories. Comment the 'doc' and 'rc-scripts' sections. This is done to silence tidy(1) when cleaning up the generated html. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Dec 23 22:38:41 2013 (r259799) +++ releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Mon Dec 23 23:50:18 2013 (r259800) @@ -117,7 +117,7 @@ Security Advisories - + No security advisories. @@ -617,12 +617,14 @@ hv_vmbus_load="YES" Al to send probe packets with no upper-layer protocol, rather than the usual UDP probe packets. + @@ -714,12 +716,14 @@ hv_vmbus_load="YES" Al + From owner-svn-src-releng@FreeBSD.ORG Tue Dec 24 02:05:08 2013 Return-Path: Delivered-To: svn-src-releng@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 67FDDD40; Tue, 24 Dec 2013 02:05:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 53D70123B; Tue, 24 Dec 2013 02:05:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBO25888053511; Tue, 24 Dec 2013 02:05:08 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBO258Pj053510; Tue, 24 Dec 2013 02:05:08 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312240205.rBO258Pj053510@svn.freebsd.org> From: Glen Barber Date: Tue, 24 Dec 2013 02:05:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259802 - releng/10.0/release/doc/en_US.ISO8859-1/relnotes 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.17 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: Tue, 24 Dec 2013 02:05:08 -0000 Author: gjb Date: Tue Dec 24 02:05:07 2013 New Revision: 259802 URL: http://svnweb.freebsd.org/changeset/base/259802 Log: Add list of rc(8) scripts added/removed in 10.0-RELEASE. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 24 00:48:39 2013 (r259801) +++ releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 24 02:05:07 2013 (r259802) @@ -617,14 +617,104 @@ hv_vmbus_load="YES" Al to send probe packets with no upper-layer protocol, rather than the usual UDP probe packets. - From owner-svn-src-releng@FreeBSD.ORG Tue Dec 24 02:07:22 2013 Return-Path: Delivered-To: svn-src-releng@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 96236E75; Tue, 24 Dec 2013 02:07:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 81ABB1241; Tue, 24 Dec 2013 02:07:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBO27MJi053880; Tue, 24 Dec 2013 02:07:22 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBO27MbU053879; Tue, 24 Dec 2013 02:07:22 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312240207.rBO27MbU053879@svn.freebsd.org> From: Glen Barber Date: Tue, 24 Dec 2013 02:07:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259803 - releng/10.0/release/doc/en_US.ISO8859-1/relnotes 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.17 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: Tue, 24 Dec 2013 02:07:22 -0000 Author: gjb Date: Tue Dec 24 02:07:22 2013 New Revision: 259803 URL: http://svnweb.freebsd.org/changeset/base/259803 Log: Fix an undo error that crept in during formatting changes. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 24 02:05:07 2013 (r259802) +++ releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 24 02:07:22 2013 (r259803) @@ -691,7 +691,7 @@ hv_vmbus_load="YES" Al &man.rc.8; Script - blah; + Reason From owner-svn-src-releng@FreeBSD.ORG Tue Dec 24 03:57:26 2013 Return-Path: Delivered-To: svn-src-releng@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 4CBBB1BC; Tue, 24 Dec 2013 03:57:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 378FF1904; Tue, 24 Dec 2013 03:57:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBO3vQAd092834; Tue, 24 Dec 2013 03:57:26 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBO3vPDw092832; Tue, 24 Dec 2013 03:57:25 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312240357.rBO3vPDw092832@svn.freebsd.org> From: Glen Barber Date: Tue, 24 Dec 2013 03:57:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259805 - releng/10.0/release/doc/en_US.ISO8859-1/installation 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.17 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: Tue, 24 Dec 2013 03:57:26 -0000 Author: gjb Date: Tue Dec 24 03:57:25 2013 New Revision: 259805 URL: http://svnweb.freebsd.org/changeset/base/259805 Log: Add the installation article, copied from releng/9.2, modified for releng/10.0/. It is not yet linked to the build. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Added: releng/10.0/release/doc/en_US.ISO8859-1/installation/ releng/10.0/release/doc/en_US.ISO8859-1/installation/Makefile (contents, props changed) releng/10.0/release/doc/en_US.ISO8859-1/installation/article.xml (contents, props changed) Added: releng/10.0/release/doc/en_US.ISO8859-1/installation/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/10.0/release/doc/en_US.ISO8859-1/installation/Makefile Tue Dec 24 03:57:25 2013 (r259805) @@ -0,0 +1,19 @@ +# $FreeBSD$ + +RELN_ROOT?= ${.CURDIR}/../.. +.ifdef NO_LANGCODE_IN_DESTDIR +DESTDIR?= ${DOCDIR}/installation +.else +DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/installation +.endif + +DOC?= article +FORMATS?= html +INSTALL_COMPRESSED?= gz +INSTALL_ONLY_COMPRESSED?= + +# SGML content +SRCS+= article.xml + +.include "${RELN_ROOT}/share/mk/doc.relnotes.mk" +.include "${DOC_PREFIX}/share/mk/doc.project.mk" Added: releng/10.0/release/doc/en_US.ISO8859-1/installation/article.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ releng/10.0/release/doc/en_US.ISO8859-1/installation/article.xml Tue Dec 24 03:57:25 2013 (r259805) @@ -0,0 +1,151 @@ + + +%release; +]> + +
+ &os; &release.current; Installation Instructions + + The &os; Project + + $FreeBSD$ + + + 2013 + The &os; Documentation Project + + + + &tm-attrib.freebsd; + &tm-attrib.intel; + &tm-attrib.sparc; + &tm-attrib.general; + + + + This article gives some brief instructions on installing + &os; &release.current; and upgrading the systems running earlier + releases. + + + + + Installing &os; + + The Installing + &os; + chapter of the &os; + Handbook provides more in-depth information about the + installation program itself, including a guided walk-through with + screenshots. + + + + Upgrading &os; + + If you are upgrading from a previous release of &os;, please + read upgrading + section in the Release Notes for notable + incompatibilities carefully. + + + Upgrading from Source + + The procedure for doing a source code based update is + described in + and + . + + For SVN use the releng/10.0 branch + which will be where any upcoming Security Advisories or Errata + Notices will be applied. + + + + Upgrading Using <quote>&os; Update</quote> + + The &man.freebsd-update.8; utility supports binary + upgrades of &arch.i386; and &arch.amd64; systems running + earlier FreeBSD releases. Systems running + 7.[34]-RELEASE, + 8.[1234]-RELEASE, + 9.[012]-RELEASE, + 10.0-RC[123] can upgrade as follows: + + &prompt.root; freebsd-update fetch +&prompt.root; freebsd-update install + + Now the &man.freebsd-update.8; utility can fetch bits + belonging to &release.current;. During this process + &man.freebsd-update.8; will ask for help in merging + configuration files. + + &prompt.root; freebsd-update upgrade -r 10.0-RELEASE + + Due to changes in the way that &os; is packaged on the + release media, two complications may arise in this process if + upgrading from FreeBSD 8.x or 9.x: + + + + The &os;, which previously could appear in either + /boot/kernel or + /boot/GENERIC, now only appears as + /boot/kernel. As a result, any + kernel appearing in /boot/GENERIC + will be deleted. Please carefully read the output printed + by &man.freebsd-update.8; and confirm that an updated + kernel will be placed into + /boot/kernel before proceeding beyond + this point. + + + + The &os; source tree in /usr/src + (if present) will be deleted. (Normally the + &man.freebsd-update.8; utility will update a source tree, + but in this case the changes in release packaging result + in the &man.freebsd-update.8; utility not recognizing that + the source tree from the old release and the source tree + from the new release correspond to the same part of + &os;.) + + + + &prompt.root; freebsd-update install + + The system must now be rebooted with the newly installed + kernel before the non-kernel components are updated. + + &prompt.root; shutdown -r now + + After rebooting, &man.freebsd-update.8; needs to be run + again to install the new userland components: + + &prompt.root; freebsd-update install + + At this point, users of systems being upgraded from &os; + 9.2-RELEASE or earlier will be prompted by + &man.freebsd-update.8; to rebuild all third-party applications + (e.g., ports installed from the ports tree) due to updates in + system libraries. + + After updating installed third-party applications (and + again, only if &man.freebsd-update.8; printed a message + indicating that this was necessary), run + &man.freebsd-update.8; again so that it can delete the old (no + longer used) system libraries: + + &prompt.root; freebsd-update install + + Finally, reboot into &release.current; + + &prompt.root; shutdown -r now + + +
From owner-svn-src-releng@FreeBSD.ORG Tue Dec 24 04:15:48 2013 Return-Path: Delivered-To: svn-src-releng@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 D9B284A6; Tue, 24 Dec 2013 04:15:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C56E21A23; Tue, 24 Dec 2013 04:15:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBO4Fm53000475; Tue, 24 Dec 2013 04:15:48 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBO4FmGA000474; Tue, 24 Dec 2013 04:15:48 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312240415.rBO4FmGA000474@svn.freebsd.org> From: Glen Barber Date: Tue, 24 Dec 2013 04:15:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259806 - releng/10.0/release/doc/en_US.ISO8859-1/installation 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.17 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: Tue, 24 Dec 2013 04:15:48 -0000 Author: gjb Date: Tue Dec 24 04:15:48 2013 New Revision: 259806 URL: http://svnweb.freebsd.org/changeset/base/259806 Log: Fix a typo in an XML element, incorrectly updated for docbook 5.0 Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/en_US.ISO8859-1/installation/article.xml Modified: releng/10.0/release/doc/en_US.ISO8859-1/installation/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/installation/article.xml Tue Dec 24 03:57:25 2013 (r259805) +++ releng/10.0/release/doc/en_US.ISO8859-1/installation/article.xml Tue Dec 24 04:15:48 2013 (r259806) @@ -14,7 +14,7 @@ 2013 - The &os; Documentation Project + The &os; Documentation Project From owner-svn-src-releng@FreeBSD.ORG Tue Dec 24 04:27:11 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C4962725; Tue, 24 Dec 2013 04:27:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B07781A65; Tue, 24 Dec 2013 04:27:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBO4RBt5004131; Tue, 24 Dec 2013 04:27:11 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBO4RBVE004130; Tue, 24 Dec 2013 04:27:11 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312240427.rBO4RBVE004130@svn.freebsd.org> From: Glen Barber Date: Tue, 24 Dec 2013 04:27:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259807 - releng/10.0/release/doc/en_US.ISO8859-1 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.17 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: Tue, 24 Dec 2013 04:27:11 -0000 Author: gjb Date: Tue Dec 24 04:27:11 2013 New Revision: 259807 URL: http://svnweb.freebsd.org/changeset/base/259807 Log: Link the installation article to the build. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/en_US.ISO8859-1/Makefile Modified: releng/10.0/release/doc/en_US.ISO8859-1/Makefile ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/Makefile Tue Dec 24 04:15:48 2013 (r259806) +++ releng/10.0/release/doc/en_US.ISO8859-1/Makefile Tue Dec 24 04:27:11 2013 (r259807) @@ -4,6 +4,7 @@ RELN_ROOT?= ${.CURDIR}/.. SUBDIR = relnotes SUBDIR+= hardware +SUBDIR+= installation SUBDIR+= readme SUBDIR+= errata From owner-svn-src-releng@FreeBSD.ORG Tue Dec 24 05:27:46 2013 Return-Path: Delivered-To: svn-src-releng@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 F1F38F2D; Tue, 24 Dec 2013 05:27:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DDD881E50; Tue, 24 Dec 2013 05:27:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBO5RjTm025430; Tue, 24 Dec 2013 05:27:45 GMT (envelope-from gjb@svn.freebsd.org) Received: (from gjb@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBO5RjtN025429; Tue, 24 Dec 2013 05:27:45 GMT (envelope-from gjb@svn.freebsd.org) Message-Id: <201312240527.rBO5RjtN025429@svn.freebsd.org> From: Glen Barber Date: Tue, 24 Dec 2013 05:27:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259810 - releng/10.0/release/doc/en_US.ISO8859-1/relnotes 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.17 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: Tue, 24 Dec 2013 05:27:46 -0000 Author: gjb Date: Tue Dec 24 05:27:45 2013 New Revision: 259810 URL: http://svnweb.freebsd.org/changeset/base/259810 Log: MFstable10 r259809 (rodrigc): Add pointer to wiki for Hyper-V information. Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml ============================================================================== --- releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 24 05:17:24 2013 (r259809) +++ releng/10.0/release/doc/en_US.ISO8859-1/relnotes/article.xml Tue Dec 24 05:27:45 2013 (r259810) @@ -211,7 +211,9 @@ hv_netsvc_load="YES" hv_utils_load="YES" hv_vmbus_load="YES" Alternatively, the Hyper-V drivers can be added to the i386 kernel by adding device hyperv to the kernel config, and then - recompiling the kernel. + recompiling the kernel. Please refer to: + FreeBSD and Microsoft Windows Server Hyper-V support + for full instructions on how to set up Hyper-V support under FreeBSD. The &man.vmx.4; driver has been added. &man.vmx.4; is a VMware VMXNET3 ethernet driver ported from From owner-svn-src-releng@FreeBSD.ORG Fri Dec 27 23:13:39 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]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 41C2268B; Fri, 27 Dec 2013 23:13:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1435B190A; Fri, 27 Dec 2013 23:13:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBRNDcZ6071166; Fri, 27 Dec 2013 23:13:38 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBRNDcLo071165; Fri, 27 Dec 2013 23:13:38 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201312272313.rBRNDcLo071165@svn.freebsd.org> From: Xin LI Date: Fri, 27 Dec 2013 23:13:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r259975 - releng/10.0/etc 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.17 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, 27 Dec 2013 23:13:39 -0000 Author: delphij Date: Fri Dec 27 23:13:38 2013 New Revision: 259975 URL: http://svnweb.freebsd.org/changeset/base/259975 Log: MF10 r259974 (MFC r259973): Tighten default restrictions for ntpd(8) server and provide a link to NTP access restriction documentation. Approved by: re (gjb) Modified: releng/10.0/etc/ntp.conf Directory Properties: releng/10.0/ (props changed) Modified: releng/10.0/etc/ntp.conf ============================================================================== --- releng/10.0/etc/ntp.conf Fri Dec 27 23:09:40 2013 (r259974) +++ releng/10.0/etc/ntp.conf Fri Dec 27 23:13:38 2013 (r259975) @@ -17,7 +17,7 @@ # users with a static IP and good upstream NTP servers to add a server # to the pool. See http://www.pool.ntp.org/join.html if you are interested. # -# The option `iburst' is used for faster initial synchronisation. +# The option `iburst' is used for faster initial synchronization. # server 0.freebsd.pool.ntp.org iburst server 1.freebsd.pool.ntp.org iburst @@ -35,21 +35,37 @@ server 2.freebsd.pool.ntp.org iburst # server 2.CC.pool.ntp.org iburst # -# Security: Only accept NTP traffic from the following hosts. -# The following configuration example only accepts traffic from the -# above defined servers. +# Security: +# +# By default, only allow time queries and block all other requests +# from unauthenticated clients. +# +# See http://support.ntp.org/bin/view/Support/AccessRestrictions +# for more information. +# +restrict default kod nomodify notrap nopeer noquery +restrict -6 default kod nomodify notrap nopeer noquery +# +# Alternatively, the following rules would block all unauthorized access. +# +#restrict default ignore +#restrict -6 default ignore +# +# In this case, all remote NTP time servers also need to be explicitly +# allowed or they would not be able to exchange time information with +# this server. # # Please note that this example doesn't work for the servers in # the pool.ntp.org domain since they return multiple A records. -# (This is the reason that by default they are commented out) # -#restrict default ignore #restrict 0.pool.ntp.org nomodify nopeer noquery notrap #restrict 1.pool.ntp.org nomodify nopeer noquery notrap #restrict 2.pool.ntp.org nomodify nopeer noquery notrap -#restrict 127.0.0.1 -#restrict -6 ::1 -#restrict 127.127.1.0 +# +# The following settings allow unrestricted access from the localhost +restrict 127.0.0.1 +restrict -6 ::1 +restrict 127.127.1.0 # # If a server loses sync with all upstream servers, NTP clients