From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:02:11 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E2B9510656ED; Sun, 20 Feb 2011 01:02:11 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CEAF18FC0A; Sun, 20 Feb 2011 01:02:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K12BOX014479; Sun, 20 Feb 2011 01:02:11 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K12BE9014476; Sun, 20 Feb 2011 01:02:11 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200102.p1K12BE9014476@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:02:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218866 - stable/8/sys/dev/jme X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:02:12 -0000 Author: yongari Date: Sun Feb 20 01:02:11 2011 New Revision: 218866 URL: http://svn.freebsd.org/changeset/base/218866 Log: MFC r217353: - Add a locked variant of jme_start() and invoke it directly while holding the lock instead of queueing it to a task. - Do not invoke jme_rxintr() to reclaim any unprocessed but received packets when shutting down the interface. Instead, just drop these packets to match the behavior of other drivers. - Hold the driver lock in the interrupt handler to avoid races with ioctl requests to down the interface. Modified: stable/8/sys/dev/jme/if_jme.c stable/8/sys/dev/jme/if_jmevar.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/jme/if_jme.c ============================================================================== --- stable/8/sys/dev/jme/if_jme.c Sun Feb 20 00:59:39 2011 (r218865) +++ stable/8/sys/dev/jme/if_jme.c Sun Feb 20 01:02:11 2011 (r218866) @@ -126,8 +126,8 @@ static void jme_setwol(struct jme_softc static int jme_suspend(device_t); static int jme_resume(device_t); static int jme_encap(struct jme_softc *, struct mbuf **); -static void jme_tx_task(void *, int); static void jme_start(struct ifnet *); +static void jme_start_locked(struct ifnet *); static void jme_watchdog(struct jme_softc *); static int jme_ioctl(struct ifnet *, u_long, caddr_t); static void jme_mac_config(struct jme_softc *); @@ -890,7 +890,6 @@ jme_attach(device_t dev) ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); /* Create local taskq. */ - TASK_INIT(&sc->jme_tx_task, 1, jme_tx_task, ifp); sc->jme_tq = taskqueue_create_fast("jme_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->jme_tq); if (sc->jme_tq == NULL) { @@ -942,7 +941,6 @@ jme_detach(device_t dev) JME_UNLOCK(sc); callout_drain(&sc->jme_tick_ch); taskqueue_drain(sc->jme_tq, &sc->jme_int_task); - taskqueue_drain(sc->jme_tq, &sc->jme_tx_task); taskqueue_drain(taskqueue_swi, &sc->jme_link_task); /* Restore possibly modified station address. */ if ((sc->jme_flags & JME_FLAG_EFUSE) != 0) @@ -1880,16 +1878,18 @@ jme_encap(struct jme_softc *sc, struct m } static void -jme_tx_task(void *arg, int pending) +jme_start(struct ifnet *ifp) { - struct ifnet *ifp; + struct jme_softc *sc; - ifp = (struct ifnet *)arg; - jme_start(ifp); + sc = ifp->if_softc; + JME_LOCK(sc); + jme_start_locked(ifp); + JME_UNLOCK(sc); } static void -jme_start(struct ifnet *ifp) +jme_start_locked(struct ifnet *ifp) { struct jme_softc *sc; struct mbuf *m_head; @@ -1897,16 +1897,14 @@ jme_start(struct ifnet *ifp) sc = ifp->if_softc; - JME_LOCK(sc); + JME_LOCK_ASSERT(sc); if (sc->jme_cdata.jme_tx_cnt >= JME_TX_DESC_HIWAT) jme_txeof(sc); if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != - IFF_DRV_RUNNING || (sc->jme_flags & JME_FLAG_LINK) == 0) { - JME_UNLOCK(sc); + IFF_DRV_RUNNING || (sc->jme_flags & JME_FLAG_LINK) == 0) return; - } for (enq = 0; !IFQ_DRV_IS_EMPTY(&ifp->if_snd); ) { IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); @@ -1945,8 +1943,6 @@ jme_start(struct ifnet *ifp) /* Set a timeout in case the chip goes out to lunch. */ sc->jme_watchdog_timer = JME_TX_TIMEOUT; } - - JME_UNLOCK(sc); } static void @@ -1972,7 +1968,7 @@ jme_watchdog(struct jme_softc *sc) if_printf(sc->jme_ifp, "watchdog timeout (missed Tx interrupts) -- recovering\n"); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - taskqueue_enqueue(sc->jme_tq, &sc->jme_tx_task); + jme_start_locked(ifp); return; } @@ -1981,7 +1977,7 @@ jme_watchdog(struct jme_softc *sc) ifp->if_drv_flags &= ~IFF_DRV_RUNNING; jme_init_locked(sc); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - taskqueue_enqueue(sc->jme_tq, &sc->jme_tx_task); + jme_start_locked(ifp); } static int @@ -2275,10 +2271,8 @@ jme_link_task(void *arg, int pending) /* XXX Drain all queued tasks. */ JME_UNLOCK(sc); taskqueue_drain(sc->jme_tq, &sc->jme_int_task); - taskqueue_drain(sc->jme_tq, &sc->jme_tx_task); JME_LOCK(sc); - jme_rxintr(sc, JME_RX_RING_CNT); if (sc->jme_cdata.jme_rxhead != NULL) m_freem(sc->jme_cdata.jme_rxhead); JME_RXCHAIN_RESET(sc); @@ -2305,7 +2299,7 @@ jme_link_task(void *arg, int pending) /* * Reuse configured Rx descriptors and reset - * procuder/consumer index. + * producer/consumer index. */ sc->jme_cdata.jme_rx_cons = 0; sc->jme_morework = 0; @@ -2384,6 +2378,7 @@ jme_int_task(void *arg, int pending) sc = (struct jme_softc *)arg; ifp = sc->jme_ifp; + JME_LOCK(sc); status = CSR_READ_4(sc, JME_INTR_STATUS); if (sc->jme_morework != 0) { sc->jme_morework = 0; @@ -2418,19 +2413,18 @@ jme_int_task(void *arg, int pending) CSR_WRITE_4(sc, JME_RXCSR, sc->jme_rxcsr | RXCSR_RX_ENB | RXCSR_RXQ_START); } - /* - * Reclaiming Tx buffers are deferred to make jme(4) run - * without locks held. - */ if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - taskqueue_enqueue(sc->jme_tq, &sc->jme_tx_task); + jme_start_locked(ifp); } if (more != 0 || (CSR_READ_4(sc, JME_INTR_STATUS) & JME_INTRS) != 0) { taskqueue_enqueue(sc->jme_tq, &sc->jme_int_task); + JME_UNLOCK(sc); return; } done: + JME_UNLOCK(sc); + /* Reenable interrupts. */ CSR_WRITE_4(sc, JME_INTR_MASK_SET, JME_INTRS); } @@ -2532,6 +2526,8 @@ jme_rxeof(struct jme_softc *sc) uint32_t flags, status; int cons, count, nsegs; + JME_LOCK_ASSERT(sc); + ifp = sc->jme_ifp; cons = sc->jme_cdata.jme_rx_cons; @@ -2643,7 +2639,9 @@ jme_rxeof(struct jme_softc *sc) ifp->if_ipackets++; /* Pass it on. */ + JME_UNLOCK(sc); (*ifp->if_input)(ifp, m); + JME_LOCK(sc); /* Reset mbuf chains. */ JME_RXCHAIN_RESET(sc); Modified: stable/8/sys/dev/jme/if_jmevar.h ============================================================================== --- stable/8/sys/dev/jme/if_jmevar.h Sun Feb 20 00:59:39 2011 (r218865) +++ stable/8/sys/dev/jme/if_jmevar.h Sun Feb 20 01:02:11 2011 (r218866) @@ -221,7 +221,6 @@ struct jme_softc { volatile int jme_morework; struct task jme_int_task; - struct task jme_tx_task; struct task jme_link_task; struct taskqueue *jme_tq; struct mtx jme_mtx; From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:05:35 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94EE51065693; Sun, 20 Feb 2011 01:05:35 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 761C88FC1A; Sun, 20 Feb 2011 01:05:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K15ZI7014593; Sun, 20 Feb 2011 01:05:35 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K15Z9Q014590; Sun, 20 Feb 2011 01:05:35 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200105.p1K15Z9Q014590@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:05:35 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218867 - stable/7/sys/dev/jme X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:05:35 -0000 Author: yongari Date: Sun Feb 20 01:05:35 2011 New Revision: 218867 URL: http://svn.freebsd.org/changeset/base/218867 Log: MFC r217353: - Add a locked variant of jme_start() and invoke it directly while holding the lock instead of queueing it to a task. - Do not invoke jme_rxintr() to reclaim any unprocessed but received packets when shutting down the interface. Instead, just drop these packets to match the behavior of other drivers. - Hold the driver lock in the interrupt handler to avoid races with ioctl requests to down the interface. Modified: stable/7/sys/dev/jme/if_jme.c stable/7/sys/dev/jme/if_jmevar.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/jme/if_jme.c ============================================================================== --- stable/7/sys/dev/jme/if_jme.c Sun Feb 20 01:02:11 2011 (r218866) +++ stable/7/sys/dev/jme/if_jme.c Sun Feb 20 01:05:35 2011 (r218867) @@ -126,8 +126,8 @@ static void jme_setwol(struct jme_softc static int jme_suspend(device_t); static int jme_resume(device_t); static int jme_encap(struct jme_softc *, struct mbuf **); -static void jme_tx_task(void *, int); static void jme_start(struct ifnet *); +static void jme_start_locked(struct ifnet *); static void jme_watchdog(struct jme_softc *); static int jme_ioctl(struct ifnet *, u_long, caddr_t); static void jme_mac_config(struct jme_softc *); @@ -890,7 +890,6 @@ jme_attach(device_t dev) ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header); /* Create local taskq. */ - TASK_INIT(&sc->jme_tx_task, 1, jme_tx_task, ifp); sc->jme_tq = taskqueue_create_fast("jme_taskq", M_WAITOK, taskqueue_thread_enqueue, &sc->jme_tq); if (sc->jme_tq == NULL) { @@ -942,7 +941,6 @@ jme_detach(device_t dev) JME_UNLOCK(sc); callout_drain(&sc->jme_tick_ch); taskqueue_drain(sc->jme_tq, &sc->jme_int_task); - taskqueue_drain(sc->jme_tq, &sc->jme_tx_task); taskqueue_drain(taskqueue_swi, &sc->jme_link_task); /* Restore possibly modified station address. */ if ((sc->jme_flags & JME_FLAG_EFUSE) != 0) @@ -1880,16 +1878,18 @@ jme_encap(struct jme_softc *sc, struct m } static void -jme_tx_task(void *arg, int pending) +jme_start(struct ifnet *ifp) { - struct ifnet *ifp; + struct jme_softc *sc; - ifp = (struct ifnet *)arg; - jme_start(ifp); + sc = ifp->if_softc; + JME_LOCK(sc); + jme_start_locked(ifp); + JME_UNLOCK(sc); } static void -jme_start(struct ifnet *ifp) +jme_start_locked(struct ifnet *ifp) { struct jme_softc *sc; struct mbuf *m_head; @@ -1897,16 +1897,14 @@ jme_start(struct ifnet *ifp) sc = ifp->if_softc; - JME_LOCK(sc); + JME_LOCK_ASSERT(sc); if (sc->jme_cdata.jme_tx_cnt >= JME_TX_DESC_HIWAT) jme_txeof(sc); if ((ifp->if_drv_flags & (IFF_DRV_RUNNING | IFF_DRV_OACTIVE)) != - IFF_DRV_RUNNING || (sc->jme_flags & JME_FLAG_LINK) == 0) { - JME_UNLOCK(sc); + IFF_DRV_RUNNING || (sc->jme_flags & JME_FLAG_LINK) == 0) return; - } for (enq = 0; !IFQ_DRV_IS_EMPTY(&ifp->if_snd); ) { IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); @@ -1945,8 +1943,6 @@ jme_start(struct ifnet *ifp) /* Set a timeout in case the chip goes out to lunch. */ sc->jme_watchdog_timer = JME_TX_TIMEOUT; } - - JME_UNLOCK(sc); } static void @@ -1972,7 +1968,7 @@ jme_watchdog(struct jme_softc *sc) if_printf(sc->jme_ifp, "watchdog timeout (missed Tx interrupts) -- recovering\n"); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - taskqueue_enqueue(sc->jme_tq, &sc->jme_tx_task); + jme_start_locked(ifp); return; } @@ -1981,7 +1977,7 @@ jme_watchdog(struct jme_softc *sc) ifp->if_drv_flags &= ~IFF_DRV_RUNNING; jme_init_locked(sc); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - taskqueue_enqueue(sc->jme_tq, &sc->jme_tx_task); + jme_start_locked(ifp); } static int @@ -2275,10 +2271,8 @@ jme_link_task(void *arg, int pending) /* XXX Drain all queued tasks. */ JME_UNLOCK(sc); taskqueue_drain(sc->jme_tq, &sc->jme_int_task); - taskqueue_drain(sc->jme_tq, &sc->jme_tx_task); JME_LOCK(sc); - jme_rxintr(sc, JME_RX_RING_CNT); if (sc->jme_cdata.jme_rxhead != NULL) m_freem(sc->jme_cdata.jme_rxhead); JME_RXCHAIN_RESET(sc); @@ -2305,7 +2299,7 @@ jme_link_task(void *arg, int pending) /* * Reuse configured Rx descriptors and reset - * procuder/consumer index. + * producer/consumer index. */ sc->jme_cdata.jme_rx_cons = 0; sc->jme_morework = 0; @@ -2384,6 +2378,7 @@ jme_int_task(void *arg, int pending) sc = (struct jme_softc *)arg; ifp = sc->jme_ifp; + JME_LOCK(sc); status = CSR_READ_4(sc, JME_INTR_STATUS); if (sc->jme_morework != 0) { sc->jme_morework = 0; @@ -2418,19 +2413,18 @@ jme_int_task(void *arg, int pending) CSR_WRITE_4(sc, JME_RXCSR, sc->jme_rxcsr | RXCSR_RX_ENB | RXCSR_RXQ_START); } - /* - * Reclaiming Tx buffers are deferred to make jme(4) run - * without locks held. - */ if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - taskqueue_enqueue(sc->jme_tq, &sc->jme_tx_task); + jme_start_locked(ifp); } if (more != 0 || (CSR_READ_4(sc, JME_INTR_STATUS) & JME_INTRS) != 0) { taskqueue_enqueue(sc->jme_tq, &sc->jme_int_task); + JME_UNLOCK(sc); return; } done: + JME_UNLOCK(sc); + /* Reenable interrupts. */ CSR_WRITE_4(sc, JME_INTR_MASK_SET, JME_INTRS); } @@ -2532,6 +2526,8 @@ jme_rxeof(struct jme_softc *sc) uint32_t flags, status; int cons, count, nsegs; + JME_LOCK_ASSERT(sc); + ifp = sc->jme_ifp; cons = sc->jme_cdata.jme_rx_cons; @@ -2643,7 +2639,9 @@ jme_rxeof(struct jme_softc *sc) ifp->if_ipackets++; /* Pass it on. */ + JME_UNLOCK(sc); (*ifp->if_input)(ifp, m); + JME_LOCK(sc); /* Reset mbuf chains. */ JME_RXCHAIN_RESET(sc); Modified: stable/7/sys/dev/jme/if_jmevar.h ============================================================================== --- stable/7/sys/dev/jme/if_jmevar.h Sun Feb 20 01:02:11 2011 (r218866) +++ stable/7/sys/dev/jme/if_jmevar.h Sun Feb 20 01:05:35 2011 (r218867) @@ -221,7 +221,6 @@ struct jme_softc { volatile int jme_morework; struct task jme_int_task; - struct task jme_tx_task; struct task jme_link_task; struct taskqueue *jme_tq; struct mtx jme_mtx; From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:08:49 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA6A6106564A; Sun, 20 Feb 2011 01:08:49 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 96AE68FC0C; Sun, 20 Feb 2011 01:08:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K18nV1014696; Sun, 20 Feb 2011 01:08:49 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K18nQU014693; Sun, 20 Feb 2011 01:08:49 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200108.p1K18nQU014693@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:08:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218868 - stable/8/sys/dev/alc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:08:49 -0000 Author: yongari Date: Sun Feb 20 01:08:49 2011 New Revision: 218868 URL: http://svn.freebsd.org/changeset/base/218868 Log: MFC r217379: - Move ether_ifdetach() earlier and remove now-unneeded IN_DETACH flag. - Expand locking in interrupt handler. Modified: stable/8/sys/dev/alc/if_alc.c stable/8/sys/dev/alc/if_alcvar.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/alc/if_alc.c ============================================================================== --- stable/8/sys/dev/alc/if_alc.c Sun Feb 20 01:05:35 2011 (r218867) +++ stable/8/sys/dev/alc/if_alc.c Sun Feb 20 01:08:49 2011 (r218868) @@ -1052,13 +1052,12 @@ alc_detach(device_t dev) ifp = sc->alc_ifp; if (device_is_attached(dev)) { + ether_ifdetach(ifp); ALC_LOCK(sc); - sc->alc_flags |= ALC_FLAG_DETACH; alc_stop(sc); ALC_UNLOCK(sc); callout_drain(&sc->alc_tick_ch); taskqueue_drain(sc->alc_tq, &sc->alc_int_task); - ether_ifdetach(ifp); } if (sc->alc_tq != NULL) { @@ -2368,7 +2367,7 @@ alc_ioctl(struct ifnet *ifp, u_long cmd, ((ifp->if_flags ^ sc->alc_if_flags) & (IFF_PROMISC | IFF_ALLMULTI)) != 0) alc_rxfilter(sc); - else if ((sc->alc_flags & ALC_FLAG_DETACH) == 0) + else alc_init_locked(sc); } else if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) alc_stop(sc); @@ -2663,6 +2662,7 @@ alc_int_task(void *arg, int pending) ifp = sc->alc_ifp; status = CSR_READ_4(sc, ALC_INTR_STATUS); + ALC_LOCK(sc); if (sc->alc_morework != 0) { sc->alc_morework = 0; status |= INTR_RX_PKT; @@ -2680,7 +2680,6 @@ alc_int_task(void *arg, int pending) if (more == EAGAIN) sc->alc_morework = 1; else if (more == EIO) { - ALC_LOCK(sc); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; alc_init_locked(sc); ALC_UNLOCK(sc); @@ -2698,7 +2697,6 @@ alc_int_task(void *arg, int pending) if ((status & INTR_TXQ_TO_RST) != 0) device_printf(sc->alc_dev, "TxQ reset! -- resetting\n"); - ALC_LOCK(sc); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; alc_init_locked(sc); ALC_UNLOCK(sc); @@ -2706,11 +2704,12 @@ alc_int_task(void *arg, int pending) } if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0 && !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - alc_start(ifp); + alc_start_locked(ifp); } if (more == EAGAIN || (CSR_READ_4(sc, ALC_INTR_STATUS) & ALC_INTRS) != 0) { + ALC_UNLOCK(sc); taskqueue_enqueue(sc->alc_tq, &sc->alc_int_task); return; } @@ -2720,6 +2719,7 @@ done: /* Re-enable interrupts if we're running. */ CSR_WRITE_4(sc, ALC_INTR_STATUS, 0x7FFFFFFF); } + ALC_UNLOCK(sc); } static void @@ -3039,7 +3039,9 @@ alc_rxeof(struct alc_softc *sc, struct r #endif { /* Pass it on. */ + ALC_UNLOCK(sc); (*ifp->if_input)(ifp, m); + ALC_LOCK(sc); } } } Modified: stable/8/sys/dev/alc/if_alcvar.h ============================================================================== --- stable/8/sys/dev/alc/if_alcvar.h Sun Feb 20 01:05:35 2011 (r218867) +++ stable/8/sys/dev/alc/if_alcvar.h Sun Feb 20 01:08:49 2011 (r218868) @@ -230,7 +230,6 @@ struct alc_softc { #define ALC_FLAG_L0S 0x0400 #define ALC_FLAG_L1S 0x0800 #define ALC_FLAG_APS 0x1000 -#define ALC_FLAG_DETACH 0x4000 #define ALC_FLAG_LINK 0x8000 struct callout alc_tick_ch; From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:10:15 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50A1F1065670; Sun, 20 Feb 2011 01:10:15 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3CF4E8FC12; Sun, 20 Feb 2011 01:10:15 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K1AFwA014779; Sun, 20 Feb 2011 01:10:15 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K1AFlO014776; Sun, 20 Feb 2011 01:10:15 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200110.p1K1AFlO014776@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:10:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218869 - stable/7/sys/dev/alc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:10:15 -0000 Author: yongari Date: Sun Feb 20 01:10:14 2011 New Revision: 218869 URL: http://svn.freebsd.org/changeset/base/218869 Log: MFC r217379: - Move ether_ifdetach() earlier and remove now-unneeded IN_DETACH flag. - Expand locking in interrupt handler. Modified: stable/7/sys/dev/alc/if_alc.c stable/7/sys/dev/alc/if_alcvar.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/alc/if_alc.c ============================================================================== --- stable/7/sys/dev/alc/if_alc.c Sun Feb 20 01:08:49 2011 (r218868) +++ stable/7/sys/dev/alc/if_alc.c Sun Feb 20 01:10:14 2011 (r218869) @@ -1052,13 +1052,12 @@ alc_detach(device_t dev) ifp = sc->alc_ifp; if (device_is_attached(dev)) { + ether_ifdetach(ifp); ALC_LOCK(sc); - sc->alc_flags |= ALC_FLAG_DETACH; alc_stop(sc); ALC_UNLOCK(sc); callout_drain(&sc->alc_tick_ch); taskqueue_drain(sc->alc_tq, &sc->alc_int_task); - ether_ifdetach(ifp); } if (sc->alc_tq != NULL) { @@ -2368,7 +2367,7 @@ alc_ioctl(struct ifnet *ifp, u_long cmd, ((ifp->if_flags ^ sc->alc_if_flags) & (IFF_PROMISC | IFF_ALLMULTI)) != 0) alc_rxfilter(sc); - else if ((sc->alc_flags & ALC_FLAG_DETACH) == 0) + else alc_init_locked(sc); } else if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) alc_stop(sc); @@ -2663,6 +2662,7 @@ alc_int_task(void *arg, int pending) ifp = sc->alc_ifp; status = CSR_READ_4(sc, ALC_INTR_STATUS); + ALC_LOCK(sc); if (sc->alc_morework != 0) { sc->alc_morework = 0; status |= INTR_RX_PKT; @@ -2680,7 +2680,6 @@ alc_int_task(void *arg, int pending) if (more == EAGAIN) sc->alc_morework = 1; else if (more == EIO) { - ALC_LOCK(sc); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; alc_init_locked(sc); ALC_UNLOCK(sc); @@ -2698,7 +2697,6 @@ alc_int_task(void *arg, int pending) if ((status & INTR_TXQ_TO_RST) != 0) device_printf(sc->alc_dev, "TxQ reset! -- resetting\n"); - ALC_LOCK(sc); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; alc_init_locked(sc); ALC_UNLOCK(sc); @@ -2706,11 +2704,12 @@ alc_int_task(void *arg, int pending) } if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0 && !IFQ_DRV_IS_EMPTY(&ifp->if_snd)) - alc_start(ifp); + alc_start_locked(ifp); } if (more == EAGAIN || (CSR_READ_4(sc, ALC_INTR_STATUS) & ALC_INTRS) != 0) { + ALC_UNLOCK(sc); taskqueue_enqueue(sc->alc_tq, &sc->alc_int_task); return; } @@ -2720,6 +2719,7 @@ done: /* Re-enable interrupts if we're running. */ CSR_WRITE_4(sc, ALC_INTR_STATUS, 0x7FFFFFFF); } + ALC_UNLOCK(sc); } static void @@ -3039,7 +3039,9 @@ alc_rxeof(struct alc_softc *sc, struct r #endif { /* Pass it on. */ + ALC_UNLOCK(sc); (*ifp->if_input)(ifp, m); + ALC_LOCK(sc); } } } Modified: stable/7/sys/dev/alc/if_alcvar.h ============================================================================== --- stable/7/sys/dev/alc/if_alcvar.h Sun Feb 20 01:08:49 2011 (r218868) +++ stable/7/sys/dev/alc/if_alcvar.h Sun Feb 20 01:10:14 2011 (r218869) @@ -230,7 +230,6 @@ struct alc_softc { #define ALC_FLAG_L0S 0x0400 #define ALC_FLAG_L1S 0x0800 #define ALC_FLAG_APS 0x1000 -#define ALC_FLAG_DETACH 0x4000 #define ALC_FLAG_LINK 0x8000 struct callout alc_tick_ch; From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:15:27 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11C501065673; Sun, 20 Feb 2011 01:15:27 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F27E78FC13; Sun, 20 Feb 2011 01:15:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K1FQeY014978; Sun, 20 Feb 2011 01:15:26 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K1FQrZ014976; Sun, 20 Feb 2011 01:15:26 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200115.p1K1FQrZ014976@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:15:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218870 - stable/8/sys/dev/alc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:15:27 -0000 Author: yongari Date: Sun Feb 20 01:15:26 2011 New Revision: 218870 URL: http://svn.freebsd.org/changeset/base/218870 Log: MFC r218141: alc_rev was used without initialization such that it failed to apply AR8152 v1.0 specific initialization code. Fix this bug by explicitly reading PCI device revision id via PCI accessor. Reported by: Gabriel Linder ( linder.gabriel <> gmail dot com ) Modified: stable/8/sys/dev/alc/if_alc.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/alc/if_alc.c ============================================================================== --- stable/8/sys/dev/alc/if_alc.c Sun Feb 20 01:10:14 2011 (r218869) +++ stable/8/sys/dev/alc/if_alc.c Sun Feb 20 01:15:26 2011 (r218870) @@ -810,7 +810,7 @@ alc_attach(device_t dev) CSR_READ_4(sc, ALC_PCIE_PHYMISC) | PCIE_PHYMISC_FORCE_RCV_DET); if (sc->alc_ident->deviceid == DEVICEID_ATHEROS_AR8152_B && - sc->alc_rev == ATHEROS_AR8152_B_V10) { + pci_get_revid(dev) == ATHEROS_AR8152_B_V10) { val = CSR_READ_4(sc, ALC_PCIE_PHYMISC2); val &= ~(PCIE_PHYMISC2_SERDES_CDR_MASK | PCIE_PHYMISC2_SERDES_TH_MASK); From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:17:00 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 18CBB1065672; Sun, 20 Feb 2011 01:17:00 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E03048FC12; Sun, 20 Feb 2011 01:16:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K1Gxsl015059; Sun, 20 Feb 2011 01:16:59 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K1Gxt3015057; Sun, 20 Feb 2011 01:16:59 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200116.p1K1Gxt3015057@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:16:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218871 - stable/7/sys/dev/alc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:17:00 -0000 Author: yongari Date: Sun Feb 20 01:16:59 2011 New Revision: 218871 URL: http://svn.freebsd.org/changeset/base/218871 Log: MFC r218141: alc_rev was used without initialization such that it failed to apply AR8152 v1.0 specific initialization code. Fix this bug by explicitly reading PCI device revision id via PCI accessor. Reported by: Gabriel Linder ( linder.gabriel <> gmail dot com ) Modified: stable/7/sys/dev/alc/if_alc.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/alc/if_alc.c ============================================================================== --- stable/7/sys/dev/alc/if_alc.c Sun Feb 20 01:15:26 2011 (r218870) +++ stable/7/sys/dev/alc/if_alc.c Sun Feb 20 01:16:59 2011 (r218871) @@ -810,7 +810,7 @@ alc_attach(device_t dev) CSR_READ_4(sc, ALC_PCIE_PHYMISC) | PCIE_PHYMISC_FORCE_RCV_DET); if (sc->alc_ident->deviceid == DEVICEID_ATHEROS_AR8152_B && - sc->alc_rev == ATHEROS_AR8152_B_V10) { + pci_get_revid(dev) == ATHEROS_AR8152_B_V10) { val = CSR_READ_4(sc, ALC_PCIE_PHYMISC2); val &= ~(PCIE_PHYMISC2_SERDES_CDR_MASK | PCIE_PHYMISC2_SERDES_TH_MASK); From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:20:49 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7213C106566B; Sun, 20 Feb 2011 01:20:49 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5E6008FC12; Sun, 20 Feb 2011 01:20:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K1Knx5015177; Sun, 20 Feb 2011 01:20:49 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K1KnOs015175; Sun, 20 Feb 2011 01:20:49 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200120.p1K1KnOs015175@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:20:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218872 - stable/8/sys/dev/nfe X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:20:49 -0000 Author: yongari Date: Sun Feb 20 01:20:49 2011 New Revision: 218872 URL: http://svn.freebsd.org/changeset/base/218872 Log: MFC r217794: Reinitialize driver when MTU is changed and driver is running. Reported by: Huang, Yusheng ( yusheng.huang <> bluecoat com ) Modified: stable/8/sys/dev/nfe/if_nfe.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/nfe/if_nfe.c ============================================================================== --- stable/8/sys/dev/nfe/if_nfe.c Sun Feb 20 01:16:59 2011 (r218871) +++ stable/8/sys/dev/nfe/if_nfe.c Sun Feb 20 01:20:49 2011 (r218872) @@ -1708,8 +1708,10 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, else { NFE_LOCK(sc); ifp->if_mtu = ifr->ifr_mtu; - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; nfe_init_locked(sc); + } NFE_UNLOCK(sc); } } From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:22:48 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADC6B106566C; Sun, 20 Feb 2011 01:22:48 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9A3CB8FC16; Sun, 20 Feb 2011 01:22:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K1Mmdj015277; Sun, 20 Feb 2011 01:22:48 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K1MmVn015275; Sun, 20 Feb 2011 01:22:48 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200122.p1K1MmVn015275@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:22:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218873 - stable/7/sys/dev/nfe X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:22:48 -0000 Author: yongari Date: Sun Feb 20 01:22:48 2011 New Revision: 218873 URL: http://svn.freebsd.org/changeset/base/218873 Log: MFC r217794: Reinitialize driver when MTU is changed and driver is running. Reported by: Huang, Yusheng ( yusheng.huang <> bluecoat com ) Modified: stable/7/sys/dev/nfe/if_nfe.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/nfe/if_nfe.c ============================================================================== --- stable/7/sys/dev/nfe/if_nfe.c Sun Feb 20 01:20:49 2011 (r218872) +++ stable/7/sys/dev/nfe/if_nfe.c Sun Feb 20 01:22:48 2011 (r218873) @@ -1707,8 +1707,10 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, else { NFE_LOCK(sc); ifp->if_mtu = ifr->ifr_mtu; - if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) + if (ifp->if_drv_flags & IFF_DRV_RUNNING) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; nfe_init_locked(sc); + } NFE_UNLOCK(sc); } } From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:25:00 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 37AC9106564A; Sun, 20 Feb 2011 01:25:00 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2416A8FC0A; Sun, 20 Feb 2011 01:25:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K1P0lm015375; Sun, 20 Feb 2011 01:25:00 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K1P03R015373; Sun, 20 Feb 2011 01:25:00 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200125.p1K1P03R015373@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:25:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218874 - stable/8/sys/dev/nfe X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:25:00 -0000 Author: yongari Date: Sun Feb 20 01:24:59 2011 New Revision: 218874 URL: http://svn.freebsd.org/changeset/base/218874 Log: MFC r215432: MCP55 is the only NVIDIA controller that supports VLAN tag insertion/stripping and it also supports TSO over VLAN. Implement TSO over VLAN support for MCP55 controller. While I'm here clean up SIOCSIFCAP ioctl handler. Since nfe(4) sets ifp capabilities based on various hardware flags in device attach, there is no need to check hardware flags again in SIOCSIFCAP ioctl handler. Also fix a bug which toggled both TX and RX checksum offloading even if user requested either TX or RX checksum configuration change. Tested by: Rob Farmer ( rfarmer <> predatorlabs dot net ) Modified: stable/8/sys/dev/nfe/if_nfe.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/nfe/if_nfe.c ============================================================================== --- stable/8/sys/dev/nfe/if_nfe.c Sun Feb 20 01:22:48 2011 (r218873) +++ stable/8/sys/dev/nfe/if_nfe.c Sun Feb 20 01:24:59 2011 (r218874) @@ -592,7 +592,8 @@ nfe_attach(device_t dev) if ((sc->nfe_flags & NFE_HW_VLAN) != 0) { ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; if ((ifp->if_capabilities & IFCAP_HWCSUM) != 0) - ifp->if_capabilities |= IFCAP_VLAN_HWCSUM; + ifp->if_capabilities |= IFCAP_VLAN_HWCSUM | + IFCAP_VLAN_HWTSO; } if (pci_find_extcap(dev, PCIY_PMG, ®) == 0) @@ -1777,20 +1778,35 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, if ((mask & IFCAP_WOL_MAGIC) != 0 && (ifp->if_capabilities & IFCAP_WOL_MAGIC) != 0) ifp->if_capenable ^= IFCAP_WOL_MAGIC; - - if ((sc->nfe_flags & NFE_HW_CSUM) != 0 && - (mask & IFCAP_HWCSUM) != 0) { - ifp->if_capenable ^= IFCAP_HWCSUM; - if ((IFCAP_TXCSUM & ifp->if_capenable) != 0 && - (IFCAP_TXCSUM & ifp->if_capabilities) != 0) + if ((mask & IFCAP_TXCSUM) != 0 && + (ifp->if_capabilities & IFCAP_TXCSUM) != 0) { + ifp->if_capenable ^= IFCAP_TXCSUM; + if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) ifp->if_hwassist |= NFE_CSUM_FEATURES; else ifp->if_hwassist &= ~NFE_CSUM_FEATURES; + } + if ((mask & IFCAP_RXCSUM) != 0 && + (ifp->if_capabilities & IFCAP_RXCSUM) != 0) { + ifp->if_capenable ^= IFCAP_RXCSUM; init++; } - if ((sc->nfe_flags & NFE_HW_VLAN) != 0 && - (mask & IFCAP_VLAN_HWTAGGING) != 0) { + if ((mask & IFCAP_TSO4) != 0 && + (ifp->if_capabilities & IFCAP_TSO4) != 0) { + ifp->if_capenable ^= IFCAP_TSO4; + if ((IFCAP_TSO4 & ifp->if_capenable) != 0) + ifp->if_hwassist |= CSUM_TSO; + else + ifp->if_hwassist &= ~CSUM_TSO; + } + if ((mask & IFCAP_VLAN_HWTSO) != 0 && + (ifp->if_capabilities & IFCAP_VLAN_HWTSO) != 0) + ifp->if_capenable ^= IFCAP_VLAN_HWTSO; + if ((mask & IFCAP_VLAN_HWTAGGING) != 0 && + (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) != 0) { ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING; + if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) == 0) + ifp->if_capenable &= ~IFCAP_VLAN_HWTSO; init++; } /* @@ -1800,28 +1816,17 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, * VLAN stripping. So when we know Rx checksum offload is * disabled turn entire hardware VLAN assist off. */ - if ((sc->nfe_flags & (NFE_HW_CSUM | NFE_HW_VLAN)) == - (NFE_HW_CSUM | NFE_HW_VLAN)) { - if ((ifp->if_capenable & IFCAP_RXCSUM) == 0) - ifp->if_capenable &= ~IFCAP_VLAN_HWTAGGING; + if ((ifp->if_capenable & IFCAP_RXCSUM) == 0) { + if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0) + init++; + ifp->if_capenable &= ~(IFCAP_VLAN_HWTAGGING | + IFCAP_VLAN_HWTSO); } - - if ((sc->nfe_flags & NFE_HW_CSUM) != 0 && - (mask & IFCAP_TSO4) != 0) { - ifp->if_capenable ^= IFCAP_TSO4; - if ((IFCAP_TSO4 & ifp->if_capenable) != 0 && - (IFCAP_TSO4 & ifp->if_capabilities) != 0) - ifp->if_hwassist |= CSUM_TSO; - else - ifp->if_hwassist &= ~CSUM_TSO; - } - if (init > 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { ifp->if_drv_flags &= ~IFF_DRV_RUNNING; nfe_init(sc); } - if ((sc->nfe_flags & NFE_HW_VLAN) != 0) - VLAN_CAPABILITIES(ifp); + VLAN_CAPABILITIES(ifp); break; default: error = ether_ioctl(ifp, cmd, data); From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 01:26:29 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD3F1106566B; Sun, 20 Feb 2011 01:26:29 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C9AF98FC21; Sun, 20 Feb 2011 01:26:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K1QTdV015446; Sun, 20 Feb 2011 01:26:29 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K1QTmE015444; Sun, 20 Feb 2011 01:26:29 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102200126.p1K1QTmE015444@svn.freebsd.org> From: Pyun YongHyeon Date: Sun, 20 Feb 2011 01:26:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218875 - stable/7/sys/dev/nfe X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 01:26:30 -0000 Author: yongari Date: Sun Feb 20 01:26:29 2011 New Revision: 218875 URL: http://svn.freebsd.org/changeset/base/218875 Log: MFC r215432: MCP55 is the only NVIDIA controller that supports VLAN tag insertion/stripping and it also supports TSO over VLAN. Implement TSO over VLAN support for MCP55 controller. While I'm here clean up SIOCSIFCAP ioctl handler. Since nfe(4) sets ifp capabilities based on various hardware flags in device attach, there is no need to check hardware flags again in SIOCSIFCAP ioctl handler. Also fix a bug which toggled both TX and RX checksum offloading even if user requested either TX or RX checksum configuration change. Tested by: Rob Farmer ( rfarmer <> predatorlabs dot net ) Modified: stable/7/sys/dev/nfe/if_nfe.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/nfe/if_nfe.c ============================================================================== --- stable/7/sys/dev/nfe/if_nfe.c Sun Feb 20 01:24:59 2011 (r218874) +++ stable/7/sys/dev/nfe/if_nfe.c Sun Feb 20 01:26:29 2011 (r218875) @@ -593,7 +593,8 @@ nfe_attach(device_t dev) if ((sc->nfe_flags & NFE_HW_VLAN) != 0) { ifp->if_capabilities |= IFCAP_VLAN_HWTAGGING; if ((ifp->if_capabilities & IFCAP_HWCSUM) != 0) - ifp->if_capabilities |= IFCAP_VLAN_HWCSUM; + ifp->if_capabilities |= IFCAP_VLAN_HWCSUM | + IFCAP_VLAN_HWTSO; } if (pci_find_extcap(dev, PCIY_PMG, ®) == 0) @@ -1776,20 +1777,35 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, if ((mask & IFCAP_WOL_MAGIC) != 0 && (ifp->if_capabilities & IFCAP_WOL_MAGIC) != 0) ifp->if_capenable ^= IFCAP_WOL_MAGIC; - - if ((sc->nfe_flags & NFE_HW_CSUM) != 0 && - (mask & IFCAP_HWCSUM) != 0) { - ifp->if_capenable ^= IFCAP_HWCSUM; - if ((IFCAP_TXCSUM & ifp->if_capenable) != 0 && - (IFCAP_TXCSUM & ifp->if_capabilities) != 0) + if ((mask & IFCAP_TXCSUM) != 0 && + (ifp->if_capabilities & IFCAP_TXCSUM) != 0) { + ifp->if_capenable ^= IFCAP_TXCSUM; + if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) ifp->if_hwassist |= NFE_CSUM_FEATURES; else ifp->if_hwassist &= ~NFE_CSUM_FEATURES; + } + if ((mask & IFCAP_RXCSUM) != 0 && + (ifp->if_capabilities & IFCAP_RXCSUM) != 0) { + ifp->if_capenable ^= IFCAP_RXCSUM; init++; } - if ((sc->nfe_flags & NFE_HW_VLAN) != 0 && - (mask & IFCAP_VLAN_HWTAGGING) != 0) { + if ((mask & IFCAP_TSO4) != 0 && + (ifp->if_capabilities & IFCAP_TSO4) != 0) { + ifp->if_capenable ^= IFCAP_TSO4; + if ((IFCAP_TSO4 & ifp->if_capenable) != 0) + ifp->if_hwassist |= CSUM_TSO; + else + ifp->if_hwassist &= ~CSUM_TSO; + } + if ((mask & IFCAP_VLAN_HWTSO) != 0 && + (ifp->if_capabilities & IFCAP_VLAN_HWTSO) != 0) + ifp->if_capenable ^= IFCAP_VLAN_HWTSO; + if ((mask & IFCAP_VLAN_HWTAGGING) != 0 && + (ifp->if_capabilities & IFCAP_VLAN_HWTAGGING) != 0) { ifp->if_capenable ^= IFCAP_VLAN_HWTAGGING; + if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) == 0) + ifp->if_capenable &= ~IFCAP_VLAN_HWTSO; init++; } /* @@ -1799,28 +1815,17 @@ nfe_ioctl(struct ifnet *ifp, u_long cmd, * VLAN stripping. So when we know Rx checksum offload is * disabled turn entire hardware VLAN assist off. */ - if ((sc->nfe_flags & (NFE_HW_CSUM | NFE_HW_VLAN)) == - (NFE_HW_CSUM | NFE_HW_VLAN)) { - if ((ifp->if_capenable & IFCAP_RXCSUM) == 0) - ifp->if_capenable &= ~IFCAP_VLAN_HWTAGGING; + if ((ifp->if_capenable & IFCAP_RXCSUM) == 0) { + if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0) + init++; + ifp->if_capenable &= ~(IFCAP_VLAN_HWTAGGING | + IFCAP_VLAN_HWTSO); } - - if ((sc->nfe_flags & NFE_HW_CSUM) != 0 && - (mask & IFCAP_TSO4) != 0) { - ifp->if_capenable ^= IFCAP_TSO4; - if ((IFCAP_TSO4 & ifp->if_capenable) != 0 && - (IFCAP_TSO4 & ifp->if_capabilities) != 0) - ifp->if_hwassist |= CSUM_TSO; - else - ifp->if_hwassist &= ~CSUM_TSO; - } - if (init > 0 && (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { ifp->if_drv_flags &= ~IFF_DRV_RUNNING; nfe_init(sc); } - if ((sc->nfe_flags & NFE_HW_VLAN) != 0) - VLAN_CAPABILITIES(ifp); + VLAN_CAPABILITIES(ifp); break; default: error = ether_ioctl(ifp, cmd, data); From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 09:18:00 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 313AC106566B; Sun, 20 Feb 2011 09:18:00 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1FF808FC1C; Sun, 20 Feb 2011 09:18:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1K9I0Lt026311; Sun, 20 Feb 2011 09:18:00 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1K9I0wZ026309; Sun, 20 Feb 2011 09:18:00 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201102200918.p1K9I0wZ026309@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 20 Feb 2011 09:17:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218880 - stable/8/sys/vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 09:18:00 -0000 Author: kib Date: Sun Feb 20 09:17:59 2011 New Revision: 218880 URL: http://svn.freebsd.org/changeset/base/218880 Log: MFC r218670: Lock the vnode around clearing of VV_TEXT flag. Remove mp_fixme() note mentioning that vnode lock is needed. Modified: stable/8/sys/vm/vm_object.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/vm/vm_object.c ============================================================================== --- stable/8/sys/vm/vm_object.c Sun Feb 20 07:58:30 2011 (r218879) +++ stable/8/sys/vm/vm_object.c Sun Feb 20 09:17:59 2011 (r218880) @@ -441,16 +441,21 @@ vm_object_vndeallocate(vm_object_t objec } #endif - object->ref_count--; - if (object->ref_count == 0) { - mp_fixme("Unlocked vflag access."); - vp->v_vflag &= ~VV_TEXT; + if (object->ref_count > 1) { + object->ref_count--; + VM_OBJECT_UNLOCK(object); + /* vrele may need the vnode lock. */ + vrele(vp); + } else { + VM_OBJECT_UNLOCK(object); + vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); + VM_OBJECT_LOCK(object); + object->ref_count--; + if (object->ref_count == 0) + vp->v_vflag &= ~VV_TEXT; + VM_OBJECT_UNLOCK(object); + vput(vp); } - VM_OBJECT_UNLOCK(object); - /* - * vrele may need a vop lock - */ - vrele(vp); } /* From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 11:29:40 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E27D1106564A; Sun, 20 Feb 2011 11:29:40 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D00408FC16; Sun, 20 Feb 2011 11:29:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KBTe0a030851; Sun, 20 Feb 2011 11:29:40 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KBTepL030849; Sun, 20 Feb 2011 11:29:40 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102201129.p1KBTepL030849@svn.freebsd.org> From: Ulrich Spoerlein Date: Sun, 20 Feb 2011 11:29:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218882 - stable/8/share/syscons/keymaps X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 11:29:41 -0000 Author: uqs Date: Sun Feb 20 11:29:40 2011 New Revision: 218882 URL: http://svn.freebsd.org/changeset/base/218882 Log: MFH r218089: syscons: install all available kbdmaps eee_nordic.kbd, us.dvorakl.kbd, and us.dvorakr.kbd were not installed. Found by: Neil Short Modified: stable/8/share/syscons/keymaps/Makefile Directory Properties: stable/8/share/syscons/ (props changed) Modified: stable/8/share/syscons/keymaps/Makefile ============================================================================== --- stable/8/share/syscons/keymaps/Makefile Sun Feb 20 09:52:29 2011 (r218881) +++ stable/8/share/syscons/keymaps/Makefile Sun Feb 20 11:29:40 2011 (r218882) @@ -11,7 +11,7 @@ FILES= INDEX.keymaps \ cz.iso2.kbd \ danish.iso.kbd danish.iso.acc.kbd danish.cp865.kbd \ dutch.iso.acc.kbd \ - el.iso07.kbd \ + eee_nordic.kbd el.iso07.kbd \ estonian.iso.kbd estonian.iso15.kbd estonian.cp850.kbd \ finnish.iso.kbd finnish.cp850.kbd \ fr.iso.kbd fr.iso.acc.kbd fr.dvorak.kbd fr.dvorak.acc.kbd \ @@ -45,8 +45,8 @@ FILES= INDEX.keymaps \ ua.koi8-u.kbd ua.koi8-u.shift.alt.kbd ua.iso5.kbd \ uk.iso.kbd uk.iso-ctrl.kbd uk.cp850.kbd uk.cp850-ctrl.kbd \ uk.dvorak.kbd \ - us.iso.kbd us.dvorak.kbd us.dvorakx.kbd us.emacs.kbd us.pc-ctrl.kbd \ - us.unix.kbd us.iso.acc.kbd + us.iso.kbd us.dvorak.kbd us.dvorakl.kbd us.dvorakr.kbd us.dvorakx.kbd \ + us.emacs.kbd us.pc-ctrl.kbd us.unix.kbd us.iso.acc.kbd FILESDIR= ${SHAREDIR}/syscons/keymaps From owner-svn-src-stable@FreeBSD.ORG Sun Feb 20 11:30:13 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0259C1065670; Sun, 20 Feb 2011 11:30:13 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E42448FC21; Sun, 20 Feb 2011 11:30:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1KBUCmx030907; Sun, 20 Feb 2011 11:30:12 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1KBUC20030905; Sun, 20 Feb 2011 11:30:12 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102201130.p1KBUC20030905@svn.freebsd.org> From: Ulrich Spoerlein Date: Sun, 20 Feb 2011 11:30:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218883 - stable/7/share/syscons/keymaps X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Feb 2011 11:30:13 -0000 Author: uqs Date: Sun Feb 20 11:30:12 2011 New Revision: 218883 URL: http://svn.freebsd.org/changeset/base/218883 Log: MFH r218089: syscons: install all available kbdmaps us.dvorakl.kbd, and us.dvorakr.kbd were not installed. Found by: Neil Short Modified: stable/7/share/syscons/keymaps/Makefile Directory Properties: stable/7/share/syscons/ (props changed) stable/7/share/syscons/keymaps/ (props changed) Modified: stable/7/share/syscons/keymaps/Makefile ============================================================================== --- stable/7/share/syscons/keymaps/Makefile Sun Feb 20 11:29:40 2011 (r218882) +++ stable/7/share/syscons/keymaps/Makefile Sun Feb 20 11:30:12 2011 (r218883) @@ -45,8 +45,8 @@ FILES= INDEX.keymaps \ ua.koi8-u.kbd ua.koi8-u.shift.alt.kbd ua.iso5.kbd \ uk.iso.kbd uk.iso-ctrl.kbd uk.cp850.kbd uk.cp850-ctrl.kbd \ uk.dvorak.kbd \ - us.iso.kbd us.dvorak.kbd us.dvorakx.kbd us.emacs.kbd us.pc-ctrl.kbd \ - us.unix.kbd us.iso.acc.kbd + us.iso.kbd us.dvorak.kbd us.dvorakl.kbd us.dvorakr.kbd us.dvorakx.kbd \ + us.emacs.kbd us.pc-ctrl.kbd us.unix.kbd us.iso.acc.kbd FILESDIR= ${SHAREDIR}/syscons/keymaps From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 00:47:40 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20AD6106566C; Mon, 21 Feb 2011 00:47:40 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0D79C8FC18; Mon, 21 Feb 2011 00:47:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L0ldqP050092; Mon, 21 Feb 2011 00:47:39 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L0ldm4050089; Mon, 21 Feb 2011 00:47:39 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210047.p1L0ldm4050089@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 00:47:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218897 - in stable/8/sys: dev/re pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 00:47:40 -0000 Author: yongari Date: Mon Feb 21 00:47:39 2011 New Revision: 218897 URL: http://svn.freebsd.org/changeset/base/218897 Log: MFC r217246,217832: r217246: Implement TSO on RealTek RTL8168/8111 C or later controllers. RealTek changed TX descriptor format for later controllers so these controllers require MSS configuration in different location of TX descriptor. TSO is enabled by default for controllers that use new descriptor format. For old controllers, TSO is still disabled by default due to broken frames under certain conditions but users can enable it. Special thanks to Hayes Wang at RealTek. r217832: Disable TSO for all Realtek controllers. Experimentation showed RTL8111C generated corrupted frames where TCP option header was broken. All other sample controllers I have did not show such problem so it could be RTL8111C specific issue. Because there are too many variants it's hard to tell how many controllers have such issue. Just disable TSO by default but have user override it. Modified: stable/8/sys/dev/re/if_re.c stable/8/sys/pci/if_rlreg.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/re/if_re.c ============================================================================== --- stable/8/sys/dev/re/if_re.c Sun Feb 20 22:32:21 2011 (r218896) +++ stable/8/sys/dev/re/if_re.c Mon Feb 21 00:47:39 2011 (r218897) @@ -1460,8 +1460,8 @@ re_attach(device_t dev) ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = re_ioctl; ifp->if_start = re_start; - ifp->if_hwassist = RE_CSUM_FEATURES; - ifp->if_capabilities = IFCAP_HWCSUM; + ifp->if_hwassist = RE_CSUM_FEATURES | CSUM_TSO; + ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_TSO4; ifp->if_capenable = ifp->if_capabilities; ifp->if_init = re_init; IFQ_SET_MAXLEN(&ifp->if_snd, RL_IFQ_MAXLEN); @@ -1472,16 +1472,6 @@ re_attach(device_t dev) TASK_INIT(&sc->rl_inttask, 0, re_int_task, sc); /* - * XXX - * Still have no idea how to make TSO work on 8168C, 8168CP, - * 8111C and 8111CP. - */ - if ((sc->rl_flags & RL_FLAG_DESCV2) == 0) { - ifp->if_hwassist |= CSUM_TSO; - ifp->if_capabilities |= IFCAP_TSO4 | IFCAP_VLAN_HWTSO; - } - - /* * Call MI attach routine. */ ether_ifattach(ifp, eaddr); @@ -1495,9 +1485,9 @@ re_attach(device_t dev) ifp->if_capabilities |= IFCAP_WOL; ifp->if_capenable = ifp->if_capabilities; /* - * Don't enable TSO by default. Under certain - * circumtances the controller generated corrupted - * packets in TSO size. + * Don't enable TSO by default. It is known to generate + * corrupted TCP segments(bad TCP options) under certain + * circumtances. */ ifp->if_hwassist &= ~CSUM_TSO; ifp->if_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); @@ -2413,11 +2403,17 @@ re_encap(struct rl_softc *sc, struct mbu */ vlanctl = 0; csum_flags = 0; - if (((*m_head)->m_pkthdr.csum_flags & CSUM_TSO) != 0) - csum_flags = RL_TDESC_CMD_LGSEND | - ((uint32_t)(*m_head)->m_pkthdr.tso_segsz << - RL_TDESC_CMD_MSSVAL_SHIFT); - else { + if (((*m_head)->m_pkthdr.csum_flags & CSUM_TSO) != 0) { + if ((sc->rl_flags & RL_FLAG_DESCV2) != 0) { + csum_flags |= RL_TDESC_CMD_LGSEND; + vlanctl |= ((uint32_t)(*m_head)->m_pkthdr.tso_segsz << + RL_TDESC_CMD_MSSVALV2_SHIFT); + } else { + csum_flags |= RL_TDESC_CMD_LGSEND | + ((uint32_t)(*m_head)->m_pkthdr.tso_segsz << + RL_TDESC_CMD_MSSVAL_SHIFT); + } + } else { /* * Unconditionally enable IP checksum if TCP or UDP * checksum is required. Otherwise, TCP/UDP checksum Modified: stable/8/sys/pci/if_rlreg.h ============================================================================== --- stable/8/sys/pci/if_rlreg.h Sun Feb 20 22:32:21 2011 (r218896) +++ stable/8/sys/pci/if_rlreg.h Mon Feb 21 00:47:39 2011 (r218897) @@ -657,6 +657,8 @@ struct rl_desc { #define RL_TDESC_CMD_UDPCSUMV2 0x80000000 #define RL_TDESC_CMD_TCPCSUMV2 0x40000000 #define RL_TDESC_CMD_IPCSUMV2 0x20000000 +#define RL_TDESC_CMD_MSSVALV2 0x1FFC0000 +#define RL_TDESC_CMD_MSSVALV2_SHIFT 18 /* * Error bits are valid only on the last descriptor of a frame From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 00:50:49 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40AD71065674; Mon, 21 Feb 2011 00:50:49 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2D95F8FC12; Mon, 21 Feb 2011 00:50:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L0onBn050219; Mon, 21 Feb 2011 00:50:49 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L0onLL050216; Mon, 21 Feb 2011 00:50:49 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210050.p1L0onLL050216@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 00:50:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218898 - in stable/7/sys: dev/re pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 00:50:49 -0000 Author: yongari Date: Mon Feb 21 00:50:48 2011 New Revision: 218898 URL: http://svn.freebsd.org/changeset/base/218898 Log: MFC r217246,217832: r217246: Implement TSO on RealTek RTL8168/8111 C or later controllers. RealTek changed TX descriptor format for later controllers so these controllers require MSS configuration in different location of TX descriptor. TSO is enabled by default for controllers that use new descriptor format. For old controllers, TSO is still disabled by default due to broken frames under certain conditions but users can enable it. Special thanks to Hayes Wang at RealTek. r217832: Disable TSO for all Realtek controllers. Experimentation showed RTL8111C generated corrupted frames where TCP option header was broken. All other sample controllers I have did not show such problem so it could be RTL8111C specific issue. Because there are too many variants it's hard to tell how many controllers have such issue. Just disable TSO by default but have user override it. Modified: stable/7/sys/dev/re/if_re.c stable/7/sys/pci/if_rlreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/re/if_re.c ============================================================================== --- stable/7/sys/dev/re/if_re.c Mon Feb 21 00:47:39 2011 (r218897) +++ stable/7/sys/dev/re/if_re.c Mon Feb 21 00:50:48 2011 (r218898) @@ -1461,8 +1461,8 @@ re_attach(device_t dev) ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = re_ioctl; ifp->if_start = re_start; - ifp->if_hwassist = RE_CSUM_FEATURES; - ifp->if_capabilities = IFCAP_HWCSUM; + ifp->if_hwassist = RE_CSUM_FEATURES | CSUM_TSO; + ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_TSO4; ifp->if_capenable = ifp->if_capabilities; ifp->if_init = re_init; IFQ_SET_MAXLEN(&ifp->if_snd, RL_IFQ_MAXLEN); @@ -1473,16 +1473,6 @@ re_attach(device_t dev) TASK_INIT(&sc->rl_inttask, 0, re_int_task, sc); /* - * XXX - * Still have no idea how to make TSO work on 8168C, 8168CP, - * 8111C and 8111CP. - */ - if ((sc->rl_flags & RL_FLAG_DESCV2) == 0) { - ifp->if_hwassist |= CSUM_TSO; - ifp->if_capabilities |= IFCAP_TSO4 | IFCAP_VLAN_HWTSO; - } - - /* * Call MI attach routine. */ ether_ifattach(ifp, eaddr); @@ -1496,9 +1486,9 @@ re_attach(device_t dev) ifp->if_capabilities |= IFCAP_WOL; ifp->if_capenable = ifp->if_capabilities; /* - * Don't enable TSO by default. Under certain - * circumtances the controller generated corrupted - * packets in TSO size. + * Don't enable TSO by default. It is known to generate + * corrupted TCP segments(bad TCP options) under certain + * circumtances. */ ifp->if_hwassist &= ~CSUM_TSO; ifp->if_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); @@ -2407,11 +2397,17 @@ re_encap(struct rl_softc *sc, struct mbu */ vlanctl = 0; csum_flags = 0; - if (((*m_head)->m_pkthdr.csum_flags & CSUM_TSO) != 0) - csum_flags = RL_TDESC_CMD_LGSEND | - ((uint32_t)(*m_head)->m_pkthdr.tso_segsz << - RL_TDESC_CMD_MSSVAL_SHIFT); - else { + if (((*m_head)->m_pkthdr.csum_flags & CSUM_TSO) != 0) { + if ((sc->rl_flags & RL_FLAG_DESCV2) != 0) { + csum_flags |= RL_TDESC_CMD_LGSEND; + vlanctl |= ((uint32_t)(*m_head)->m_pkthdr.tso_segsz << + RL_TDESC_CMD_MSSVALV2_SHIFT); + } else { + csum_flags |= RL_TDESC_CMD_LGSEND | + ((uint32_t)(*m_head)->m_pkthdr.tso_segsz << + RL_TDESC_CMD_MSSVAL_SHIFT); + } + } else { /* * Unconditionally enable IP checksum if TCP or UDP * checksum is required. Otherwise, TCP/UDP checksum Modified: stable/7/sys/pci/if_rlreg.h ============================================================================== --- stable/7/sys/pci/if_rlreg.h Mon Feb 21 00:47:39 2011 (r218897) +++ stable/7/sys/pci/if_rlreg.h Mon Feb 21 00:50:48 2011 (r218898) @@ -657,6 +657,8 @@ struct rl_desc { #define RL_TDESC_CMD_UDPCSUMV2 0x80000000 #define RL_TDESC_CMD_TCPCSUMV2 0x40000000 #define RL_TDESC_CMD_IPCSUMV2 0x20000000 +#define RL_TDESC_CMD_MSSVALV2 0x1FFC0000 +#define RL_TDESC_CMD_MSSVALV2_SHIFT 18 /* * Error bits are valid only on the last descriptor of a frame From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 00:58:51 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 48569106564A; Mon, 21 Feb 2011 00:58:51 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3511B8FC13; Mon, 21 Feb 2011 00:58:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L0wpxk050478; Mon, 21 Feb 2011 00:58:51 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L0wphe050476; Mon, 21 Feb 2011 00:58:51 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210058.p1L0wphe050476@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 00:58:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218899 - stable/8/sys/dev/re X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 00:58:51 -0000 Author: yongari Date: Mon Feb 21 00:58:50 2011 New Revision: 218899 URL: http://svn.freebsd.org/changeset/base/218899 Log: MFC r217247,217381-217382,217384-217385: r217247: When driver is not running, do not send DUMP command to controller and just show old (cached) values. Controller will not respond to the command unless MAC is enabled so DUMP request for down interface caused request timeout. r217381: Allow TX/RX checksum offloading to be configured independently. r217382: re_reset() should be called only after setting device specific features. r217384: Make sure to check validity of dma maps before destroying. r217385: If driver is not able to allocate RX buffer, do not start driver. While I'm here move RX buffer allocation and descriptor initialization up to not touch hardware registers in case of RX buffer allocation failure. Modified: stable/8/sys/dev/re/if_re.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/re/if_re.c ============================================================================== --- stable/8/sys/dev/re/if_re.c Mon Feb 21 00:50:48 2011 (r218898) +++ stable/8/sys/dev/re/if_re.c Mon Feb 21 00:58:50 2011 (r218899) @@ -1258,11 +1258,6 @@ re_attach(device_t dev) CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); } - /* Reset the adapter. */ - RL_LOCK(sc); - re_reset(sc); - RL_UNLOCK(sc); - hw_rev = re_hwrevs; hwrev = CSR_READ_4(sc, RL_TXCFG); switch (hwrev & 0x70000000) { @@ -1366,6 +1361,11 @@ re_attach(device_t dev) break; } + /* Reset the adapter. */ + RL_LOCK(sc); + re_reset(sc); + RL_UNLOCK(sc); + /* Enable PME. */ CSR_WRITE_1(sc, RL_EECMD, RL_EE_MODE); cfg = CSR_READ_1(sc, RL_CFG1); @@ -1661,15 +1661,19 @@ re_detach(device_t dev) /* Destroy all the RX and TX buffer maps */ if (sc->rl_ldata.rl_tx_mtag) { - for (i = 0; i < sc->rl_ldata.rl_tx_desc_cnt; i++) - bus_dmamap_destroy(sc->rl_ldata.rl_tx_mtag, - sc->rl_ldata.rl_tx_desc[i].tx_dmamap); + for (i = 0; i < sc->rl_ldata.rl_tx_desc_cnt; i++) { + if (sc->rl_ldata.rl_tx_desc[i].tx_dmamap) + bus_dmamap_destroy(sc->rl_ldata.rl_tx_mtag, + sc->rl_ldata.rl_tx_desc[i].tx_dmamap); + } bus_dma_tag_destroy(sc->rl_ldata.rl_tx_mtag); } if (sc->rl_ldata.rl_rx_mtag) { - for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) - bus_dmamap_destroy(sc->rl_ldata.rl_rx_mtag, - sc->rl_ldata.rl_rx_desc[i].rx_dmamap); + for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { + if (sc->rl_ldata.rl_rx_desc[i].rx_dmamap) + bus_dmamap_destroy(sc->rl_ldata.rl_rx_mtag, + sc->rl_ldata.rl_rx_desc[i].rx_dmamap); + } if (sc->rl_ldata.rl_rx_sparemap) bus_dmamap_destroy(sc->rl_ldata.rl_rx_mtag, sc->rl_ldata.rl_rx_sparemap); @@ -2616,6 +2620,16 @@ re_init_locked(struct rl_softc *sc) re_reset(sc); /* + * For C+ mode, initialize the RX descriptors and mbufs. + */ + if (re_rx_list_init(sc) != 0) { + device_printf(sc->rl_dev, "no memory for RX buffers\n"); + re_stop(sc); + return; + } + re_tx_list_init(sc); + + /* * Enable C+ RX and TX mode, as well as VLAN stripping and * RX checksum offload. We must configure the C+ register * before all others. @@ -2667,12 +2681,6 @@ re_init_locked(struct rl_softc *sc) CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); /* - * For C+ mode, initialize the RX descriptors and mbufs. - */ - re_rx_list_init(sc); - re_tx_list_init(sc); - - /* * Load the addresses of the RX and TX lists into the chip. */ @@ -2921,14 +2929,20 @@ re_ioctl(struct ifnet *ifp, u_long comma } } #endif /* DEVICE_POLLING */ - if (mask & IFCAP_HWCSUM) { - ifp->if_capenable ^= IFCAP_HWCSUM; - if (ifp->if_capenable & IFCAP_TXCSUM) + if ((mask & IFCAP_TXCSUM) != 0 && + (ifp->if_capabilities & IFCAP_TXCSUM) != 0) { + ifp->if_capenable ^= IFCAP_TXCSUM; + if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) ifp->if_hwassist |= RE_CSUM_FEATURES; else ifp->if_hwassist &= ~RE_CSUM_FEATURES; reinit = 1; } + if ((mask & IFCAP_RXCSUM) != 0 && + (ifp->if_capabilities & IFCAP_RXCSUM) != 0) { + ifp->if_capenable ^= IFCAP_RXCSUM; + reinit = 1; + } if ((mask & IFCAP_TSO4) != 0 && (ifp->if_capabilities & IFCAP_TSO) != 0) { ifp->if_capenable ^= IFCAP_TSO4; @@ -3281,6 +3295,10 @@ re_sysctl_stats(SYSCTL_HANDLER_ARGS) if (result == 1) { sc = (struct rl_softc *)arg1; RL_LOCK(sc); + if ((sc->rl_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + RL_UNLOCK(sc); + goto done; + } bus_dmamap_sync(sc->rl_ldata.rl_stag, sc->rl_ldata.rl_smap, BUS_DMASYNC_PREREAD); CSR_WRITE_4(sc, RL_DUMPSTATS_HI, @@ -3304,6 +3322,7 @@ re_sysctl_stats(SYSCTL_HANDLER_ARGS) "DUMP statistics request timedout\n"); return (ETIMEDOUT); } +done: stats = sc->rl_ldata.rl_stats; printf("%s statistics:\n", device_get_nameunit(sc->rl_dev)); printf("Tx frames : %ju\n", From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 01:01:26 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 805691065672; Mon, 21 Feb 2011 01:01:26 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6D5FD8FC0A; Mon, 21 Feb 2011 01:01:26 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L11QbM050655; Mon, 21 Feb 2011 01:01:26 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L11Qj7050653; Mon, 21 Feb 2011 01:01:26 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210101.p1L11Qj7050653@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 01:01:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218900 - stable/7/sys/dev/re X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 01:01:26 -0000 Author: yongari Date: Mon Feb 21 01:01:26 2011 New Revision: 218900 URL: http://svn.freebsd.org/changeset/base/218900 Log: MFC r217247,217381-217382,217384-217385: r217247: When driver is not running, do not send DUMP command to controller and just show old (cached) values. Controller will not respond to the command unless MAC is enabled so DUMP request for down interface caused request timeout. r217381: Allow TX/RX checksum offloading to be configured independently. r217382: re_reset() should be called only after setting device specific features. r217384: Make sure to check validity of dma maps before destroying. r217385: If driver is not able to allocate RX buffer, do not start driver. While I'm here move RX buffer allocation and descriptor initialization up to not touch hardware registers in case of RX buffer allocation failure. Modified: stable/7/sys/dev/re/if_re.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/re/if_re.c ============================================================================== --- stable/7/sys/dev/re/if_re.c Mon Feb 21 00:58:50 2011 (r218899) +++ stable/7/sys/dev/re/if_re.c Mon Feb 21 01:01:26 2011 (r218900) @@ -1259,11 +1259,6 @@ re_attach(device_t dev) CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); } - /* Reset the adapter. */ - RL_LOCK(sc); - re_reset(sc); - RL_UNLOCK(sc); - hw_rev = re_hwrevs; hwrev = CSR_READ_4(sc, RL_TXCFG); switch (hwrev & 0x70000000) { @@ -1367,6 +1362,11 @@ re_attach(device_t dev) break; } + /* Reset the adapter. */ + RL_LOCK(sc); + re_reset(sc); + RL_UNLOCK(sc); + /* Enable PME. */ CSR_WRITE_1(sc, RL_EECMD, RL_EE_MODE); cfg = CSR_READ_1(sc, RL_CFG1); @@ -1662,15 +1662,19 @@ re_detach(device_t dev) /* Destroy all the RX and TX buffer maps */ if (sc->rl_ldata.rl_tx_mtag) { - for (i = 0; i < sc->rl_ldata.rl_tx_desc_cnt; i++) - bus_dmamap_destroy(sc->rl_ldata.rl_tx_mtag, - sc->rl_ldata.rl_tx_desc[i].tx_dmamap); + for (i = 0; i < sc->rl_ldata.rl_tx_desc_cnt; i++) { + if (sc->rl_ldata.rl_tx_desc[i].tx_dmamap) + bus_dmamap_destroy(sc->rl_ldata.rl_tx_mtag, + sc->rl_ldata.rl_tx_desc[i].tx_dmamap); + } bus_dma_tag_destroy(sc->rl_ldata.rl_tx_mtag); } if (sc->rl_ldata.rl_rx_mtag) { - for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) - bus_dmamap_destroy(sc->rl_ldata.rl_rx_mtag, - sc->rl_ldata.rl_rx_desc[i].rx_dmamap); + for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { + if (sc->rl_ldata.rl_rx_desc[i].rx_dmamap) + bus_dmamap_destroy(sc->rl_ldata.rl_rx_mtag, + sc->rl_ldata.rl_rx_desc[i].rx_dmamap); + } if (sc->rl_ldata.rl_rx_sparemap) bus_dmamap_destroy(sc->rl_ldata.rl_rx_mtag, sc->rl_ldata.rl_rx_sparemap); @@ -2610,6 +2614,16 @@ re_init_locked(struct rl_softc *sc) re_reset(sc); /* + * For C+ mode, initialize the RX descriptors and mbufs. + */ + if (re_rx_list_init(sc) != 0) { + device_printf(sc->rl_dev, "no memory for RX buffers\n"); + re_stop(sc); + return; + } + re_tx_list_init(sc); + + /* * Enable C+ RX and TX mode, as well as VLAN stripping and * RX checksum offload. We must configure the C+ register * before all others. @@ -2661,12 +2675,6 @@ re_init_locked(struct rl_softc *sc) CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); /* - * For C+ mode, initialize the RX descriptors and mbufs. - */ - re_rx_list_init(sc); - re_tx_list_init(sc); - - /* * Load the addresses of the RX and TX lists into the chip. */ @@ -2915,14 +2923,20 @@ re_ioctl(struct ifnet *ifp, u_long comma } } #endif /* DEVICE_POLLING */ - if (mask & IFCAP_HWCSUM) { - ifp->if_capenable ^= IFCAP_HWCSUM; - if (ifp->if_capenable & IFCAP_TXCSUM) + if ((mask & IFCAP_TXCSUM) != 0 && + (ifp->if_capabilities & IFCAP_TXCSUM) != 0) { + ifp->if_capenable ^= IFCAP_TXCSUM; + if ((ifp->if_capenable & IFCAP_TXCSUM) != 0) ifp->if_hwassist |= RE_CSUM_FEATURES; else ifp->if_hwassist &= ~RE_CSUM_FEATURES; reinit = 1; } + if ((mask & IFCAP_RXCSUM) != 0 && + (ifp->if_capabilities & IFCAP_RXCSUM) != 0) { + ifp->if_capenable ^= IFCAP_RXCSUM; + reinit = 1; + } if ((mask & IFCAP_TSO4) != 0 && (ifp->if_capabilities & IFCAP_TSO) != 0) { ifp->if_capenable ^= IFCAP_TSO4; @@ -3275,6 +3289,10 @@ re_sysctl_stats(SYSCTL_HANDLER_ARGS) if (result == 1) { sc = (struct rl_softc *)arg1; RL_LOCK(sc); + if ((sc->rl_ifp->if_drv_flags & IFF_DRV_RUNNING) == 0) { + RL_UNLOCK(sc); + goto done; + } bus_dmamap_sync(sc->rl_ldata.rl_stag, sc->rl_ldata.rl_smap, BUS_DMASYNC_PREREAD); CSR_WRITE_4(sc, RL_DUMPSTATS_HI, @@ -3298,6 +3316,7 @@ re_sysctl_stats(SYSCTL_HANDLER_ARGS) "DUMP statistics request timedout\n"); return (ETIMEDOUT); } +done: stats = sc->rl_ldata.rl_stats; printf("%s statistics:\n", device_get_nameunit(sc->rl_dev)); printf("Tx frames : %ju\n", From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 01:04:16 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9CF1C106566C; Mon, 21 Feb 2011 01:04:16 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6FD388FC0A; Mon, 21 Feb 2011 01:04:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L14GpY050753; Mon, 21 Feb 2011 01:04:16 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L14GRu050750; Mon, 21 Feb 2011 01:04:16 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210104.p1L14GRu050750@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 01:04:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218901 - in stable/8/sys: dev/re pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 01:04:16 -0000 Author: yongari Date: Mon Feb 21 01:04:16 2011 New Revision: 218901 URL: http://svn.freebsd.org/changeset/base/218901 Log: MFC r217498: Add initial support for RTL8168E/8111E-VL PCIe GbE. Modified: stable/8/sys/dev/re/if_re.c stable/8/sys/pci/if_rlreg.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/re/if_re.c ============================================================================== --- stable/8/sys/dev/re/if_re.c Mon Feb 21 01:01:26 2011 (r218900) +++ stable/8/sys/dev/re/if_re.c Mon Feb 21 01:04:16 2011 (r218901) @@ -221,6 +221,7 @@ static struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8168D, RL_8169, "8168D/8111D"}, { RL_HWREV_8168DP, RL_8169, "8168DP/8111DP"}, { RL_HWREV_8168E, RL_8169, "8168E/8111E"}, + { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL"}, { 0, 0, NULL } }; @@ -1346,6 +1347,11 @@ re_attach(device_t dev) RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO; break; + case RL_HWREV_8168E_VL: + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | + RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | + RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO; + break; case RL_HWREV_8169_8110SB: case RL_HWREV_8169_8110SBL: case RL_HWREV_8169_8110SC: Modified: stable/8/sys/pci/if_rlreg.h ============================================================================== --- stable/8/sys/pci/if_rlreg.h Mon Feb 21 01:01:26 2011 (r218900) +++ stable/8/sys/pci/if_rlreg.h Mon Feb 21 01:04:16 2011 (r218901) @@ -165,6 +165,7 @@ #define RL_HWREV_8168D 0x28000000 #define RL_HWREV_8168DP 0x28800000 #define RL_HWREV_8168E 0x2C000000 +#define RL_HWREV_8168E_VL 0x2C800000 #define RL_HWREV_8168_SPIN1 0x30000000 #define RL_HWREV_8100E 0x30800000 #define RL_HWREV_8101E 0x34000000 From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 01:05:24 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F00E106566B; Mon, 21 Feb 2011 01:05:24 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 122D28FC0A; Mon, 21 Feb 2011 01:05:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L15NlZ050827; Mon, 21 Feb 2011 01:05:23 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L15N4a050824; Mon, 21 Feb 2011 01:05:23 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210105.p1L15N4a050824@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 01:05:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218902 - in stable/7/sys: dev/re pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 01:05:24 -0000 Author: yongari Date: Mon Feb 21 01:05:23 2011 New Revision: 218902 URL: http://svn.freebsd.org/changeset/base/218902 Log: MFC r217498: Add initial support for RTL8168E/8111E-VL PCIe GbE. Modified: stable/7/sys/dev/re/if_re.c stable/7/sys/pci/if_rlreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/re/if_re.c ============================================================================== --- stable/7/sys/dev/re/if_re.c Mon Feb 21 01:04:16 2011 (r218901) +++ stable/7/sys/dev/re/if_re.c Mon Feb 21 01:05:23 2011 (r218902) @@ -221,6 +221,7 @@ static struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8168D, RL_8169, "8168D/8111D"}, { RL_HWREV_8168DP, RL_8169, "8168DP/8111DP"}, { RL_HWREV_8168E, RL_8169, "8168E/8111E"}, + { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL"}, { 0, 0, NULL } }; @@ -1347,6 +1348,11 @@ re_attach(device_t dev) RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO; break; + case RL_HWREV_8168E_VL: + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | + RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | + RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO; + break; case RL_HWREV_8169_8110SB: case RL_HWREV_8169_8110SBL: case RL_HWREV_8169_8110SC: Modified: stable/7/sys/pci/if_rlreg.h ============================================================================== --- stable/7/sys/pci/if_rlreg.h Mon Feb 21 01:04:16 2011 (r218901) +++ stable/7/sys/pci/if_rlreg.h Mon Feb 21 01:05:23 2011 (r218902) @@ -165,6 +165,7 @@ #define RL_HWREV_8168D 0x28000000 #define RL_HWREV_8168DP 0x28800000 #define RL_HWREV_8168E 0x2C000000 +#define RL_HWREV_8168E_VL 0x2C800000 #define RL_HWREV_8168_SPIN1 0x30000000 #define RL_HWREV_8100E 0x30800000 #define RL_HWREV_8101E 0x34000000 From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 01:08:13 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F417106564A; Mon, 21 Feb 2011 01:08:13 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4AFD18FC0C; Mon, 21 Feb 2011 01:08:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L18DGs050927; Mon, 21 Feb 2011 01:08:13 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L18DUG050924; Mon, 21 Feb 2011 01:08:13 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210108.p1L18DUG050924@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 01:08:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218903 - in stable/8/sys: dev/re pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 01:08:13 -0000 Author: yongari Date: Mon Feb 21 01:08:13 2011 New Revision: 218903 URL: http://svn.freebsd.org/changeset/base/218903 Log: MFC r217499: Implement initial jumbo frame support for RTL8168/8111 C/D/E PCIe GbE controllers. It seems these controllers no longer support multi-fragmented RX buffers such that driver have to allocate physically contiguous buffers. o Retire RL_FLAG_NOJUMBO flag and introduce RL_FLAG_JUMBOV2 to mark controllers that use new jumbo frame scheme. o Configure PCIe max read request size to 4096 for standard frames and reduce it to 512 for jumbo frames. o TSO/checksum offloading is not supported for jumbo frames on these controllers. Reflect it to ioctl handler and driver initialization. o Remove unused rl_stats_no_timeout in softc. o Embed a pointer to structure rl_hwrev into softc to keep track of controller MTU limitation and remove rl_hwrev in softc since that information is available through a pointer to structure rl_hwrev. Special thanks to Realtek for donating sample hardwares which made this possible. H/W donated by: Realtek Semiconductor Corp. Modified: stable/8/sys/dev/re/if_re.c stable/8/sys/pci/if_rlreg.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/re/if_re.c ============================================================================== --- stable/8/sys/dev/re/if_re.c Mon Feb 21 01:05:23 2011 (r218902) +++ stable/8/sys/dev/re/if_re.c Mon Feb 21 01:08:13 2011 (r218903) @@ -189,40 +189,40 @@ static struct rl_type re_devs[] = { }; static struct rl_hwrev re_hwrevs[] = { - { RL_HWREV_8139, RL_8139, "" }, - { RL_HWREV_8139A, RL_8139, "A" }, - { RL_HWREV_8139AG, RL_8139, "A-G" }, - { RL_HWREV_8139B, RL_8139, "B" }, - { RL_HWREV_8130, RL_8139, "8130" }, - { RL_HWREV_8139C, RL_8139, "C" }, - { RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C" }, - { RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+"}, - { RL_HWREV_8168_SPIN1, RL_8169, "8168"}, - { RL_HWREV_8169, RL_8169, "8169"}, - { RL_HWREV_8169S, RL_8169, "8169S"}, - { RL_HWREV_8110S, RL_8169, "8110S"}, - { RL_HWREV_8169_8110SB, RL_8169, "8169SB/8110SB"}, - { RL_HWREV_8169_8110SC, RL_8169, "8169SC/8110SC"}, - { RL_HWREV_8169_8110SBL, RL_8169, "8169SBL/8110SBL"}, - { RL_HWREV_8169_8110SCE, RL_8169, "8169SC/8110SC"}, - { RL_HWREV_8100, RL_8139, "8100"}, - { RL_HWREV_8101, RL_8139, "8101"}, - { RL_HWREV_8100E, RL_8169, "8100E"}, - { RL_HWREV_8101E, RL_8169, "8101E"}, - { RL_HWREV_8102E, RL_8169, "8102E"}, - { RL_HWREV_8102EL, RL_8169, "8102EL"}, - { RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL"}, - { RL_HWREV_8103E, RL_8169, "8103E"}, - { RL_HWREV_8168_SPIN2, RL_8169, "8168"}, - { RL_HWREV_8168_SPIN3, RL_8169, "8168"}, - { RL_HWREV_8168C, RL_8169, "8168C/8111C"}, - { RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C"}, - { RL_HWREV_8168CP, RL_8169, "8168CP/8111CP"}, - { RL_HWREV_8168D, RL_8169, "8168D/8111D"}, - { RL_HWREV_8168DP, RL_8169, "8168DP/8111DP"}, - { RL_HWREV_8168E, RL_8169, "8168E/8111E"}, - { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL"}, - { 0, 0, NULL } + { RL_HWREV_8139, RL_8139, "", RL_MTU }, + { RL_HWREV_8139A, RL_8139, "A", RL_MTU }, + { RL_HWREV_8139AG, RL_8139, "A-G", RL_MTU }, + { RL_HWREV_8139B, RL_8139, "B", RL_MTU }, + { RL_HWREV_8130, RL_8139, "8130", RL_MTU }, + { RL_HWREV_8139C, RL_8139, "C", RL_MTU }, + { RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C", RL_MTU }, + { RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+", RL_MTU }, + { RL_HWREV_8168_SPIN1, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8169, RL_8169, "8169", RL_JUMBO_MTU }, + { RL_HWREV_8169S, RL_8169, "8169S", RL_JUMBO_MTU }, + { RL_HWREV_8110S, RL_8169, "8110S", RL_JUMBO_MTU }, + { RL_HWREV_8169_8110SB, RL_8169, "8169SB/8110SB", RL_JUMBO_MTU }, + { RL_HWREV_8169_8110SC, RL_8169, "8169SC/8110SC", RL_JUMBO_MTU }, + { RL_HWREV_8169_8110SBL, RL_8169, "8169SBL/8110SBL", RL_JUMBO_MTU }, + { RL_HWREV_8169_8110SCE, RL_8169, "8169SC/8110SC", RL_JUMBO_MTU }, + { RL_HWREV_8100, RL_8139, "8100", RL_MTU }, + { RL_HWREV_8101, RL_8139, "8101", RL_MTU }, + { RL_HWREV_8100E, RL_8169, "8100E", RL_MTU }, + { RL_HWREV_8101E, RL_8169, "8101E", RL_MTU }, + { RL_HWREV_8102E, RL_8169, "8102E", RL_MTU }, + { RL_HWREV_8102EL, RL_8169, "8102EL", RL_MTU }, + { RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL", RL_MTU }, + { RL_HWREV_8103E, RL_8169, "8103E", RL_MTU }, + { RL_HWREV_8168_SPIN2, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168_SPIN3, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K }, + { RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K }, + { RL_HWREV_8168CP, RL_8169, "8168CP/8111CP", RL_JUMBO_MTU_6K }, + { RL_HWREV_8168D, RL_8169, "8168D/8111D", RL_JUMBO_MTU_9K }, + { RL_HWREV_8168DP, RL_8169, "8168DP/8111DP", RL_JUMBO_MTU_9K }, + { RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K}, + { 0, 0, NULL, 0 } }; static int re_probe (device_t); @@ -236,7 +236,9 @@ static int re_allocmem (device_t, struc static __inline void re_discard_rxbuf (struct rl_softc *, int); static int re_newbuf (struct rl_softc *, int); +static int re_jumbo_newbuf (struct rl_softc *, int); static int re_rx_list_init (struct rl_softc *); +static int re_jrx_list_init (struct rl_softc *); static int re_tx_list_init (struct rl_softc *); #ifdef RE_FIXUP_RX static __inline void re_fixup_rx @@ -274,6 +276,7 @@ static int re_miibus_readreg (device_t, static int re_miibus_writereg (device_t, int, int, int); static void re_miibus_statchg (device_t); +static void re_set_jumbo (struct rl_softc *, int); static void re_set_rxmode (struct rl_softc *); static void re_reset (struct rl_softc *); static void re_setwol (struct rl_softc *); @@ -699,7 +702,7 @@ re_reset(struct rl_softc *sc) if ((sc->rl_flags & RL_FLAG_MACRESET) != 0) CSR_WRITE_1(sc, 0x82, 1); - if (sc->rl_hwrev == RL_HWREV_8169S) + if (sc->rl_hwrev->rl_rev == RL_HWREV_8169S) re_gmii_writereg(sc->rl_dev, 1, 0x0b, 0); } @@ -991,6 +994,17 @@ re_allocmem(device_t dev, struct rl_soft * Allocate map for RX mbufs. */ + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0) { + error = bus_dma_tag_create(sc->rl_parent_tag, sizeof(uint64_t), + 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, + MJUM9BYTES, 1, MJUM9BYTES, 0, NULL, NULL, + &sc->rl_ldata.rl_jrx_mtag); + if (error) { + device_printf(dev, + "could not allocate jumbo RX DMA tag\n"); + return (error); + } + } error = bus_dma_tag_create(sc->rl_parent_tag, sizeof(uint64_t), 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, NULL, NULL, &sc->rl_ldata.rl_rx_mtag); @@ -1082,6 +1096,24 @@ re_allocmem(device_t dev, struct rl_soft /* Create DMA maps for RX buffers */ + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0) { + error = bus_dmamap_create(sc->rl_ldata.rl_jrx_mtag, 0, + &sc->rl_ldata.rl_jrx_sparemap); + if (error) { + device_printf(dev, + "could not create spare DMA map for jumbo RX\n"); + return (error); + } + for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { + error = bus_dmamap_create(sc->rl_ldata.rl_jrx_mtag, 0, + &sc->rl_ldata.rl_jrx_desc[i].rx_dmamap); + if (error) { + device_printf(dev, + "could not create DMA map for jumbo RX\n"); + return (error); + } + } + } error = bus_dmamap_create(sc->rl_ldata.rl_rx_mtag, 0, &sc->rl_ldata.rl_rx_sparemap); if (error) { @@ -1197,11 +1229,6 @@ re_attach(device_t dev) msic = 0; if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { sc->rl_flags |= RL_FLAG_PCIE; - if (devid != RT_DEVICEID_8101E) { - /* Set PCIe maximum read request size to 2048. */ - if (pci_get_max_read_req(dev) < 2048) - pci_set_max_read_req(dev, 2048); - } msic = pci_msi_count(dev); if (bootverbose) device_printf(dev, "MSI count : %d\n", msic); @@ -1276,7 +1303,7 @@ re_attach(device_t dev) while (hw_rev->rl_desc != NULL) { if (hw_rev->rl_rev == hwrev) { sc->rl_type = hw_rev->rl_type; - sc->rl_hwrev = hw_rev->rl_rev; + sc->rl_hwrev = hw_rev; break; } hw_rev++; @@ -1289,26 +1316,23 @@ re_attach(device_t dev) switch (hw_rev->rl_rev) { case RL_HWREV_8139CPLUS: - sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_FASTETHER | - RL_FLAG_AUTOPAD; + sc->rl_flags |= RL_FLAG_FASTETHER | RL_FLAG_AUTOPAD; break; case RL_HWREV_8100E: case RL_HWREV_8101E: - sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_PHYWAKE | - RL_FLAG_FASTETHER; + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_FASTETHER; break; case RL_HWREV_8102E: case RL_HWREV_8102EL: case RL_HWREV_8102EL_SPIN1: - sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_PHYWAKE | - RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | - RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD; + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | + RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | + RL_FLAG_AUTOPAD; break; case RL_HWREV_8103E: - sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_PHYWAKE | - RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | - RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | - RL_FLAG_MACSLEEP; + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | + RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | + RL_FLAG_AUTOPAD | RL_FLAG_MACSLEEP; break; case RL_HWREV_8168_SPIN1: case RL_HWREV_8168_SPIN2: @@ -1329,28 +1353,17 @@ re_attach(device_t dev) case RL_HWREV_8168DP: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | - RL_FLAG_AUTOPAD; - /* - * These controllers support jumbo frame but it seems - * that enabling it requires touching additional magic - * registers. Depending on MAC revisions some - * controllers need to disable checksum offload. So - * disable jumbo frame until I have better idea what - * it really requires to make it support. - * RTL8168C/CP : supports up to 6KB jumbo frame. - * RTL8111C/CP : supports up to 9KB jumbo frame. - */ - sc->rl_flags |= RL_FLAG_NOJUMBO; + RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2; break; case RL_HWREV_8168E: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | - RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO; + RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2; break; case RL_HWREV_8168E_VL: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | - RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO; + RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2; break; case RL_HWREV_8169_8110SB: case RL_HWREV_8169_8110SBL: @@ -1685,7 +1698,17 @@ re_detach(device_t dev) sc->rl_ldata.rl_rx_sparemap); bus_dma_tag_destroy(sc->rl_ldata.rl_rx_mtag); } - + if (sc->rl_ldata.rl_jrx_mtag) { + for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { + if (sc->rl_ldata.rl_jrx_desc[i].rx_dmamap) + bus_dmamap_destroy(sc->rl_ldata.rl_jrx_mtag, + sc->rl_ldata.rl_jrx_desc[i].rx_dmamap); + } + if (sc->rl_ldata.rl_jrx_sparemap) + bus_dmamap_destroy(sc->rl_ldata.rl_jrx_mtag, + sc->rl_ldata.rl_jrx_sparemap); + bus_dma_tag_destroy(sc->rl_ldata.rl_jrx_mtag); + } /* Unload and free the stats buffer and map */ if (sc->rl_ldata.rl_stag) { @@ -1713,7 +1736,11 @@ re_discard_rxbuf(struct rl_softc *sc, in struct rl_rxdesc *rxd; uint32_t cmdstat; - rxd = &sc->rl_ldata.rl_rx_desc[idx]; + if (sc->rl_ifp->if_mtu > RL_MTU && + (sc->rl_flags & RL_FLAG_JUMBOV2) != 0) + rxd = &sc->rl_ldata.rl_jrx_desc[idx]; + else + rxd = &sc->rl_ldata.rl_rx_desc[idx]; desc = &sc->rl_ldata.rl_rx_list[idx]; desc->rl_vlanctl = 0; cmdstat = rxd->rx_size; @@ -1786,6 +1813,59 @@ re_newbuf(struct rl_softc *sc, int idx) return (0); } +static int +re_jumbo_newbuf(struct rl_softc *sc, int idx) +{ + struct mbuf *m; + struct rl_rxdesc *rxd; + bus_dma_segment_t segs[1]; + bus_dmamap_t map; + struct rl_desc *desc; + uint32_t cmdstat; + int error, nsegs; + + m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES); + if (m == NULL) + return (ENOBUFS); + m->m_len = m->m_pkthdr.len = MJUM9BYTES; +#ifdef RE_FIXUP_RX + m_adj(m, RE_ETHER_ALIGN); +#endif + error = bus_dmamap_load_mbuf_sg(sc->rl_ldata.rl_jrx_mtag, + sc->rl_ldata.rl_jrx_sparemap, m, segs, &nsegs, BUS_DMA_NOWAIT); + if (error != 0) { + m_freem(m); + return (ENOBUFS); + } + KASSERT(nsegs == 1, ("%s: %d segment returned!", __func__, nsegs)); + + rxd = &sc->rl_ldata.rl_jrx_desc[idx]; + if (rxd->rx_m != NULL) { + bus_dmamap_sync(sc->rl_ldata.rl_jrx_mtag, rxd->rx_dmamap, + BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->rl_ldata.rl_jrx_mtag, rxd->rx_dmamap); + } + + rxd->rx_m = m; + map = rxd->rx_dmamap; + rxd->rx_dmamap = sc->rl_ldata.rl_jrx_sparemap; + rxd->rx_size = segs[0].ds_len; + sc->rl_ldata.rl_jrx_sparemap = map; + bus_dmamap_sync(sc->rl_ldata.rl_jrx_mtag, rxd->rx_dmamap, + BUS_DMASYNC_PREREAD); + + desc = &sc->rl_ldata.rl_rx_list[idx]; + desc->rl_vlanctl = 0; + desc->rl_bufaddr_lo = htole32(RL_ADDR_LO(segs[0].ds_addr)); + desc->rl_bufaddr_hi = htole32(RL_ADDR_HI(segs[0].ds_addr)); + cmdstat = segs[0].ds_len; + if (idx == sc->rl_ldata.rl_rx_desc_cnt - 1) + cmdstat |= RL_RDESC_CMD_EOR; + desc->rl_cmdstat = htole32(cmdstat | RL_RDESC_CMD_OWN); + + return (0); +} + #ifdef RE_FIXUP_RX static __inline void re_fixup_rx(struct mbuf *m) @@ -1855,6 +1935,29 @@ re_rx_list_init(struct rl_softc *sc) return (0); } +static int +re_jrx_list_init(struct rl_softc *sc) +{ + int error, i; + + bzero(sc->rl_ldata.rl_rx_list, + sc->rl_ldata.rl_rx_desc_cnt * sizeof(struct rl_desc)); + for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { + sc->rl_ldata.rl_jrx_desc[i].rx_m = NULL; + if ((error = re_jumbo_newbuf(sc, i)) != 0) + return (error); + } + + bus_dmamap_sync(sc->rl_ldata.rl_rx_list_tag, + sc->rl_ldata.rl_rx_list_map, + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); + + sc->rl_ldata.rl_rx_prodidx = 0; + sc->rl_head = sc->rl_tail = NULL; + + return (0); +} + /* * RX handler for C+ and 8169. For the gigE chips, we support * the reception of jumbo frames that have been fragmented @@ -1865,14 +1968,18 @@ re_rxeof(struct rl_softc *sc, int *rx_np { struct mbuf *m; struct ifnet *ifp; - int i, total_len; + int i, rxerr, total_len; struct rl_desc *cur_rx; u_int32_t rxstat, rxvlan; - int maxpkt = 16, rx_npkts = 0; + int jumbo, maxpkt = 16, rx_npkts = 0; RL_LOCK_ASSERT(sc); ifp = sc->rl_ifp; + if (ifp->if_mtu > RL_MTU && (sc->rl_flags & RL_FLAG_JUMBOV2) != 0) + jumbo = 1; + else + jumbo = 0; /* Invalidate the descriptor memory */ @@ -1890,9 +1997,21 @@ re_rxeof(struct rl_softc *sc, int *rx_np break; total_len = rxstat & sc->rl_rxlenmask; rxvlan = le32toh(cur_rx->rl_vlanctl); - m = sc->rl_ldata.rl_rx_desc[i].rx_m; + if (jumbo != 0) + m = sc->rl_ldata.rl_jrx_desc[i].rx_m; + else + m = sc->rl_ldata.rl_rx_desc[i].rx_m; - if (!(rxstat & RL_RDESC_STAT_EOF)) { + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0 && + (rxstat & (RL_RDESC_STAT_SOF | RL_RDESC_STAT_EOF)) != + (RL_RDESC_STAT_SOF | RL_RDESC_STAT_EOF)) { + /* + * RTL8168C or later controllers do not + * support multi-fragment packet. + */ + re_discard_rxbuf(sc, i); + continue; + } else if ((rxstat & RL_RDESC_STAT_EOF) == 0) { if (re_newbuf(sc, i) != 0) { /* * If this is part of a multi-fragment packet, @@ -1939,27 +2058,36 @@ re_rxeof(struct rl_softc *sc, int *rx_np * if total_len > 2^13-1, both _RXERRSUM and _GIANT will be * set, but if CRC is clear, it will still be a valid frame. */ - if (rxstat & RL_RDESC_STAT_RXERRSUM && !(total_len > 8191 && - (rxstat & RL_RDESC_STAT_ERRS) == RL_RDESC_STAT_GIANT)) { - ifp->if_ierrors++; - /* - * If this is part of a multi-fragment packet, - * discard all the pieces. - */ - if (sc->rl_head != NULL) { - m_freem(sc->rl_head); - sc->rl_head = sc->rl_tail = NULL; + if ((rxstat & RL_RDESC_STAT_RXERRSUM) != 0) { + rxerr = 1; + if ((sc->rl_flags & RL_FLAG_JUMBOV2) == 0 && + total_len > 8191 && + (rxstat & RL_RDESC_STAT_ERRS) == RL_RDESC_STAT_GIANT) + rxerr = 0; + if (rxerr != 0) { + ifp->if_ierrors++; + /* + * If this is part of a multi-fragment packet, + * discard all the pieces. + */ + if (sc->rl_head != NULL) { + m_freem(sc->rl_head); + sc->rl_head = sc->rl_tail = NULL; + } + re_discard_rxbuf(sc, i); + continue; } - re_discard_rxbuf(sc, i); - continue; } /* * If allocating a replacement mbuf fails, * reload the current one. */ - - if (re_newbuf(sc, i) != 0) { + if (jumbo != 0) + rxerr = re_jumbo_newbuf(sc, i); + else + rxerr = re_newbuf(sc, i); + if (rxerr != 0) { ifp->if_iqdrops++; if (sc->rl_head != NULL) { m_freem(sc->rl_head); @@ -1970,9 +2098,13 @@ re_rxeof(struct rl_softc *sc, int *rx_np } if (sc->rl_head != NULL) { - m->m_len = total_len % RE_RX_DESC_BUFLEN; - if (m->m_len == 0) - m->m_len = RE_RX_DESC_BUFLEN; + if (jumbo != 0) + m->m_len = total_len; + else { + m->m_len = total_len % RE_RX_DESC_BUFLEN; + if (m->m_len == 0) + m->m_len = RE_RX_DESC_BUFLEN; + } /* * Special case: if there's 4 bytes or less * in this buffer, the mbuf can be discarded: @@ -2589,6 +2721,59 @@ re_start(struct ifnet *ifp) } static void +re_set_jumbo(struct rl_softc *sc, int jumbo) +{ + + if (sc->rl_hwrev->rl_rev == RL_HWREV_8168E_VL) { + pci_set_max_read_req(sc->rl_dev, 4096); + return; + } + + CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_WRITECFG); + if (jumbo != 0) { + CSR_WRITE_1(sc, RL_CFG3, CSR_READ_1(sc, RL_CFG3) | + RL_CFG3_JUMBO_EN0); + switch (sc->rl_hwrev->rl_rev) { + case RL_HWREV_8168DP: + break; + case RL_HWREV_8168E: + CSR_WRITE_1(sc, RL_CFG4, CSR_READ_1(sc, RL_CFG4) | + 0x01); + break; + default: + CSR_WRITE_1(sc, RL_CFG4, CSR_READ_1(sc, RL_CFG4) | + RL_CFG4_JUMBO_EN1); + } + } else { + CSR_WRITE_1(sc, RL_CFG3, CSR_READ_1(sc, RL_CFG3) & + ~RL_CFG3_JUMBO_EN0); + switch (sc->rl_hwrev->rl_rev) { + case RL_HWREV_8168DP: + break; + case RL_HWREV_8168E: + CSR_WRITE_1(sc, RL_CFG4, CSR_READ_1(sc, RL_CFG4) & + ~0x01); + break; + default: + CSR_WRITE_1(sc, RL_CFG4, CSR_READ_1(sc, RL_CFG4) & + ~RL_CFG4_JUMBO_EN1); + } + } + CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); + + switch (sc->rl_hwrev->rl_rev) { + case RL_HWREV_8168DP: + pci_set_max_read_req(sc->rl_dev, 4096); + break; + default: + if (jumbo != 0) + pci_set_max_read_req(sc->rl_dev, 512); + else + pci_set_max_read_req(sc->rl_dev, 4096); + } +} + +static void re_init(void *xsc) { struct rl_softc *sc = xsc; @@ -2628,10 +2813,39 @@ re_init_locked(struct rl_softc *sc) /* * For C+ mode, initialize the RX descriptors and mbufs. */ - if (re_rx_list_init(sc) != 0) { - device_printf(sc->rl_dev, "no memory for RX buffers\n"); - re_stop(sc); - return; + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0) { + if (ifp->if_mtu > RL_MTU) { + if (re_jrx_list_init(sc) != 0) { + device_printf(sc->rl_dev, + "no memory for jumbo RX buffers\n"); + re_stop(sc); + return; + } + /* Disable checksum offloading for jumbo frames. */ + ifp->if_capenable &= ~(IFCAP_HWCSUM | IFCAP_TSO4); + ifp->if_hwassist &= ~(RE_CSUM_FEATURES | CSUM_TSO); + } else { + if (re_rx_list_init(sc) != 0) { + device_printf(sc->rl_dev, + "no memory for RX buffers\n"); + re_stop(sc); + return; + } + } + re_set_jumbo(sc, ifp->if_mtu > RL_MTU); + } else { + if (re_rx_list_init(sc) != 0) { + device_printf(sc->rl_dev, "no memory for RX buffers\n"); + re_stop(sc); + return; + } + if ((sc->rl_flags & RL_FLAG_PCIE) != 0 && + pci_get_device(sc->rl_dev) != RT_DEVICEID_8101E) { + if (ifp->if_mtu > RL_MTU) + pci_set_max_read_req(sc->rl_dev, 512); + else + pci_set_max_read_req(sc->rl_dev, 4096); + } } re_tx_list_init(sc); @@ -2652,12 +2866,12 @@ re_init_locked(struct rl_softc *sc) } else cfg |= RL_CPLUSCMD_RXENB | RL_CPLUSCMD_TXENB; CSR_WRITE_2(sc, RL_CPLUS_CMD, cfg); - if (sc->rl_hwrev == RL_HWREV_8169_8110SC || - sc->rl_hwrev == RL_HWREV_8169_8110SCE) { + if (sc->rl_hwrev->rl_rev == RL_HWREV_8169_8110SC || + sc->rl_hwrev->rl_rev == RL_HWREV_8169_8110SCE) { reg = 0x000fff00; if ((CSR_READ_1(sc, RL_CFG2) & RL_CFG2_PCI66MHZ) != 0) reg |= 0x000000ff; - if (sc->rl_hwrev == RL_HWREV_8169_8110SCE) + if (sc->rl_hwrev->rl_rev == RL_HWREV_8169_8110SCE) reg |= 0x00f00000; CSR_WRITE_4(sc, 0x7c, reg); /* Disable interrupt mitigation. */ @@ -2727,7 +2941,7 @@ re_init_locked(struct rl_softc *sc) /* Configure interrupt moderation. */ if (sc->rl_type == RL_8169) { - switch (sc->rl_hwrev) { + switch (sc->rl_hwrev->rl_rev) { case RL_HWREV_8100E: case RL_HWREV_8101E: case RL_HWREV_8102E: @@ -2790,10 +3004,25 @@ re_init_locked(struct rl_softc *sc) * size so we can receive jumbo frames. */ if (sc->rl_type == RL_8169) { - if ((sc->rl_flags & (RL_FLAG_PCIE | RL_FLAG_NOJUMBO)) == - (RL_FLAG_PCIE | RL_FLAG_NOJUMBO)) + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0) { + /* + * For controllers that use new jumbo frame scheme, + * set maximum size of jumbo frame depedning on + * controller revisions. + */ + if (ifp->if_mtu > RL_MTU) + CSR_WRITE_2(sc, RL_MAXRXPKTLEN, + sc->rl_hwrev->rl_max_mtu + + ETHER_VLAN_ENCAP_LEN + ETHER_HDR_LEN + + ETHER_CRC_LEN); + else + CSR_WRITE_2(sc, RL_MAXRXPKTLEN, + RE_RX_DESC_BUFLEN); + } else if ((sc->rl_flags & RL_FLAG_PCIE) != 0 && + sc->rl_hwrev->rl_max_mtu == RL_MTU) { + /* RTL810x has no jumbo frame support. */ CSR_WRITE_2(sc, RL_MAXRXPKTLEN, RE_RX_DESC_BUFLEN); - else + } else CSR_WRITE_2(sc, RL_MAXRXPKTLEN, 16383); } @@ -2860,22 +3089,25 @@ re_ioctl(struct ifnet *ifp, u_long comma switch (command) { case SIOCSIFMTU: - if (ifr->ifr_mtu < ETHERMIN || ifr->ifr_mtu > RL_JUMBO_MTU) { - error = EINVAL; - break; - } - if ((sc->rl_flags & RL_FLAG_NOJUMBO) != 0 && - ifr->ifr_mtu > RL_MAX_FRAMELEN) { + if (ifr->ifr_mtu < ETHERMIN || + ifr->ifr_mtu > sc->rl_hwrev->rl_max_mtu) { error = EINVAL; break; } RL_LOCK(sc); - if (ifp->if_mtu != ifr->ifr_mtu) + if (ifp->if_mtu != ifr->ifr_mtu) { ifp->if_mtu = ifr->ifr_mtu; - if (ifp->if_mtu > RL_TSO_MTU && - (ifp->if_capenable & IFCAP_TSO4) != 0) { - ifp->if_capenable &= ~IFCAP_TSO4; - ifp->if_hwassist &= ~CSUM_TSO; + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0 && + (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + re_init_locked(sc); + } + if (ifp->if_mtu > RL_TSO_MTU && + (ifp->if_capenable & IFCAP_TSO4) != 0) { + ifp->if_capenable &= ~(IFCAP_TSO4 | + IFCAP_VLAN_HWTSO); + ifp->if_hwassist &= ~CSUM_TSO; + } VLAN_CAPABILITIES(ifp); } RL_UNLOCK(sc); @@ -2973,6 +3205,10 @@ re_ioctl(struct ifnet *ifp, u_long comma ifp->if_capenable &= ~IFCAP_VLAN_HWTSO; reinit = 1; } + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0 && + (mask & (IFCAP_HWCSUM | IFCAP_TSO4 | + IFCAP_VLAN_HWTSO)) != 0) + reinit = 1; if ((mask & IFCAP_WOL) != 0 && (ifp->if_capabilities & IFCAP_WOL) != 0) { if ((mask & IFCAP_WOL_UCAST) != 0) Modified: stable/8/sys/pci/if_rlreg.h ============================================================================== --- stable/8/sys/pci/if_rlreg.h Mon Feb 21 01:05:23 2011 (r218902) +++ stable/8/sys/pci/if_rlreg.h Mon Feb 21 01:08:13 2011 (r218903) @@ -429,6 +429,7 @@ #define RL_CFG3_GRANTSEL 0x80 #define RL_CFG3_WOL_MAGIC 0x20 #define RL_CFG3_WOL_LINK 0x10 +#define RL_CFG3_JUMBO_EN0 0x04 /* RTL8168C or later. */ #define RL_CFG3_FAST_B2B 0x01 /* @@ -436,6 +437,7 @@ */ #define RL_CFG4_LWPTN 0x04 #define RL_CFG4_LWPME 0x10 +#define RL_CFG4_JUMBO_EN1 0x02 /* RTL8168C or later. */ /* * Config 5 register @@ -592,6 +594,7 @@ struct rl_hwrev { uint32_t rl_rev; int rl_type; char *rl_desc; + int rl_max_mtu; }; struct rl_mii_frame { @@ -767,6 +770,7 @@ struct rl_stats { #define RL_8139_RX_DESC_CNT 64 #define RL_TX_DESC_CNT RL_8169_TX_DESC_CNT #define RL_RX_DESC_CNT RL_8169_RX_DESC_CNT +#define RL_RX_JUMBO_DESC_CNT RL_RX_DESC_CNT #define RL_NTXSEGS 32 #define RL_RING_ALIGN 256 @@ -801,8 +805,13 @@ struct rl_stats { /* see comment in dev/re/if_re.c */ #define RL_JUMBO_FRAMELEN 7440 -#define RL_JUMBO_MTU (RL_JUMBO_FRAMELEN-ETHER_HDR_LEN-ETHER_CRC_LEN) -#define RL_MAX_FRAMELEN \ +#define RL_JUMBO_MTU \ + (RL_JUMBO_FRAMELEN-ETHER_VLAN_ENCAP_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN) +#define RL_JUMBO_MTU_6K \ + ((6 * 1024) - ETHER_VLAN_ENCAP_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN) +#define RL_JUMBO_MTU_9K \ + ((9 * 1024) - ETHER_VLAN_ENCAP_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN) +#define RL_MTU \ (ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN) struct rl_txdesc { @@ -819,6 +828,7 @@ struct rl_rxdesc { struct rl_list_data { struct rl_txdesc rl_tx_desc[RL_TX_DESC_CNT]; struct rl_rxdesc rl_rx_desc[RL_RX_DESC_CNT]; + struct rl_rxdesc rl_jrx_desc[RL_RX_JUMBO_DESC_CNT]; int rl_tx_desc_cnt; int rl_rx_desc_cnt; int rl_tx_prodidx; @@ -827,7 +837,9 @@ struct rl_list_data { int rl_tx_free; bus_dma_tag_t rl_tx_mtag; /* mbuf TX mapping tag */ bus_dma_tag_t rl_rx_mtag; /* mbuf RX mapping tag */ + bus_dma_tag_t rl_jrx_mtag; /* mbuf RX mapping tag */ bus_dmamap_t rl_rx_sparemap; + bus_dmamap_t rl_jrx_sparemap; bus_dma_tag_t rl_stag; /* stats mapping tag */ bus_dmamap_t rl_smap; /* stats map */ struct rl_stats *rl_stats; @@ -857,9 +869,9 @@ struct rl_softc { device_t rl_miibus; bus_dma_tag_t rl_parent_tag; uint8_t rl_type; + struct rl_hwrev *rl_hwrev; int rl_eecmd_read; int rl_eewidth; - uint8_t rl_stats_no_timeout; int rl_txthresh; struct rl_chain_data rl_cdata; struct rl_list_data rl_ldata; @@ -868,7 +880,6 @@ struct rl_softc { struct mtx rl_mtx; struct mbuf *rl_head; struct mbuf *rl_tail; - uint32_t rl_hwrev; uint32_t rl_rxlenmask; int rl_testmode; int rl_if_flags; @@ -890,7 +901,7 @@ struct rl_softc { #define RL_FLAG_AUTOPAD 0x0002 #define RL_FLAG_PHYWAKE_PM 0x0004 #define RL_FLAG_PHYWAKE 0x0008 -#define RL_FLAG_NOJUMBO 0x0010 +#define RL_FLAG_JUMBOV2 0x0010 #define RL_FLAG_PAR 0x0020 #define RL_FLAG_DESCV2 0x0040 #define RL_FLAG_MACSTAT 0x0080 From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 01:15:11 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FBEA106567A; Mon, 21 Feb 2011 01:15:11 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5B5F48FC16; Mon, 21 Feb 2011 01:15:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L1FBBr051115; Mon, 21 Feb 2011 01:15:11 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L1FBDd051112; Mon, 21 Feb 2011 01:15:11 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210115.p1L1FBDd051112@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 01:15:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218904 - in stable/7/sys: dev/re pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 01:15:11 -0000 Author: yongari Date: Mon Feb 21 01:15:11 2011 New Revision: 218904 URL: http://svn.freebsd.org/changeset/base/218904 Log: MFC r217499: Implement initial jumbo frame support for RTL8168/8111 C/D/E PCIe GbE controllers. It seems these controllers no longer support multi-fragmented RX buffers such that driver have to allocate physically contiguous buffers. o Retire RL_FLAG_NOJUMBO flag and introduce RL_FLAG_JUMBOV2 to mark controllers that use new jumbo frame scheme. o Configure PCIe max read request size to 4096 for standard frames and reduce it to 512 for jumbo frames. o TSO/checksum offloading is not supported for jumbo frames on these controllers. Reflect it to ioctl handler and driver initialization. o Remove unused rl_stats_no_timeout in softc. o Embed a pointer to structure rl_hwrev into softc to keep track of controller MTU limitation and remove rl_hwrev in softc since that information is available through a pointer to structure rl_hwrev. Special thanks to Realtek for donating sample hardwares which made this possible. H/W donated by: Realtek Semiconductor Corp. Modified: stable/7/sys/dev/re/if_re.c stable/7/sys/pci/if_rlreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/re/if_re.c ============================================================================== --- stable/7/sys/dev/re/if_re.c Mon Feb 21 01:08:13 2011 (r218903) +++ stable/7/sys/dev/re/if_re.c Mon Feb 21 01:15:11 2011 (r218904) @@ -189,40 +189,40 @@ static struct rl_type re_devs[] = { }; static struct rl_hwrev re_hwrevs[] = { - { RL_HWREV_8139, RL_8139, "" }, - { RL_HWREV_8139A, RL_8139, "A" }, - { RL_HWREV_8139AG, RL_8139, "A-G" }, - { RL_HWREV_8139B, RL_8139, "B" }, - { RL_HWREV_8130, RL_8139, "8130" }, - { RL_HWREV_8139C, RL_8139, "C" }, - { RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C" }, - { RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+"}, - { RL_HWREV_8168_SPIN1, RL_8169, "8168"}, - { RL_HWREV_8169, RL_8169, "8169"}, - { RL_HWREV_8169S, RL_8169, "8169S"}, - { RL_HWREV_8110S, RL_8169, "8110S"}, - { RL_HWREV_8169_8110SB, RL_8169, "8169SB/8110SB"}, - { RL_HWREV_8169_8110SC, RL_8169, "8169SC/8110SC"}, - { RL_HWREV_8169_8110SBL, RL_8169, "8169SBL/8110SBL"}, - { RL_HWREV_8169_8110SCE, RL_8169, "8169SC/8110SC"}, - { RL_HWREV_8100, RL_8139, "8100"}, - { RL_HWREV_8101, RL_8139, "8101"}, - { RL_HWREV_8100E, RL_8169, "8100E"}, - { RL_HWREV_8101E, RL_8169, "8101E"}, - { RL_HWREV_8102E, RL_8169, "8102E"}, - { RL_HWREV_8102EL, RL_8169, "8102EL"}, - { RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL"}, - { RL_HWREV_8103E, RL_8169, "8103E"}, - { RL_HWREV_8168_SPIN2, RL_8169, "8168"}, - { RL_HWREV_8168_SPIN3, RL_8169, "8168"}, - { RL_HWREV_8168C, RL_8169, "8168C/8111C"}, - { RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C"}, - { RL_HWREV_8168CP, RL_8169, "8168CP/8111CP"}, - { RL_HWREV_8168D, RL_8169, "8168D/8111D"}, - { RL_HWREV_8168DP, RL_8169, "8168DP/8111DP"}, - { RL_HWREV_8168E, RL_8169, "8168E/8111E"}, - { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL"}, - { 0, 0, NULL } + { RL_HWREV_8139, RL_8139, "", RL_MTU }, + { RL_HWREV_8139A, RL_8139, "A", RL_MTU }, + { RL_HWREV_8139AG, RL_8139, "A-G", RL_MTU }, + { RL_HWREV_8139B, RL_8139, "B", RL_MTU }, + { RL_HWREV_8130, RL_8139, "8130", RL_MTU }, + { RL_HWREV_8139C, RL_8139, "C", RL_MTU }, + { RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C", RL_MTU }, + { RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+", RL_MTU }, + { RL_HWREV_8168_SPIN1, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8169, RL_8169, "8169", RL_JUMBO_MTU }, + { RL_HWREV_8169S, RL_8169, "8169S", RL_JUMBO_MTU }, + { RL_HWREV_8110S, RL_8169, "8110S", RL_JUMBO_MTU }, + { RL_HWREV_8169_8110SB, RL_8169, "8169SB/8110SB", RL_JUMBO_MTU }, + { RL_HWREV_8169_8110SC, RL_8169, "8169SC/8110SC", RL_JUMBO_MTU }, + { RL_HWREV_8169_8110SBL, RL_8169, "8169SBL/8110SBL", RL_JUMBO_MTU }, + { RL_HWREV_8169_8110SCE, RL_8169, "8169SC/8110SC", RL_JUMBO_MTU }, + { RL_HWREV_8100, RL_8139, "8100", RL_MTU }, + { RL_HWREV_8101, RL_8139, "8101", RL_MTU }, + { RL_HWREV_8100E, RL_8169, "8100E", RL_MTU }, + { RL_HWREV_8101E, RL_8169, "8101E", RL_MTU }, + { RL_HWREV_8102E, RL_8169, "8102E", RL_MTU }, + { RL_HWREV_8102EL, RL_8169, "8102EL", RL_MTU }, + { RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL", RL_MTU }, + { RL_HWREV_8103E, RL_8169, "8103E", RL_MTU }, + { RL_HWREV_8168_SPIN2, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168_SPIN3, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K }, + { RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K }, + { RL_HWREV_8168CP, RL_8169, "8168CP/8111CP", RL_JUMBO_MTU_6K }, + { RL_HWREV_8168D, RL_8169, "8168D/8111D", RL_JUMBO_MTU_9K }, + { RL_HWREV_8168DP, RL_8169, "8168DP/8111DP", RL_JUMBO_MTU_9K }, + { RL_HWREV_8168E, RL_8169, "8168E/8111E", RL_JUMBO_MTU_9K}, + { RL_HWREV_8168E_VL, RL_8169, "8168E/8111E-VL", RL_JUMBO_MTU_6K}, + { 0, 0, NULL, 0 } }; static int re_probe (device_t); @@ -236,7 +236,9 @@ static int re_allocmem (device_t, struc static __inline void re_discard_rxbuf (struct rl_softc *, int); static int re_newbuf (struct rl_softc *, int); +static int re_jumbo_newbuf (struct rl_softc *, int); static int re_rx_list_init (struct rl_softc *); +static int re_jrx_list_init (struct rl_softc *); static int re_tx_list_init (struct rl_softc *); #ifdef RE_FIXUP_RX static __inline void re_fixup_rx @@ -274,6 +276,7 @@ static int re_miibus_readreg (device_t, static int re_miibus_writereg (device_t, int, int, int); static void re_miibus_statchg (device_t); +static void re_set_jumbo (struct rl_softc *, int); static void re_set_rxmode (struct rl_softc *); static void re_reset (struct rl_softc *); static void re_setwol (struct rl_softc *); @@ -700,7 +703,7 @@ re_reset(struct rl_softc *sc) if ((sc->rl_flags & RL_FLAG_MACRESET) != 0) CSR_WRITE_1(sc, 0x82, 1); - if (sc->rl_hwrev == RL_HWREV_8169S) + if (sc->rl_hwrev->rl_rev == RL_HWREV_8169S) re_gmii_writereg(sc->rl_dev, 1, 0x0b, 0); } @@ -992,6 +995,17 @@ re_allocmem(device_t dev, struct rl_soft * Allocate map for RX mbufs. */ + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0) { + error = bus_dma_tag_create(sc->rl_parent_tag, sizeof(uint64_t), + 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, + MJUM9BYTES, 1, MJUM9BYTES, 0, NULL, NULL, + &sc->rl_ldata.rl_jrx_mtag); + if (error) { + device_printf(dev, + "could not allocate jumbo RX DMA tag\n"); + return (error); + } + } error = bus_dma_tag_create(sc->rl_parent_tag, sizeof(uint64_t), 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, 1, MCLBYTES, 0, NULL, NULL, &sc->rl_ldata.rl_rx_mtag); @@ -1083,6 +1097,24 @@ re_allocmem(device_t dev, struct rl_soft /* Create DMA maps for RX buffers */ + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0) { + error = bus_dmamap_create(sc->rl_ldata.rl_jrx_mtag, 0, + &sc->rl_ldata.rl_jrx_sparemap); + if (error) { + device_printf(dev, + "could not create spare DMA map for jumbo RX\n"); + return (error); + } + for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { + error = bus_dmamap_create(sc->rl_ldata.rl_jrx_mtag, 0, + &sc->rl_ldata.rl_jrx_desc[i].rx_dmamap); + if (error) { + device_printf(dev, + "could not create DMA map for jumbo RX\n"); + return (error); + } + } + } error = bus_dmamap_create(sc->rl_ldata.rl_rx_mtag, 0, &sc->rl_ldata.rl_rx_sparemap); if (error) { @@ -1198,11 +1230,6 @@ re_attach(device_t dev) msic = 0; if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) { sc->rl_flags |= RL_FLAG_PCIE; - if (devid != RT_DEVICEID_8101E) { - /* Set PCIe maximum read request size to 2048. */ - if (pci_get_max_read_req(dev) < 2048) - pci_set_max_read_req(dev, 2048); - } msic = pci_msi_count(dev); if (bootverbose) device_printf(dev, "MSI count : %d\n", msic); @@ -1277,7 +1304,7 @@ re_attach(device_t dev) while (hw_rev->rl_desc != NULL) { if (hw_rev->rl_rev == hwrev) { sc->rl_type = hw_rev->rl_type; - sc->rl_hwrev = hw_rev->rl_rev; + sc->rl_hwrev = hw_rev; break; } hw_rev++; @@ -1290,26 +1317,23 @@ re_attach(device_t dev) switch (hw_rev->rl_rev) { case RL_HWREV_8139CPLUS: - sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_FASTETHER | - RL_FLAG_AUTOPAD; + sc->rl_flags |= RL_FLAG_FASTETHER | RL_FLAG_AUTOPAD; break; case RL_HWREV_8100E: case RL_HWREV_8101E: - sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_PHYWAKE | - RL_FLAG_FASTETHER; + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_FASTETHER; break; case RL_HWREV_8102E: case RL_HWREV_8102EL: case RL_HWREV_8102EL_SPIN1: - sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_PHYWAKE | - RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | - RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD; + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | + RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | + RL_FLAG_AUTOPAD; break; case RL_HWREV_8103E: - sc->rl_flags |= RL_FLAG_NOJUMBO | RL_FLAG_PHYWAKE | - RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | - RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | - RL_FLAG_MACSLEEP; + sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | + RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | + RL_FLAG_AUTOPAD | RL_FLAG_MACSLEEP; break; case RL_HWREV_8168_SPIN1: case RL_HWREV_8168_SPIN2: @@ -1330,28 +1354,17 @@ re_attach(device_t dev) case RL_HWREV_8168DP: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | - RL_FLAG_AUTOPAD; - /* - * These controllers support jumbo frame but it seems - * that enabling it requires touching additional magic - * registers. Depending on MAC revisions some - * controllers need to disable checksum offload. So - * disable jumbo frame until I have better idea what - * it really requires to make it support. - * RTL8168C/CP : supports up to 6KB jumbo frame. - * RTL8111C/CP : supports up to 9KB jumbo frame. - */ - sc->rl_flags |= RL_FLAG_NOJUMBO; + RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2; break; case RL_HWREV_8168E: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PHYWAKE_PM | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | - RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO; + RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2; break; case RL_HWREV_8168E_VL: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | - RL_FLAG_AUTOPAD | RL_FLAG_NOJUMBO; + RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2; break; case RL_HWREV_8169_8110SB: case RL_HWREV_8169_8110SBL: @@ -1686,7 +1699,17 @@ re_detach(device_t dev) sc->rl_ldata.rl_rx_sparemap); bus_dma_tag_destroy(sc->rl_ldata.rl_rx_mtag); } - + if (sc->rl_ldata.rl_jrx_mtag) { + for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { + if (sc->rl_ldata.rl_jrx_desc[i].rx_dmamap) + bus_dmamap_destroy(sc->rl_ldata.rl_jrx_mtag, + sc->rl_ldata.rl_jrx_desc[i].rx_dmamap); + } + if (sc->rl_ldata.rl_jrx_sparemap) + bus_dmamap_destroy(sc->rl_ldata.rl_jrx_mtag, + sc->rl_ldata.rl_jrx_sparemap); + bus_dma_tag_destroy(sc->rl_ldata.rl_jrx_mtag); + } /* Unload and free the stats buffer and map */ if (sc->rl_ldata.rl_stag) { @@ -1714,7 +1737,11 @@ re_discard_rxbuf(struct rl_softc *sc, in struct rl_rxdesc *rxd; uint32_t cmdstat; - rxd = &sc->rl_ldata.rl_rx_desc[idx]; + if (sc->rl_ifp->if_mtu > RL_MTU && + (sc->rl_flags & RL_FLAG_JUMBOV2) != 0) + rxd = &sc->rl_ldata.rl_jrx_desc[idx]; + else + rxd = &sc->rl_ldata.rl_rx_desc[idx]; desc = &sc->rl_ldata.rl_rx_list[idx]; desc->rl_vlanctl = 0; cmdstat = rxd->rx_size; @@ -1787,6 +1814,59 @@ re_newbuf(struct rl_softc *sc, int idx) return (0); } +static int +re_jumbo_newbuf(struct rl_softc *sc, int idx) +{ + struct mbuf *m; + struct rl_rxdesc *rxd; + bus_dma_segment_t segs[1]; + bus_dmamap_t map; + struct rl_desc *desc; + uint32_t cmdstat; + int error, nsegs; + + m = m_getjcl(M_DONTWAIT, MT_DATA, M_PKTHDR, MJUM9BYTES); + if (m == NULL) + return (ENOBUFS); + m->m_len = m->m_pkthdr.len = MJUM9BYTES; +#ifdef RE_FIXUP_RX + m_adj(m, RE_ETHER_ALIGN); +#endif + error = bus_dmamap_load_mbuf_sg(sc->rl_ldata.rl_jrx_mtag, + sc->rl_ldata.rl_jrx_sparemap, m, segs, &nsegs, BUS_DMA_NOWAIT); + if (error != 0) { + m_freem(m); + return (ENOBUFS); + } + KASSERT(nsegs == 1, ("%s: %d segment returned!", __func__, nsegs)); + + rxd = &sc->rl_ldata.rl_jrx_desc[idx]; + if (rxd->rx_m != NULL) { + bus_dmamap_sync(sc->rl_ldata.rl_jrx_mtag, rxd->rx_dmamap, + BUS_DMASYNC_POSTREAD); + bus_dmamap_unload(sc->rl_ldata.rl_jrx_mtag, rxd->rx_dmamap); + } + + rxd->rx_m = m; + map = rxd->rx_dmamap; + rxd->rx_dmamap = sc->rl_ldata.rl_jrx_sparemap; + rxd->rx_size = segs[0].ds_len; + sc->rl_ldata.rl_jrx_sparemap = map; + bus_dmamap_sync(sc->rl_ldata.rl_jrx_mtag, rxd->rx_dmamap, + BUS_DMASYNC_PREREAD); + + desc = &sc->rl_ldata.rl_rx_list[idx]; + desc->rl_vlanctl = 0; + desc->rl_bufaddr_lo = htole32(RL_ADDR_LO(segs[0].ds_addr)); + desc->rl_bufaddr_hi = htole32(RL_ADDR_HI(segs[0].ds_addr)); + cmdstat = segs[0].ds_len; + if (idx == sc->rl_ldata.rl_rx_desc_cnt - 1) + cmdstat |= RL_RDESC_CMD_EOR; + desc->rl_cmdstat = htole32(cmdstat | RL_RDESC_CMD_OWN); + + return (0); +} + #ifdef RE_FIXUP_RX static __inline void re_fixup_rx(struct mbuf *m) @@ -1856,6 +1936,29 @@ re_rx_list_init(struct rl_softc *sc) return (0); } +static int +re_jrx_list_init(struct rl_softc *sc) +{ + int error, i; + + bzero(sc->rl_ldata.rl_rx_list, + sc->rl_ldata.rl_rx_desc_cnt * sizeof(struct rl_desc)); + for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) { + sc->rl_ldata.rl_jrx_desc[i].rx_m = NULL; + if ((error = re_jumbo_newbuf(sc, i)) != 0) + return (error); + } + + bus_dmamap_sync(sc->rl_ldata.rl_rx_list_tag, + sc->rl_ldata.rl_rx_list_map, + BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); + + sc->rl_ldata.rl_rx_prodidx = 0; + sc->rl_head = sc->rl_tail = NULL; + + return (0); +} + /* * RX handler for C+ and 8169. For the gigE chips, we support * the reception of jumbo frames that have been fragmented @@ -1866,14 +1969,18 @@ re_rxeof(struct rl_softc *sc) { struct mbuf *m; struct ifnet *ifp; - int i, total_len; + int i, rxerr, total_len; struct rl_desc *cur_rx; u_int32_t rxstat, rxvlan; - int maxpkt = 16; + int jumbo, maxpkt = 16; RL_LOCK_ASSERT(sc); ifp = sc->rl_ifp; + if (ifp->if_mtu > RL_MTU && (sc->rl_flags & RL_FLAG_JUMBOV2) != 0) + jumbo = 1; + else + jumbo = 0; /* Invalidate the descriptor memory */ @@ -1891,9 +1998,21 @@ re_rxeof(struct rl_softc *sc) break; total_len = rxstat & sc->rl_rxlenmask; rxvlan = le32toh(cur_rx->rl_vlanctl); - m = sc->rl_ldata.rl_rx_desc[i].rx_m; + if (jumbo != 0) + m = sc->rl_ldata.rl_jrx_desc[i].rx_m; + else + m = sc->rl_ldata.rl_rx_desc[i].rx_m; - if (!(rxstat & RL_RDESC_STAT_EOF)) { + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0 && + (rxstat & (RL_RDESC_STAT_SOF | RL_RDESC_STAT_EOF)) != + (RL_RDESC_STAT_SOF | RL_RDESC_STAT_EOF)) { + /* + * RTL8168C or later controllers do not + * support multi-fragment packet. + */ + re_discard_rxbuf(sc, i); + continue; + } else if ((rxstat & RL_RDESC_STAT_EOF) == 0) { if (re_newbuf(sc, i) != 0) { /* * If this is part of a multi-fragment packet, @@ -1940,27 +2059,36 @@ re_rxeof(struct rl_softc *sc) * if total_len > 2^13-1, both _RXERRSUM and _GIANT will be * set, but if CRC is clear, it will still be a valid frame. */ - if (rxstat & RL_RDESC_STAT_RXERRSUM && !(total_len > 8191 && - (rxstat & RL_RDESC_STAT_ERRS) == RL_RDESC_STAT_GIANT)) { - ifp->if_ierrors++; - /* - * If this is part of a multi-fragment packet, - * discard all the pieces. - */ - if (sc->rl_head != NULL) { - m_freem(sc->rl_head); - sc->rl_head = sc->rl_tail = NULL; + if ((rxstat & RL_RDESC_STAT_RXERRSUM) != 0) { + rxerr = 1; + if ((sc->rl_flags & RL_FLAG_JUMBOV2) == 0 && + total_len > 8191 && + (rxstat & RL_RDESC_STAT_ERRS) == RL_RDESC_STAT_GIANT) + rxerr = 0; + if (rxerr != 0) { + ifp->if_ierrors++; + /* + * If this is part of a multi-fragment packet, + * discard all the pieces. + */ + if (sc->rl_head != NULL) { + m_freem(sc->rl_head); + sc->rl_head = sc->rl_tail = NULL; + } + re_discard_rxbuf(sc, i); + continue; } - re_discard_rxbuf(sc, i); - continue; } /* * If allocating a replacement mbuf fails, * reload the current one. */ - - if (re_newbuf(sc, i) != 0) { + if (jumbo != 0) + rxerr = re_jumbo_newbuf(sc, i); + else + rxerr = re_newbuf(sc, i); + if (rxerr != 0) { ifp->if_iqdrops++; if (sc->rl_head != NULL) { m_freem(sc->rl_head); @@ -1971,9 +2099,13 @@ re_rxeof(struct rl_softc *sc) } if (sc->rl_head != NULL) { - m->m_len = total_len % RE_RX_DESC_BUFLEN; - if (m->m_len == 0) - m->m_len = RE_RX_DESC_BUFLEN; + if (jumbo != 0) + m->m_len = total_len; + else { + m->m_len = total_len % RE_RX_DESC_BUFLEN; + if (m->m_len == 0) + m->m_len = RE_RX_DESC_BUFLEN; + } /* * Special case: if there's 4 bytes or less * in this buffer, the mbuf can be discarded: @@ -2583,6 +2715,59 @@ re_start(struct ifnet *ifp) } static void +re_set_jumbo(struct rl_softc *sc, int jumbo) +{ + + if (sc->rl_hwrev->rl_rev == RL_HWREV_8168E_VL) { + pci_set_max_read_req(sc->rl_dev, 4096); + return; + } + + CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_WRITECFG); + if (jumbo != 0) { + CSR_WRITE_1(sc, RL_CFG3, CSR_READ_1(sc, RL_CFG3) | + RL_CFG3_JUMBO_EN0); + switch (sc->rl_hwrev->rl_rev) { + case RL_HWREV_8168DP: + break; + case RL_HWREV_8168E: + CSR_WRITE_1(sc, RL_CFG4, CSR_READ_1(sc, RL_CFG4) | + 0x01); + break; + default: + CSR_WRITE_1(sc, RL_CFG4, CSR_READ_1(sc, RL_CFG4) | + RL_CFG4_JUMBO_EN1); + } + } else { + CSR_WRITE_1(sc, RL_CFG3, CSR_READ_1(sc, RL_CFG3) & + ~RL_CFG3_JUMBO_EN0); + switch (sc->rl_hwrev->rl_rev) { + case RL_HWREV_8168DP: + break; + case RL_HWREV_8168E: + CSR_WRITE_1(sc, RL_CFG4, CSR_READ_1(sc, RL_CFG4) & + ~0x01); + break; + default: + CSR_WRITE_1(sc, RL_CFG4, CSR_READ_1(sc, RL_CFG4) & + ~RL_CFG4_JUMBO_EN1); + } + } + CSR_WRITE_1(sc, RL_EECMD, RL_EEMODE_OFF); + + switch (sc->rl_hwrev->rl_rev) { + case RL_HWREV_8168DP: + pci_set_max_read_req(sc->rl_dev, 4096); + break; + default: + if (jumbo != 0) + pci_set_max_read_req(sc->rl_dev, 512); + else + pci_set_max_read_req(sc->rl_dev, 4096); + } +} + +static void re_init(void *xsc) { struct rl_softc *sc = xsc; @@ -2622,10 +2807,39 @@ re_init_locked(struct rl_softc *sc) /* * For C+ mode, initialize the RX descriptors and mbufs. */ - if (re_rx_list_init(sc) != 0) { - device_printf(sc->rl_dev, "no memory for RX buffers\n"); - re_stop(sc); - return; + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0) { + if (ifp->if_mtu > RL_MTU) { + if (re_jrx_list_init(sc) != 0) { + device_printf(sc->rl_dev, + "no memory for jumbo RX buffers\n"); + re_stop(sc); + return; + } + /* Disable checksum offloading for jumbo frames. */ + ifp->if_capenable &= ~(IFCAP_HWCSUM | IFCAP_TSO4); + ifp->if_hwassist &= ~(RE_CSUM_FEATURES | CSUM_TSO); + } else { + if (re_rx_list_init(sc) != 0) { + device_printf(sc->rl_dev, + "no memory for RX buffers\n"); + re_stop(sc); + return; + } + } + re_set_jumbo(sc, ifp->if_mtu > RL_MTU); + } else { + if (re_rx_list_init(sc) != 0) { + device_printf(sc->rl_dev, "no memory for RX buffers\n"); + re_stop(sc); + return; + } + if ((sc->rl_flags & RL_FLAG_PCIE) != 0 && + pci_get_device(sc->rl_dev) != RT_DEVICEID_8101E) { + if (ifp->if_mtu > RL_MTU) + pci_set_max_read_req(sc->rl_dev, 512); + else + pci_set_max_read_req(sc->rl_dev, 4096); + } } re_tx_list_init(sc); @@ -2646,12 +2860,12 @@ re_init_locked(struct rl_softc *sc) } else cfg |= RL_CPLUSCMD_RXENB | RL_CPLUSCMD_TXENB; CSR_WRITE_2(sc, RL_CPLUS_CMD, cfg); - if (sc->rl_hwrev == RL_HWREV_8169_8110SC || - sc->rl_hwrev == RL_HWREV_8169_8110SCE) { + if (sc->rl_hwrev->rl_rev == RL_HWREV_8169_8110SC || + sc->rl_hwrev->rl_rev == RL_HWREV_8169_8110SCE) { reg = 0x000fff00; if ((CSR_READ_1(sc, RL_CFG2) & RL_CFG2_PCI66MHZ) != 0) reg |= 0x000000ff; - if (sc->rl_hwrev == RL_HWREV_8169_8110SCE) + if (sc->rl_hwrev->rl_rev == RL_HWREV_8169_8110SCE) reg |= 0x00f00000; CSR_WRITE_4(sc, 0x7c, reg); /* Disable interrupt mitigation. */ @@ -2721,7 +2935,7 @@ re_init_locked(struct rl_softc *sc) /* Configure interrupt moderation. */ if (sc->rl_type == RL_8169) { - switch (sc->rl_hwrev) { + switch (sc->rl_hwrev->rl_rev) { case RL_HWREV_8100E: case RL_HWREV_8101E: case RL_HWREV_8102E: @@ -2784,10 +2998,25 @@ re_init_locked(struct rl_softc *sc) * size so we can receive jumbo frames. */ if (sc->rl_type == RL_8169) { - if ((sc->rl_flags & (RL_FLAG_PCIE | RL_FLAG_NOJUMBO)) == - (RL_FLAG_PCIE | RL_FLAG_NOJUMBO)) + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0) { + /* + * For controllers that use new jumbo frame scheme, + * set maximum size of jumbo frame depedning on + * controller revisions. + */ + if (ifp->if_mtu > RL_MTU) + CSR_WRITE_2(sc, RL_MAXRXPKTLEN, + sc->rl_hwrev->rl_max_mtu + + ETHER_VLAN_ENCAP_LEN + ETHER_HDR_LEN + + ETHER_CRC_LEN); + else + CSR_WRITE_2(sc, RL_MAXRXPKTLEN, + RE_RX_DESC_BUFLEN); + } else if ((sc->rl_flags & RL_FLAG_PCIE) != 0 && + sc->rl_hwrev->rl_max_mtu == RL_MTU) { + /* RTL810x has no jumbo frame support. */ CSR_WRITE_2(sc, RL_MAXRXPKTLEN, RE_RX_DESC_BUFLEN); - else + } else CSR_WRITE_2(sc, RL_MAXRXPKTLEN, 16383); } @@ -2854,22 +3083,25 @@ re_ioctl(struct ifnet *ifp, u_long comma switch (command) { case SIOCSIFMTU: - if (ifr->ifr_mtu < ETHERMIN || ifr->ifr_mtu > RL_JUMBO_MTU) { - error = EINVAL; - break; - } - if ((sc->rl_flags & RL_FLAG_NOJUMBO) != 0 && - ifr->ifr_mtu > RL_MAX_FRAMELEN) { + if (ifr->ifr_mtu < ETHERMIN || + ifr->ifr_mtu > sc->rl_hwrev->rl_max_mtu) { error = EINVAL; break; } RL_LOCK(sc); - if (ifp->if_mtu != ifr->ifr_mtu) + if (ifp->if_mtu != ifr->ifr_mtu) { ifp->if_mtu = ifr->ifr_mtu; - if (ifp->if_mtu > RL_TSO_MTU && - (ifp->if_capenable & IFCAP_TSO4) != 0) { - ifp->if_capenable &= ~IFCAP_TSO4; - ifp->if_hwassist &= ~CSUM_TSO; + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0 && + (ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) { + ifp->if_drv_flags &= ~IFF_DRV_RUNNING; + re_init_locked(sc); + } + if (ifp->if_mtu > RL_TSO_MTU && + (ifp->if_capenable & IFCAP_TSO4) != 0) { + ifp->if_capenable &= ~(IFCAP_TSO4 | + IFCAP_VLAN_HWTSO); + ifp->if_hwassist &= ~CSUM_TSO; + } VLAN_CAPABILITIES(ifp); } RL_UNLOCK(sc); @@ -2967,6 +3199,10 @@ re_ioctl(struct ifnet *ifp, u_long comma ifp->if_capenable &= ~IFCAP_VLAN_HWTSO; reinit = 1; } + if ((sc->rl_flags & RL_FLAG_JUMBOV2) != 0 && + (mask & (IFCAP_HWCSUM | IFCAP_TSO4 | + IFCAP_VLAN_HWTSO)) != 0) + reinit = 1; if ((mask & IFCAP_WOL) != 0 && (ifp->if_capabilities & IFCAP_WOL) != 0) { if ((mask & IFCAP_WOL_UCAST) != 0) Modified: stable/7/sys/pci/if_rlreg.h ============================================================================== --- stable/7/sys/pci/if_rlreg.h Mon Feb 21 01:08:13 2011 (r218903) +++ stable/7/sys/pci/if_rlreg.h Mon Feb 21 01:15:11 2011 (r218904) @@ -429,6 +429,7 @@ #define RL_CFG3_GRANTSEL 0x80 #define RL_CFG3_WOL_MAGIC 0x20 #define RL_CFG3_WOL_LINK 0x10 +#define RL_CFG3_JUMBO_EN0 0x04 /* RTL8168C or later. */ #define RL_CFG3_FAST_B2B 0x01 /* @@ -436,6 +437,7 @@ */ #define RL_CFG4_LWPTN 0x04 #define RL_CFG4_LWPME 0x10 +#define RL_CFG4_JUMBO_EN1 0x02 /* RTL8168C or later. */ /* * Config 5 register @@ -592,6 +594,7 @@ struct rl_hwrev { uint32_t rl_rev; int rl_type; char *rl_desc; + int rl_max_mtu; }; struct rl_mii_frame { @@ -767,6 +770,7 @@ struct rl_stats { #define RL_8139_RX_DESC_CNT 64 #define RL_TX_DESC_CNT RL_8169_TX_DESC_CNT #define RL_RX_DESC_CNT RL_8169_RX_DESC_CNT +#define RL_RX_JUMBO_DESC_CNT RL_RX_DESC_CNT #define RL_NTXSEGS 32 #define RL_RING_ALIGN 256 @@ -801,8 +805,13 @@ struct rl_stats { /* see comment in dev/re/if_re.c */ #define RL_JUMBO_FRAMELEN 7440 -#define RL_JUMBO_MTU (RL_JUMBO_FRAMELEN-ETHER_HDR_LEN-ETHER_CRC_LEN) -#define RL_MAX_FRAMELEN \ +#define RL_JUMBO_MTU \ + (RL_JUMBO_FRAMELEN-ETHER_VLAN_ENCAP_LEN-ETHER_HDR_LEN-ETHER_CRC_LEN) +#define RL_JUMBO_MTU_6K \ + ((6 * 1024) - ETHER_VLAN_ENCAP_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN) +#define RL_JUMBO_MTU_9K \ + ((9 * 1024) - ETHER_VLAN_ENCAP_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN) +#define RL_MTU \ (ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN - ETHER_HDR_LEN - ETHER_CRC_LEN) struct rl_txdesc { @@ -819,6 +828,7 @@ struct rl_rxdesc { struct rl_list_data { struct rl_txdesc rl_tx_desc[RL_TX_DESC_CNT]; struct rl_rxdesc rl_rx_desc[RL_RX_DESC_CNT]; + struct rl_rxdesc rl_jrx_desc[RL_RX_JUMBO_DESC_CNT]; int rl_tx_desc_cnt; int rl_rx_desc_cnt; int rl_tx_prodidx; @@ -827,7 +837,9 @@ struct rl_list_data { int rl_tx_free; bus_dma_tag_t rl_tx_mtag; /* mbuf TX mapping tag */ bus_dma_tag_t rl_rx_mtag; /* mbuf RX mapping tag */ + bus_dma_tag_t rl_jrx_mtag; /* mbuf RX mapping tag */ bus_dmamap_t rl_rx_sparemap; + bus_dmamap_t rl_jrx_sparemap; bus_dma_tag_t rl_stag; /* stats mapping tag */ bus_dmamap_t rl_smap; /* stats map */ struct rl_stats *rl_stats; @@ -857,9 +869,9 @@ struct rl_softc { device_t rl_miibus; bus_dma_tag_t rl_parent_tag; uint8_t rl_type; + struct rl_hwrev *rl_hwrev; int rl_eecmd_read; int rl_eewidth; - uint8_t rl_stats_no_timeout; int rl_txthresh; struct rl_chain_data rl_cdata; struct rl_list_data rl_ldata; @@ -868,7 +880,6 @@ struct rl_softc { struct mtx rl_mtx; struct mbuf *rl_head; struct mbuf *rl_tail; - uint32_t rl_hwrev; uint32_t rl_rxlenmask; int rl_testmode; int rl_if_flags; @@ -890,7 +901,7 @@ struct rl_softc { #define RL_FLAG_AUTOPAD 0x0002 #define RL_FLAG_PHYWAKE_PM 0x0004 #define RL_FLAG_PHYWAKE 0x0008 -#define RL_FLAG_NOJUMBO 0x0010 +#define RL_FLAG_JUMBOV2 0x0010 #define RL_FLAG_PAR 0x0020 #define RL_FLAG_DESCV2 0x0040 #define RL_FLAG_MACSTAT 0x0080 From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 01:19:09 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D4DC11065674; Mon, 21 Feb 2011 01:19:09 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C1F7A8FC0C; Mon, 21 Feb 2011 01:19:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L1J98o051252; Mon, 21 Feb 2011 01:19:09 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L1J9Z0051249; Mon, 21 Feb 2011 01:19:09 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210119.p1L1J9Z0051249@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 01:19:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218905 - in stable/8/sys: dev/re pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 01:19:09 -0000 Author: yongari Date: Mon Feb 21 01:19:09 2011 New Revision: 218905 URL: http://svn.freebsd.org/changeset/base/218905 Log: MFC r217524,217766: Change model names of controller RTL_HWREV_8168_SPIN[123] to real ones. s/RL_HWREV_8168_SPIN1/RL_HWREV_8168B_SPIN1/g s/RL_HWREV_8168_SPIN2/RL_HWREV_8168B_SPIN2/g s/RL_HWREV_8168_SPIN3/RL_HWREV_8168B_SPIN3/g No functional changes. r217766: Apply TX interrupt moderation to all RTL810xE PCIe Fast Ethernet controllers. Experimentation with RTL8102E, RTL8103E and RTL8105E showed dramatic decrement of TX completion interrupts under high TX load(e.g. from 147k interrupts/second to 10k interrupts/second) With this change, TX interrupt moderation is applied to all controllers except RTL8139C+. Modified: stable/8/sys/dev/re/if_re.c stable/8/sys/pci/if_rlreg.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/re/if_re.c ============================================================================== --- stable/8/sys/dev/re/if_re.c Mon Feb 21 01:15:11 2011 (r218904) +++ stable/8/sys/dev/re/if_re.c Mon Feb 21 01:19:09 2011 (r218905) @@ -197,7 +197,7 @@ static struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8139C, RL_8139, "C", RL_MTU }, { RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C", RL_MTU }, { RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+", RL_MTU }, - { RL_HWREV_8168_SPIN1, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168B_SPIN1, RL_8169, "8168", RL_JUMBO_MTU }, { RL_HWREV_8169, RL_8169, "8169", RL_JUMBO_MTU }, { RL_HWREV_8169S, RL_8169, "8169S", RL_JUMBO_MTU }, { RL_HWREV_8110S, RL_8169, "8110S", RL_JUMBO_MTU }, @@ -213,8 +213,8 @@ static struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8102EL, RL_8169, "8102EL", RL_MTU }, { RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL", RL_MTU }, { RL_HWREV_8103E, RL_8169, "8103E", RL_MTU }, - { RL_HWREV_8168_SPIN2, RL_8169, "8168", RL_JUMBO_MTU }, - { RL_HWREV_8168_SPIN3, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168B_SPIN2, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168B_SPIN3, RL_8169, "8168", RL_JUMBO_MTU }, { RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K }, { RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K }, { RL_HWREV_8168CP, RL_8169, "8168CP/8111CP", RL_JUMBO_MTU_6K }, @@ -1334,11 +1334,11 @@ re_attach(device_t dev) RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_MACSLEEP; break; - case RL_HWREV_8168_SPIN1: - case RL_HWREV_8168_SPIN2: + case RL_HWREV_8168B_SPIN1: + case RL_HWREV_8168B_SPIN2: sc->rl_flags |= RL_FLAG_WOLRXENB; /* FALLTHROUGH */ - case RL_HWREV_8168_SPIN3: + case RL_HWREV_8168B_SPIN3: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_MACSTAT; break; case RL_HWREV_8168C_SPIN2: @@ -2941,20 +2941,8 @@ re_init_locked(struct rl_softc *sc) /* Configure interrupt moderation. */ if (sc->rl_type == RL_8169) { - switch (sc->rl_hwrev->rl_rev) { - case RL_HWREV_8100E: - case RL_HWREV_8101E: - case RL_HWREV_8102E: - case RL_HWREV_8102EL: - case RL_HWREV_8102EL_SPIN1: - case RL_HWREV_8103E: - CSR_WRITE_2(sc, RL_INTRMOD, 0); - break; - default: - /* Magic from vendor. */ - CSR_WRITE_2(sc, RL_INTRMOD, 0x5100); - break; - } + /* Magic from vendor. */ + CSR_WRITE_2(sc, RL_INTRMOD, 0x5100); } #ifdef DEVICE_POLLING Modified: stable/8/sys/pci/if_rlreg.h ============================================================================== --- stable/8/sys/pci/if_rlreg.h Mon Feb 21 01:15:11 2011 (r218904) +++ stable/8/sys/pci/if_rlreg.h Mon Feb 21 01:19:09 2011 (r218905) @@ -166,13 +166,13 @@ #define RL_HWREV_8168DP 0x28800000 #define RL_HWREV_8168E 0x2C000000 #define RL_HWREV_8168E_VL 0x2C800000 -#define RL_HWREV_8168_SPIN1 0x30000000 +#define RL_HWREV_8168B_SPIN1 0x30000000 #define RL_HWREV_8100E 0x30800000 #define RL_HWREV_8101E 0x34000000 #define RL_HWREV_8102E 0x34800000 #define RL_HWREV_8103E 0x34C00000 -#define RL_HWREV_8168_SPIN2 0x38000000 -#define RL_HWREV_8168_SPIN3 0x38400000 +#define RL_HWREV_8168B_SPIN2 0x38000000 +#define RL_HWREV_8168B_SPIN3 0x38400000 #define RL_HWREV_8168C 0x3C000000 #define RL_HWREV_8168C_SPIN2 0x3C400000 #define RL_HWREV_8168CP 0x3C800000 From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 01:20:57 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0332D1065673; Mon, 21 Feb 2011 01:20:57 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E49528FC15; Mon, 21 Feb 2011 01:20:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1L1KuiC051353; Mon, 21 Feb 2011 01:20:56 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1L1Kusi051350; Mon, 21 Feb 2011 01:20:56 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102210120.p1L1Kusi051350@svn.freebsd.org> From: Pyun YongHyeon Date: Mon, 21 Feb 2011 01:20:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218906 - in stable/7/sys: dev/re pci X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 01:20:57 -0000 Author: yongari Date: Mon Feb 21 01:20:56 2011 New Revision: 218906 URL: http://svn.freebsd.org/changeset/base/218906 Log: MFC r217524,217766: r217524: Change model names of controller RTL_HWREV_8168_SPIN[123] to real ones. s/RL_HWREV_8168_SPIN1/RL_HWREV_8168B_SPIN1/g s/RL_HWREV_8168_SPIN2/RL_HWREV_8168B_SPIN2/g s/RL_HWREV_8168_SPIN3/RL_HWREV_8168B_SPIN3/g No functional changes. r217766: Apply TX interrupt moderation to all RTL810xE PCIe Fast Ethernet controllers. Experimentation with RTL8102E, RTL8103E and RTL8105E showed dramatic decrement of TX completion interrupts under high TX load(e.g. from 147k interrupts/second to 10k interrupts/second) With this change, TX interrupt moderation is applied to all controllers except RTL8139C+. Modified: stable/7/sys/dev/re/if_re.c stable/7/sys/pci/if_rlreg.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/re/if_re.c ============================================================================== --- stable/7/sys/dev/re/if_re.c Mon Feb 21 01:19:09 2011 (r218905) +++ stable/7/sys/dev/re/if_re.c Mon Feb 21 01:20:56 2011 (r218906) @@ -197,7 +197,7 @@ static struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8139C, RL_8139, "C", RL_MTU }, { RL_HWREV_8139D, RL_8139, "8139D/8100B/8100C", RL_MTU }, { RL_HWREV_8139CPLUS, RL_8139CPLUS, "C+", RL_MTU }, - { RL_HWREV_8168_SPIN1, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168B_SPIN1, RL_8169, "8168", RL_JUMBO_MTU }, { RL_HWREV_8169, RL_8169, "8169", RL_JUMBO_MTU }, { RL_HWREV_8169S, RL_8169, "8169S", RL_JUMBO_MTU }, { RL_HWREV_8110S, RL_8169, "8110S", RL_JUMBO_MTU }, @@ -213,8 +213,8 @@ static struct rl_hwrev re_hwrevs[] = { { RL_HWREV_8102EL, RL_8169, "8102EL", RL_MTU }, { RL_HWREV_8102EL_SPIN1, RL_8169, "8102EL", RL_MTU }, { RL_HWREV_8103E, RL_8169, "8103E", RL_MTU }, - { RL_HWREV_8168_SPIN2, RL_8169, "8168", RL_JUMBO_MTU }, - { RL_HWREV_8168_SPIN3, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168B_SPIN2, RL_8169, "8168", RL_JUMBO_MTU }, + { RL_HWREV_8168B_SPIN3, RL_8169, "8168", RL_JUMBO_MTU }, { RL_HWREV_8168C, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K }, { RL_HWREV_8168C_SPIN2, RL_8169, "8168C/8111C", RL_JUMBO_MTU_6K }, { RL_HWREV_8168CP, RL_8169, "8168CP/8111CP", RL_JUMBO_MTU_6K }, @@ -1335,11 +1335,11 @@ re_attach(device_t dev) RL_FLAG_MACSTAT | RL_FLAG_FASTETHER | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_MACSLEEP; break; - case RL_HWREV_8168_SPIN1: - case RL_HWREV_8168_SPIN2: + case RL_HWREV_8168B_SPIN1: + case RL_HWREV_8168B_SPIN2: sc->rl_flags |= RL_FLAG_WOLRXENB; /* FALLTHROUGH */ - case RL_HWREV_8168_SPIN3: + case RL_HWREV_8168B_SPIN3: sc->rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_MACSTAT; break; case RL_HWREV_8168C_SPIN2: @@ -2935,20 +2935,8 @@ re_init_locked(struct rl_softc *sc) /* Configure interrupt moderation. */ if (sc->rl_type == RL_8169) { - switch (sc->rl_hwrev->rl_rev) { - case RL_HWREV_8100E: - case RL_HWREV_8101E: - case RL_HWREV_8102E: - case RL_HWREV_8102EL: - case RL_HWREV_8102EL_SPIN1: - case RL_HWREV_8103E: - CSR_WRITE_2(sc, RL_INTRMOD, 0); - break; - default: - /* Magic from vendor. */ - CSR_WRITE_2(sc, RL_INTRMOD, 0x5100); - break; - } + /* Magic from vendor. */ + CSR_WRITE_2(sc, RL_INTRMOD, 0x5100); } #ifdef DEVICE_POLLING Modified: stable/7/sys/pci/if_rlreg.h ============================================================================== --- stable/7/sys/pci/if_rlreg.h Mon Feb 21 01:19:09 2011 (r218905) +++ stable/7/sys/pci/if_rlreg.h Mon Feb 21 01:20:56 2011 (r218906) @@ -166,13 +166,13 @@ #define RL_HWREV_8168DP 0x28800000 #define RL_HWREV_8168E 0x2C000000 #define RL_HWREV_8168E_VL 0x2C800000 -#define RL_HWREV_8168_SPIN1 0x30000000 +#define RL_HWREV_8168B_SPIN1 0x30000000 #define RL_HWREV_8100E 0x30800000 #define RL_HWREV_8101E 0x34000000 #define RL_HWREV_8102E 0x34800000 #define RL_HWREV_8103E 0x34C00000 -#define RL_HWREV_8168_SPIN2 0x38000000 -#define RL_HWREV_8168_SPIN3 0x38400000 +#define RL_HWREV_8168B_SPIN2 0x38000000 +#define RL_HWREV_8168B_SPIN3 0x38400000 #define RL_HWREV_8168C 0x3C000000 #define RL_HWREV_8168C_SPIN2 0x3C400000 #define RL_HWREV_8168CP 0x3C800000 From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 10:08:48 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 000651065673; Mon, 21 Feb 2011 10:08:47 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E0DE68FC0A; Mon, 21 Feb 2011 10:08:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LA8lsc064974; Mon, 21 Feb 2011 10:08:47 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LA8lmt064969; Mon, 21 Feb 2011 10:08:47 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201102211008.p1LA8lmt064969@svn.freebsd.org> From: Martin Matuska Date: Mon, 21 Feb 2011 10:08:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218911 - stable/8/usr.sbin/newsyslog X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 10:08:48 -0000 Author: mm Date: Mon Feb 21 10:08:47 2011 New Revision: 218911 URL: http://svn.freebsd.org/changeset/base/218911 Log: MFC r218127, r218128: Add xz(1) support to newsyslog. Rewrite and simplify logfile compression code. Approved by: gad Modified: stable/8/usr.sbin/newsyslog/newsyslog.8 stable/8/usr.sbin/newsyslog/newsyslog.c stable/8/usr.sbin/newsyslog/newsyslog.conf.5 stable/8/usr.sbin/newsyslog/pathnames.h Directory Properties: stable/8/usr.sbin/newsyslog/ (props changed) Modified: stable/8/usr.sbin/newsyslog/newsyslog.8 ============================================================================== --- stable/8/usr.sbin/newsyslog/newsyslog.8 Mon Feb 21 09:56:08 2011 (r218910) +++ stable/8/usr.sbin/newsyslog/newsyslog.8 Mon Feb 21 10:08:47 2011 (r218911) @@ -17,7 +17,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd July 23, 2010 +.Dd January 31, 2011 .Dt NEWSYSLOG 8 .Os .Sh NAME @@ -279,6 +279,7 @@ accepted for backwards compatibility. .Sh SEE ALSO .Xr bzip2 1 , .Xr gzip 1 , +.Xr xz 1 , .Xr syslog 3 , .Xr newsyslog.conf 5 , .Xr chown 8 , Modified: stable/8/usr.sbin/newsyslog/newsyslog.c ============================================================================== --- stable/8/usr.sbin/newsyslog/newsyslog.c Mon Feb 21 09:56:08 2011 (r218910) +++ stable/8/usr.sbin/newsyslog/newsyslog.c Mon Feb 21 10:08:47 2011 (r218911) @@ -57,12 +57,6 @@ __FBSDID("$FreeBSD$"); #define OSF -#ifndef COMPRESS_POSTFIX -#define COMPRESS_POSTFIX ".gz" -#endif -#ifndef BZCOMPRESS_POSTFIX -#define BZCOMPRESS_POSTFIX ".bz2" -#endif #include #include @@ -92,10 +86,35 @@ __FBSDID("$FreeBSD$"); #include "extern.h" /* + * Compression suffixes + */ +#ifndef COMPRESS_SUFFIX_GZ +#define COMPRESS_SUFFIX_GZ ".gz" +#endif + +#ifndef COMPRESS_SUFFIX_BZ2 +#define COMPRESS_SUFFIX_BZ2 ".bz2" +#endif + +#ifndef COMPRESS_SUFFIX_XZ +#define COMPRESS_SUFFIX_XZ ".xz" +#endif + +#define COMPRESS_SUFFIX_MAXLEN MAX(MAX(sizeof(COMPRESS_SUFFIX_GZ),sizeof(COMPRESS_SUFFIX_BZ2)),sizeof(COMPRESS_SUFFIX_XZ)) + +/* + * Compression types + */ +#define COMPRESS_TYPES 4 /* Number of supported compression types */ + +#define COMPRESS_NONE 0 +#define COMPRESS_GZIP 1 +#define COMPRESS_BZIP2 2 +#define COMPRESS_XZ 3 + +/* * Bit-values for the 'flags' parsed from a config-file entry. */ -#define CE_COMPACT 0x0001 /* Compact the archived log files with gzip. */ -#define CE_BZCOMPACT 0x0002 /* Compact the archived log files with bzip2. */ #define CE_BINARY 0x0008 /* Logfile is in binary, do not add status */ /* messages to logfile(s) when rotating. */ #define CE_NOSIGNAL 0x0010 /* There is no process to signal when */ @@ -119,6 +138,19 @@ __FBSDID("$FreeBSD$"); #define MAX_OLDLOGS 65536 /* Default maximum number of old logfiles */ +struct compress_types { + const char *flag; /* Flag in configuration file */ + const char *suffix; /* Compression suffix */ + const char *path; /* Path to compression program */ +}; + +const struct compress_types compress_type[COMPRESS_TYPES] = { + { "", "", "" }, /* no compression */ + { "Z", COMPRESS_SUFFIX_GZ, _PATH_GZIP }, /* gzip compression */ + { "J", COMPRESS_SUFFIX_BZ2, _PATH_BZIP2 }, /* bzip2 compression */ + { "X", COMPRESS_SUFFIX_XZ, _PATH_XZ } /* xz compression */ +}; + struct conf_entry { STAILQ_ENTRY(conf_entry) cf_nextp; char *log; /* Name of the log */ @@ -134,7 +166,8 @@ struct conf_entry { int hours; /* Hours between log trimming */ struct ptime_data *trim_at; /* Specific time to do trimming */ unsigned int permissions; /* File permissions on the log */ - int flags; /* CE_COMPACT, CE_BZCOMPACT, CE_BINARY */ + int flags; /* CE_BINARY */ + int compress; /* Compression */ int sig; /* Signal to send */ int def_cfg; /* Using the rule for this file */ }; @@ -218,6 +251,7 @@ static int isnumberstr(const char *); static int isglobstr(const char *); static char *missing_field(char *p, char *errline); static void change_attrs(const char *, const struct conf_entry *); +static const char *get_logfile_suffix(const char *logfile); static fk_entry do_entry(struct conf_entry *); static fk_entry do_rotate(const struct conf_entry *); static void do_sigwork(struct sigwork_entry *); @@ -367,6 +401,7 @@ init_entry(const char *fname, struct con tempwork->trim_at = ptime_init(src_entry->trim_at); tempwork->permissions = src_entry->permissions; tempwork->flags = src_entry->flags; + tempwork->compress = src_entry->compress; tempwork->sig = src_entry->sig; tempwork->def_cfg = src_entry->def_cfg; } else { @@ -384,6 +419,7 @@ init_entry(const char *fname, struct con tempwork->trim_at = NULL; tempwork->permissions = 0; tempwork->flags = 0; + tempwork->compress = COMPRESS_NONE; tempwork->sig = SIGHUP; tempwork->def_cfg = 0; } @@ -448,14 +484,9 @@ do_entry(struct conf_entry * ent) char temp_reason[REASON_MAX]; free_or_keep = FREE_ENT; - if (verbose) { - if (ent->flags & CE_COMPACT) - printf("%s <%dZ>: ", ent->log, ent->numlogs); - else if (ent->flags & CE_BZCOMPACT) - printf("%s <%dJ>: ", ent->log, ent->numlogs); - else - printf("%s <%d>: ", ent->log, ent->numlogs); - } + if (verbose) + printf("%s <%d%s>: ", ent->log, ent->numlogs, + compress_type[ent->compress].flag); ent->fsize = sizefile(ent->log); modtime = age_old_log(ent->log); ent->rotate = 0; @@ -560,17 +591,10 @@ do_entry(struct conf_entry * ent) ent->r_reason = strdup(temp_reason); if (verbose) printf("--> trimming log....\n"); - if (noaction && !verbose) { - if (ent->flags & CE_COMPACT) - printf("%s <%dZ>: trimming\n", - ent->log, ent->numlogs); - else if (ent->flags & CE_BZCOMPACT) - printf("%s <%dJ>: trimming\n", - ent->log, ent->numlogs); - else - printf("%s <%d>: trimming\n", - ent->log, ent->numlogs); - } + if (noaction && !verbose) + printf("%s <%d%s>: trimming\n", ent->log, + ent->numlogs, + compress_type[ent->compress].flag); free_or_keep = do_rotate(ent); } else { if (verbose) @@ -1183,6 +1207,7 @@ parse_file(FILE *cf, struct cflist *work } working->flags = 0; + working->compress = COMPRESS_NONE; q = parse = missing_field(sob(++parse), errline); parse = son(parse); eol = !*parse; @@ -1261,7 +1286,7 @@ no_trimat: working->flags |= CE_GLOB; break; case 'j': - working->flags |= CE_BZCOMPACT; + working->compress = COMPRESS_BZIP2; break; case 'n': working->flags |= CE_NOSIGNAL; @@ -1272,8 +1297,11 @@ no_trimat: case 'w': /* Depreciated flag - keep for compatibility purposes */ break; + case 'x': + working->compress = COMPRESS_XZ; + break; case 'z': - working->flags |= CE_COMPACT; + working->compress = COMPRESS_GZIP; break; case '-': break; @@ -1415,7 +1443,7 @@ static void delete_oldest_timelog(const struct conf_entry *ent, const char *archive_dir) { char *logfname, *s, *dir, errbuf[80]; - int logcnt, max_logcnt, dirfd, i; + int dirfd, i, logcnt, max_logcnt, valid; struct oldlog_entry *oldlogs; size_t logfname_len; struct dirent *dp; @@ -1485,9 +1513,12 @@ delete_oldest_timelog(const struct conf_ "match time format\n", dp->d_name); continue; } - if (*s != '\0' && !(strcmp(s, BZCOMPRESS_POSTFIX) == 0 || - strcmp(s, COMPRESS_POSTFIX) == 0)) { - if (verbose) + + for (int c = 0; c < COMPRESS_TYPES; c++) + if (strcmp(s, compress_type[c].suffix) == 0) + valid = 1; + if (valid != 1) { + if (verbose) printf("Ignoring %s which has unexpected " "extension '%s'\n", dp->d_name, s); continue; @@ -1586,13 +1617,35 @@ add_to_queue(const char *fname, struct i STAILQ_INSERT_TAIL(inclist, inc, inc_nextp); } +/* + * Search for logfile and return its compression suffix (if supported) + * The suffix detection is first-match in the order of compress_types + * + * Note: if logfile without suffix exists (uncompressed, COMPRESS_NONE) + * a zero-length string is returned + */ +static const char * +get_logfile_suffix(const char *logfile) +{ + struct stat st; + char zfile[MAXPATHLEN]; + + for (int c = 0; c < COMPRESS_TYPES; c++) { + (void) strlcpy(zfile, logfile, MAXPATHLEN); + (void) strlcat(zfile, compress_type[c].suffix, MAXPATHLEN); + if (lstat(zfile, &st) == 0) + return (compress_type[c].suffix); + } + return (NULL); +} + static fk_entry do_rotate(const struct conf_entry *ent) { char dirpart[MAXPATHLEN], namepart[MAXPATHLEN]; char file1[MAXPATHLEN], file2[MAXPATHLEN]; char zfile1[MAXPATHLEN], zfile2[MAXPATHLEN]; - char jfile1[MAXPATHLEN]; + const char *logfile_suffix; char datetimestr[30]; int flags, numlogs_c; fk_entry free_or_keep; @@ -1650,19 +1703,13 @@ do_rotate(const struct conf_entry *ent) delete_oldest_timelog(ent, dirpart); else { /* name of oldest log */ - (void) snprintf(zfile1, sizeof(zfile1), "%s%s", file1, - COMPRESS_POSTFIX); - snprintf(jfile1, sizeof(jfile1), "%s%s", file1, - BZCOMPRESS_POSTFIX); - - if (noaction) { - printf("\trm -f %s\n", file1); - printf("\trm -f %s\n", zfile1); - printf("\trm -f %s\n", jfile1); - } else { - (void) unlink(file1); - (void) unlink(zfile1); - (void) unlink(jfile1); + for (int c = 0; c < COMPRESS_TYPES; c++) { + (void) snprintf(zfile1, sizeof(zfile1), "%s%s", file1, + compress_type[c].suffix); + if (noaction) + printf("\trm -f %s\n", zfile1); + else + (void) unlink(zfile1); } } @@ -1697,24 +1744,14 @@ do_rotate(const struct conf_entry *ent) (void) snprintf(file1, sizeof(file1), "%s.%d", ent->log, numlogs_c); - (void) strlcpy(zfile1, file1, sizeof(zfile1)); - (void) strlcpy(zfile2, file2, sizeof(zfile2)); - if (lstat(file1, &st)) { - (void) strlcat(zfile1, COMPRESS_POSTFIX, - sizeof(zfile1)); - (void) strlcat(zfile2, COMPRESS_POSTFIX, - sizeof(zfile2)); - if (lstat(zfile1, &st)) { - strlcpy(zfile1, file1, sizeof(zfile1)); - strlcpy(zfile2, file2, sizeof(zfile2)); - strlcat(zfile1, BZCOMPRESS_POSTFIX, - sizeof(zfile1)); - strlcat(zfile2, BZCOMPRESS_POSTFIX, - sizeof(zfile2)); - if (lstat(zfile1, &st)) - continue; - } - } + logfile_suffix = get_logfile_suffix(file1); + if (logfile_suffix == NULL) + continue; + (void) strlcpy(zfile1, file1, MAXPATHLEN); + (void) strlcpy(zfile2, file2, MAXPATHLEN); + (void) strlcat(zfile1, logfile_suffix, MAXPATHLEN); + (void) strlcat(zfile2, logfile_suffix, MAXPATHLEN); + if (noaction) printf("\tmv %s %s\n", zfile1, zfile2); else { @@ -1760,7 +1797,7 @@ do_rotate(const struct conf_entry *ent) swork = NULL; if (ent->pid_file != NULL) swork = save_sigwork(ent); - if (ent->numlogs > 0 && (flags & (CE_COMPACT | CE_BZCOMPACT))) { + if (ent->numlogs > 0 && ent->compress > COMPRESS_NONE) { /* * The zipwork_entry will include a pointer to this * conf_entry, so the conf_entry should not be freed. @@ -1855,15 +1892,16 @@ do_zipwork(struct zipwork_entry *zwork) pgm_path = NULL; strlcpy(zresult, zwork->zw_fname, sizeof(zresult)); - if (zwork != NULL && zwork->zw_conf != NULL) { - if (zwork->zw_conf->flags & CE_COMPACT) { - pgm_path = _PATH_GZIP; - strlcat(zresult, COMPRESS_POSTFIX, sizeof(zresult)); - } else if (zwork->zw_conf->flags & CE_BZCOMPACT) { - pgm_path = _PATH_BZIP2; - strlcat(zresult, BZCOMPRESS_POSTFIX, sizeof(zresult)); + if (zwork != NULL && zwork->zw_conf != NULL && + zwork->zw_conf->compress > COMPRESS_NONE) + for (int c = 1; c < COMPRESS_TYPES; c++) { + if (zwork->zw_conf->compress == c) { + pgm_path = compress_type[c].path; + (void) strlcat(zresult, + compress_type[c].suffix, sizeof(zresult)); + break; + } } - } if (pgm_path == NULL) { warnx("invalid entry for %s in do_zipwork", zwork->zw_fname); return; @@ -2141,9 +2179,8 @@ static int age_old_log(char *file) { struct stat sb; - char *endp; - char tmp[MAXPATHLEN + sizeof(".0") + sizeof(COMPRESS_POSTFIX) + - sizeof(BZCOMPRESS_POSTFIX) + 1]; + const char *logfile_suffix; + char tmp[MAXPATHLEN + sizeof(".0") + COMPRESS_SUFFIX_MAXLEN + 1]; if (archtodir) { char *p; @@ -2173,21 +2210,12 @@ age_old_log(char *file) } strlcat(tmp, ".0", sizeof(tmp)); - if (stat(tmp, &sb) < 0) { - /* - * A plain '.0' file does not exist. Try again, first - * with the added suffix of '.gz', then with an added - * suffix of '.bz2' instead of '.gz'. - */ - endp = strchr(tmp, '\0'); - strlcat(tmp, COMPRESS_POSTFIX, sizeof(tmp)); - if (stat(tmp, &sb) < 0) { - *endp = '\0'; /* Remove .gz */ - strlcat(tmp, BZCOMPRESS_POSTFIX, sizeof(tmp)); - if (stat(tmp, &sb) < 0) - return (-1); - } - } + logfile_suffix = get_logfile_suffix(tmp); + if (logfile_suffix == NULL) + return (-1); + (void) strlcat(tmp, logfile_suffix, sizeof(tmp)); + if (stat(tmp, &sb) < 0) + return (-1); return ((int)(ptimeget_secs(timenow) - sb.st_mtime + 1800) / 3600); } Modified: stable/8/usr.sbin/newsyslog/newsyslog.conf.5 ============================================================================== --- stable/8/usr.sbin/newsyslog/newsyslog.conf.5 Mon Feb 21 09:56:08 2011 (r218910) +++ stable/8/usr.sbin/newsyslog/newsyslog.conf.5 Mon Feb 21 10:08:47 2011 (r218911) @@ -21,7 +21,7 @@ .\" the suitability of this software for any purpose. It is .\" provided "as is" without express or implied warranty. .\" -.Dd July 23, 2010 +.Dd January 31, 2011 .Dt NEWSYSLOG.CONF 5 .Os .Sh NAME @@ -292,6 +292,12 @@ indicates that should attempt to save disk space by compressing the rotated log file using .Xr bzip2 1 . +.It Cm X +indicates that +.Xr newsyslog 8 +should attempt to save disk space by compressing the rotated +log file using +.Xr xz 1 . .It Cm N indicates that there is no process which needs to be signaled when this log file is rotated. @@ -346,6 +352,7 @@ signal will be sent. .Sh SEE ALSO .Xr bzip2 1 , .Xr gzip 1 , +.Xr xz 1 , .Xr syslog 3 , .Xr chown 8 , .Xr newsyslog 8 , Modified: stable/8/usr.sbin/newsyslog/pathnames.h ============================================================================== --- stable/8/usr.sbin/newsyslog/pathnames.h Mon Feb 21 09:56:08 2011 (r218910) +++ stable/8/usr.sbin/newsyslog/pathnames.h Mon Feb 21 10:08:47 2011 (r218911) @@ -22,7 +22,8 @@ provided "as is" without express or impl */ -#define _PATH_CONF "/etc/newsyslog.conf" -#define _PATH_SYSLOGPID _PATH_VARRUN "syslog.pid" -#define _PATH_BZIP2 "/usr/bin/bzip2" -#define _PATH_GZIP "/usr/bin/gzip" +#define _PATH_CONF "/etc/newsyslog.conf" +#define _PATH_SYSLOGPID _PATH_VARRUN "syslog.pid" +#define _PATH_BZIP2 "/usr/bin/bzip2" +#define _PATH_GZIP "/usr/bin/gzip" +#define _PATH_XZ "/usr/bin/xz" From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 16:30:27 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B2EC3106566B; Mon, 21 Feb 2011 16:30:27 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A0E3B8FC26; Mon, 21 Feb 2011 16:30:27 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LGURtL076216; Mon, 21 Feb 2011 16:30:27 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LGURlt076214; Mon, 21 Feb 2011 16:30:27 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201102211630.p1LGURlt076214@svn.freebsd.org> From: Jaakko Heinonen Date: Mon, 21 Feb 2011 16:30:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218919 - stable/8/sys/geom/label X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 16:30:27 -0000 Author: jh Date: Mon Feb 21 16:30:27 2011 New Revision: 218919 URL: http://svn.freebsd.org/changeset/base/218919 Log: MFC r216098: - Report an error when a label with invalid name is attempted to be created with glabel(8). - Fix a typo in an error message. - Fix comment typos. Modified: stable/8/sys/geom/label/g_label.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/geom/label/g_label.c ============================================================================== --- stable/8/sys/geom/label/g_label.c Mon Feb 21 16:21:43 2011 (r218918) +++ stable/8/sys/geom/label/g_label.c Mon Feb 21 16:30:27 2011 (r218919) @@ -124,13 +124,13 @@ g_label_is_name_ok(const char *label) { const char *s; - /* Check is the label starts from ../ */ + /* Check if the label starts from ../ */ if (strncmp(label, "../", 3) == 0) return (0); - /* Check is the label contains /../ */ + /* Check if the label contains /../ */ if (strstr(label, "/../") != NULL) return (0); - /* Check is the label ends at ../ */ + /* Check if the label ends at ../ */ if ((s = strstr(label, "/..")) != NULL && s[3] == '\0') return (0); return (1); @@ -151,6 +151,8 @@ g_label_create(struct gctl_req *req, str G_LABEL_DEBUG(0, "%s contains suspicious label, skipping.", pp->name); G_LABEL_DEBUG(1, "%s suspicious label is: %s", pp->name, label); + if (req != NULL) + gctl_error(req, "Label name %s is invalid.", label); return (NULL); } gp = NULL; @@ -346,7 +348,7 @@ g_label_ctl_create(struct gctl_req *req, return; } if (*nargs != 2) { - gctl_error(req, "Invalid number of argument."); + gctl_error(req, "Invalid number of arguments."); return; } /* From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 16:33:01 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68FA31065673; Mon, 21 Feb 2011 16:33:01 +0000 (UTC) (envelope-from jh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 568FB8FC17; Mon, 21 Feb 2011 16:33:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LGX1Ui076318; Mon, 21 Feb 2011 16:33:01 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LGX1wY076316; Mon, 21 Feb 2011 16:33:01 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201102211633.p1LGX1wY076316@svn.freebsd.org> From: Jaakko Heinonen Date: Mon, 21 Feb 2011 16:33:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218920 - stable/7/sys/geom/label X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 16:33:01 -0000 Author: jh Date: Mon Feb 21 16:33:01 2011 New Revision: 218920 URL: http://svn.freebsd.org/changeset/base/218920 Log: MFC r216098: - Report an error when a label with invalid name is attempted to be created with glabel(8). - Fix a typo in an error message. - Fix comment typos. Modified: stable/7/sys/geom/label/g_label.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/geom/label/g_label.c ============================================================================== --- stable/7/sys/geom/label/g_label.c Mon Feb 21 16:30:27 2011 (r218919) +++ stable/7/sys/geom/label/g_label.c Mon Feb 21 16:33:01 2011 (r218920) @@ -123,13 +123,13 @@ g_label_is_name_ok(const char *label) { const char *s; - /* Check is the label starts from ../ */ + /* Check if the label starts from ../ */ if (strncmp(label, "../", 3) == 0) return (0); - /* Check is the label contains /../ */ + /* Check if the label contains /../ */ if (strstr(label, "/../") != NULL) return (0); - /* Check is the label ends at ../ */ + /* Check if the label ends at ../ */ if ((s = strstr(label, "/..")) != NULL && s[3] == '\0') return (0); return (1); @@ -150,6 +150,8 @@ g_label_create(struct gctl_req *req, str G_LABEL_DEBUG(0, "%s contains suspicious label, skipping.", pp->name); G_LABEL_DEBUG(1, "%s suspicious label is: %s", pp->name, label); + if (req != NULL) + gctl_error(req, "Label name %s is invalid.", label); return (NULL); } gp = NULL; @@ -339,7 +341,7 @@ g_label_ctl_create(struct gctl_req *req, return; } if (*nargs != 2) { - gctl_error(req, "Invalid number of argument."); + gctl_error(req, "Invalid number of arguments."); return; } /* From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 16:55:54 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52BD6106566C; Mon, 21 Feb 2011 16:55:54 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 40A2B8FC14; Mon, 21 Feb 2011 16:55:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LGtsQj076946; Mon, 21 Feb 2011 16:55:54 GMT (envelope-from ken@svn.freebsd.org) Received: (from ken@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LGtsk5076942; Mon, 21 Feb 2011 16:55:54 GMT (envelope-from ken@svn.freebsd.org) Message-Id: <201102211655.p1LGtsk5076942@svn.freebsd.org> From: "Kenneth D. Merry" Date: Mon, 21 Feb 2011 16:55:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218921 - stable/8/sys/dev/mps X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 16:55:54 -0000 Author: ken Date: Mon Feb 21 16:55:53 2011 New Revision: 218921 URL: http://svn.freebsd.org/changeset/base/218921 Log: MFC: r218811: In the MPS driver, during device removal processing, don't assume that the controller firmware will return all of our commands. Instead, keep track of outstanding I/Os and return them to CAM once device removal processing completes. mpsvar.h: Declare the new "io_list" in the mps_softc. mps.c: Initialize the new "io_list" in the mps softc. mps_sas.c: o Track SCSI I/O requests on the io_list from the time of mpssas_action() through mpssas_scsiio_complete(). o Zero out the request structures used for device removal commands prior to filling them out. o Once the target reset task management function completes during device removal processing, assume any SCSI I/O commands that are still oustanding will never return from the controller, and process them manually. Submitted by: gibbs Modified: stable/8/sys/dev/mps/mps.c stable/8/sys/dev/mps/mps_sas.c stable/8/sys/dev/mps/mpsvar.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/mps/mps.c ============================================================================== --- stable/8/sys/dev/mps/mps.c Mon Feb 21 16:33:01 2011 (r218920) +++ stable/8/sys/dev/mps/mps.c Mon Feb 21 16:55:53 2011 (r218921) @@ -898,6 +898,7 @@ mps_attach(struct mps_softc *sc) TAILQ_INIT(&sc->req_list); TAILQ_INIT(&sc->chain_list); TAILQ_INIT(&sc->tm_list); + TAILQ_INIT(&sc->io_list); if (((error = mps_alloc_queues(sc)) != 0) || ((error = mps_alloc_replies(sc)) != 0) || Modified: stable/8/sys/dev/mps/mps_sas.c ============================================================================== --- stable/8/sys/dev/mps/mps_sas.c Mon Feb 21 16:33:01 2011 (r218920) +++ stable/8/sys/dev/mps/mps_sas.c Mon Feb 21 16:55:53 2011 (r218921) @@ -486,7 +486,10 @@ mpssas_prepare_remove(struct mpssas_soft return; } + mps_dprint(sc, MPS_INFO, "Preparing to remove target %d\n", targ->tid); + req = (MPI2_SCSI_TASK_MANAGE_REQUEST *)cm->cm_req; + memset(req, 0, sizeof(*req)); req->DevHandle = targ->handle; req->Function = MPI2_FUNCTION_SCSI_TASK_MGMT; req->TaskType = MPI2_SCSITASKMGMT_TASKTYPE_TARGET_RESET; @@ -507,6 +510,7 @@ mpssas_remove_device(struct mps_softc *s MPI2_SCSI_TASK_MANAGE_REPLY *reply; MPI2_SAS_IOUNIT_CONTROL_REQUEST *req; struct mpssas_target *targ; + struct mps_command *next_cm; uint16_t handle; mps_dprint(sc, MPS_TRACE, "%s\n", __func__); @@ -523,11 +527,13 @@ mpssas_remove_device(struct mps_softc *s return; } - mps_printf(sc, "Reset aborted %d commands\n", reply->TerminationCount); + mps_dprint(sc, MPS_INFO, "Reset aborted %u commands\n", + reply->TerminationCount); mps_free_reply(sc, cm->cm_reply_data); /* Reuse the existing command */ req = (MPI2_SAS_IOUNIT_CONTROL_REQUEST *)cm->cm_req; + memset(req, 0, sizeof(*req)); req->Function = MPI2_FUNCTION_SAS_IO_UNIT_CONTROL; req->Operation = MPI2_SAS_OP_REMOVE_DEVICE; req->DevHandle = handle; @@ -539,6 +545,17 @@ mpssas_remove_device(struct mps_softc *s mps_map_command(sc, cm); mps_dprint(sc, MPS_INFO, "clearing target handle 0x%04x\n", handle); + TAILQ_FOREACH_SAFE(cm, &sc->io_list, cm_link, next_cm) { + union ccb *ccb; + + if (cm->cm_targ->handle != handle) + continue; + + mps_dprint(sc, MPS_INFO, "Completing missed command %p\n", cm); + ccb = cm->cm_complete_data; + ccb->ccb_h.status = CAM_DEV_NOT_THERE; + mpssas_scsiio_complete(sc, cm); + } targ = mpssas_find_target(sc->sassc, 0, handle); if (targ != NULL) { targ->handle = 0x0; @@ -1430,6 +1447,7 @@ mpssas_action_scsiio(struct mpssas_softc cm->cm_complete_data = ccb; cm->cm_targ = targ; + TAILQ_INSERT_TAIL(&sc->io_list, cm, cm_link); callout_reset(&cm->cm_callout, (ccb->ccb_h.timeout * hz) / 1000, mpssas_scsiio_timeout, cm); @@ -1449,6 +1467,7 @@ mpssas_scsiio_complete(struct mps_softc mps_dprint(sc, MPS_TRACE, "%s\n", __func__); callout_stop(&cm->cm_callout); + TAILQ_REMOVE(&sc->io_list, cm, cm_link); sassc = sc->sassc; ccb = cm->cm_complete_data; @@ -1470,8 +1489,10 @@ mpssas_scsiio_complete(struct mps_softc /* Take the fast path to completion */ if (cm->cm_reply == NULL) { - ccb->ccb_h.status = CAM_REQ_CMP; - ccb->csio.scsi_status = SCSI_STATUS_OK; + if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG) { + ccb->ccb_h.status = CAM_REQ_CMP; + ccb->csio.scsi_status = SCSI_STATUS_OK; + } mps_free_command(sc, cm); xpt_done(ccb); return; Modified: stable/8/sys/dev/mps/mpsvar.h ============================================================================== --- stable/8/sys/dev/mps/mpsvar.h Mon Feb 21 16:33:01 2011 (r218920) +++ stable/8/sys/dev/mps/mpsvar.h Mon Feb 21 16:55:53 2011 (r218921) @@ -133,6 +133,7 @@ struct mps_softc { TAILQ_HEAD(, mps_command) req_list; TAILQ_HEAD(, mps_chain) chain_list; TAILQ_HEAD(, mps_command) tm_list; + TAILQ_HEAD(, mps_command) io_list; int replypostindex; int replyfreeindex; From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 18:11:56 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA71810656B0; Mon, 21 Feb 2011 18:11:56 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9720F8FC0C; Mon, 21 Feb 2011 18:11:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LIBu3h078772; Mon, 21 Feb 2011 18:11:56 GMT (envelope-from ken@svn.freebsd.org) Received: (from ken@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LIBuGu078768; Mon, 21 Feb 2011 18:11:56 GMT (envelope-from ken@svn.freebsd.org) Message-Id: <201102211811.p1LIBuGu078768@svn.freebsd.org> From: "Kenneth D. Merry" Date: Mon, 21 Feb 2011 18:11:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218922 - stable/8/sys/dev/mps X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 18:11:56 -0000 Author: ken Date: Mon Feb 21 18:11:56 2011 New Revision: 218922 URL: http://svn.freebsd.org/changeset/base/218922 Log: MFC: r218812 Fix several issues with the mps(4) driver. When the driver ran out of DMA chaining buffers, it kept the timeout for the I/O, and I/O would stall. The driver was not freezing the device queue on errors. mps.c: Pull command completion logic into a separate function, and call the callback/wakeup for commands that are never sent due to lack of chain buffers. Add a number of extra diagnostic sysctl variables. Handle pre-hardware errors for configuration I/O. This doesn't panic the system, but it will fail the configuration I/O and there is no retry mechanism. So the device probe will not succeed. This should be a very uncommon situation, however. mps_sas.c: Freeze the SIM queue when we run out of chain buffers, and unfreeze it when more commands complete. Freeze the device queue when errors occur, so that CAM can insure proper command ordering. Report pre-hardware errors for task management commands. In general, that shouldn't be possible because task management commands don't have S/G lists, and that is currently the only error path before we get to the hardware. Handle pre-hardware errors (like out of chain elements) for SMP requests. That shouldn't happen either, since we should have enough space for two S/G elements in the standard request. For commands that end with MPI2_IOCSTATUS_SCSI_IOC_TERMINATED and MPI2_IOCSTATUS_SCSI_EXT_TERMINATED, return them with CAM_REQUEUE_REQ to retry them unconditionally. These seem to be related to back end, transport related problems that are hopefully transient. We don't want to go through the retry count for something that is not a permanent error. Keep track of the number of outstanding I/Os. mpsvar.h: Track the number of free chain elements. Add variables for the number of outstanding I/Os, and I/O high water mark. Add variables to track the number of free chain buffers and the chain low water mark, as well as the number of chain allocation failures. Add I/O state flags and an attach done flag. Modified: stable/8/sys/dev/mps/mps.c stable/8/sys/dev/mps/mps_sas.c stable/8/sys/dev/mps/mpsvar.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/mps/mps.c ============================================================================== --- stable/8/sys/dev/mps/mps.c Mon Feb 21 16:55:53 2011 (r218921) +++ stable/8/sys/dev/mps/mps.c Mon Feb 21 18:11:56 2011 (r218922) @@ -62,6 +62,7 @@ static void mps_startup(void *arg); static void mps_startup_complete(struct mps_softc *sc, struct mps_command *cm); static int mps_send_iocinit(struct mps_softc *sc); static int mps_attach_log(struct mps_softc *sc); +static __inline void mps_complete_command(struct mps_command *cm); static void mps_dispatch_event(struct mps_softc *sc, uintptr_t data, MPI2_EVENT_NOTIFICATION_REPLY *reply); static void mps_config_complete(struct mps_softc *sc, struct mps_command *cm); static void mps_periodic(void *); @@ -387,6 +388,15 @@ mps_enqueue_request(struct mps_softc *sc mps_dprint(sc, MPS_TRACE, "%s\n", __func__); + if (sc->mps_flags & MPS_FLAGS_ATTACH_DONE) + mtx_assert(&sc->mps_mtx, MA_OWNED); + + if ((cm->cm_desc.Default.SMID < 1) + || (cm->cm_desc.Default.SMID >= sc->num_reqs)) { + mps_printf(sc, "%s: invalid SMID %d, desc %#x %#x\n", + __func__, cm->cm_desc.Default.SMID, + cm->cm_desc.Words.High, cm->cm_desc.Words.Low); + } mps_regwrite(sc, MPI2_REQUEST_DESCRIPTOR_POST_LOW_OFFSET, cm->cm_desc.Words.Low); mps_regwrite(sc, MPI2_REQUEST_DESCRIPTOR_POST_HIGH_OFFSET, @@ -732,6 +742,7 @@ mps_alloc_requests(struct mps_softc *sc) chain->chain_busaddr = sc->chain_busaddr + i * sc->facts->IOCRequestFrameSize * 4; mps_free_chain(sc, chain); + sc->chain_free_lowwater++; } /* XXX Need to pick a more precise value */ @@ -855,6 +866,26 @@ mps_attach(struct mps_softc *sc) &sc->allow_multiple_tm_cmds, 0, "allow multiple simultaneous task management cmds"); + SYSCTL_ADD_INT(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), + OID_AUTO, "io_cmds_active", CTLFLAG_RD, + &sc->io_cmds_active, 0, "number of currently active commands"); + + SYSCTL_ADD_INT(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), + OID_AUTO, "io_cmds_highwater", CTLFLAG_RD, + &sc->io_cmds_highwater, 0, "maximum active commands seen"); + + SYSCTL_ADD_INT(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), + OID_AUTO, "chain_free", CTLFLAG_RD, + &sc->chain_free, 0, "number of free chain elements"); + + SYSCTL_ADD_INT(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), + OID_AUTO, "chain_free_lowwater", CTLFLAG_RD, + &sc->chain_free_lowwater, 0,"lowest number of free chain elements"); + + SYSCTL_ADD_QUAD(&sc->sysctl_ctx, SYSCTL_CHILDREN(sc->sysctl_tree), + OID_AUTO, "chain_alloc_fail", CTLFLAG_RD, + &sc->chain_alloc_fail, "chain allocation failures"); + if ((error = mps_transition_ready(sc)) != 0) return (error); @@ -895,6 +926,8 @@ mps_attach(struct mps_softc *sc) sc->num_reqs = MIN(MPS_REQ_FRAMES, sc->facts->RequestCredit); sc->num_replies = MIN(MPS_REPLY_FRAMES + MPS_EVT_REPLY_FRAMES, sc->facts->MaxReplyDescriptorPostQueueDepth) - 1; + mps_dprint(sc, MPS_INFO, "num_reqs %d, num_replies %d\n", sc->num_reqs, + sc->num_replies); TAILQ_INIT(&sc->req_list); TAILQ_INIT(&sc->chain_list); TAILQ_INIT(&sc->tm_list); @@ -968,6 +1001,8 @@ mps_attach(struct mps_softc *sc) error = EINVAL; } + sc->mps_flags |= MPS_FLAGS_ATTACH_DONE; + return (error); } @@ -1167,6 +1202,22 @@ mps_free(struct mps_softc *sc) return (0); } +static __inline void +mps_complete_command(struct mps_command *cm) +{ + if (cm->cm_flags & MPS_CM_FLAGS_POLLED) + cm->cm_flags |= MPS_CM_FLAGS_COMPLETE; + + if (cm->cm_complete != NULL) + cm->cm_complete(cm->cm_sc, cm); + + if (cm->cm_flags & MPS_CM_FLAGS_WAKEUP) { + mps_dprint(cm->cm_sc, MPS_TRACE, "%s: waking up %p\n", + __func__, cm); + wakeup(cm); + } +} + void mps_intr(void *data) { @@ -1293,16 +1344,8 @@ mps_intr_locked(void *data) break; } - if (cm != NULL) { - if (cm->cm_flags & MPS_CM_FLAGS_POLLED) - cm->cm_flags |= MPS_CM_FLAGS_COMPLETE; - - if (cm->cm_complete != NULL) - cm->cm_complete(sc, cm); - - if (cm->cm_flags & MPS_CM_FLAGS_WAKEUP) - wakeup(cm); - } + if (cm != NULL) + mps_complete_command(cm); desc->Words.Low = 0xffffffff; desc->Words.High = 0xffffffff; @@ -1663,6 +1706,8 @@ mps_data_cb(void *arg, bus_dma_segment_t if (error != 0) { /* Resource shortage, roll back! */ mps_printf(sc, "out of chain frames\n"); + cm->cm_flags |= MPS_CM_FLAGS_CHAIN_FAILED; + mps_complete_command(cm); return; } } @@ -1802,6 +1847,15 @@ mps_config_complete(struct mps_softc *sc bus_dmamap_unload(sc->buffer_dmat, cm->cm_dmamap); } + /* + * XXX KDM need to do more error recovery? This results in the + * device in question not getting probed. + */ + if ((cm->cm_flags & MPS_CM_FLAGS_ERROR_MASK) != 0) { + params->status = MPI2_IOCSTATUS_BUSY; + goto bailout; + } + reply = (MPI2_CONFIG_REPLY *)cm->cm_reply; params->status = reply->IOCStatus; if (params->hdr.Ext.ExtPageType != 0) { @@ -1814,6 +1868,8 @@ mps_config_complete(struct mps_softc *sc params->hdr.Struct.PageVersion = reply->Header.PageVersion; } +bailout: + mps_free_command(sc, cm); if (params->callback != NULL) params->callback(sc, params); Modified: stable/8/sys/dev/mps/mps_sas.c ============================================================================== --- stable/8/sys/dev/mps/mps_sas.c Mon Feb 21 16:55:53 2011 (r218921) +++ stable/8/sys/dev/mps/mps_sas.c Mon Feb 21 18:11:56 2011 (r218922) @@ -520,6 +520,18 @@ mpssas_remove_device(struct mps_softc *s mpssas_complete_tm_request(sc, cm, /*free_cm*/ 0); + /* + * Currently there should be no way we can hit this case. It only + * happens when we have a failure to allocate chain frames, and + * task management commands don't have S/G lists. + */ + if ((cm->cm_flags & MPS_CM_FLAGS_ERROR_MASK) != 0) { + mps_printf(sc, "%s: cm_flags = %#x for remove of handle %#04x! " + "This should not happen!\n", __func__, cm->cm_flags, + handle); + return; + } + if (reply->IOCStatus != MPI2_IOCSTATUS_SUCCESS) { mps_printf(sc, "Failure 0x%x reseting device 0x%04x\n", reply->IOCStatus, handle); @@ -1100,6 +1112,17 @@ mpssas_abort_complete(struct mps_softc * req = (MPI2_SCSI_TASK_MANAGE_REQUEST *)cm->cm_req; + /* + * Currently there should be no way we can hit this case. It only + * happens when we have a failure to allocate chain frames, and + * task management commands don't have S/G lists. + */ + if ((cm->cm_flags & MPS_CM_FLAGS_ERROR_MASK) != 0) { + mps_printf(sc, "%s: cm_flags = %#x for abort on handle %#04x! " + "This should not happen!\n", __func__, cm->cm_flags, + req->DevHandle); + } + mps_printf(sc, "%s: abort request on handle %#04x SMID %d " "complete\n", __func__, req->DevHandle, req->TaskMID); @@ -1216,7 +1239,8 @@ mpssas_tm_complete(struct mps_softc *sc, resp = (MPI2_SCSI_TASK_MANAGE_REPLY *)cm->cm_reply; - resp->ResponseCode = error; + if (resp != NULL) + resp->ResponseCode = error; /* * Call the callback for this command, it will be @@ -1366,6 +1390,7 @@ mpssas_action_scsiio(struct mpssas_softc } req = (MPI2_SCSI_IO_REQUEST *)cm->cm_req; + bzero(req, sizeof(*req)); req->DevHandle = targ->handle; req->Function = MPI2_FUNCTION_SCSI_IO_REQUEST; req->MsgFlags = 0; @@ -1447,6 +1472,10 @@ mpssas_action_scsiio(struct mpssas_softc cm->cm_complete_data = ccb; cm->cm_targ = targ; + sc->io_cmds_active++; + if (sc->io_cmds_active > sc->io_cmds_highwater) + sc->io_cmds_highwater = sc->io_cmds_active; + TAILQ_INSERT_TAIL(&sc->io_list, cm, cm_link); callout_reset(&cm->cm_callout, (ccb->ccb_h.timeout * hz) / 1000, mpssas_scsiio_timeout, cm); @@ -1468,11 +1497,17 @@ mpssas_scsiio_complete(struct mps_softc callout_stop(&cm->cm_callout); TAILQ_REMOVE(&sc->io_list, cm, cm_link); + sc->io_cmds_active--; sassc = sc->sassc; ccb = cm->cm_complete_data; rep = (MPI2_SCSI_IO_REPLY *)cm->cm_reply; + /* + * XXX KDM if the chain allocation fails, does it matter if we do + * the sync and unload here? It is simpler to do it in every case, + * assuming it doesn't cause problems. + */ if (cm->cm_data != NULL) { if (cm->cm_flags & MPS_CM_FLAGS_DATAIN) dir = BUS_DMASYNC_POSTREAD; @@ -1482,9 +1517,34 @@ mpssas_scsiio_complete(struct mps_softc bus_dmamap_unload(sc->buffer_dmat, cm->cm_dmamap); } - if (sassc->flags & MPSSAS_QUEUE_FROZEN) { - ccb->ccb_h.flags |= CAM_RELEASE_SIMQ; - sassc->flags &= ~MPSSAS_QUEUE_FROZEN; + if ((cm->cm_flags & MPS_CM_FLAGS_ERROR_MASK) != 0) { + /* + * We ran into an error after we tried to map the command, + * so we're getting a callback without queueing the command + * to the hardware. So we set the status here, and it will + * be retained below. We'll go through the "fast path", + * because there can be no reply when we haven't actually + * gone out to the hardware. + */ + ccb->ccb_h.status |= CAM_REQUEUE_REQ; + + /* + * Currently the only error included in the mask is + * MPS_CM_FLAGS_CHAIN_FAILED, which means we're out of + * chain frames. We need to freeze the queue until we get + * a command that completed without this error, which will + * hopefully have some chain frames attached that we can + * use. If we wanted to get smarter about it, we would + * only unfreeze the queue in this condition when we're + * sure that we're getting some chain frames back. That's + * probably unnecessary. + */ + if ((sassc->flags & MPSSAS_QUEUE_FROZEN) == 0) { + xpt_freeze_simq(sassc->sim, 1); + sassc->flags |= MPSSAS_QUEUE_FROZEN; + mps_printf(sc, "Error sending command, freezing " + "SIM queue\n"); + } } /* Take the fast path to completion */ @@ -1492,6 +1552,15 @@ mpssas_scsiio_complete(struct mps_softc if ((ccb->ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_INPROG) { ccb->ccb_h.status = CAM_REQ_CMP; ccb->csio.scsi_status = SCSI_STATUS_OK; + + if (sassc->flags & MPSSAS_QUEUE_FROZEN) { + ccb->ccb_h.status |= CAM_RELEASE_SIMQ; + sassc->flags &= ~MPSSAS_QUEUE_FROZEN; + mps_printf(sc, "Unfreezing SIM queue\n"); + } + } else { + ccb->ccb_h.status |= CAM_DEV_QFRZN; + xpt_freeze_devq(ccb->ccb_h.path, /*count*/ 1); } mps_free_command(sc, cm); xpt_done(ccb); @@ -1547,7 +1616,16 @@ mpssas_scsiio_complete(struct mps_softc break; case MPI2_IOCSTATUS_SCSI_IOC_TERMINATED: case MPI2_IOCSTATUS_SCSI_EXT_TERMINATED: +#if 0 ccb->ccb_h.status = CAM_REQ_ABORTED; +#endif + mps_printf(sc, "(%d:%d:%d) terminated ioc %x scsi %x state %x " + "xfer %u\n", xpt_path_path_id(ccb->ccb_h.path), + xpt_path_target_id(ccb->ccb_h.path), + xpt_path_lun_id(ccb->ccb_h.path), + rep->IOCStatus, rep->SCSIStatus, rep->SCSIState, + rep->TransferCount); + ccb->ccb_h.status = CAM_REQUEUE_REQ; break; case MPI2_IOCSTATUS_INVALID_SGL: mps_print_scsiio_cmd(sc, cm); @@ -1601,6 +1679,15 @@ mpssas_scsiio_complete(struct mps_softc if (rep->SCSIState & MPI2_SCSI_STATE_RESPONSE_INFO_VALID) ccb->ccb_h.status = CAM_REQ_CMP_ERR; + if (sassc->flags & MPSSAS_QUEUE_FROZEN) { + ccb->ccb_h.status |= CAM_RELEASE_SIMQ; + sassc->flags &= ~MPSSAS_QUEUE_FROZEN; + mps_printf(sc, "Command completed, unfreezing SIM queue\n"); + } + if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + ccb->ccb_h.status |= CAM_DEV_QFRZN; + xpt_freeze_devq(ccb->ccb_h.path, /*count*/ 1); + } mps_free_command(sc, cm); xpt_done(ccb); } @@ -1615,6 +1702,20 @@ mpssas_smpio_complete(struct mps_softc * union ccb *ccb; ccb = cm->cm_complete_data; + + /* + * Currently there should be no way we can hit this case. It only + * happens when we have a failure to allocate chain frames, and SMP + * commands require two S/G elements only. That should be handled + * in the standard request size. + */ + if ((cm->cm_flags & MPS_CM_FLAGS_ERROR_MASK) != 0) { + mps_printf(sc, "%s: cm_flags = %#x on SMP request!\n", + __func__, cm->cm_flags); + ccb->ccb_h.status = CAM_REQ_CMP_ERR; + goto bailout; + } + rpl = (MPI2_SMP_PASSTHROUGH_REPLY *)cm->cm_reply; if (rpl == NULL) { mps_dprint(sc, MPS_INFO, "%s: NULL cm_reply!\n", __func__); @@ -1994,6 +2095,19 @@ mpssas_resetdev_complete(struct mps_soft resp = (MPI2_SCSI_TASK_MANAGE_REPLY *)cm->cm_reply; ccb = cm->cm_complete_data; + if ((cm->cm_flags & MPS_CM_FLAGS_ERROR_MASK) != 0) { + MPI2_SCSI_TASK_MANAGE_REQUEST *req; + + req = (MPI2_SCSI_TASK_MANAGE_REQUEST *)cm->cm_req; + + mps_printf(sc, "%s: cm_flags = %#x for reset of handle %#04x! " + "This should not happen!\n", __func__, cm->cm_flags, + req->DevHandle); + + ccb->ccb_h.status = CAM_REQ_CMP_ERR; + goto bailout; + } + printf("resetdev complete IOCStatus= 0x%x ResponseCode= 0x%x\n", resp->IOCStatus, resp->ResponseCode); @@ -2002,6 +2116,7 @@ mpssas_resetdev_complete(struct mps_soft else ccb->ccb_h.status = CAM_REQ_CMP_ERR; +bailout: mpssas_complete_tm_request(sc, cm, /*free_cm*/ 1); xpt_done(ccb); Modified: stable/8/sys/dev/mps/mpsvar.h ============================================================================== --- stable/8/sys/dev/mps/mpsvar.h Mon Feb 21 16:55:53 2011 (r218921) +++ stable/8/sys/dev/mps/mpsvar.h Mon Feb 21 18:11:56 2011 (r218922) @@ -92,6 +92,8 @@ struct mps_command { #define MPS_CM_FLAGS_ACTIVE (1 << 6) #define MPS_CM_FLAGS_USE_UIO (1 << 7) #define MPS_CM_FLAGS_SMP_PASS (1 << 8) +#define MPS_CM_FLAGS_CHAIN_FAILED (1 << 9) +#define MPS_CM_FLAGS_ERROR_MASK MPS_CM_FLAGS_CHAIN_FAILED u_int cm_state; #define MPS_CM_STATE_FREE 0 #define MPS_CM_STATE_BUSY 1 @@ -119,9 +121,15 @@ struct mps_softc { #define MPS_FLAGS_MSI (1 << 1) #define MPS_FLAGS_BUSY (1 << 2) #define MPS_FLAGS_SHUTDOWN (1 << 3) +#define MPS_FLAGS_ATTACH_DONE (1 << 4) u_int mps_debug; u_int allow_multiple_tm_cmds; int tm_cmds_active; + int io_cmds_active; + int io_cmds_highwater; + int chain_free; + int chain_free_lowwater; + uint64_t chain_alloc_fail; struct sysctl_ctx_list sysctl_ctx; struct sysctl_oid *sysctl_tree; struct mps_command *commands; @@ -229,8 +237,13 @@ mps_alloc_chain(struct mps_softc *sc) { struct mps_chain *chain; - if ((chain = TAILQ_FIRST(&sc->chain_list)) != NULL) + if ((chain = TAILQ_FIRST(&sc->chain_list)) != NULL) { TAILQ_REMOVE(&sc->chain_list, chain, chain_link); + sc->chain_free--; + if (sc->chain_free < sc->chain_free_lowwater) + sc->chain_free_lowwater = sc->chain_free; + } else + sc->chain_alloc_fail++; return (chain); } @@ -240,6 +253,7 @@ mps_free_chain(struct mps_softc *sc, str #if 0 bzero(chain->chain, 128); #endif + sc->chain_free++; TAILQ_INSERT_TAIL(&sc->chain_list, chain, chain_link); } From owner-svn-src-stable@FreeBSD.ORG Mon Feb 21 21:00:30 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 36B26106564A; Mon, 21 Feb 2011 21:00:30 +0000 (UTC) (envelope-from bschmidt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 240C18FC08; Mon, 21 Feb 2011 21:00:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1LL0UpF083192; Mon, 21 Feb 2011 21:00:30 GMT (envelope-from bschmidt@svn.freebsd.org) Received: (from bschmidt@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1LL0U4p083190; Mon, 21 Feb 2011 21:00:30 GMT (envelope-from bschmidt@svn.freebsd.org) Message-Id: <201102212100.p1LL0U4p083190@svn.freebsd.org> From: Bernhard Schmidt Date: Mon, 21 Feb 2011 21:00:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218929 - stable/8/sys/conf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Feb 2011 21:00:30 -0000 Author: bschmidt Date: Mon Feb 21 21:00:29 2011 New Revision: 218929 URL: http://svn.freebsd.org/changeset/base/218929 Log: MFC r218368: Fix cut&paste mistake. Modified: stable/8/sys/conf/files Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/conf/files ============================================================================== --- stable/8/sys/conf/files Mon Feb 21 20:02:02 2011 (r218928) +++ stable/8/sys/conf/files Mon Feb 21 21:00:29 2011 (r218929) @@ -1204,7 +1204,7 @@ iwn6050.fw optional iwn6050fw | iwnfw dependency ".PHONY" \ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-6050-9.201.4.1.fw.uu" \ no-obj no-implicit-rule \ - clean "iwn6000.fw" + clean "iwn6050.fw" dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb From owner-svn-src-stable@FreeBSD.ORG Tue Feb 22 17:37:13 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3278106564A; Tue, 22 Feb 2011 17:37:13 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A0B2F8FC1C; Tue, 22 Feb 2011 17:37:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MHbDO8016106; Tue, 22 Feb 2011 17:37:13 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MHbDUw016104; Tue, 22 Feb 2011 17:37:13 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102221737.p1MHbDUw016104@svn.freebsd.org> From: Bruce Cran Date: Tue, 22 Feb 2011 17:37:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218952 - stable/8/usr.sbin/sysinstall X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 17:37:13 -0000 Author: brucec Date: Tue Feb 22 17:37:13 2011 New Revision: 218952 URL: http://svn.freebsd.org/changeset/base/218952 Log: MFC r218839: In the distribution list, 'A' is listed as the key to press to select both 'All' and 'Minimal'. Update the keys for Minimal and Custom to avoid the conflict. PR: bin/153809 Submitted by: Janne Snabb Modified: stable/8/usr.sbin/sysinstall/menus.c Directory Properties: stable/8/usr.sbin/sysinstall/ (props changed) Modified: stable/8/usr.sbin/sysinstall/menus.c ============================================================================== --- stable/8/usr.sbin/sysinstall/menus.c Tue Feb 22 15:31:40 2011 (r218951) +++ stable/8/usr.sbin/sysinstall/menus.c Tue Feb 22 17:37:13 2011 (r218952) @@ -961,9 +961,9 @@ DMenu MenuDistributions = { checkDistKernDeveloper, distSetKernDeveloper }, { "6 User", "Average user - binaries and doc only", checkDistUser, distSetUser }, - { "A Minimal", "The smallest configuration possible", + { "7 Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, - { "B Custom", "Specify your own distribution set", + { "8 Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, { NULL } }, }; From owner-svn-src-stable@FreeBSD.ORG Tue Feb 22 17:38:43 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ECEEC10657A0; Tue, 22 Feb 2011 17:38:43 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DAD038FC1D; Tue, 22 Feb 2011 17:38:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MHchq1016187; Tue, 22 Feb 2011 17:38:43 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MHchsd016185; Tue, 22 Feb 2011 17:38:43 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102221738.p1MHchsd016185@svn.freebsd.org> From: Bruce Cran Date: Tue, 22 Feb 2011 17:38:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218953 - stable/8/usr.sbin/sysinstall X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 17:38:44 -0000 Author: brucec Date: Tue Feb 22 17:38:43 2011 New Revision: 218953 URL: http://svn.freebsd.org/changeset/base/218953 Log: MFC r218840: Remove the quotas option from the Startup Services menu. GENERIC has no support for quotas so this option has no effect. PR: bin/123237 Submitted by: Lawrence Mayer Modified: stable/8/usr.sbin/sysinstall/menus.c Directory Properties: stable/8/usr.sbin/sysinstall/ (props changed) Modified: stable/8/usr.sbin/sysinstall/menus.c ============================================================================== --- stable/8/usr.sbin/sysinstall/menus.c Tue Feb 22 17:37:13 2011 (r218952) +++ stable/8/usr.sbin/sysinstall/menus.c Tue Feb 22 17:38:43 2011 (r218953) @@ -1287,8 +1287,6 @@ DMenu MenuStartup = { { " SVR4", "This host wants to be able to run SVR4 binaries.", dmenuVarCheck, dmenuToggleVariable, NULL, "svr4_enable=YES" }, #endif - { " quotas", "This host wishes to check quotas on startup.", - dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, { NULL } }, }; From owner-svn-src-stable@FreeBSD.ORG Tue Feb 22 17:40:18 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E94C01065679; Tue, 22 Feb 2011 17:40:18 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D720D8FC18; Tue, 22 Feb 2011 17:40:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MHeIco016275; Tue, 22 Feb 2011 17:40:18 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MHeIP6016273; Tue, 22 Feb 2011 17:40:18 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102221740.p1MHeIP6016273@svn.freebsd.org> From: Bruce Cran Date: Tue, 22 Feb 2011 17:40:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218954 - stable/8/usr.sbin/sysinstall X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 17:40:19 -0000 Author: brucec Date: Tue Feb 22 17:40:18 2011 New Revision: 218954 URL: http://svn.freebsd.org/changeset/base/218954 Log: MFC r218841: Allow users to create ufs1 filesystems via the noninteractive install.cfg system. PR: bin/113979 Modified: stable/8/usr.sbin/sysinstall/label.c Directory Properties: stable/8/usr.sbin/sysinstall/ (props changed) Modified: stable/8/usr.sbin/sysinstall/label.c ============================================================================== --- stable/8/usr.sbin/sysinstall/label.c Tue Feb 22 17:38:43 2011 (r218953) +++ stable/8/usr.sbin/sysinstall/label.c Tue Feb 22 17:40:18 2011 (r218954) @@ -1653,6 +1653,8 @@ diskLabelNonInteractive(Device *dev) pi = tmp->private_data = new_part(PART_FILESYSTEM, mpoint, TRUE); tmp->private_free = safe_free; pi->newfs_data.newfs_ufs.softupdates = soft; + if (!strcmp(typ, "ufs1")) + pi->newfs_data.newfs_ufs.ufs1 = TRUE; } } } From owner-svn-src-stable@FreeBSD.ORG Tue Feb 22 17:43:10 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 115CC106566B; Tue, 22 Feb 2011 17:43:10 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F35118FC0A; Tue, 22 Feb 2011 17:43:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MHh9RN016402; Tue, 22 Feb 2011 17:43:09 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MHh9Ut016400; Tue, 22 Feb 2011 17:43:09 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102221743.p1MHh9Ut016400@svn.freebsd.org> From: Bruce Cran Date: Tue, 22 Feb 2011 17:43:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218955 - stable/8/share/examples/pf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 17:43:10 -0000 Author: brucec Date: Tue Feb 22 17:43:09 2011 New Revision: 218955 URL: http://svn.freebsd.org/changeset/base/218955 Log: MFC r218854: Update the icmp example to show allowing only the safe types. Suggested by: Tom Judge Modified: stable/8/share/examples/pf/pf.conf Directory Properties: stable/8/share/examples/ (props changed) stable/8/share/examples/etc/ (props changed) stable/8/share/examples/kld/syscall/ (props changed) Modified: stable/8/share/examples/pf/pf.conf ============================================================================== --- stable/8/share/examples/pf/pf.conf Tue Feb 22 17:40:18 2011 (r218954) +++ stable/8/share/examples/pf/pf.conf Tue Feb 22 17:43:09 2011 (r218955) @@ -32,4 +32,4 @@ #pass in on $ext_if proto tcp to ($ext_if) port ssh #pass in log on $ext_if proto tcp to ($ext_if) port smtp #pass out log on $ext_if proto tcp from ($ext_if) to port smtp -#pass in on $ext_if proto icmp to ($ext_if) +#pass in on $ext_if inet proto icmp from any to ($ext_if) icmp-type { unreach, redir, timex } From owner-svn-src-stable@FreeBSD.ORG Tue Feb 22 17:50:33 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB85F106566B; Tue, 22 Feb 2011 17:50:33 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7E7FA8FC13; Tue, 22 Feb 2011 17:50:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MHoXvG016680; Tue, 22 Feb 2011 17:50:33 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MHoX9Q016677; Tue, 22 Feb 2011 17:50:33 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102221750.p1MHoX9Q016677@svn.freebsd.org> From: Bruce Cran Date: Tue, 22 Feb 2011 17:50:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218956 - stable/7/usr.sbin/sysinstall X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 17:50:33 -0000 Author: brucec Date: Tue Feb 22 17:50:33 2011 New Revision: 218956 URL: http://svn.freebsd.org/changeset/base/218956 Log: MFC r218839, r218840, r218841: In the distribution list, 'A' is listed as the key to press to select both 'All' and 'Minimal'. Update the keys for Minimal and Custom to avoid the conflict. Remove the quotas option from the Startup Services menu. GENERIC has no support for quotas so this option has no effect. Allow users to create ufs1 filesystems via the noninteractive install.cfg system. PR: bin/153809 PR: bin/123237 PR: bin/113979 Modified: stable/7/usr.sbin/sysinstall/label.c stable/7/usr.sbin/sysinstall/menus.c Directory Properties: stable/7/usr.sbin/sysinstall/ (props changed) Modified: stable/7/usr.sbin/sysinstall/label.c ============================================================================== --- stable/7/usr.sbin/sysinstall/label.c Tue Feb 22 17:43:09 2011 (r218955) +++ stable/7/usr.sbin/sysinstall/label.c Tue Feb 22 17:50:33 2011 (r218956) @@ -1674,6 +1674,8 @@ diskLabelNonInteractive(Device *dev) pi = tmp->private_data = new_part(PART_FILESYSTEM, mpoint, TRUE); tmp->private_free = safe_free; pi->newfs_data.newfs_ufs.softupdates = soft; + if (!strcmp(typ, "ufs1")) + pi->newfs_data.newfs_ufs.ufs1 = TRUE; } } } Modified: stable/7/usr.sbin/sysinstall/menus.c ============================================================================== --- stable/7/usr.sbin/sysinstall/menus.c Tue Feb 22 17:43:09 2011 (r218955) +++ stable/7/usr.sbin/sysinstall/menus.c Tue Feb 22 17:50:33 2011 (r218956) @@ -922,9 +922,9 @@ DMenu MenuDistributions = { checkDistUser, distSetUser }, { "9 X-User", "Same as above + X Window System", checkDistXUser, distSetXUser }, - { "A Minimal", "The smallest configuration possible", + { "B Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, - { "B Custom", "Specify your own distribution set", + { "C Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, { NULL } }, }; @@ -1263,8 +1263,6 @@ DMenu MenuStartup = { { " OSF/1", "This host wants to be able to run DEC OSF/1 binaries.", dmenuVarCheck, configOSF1, NULL, VAR_OSF1_ENABLE "=YES" }, #endif - { " quotas", "This host wishes to check quotas on startup.", - dmenuVarCheck, dmenuToggleVariable, NULL, "check_quotas=YES" }, { NULL } }, }; From owner-svn-src-stable@FreeBSD.ORG Tue Feb 22 17:51:45 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B382E1065783; Tue, 22 Feb 2011 17:51:45 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A14148FC16; Tue, 22 Feb 2011 17:51:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MHpjFv016762; Tue, 22 Feb 2011 17:51:45 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MHpjht016760; Tue, 22 Feb 2011 17:51:45 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102221751.p1MHpjht016760@svn.freebsd.org> From: Bruce Cran Date: Tue, 22 Feb 2011 17:51:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218957 - stable/7/share/examples/pf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 17:51:45 -0000 Author: brucec Date: Tue Feb 22 17:51:45 2011 New Revision: 218957 URL: http://svn.freebsd.org/changeset/base/218957 Log: MFC r218854: Update the icmp example to show allowing only the safe types. Suggested by: Tom Judge Modified: stable/7/share/examples/pf/pf.conf Directory Properties: stable/7/share/examples/ (props changed) Modified: stable/7/share/examples/pf/pf.conf ============================================================================== --- stable/7/share/examples/pf/pf.conf Tue Feb 22 17:50:33 2011 (r218956) +++ stable/7/share/examples/pf/pf.conf Tue Feb 22 17:51:45 2011 (r218957) @@ -32,4 +32,4 @@ #pass in on $ext_if proto tcp to ($ext_if) port ssh #pass in log on $ext_if proto tcp to ($ext_if) port smtp #pass out log on $ext_if proto tcp from ($ext_if) to port smtp -#pass in on $ext_if proto icmp to ($ext_if) +#pass in on $ext_if inet proto icmp from any to ($ext_if) icmp-type { unreach, redir, timex } From owner-svn-src-stable@FreeBSD.ORG Tue Feb 22 21:24:37 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47BBC106566C; Tue, 22 Feb 2011 21:24:37 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 350A88FC15; Tue, 22 Feb 2011 21:24:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MLObhN021883; Tue, 22 Feb 2011 21:24:37 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MLOb14021881; Tue, 22 Feb 2011 21:24:37 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102222124.p1MLOb14021881@svn.freebsd.org> From: Pyun YongHyeon Date: Tue, 22 Feb 2011 21:24:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218962 - stable/8/sys/dev/fxp X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 21:24:37 -0000 Author: yongari Date: Tue Feb 22 21:24:36 2011 New Revision: 218962 URL: http://svn.freebsd.org/changeset/base/218962 Log: MFC r218710: Fix a regression introduced in r215906. The change made in r215906 caused link re-negotiation whenever application joins or leaves a multicast group. If driver is running, it would have established a link so there is no need to start re-negotiation. The re-negotiation broke established link which in turn stopped multicast application working while re-negotiation is in progress. PR: kern/154667 Modified: stable/8/sys/dev/fxp/if_fxp.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/dev/fxp/if_fxp.c ============================================================================== --- stable/8/sys/dev/fxp/if_fxp.c Tue Feb 22 21:13:40 2011 (r218961) +++ stable/8/sys/dev/fxp/if_fxp.c Tue Feb 22 21:24:36 2011 (r218962) @@ -2823,8 +2823,10 @@ fxp_ioctl(struct ifnet *ifp, u_long comm case SIOCADDMULTI: case SIOCDELMULTI: + FXP_LOCK(sc); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) - fxp_init(sc); + fxp_init_body(sc, 0); + FXP_UNLOCK(sc); break; case SIOCSIFMEDIA: From owner-svn-src-stable@FreeBSD.ORG Tue Feb 22 21:27:46 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF20B1065675; Tue, 22 Feb 2011 21:27:46 +0000 (UTC) (envelope-from yongari@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9CA1B8FC0A; Tue, 22 Feb 2011 21:27:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1MLRkBu021988; Tue, 22 Feb 2011 21:27:46 GMT (envelope-from yongari@svn.freebsd.org) Received: (from yongari@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1MLRk2Z021986; Tue, 22 Feb 2011 21:27:46 GMT (envelope-from yongari@svn.freebsd.org) Message-Id: <201102222127.p1MLRk2Z021986@svn.freebsd.org> From: Pyun YongHyeon Date: Tue, 22 Feb 2011 21:27:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218963 - stable/7/sys/dev/fxp X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Feb 2011 21:27:46 -0000 Author: yongari Date: Tue Feb 22 21:27:46 2011 New Revision: 218963 URL: http://svn.freebsd.org/changeset/base/218963 Log: MFC r218710: Fix a regression introduced in r215906. The change made in r215906 caused link re-negotiation whenever application joins or leaves a multicast group. If driver is running, it would have established a link so there is no need to start re-negotiation. The re-negotiation broke established link which in turn stopped multicast application working while re-negotiation is in progress. PR: kern/154667 Modified: stable/7/sys/dev/fxp/if_fxp.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/fxp/if_fxp.c ============================================================================== --- stable/7/sys/dev/fxp/if_fxp.c Tue Feb 22 21:24:36 2011 (r218962) +++ stable/7/sys/dev/fxp/if_fxp.c Tue Feb 22 21:27:46 2011 (r218963) @@ -2816,8 +2816,10 @@ fxp_ioctl(struct ifnet *ifp, u_long comm case SIOCADDMULTI: case SIOCDELMULTI: + FXP_LOCK(sc); if ((ifp->if_drv_flags & IFF_DRV_RUNNING) != 0) - fxp_init(sc); + fxp_init_body(sc, 0); + FXP_UNLOCK(sc); break; case SIOCSIFMEDIA: From owner-svn-src-stable@FreeBSD.ORG Wed Feb 23 19:07:51 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11C40106564A; Wed, 23 Feb 2011 19:07:51 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F20798FC15; Wed, 23 Feb 2011 19:07:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NJ7oXu004293; Wed, 23 Feb 2011 19:07:50 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NJ7od7004290; Wed, 23 Feb 2011 19:07:50 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102231907.p1NJ7od7004290@svn.freebsd.org> From: Hiroki Sato Date: Wed, 23 Feb 2011 19:07:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218977 - in stable/8/release/doc: en_US.ISO8859-1/relnotes share/sgml X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 19:07:51 -0000 Author: hrs Date: Wed Feb 23 19:07:50 2011 New Revision: 218977 URL: http://svn.freebsd.org/changeset/base/218977 Log: Import and update relnotes items for 8.2R: fix SA table's cell width[1], alq(4) improvement in details, TCP reassembly improved[2], xz rewording[3], and various grammer fixes[4]. Suggested by: dougb[1], keramida[1], lstewart[2], mm[3], mandree[4]. Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml stable/8/release/doc/share/sgml/release.dsl stable/8/release/doc/share/sgml/release.ent Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed Feb 23 18:22:40 2011 (r218976) +++ stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed Feb 23 19:07:50 2011 (r218977) @@ -15,7 +15,7 @@ $FreeBSD$ - 2010 + 2011 The &os; Documentation Project @@ -117,7 +117,7 @@ advisories available from . - + @@ -132,64 +132,24 @@ - SA-09:15.ssl - 3 Dec 2009 - SSL protocol flaw + SA-10:08.bzip2 + 20 September 2010 + Integer overflow in bzip2 decompression + - SA-09:17.freebsd-update - 3 Dec 2009 - Inappropriate directory permissions in &man.freebsd-update.8; - - - SA-10:01.bind - 6 Jan 2010 - BIND &man.named.8; cache poisoning with DNSSEC validation - - - SA-10:02.ntpd - 6 Jan 2010 - ntpd mode 7 denial of service - - - SA-10:03.zfs - 6 Jan 2010 - ZFS ZIL playback with insecure permissions - - - SA-10:04.jail - 27 May 2010 - Insufficient environment sanitization in &man.jail.8; - - - SA-10:05.opie - 27 May 2010 - OPIE off-by-one stack overflow - - - SA-10:06.nfsclient - 27 May 2010 - Unvalidated input in nfsclient - - - SA-10:07.mbuf - 13 July 2010 - Lost mbuf flag resulting in data corruption + SA-10:10.openssl + 29 November 2010 + OpenSSL multiple vulnerabilities @@ -199,1266 +159,1026 @@ Kernel Changes - The &man.ddb.4; debugger has been improved: - - - - It now supports show - ifnets and show ifnet struct - ifnet * commands to print a list of - ifnet * of each virtual network stack and - fields of specified fip, - respectively. - - - - It now supports show all - lltables, show lltable - struct lltable *, and - show llentry struct llentry - * commands to print a list of - lltable * of each virtual network stack, - fields of specified structures respectively. - - - - The show mount command now prints - active string mount options. - - - - It now supports show - vnetrcrs command to dump the whole log of - distinctive curvnet recursion - events. - - - - It now supports show - vnet_sysinit and show - vnet_unsysinit commands to print - ordered call lists. - - - - A new kernel thread called deadlock - resolver has been added. This can be used to detect - possible deadlock by using information of thread state and - heuristic analysis. This is not enabled by default. To - enable this, an option in - kernel configuration file and recompilation of the - kernel. - - The default &man.devfs.5; rules now expose the upper 256 - of &man.pty.4; device nodes. - - Two commands to enable/disable read-ahead have been added - to &man.fcntl.2; system call: - - - - F_READAHEAD specifies the amount - for sequential access. The amount is specified in bytes and is - rounded up to nearest block size. - - - - F_RDAHEAD is a Darwin compatible - version that use 128KB as the sequential access - size. - - - - Note that the read-ahead amount is also limited by - sysctl variable vfs.read_max, which may - need to be raised in order to better utilize this - feature. - - The &man.lindev.4; driver has been added. This is for - supporting various Linux-specific pseudo devices such as - /dev/full. Note that this is not - included in GENERIC kernel. - - A POSIX function pselect(3) has been reimplemented as a - system call &man.pselect.2; to eliminate race - condition. - - A kernel option has been added to - GENERIC kernel by default. - - A bug in the &man.sched.4bsd.4; scheduler that the - timestamp for the sleeping operation is not cleaned up on the - wakeup has been fixed. - - A race condition in the &man.sched.4bsd.4; scheduler has - been fixed. - - A bug in the &man.sched.ule.4; scheduler which prevented - process usage (%CPU) from working correctly - has been fixed. - - New SDT (Statically Defined Tracing) probes such as ones - for opencrypto and vnet - have been added to &os; &man.dtrace.1; subsystem. - - &os; now supports SMP in PowerPC G5 - systems. Note that SMP support on &os;/&arch.powerpc; is - disabled by default in GENERIC - kernel. - - &os; now supports UltraSPARC IV, IV+, and - SPARC64 V CPUs. - - The &man.syscons.4; driver has been improved. The history - buffer can be fully saved/restored in the VESA mode switching - via a loader tunable - hint.sc.0.vesa_mode. - - A bug in the &man.tty.4; driver that - TIOCSTI did not work has been fixed. This - affects applications like &man.mail.1;. - - An x86 real mode emulator based on - OpenBSD's x86emu implementation has been added to improve real - mode BIOS call support on both &arch.i386; and &arch.amd64;. - The &man.atkbdc.4;, &man.dpms.4;, vesa(4), &man.vga.4; driver - now use this emulator and work on the both platforms. - - The VIMAGE &man.jail.8; virtualization container can work - with &man.sctp.4; now. Note that the VIMAGE is not enabled by - default in GENERIC kernel. - - The VIMAGE &man.jail.8; now supports - ip4.saddrsel, - ip4.nosaddrsel, - ip6.saddrsel, and - ip6.nosaddrsel to control whether to use - source address selection or the primary jail address for - unbound outgoing connections. The default value is to use - source address selection. + The maximum number of pages + used for DMA bounce buffer pool has been increased from 256 to + 1024. + + The default value of + kern.hz has been increased from 100 to + 1000. + + The SMP kernel now works on + MPC7400-based Apple desktop machines such as + PowerMac3,3. + + &os;/powerpc now supports + DMA bounce buffer which is required on systems with larger RAM + than 4GB. + + &os;/mips support has been + improved. It now supports SMP on a SWARM with a dual-core + Sibyte processor. + + &os;/mips now supports Netlogic Microsystems' + XLR and XLS multi-core processor families. + + &os;/sparc64 now supports + reservation-based physical memory allocation which provides + better performance. + + &os;/amd64 now always sets + the KVA space as equal to or larger than physical memory size. + The default size was calculated based on one-third of the + physical memory size by a code derived from one for i386. It + has been changed because constraints for memory space are not + severe on amd64 and this change would help to prevent a + kmem_map too small panic which often occurs + when using ZFS. + + CPU topology detection + for Intel CPUs has been improved. + + ACPI suspend/resume + functionality support has been improved. + + &os; kernel now + supports kern_fpu_enter() and + kern_fpu_leave() KPIs which allow the + kernel subsystems to use XMM register files used in Intel SSE + (Streaming SIMD Extensions). + + The &man.acpi.4; + driver now uses ACPI Reset Register capability by default only + when a flag in the FADT which indicates it is available. This + behavior was controlled by a &man.sysctl.8; variable + hw.acpi.handle_reboot and the default value + was always set to 0. + + The &man.acpi.4; + driver now supports new loader tunables + hw.acpi.install_interface and + hw.acpi.remove_interface. For more + details, see &man.acpi.4; manual page. + + The &man.alq.9; support has been + improved. The alq_writen() and + alq_getn() KPIs have been extended to + support variable length messages, which is enabled at ALQ + creation time depending on the arguments passed to + alq_open(). Also, the + ALQ_NOACTIVATE and + ALQ_ORDERED flags have been added to allow + ALQ consumers to have more control over I/O scheduling and + resource acquisition respectively. These extensions are fully + backward compatible. + + The &man.alq.9; support is now provided + as a kernel module alq.ko. + + The &man.ddb.8; kernel debugger now + supports an optional delay in reset and + reboot commands. This allows an + administrator to break the system into debugger and trigger + automatic textdump when an unattended panic occurs. + + The &man.ddb.8; kernel debugger now + supports a show cdev command. This + displays the list of all created cdev's, consisting of devfs + node name and struct cdev address. + + The &os; GENERIC + kernel is now compiled with and + options. From 8.2-RELEASE the + kernel supports displaying a stack trace on panic by using + &man.stack.9; facility with no debugger backend like + &man.ddb.8;. Note that this does not change the default + behaviors of the GENERIC kernel on + panic. + + The following + &man.sysctl.8; variables are also now loader tunables: + vm.kmem_size, + vm.kmem_size_max, and + vm.kmem_size_min, + debug.kdb.stop_cpus, + debug.trace_on_panic, and + kern.sync_on_panic. Also, new + &man.sysctl.8; variables vm.kmem_map_size + for the current kmem map size and + vm.kmem_map_free for largest contiguous + free range in kmem map, vfs.ncsizefactor + for size factor for namecache, and + vfs.ncnegfactor for ratio of negative + namecache entries have been added. + + The &os; &man.memguard.9; framework has + been improved to make it able to detect use-after-free of + allocated memories over a longer time. For more details, see + &man.memguard.9; manual page. + + PT_LWPINFO request to + obtain information about the kernel thread that caused the + traced process to stop in the &man.ptrace.2; process tracing + and debugging facility has been improved. It now reports + system call entry and leave events, as well as availability of + siginfo_t accompanying the reported + signal. + + The &os; &man.crypto.4; framework + (opencrypto) now supports XTS-AES (XEX-TCB-CTS, or XEX-based + Tweaked Code Book mode with CipherText Stealing), which is + defined in IEEE Std. 1619-2007. + + Xen HVM support in + &os;/amd64 kernel has been improved. For more details, see + &man.xen.4; manual page. + + The qpi(4) pseudo bus + driver has been added. This supports extra PCI buses on Intel + QPI chipsets where various hardware such as memory controllers + for each socket is connected. Boot Loader Changes - The boot2 bootcode has - been reimplemented based on the &arch.i386 counterpart. It - now supports ELF binary, UFS2 file system, and larger number - of slices. - - The EFI loader program - now supports a command-line option to specify the - default value of currdev. This option - can be set by the EFI boot manager. - - The &man.loader.8; program now supports - U-Boot storage. - - The algorithm the &man.loader.8; uses has - been improved to choose a memory range for its heap when - using a range above 1MB. This fixes a symptom that the - loader fails to load a kernel. - - A kernel environment variable - vfs.root.mountfrom now supports - multiple elements for root file system in a space-separated - list. Each list element will be tried in order and the - first available one will be mounted. - - The zfsloader has been added. This - is a separate &man.zfs.8; enabled loader. Note that a ZFS - bootcode (zfsboot or - gptzfsboot) need to be installed - to use this new loader. - - The zfsboot and - gptzfsboot bootcode now fully support - 64-bit LBAs for disk addresses. This allows booting from - large volumes. + &os; now fully supports GPT (GUID + Partition Table). Checksums of primary header and primary + partition table are verified properly now. + + Memory + management issues that prevented &os; OpenFirmware loader + and netbooting from working have been fixed. + + The &man.pxeboot.8; now uses NFS + version 3 instead of version 2 by default. Hardware Support - The adb driver now - supports for interpreting taps on ADB touchpads as a button - click. - - The amdsbwd(4) driver for AMD SB600/SB7xx watchdog - timer has been added. - - The apt driver for - the Apple Touchpad present on MacBook has been added to - GENERIC kernel. - - The epic(4) driver for the front panel - LEDs in Sun Fire V215/V245 has been added. - - A bug in the &man.ipmi.4; driver that caused incorrect - watchdog timer setting has been fixed. - - The &man.pci.4; driver now supports a - JBus to PCIe bridge (called as Fire) found in - the Sun Fire V215/V245 and Sun Ultra 25/45 machines. - - The &man.smu.4; driver now provides - thermal management and monitoring features. This allows fan - control and thermal monitoring on SMU-based Apple G5 - machines, as well as an &man.led.4; interface to control the - sleep LED. - - The &man.tnt4882.4; driver for IEEE-488 (GPIB) bus now - supports National Instruments TNT5004 chip. - - The &man.uart.4; driver now supports NetMos NM9865 - family of Serial/Parallel ports. - - The &man.uep.4; driver for USB onscreen touch panel - from eGalax has been added. This driver is supported by - x11-drivers/xf86-input-egalax. - - A bug in the &man.uftdi.4; driver that can allow to send - a zero length packet has been fixed. - - The &man.usb.4; subsystem now reports &man.devd.8; - notify events with the device properties - instead of attach events. The following is an - example entry of &man.devd.conf.5; to match a &man.umass.4; - device with a SCSI subclass and BBB protocol: - - notify 100 { - match "system" "USB"; - match "subsystem" "INTERFACE"; - match "type" "ATTACH"; - match "intclass" "0x08"; - match "intsubclass" "0x06"; - match "intprotocol" "0x50"; - action "/path/to/command -flag"; -}; + The &man.aesni.4; + driver has been added. This supports AES accelerator on + Intel CPUs and accelerates AES operations for + &man.crypto.4;. + + The &man.aibs.4; + driver has been added. This supports the hardware sensors + in ASUS motherboards and replaces the &man.acpi.aiboost.4; + driver. + + The &man.coretemp.4; + driver now supports Xeon 5500/5600 series. + + &os;/powerpc now + supports the I2C bus in Apple System Management Unit. + + A device driver that + supports CPU temperature sensors on PowerMac 11,2 has been + added. + + The &man.ehci.4;, &man.ohci.4;, and + &man.uhci.4; driver now support LOW speed BULK transfer + mode. + + The &man.ichwd.4; + driver now supports Intel NM10 Express chipset watchdog + timer. + + The &man.tpm.4; driver, which supports + Trusted Platform Module has been added. + + The xhci(4) driver, which supports + Extensible Host Controller Interface (xHCI) and USB 3.0, has + been added. Multimedia Support - The &man.acpi.video.4; driver now supports LCD - brightness control notify handler. - - The &man.acpi.sony.4; helper driver now supports - default display brightness, wired LAN power, and bass - gain. - - The &man.agp.4; driver has been improved. It includes - a fix for aperture size calculation issue which prevents - some graphics cards from working. - - The &man.snd.hda.4; driver now allows AD1981HD codecs - to use playback mixer. - - The &man.snd.hda.4; driver now supports multichannel - (4.0 and 7.1) playback support. The 5.1 mode support is - disabled now due to unidentified synchronization problem. - Devices which supports the 7.1 mode can handle the 5.1 - operation via software upmix done by &man.sound.4;. Note - that stereo stream is no longer duplicated to all - ports. + The &os; Linux emulation subsystem now supports the + video4linux API. This requires + native video4linux hardware + drivers such as the ones provided by multimedia/pwcbsd and multimedia/webcamd. + + MIDI input buffer size in the + &man.uaudio.4; driver has been changed. This fixes a + problem where the input appears several seconds + late. + + An issue in the &man.uaudio.4; + driver that prevented some USB audio devices from working + has been fixed. Network Interface Support - The &man.ath.4; driver now supports Atheros - AR9285-based devices. + The &man.alc.4; driver now supports + Atheros AR8151/AR8152 PCIe Gigabit/Fast Ethernet + controllers. - A bug in the &man.ath.4; driver which causes a problem - of AR5416-based chipsets including AR9285 has been fixed. + A bug in the &man.alc.4; driver was + fixed that could lead to a system freeze when the system + was booted without a cable plugged in. This symptom was + found in AR8132 on EEE PC. + + The TX interrupt moderation timer in + the &man.alc.4; driver has been reduced from 50ms to 1ms. + The 50ms timer resulted in a poor UDP performance. + + The &man.axe.4; driver + has been improved for stability and better performance on + the TX packet rate. + + The &man.bge.4; driver now supports + BCM5718 x2 PCI Express dual-port gigabit Ethernet + controller family. This family is the successor to the + BCM5714/BCM5715 family and supports IPv4/IPv6 checksum + offloading, TSO, VLAN hardware tagging, jumbo frames, + MSI/MSIX, IOV, RSS and TSS. The current version of the + driver supports all hardware features except IOV and + RSS/TSS. - The &man.bge.4; driver now supports BCM5761, BCM5784, and - BCM57780-based devices. + A bug in the &man.bge.4; driver which + prevented TSO in BCM57780 from working has been + fixed. - The &man.bge.4; driver now supports TSO (TCP - Segmentation Offloading) on BCM5755 or newer - controllers. + A bug in the &man.bge.4; driver that + could wrongly disable the TX checksum offloading feature + as well when one tries to disable only the RX checksum + offloading has been fixed. + + Some improvements for reliability of + the &man.bge.4; driver with BCM5906 controller has been + made. + + The &man.bge.4; driver now supports + hardware MAC statistics in controller's internal memory + for BCM5705 or newer Broadcom controllers. These counters + can be accessed via &man.sysctl.8; variable + dev.bge.N.stats.* + and provide useful information to diagnose driver + issues. + + UDP checksum offloading in the + &man.bge.4; driver has been disabled by default. This is + because Broadcom controllers have a bug which can generate + UDP datagrams with checksum value 0 + when TX UDP checksum offloading is enabled. The checksum + offloading can be enabled by using the following loader + tunable: + + dev.bge.N.forced_udpcsum + + A bug in the &man.bge.4; driver that + could lead to poor performance on a system with more than + 4 GB RAM has been fixed. The cause was that all of + Broadcom controllers except the BCM5755 and later have a + bug in 4 GB-boundary DMA processing and used the bounce + buffer in an inefficient way. + + The &man.bwi.4; driver, which supports + Broadcom BCM430* and BCM431* family Wireless Ethernet + controllers, has been added. This is not compiled into + the GENERIC kernel because there are + some problems. The kernel module + if_bwi.ko is available and can be + loaded without recompiling the kernel to enable this + driver. - A long-standing bug in the &man.bge.4; driver which - was related to ASF heartbeat sending has been + A bug in the &man.bwn.4; driver that + prevented WPA authentication from working has been fixed. - A long-standing stability issue of the &man.bce.4; and - &man.bge.4; driver due to a hardware bug in its DMA - handling when the system has more than 4GB memory has been - fixed. This applies to BCM5714, BCM5715, and BCM5708 - controllers. + A bug in the &man.cdce.4; driver has + been fixed. - A bug in the &man.bge.4; driver that incorrectly - enabled TSO on BCM5754/BCM5754M controllers has been - fixed. + The &man.cxgb.4; driver now supports + the following new &man.sysctl.8; variables: + hw.cxgb.nfilters sets the maximum + number of entries in the hardware filter table, + dev.cxgbc.N.pkt_timestamp + provides packet timestamp instead of connection hash, and + dev.cxgbc.N.core_clock + provides the core clock frequency in kHz. + + The &man.em.4; driver has been updated to version + 7.1.9. + + The &man.igb.4; driver has been updated to version + 2.0.7. + + The &man.em.4; and &man.igb.4; drivers + now provide statistics counters as &man.sysctl.8; MIB + objects. + + The &man.em.4; and &man.igb.4; drivers + now support the &man.led.4; interface via + /dev/led/emN + and + /dev/led/igbN + for identification LED control. The following command + line makes the LED blink on em0: + + &prompt.root; echo f2 > /dev/led/em0 + + The &man.epair.4; virtual Ethernet + interface driver now supports explicit UP/DOWN linkstate. + This fixes an issue when it is used with the &man.carp.4; + protocol. + + The &man.fxp.4; driver now supports + TSO over VLAN on i82550 and i82551 controllers. + + The &man.iwn.4; driver now supports + Intel Wireless WiFi Link 6000 series. The firmware has + been updated to version 9.221.4.1. + + The &man.ixgbe.4; + driver is now also provided as a kernel module. + + The &man.ixgbe.4; + driver has been updated to version 2.3.8. It now supports + 82599, better interrupt handling, hardware assist to LRO, + VM SRIOV interface, and so on. + + The + &man.miibus.4; has been rewritten for the generic IEEE + 802.3 annex 31B full duplex flow control support. The + &man.alc.4;, &man.bge.4;, &man.bce.4;, &man.cas.4;, + &man.fxp.4;, &man.gem.4;, &man.jme.4;, &man.msk.4;, + &man.nfe.4;, &man.re.4;, &man.stge.4;, and &man.xl.4; + drivers along with atphy(4), bmtphy(4), brgphy(4), + e1000phy(4), gentbi(4), inphy(4), ip1000phy(4), jmphy(4), + nsgphy(4), nsphyter(4), and &man.rgephy.4; have been + updated to support flow control via this facility. + + The &man.mwlfw.4; + driver is now also provided as a kernel module. + + A bug in the &man.mxge.4; driver + that prevented TSO from working has been fixed. - A bug in the &man.if.bridge.4; driver has been fixed. - The MTU was set based on the firstly-added member even if - the addition failed. - - The &man.if.bridge.4; driver now supports - SIOCSIFMTU ioctl. For example, - ifconfig bridge0 mtu 1280 can change - the MTU of bridge0 to - 1280. Changing the MTU is allowed only - when all members have the same MTU value. - - The &man.bwn.4; driver for Broadcom BCM43xx chipsets - has been added. - - The &man.cxgb.4; driver has been updated to T3 - firmware 7.8.0. - - The &man.cxgb.4; driver now supports hardware - filtering based on inspection of L2/L3/L4 headers. - Filtering based on source IP address, destination IP - address, source port number, destination port number, - 802.1q VLAN frame tag, UDP, TCP, and MAC address is - possible. The configuration can be done by the - cxgbtool(8) utility. Note that cxgbtool(8) is in - src/usr.sbin/cxgbtool but not - compiled by default. - - The &man.em.4; driver has been updated to version - 7.0.5. - - The et(4) driver now supports MSI and Tx checksum - offloading of IPv4, TCP, and UDP. - - The &man.fxp.4; driver now exports the hardware MAC - statistics via sysctl variables. - - The &man.igb.4; driver has been updated to version - 1.9.5. - - The &man.iwn.4; driver has been updated. This - includes various improvements and bugfixes regarding RF - switch, bgscan support, suspend/resume support, locking - issue, and more. The line device iwnfw - in the kernel configuration file will include all firmware - images. - - The &man.ixgbe.4; driver has been updated to version - 2.2.0. - - The &man.msk.4; driver has been improved: - - - - It now supports Marvell Yukon 88E8042, 88E8057, - 88E8059 (Yukon Optima) devices and DGE-560SX (Yukon - XL). - - - - A rudimentary interrupt moderation with - programmable countdown timer register has been - implemented. The default parameter of the holdoff - time is 100us and this can be changed via sysctl - variable - dev.mskc.0.int_holdoff. - Note that the interrupt moderation is shared resource - on a dual-port controllers and it is impossible to use - separate interrupt moderation values for each - port. - - - - A stability issue has been fixed. A heavy RX - traffic while rebooting is in progress could prevent - the system from working. - - - The &man.mxge.4; driver has been updated to firmware - version 1.4.50 from Myricom. - - The &man.re.4; driver no longer performs an - unnecessary interface up/down during getting IP address - via DHCP. - - The &man.re.4; driver now uses 2048 - as PCIe Maximum Read Request Size. This improves bulk - transfer performance. - - The &man.run.4; driver for Ralink - RT2700U/RT2800U/RT3000U USB 802.11agn devices has been - added. - - The sge(4) driver for Silicon Integrated Systems - SiS190/191 Fast/Gigabit Ethernet has been added. This - supports TSO and TSO over VLAN. - - The &man.ste.4; driver has been improved: - - - - The DMA handling has been improved. - - - - Wake-On-LAN is now supported. - - - - Unnecessary reinitialization of the - interfaces has been eliminated. - - - - RX interrupt moderation with single shot timer has - been implemented. The default parameter of the - moderation time is 150us and this can be changed via - sysctl variable - dev.ste.0.int_rx_mod. - Setting it 0 effectively disables the RX interrupt - moderation feature. - - - - The tsec(4) driver now supports &man.altq.4;. - - The &man.u3g.4; driver has been improved and now works - with ZTE MF636, Option Gi0322, Globetrotter GE40x, and - Novatel MC950D. - - The &man.uhso.4; driver for Option HSDPA USB devices - has been added. A new &man.uhsoctl.1; userland utility - can be used to initiate and close the WAN - connection. - - The &man.vge.4; driver has been improved: - - - - The DMA handling has been improved. - - - - Wake-On-LAN is now supported. - - - - Unnecessary reinitialization of the - interfaces has been eliminated. - - - - Hardware MAC statistics are now supported via sysctl variables - dev.vge.0.stats. - - - - Interrupt moderation with single shot timer and - scheme supported by VT61xx controllers have been - implemented. The default parameters are tuned to - generate interrupt less than 8k per second, and these - parameters can be changed via sysctl variables - dev.vge.0.int_holdoff, - dev.vge.0.rx_coal_pkt, - and - dev.vge.0.tx_coal_pkt. - Note that an up/down cycle is needed to make a - parameter change take effect. - - + The &man.nfe.4; driver now supports + WoL (Wake on LAN). - The &man.urtw.4; driver has been improved and now - supports RTL8187B-based devices. + The &man.re.4; driver now supports + 64-bit DMA addressing for RTL810xE/RTL8168/RTL8111 PCIe + controllers. - The &os; Xen netfront driver has been improved in - stability and performance. + The &man.re.4; driver now supports + hardware interrupt moderation of TX completion interrupts + on RTL8169/RTL8168 controllers. + + The &man.rl.4; driver now supports WoL + (Wake on LAN) on RTL8139B or newer controllers. + + The &man.rl.4; driver now supports + reading hardware statistics counters by setting a + &man.sysctl.8; variable + dev.rl.N.stats + to 1. + + The &man.rl.4; driver now supports a + device hint to change a way of register access. Although + some newer RTL8139 controllers support memory-mapped + register access, it is difficult to detect the support + automatically. For this reason the driver uses I/O + mapping by default and provides the following device hint. + If it is set to 0, the driver uses + memory mapping for register access. + + hint.rl.N.prefer_iomap="0" + + Note that the default value is 1. + + The &man.rl.4; driver has been + improved on interrupt handling. It now has better TX + performance under high RX load. + + A bug in the &man.sk.4; driver has + been fixed. It did not program the station address for + Yukon controllers and overriding the station address with + &man.ifconfig.8; was not possible. + + The &man.sk.4; driver now disables TX + checksum offloading by default. This is because some + revisions of the Yukon controller generate corrupted frames. + The checksum offloading can be enabled manually by using + option in the &man.ifconfig.8; + utility. + + The &man.sis.4; driver + now works on all supported platforms. Some stability and + performance issues have also been fixed. + + The &man.sis.4; driver now supports + WoL (Wake on LAN) on NS DP8315 controller. + + A tunable + dev.sis.N.manual_pad + for the &man.sis.4; driver has been added. This controls + whether padding with 0x00 for short frames is done by CPU, + rather than the controller. The reason why this tunable + has been added is that NS DP83815/DP83816 pads them with + 0xff though RFC 1042 specifies it should be 0x00. The + tunable is disabled by default, which means padding with + 0xff is used because padding with 0x00 by software needs + extra CPU cycles. Setting a non-zero value enables the + software padding. + + The &man.ste.4; driver now supports a + device hint to change a way of register access. Although + it uses memory-mapped register access by default, some old + IC Plus Corp (formerly Sundace) controllers are found + unstable. The following device hint makes the driver use + I/O mapping for register access: + + hint.ste.N.prefer_iomap="1" + + The &man.xl.4; driver now supports + WoL (Wake on LAN). Note that not all controllers support + this functionality and some need an additional remote + wakeup cable. Network Protocols - &os; flowtable now supports IPv6. This is for per-CPU - caching flows as a means of accelerating L3 and L2 lookups - as well as providing stateful load balancing when ECMP - (Equal-Cost Multi-Path routing) is enabled by . - - A new capability flag LINKSTATE has *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-stable@FreeBSD.ORG Wed Feb 23 19:33:43 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2079B1065673; Wed, 23 Feb 2011 19:33:43 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E87238FC18; Wed, 23 Feb 2011 19:33:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NJXg3Y005891; Wed, 23 Feb 2011 19:33:42 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NJXgJ9005888; Wed, 23 Feb 2011 19:33:42 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102231933.p1NJXgJ9005888@svn.freebsd.org> From: Hiroki Sato Date: Wed, 23 Feb 2011 19:33:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218978 - stable/8/release/doc/en_US.ISO8859-1/errata X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 19:33:43 -0000 Author: hrs Date: Wed Feb 23 19:33:42 2011 New Revision: 218978 URL: http://svn.freebsd.org/changeset/base/218978 Log: Update Errata document for 8.2R. CVE-2011-0014 fix for OpenSSL. Modified: stable/8/release/doc/en_US.ISO8859-1/errata/article.sgml Modified: stable/8/release/doc/en_US.ISO8859-1/errata/article.sgml ============================================================================== --- stable/8/release/doc/en_US.ISO8859-1/errata/article.sgml Wed Feb 23 19:07:50 2011 (r218977) +++ stable/8/release/doc/en_US.ISO8859-1/errata/article.sgml Wed Feb 23 19:33:42 2011 (r218978) @@ -16,7 +16,7 @@ %release; - + ]>
@@ -40,7 +40,7 @@ $FreeBSD$ - 2010 + 2011 The &os; Documentation Project @@ -131,7 +131,7 @@ For more information, consult the individual advisories available from . - + @@ -160,23 +160,19 @@ Open Issues - No open issues. + No open issue. Late-Breaking News and Corrections - A deadlock can occur in UFS with the QUOTA enabled due to a - lock order reversal. This problem has been fixed in r209367 - (HEAD). An Errata Notice for &release.bugfix; is - planned. - - A legacy device detection in the &man.ata.4; can fail in - some cases. Specifically, Marvell 88SX6141 controllers can - cause attach failure or panic. This problem has been fixed in - r210168 - (HEAD). An Errata Notice for &release.bugfix; is - planned. + A bug in OpenSSL that could cause + it to parse past the end of the message was found at the late + stage of &release.bugfix; release process. The &release.bugfix; + includes a fix for this issue by importing relevant parts from + the OpenSSL CVS. This could be triggered by an incorrectly + formatted ClientHello SSL/TLS handshake messages. The details + can be found at .
From owner-svn-src-stable@FreeBSD.ORG Wed Feb 23 20:13:08 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 144E8106564A; Wed, 23 Feb 2011 20:13:08 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 00E488FC17; Wed, 23 Feb 2011 20:13:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NKD7qD009627; Wed, 23 Feb 2011 20:13:07 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NKD78H009625; Wed, 23 Feb 2011 20:13:07 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102232013.p1NKD78H009625@svn.freebsd.org> From: Hiroki Sato Date: Wed, 23 Feb 2011 20:13:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218979 - stable/8/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 20:13:08 -0000 Author: hrs Date: Wed Feb 23 20:13:07 2011 New Revision: 218979 URL: http://svn.freebsd.org/changeset/base/218979 Log: Various wording fixes. Suggested by: keramida Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed Feb 23 19:33:42 2011 (r218978) +++ stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed Feb 23 20:13:07 2011 (r218979) @@ -401,7 +401,7 @@ RSS/TSS. A bug in the &man.bge.4; driver which - prevented TSO in BCM57780 from working has been + prevented TSO from working in BCM57780 has been fixed. A bug in the &man.bge.4; driver that @@ -554,9 +554,9 @@ Note that the default value is 1. - The &man.rl.4; driver has been - improved on interrupt handling. It now has better TX - performance under high RX load. + The &man.rl.4; driver has improved + interrupt handling. It now has better TX performance + under high RX load. A bug in the &man.sk.4; driver has been fixed. It did not program the station address for @@ -586,15 +586,17 @@ 0xff though RFC 1042 specifies it should be 0x00. The tunable is disabled by default, which means padding with 0xff is used because padding with 0x00 by software needs - extra CPU cycles. Setting a non-zero value enables the - software padding. - - The &man.ste.4; driver now supports a - device hint to change a way of register access. Although - it uses memory-mapped register access by default, some old - IC Plus Corp (formerly Sundace) controllers are found - unstable. The following device hint makes the driver use - I/O mapping for register access: + extra CPU cycles. Enabling manual_pad, + by setting this &man.sysctl.8; variable to a non-zero + value, forces the use of software padding. + + The &man.ste.4; driver now supports + a device hint to change the device register access mode. + The driver uses memory-mapped register access by default, + but this caused stability problems with some old IC Plus + Corp (formerly Sundace) controllers. The following device + hint makes the driver use I/O mapping for register + access: hint.ste.N.prefer_iomap="1" @@ -620,7 +622,7 @@ The default value for this parameter is 50. - A ngtee action in + The ngtee action in the &man.ipfw.4; packet filter subsystem has been changed. It no longer accepts a packet. @@ -630,13 +632,13 @@ IPsec flow distribution has been improved for more parallel processing. - A bug in &os; IPv4 stack that a proxy - ARP entry cannot be added over &man.netgraph.4; interfaces - has been fixed. - - A bug in &os; IPv6 stack that prevented - an in the &man.ping6.8; utility from - working with + A bug in the &os; IPv4 stack that + prevented adding a proxy ARP entry over &man.netgraph.4; + interfaces has been fixed. + + A bug in the &os; IPv6 stack that + prevented an in the &man.ping6.8; + utility from working with net.inet6.ip6.use_defaultzone=1 has been fixed. @@ -653,7 +655,7 @@ The &man.ng.ether.4; &man.netgraph.4; node now supports interface transfer between multiple virtual network stacks by &man.ifconfig.8; vnet - command. A &man.ng.ether.4; node associated with an network + command. A &man.ng.ether.4; node associated with a network interface is now destroyed and recreated when the network interface is moved to another vnet. @@ -667,8 +669,8 @@ &man.pf.4; packet filter subsystem when TSO support is enabled has been fixed. - A TCP bandwidth delay product window - limiting algorithm by a &man.sysctl.8; variable + The TCP bandwidth delay product window + limiting algorithm controlled by the &man.sysctl.8; variable net.inet.tcp.inflight.enable is now disabled by default. It has been found that this algorithm is inefficient on a fast network with smaller RTT than 10ms. @@ -740,7 +742,7 @@ >.mode or hint.devname.unit.mode. The valid values are the same as ones supported in the - &man.atacontrol.8; and &man.camcontrol.8;. + &man.atacontrol.8; and &man.camcontrol.8; utilities. The &man.ata.4; driver now disables cable status check on both controller and device side @@ -750,7 +752,7 @@ performed regardless of this loader tunable. The &man.ata.4; driver now reports - SATA power management capabilities to &man.CAM.4; layer when + SATA power management capabilities to the &man.CAM.4; layer when is enabled. This allows a device to initiate transitions if controller configured to accept it. This makes @@ -887,7 +889,7 @@ It now runs faster even when a single interface has a number of aliases. - A bug in the &man.b64decode.1; that + A bug in the &man.b64decode.1; utility that prevented an option from handling arbitrary breaks in a base64 encoded string has been fixed. @@ -908,8 +910,8 @@ software itself and its correlation with the kernel, thus allowing a much better picture of what exactly is going on behind the scenes. The &man.dtruss.1; utility has been added - and libproc has been updated to support - the facility. + and the libproc library has been updated + to support the facility. The &man.du.1; utility now supports a @@ -928,7 +930,7 @@ The &man.geli.8; utility now supports resize subcommand to resize encrypted file - systems prior to growing it. + systems after growing it. The &man.geli.8; utility now supports suspend and resume @@ -947,7 +949,7 @@ The &man.geli.8; utility now supports and - + options for loading passphrase from a file. The gethost*(), @@ -957,7 +959,7 @@ with NS_RETURN when the result buffer size is too small. - The &man.gpart.8; utility now supports + The &man.gpart.8; utility now supports a resize command to resize partitions for all schemes but EBR. @@ -971,9 +973,10 @@ /dev/ prefix. The &man.gpart.8; utility now supports - an option for force - subcommand. This option force destroying of the partition - table even if it is not empty. + an option for the + destroy subcommand. This option forces + destroying of the partition table even if it is not + empty. The &man.gpart.8; utility now supports a recover subcommand for GPT partition @@ -994,9 +997,9 @@ - Any changes to the corrupted GPT table are not allowed - except for destroy and - recover subcommands. + Changes to the corrupted GPT table are not allowed except + for destroy and recover + subcommands. The &man.gpart.8; utility now supports GPT_ENT_ATTR_BOOTME, @@ -1009,12 +1012,12 @@ An issue in the &man.newfs.8; utility has been fixed. A UFS1 file system created with 64KB blocksize was incorrectly recognized as one with a broken - superblock. This is because &os; kernel checks UFS2 - superblock at 64KB offset in the partition first, and UFS1 - with 64KB blocksize has an alternative superblock at the same - location. For example, a file system created by - newfs -U -O 1 -b 65536 -f 8192 could lead - to this symptom. + superblock. This is because the &os; kernel checks a + partition first for a UFS2 superblock at 64KB offset while it + is possible that a UFS1 file systems with 64KB blocksize has + an alternative superblock at the same location. For example, + a file system created by newfs -U -O 1 -b 65536 -f + 8192 could lead to this symptom. The &man.hastd.8; utility now supports SIGHUP for reloading the configuration @@ -1035,9 +1038,9 @@ sequences and reverse ranges in the &man.jot.1; utility have been fixed. - The libarchive and - &man.tar.1; utility now support LZMA (Lempel-Ziv-Markov - chain-Algorithm) compression format. + The libarchive + library and &man.tar.1; utility now support LZMA + (Lempel-Ziv-Markov chain-Algorithm) compression format. The &man.tar.1; utility now supports a blocksize which is up to 8192 (4MB) in the @@ -1049,8 +1052,8 @@ has been fixed. The option in the - &man.mount.8; utility now displays rw mount - option correctly as in the &man.fstab.5; format. + &man.mount.8; utility now displays the rw + mount option correctly as in the &man.fstab.5; format. The &man.ncal.1; utility has been updated. The option has been replaced @@ -1073,7 +1076,7 @@ <include> for processing file inclusion. Globbing in the file name and circular dependency detection are supported. For more details, see - &man.newsyslog.conf.5; manual page. + the &man.newsyslog.conf.5; manual page. The &man.ntpd.8; utility is now compiled with shared memory reference clock driver. For example, GPS @@ -1136,7 +1139,7 @@ &prompt.user; < /dev/null & The &man.sleep.1; utility now supports - SIGINFO signal and reports the specified + the SIGINFO signal and reports the specified sleep time and the remaining time. The &man.tftp.1; and &man.tftpd.8; @@ -1159,11 +1162,11 @@ ^C in insert mode when reading an ex command. - The &man.watchdogd.8; program now set - MADV_PROTECT memory flag onto themselves to - protect from being terminated by the &os; kernel when - available memory becomes short. This kind of process - termination happens in a swap-intensive workload. + The &man.watchdogd.8; program now uses + MADV_PROTECT memory flag to protect itself + from being terminated by the &os; kernel when available memory + becomes short. This kind of process termination happens in a + swap-intensive workload. The set sharenfs command in the &man.zfs.8; utility now supports @@ -1227,7 +1230,7 @@ The &man.sysinstall.8; utility now attempts to enable &man.getty.8; on a serial port when no VGA - card on the system. + card is detected on the system. The supported version of the GNOME desktop environment From owner-svn-src-stable@FreeBSD.ORG Wed Feb 23 20:24:10 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9A5B510656A4; Wed, 23 Feb 2011 20:24:10 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 88ACC8FC1E; Wed, 23 Feb 2011 20:24:10 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NKOAw4010211; Wed, 23 Feb 2011 20:24:10 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NKOAwE010209; Wed, 23 Feb 2011 20:24:10 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102232024.p1NKOAwE010209@svn.freebsd.org> From: Ulrich Spoerlein Date: Wed, 23 Feb 2011 20:24:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218980 - stable/8/etc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 20:24:10 -0000 Author: uqs Date: Wed Feb 23 20:24:10 2011 New Revision: 218980 URL: http://svn.freebsd.org/changeset/base/218980 Log: MFH r218477: Fix termcap entry typo. Modified: stable/8/etc/termcap.small Directory Properties: stable/8/etc/ (props changed) Modified: stable/8/etc/termcap.small ============================================================================== --- stable/8/etc/termcap.small Wed Feb 23 20:13:07 2011 (r218979) +++ stable/8/etc/termcap.small Wed Feb 23 20:24:10 2011 (r218980) @@ -171,7 +171,7 @@ cons60l1|cons60-iso8859-1:\ cons60l1-m|cons60-iso8859-1-mono:\ :li#60:tc=cons25l1-m: # 132x25 ISO 8859-1 FreeBSD console -cons25l1-w|:cons25w-iso8859-1:\ +cons25l1-w|cons25w-iso8859-1:\ :co#132:tc=cons25l1: cons30l1-w|cons30w-iso8859-1:\ :co#132:tc=cons30l1: From owner-svn-src-stable@FreeBSD.ORG Wed Feb 23 20:24:21 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 08B48106566C; Wed, 23 Feb 2011 20:24:21 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E6BC28FC14; Wed, 23 Feb 2011 20:24:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NKOKta010252; Wed, 23 Feb 2011 20:24:20 GMT (envelope-from uqs@svn.freebsd.org) Received: (from uqs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NKOKfG010250; Wed, 23 Feb 2011 20:24:20 GMT (envelope-from uqs@svn.freebsd.org) Message-Id: <201102232024.p1NKOKfG010250@svn.freebsd.org> From: Ulrich Spoerlein Date: Wed, 23 Feb 2011 20:24:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218981 - stable/7/etc X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 20:24:21 -0000 Author: uqs Date: Wed Feb 23 20:24:20 2011 New Revision: 218981 URL: http://svn.freebsd.org/changeset/base/218981 Log: MFH r218477: Fix termcap entry typo. Modified: stable/7/etc/termcap.small Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/termcap.small ============================================================================== --- stable/7/etc/termcap.small Wed Feb 23 20:24:10 2011 (r218980) +++ stable/7/etc/termcap.small Wed Feb 23 20:24:20 2011 (r218981) @@ -171,7 +171,7 @@ cons60l1|cons60-iso8859-1:\ cons60l1-m|cons60-iso8859-1-mono:\ :li#60:tc=cons25l1-m: # 132x25 ISO 8859-1 FreeBSD console -cons25l1-w|:cons25w-iso8859-1:\ +cons25l1-w|cons25w-iso8859-1:\ :co#132:tc=cons25l1: cons30l1-w|cons30w-iso8859-1:\ :co#132:tc=cons30l1: From owner-svn-src-stable@FreeBSD.ORG Wed Feb 23 20:26:43 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 86888106566C; Wed, 23 Feb 2011 20:26:43 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 747E18FC08; Wed, 23 Feb 2011 20:26:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NKQhGt010340; Wed, 23 Feb 2011 20:26:43 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NKQhEJ010338; Wed, 23 Feb 2011 20:26:43 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102232026.p1NKQhEJ010338@svn.freebsd.org> From: Hiroki Sato Date: Wed, 23 Feb 2011 20:26:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218982 - stable/8/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 20:26:43 -0000 Author: hrs Date: Wed Feb 23 20:26:43 2011 New Revision: 218982 URL: http://svn.freebsd.org/changeset/base/218982 Log: More wording nit. Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed Feb 23 20:24:20 2011 (r218981) +++ stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Wed Feb 23 20:26:43 2011 (r218982) @@ -1181,7 +1181,7 @@ A periodic script which can be used to find installed ports' files with mismatched checksum has been added. For more - details, see &man.periodic.conf.5; + details, see the &man.periodic.conf.5; manual page. From owner-svn-src-stable@FreeBSD.ORG Wed Feb 23 20:50:42 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 87E76106566C; Wed, 23 Feb 2011 20:50:42 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 744028FC12; Wed, 23 Feb 2011 20:50:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1NKogBJ010991; Wed, 23 Feb 2011 20:50:42 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1NKogx5010987; Wed, 23 Feb 2011 20:50:42 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102232050.p1NKogx5010987@svn.freebsd.org> From: Hiroki Sato Date: Wed, 23 Feb 2011 20:50:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218983 - in stable/7/release/doc: en_US.ISO8859-1/errata share/sgml X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Feb 2011 20:50:42 -0000 Author: hrs Date: Wed Feb 23 20:50:42 2011 New Revision: 218983 URL: http://svn.freebsd.org/changeset/base/218983 Log: Update release documents for 7.4R. Document OpenSSL vuln was fixed and shlib version was decreased in Errata. Modified: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml stable/7/release/doc/share/sgml/release.dsl stable/7/release/doc/share/sgml/release.ent Modified: stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml ============================================================================== --- stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml Wed Feb 23 20:26:43 2011 (r218982) +++ stable/7/release/doc/en_US.ISO8859-1/errata/article.sgml Wed Feb 23 20:50:42 2011 (r218983) @@ -16,7 +16,7 @@ %release; - + ]>
@@ -40,7 +40,7 @@ $FreeBSD$ - 2010 + 2011 The &os; Documentation Project @@ -167,42 +167,28 @@ Late-Breaking News and Corrections - [20100402] The &os; 7.3-RELEASE Release Notes incorrectly - mentioned that a flag has been added to the - &man.ps.1; utility. It should have been a - flag. The correct entry is: - -
- The &man.ps.1; command now supports a new flag - . This displays descendant info with the - output similar to Linux's (or - ). -
- - [20100330] The libc of &os; 7.3-RELEASE - has the &man.fdopendir.3; function but - <dirent.h> header file does not - contain the function prototype. This could cause programs - compiled on the system to crash on platforms such as - &os;/&arch.amd64;, where sizeof(void *) is - greater than sizeof(int). This problem has - been fixed in r205265 - (RELENG_7). An Errata Notice for 7.3-RELEASE is - planned. - - [20100330] It turns out that the - zfsloader in 7.3-RELEASE, a new boot loader - similar to &man.loader.8; but it supports ZFS, does not work - properly. This problem has been fixed in r205539 - (RELENG_7). An Errata Notice for 7.3-RELEASE is - planned. - - [20100323] The &os; 7.3-RELEASE Release Notes incorrectly - mentioned that the &man.hwpmc.4; driver has been added though this - driver has already been added in 7.0-RELEASE. The changes in - 7.3-RELEASE are that &man.pmcannotate.8; utility and support for - Intel Core 2 and Core i7 have been added. + A bug in OpenSSL that could cause + it to parse past the end of the message was found at the late + stage of &release.bugfix; release process. The &release.bugfix; + includes a fix for this issue by importing relevant parts from + the OpenSSL CVS. This could be triggered by an incorrectly + formatted ClientHello SSL/TLS handshake messages. The details + can be found at . + + The shared object version numbers of + libcrypto and + libssl have been decreased from + 6 to 5. These are + accidentaly increased on 28 November, 2010 (r215997) as OpenSSL + 0.9.8p was merged. Note that this affects systems running + 7-STABLE after that date (after 7.3-RELEASE), not 7.3-RELEASE + and the security branch. Also note that in &os; + &release.bugfix;, the library files with the version number + 6 are still provided as symbolic links to + prevent binaries built in the time window with the accidentaly + increased version number from being broken after the system gets + updated to &release.bugfix;. +
Modified: stable/7/release/doc/share/sgml/release.dsl ============================================================================== --- stable/7/release/doc/share/sgml/release.dsl Wed Feb 23 20:26:43 2011 (r218982) +++ stable/7/release/doc/share/sgml/release.dsl Wed Feb 23 20:50:42 2011 (r218983) @@ -81,7 +81,7 @@ ((or (equal? arch #f) (equal? arch "") (equal? arch "all")) - (process-children-trim)) + (process-children-trim)) (else (make sequence (literal "[") @@ -95,7 +95,7 @@ (loop (car rest) (cdr rest))) (empty-sosofo)))) (literal "] ") - (process-children-trim)))) + (process-children-trim))))) (if (and (not (null? role)) (equal? role "merged")) (literal " [" merged-string "]") (empty-sosofo)))) @@ -118,7 +118,7 @@ ((or (equal? arch #f) (equal? arch "") (equal? arch "all")) - (process-children-trim)) + (process-children-trim)) (else (make sequence (literal "[") @@ -135,7 +135,7 @@ (process-children-trim)))) (if (and (not (null? role)) (equal? role "merged")) (literal " [" merged-string "]") - (empty-sosofo))))))) + (empty-sosofo)))))))) ]]> - + - - - - + - + - + - + - - + + - - + + - + @@ -53,6 +48,7 @@ + From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 09:12:46 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 739EF106566C; Thu, 24 Feb 2011 09:12:46 +0000 (UTC) (envelope-from pluknet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6228F8FC13; Thu, 24 Feb 2011 09:12:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1O9Ck54029815; Thu, 24 Feb 2011 09:12:46 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1O9CjLe029812; Thu, 24 Feb 2011 09:12:45 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201102240912.p1O9CjLe029812@svn.freebsd.org> From: Sergey Kandaurov Date: Thu, 24 Feb 2011 09:12:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218987 - stable/8/bin/kenv X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 09:12:46 -0000 Author: pluknet Date: Thu Feb 24 09:12:45 2011 New Revision: 218987 URL: http://svn.freebsd.org/changeset/base/218987 Log: MFC r218917: mdoc(7) markup. Approved by: avg (mentor) Modified: stable/8/bin/kenv/kenv.1 Directory Properties: stable/8/bin/kenv/ (props changed) Modified: stable/8/bin/kenv/kenv.1 ============================================================================== --- stable/8/bin/kenv/kenv.1 Thu Feb 24 06:28:48 2011 (r218986) +++ stable/8/bin/kenv/kenv.1 Thu Feb 24 09:12:45 2011 (r218987) @@ -69,7 +69,7 @@ option is set, warnings normally printed perform the requested operation will be suppressed. .Pp Variables can be added to the kernel environment using the -.Xr /boot/loader.conf +.Pa /boot/loader.conf file, or also statically compiled into the kernel using the statement .Pp .Dl Ic env Ar filename From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 10:11:30 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2AAA81065670; Thu, 24 Feb 2011 10:11:30 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 198B98FC1F; Thu, 24 Feb 2011 10:11:30 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OABTUD033387; Thu, 24 Feb 2011 10:11:29 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OABTFv033384; Thu, 24 Feb 2011 10:11:29 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201102241011.p1OABTFv033384@svn.freebsd.org> From: Konstantin Belousov Date: Thu, 24 Feb 2011 10:11:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218990 - in stable/8: etc/mtree include X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 10:11:30 -0000 Author: kib Date: Thu Feb 24 10:11:29 2011 New Revision: 218990 URL: http://svn.freebsd.org/changeset/base/218990 Log: MFC r218772: Install iodev.h. Modified: stable/8/etc/mtree/BSD.include.dist stable/8/include/Makefile Directory Properties: stable/8/etc/ (props changed) stable/8/include/ (props changed) Modified: stable/8/etc/mtree/BSD.include.dist ============================================================================== --- stable/8/etc/mtree/BSD.include.dist Thu Feb 24 09:22:56 2011 (r218989) +++ stable/8/etc/mtree/BSD.include.dist Thu Feb 24 10:11:29 2011 (r218990) @@ -102,6 +102,8 @@ .. iicbus .. + io + .. lmc .. mfi Modified: stable/8/include/Makefile ============================================================================== --- stable/8/include/Makefile Thu Feb 24 09:22:56 2011 (r218989) +++ stable/8/include/Makefile Thu Feb 24 10:11:29 2011 (r218990) @@ -40,7 +40,7 @@ LDIRS= bsm cam geom net net80211 netatal LSUBDIRS= cam/ata cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ - dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/mfi dev/ofw \ + dev/ic dev/iicbus ${_dev_ieee488} dev/io dev/lmc dev/mfi dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/nfs fs/ntfs fs/nullfs \ From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 10:23:24 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 565BB1065695; Thu, 24 Feb 2011 10:23:24 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4104A8FC18; Thu, 24 Feb 2011 10:23:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OANOaK033897; Thu, 24 Feb 2011 10:23:24 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OANMN8033816; Thu, 24 Feb 2011 10:23:22 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102241023.p1OANMN8033816@svn.freebsd.org> From: Bruce Cran Date: Thu, 24 Feb 2011 10:23:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218992 - in stable/8: bin/df bin/sh lib/libc/arm/gen lib/libc/ia64/gen lib/libc/mips/gen lib/libc/powerpc/gen sys/amd64/amd64 sys/arm/xscale/i80321 sys/boot/ficl sys/cam sys/cam/scsi s... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 10:23:24 -0000 Author: brucec Date: Thu Feb 24 10:23:22 2011 New Revision: 218992 URL: http://svn.freebsd.org/changeset/base/218992 Log: MFC r218909: Fix typos - remove duplicate "the". PR: bin/154928 Submitted by: Eitan Adler Modified: stable/8/bin/df/df.c stable/8/bin/sh/expand.c stable/8/lib/libc/arm/gen/modf.c stable/8/lib/libc/ia64/gen/modf.c stable/8/lib/libc/mips/gen/modf.c stable/8/lib/libc/powerpc/gen/modf.c stable/8/sys/amd64/amd64/trap.c stable/8/sys/arm/xscale/i80321/iq80321.c stable/8/sys/boot/ficl/words.c stable/8/sys/cam/cam_xpt.c stable/8/sys/cam/scsi/scsi_sa.c stable/8/sys/cddl/dev/dtrace/amd64/dtrace_subr.c stable/8/sys/cddl/dev/dtrace/i386/dtrace_subr.c stable/8/sys/compat/ndis/subr_ntoskrnl.c stable/8/sys/dev/advansys/adwcam.c stable/8/sys/dev/aic7xxx/aic79xx_osm.h stable/8/sys/dev/aic7xxx/aic7xxx_osm.h stable/8/sys/dev/asr/i2omsg.h stable/8/sys/dev/bktr/bktr_card.c stable/8/sys/dev/ctau/ctau.c stable/8/sys/dev/ctau/ctddk.h stable/8/sys/dev/cxgb/cxgb_main.c stable/8/sys/dev/drm/mach64_dma.c stable/8/sys/dev/drm/r300_reg.h stable/8/sys/dev/e1000/e1000_82575.c stable/8/sys/dev/e1000/e1000_ich8lan.c stable/8/sys/dev/ep/if_epreg.h stable/8/sys/dev/fdc/fdc.c stable/8/sys/dev/ixgb/ixgb_ee.c stable/8/sys/dev/malo/if_malohal.h stable/8/sys/dev/mwl/mwlhal.h stable/8/sys/dev/nxge/xgehal/xgehal-device.c stable/8/sys/dev/nxge/xgehal/xgehal-ring-fp.c stable/8/sys/dev/random/randomdev_soft.c stable/8/sys/dev/sound/pci/es137x.c stable/8/sys/dev/sym/sym_fw1.h stable/8/sys/dev/sym/sym_fw2.h stable/8/sys/dev/uart/uart_dev_ns8250.c stable/8/sys/dev/usb/usb_process.c stable/8/sys/dev/vx/if_vxreg.h stable/8/sys/dev/wpi/if_wpi.c stable/8/sys/fs/fdescfs/fdesc_vnops.c stable/8/sys/fs/msdosfs/msdosfs_vnops.c stable/8/sys/geom/geom_vfs.c stable/8/sys/geom/part/g_part_ebr.c stable/8/sys/geom/sched/gs_scheduler.h stable/8/sys/gnu/fs/xfs/xfs_dir_leaf.c stable/8/sys/gnu/fs/xfs/xfs_itable.c stable/8/sys/i386/i386/trap.c stable/8/sys/kern/subr_unit.c stable/8/sys/kern/subr_witness.c stable/8/sys/kern/uipc_mbuf.c stable/8/sys/mips/mips/pmap.c stable/8/sys/mips/rmi/fmn.c stable/8/sys/mips/sibyte/sb_zbpci.c stable/8/sys/net/if_media.c stable/8/sys/net/route.c stable/8/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c stable/8/sys/netgraph/ng_source.c stable/8/sys/netinet/if_ether.c stable/8/sys/netinet/ip_input.c stable/8/sys/netinet/ipfw/ip_fw_private.h stable/8/sys/netinet/libalias/alias_sctp.c stable/8/sys/netinet/tcp_offload.h stable/8/sys/netinet/tcp_subr.c stable/8/sys/netinet/tcp_syncache.c stable/8/sys/netinet/tcp_timewait.c stable/8/sys/netinet6/in6.h stable/8/sys/pc98/cbus/fdc.c stable/8/sys/sparc64/include/iommureg.h stable/8/sys/sparc64/sparc64/trap.c stable/8/sys/sys/aac_ioctl.h stable/8/usr.bin/lex/misc.c stable/8/usr.bin/m4/gnum4.c stable/8/usr.bin/make/lst.c stable/8/usr.bin/rpcinfo/rpcinfo.c stable/8/usr.bin/xinstall/xinstall.c stable/8/usr.sbin/moused/moused.c stable/8/usr.sbin/rpcbind/util.c stable/8/usr.sbin/sysinstall/install.c Directory Properties: stable/8/bin/df/ (props changed) stable/8/bin/sh/ (props changed) stable/8/lib/libc/ (props changed) stable/8/lib/libc/stdtime/ (props changed) stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/usr.bin/lex/ (props changed) stable/8/usr.bin/m4/ (props changed) stable/8/usr.bin/make/ (props changed) stable/8/usr.bin/rpcinfo/ (props changed) stable/8/usr.bin/xinstall/ (props changed) stable/8/usr.sbin/moused/ (props changed) stable/8/usr.sbin/rpcbind/ (props changed) stable/8/usr.sbin/sysinstall/ (props changed) Modified: stable/8/bin/df/df.c ============================================================================== --- stable/8/bin/df/df.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/bin/df/df.c Thu Feb 24 10:23:22 2011 (r218992) @@ -125,7 +125,7 @@ main(int argc, char *argv[]) /* FALLTHROUGH */ case 'P': /* - * POSIX specifically discusses the the behavior of + * POSIX specifically discusses the behavior of * both -k and -P. It states that the blocksize should * be set to 1024. Thus, if this occurs, simply break * rather than clobbering the old blocksize. Modified: stable/8/bin/sh/expand.c ============================================================================== --- stable/8/bin/sh/expand.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/bin/sh/expand.c Thu Feb 24 10:23:22 2011 (r218992) @@ -944,7 +944,7 @@ numvar: /* - * Record the the fact that we have to scan this region of the + * Record the fact that we have to scan this region of the * string for IFS characters. */ Modified: stable/8/lib/libc/arm/gen/modf.c ============================================================================== --- stable/8/lib/libc/arm/gen/modf.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/lib/libc/arm/gen/modf.c Thu Feb 24 10:23:22 2011 (r218992) @@ -86,7 +86,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: stable/8/lib/libc/ia64/gen/modf.c ============================================================================== --- stable/8/lib/libc/ia64/gen/modf.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/lib/libc/ia64/gen/modf.c Thu Feb 24 10:23:22 2011 (r218992) @@ -85,7 +85,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: stable/8/lib/libc/mips/gen/modf.c ============================================================================== --- stable/8/lib/libc/mips/gen/modf.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/lib/libc/mips/gen/modf.c Thu Feb 24 10:23:22 2011 (r218992) @@ -86,7 +86,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: stable/8/lib/libc/powerpc/gen/modf.c ============================================================================== --- stable/8/lib/libc/powerpc/gen/modf.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/lib/libc/powerpc/gen/modf.c Thu Feb 24 10:23:22 2011 (r218992) @@ -86,7 +86,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: stable/8/sys/amd64/amd64/trap.c ============================================================================== --- stable/8/sys/amd64/amd64/trap.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/amd64/amd64/trap.c Thu Feb 24 10:23:22 2011 (r218992) @@ -232,7 +232,7 @@ trap(struct trapframe *frame) * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * If the DTrace kernel module has registered a trap handler, Modified: stable/8/sys/arm/xscale/i80321/iq80321.c ============================================================================== --- stable/8/sys/arm/xscale/i80321/iq80321.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/arm/xscale/i80321/iq80321.c Thu Feb 24 10:23:22 2011 (r218992) @@ -139,7 +139,7 @@ iq80321_attach(device_t dev) device_get_name(dev)); /* - * We have mapped the the PCI I/O windows in the early + * We have mapped the PCI I/O windows in the early * bootstrap phase. */ sc->sc_iow_vaddr = IQ80321_IOW_VBASE; Modified: stable/8/sys/boot/ficl/words.c ============================================================================== --- stable/8/sys/boot/ficl/words.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/boot/ficl/words.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1293,7 +1293,7 @@ static void ifCoIm(FICL_VM *pVM) ** compiles an "else"... ** 1) Compile a branch and a patch address; the address gets patched ** by "endif" to point past the "else" code. -** 2) Pop the the "if" patch address +** 2) Pop the "if" patch address ** 3) Patch the "if" branch to point to the current compile address. ** 4) Push the "else" patch address. ("endif" patches this to jump past ** the "else" code. Modified: stable/8/sys/cam/cam_xpt.c ============================================================================== --- stable/8/sys/cam/cam_xpt.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/cam/cam_xpt.c Thu Feb 24 10:23:22 2011 (r218992) @@ -308,7 +308,7 @@ xpt_schedule_dev_allocq(struct cam_eb *b CAMQ_GET_PRIO(&dev->drvq))) == 0)) { /* * The priority of a device waiting for CCB resources - * is that of the the highest priority peripheral driver + * is that of the highest priority peripheral driver * enqueued. */ retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue, @@ -331,7 +331,7 @@ xpt_schedule_dev_sendq(struct cam_eb *bu (cam_ccbq_frozen_top(&dev->ccbq) == 0)) { /* * The priority of a device waiting for controller - * resources is that of the the highest priority CCB + * resources is that of the highest priority CCB * enqueued. */ retval = Modified: stable/8/sys/cam/scsi/scsi_sa.c ============================================================================== --- stable/8/sys/cam/scsi/scsi_sa.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/cam/scsi/scsi_sa.c Thu Feb 24 10:23:22 2011 (r218992) @@ -2654,7 +2654,7 @@ retry: struct scsi_dev_conf_page *cp = &ntcs->dconf; /* * We don't really know whether this device supports - * Data Compression if the the algorithm field is + * Data Compression if the algorithm field is * zero. Just say we do. */ *comp_supported = TRUE; Modified: stable/8/sys/cddl/dev/dtrace/amd64/dtrace_subr.c ============================================================================== --- stable/8/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Feb 24 10:23:22 2011 (r218992) @@ -499,7 +499,7 @@ dtrace_trap(struct trapframe *frame, u_i * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * Check if DTrace has enabled 'no-fault' mode: Modified: stable/8/sys/cddl/dev/dtrace/i386/dtrace_subr.c ============================================================================== --- stable/8/sys/cddl/dev/dtrace/i386/dtrace_subr.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/cddl/dev/dtrace/i386/dtrace_subr.c Thu Feb 24 10:23:22 2011 (r218992) @@ -499,7 +499,7 @@ dtrace_trap(struct trapframe *frame, u_i * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * Check if DTrace has enabled 'no-fault' mode: Modified: stable/8/sys/compat/ndis/subr_ntoskrnl.c ============================================================================== --- stable/8/sys/compat/ndis/subr_ntoskrnl.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/compat/ndis/subr_ntoskrnl.c Thu Feb 24 10:23:22 2011 (r218992) @@ -3354,7 +3354,7 @@ KeSetEvent(nt_kevent *kevent, uint32_t i * setting the state to signalled since we're supposed * to automatically clear synchronization events anyway). * - * If it's a notification event, or the the first + * If it's a notification event, or the first * waiter is doing a WAITTYPE_ALL wait, go through * the full wait satisfaction process. */ Modified: stable/8/sys/dev/advansys/adwcam.c ============================================================================== --- stable/8/sys/dev/advansys/adwcam.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/advansys/adwcam.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1,5 +1,5 @@ /*- - * CAM SCSI interface for the the Advanced Systems Inc. + * CAM SCSI interface for the Advanced Systems Inc. * Second Generation SCSI controllers. * * Product specific probe and attach routines can be found in: Modified: stable/8/sys/dev/aic7xxx/aic79xx_osm.h ============================================================================== --- stable/8/sys/dev/aic7xxx/aic79xx_osm.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/aic7xxx/aic79xx_osm.h Thu Feb 24 10:23:22 2011 (r218992) @@ -103,7 +103,7 @@ * The number of dma segments supported. The sequencer can handle any number * of physically contiguous S/G entrys. To reduce the driver's memory * consumption, we limit the number supported to be sufficient to handle - * the largest mapping supported by the the legacy kernel MAXPHYS setting of + * the largest mapping supported by the legacy kernel MAXPHYS setting of * 128K. This can be increased once some testing is done. Assuming the * transfer is as fragmented as possible and unaligned, this turns out to * be the number of paged sized transfers in MAXPHYS plus an extra element Modified: stable/8/sys/dev/aic7xxx/aic7xxx_osm.h ============================================================================== --- stable/8/sys/dev/aic7xxx/aic7xxx_osm.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/aic7xxx/aic7xxx_osm.h Thu Feb 24 10:23:22 2011 (r218992) @@ -115,7 +115,7 @@ extern devclass_t ahc_devclass; * The number of dma segments supported. The sequencer can handle any number * of physically contiguous S/G entrys. To reduce the driver's memory * consumption, we limit the number supported to be sufficient to handle - * the largest mapping supported by the the legacy kernel MAXPHYS setting of + * the largest mapping supported by the legacy kernel MAXPHYS setting of * 128K. This can be increased once some testing is done. Assuming the * be the number of paged sized transfers in MAXPHYS plus an extra element * to handle any unaligned residual. The sequencer fetches SG elements Modified: stable/8/sys/dev/asr/i2omsg.h ============================================================================== --- stable/8/sys/dev/asr/i2omsg.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/asr/i2omsg.h Thu Feb 24 10:23:22 2011 (r218992) @@ -183,7 +183,7 @@ PRAGMA_PACK_PUSH #define I2O_VERSION_OFFSET_SGL_TRL_OFFSET_MASK 0xF0 /* Defines for the Message Flags Field. */ -/* Please Note the the FAIL bit is only set in the Transport Fail Message. */ +/* Please Note the FAIL bit is only set in the Transport Fail Message. */ #define I2O_MESSAGE_FLAGS_STATIC 0x01 #define I2O_MESSAGE_FLAGS_64BIT_CONTEXT 0x02 #define I2O_MESSAGE_FLAGS_MULTIPLE 0x10 Modified: stable/8/sys/dev/bktr/bktr_card.c ============================================================================== --- stable/8/sys/dev/bktr/bktr_card.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/bktr/bktr_card.c Thu Feb 24 10:23:22 2011 (r218992) @@ -570,7 +570,7 @@ static int locate_eeprom_address( bktr_p * * However some makes of card (eg Hauppauge) come with a configuration eeprom * which tells us the make of the card. Most eeproms also tell us the - * tuner type and other features of the the cards. + * tuner type and other features of the cards. * * The current probe code works as follows * A) If the card uses a Bt878/879: Modified: stable/8/sys/dev/ctau/ctau.c ============================================================================== --- stable/8/sys/dev/ctau/ctau.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/ctau/ctau.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1734,7 +1734,7 @@ ct_board_opt_t ct_board_opt_dflt = { 0, /* board control register 2 */ { /* DMA priority control register */ PCR_PRIO_ROTATE, - 0, /* all channels share the the bus hold */ + 0, /* all channels share the bus hold */ 0, /* hold the bus until all transfers done */ }, CFG_A, /* E1/G.703 config: two independent channels */ Modified: stable/8/sys/dev/ctau/ctddk.h ============================================================================== --- stable/8/sys/dev/ctau/ctddk.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/ctau/ctddk.h Thu Feb 24 10:23:22 2011 (r218992) @@ -206,7 +206,7 @@ typedef struct { typedef struct { unsigned prio : 3; /* priority of channels */ unsigned noshare : 1; /* 1 - chan holds the bus until end of data */ - /* 0 - all channels share the the bus hold */ + /* 0 - all channels share the bus hold */ unsigned release : 1; /* 1 - release the bus between transfers */ /* 0 - hold the bus until all transfers done */ } ct_pcr_t; Modified: stable/8/sys/dev/cxgb/cxgb_main.c ============================================================================== --- stable/8/sys/dev/cxgb/cxgb_main.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/cxgb/cxgb_main.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1908,7 +1908,7 @@ cxgb_uninit_synchronized(struct port_inf /* * Clear this port's bit from the open device map, and then drain all * the tasks that can access/manipulate this port's port_info or ifp. - * We disable this port's interrupts here and so the the slow/ext + * We disable this port's interrupts here and so the slow/ext * interrupt tasks won't be enqueued. The tick task will continue to * be enqueued every second but the runs after this drain will not see * this port in the open device map. @@ -2858,7 +2858,7 @@ cxgb_extension_ioctl(struct cdev *dev, u u64 buf[32]; /* - * Use these to avoid modifying len/addr in the the return + * Use these to avoid modifying len/addr in the return * struct */ uint32_t len = t->len, addr = t->addr; Modified: stable/8/sys/dev/drm/mach64_dma.c ============================================================================== --- stable/8/sys/dev/drm/mach64_dma.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/drm/mach64_dma.c Thu Feb 24 10:23:22 2011 (r218992) @@ -173,7 +173,7 @@ static int mach64_ring_idle(drm_mach64_p } /** - * Reset the the ring buffer descriptors. + * Reset the ring buffer descriptors. * * \sa mach64_do_engine_reset() */ Modified: stable/8/sys/dev/drm/r300_reg.h ============================================================================== --- stable/8/sys/dev/drm/r300_reg.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/drm/r300_reg.h Thu Feb 24 10:23:22 2011 (r218992) @@ -353,7 +353,7 @@ __FBSDID("$FreeBSD$"); # define R300_PVS_CNTL_1_PROGRAM_START_SHIFT 0 # define R300_PVS_CNTL_1_POS_END_SHIFT 10 # define R300_PVS_CNTL_1_PROGRAM_END_SHIFT 20 -/* Addresses are relative the the vertex program parameters area. */ +/* Addresses are relative the vertex program parameters area. */ #define R300_VAP_PVS_CNTL_2 0x22D4 # define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0 # define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT 16 Modified: stable/8/sys/dev/e1000/e1000_82575.c ============================================================================== --- stable/8/sys/dev/e1000/e1000_82575.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/e1000/e1000_82575.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1831,7 +1831,7 @@ out: * e1000_reset_mdicnfg_82580 - Reset MDICNFG destination and com_mdio bits * @hw: pointer to the HW structure * - * This resets the the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on + * This resets the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on * the values found in the EEPROM. This addresses an issue in which these * bits are not restored from EEPROM after reset. **/ Modified: stable/8/sys/dev/e1000/e1000_ich8lan.c ============================================================================== --- stable/8/sys/dev/e1000/e1000_ich8lan.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/e1000/e1000_ich8lan.c Thu Feb 24 10:23:22 2011 (r218992) @@ -3164,7 +3164,7 @@ out: * @hw: pointer to the HW structure * * ICH8 use the PCI Express bus, but does not contain a PCI Express Capability - * register, so the the bus width is hard coded. + * register, so the bus width is hard coded. **/ static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw) { Modified: stable/8/sys/dev/ep/if_epreg.h ============================================================================== --- stable/8/sys/dev/ep/if_epreg.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/ep/if_epreg.h Thu Feb 24 10:23:22 2011 (r218992) @@ -113,7 +113,7 @@ /************************************************************************** * * * These are the registers for the 3Com 3c509 and their bit patterns when * - * applicable. They have been taken out the the "EtherLink III Parallel * + * applicable. They have been taken out the "EtherLink III Parallel * * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual * * from 3com. * * * Modified: stable/8/sys/dev/fdc/fdc.c ============================================================================== --- stable/8/sys/dev/fdc/fdc.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/fdc/fdc.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1267,7 +1267,7 @@ fdmisccmd(struct fd_data *fd, u_int cmd, /* * Set up a bio request for fdstrategy(). bio_offset is faked - * so that fdstrategy() will seek to the the requested + * so that fdstrategy() will seek to the requested * cylinder, and use the desired head. */ bp->bio_cmd = cmd; Modified: stable/8/sys/dev/ixgb/ixgb_ee.c ============================================================================== --- stable/8/sys/dev/ixgb/ixgb_ee.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/ixgb/ixgb_ee.c Thu Feb 24 10:23:22 2011 (r218992) @@ -325,7 +325,7 @@ ixgb_wait_eeprom_command(struct ixgb_hw * hw - Struct containing variables accessed by shared code * * Reads the first 64 16 bit words of the EEPROM and sums the values read. - * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is + * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is * valid. * * Returns: Modified: stable/8/sys/dev/malo/if_malohal.h ============================================================================== --- stable/8/sys/dev/malo/if_malohal.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/malo/if_malohal.h Thu Feb 24 10:23:22 2011 (r218992) @@ -133,7 +133,7 @@ struct malo_hal_hwstats { /* * Set Antenna Configuration (legacy operation). * - * The RX antenna can be selected using the the bitmask + * The RX antenna can be selected using the bitmask * ant (bit 0 = antenna 1, bit 1 = antenna 2, etc.) * (diversity?XXX) */ Modified: stable/8/sys/dev/mwl/mwlhal.h ============================================================================== --- stable/8/sys/dev/mwl/mwlhal.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/mwl/mwlhal.h Thu Feb 24 10:23:22 2011 (r218992) @@ -291,7 +291,7 @@ int mwl_hal_setradio(struct mwl_hal *mh, /* * Set Antenna Configuration (legacy operation). * - * The RX antenna can be selected using the the bitmask + * The RX antenna can be selected using the bitmask * ant (bit 0 = antenna 1, bit 1 = antenna 2, etc.) * (diversity?XXX) */ Modified: stable/8/sys/dev/nxge/xgehal/xgehal-device.c ============================================================================== --- stable/8/sys/dev/nxge/xgehal/xgehal-device.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/nxge/xgehal/xgehal-device.c Thu Feb 24 10:23:22 2011 (r218992) @@ -4418,7 +4418,7 @@ xge_hal_device_status(xge_hal_device_t * #ifndef XGE_HAL_HERC_EMULATION /* * Andrew: in PCI 33 mode, the P_PLL is not used, and therefore, - * the the P_PLL_LOCK bit in the adapter_status register will + * the P_PLL_LOCK bit in the adapter_status register will * not be asserted. */ if (!(tmp64 & XGE_HAL_ADAPTER_STATUS_P_PLL_LOCK) && Modified: stable/8/sys/dev/nxge/xgehal/xgehal-ring-fp.c ============================================================================== --- stable/8/sys/dev/nxge/xgehal/xgehal-ring-fp.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/nxge/xgehal/xgehal-ring-fp.c Thu Feb 24 10:23:22 2011 (r218992) @@ -801,7 +801,7 @@ xge_hal_ring_dtr_free(xge_hal_channel_h * xge_hal_ring_is_next_dtr_completed - Check if the next dtr is completed * @channelh: Channel handle. * - * Checks if the the _next_ completed descriptor is in host memory + * Checks if the _next_ completed descriptor is in host memory * * Returns: XGE_HAL_OK - success. * XGE_HAL_INF_NO_MORE_COMPLETED_DESCRIPTORS - No completed descriptors Modified: stable/8/sys/dev/random/randomdev_soft.c ============================================================================== --- stable/8/sys/dev/random/randomdev_soft.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/random/randomdev_soft.c Thu Feb 24 10:23:22 2011 (r218992) @@ -347,7 +347,7 @@ random_yarrow_write(void *buf, int count /* * Break the input up into HARVESTSIZE chunks. The writer has too - * much control here, so "estimate" the the entropy as zero. + * much control here, so "estimate" the entropy as zero. */ for (i = 0; i < count; i += HARVESTSIZE) { chunk = HARVESTSIZE; Modified: stable/8/sys/dev/sound/pci/es137x.c ============================================================================== --- stable/8/sys/dev/sound/pci/es137x.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/sound/pci/es137x.c Thu Feb 24 10:23:22 2011 (r218992) @@ -559,7 +559,7 @@ eschan1370_setspeed(kobj_t obj, void *da /* * DAC1 does not support continuous rate settings. * Pick the nearest and use it since FEEDER_RATE will - * do the the proper conversion for us. + * do the proper conversion for us. */ es->ctrl &= ~CTRL_WTSRSEL; if (speed < 8268) { Modified: stable/8/sys/dev/sym/sym_fw1.h ============================================================================== --- stable/8/sys/dev/sym/sym_fw1.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/sym/sym_fw1.h Thu Feb 24 10:23:22 2011 (r218992) @@ -262,7 +262,7 @@ static const struct SYM_FWA_SCR SYM_FWA_ * The below GETJOB_BEGIN to GETJOB_END section of SCRIPTS * is a critical path. If it is partially executed, it then * may happen that the job address is not yet in the DSA - * and the the next queue position points to the next JOB. + * and the next queue position points to the next JOB. */ }/*-------------------------< GETJOB_BEGIN >---------------------*/,{ /* Modified: stable/8/sys/dev/sym/sym_fw2.h ============================================================================== --- stable/8/sys/dev/sym/sym_fw2.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/sym/sym_fw2.h Thu Feb 24 10:23:22 2011 (r218992) @@ -252,7 +252,7 @@ static const struct SYM_FWA_SCR SYM_FWA_ * The below GETJOB_BEGIN to GETJOB_END section of SCRIPTS * is a critical path. If it is partially executed, it then * may happen that the job address is not yet in the DSA - * and the the next queue position points to the next JOB. + * and the next queue position points to the next JOB. */ SCR_LOAD_ABS (dsa, 4), PADDR_B (startpos), Modified: stable/8/sys/dev/uart/uart_dev_ns8250.c ============================================================================== --- stable/8/sys/dev/uart/uart_dev_ns8250.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/uart/uart_dev_ns8250.c Thu Feb 24 10:23:22 2011 (r218992) @@ -693,7 +693,7 @@ ns8250_bus_probe(struct uart_softc *sc) /* * We should have a sufficiently clean "pipe" to determine the * size of the FIFOs. We send as much characters as is reasonable - * and wait for the the overflow bit in the LSR register to be + * and wait for the overflow bit in the LSR register to be * asserted, counting the characters as we send them. Based on * that count we know the FIFO size. */ Modified: stable/8/sys/dev/usb/usb_process.c ============================================================================== --- stable/8/sys/dev/usb/usb_process.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/usb/usb_process.c Thu Feb 24 10:23:22 2011 (r218992) @@ -463,7 +463,7 @@ usb_proc_drain(struct usb_process *up) /*------------------------------------------------------------------------* * usb_proc_rewakeup * - * This function is called to re-wakeup the the given USB + * This function is called to re-wakeup the given USB * process. This usually happens after that the USB system has been in * polling mode, like during a panic. This function must be called * having "up->up_mtx" locked. Modified: stable/8/sys/dev/vx/if_vxreg.h ============================================================================== --- stable/8/sys/dev/vx/if_vxreg.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/vx/if_vxreg.h Thu Feb 24 10:23:22 2011 (r218992) @@ -112,7 +112,7 @@ /************************************************************************** * These are the registers for the 3Com 3c509 and their bit patterns when * - * applicable. They have been taken out the the "EtherLink III Parallel * + * applicable. They have been taken out the "EtherLink III Parallel * * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual * * from 3com. * **************************************************************************/ Modified: stable/8/sys/dev/wpi/if_wpi.c ============================================================================== --- stable/8/sys/dev/wpi/if_wpi.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/dev/wpi/if_wpi.c Thu Feb 24 10:23:22 2011 (r218992) @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); * state and told to load boot firmware. The boot firmware loads an init and a * main binary firmware image into SRAM on the card via DMA. * Once the firmware is loaded, the driver/hw then - * communicate by way of circular dma rings via the the SRAM to the firmware. + * communicate by way of circular dma rings via the SRAM to the firmware. * * There is 6 memory rings. 1 command ring, 1 rx data ring & 4 tx data rings. * The 4 tx data rings allow for prioritization QoS. Modified: stable/8/sys/fs/fdescfs/fdesc_vnops.c ============================================================================== --- stable/8/sys/fs/fdescfs/fdesc_vnops.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/fs/fdescfs/fdesc_vnops.c Thu Feb 24 10:23:22 2011 (r218992) @@ -368,7 +368,7 @@ fdesc_open(ap) return (0); /* - * XXX Kludge: set td->td_proc->p_dupfd to contain the value of the the file + * XXX Kludge: set td->td_proc->p_dupfd to contain the value of the file * descriptor being sought for duplication. The error return ensures * that the vnode for this device will be released by vn_open. Open * will detect this special error and take the actions in dupfdopen. Modified: stable/8/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- stable/8/sys/fs/msdosfs/msdosfs_vnops.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/fs/msdosfs/msdosfs_vnops.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1542,7 +1542,7 @@ msdosfs_readdir(ap) /* * msdosfs_readdir() won't operate properly on regular files since - * it does i/o only with the the filesystem vnode, and hence can + * it does i/o only with the filesystem vnode, and hence can * retrieve the wrong block from the buffer cache for a plain file. * So, fail attempts to readdir() on a plain file. */ Modified: stable/8/sys/geom/geom_vfs.c ============================================================================== --- stable/8/sys/geom/geom_vfs.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/geom/geom_vfs.c Thu Feb 24 10:23:22 2011 (r218992) @@ -109,7 +109,7 @@ g_vfs_strategy(struct bufobj *bo, struct /* G_VALID_CONSUMER(cp); We likely lack topology lock */ /* - * If the the provider has orphaned us, just return EXIO. + * If the provider has orphaned us, just return EXIO. */ if (cp->provider == NULL) { bp->b_error = ENXIO; Modified: stable/8/sys/geom/part/g_part_ebr.c ============================================================================== --- stable/8/sys/geom/part/g_part_ebr.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/geom/part/g_part_ebr.c Thu Feb 24 10:23:22 2011 (r218992) @@ -585,7 +585,7 @@ g_part_ebr_write(struct g_part_table *ba while (baseentry != NULL && baseentry->gpe_deleted) baseentry = LIST_NEXT(baseentry, gpe_entry); - /* Wipe-out the the first EBR when there are no slices. */ + /* Wipe-out the first EBR when there are no slices. */ if (baseentry == NULL) { error = g_write_data(cp, 0, buf, pp->sectorsize); goto out; Modified: stable/8/sys/geom/sched/gs_scheduler.h ============================================================================== --- stable/8/sys/geom/sched/gs_scheduler.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/geom/sched/gs_scheduler.h Thu Feb 24 10:23:22 2011 (r218992) @@ -144,7 +144,7 @@ struct g_sched_class { /* * Manipulate the classifier's data. g_sched_get_class() gets a reference - * to the the class corresponding to bp in gp, allocating and initializing + * to the class corresponding to bp in gp, allocating and initializing * it if necessary. g_sched_put_class() releases the reference. * The returned value points to the private data for the class. */ Modified: stable/8/sys/gnu/fs/xfs/xfs_dir_leaf.c ============================================================================== --- stable/8/sys/gnu/fs/xfs/xfs_dir_leaf.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/gnu/fs/xfs/xfs_dir_leaf.c Thu Feb 24 10:23:22 2011 (r218992) @@ -2153,7 +2153,7 @@ xfs_dir_leaf_getdents_int( } /* - * Format a dirent64 structure and copy it out the the user's buffer. + * Format a dirent64 structure and copy it out the user's buffer. */ int xfs_dir_put_dirent64_direct(xfs_dir_put_args_t *pa) @@ -2185,7 +2185,7 @@ xfs_dir_put_dirent64_direct(xfs_dir_put_ } /* - * Format a dirent64 structure and copy it out the the user's buffer. + * Format a dirent64 structure and copy it out the user's buffer. */ int xfs_dir_put_dirent64_uio(xfs_dir_put_args_t *pa) Modified: stable/8/sys/gnu/fs/xfs/xfs_itable.c ============================================================================== --- stable/8/sys/gnu/fs/xfs/xfs_itable.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/gnu/fs/xfs/xfs_itable.c Thu Feb 24 10:23:22 2011 (r218992) @@ -777,7 +777,7 @@ xfs_inumbers( xfs_buf_relse(agbp); agbp = NULL; /* - * Move up the the last inode in the current + * Move up the last inode in the current * chunk. The lookup_ge will always get * us the first inode in the next chunk. */ Modified: stable/8/sys/i386/i386/trap.c ============================================================================== --- stable/8/sys/i386/i386/trap.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/i386/i386/trap.c Thu Feb 24 10:23:22 2011 (r218992) @@ -252,7 +252,7 @@ trap(struct trapframe *frame) * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * If the DTrace kernel module has registered a trap handler, Modified: stable/8/sys/kern/subr_unit.c ============================================================================== --- stable/8/sys/kern/subr_unit.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/kern/subr_unit.c Thu Feb 24 10:23:22 2011 (r218992) @@ -41,7 +41,7 @@ * * If a mutex is not provided when the unit number space is created, a * default global mutex is used. The advantage to passing a mutex in, is - * that the the alloc_unrl() function can be called with the mutex already + * that the alloc_unrl() function can be called with the mutex already * held (it will not be released by alloc_unrl()). * * The allocation function alloc_unr{l}() never sleeps (but it may block on @@ -52,7 +52,7 @@ * * A userland test program is included. * - * Memory usage is a very complex function of the the exact allocation + * Memory usage is a very complex function of the exact allocation * pattern, but always very compact: * * For the very typical case where a single unbroken run of unit * numbers are allocated 44 bytes are used on i386. Modified: stable/8/sys/kern/subr_witness.c ============================================================================== --- stable/8/sys/kern/subr_witness.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/kern/subr_witness.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1173,7 +1173,7 @@ witness_checkorder(struct lock_object *l mtx_assert(&w_mtx, MA_OWNED); /* - * If we know that the the lock we are acquiring comes after + * If we know that the lock we are acquiring comes after * the lock we most recently acquired in the lock order tree, * then there is no need for any further checks. */ Modified: stable/8/sys/kern/uipc_mbuf.c ============================================================================== --- stable/8/sys/kern/uipc_mbuf.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/kern/uipc_mbuf.c Thu Feb 24 10:23:22 2011 (r218992) @@ -280,7 +280,7 @@ mb_free_ext(struct mbuf *m) } /* - * Attach the the cluster from *m to *n, set up m_ext in *n + * Attach the cluster from *m to *n, set up m_ext in *n * and bump the refcount of the cluster. */ static void Modified: stable/8/sys/mips/mips/pmap.c ============================================================================== --- stable/8/sys/mips/mips/pmap.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/mips/mips/pmap.c Thu Feb 24 10:23:22 2011 (r218992) @@ -2021,7 +2021,7 @@ validate: pmap_update_page(pmap, va, newpte); /* - * Sync I & D caches for executable pages. Do this only if the the + * Sync I & D caches for executable pages. Do this only if the * target pmap belongs to the current process. Otherwise, an * unresolvable TLB miss may occur. */ @@ -2155,7 +2155,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_ else { *pte |= PTE_RO; /* - * Sync I & D caches. Do this only if the the target pmap + * Sync I & D caches. Do this only if the target pmap * belongs to the current process. Otherwise, an * unresolvable TLB miss may occur. */ if (pmap == &curproc->p_vmspace->vm_pmap) { Modified: stable/8/sys/mips/rmi/fmn.c ============================================================================== --- stable/8/sys/mips/rmi/fmn.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/mips/rmi/fmn.c Thu Feb 24 10:23:22 2011 (r218992) @@ -99,7 +99,7 @@ static int msgring_maxthreads = 3; TUNABLE_INT("hw.fmn.maxthreads", &msgring_maxthreads); /* - * The device drivers can register a handler for the the messages sent + * The device drivers can register a handler for the messages sent * from a station (corresponding to the device). */ struct tx_stn_handler { @@ -148,7 +148,7 @@ xlr_msgring_cpu_init(void) * For sending FMN messages, we need credits on the destination * bucket. Program the credits this core has on the 128 possible * destination buckets. - * We cannot use a loop here, because the the first argument has + * We cannot use a loop here, because the first argument has * to be a constant integer value. */ MSGRNG_CC_INIT_CPU_DEST(0, cc_config->counters); Modified: stable/8/sys/mips/sibyte/sb_zbpci.c ============================================================================== --- stable/8/sys/mips/sibyte/sb_zbpci.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/mips/sibyte/sb_zbpci.c Thu Feb 24 10:23:22 2011 (r218992) @@ -110,7 +110,7 @@ zbpci_attach(device_t dev) panic("%s: port_rman", __func__); /* - * Reserve the the physical memory that is used to read/write to the + * Reserve the physical memory that is used to read/write to the * pci config space but don't activate it. We are using a page worth * of KVA as a window over this region. */ Modified: stable/8/sys/net/if_media.c ============================================================================== --- stable/8/sys/net/if_media.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/net/if_media.c Thu Feb 24 10:23:22 2011 (r218992) @@ -235,7 +235,7 @@ ifmedia_ioctl(ifp, ifr, ifm, cmd) /* * If no change, we're done. * XXX Automedia may invole software intervention. - * Keep going in case the the connected media changed. + * Keep going in case the connected media changed. * Similarly, if best match changed (kernel debugger?). */ if ((IFM_SUBTYPE(newmedia) != IFM_AUTO) && Modified: stable/8/sys/net/route.c ============================================================================== --- stable/8/sys/net/route.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/net/route.c Thu Feb 24 10:23:22 2011 (r218992) @@ -539,7 +539,7 @@ rtredirect_fib(struct sockaddr *dst, goto done; /* * Create a new entry if we just got back a wildcard entry - * or the the lookup failed. This is necessary for hosts + * or the lookup failed. This is necessary for hosts * which use routing redirects generated by smart gateways * to dynamically build the routing tables. */ Modified: stable/8/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c ============================================================================== --- stable/8/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Thu Feb 24 10:23:22 2011 (r218992) @@ -557,7 +557,7 @@ ng_btsocket_rfcomm_connect(struct socket soclose(l2so); /* we don't need new L2CAP socket */ /* - * Check if we already have the same DLCI the the same session + * Check if we already have the same DLCI the same session */ mtx_lock(&s->session_mtx); Modified: stable/8/sys/netgraph/ng_source.c ============================================================================== --- stable/8/sys/netgraph/ng_source.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netgraph/ng_source.c Thu Feb 24 10:23:22 2011 (r218992) @@ -604,7 +604,7 @@ ng_source_disconnect(hook_p hook) } /* - * Set sc->output_ifp to point to the the struct ifnet of the interface + * Set sc->output_ifp to point to the struct ifnet of the interface * reached via our output hook. */ static int Modified: stable/8/sys/netinet/if_ether.c ============================================================================== --- stable/8/sys/netinet/if_ether.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netinet/if_ether.c Thu Feb 24 10:23:22 2011 (r218992) @@ -795,7 +795,7 @@ reply: /* * Also check that the node which sent the ARP packet - * is on the the interface we expect it to be on. This + * is on the interface we expect it to be on. This * avoids ARP chaos if an interface is connected to the * wrong network. */ Modified: stable/8/sys/netinet/ip_input.c ============================================================================== --- stable/8/sys/netinet/ip_input.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netinet/ip_input.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1031,7 +1031,7 @@ found: * segment. If it provides all of our data, drop us, otherwise * stick new segment in the proper place. * - * If some of the data is dropped from the the preceding + * If some of the data is dropped from the preceding * segment, then it's checksum is invalidated. */ if (p) { Modified: stable/8/sys/netinet/ipfw/ip_fw_private.h ============================================================================== --- stable/8/sys/netinet/ipfw/ip_fw_private.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netinet/ipfw/ip_fw_private.h Thu Feb 24 10:23:22 2011 (r218992) @@ -90,7 +90,7 @@ struct ip_fw_args { /* * On return, it points to the matching rule. * On entry, rule.slot > 0 means the info is valid and - * contains the the starting rule for an ipfw search. + * contains the starting rule for an ipfw search. * If chain_id == chain->id && slot >0 then jump to that slot. * Otherwise, we locate the first rule >= rulenum:rule_id */ Modified: stable/8/sys/netinet/libalias/alias_sctp.c ============================================================================== --- stable/8/sys/netinet/libalias/alias_sctp.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netinet/libalias/alias_sctp.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1929,7 +1929,7 @@ UP_process(struct libalias *la, int dire * @brief Process SCTP message while association is in the process of closing * * This function waits for a SHUT-COMP to close the association. Depending on - * the the setting of sysctl_holddown_timer it may not remove the association + * the setting of sysctl_holddown_timer it may not remove the association * immediately, but leave it up until SN_X_T(la). Only SHUT-COMP, SHUT-ACK, and * ABORT packets are permitted in this state. All other packets are dropped. * Modified: stable/8/sys/netinet/tcp_offload.h ============================================================================== --- stable/8/sys/netinet/tcp_offload.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netinet/tcp_offload.h Thu Feb 24 10:23:22 2011 (r218992) @@ -56,7 +56,7 @@ * * It is assumed that individuals deploying TOE will want connections * to be offloaded without software changes so all connections on an - * interface providing TOE are offloaded unless the the SO_NO_OFFLOAD + * interface providing TOE are offloaded unless the SO_NO_OFFLOAD * flag is set on the socket. * * Modified: stable/8/sys/netinet/tcp_subr.c ============================================================================== --- stable/8/sys/netinet/tcp_subr.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netinet/tcp_subr.c Thu Feb 24 10:23:22 2011 (r218992) @@ -1321,7 +1321,7 @@ tcp_ctlinput(int cmd, struct sockaddr *s mtu = V_tcp_minmss + sizeof(struct tcpiphdr); /* - * Only cache the the MTU if it + * Only cache the MTU if it * is smaller than the interface * or route MTU. tcp_mtudisc() * will do right thing by itself. Modified: stable/8/sys/netinet/tcp_syncache.c ============================================================================== --- stable/8/sys/netinet/tcp_syncache.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netinet/tcp_syncache.c Thu Feb 24 10:23:22 2011 (r218992) @@ -524,7 +524,7 @@ syncache_chkrst(struct in_conninfo *inc, * used, or we are under memory pressure, a valid RST * may not find a syncache entry. In that case we're * done and no SYN|ACK retransmissions will happen. - * Otherwise the the RST was misdirected or spoofed. + * Otherwise the RST was misdirected or spoofed. */ if (sc == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) Modified: stable/8/sys/netinet/tcp_timewait.c ============================================================================== --- stable/8/sys/netinet/tcp_timewait.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netinet/tcp_timewait.c Thu Feb 24 10:23:22 2011 (r218992) @@ -397,7 +397,7 @@ tcp_twcheck(struct inpcb *inp, struct tc } /* - * Drop the the segment if it does not contain an ACK. + * Drop the segment if it does not contain an ACK. */ if ((thflags & TH_ACK) == 0) goto drop; Modified: stable/8/sys/netinet6/in6.h ============================================================================== --- stable/8/sys/netinet6/in6.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/netinet6/in6.h Thu Feb 24 10:23:22 2011 (r218992) @@ -78,7 +78,7 @@ /* * IPv6 port allocation rules should mirror the IPv4 rules and are controlled - * by the the net.inet.ip.portrange sysctl tree. The following defines exist + * by the net.inet.ip.portrange sysctl tree. The following defines exist * for compatibility with userland applications that need them. */ #if __BSD_VISIBLE Modified: stable/8/sys/pc98/cbus/fdc.c ============================================================================== --- stable/8/sys/pc98/cbus/fdc.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/pc98/cbus/fdc.c Thu Feb 24 10:23:22 2011 (r218992) @@ -2378,7 +2378,7 @@ fdmisccmd(struct cdev *dev, u_int cmd, v /* * Set up a bio request for fdstrategy(). bio_offset is faked - * so that fdstrategy() will seek to the the requested + * so that fdstrategy() will seek to the requested * cylinder, and use the desired head. */ bp->bio_cmd = cmd; Modified: stable/8/sys/sparc64/include/iommureg.h ============================================================================== --- stable/8/sys/sparc64/include/iommureg.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/sparc64/include/iommureg.h Thu Feb 24 10:23:22 2011 (r218992) @@ -194,7 +194,7 @@ * Unfortunately, sabres on UltraSPARC IIi and IIe processors does not use * this scheme to determine the IOVA base address. Instead, bits 31-29 are * used to check against the Target Address Space register in the IIi and - * the the IOMMU is used if they hit. God knows what goes on in the IIe. + * the IOMMU is used if they hit. God knows what goes on in the IIe. * */ Modified: stable/8/sys/sparc64/sparc64/trap.c ============================================================================== --- stable/8/sys/sparc64/sparc64/trap.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/sparc64/sparc64/trap.c Thu Feb 24 10:23:22 2011 (r218992) @@ -438,7 +438,7 @@ trap_cecc(void) cache_flush(); /* Ensure the caches are still turned on (should be). */ cache_enable(PCPU_GET(impl)); - /* Clear the the error from the AFSR. */ + /* Clear the error from the AFSR. */ stxa_sync(0, ASI_AFSR, ldxa(0, ASI_AFSR)); corrected_ecc++; printf("corrected ECC error\n"); Modified: stable/8/sys/sys/aac_ioctl.h ============================================================================== --- stable/8/sys/sys/aac_ioctl.h Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/sys/sys/aac_ioctl.h Thu Feb 24 10:23:22 2011 (r218992) @@ -117,7 +117,7 @@ union aac_statrequest { /* Do the native version of the ioctls. Since the BSD encoding scheme * conflicts with the 'standard' AAC encoding scheme, the resulting numbers * will be different. The '8' comes from the fact that the previous scheme - * used 12 bits for the number, with the the 12th bit being the only set + * used 12 bits for the number, with the 12th bit being the only set * bit above bit 8. Thus the value of 8, with the lower 8 bits holding the * command number. 9 is used for the odd overflow case. */ Modified: stable/8/usr.bin/lex/misc.c ============================================================================== --- stable/8/usr.bin/lex/misc.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/usr.bin/lex/misc.c Thu Feb 24 10:23:22 2011 (r218992) @@ -707,7 +707,7 @@ const char str[]; } -/* readable_form - return the the human-readable form of a character +/* readable_form - return the human-readable form of a character * * The returned string is in static storage. */ Modified: stable/8/usr.bin/m4/gnum4.c ============================================================================== --- stable/8/usr.bin/m4/gnum4.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/usr.bin/m4/gnum4.c Thu Feb 24 10:23:22 2011 (r218992) @@ -54,7 +54,7 @@ int mimic_gnu = 0; /* * Support for include path search - * First search in the the current directory. + * First search in the current directory. * If not found, and the path is not absolute, include path kicks in. * First, -I options, in the order found on the command line. * Then M4PATH env variable Modified: stable/8/usr.bin/make/lst.c ============================================================================== --- stable/8/usr.bin/make/lst.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/usr.bin/make/lst.c Thu Feb 24 10:23:22 2011 (r218992) @@ -99,7 +99,7 @@ Lst_Append(Lst *list, LstNode *ln, void * LST_CONCLINK if should just be relinked * * Side Effects: - * New elements are created and appended the the first list. + * New elements are created and appended the first list. */ void Lst_Concat(Lst *list1, Lst *list2, int flags) Modified: stable/8/usr.bin/rpcinfo/rpcinfo.c ============================================================================== --- stable/8/usr.bin/rpcinfo/rpcinfo.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/usr.bin/rpcinfo/rpcinfo.c Thu Feb 24 10:23:22 2011 (r218992) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); /* * rpcinfo: ping a particular rpc program - * or dump the the registered programs on the remote machine. + * or dump the registered programs on the remote machine. */ /* Modified: stable/8/usr.bin/xinstall/xinstall.c ============================================================================== --- stable/8/usr.bin/xinstall/xinstall.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/usr.bin/xinstall/xinstall.c Thu Feb 24 10:23:22 2011 (r218992) @@ -497,7 +497,7 @@ install(const char *from_name, const cha * flags, except for the dump flag. * NFS does not support flags. Ignore EOPNOTSUPP flags if we're just * trying to turn off UF_NODUMP. If we're trying to set real flags, - * then warn if the the fs doesn't support it, otherwise fail. + * then warn if the fs doesn't support it, otherwise fail. */ if (!devnull && (flags & SETFLAGS || (from_sb.st_flags & ~UF_NODUMP) != to_sb.st_flags) && Modified: stable/8/usr.sbin/moused/moused.c ============================================================================== --- stable/8/usr.sbin/moused/moused.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/usr.sbin/moused/moused.c Thu Feb 24 10:23:22 2011 (r218992) @@ -931,7 +931,7 @@ main(int argc, char *argv[]) /* * We cannot continue because of error. Exit if the * program has not become a daemon. Otherwise, block - * until the the user corrects the problem and issues SIGHUP. + * until the user corrects the problem and issues SIGHUP. */ if (!background) exit(1); Modified: stable/8/usr.sbin/rpcbind/util.c ============================================================================== --- stable/8/usr.sbin/rpcbind/util.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/usr.sbin/rpcbind/util.c Thu Feb 24 10:23:22 2011 (r218992) @@ -244,7 +244,7 @@ addrmerge(struct netbuf *caller, char *s found: /* - * Construct the new address using the the address from + * Construct the new address using the address from * `bestif', and the port number from `serv_uaddr'. */ serv_nbp = uaddr2taddr(nconf, serv_uaddr); Modified: stable/8/usr.sbin/sysinstall/install.c ============================================================================== --- stable/8/usr.sbin/sysinstall/install.c Thu Feb 24 10:21:26 2011 (r218991) +++ stable/8/usr.sbin/sysinstall/install.c Thu Feb 24 10:23:22 2011 (r218992) @@ -946,7 +946,7 @@ installFixupBase(dialogMenuItem *self) vsystem("mtree -deU -f /etc/mtree/BSD.usr.dist -p /usr"); #ifdef __ia64__ - /* Move /boot to the the EFI partition and make /boot a link to it. */ + /* Move /boot to the EFI partition and make /boot a link to it. */ efi_mntpt = (EfiChunk != NULL) ? ((PartInfo *)EfiChunk->private_data)->mountpoint : NULL; if (efi_mntpt != NULL) { vsystem("if [ ! -L /boot ]; then mv /boot %s; fi", efi_mntpt); From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 10:45:43 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33D04106564A; Thu, 24 Feb 2011 10:45:43 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1E5CF8FC0A; Thu, 24 Feb 2011 10:45:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OAjhFk034861; Thu, 24 Feb 2011 10:45:43 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OAjfFR034792; Thu, 24 Feb 2011 10:45:41 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102241045.p1OAjfFR034792@svn.freebsd.org> From: Bruce Cran Date: Thu, 24 Feb 2011 10:45:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218993 - in stable/7: bin/df bin/sh lib/libc/arm/gen lib/libc/ia64/gen lib/libc/powerpc/gen sys/amd64/amd64 sys/arm/xscale/i80321 sys/boot/ficl sys/cam sys/cam/scsi sys/cddl/dev/dtrace... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 10:45:43 -0000 Author: brucec Date: Thu Feb 24 10:45:41 2011 New Revision: 218993 URL: http://svn.freebsd.org/changeset/base/218993 Log: MFC r218909: Fix typos - remove duplicate "the". PR: bin/154928 Submitted by: Eitan Adler Modified: stable/7/bin/df/df.c stable/7/bin/sh/expand.c stable/7/lib/libc/arm/gen/modf.c stable/7/lib/libc/ia64/gen/modf.c stable/7/lib/libc/powerpc/gen/modf.c stable/7/sys/amd64/amd64/trap.c stable/7/sys/arm/xscale/i80321/iq80321.c stable/7/sys/boot/ficl/words.c stable/7/sys/cam/cam_xpt.c stable/7/sys/cam/scsi/scsi_sa.c stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c stable/7/sys/compat/ndis/subr_ntoskrnl.c stable/7/sys/dev/advansys/adwcam.c stable/7/sys/dev/asr/i2omsg.h stable/7/sys/dev/bktr/bktr_card.c stable/7/sys/dev/ctau/ctau.c stable/7/sys/dev/ctau/ctddk.h stable/7/sys/dev/cxgb/cxgb_main.c stable/7/sys/dev/drm/mach64_dma.c stable/7/sys/dev/drm/r300_reg.h stable/7/sys/dev/e1000/e1000_82575.c stable/7/sys/dev/e1000/e1000_ich8lan.c stable/7/sys/dev/ep/if_epreg.h stable/7/sys/dev/fdc/fdc.c stable/7/sys/dev/ixgb/ixgb_ee.c stable/7/sys/dev/malo/if_malohal.h stable/7/sys/dev/nxge/xgehal/xgehal-device.c stable/7/sys/dev/nxge/xgehal/xgehal-ring-fp.c stable/7/sys/dev/random/randomdev_soft.c stable/7/sys/dev/sound/pci/es137x.c stable/7/sys/dev/sym/sym_fw1.h stable/7/sys/dev/sym/sym_fw2.h stable/7/sys/dev/uart/uart_dev_ns8250.c stable/7/sys/dev/vx/if_vxreg.h stable/7/sys/dev/wpi/if_wpi.c stable/7/sys/fs/fdescfs/fdesc_vnops.c stable/7/sys/fs/msdosfs/msdosfs_vnops.c stable/7/sys/geom/geom_vfs.c stable/7/sys/geom/part/g_part_ebr.c stable/7/sys/i386/i386/trap.c stable/7/sys/kern/subr_unit.c stable/7/sys/kern/subr_witness.c stable/7/sys/kern/uipc_mbuf.c stable/7/sys/net/if_media.c stable/7/sys/net/route.c stable/7/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c stable/7/sys/netgraph/ng_source.c stable/7/sys/netinet/if_ether.c stable/7/sys/netinet/ip_input.c stable/7/sys/netinet/tcp_offload.h stable/7/sys/netinet/tcp_subr.c stable/7/sys/netinet/tcp_syncache.c stable/7/sys/netinet/tcp_timewait.c stable/7/sys/netinet6/in6.h stable/7/sys/pc98/cbus/fdc.c stable/7/sys/sparc64/include/iommureg.h stable/7/sys/sparc64/sparc64/trap.c stable/7/sys/sys/aac_ioctl.h stable/7/usr.bin/lex/misc.c stable/7/usr.bin/m4/gnum4.c stable/7/usr.bin/make/lst.c stable/7/usr.bin/rpcinfo/rpcinfo.c stable/7/usr.bin/xinstall/xinstall.c stable/7/usr.sbin/moused/moused.c stable/7/usr.sbin/rpcbind/util.c stable/7/usr.sbin/sysinstall/install.c Directory Properties: stable/7/bin/df/ (props changed) stable/7/bin/sh/ (props changed) stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/usr.bin/lex/ (props changed) stable/7/usr.bin/m4/ (props changed) stable/7/usr.bin/make/ (props changed) stable/7/usr.bin/rpcinfo/ (props changed) stable/7/usr.bin/xinstall/ (props changed) stable/7/usr.sbin/moused/ (props changed) stable/7/usr.sbin/rpcbind/ (props changed) stable/7/usr.sbin/sysinstall/ (props changed) Modified: stable/7/bin/df/df.c ============================================================================== --- stable/7/bin/df/df.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/bin/df/df.c Thu Feb 24 10:45:41 2011 (r218993) @@ -124,7 +124,7 @@ main(int argc, char *argv[]) /* FALLTHROUGH */ case 'P': /* - * POSIX specifically discusses the the behavior of + * POSIX specifically discusses the behavior of * both -k and -P. It states that the blocksize should * be set to 1024. Thus, if this occurs, simply break * rather than clobbering the old blocksize. Modified: stable/7/bin/sh/expand.c ============================================================================== --- stable/7/bin/sh/expand.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/bin/sh/expand.c Thu Feb 24 10:45:41 2011 (r218993) @@ -944,7 +944,7 @@ numvar: /* - * Record the the fact that we have to scan this region of the + * Record the fact that we have to scan this region of the * string for IFS characters. */ Modified: stable/7/lib/libc/arm/gen/modf.c ============================================================================== --- stable/7/lib/libc/arm/gen/modf.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/lib/libc/arm/gen/modf.c Thu Feb 24 10:45:41 2011 (r218993) @@ -86,7 +86,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: stable/7/lib/libc/ia64/gen/modf.c ============================================================================== --- stable/7/lib/libc/ia64/gen/modf.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/lib/libc/ia64/gen/modf.c Thu Feb 24 10:45:41 2011 (r218993) @@ -85,7 +85,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: stable/7/lib/libc/powerpc/gen/modf.c ============================================================================== --- stable/7/lib/libc/powerpc/gen/modf.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/lib/libc/powerpc/gen/modf.c Thu Feb 24 10:45:41 2011 (r218993) @@ -86,7 +86,7 @@ modf(val, iptr) * If you look at the math involved for a few seconds, it's * plain to see that the integral part is the input, with the * low (DBL_FRACBITS - (exponent - DBL_EXP_BIAS)) bits zeroed, - * the the fractional part is the part with the rest of the + * the fractional part is the part with the rest of the * bits zeroed. Just zeroing the high bits to get the * fractional part would yield a fraction in need of * normalization. Therefore, we take the easy way out, and Modified: stable/7/sys/amd64/amd64/trap.c ============================================================================== --- stable/7/sys/amd64/amd64/trap.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/amd64/amd64/trap.c Thu Feb 24 10:45:41 2011 (r218993) @@ -240,7 +240,7 @@ trap(struct trapframe *frame) * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * If the DTrace kernel module has registered a trap handler, Modified: stable/7/sys/arm/xscale/i80321/iq80321.c ============================================================================== --- stable/7/sys/arm/xscale/i80321/iq80321.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/arm/xscale/i80321/iq80321.c Thu Feb 24 10:45:41 2011 (r218993) @@ -139,7 +139,7 @@ iq80321_attach(device_t dev) device_get_name(dev)); /* - * We have mapped the the PCI I/O windows in the early + * We have mapped the PCI I/O windows in the early * bootstrap phase. */ sc->sc_iow_vaddr = IQ80321_IOW_VBASE; Modified: stable/7/sys/boot/ficl/words.c ============================================================================== --- stable/7/sys/boot/ficl/words.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/boot/ficl/words.c Thu Feb 24 10:45:41 2011 (r218993) @@ -1293,7 +1293,7 @@ static void ifCoIm(FICL_VM *pVM) ** compiles an "else"... ** 1) Compile a branch and a patch address; the address gets patched ** by "endif" to point past the "else" code. -** 2) Pop the the "if" patch address +** 2) Pop the "if" patch address ** 3) Patch the "if" branch to point to the current compile address. ** 4) Push the "else" patch address. ("endif" patches this to jump past ** the "else" code. Modified: stable/7/sys/cam/cam_xpt.c ============================================================================== --- stable/7/sys/cam/cam_xpt.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/cam/cam_xpt.c Thu Feb 24 10:45:41 2011 (r218993) @@ -883,7 +883,7 @@ xpt_schedule_dev_allocq(struct cam_eb *b } /* * The priority of a device waiting for CCB resources - * is that of the the highest priority peripheral driver + * is that of the highest priority peripheral driver * enqueued. */ retval = xpt_schedule_dev(&bus->sim->devq->alloc_queue, @@ -904,7 +904,7 @@ xpt_schedule_dev_sendq(struct cam_eb *bu if (dev->ccbq.dev_openings > 0) { /* * The priority of a device waiting for controller - * resources is that of the the highest priority CCB + * resources is that of the highest priority CCB * enqueued. */ retval = Modified: stable/7/sys/cam/scsi/scsi_sa.c ============================================================================== --- stable/7/sys/cam/scsi/scsi_sa.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/cam/scsi/scsi_sa.c Thu Feb 24 10:45:41 2011 (r218993) @@ -2660,7 +2660,7 @@ retry: struct scsi_dev_conf_page *cp = &ntcs->dconf; /* * We don't really know whether this device supports - * Data Compression if the the algorithm field is + * Data Compression if the algorithm field is * zero. Just say we do. */ *comp_supported = TRUE; Modified: stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c ============================================================================== --- stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/cddl/dev/dtrace/amd64/dtrace_subr.c Thu Feb 24 10:45:41 2011 (r218993) @@ -502,7 +502,7 @@ dtrace_trap(struct trapframe *frame, u_i * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * Check if DTrace has enabled 'no-fault' mode: Modified: stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c ============================================================================== --- stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/cddl/dev/dtrace/i386/dtrace_subr.c Thu Feb 24 10:45:41 2011 (r218993) @@ -502,7 +502,7 @@ dtrace_trap(struct trapframe *frame, u_i * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * Check if DTrace has enabled 'no-fault' mode: Modified: stable/7/sys/compat/ndis/subr_ntoskrnl.c ============================================================================== --- stable/7/sys/compat/ndis/subr_ntoskrnl.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/compat/ndis/subr_ntoskrnl.c Thu Feb 24 10:45:41 2011 (r218993) @@ -3277,7 +3277,7 @@ KeSetEvent(nt_kevent *kevent, uint32_t i * setting the state to signalled since we're supposed * to automatically clear synchronization events anyway). * - * If it's a notification event, or the the first + * If it's a notification event, or the first * waiter is doing a WAITTYPE_ALL wait, go through * the full wait satisfaction process. */ Modified: stable/7/sys/dev/advansys/adwcam.c ============================================================================== --- stable/7/sys/dev/advansys/adwcam.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/advansys/adwcam.c Thu Feb 24 10:45:41 2011 (r218993) @@ -1,5 +1,5 @@ /*- - * CAM SCSI interface for the the Advanced Systems Inc. + * CAM SCSI interface for the Advanced Systems Inc. * Second Generation SCSI controllers. * * Product specific probe and attach routines can be found in: Modified: stable/7/sys/dev/asr/i2omsg.h ============================================================================== --- stable/7/sys/dev/asr/i2omsg.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/asr/i2omsg.h Thu Feb 24 10:45:41 2011 (r218993) @@ -183,7 +183,7 @@ PRAGMA_PACK_PUSH #define I2O_VERSION_OFFSET_SGL_TRL_OFFSET_MASK 0xF0 /* Defines for the Message Flags Field. */ -/* Please Note the the FAIL bit is only set in the Transport Fail Message. */ +/* Please Note the FAIL bit is only set in the Transport Fail Message. */ #define I2O_MESSAGE_FLAGS_STATIC 0x01 #define I2O_MESSAGE_FLAGS_64BIT_CONTEXT 0x02 #define I2O_MESSAGE_FLAGS_MULTIPLE 0x10 Modified: stable/7/sys/dev/bktr/bktr_card.c ============================================================================== --- stable/7/sys/dev/bktr/bktr_card.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/bktr/bktr_card.c Thu Feb 24 10:45:41 2011 (r218993) @@ -570,7 +570,7 @@ static int locate_eeprom_address( bktr_p * * However some makes of card (eg Hauppauge) come with a configuration eeprom * which tells us the make of the card. Most eeproms also tell us the - * tuner type and other features of the the cards. + * tuner type and other features of the cards. * * The current probe code works as follows * A) If the card uses a Bt878/879: Modified: stable/7/sys/dev/ctau/ctau.c ============================================================================== --- stable/7/sys/dev/ctau/ctau.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/ctau/ctau.c Thu Feb 24 10:45:41 2011 (r218993) @@ -1734,7 +1734,7 @@ ct_board_opt_t ct_board_opt_dflt = { 0, /* board control register 2 */ { /* DMA priority control register */ PCR_PRIO_ROTATE, - 0, /* all channels share the the bus hold */ + 0, /* all channels share the bus hold */ 0, /* hold the bus until all transfers done */ }, CFG_A, /* E1/G.703 config: two independent channels */ Modified: stable/7/sys/dev/ctau/ctddk.h ============================================================================== --- stable/7/sys/dev/ctau/ctddk.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/ctau/ctddk.h Thu Feb 24 10:45:41 2011 (r218993) @@ -206,7 +206,7 @@ typedef struct { typedef struct { unsigned prio : 3; /* priority of channels */ unsigned noshare : 1; /* 1 - chan holds the bus until end of data */ - /* 0 - all channels share the the bus hold */ + /* 0 - all channels share the bus hold */ unsigned release : 1; /* 1 - release the bus between transfers */ /* 0 - hold the bus until all transfers done */ } ct_pcr_t; Modified: stable/7/sys/dev/cxgb/cxgb_main.c ============================================================================== --- stable/7/sys/dev/cxgb/cxgb_main.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/cxgb/cxgb_main.c Thu Feb 24 10:45:41 2011 (r218993) @@ -1952,7 +1952,7 @@ cxgb_uninit_synchronized(struct port_inf /* * Clear this port's bit from the open device map, and then drain all * the tasks that can access/manipulate this port's port_info or ifp. - * We disable this port's interrupts here and so the the slow/ext + * We disable this port's interrupts here and so the slow/ext * interrupt tasks won't be enqueued. The tick task will continue to * be enqueued every second but the runs after this drain will not see * this port in the open device map. @@ -2915,7 +2915,7 @@ cxgb_extension_ioctl(struct cdev *dev, u u64 buf[32]; /* - * Use these to avoid modifying len/addr in the the return + * Use these to avoid modifying len/addr in the return * struct */ uint32_t len = t->len, addr = t->addr; Modified: stable/7/sys/dev/drm/mach64_dma.c ============================================================================== --- stable/7/sys/dev/drm/mach64_dma.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/drm/mach64_dma.c Thu Feb 24 10:45:41 2011 (r218993) @@ -173,7 +173,7 @@ static int mach64_ring_idle(drm_mach64_p } /** - * Reset the the ring buffer descriptors. + * Reset the ring buffer descriptors. * * \sa mach64_do_engine_reset() */ Modified: stable/7/sys/dev/drm/r300_reg.h ============================================================================== --- stable/7/sys/dev/drm/r300_reg.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/drm/r300_reg.h Thu Feb 24 10:45:41 2011 (r218993) @@ -353,7 +353,7 @@ __FBSDID("$FreeBSD$"); # define R300_PVS_CNTL_1_PROGRAM_START_SHIFT 0 # define R300_PVS_CNTL_1_POS_END_SHIFT 10 # define R300_PVS_CNTL_1_PROGRAM_END_SHIFT 20 -/* Addresses are relative the the vertex program parameters area. */ +/* Addresses are relative the vertex program parameters area. */ #define R300_VAP_PVS_CNTL_2 0x22D4 # define R300_PVS_CNTL_2_PARAM_OFFSET_SHIFT 0 # define R300_PVS_CNTL_2_PARAM_COUNT_SHIFT 16 Modified: stable/7/sys/dev/e1000/e1000_82575.c ============================================================================== --- stable/7/sys/dev/e1000/e1000_82575.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/e1000/e1000_82575.c Thu Feb 24 10:45:41 2011 (r218993) @@ -1831,7 +1831,7 @@ out: * e1000_reset_mdicnfg_82580 - Reset MDICNFG destination and com_mdio bits * @hw: pointer to the HW structure * - * This resets the the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on + * This resets the MDICNFG.Destination and MDICNFG.Com_MDIO bits based on * the values found in the EEPROM. This addresses an issue in which these * bits are not restored from EEPROM after reset. **/ Modified: stable/7/sys/dev/e1000/e1000_ich8lan.c ============================================================================== --- stable/7/sys/dev/e1000/e1000_ich8lan.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/e1000/e1000_ich8lan.c Thu Feb 24 10:45:41 2011 (r218993) @@ -3164,7 +3164,7 @@ out: * @hw: pointer to the HW structure * * ICH8 use the PCI Express bus, but does not contain a PCI Express Capability - * register, so the the bus width is hard coded. + * register, so the bus width is hard coded. **/ static s32 e1000_get_bus_info_ich8lan(struct e1000_hw *hw) { Modified: stable/7/sys/dev/ep/if_epreg.h ============================================================================== --- stable/7/sys/dev/ep/if_epreg.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/ep/if_epreg.h Thu Feb 24 10:45:41 2011 (r218993) @@ -113,7 +113,7 @@ /************************************************************************** * * * These are the registers for the 3Com 3c509 and their bit patterns when * - * applicable. They have been taken out the the "EtherLink III Parallel * + * applicable. They have been taken out the "EtherLink III Parallel * * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual * * from 3com. * * * Modified: stable/7/sys/dev/fdc/fdc.c ============================================================================== --- stable/7/sys/dev/fdc/fdc.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/fdc/fdc.c Thu Feb 24 10:45:41 2011 (r218993) @@ -1267,7 +1267,7 @@ fdmisccmd(struct fd_data *fd, u_int cmd, /* * Set up a bio request for fdstrategy(). bio_offset is faked - * so that fdstrategy() will seek to the the requested + * so that fdstrategy() will seek to the requested * cylinder, and use the desired head. */ bp->bio_cmd = cmd; Modified: stable/7/sys/dev/ixgb/ixgb_ee.c ============================================================================== --- stable/7/sys/dev/ixgb/ixgb_ee.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/ixgb/ixgb_ee.c Thu Feb 24 10:45:41 2011 (r218993) @@ -325,7 +325,7 @@ ixgb_wait_eeprom_command(struct ixgb_hw * hw - Struct containing variables accessed by shared code * * Reads the first 64 16 bit words of the EEPROM and sums the values read. - * If the the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is + * If the sum of the 64 16 bit words is 0xBABA, the EEPROM's checksum is * valid. * * Returns: Modified: stable/7/sys/dev/malo/if_malohal.h ============================================================================== --- stable/7/sys/dev/malo/if_malohal.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/malo/if_malohal.h Thu Feb 24 10:45:41 2011 (r218993) @@ -133,7 +133,7 @@ struct malo_hal_hwstats { /* * Set Antenna Configuration (legacy operation). * - * The RX antenna can be selected using the the bitmask + * The RX antenna can be selected using the bitmask * ant (bit 0 = antenna 1, bit 1 = antenna 2, etc.) * (diversity?XXX) */ Modified: stable/7/sys/dev/nxge/xgehal/xgehal-device.c ============================================================================== --- stable/7/sys/dev/nxge/xgehal/xgehal-device.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/nxge/xgehal/xgehal-device.c Thu Feb 24 10:45:41 2011 (r218993) @@ -4418,7 +4418,7 @@ xge_hal_device_status(xge_hal_device_t * #ifndef XGE_HAL_HERC_EMULATION /* * Andrew: in PCI 33 mode, the P_PLL is not used, and therefore, - * the the P_PLL_LOCK bit in the adapter_status register will + * the P_PLL_LOCK bit in the adapter_status register will * not be asserted. */ if (!(tmp64 & XGE_HAL_ADAPTER_STATUS_P_PLL_LOCK) && Modified: stable/7/sys/dev/nxge/xgehal/xgehal-ring-fp.c ============================================================================== --- stable/7/sys/dev/nxge/xgehal/xgehal-ring-fp.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/nxge/xgehal/xgehal-ring-fp.c Thu Feb 24 10:45:41 2011 (r218993) @@ -801,7 +801,7 @@ xge_hal_ring_dtr_free(xge_hal_channel_h * xge_hal_ring_is_next_dtr_completed - Check if the next dtr is completed * @channelh: Channel handle. * - * Checks if the the _next_ completed descriptor is in host memory + * Checks if the _next_ completed descriptor is in host memory * * Returns: XGE_HAL_OK - success. * XGE_HAL_INF_NO_MORE_COMPLETED_DESCRIPTORS - No completed descriptors Modified: stable/7/sys/dev/random/randomdev_soft.c ============================================================================== --- stable/7/sys/dev/random/randomdev_soft.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/random/randomdev_soft.c Thu Feb 24 10:45:41 2011 (r218993) @@ -350,7 +350,7 @@ random_yarrow_write(void *buf, int count /* * Break the input up into HARVESTSIZE chunks. The writer has too - * much control here, so "estimate" the the entropy as zero. + * much control here, so "estimate" the entropy as zero. */ for (i = 0; i < count; i += HARVESTSIZE) { chunk = HARVESTSIZE; Modified: stable/7/sys/dev/sound/pci/es137x.c ============================================================================== --- stable/7/sys/dev/sound/pci/es137x.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/sound/pci/es137x.c Thu Feb 24 10:45:41 2011 (r218993) @@ -555,7 +555,7 @@ eschan1370_setspeed(kobj_t obj, void *da /* * DAC1 does not support continuous rate settings. * Pick the nearest and use it since FEEDER_RATE will - * do the the proper conversion for us. + * do the proper conversion for us. */ es->ctrl &= ~CTRL_WTSRSEL; if (speed < 8268) { Modified: stable/7/sys/dev/sym/sym_fw1.h ============================================================================== --- stable/7/sys/dev/sym/sym_fw1.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/sym/sym_fw1.h Thu Feb 24 10:45:41 2011 (r218993) @@ -262,7 +262,7 @@ static const struct SYM_FWA_SCR SYM_FWA_ * The below GETJOB_BEGIN to GETJOB_END section of SCRIPTS * is a critical path. If it is partially executed, it then * may happen that the job address is not yet in the DSA - * and the the next queue position points to the next JOB. + * and the next queue position points to the next JOB. */ }/*-------------------------< GETJOB_BEGIN >---------------------*/,{ /* Modified: stable/7/sys/dev/sym/sym_fw2.h ============================================================================== --- stable/7/sys/dev/sym/sym_fw2.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/sym/sym_fw2.h Thu Feb 24 10:45:41 2011 (r218993) @@ -252,7 +252,7 @@ static const struct SYM_FWA_SCR SYM_FWA_ * The below GETJOB_BEGIN to GETJOB_END section of SCRIPTS * is a critical path. If it is partially executed, it then * may happen that the job address is not yet in the DSA - * and the the next queue position points to the next JOB. + * and the next queue position points to the next JOB. */ SCR_LOAD_ABS (dsa, 4), PADDR_B (startpos), Modified: stable/7/sys/dev/uart/uart_dev_ns8250.c ============================================================================== --- stable/7/sys/dev/uart/uart_dev_ns8250.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/uart/uart_dev_ns8250.c Thu Feb 24 10:45:41 2011 (r218993) @@ -667,7 +667,7 @@ ns8250_bus_probe(struct uart_softc *sc) /* * We should have a sufficiently clean "pipe" to determine the * size of the FIFOs. We send as much characters as is reasonable - * and wait for the the overflow bit in the LSR register to be + * and wait for the overflow bit in the LSR register to be * asserted, counting the characters as we send them. Based on * that count we know the FIFO size. */ Modified: stable/7/sys/dev/vx/if_vxreg.h ============================================================================== --- stable/7/sys/dev/vx/if_vxreg.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/vx/if_vxreg.h Thu Feb 24 10:45:41 2011 (r218993) @@ -112,7 +112,7 @@ /************************************************************************** * These are the registers for the 3Com 3c509 and their bit patterns when * - * applicable. They have been taken out the the "EtherLink III Parallel * + * applicable. They have been taken out the "EtherLink III Parallel * * Tasking EISA and ISA Technical Reference" "Beta Draft 10/30/92" manual * * from 3com. * **************************************************************************/ Modified: stable/7/sys/dev/wpi/if_wpi.c ============================================================================== --- stable/7/sys/dev/wpi/if_wpi.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/dev/wpi/if_wpi.c Thu Feb 24 10:45:41 2011 (r218993) @@ -29,7 +29,7 @@ __FBSDID("$FreeBSD$"); * state and told to load boot firmware. The boot firmware loads an init and a * main binary firmware image into SRAM on the card via DMA. * Once the firmware is loaded, the driver/hw then - * communicate by way of circular dma rings via the the SRAM to the firmware. + * communicate by way of circular dma rings via the SRAM to the firmware. * * There is 6 memory rings. 1 command ring, 1 rx data ring & 4 tx data rings. * The 4 tx data rings allow for prioritization QoS. Modified: stable/7/sys/fs/fdescfs/fdesc_vnops.c ============================================================================== --- stable/7/sys/fs/fdescfs/fdesc_vnops.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/fs/fdescfs/fdesc_vnops.c Thu Feb 24 10:45:41 2011 (r218993) @@ -367,7 +367,7 @@ fdesc_open(ap) return (0); /* - * XXX Kludge: set td->td_proc->p_dupfd to contain the value of the the file + * XXX Kludge: set td->td_proc->p_dupfd to contain the value of the file * descriptor being sought for duplication. The error return ensures * that the vnode for this device will be released by vn_open. Open * will detect this special error and take the actions in dupfdopen. Modified: stable/7/sys/fs/msdosfs/msdosfs_vnops.c ============================================================================== --- stable/7/sys/fs/msdosfs/msdosfs_vnops.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/fs/msdosfs/msdosfs_vnops.c Thu Feb 24 10:45:41 2011 (r218993) @@ -1538,7 +1538,7 @@ msdosfs_readdir(ap) /* * msdosfs_readdir() won't operate properly on regular files since - * it does i/o only with the the filesystem vnode, and hence can + * it does i/o only with the filesystem vnode, and hence can * retrieve the wrong block from the buffer cache for a plain file. * So, fail attempts to readdir() on a plain file. */ Modified: stable/7/sys/geom/geom_vfs.c ============================================================================== --- stable/7/sys/geom/geom_vfs.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/geom/geom_vfs.c Thu Feb 24 10:45:41 2011 (r218993) @@ -109,7 +109,7 @@ g_vfs_strategy(struct bufobj *bo, struct G_VALID_CONSUMER(cp); /* - * If the the provider has orphaned us, just return EXIO. + * If the provider has orphaned us, just return EXIO. */ if (cp->provider == NULL) { bp->b_error = ENXIO; Modified: stable/7/sys/geom/part/g_part_ebr.c ============================================================================== --- stable/7/sys/geom/part/g_part_ebr.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/geom/part/g_part_ebr.c Thu Feb 24 10:45:41 2011 (r218993) @@ -555,7 +555,7 @@ g_part_ebr_write(struct g_part_table *ba while (baseentry != NULL && baseentry->gpe_deleted) baseentry = LIST_NEXT(baseentry, gpe_entry); - /* Wipe-out the the first EBR when there are no slices. */ + /* Wipe-out the first EBR when there are no slices. */ if (baseentry == NULL) { error = g_write_data(cp, 0, buf, pp->sectorsize); goto out; Modified: stable/7/sys/i386/i386/trap.c ============================================================================== --- stable/7/sys/i386/i386/trap.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/i386/i386/trap.c Thu Feb 24 10:45:41 2011 (r218993) @@ -254,7 +254,7 @@ trap(struct trapframe *frame) * A trap can occur while DTrace executes a probe. Before * executing the probe, DTrace blocks re-scheduling and sets * a flag in it's per-cpu flags to indicate that it doesn't - * want to fault. On returning from the the probe, the no-fault + * want to fault. On returning from the probe, the no-fault * flag is cleared and finally re-scheduling is enabled. * * If the DTrace kernel module has registered a trap handler, Modified: stable/7/sys/kern/subr_unit.c ============================================================================== --- stable/7/sys/kern/subr_unit.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/kern/subr_unit.c Thu Feb 24 10:45:41 2011 (r218993) @@ -41,7 +41,7 @@ * * If a mutex is not provided when the unit number space is created, a * default global mutex is used. The advantage to passing a mutex in, is - * that the the alloc_unrl() function can be called with the mutex already + * that the alloc_unrl() function can be called with the mutex already * held (it will not be released by alloc_unrl()). * * The allocation function alloc_unr{l}() never sleeps (but it may block on @@ -52,7 +52,7 @@ * * A userland test program is included. * - * Memory usage is a very complex function of the the exact allocation + * Memory usage is a very complex function of the exact allocation * pattern, but always very compact: * * For the very typical case where a single unbroken run of unit * numbers are allocated 44 bytes are used on i386. Modified: stable/7/sys/kern/subr_witness.c ============================================================================== --- stable/7/sys/kern/subr_witness.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/kern/subr_witness.c Thu Feb 24 10:45:41 2011 (r218993) @@ -966,7 +966,7 @@ witness_checkorder(struct lock_object *l MPASS(!mtx_owned(&w_mtx)); mtx_lock_spin(&w_mtx); /* - * If we know that the the lock we are acquiring comes after + * If we know that the lock we are acquiring comes after * the lock we most recently acquired in the lock order tree, * then there is no need for any further checks. */ Modified: stable/7/sys/kern/uipc_mbuf.c ============================================================================== --- stable/7/sys/kern/uipc_mbuf.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/kern/uipc_mbuf.c Thu Feb 24 10:45:41 2011 (r218993) @@ -280,7 +280,7 @@ mb_free_ext(struct mbuf *m) } /* - * Attach the the cluster from *m to *n, set up m_ext in *n + * Attach the cluster from *m to *n, set up m_ext in *n * and bump the refcount of the cluster. */ static void Modified: stable/7/sys/net/if_media.c ============================================================================== --- stable/7/sys/net/if_media.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/net/if_media.c Thu Feb 24 10:45:41 2011 (r218993) @@ -235,7 +235,7 @@ ifmedia_ioctl(ifp, ifr, ifm, cmd) /* * If no change, we're done. * XXX Automedia may invole software intervention. - * Keep going in case the the connected media changed. + * Keep going in case the connected media changed. * Similarly, if best match changed (kernel debugger?). */ if ((IFM_SUBTYPE(newmedia) != IFM_AUTO) && Modified: stable/7/sys/net/route.c ============================================================================== --- stable/7/sys/net/route.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/net/route.c Thu Feb 24 10:45:41 2011 (r218993) @@ -515,7 +515,7 @@ rtredirect_fib(struct sockaddr *dst, goto done; /* * Create a new entry if we just got back a wildcard entry - * or the the lookup failed. This is necessary for hosts + * or the lookup failed. This is necessary for hosts * which use routing redirects generated by smart gateways * to dynamically build the routing tables. */ Modified: stable/7/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c ============================================================================== --- stable/7/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c Thu Feb 24 10:45:41 2011 (r218993) @@ -557,7 +557,7 @@ ng_btsocket_rfcomm_connect(struct socket soclose(l2so); /* we don't need new L2CAP socket */ /* - * Check if we already have the same DLCI the the same session + * Check if we already have the same DLCI the same session */ mtx_lock(&s->session_mtx); Modified: stable/7/sys/netgraph/ng_source.c ============================================================================== --- stable/7/sys/netgraph/ng_source.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/netgraph/ng_source.c Thu Feb 24 10:45:41 2011 (r218993) @@ -603,7 +603,7 @@ ng_source_disconnect(hook_p hook) } /* - * Set sc->output_ifp to point to the the struct ifnet of the interface + * Set sc->output_ifp to point to the struct ifnet of the interface * reached via our output hook. */ static int Modified: stable/7/sys/netinet/if_ether.c ============================================================================== --- stable/7/sys/netinet/if_ether.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/netinet/if_ether.c Thu Feb 24 10:45:41 2011 (r218993) @@ -918,7 +918,7 @@ reply: /* * Also check that the node which sent the ARP packet - * is on the the interface we expect it to be on. This + * is on the interface we expect it to be on. This * avoids ARP chaos if an interface is connected to the * wrong network. */ Modified: stable/7/sys/netinet/ip_input.c ============================================================================== --- stable/7/sys/netinet/ip_input.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/netinet/ip_input.c Thu Feb 24 10:45:41 2011 (r218993) @@ -906,7 +906,7 @@ found: * segment. If it provides all of our data, drop us, otherwise * stick new segment in the proper place. * - * If some of the data is dropped from the the preceding + * If some of the data is dropped from the preceding * segment, then it's checksum is invalidated. */ if (p) { Modified: stable/7/sys/netinet/tcp_offload.h ============================================================================== --- stable/7/sys/netinet/tcp_offload.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/netinet/tcp_offload.h Thu Feb 24 10:45:41 2011 (r218993) @@ -56,7 +56,7 @@ * * It is assumed that individuals deploying TOE will want connections * to be offloaded without software changes so all connections on an - * interface providing TOE are offloaded unless the the SO_NO_OFFLOAD + * interface providing TOE are offloaded unless the SO_NO_OFFLOAD * flag is set on the socket. * * Modified: stable/7/sys/netinet/tcp_subr.c ============================================================================== --- stable/7/sys/netinet/tcp_subr.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/netinet/tcp_subr.c Thu Feb 24 10:45:41 2011 (r218993) @@ -1232,7 +1232,7 @@ tcp_ctlinput(int cmd, struct sockaddr *s mtu = tcp_minmss + sizeof(struct tcpiphdr); /* - * Only cache the the MTU if it + * Only cache the MTU if it * is smaller than the interface * or route MTU. tcp_mtudisc() * will do right thing by itself. Modified: stable/7/sys/netinet/tcp_syncache.c ============================================================================== --- stable/7/sys/netinet/tcp_syncache.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/netinet/tcp_syncache.c Thu Feb 24 10:45:41 2011 (r218993) @@ -542,7 +542,7 @@ syncache_chkrst(struct in_conninfo *inc, * used, or we are under memory pressure, a valid RST * may not find a syncache entry. In that case we're * done and no SYN|ACK retransmissions will happen. - * Otherwise the the RST was misdirected or spoofed. + * Otherwise the RST was misdirected or spoofed. */ if (sc == NULL) { if ((s = tcp_log_addrs(inc, th, NULL, NULL))) Modified: stable/7/sys/netinet/tcp_timewait.c ============================================================================== --- stable/7/sys/netinet/tcp_timewait.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/netinet/tcp_timewait.c Thu Feb 24 10:45:41 2011 (r218993) @@ -379,7 +379,7 @@ tcp_twcheck(struct inpcb *inp, struct tc } /* - * Drop the the segment if it does not contain an ACK. + * Drop the segment if it does not contain an ACK. */ if ((thflags & TH_ACK) == 0) goto drop; Modified: stable/7/sys/netinet6/in6.h ============================================================================== --- stable/7/sys/netinet6/in6.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/netinet6/in6.h Thu Feb 24 10:45:41 2011 (r218993) @@ -78,7 +78,7 @@ /* * IPv6 port allocation rules should mirror the IPv4 rules and are controlled - * by the the net.inet.ip.portrange sysctl tree. The following defines exist + * by the net.inet.ip.portrange sysctl tree. The following defines exist * for compatibility with userland applications that need them. */ #if __BSD_VISIBLE Modified: stable/7/sys/pc98/cbus/fdc.c ============================================================================== --- stable/7/sys/pc98/cbus/fdc.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/pc98/cbus/fdc.c Thu Feb 24 10:45:41 2011 (r218993) @@ -2378,7 +2378,7 @@ fdmisccmd(struct cdev *dev, u_int cmd, v /* * Set up a bio request for fdstrategy(). bio_offset is faked - * so that fdstrategy() will seek to the the requested + * so that fdstrategy() will seek to the requested * cylinder, and use the desired head. */ bp->bio_cmd = cmd; Modified: stable/7/sys/sparc64/include/iommureg.h ============================================================================== --- stable/7/sys/sparc64/include/iommureg.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/sparc64/include/iommureg.h Thu Feb 24 10:45:41 2011 (r218993) @@ -194,7 +194,7 @@ * Unfortunately, sabres on UltraSPARC IIi and IIe processors does not use * this scheme to determine the IOVA base address. Instead, bits 31-29 are * used to check against the Target Address Space register in the IIi and - * the the IOMMU is used if they hit. God knows what goes on in the IIe. + * the IOMMU is used if they hit. God knows what goes on in the IIe. * */ Modified: stable/7/sys/sparc64/sparc64/trap.c ============================================================================== --- stable/7/sys/sparc64/sparc64/trap.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/sparc64/sparc64/trap.c Thu Feb 24 10:45:41 2011 (r218993) @@ -438,7 +438,7 @@ trap_cecc(void) cache_flush(); /* Ensure the caches are still turned on (should be). */ cache_enable(PCPU_GET(impl)); - /* Clear the the error from the AFSR. */ + /* Clear the error from the AFSR. */ stxa_sync(0, ASI_AFSR, ldxa(0, ASI_AFSR)); corrected_ecc++; printf("corrected ECC error\n"); Modified: stable/7/sys/sys/aac_ioctl.h ============================================================================== --- stable/7/sys/sys/aac_ioctl.h Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/sys/sys/aac_ioctl.h Thu Feb 24 10:45:41 2011 (r218993) @@ -117,7 +117,7 @@ union aac_statrequest { /* Do the native version of the ioctls. Since the BSD encoding scheme * conflicts with the 'standard' AAC encoding scheme, the resulting numbers * will be different. The '8' comes from the fact that the previous scheme - * used 12 bits for the number, with the the 12th bit being the only set + * used 12 bits for the number, with the 12th bit being the only set * bit above bit 8. Thus the value of 8, with the lower 8 bits holding the * command number. 9 is used for the odd overflow case. */ Modified: stable/7/usr.bin/lex/misc.c ============================================================================== --- stable/7/usr.bin/lex/misc.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/usr.bin/lex/misc.c Thu Feb 24 10:45:41 2011 (r218993) @@ -707,7 +707,7 @@ const char str[]; } -/* readable_form - return the the human-readable form of a character +/* readable_form - return the human-readable form of a character * * The returned string is in static storage. */ Modified: stable/7/usr.bin/m4/gnum4.c ============================================================================== --- stable/7/usr.bin/m4/gnum4.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/usr.bin/m4/gnum4.c Thu Feb 24 10:45:41 2011 (r218993) @@ -54,7 +54,7 @@ int mimic_gnu = 0; /* * Support for include path search - * First search in the the current directory. + * First search in the current directory. * If not found, and the path is not absolute, include path kicks in. * First, -I options, in the order found on the command line. * Then M4PATH env variable Modified: stable/7/usr.bin/make/lst.c ============================================================================== --- stable/7/usr.bin/make/lst.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/usr.bin/make/lst.c Thu Feb 24 10:45:41 2011 (r218993) @@ -99,7 +99,7 @@ Lst_Append(Lst *list, LstNode *ln, void * LST_CONCLINK if should just be relinked * * Side Effects: - * New elements are created and appended the the first list. + * New elements are created and appended the first list. */ void Lst_Concat(Lst *list1, Lst *list2, int flags) Modified: stable/7/usr.bin/rpcinfo/rpcinfo.c ============================================================================== --- stable/7/usr.bin/rpcinfo/rpcinfo.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/usr.bin/rpcinfo/rpcinfo.c Thu Feb 24 10:45:41 2011 (r218993) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); /* * rpcinfo: ping a particular rpc program - * or dump the the registered programs on the remote machine. + * or dump the registered programs on the remote machine. */ /* Modified: stable/7/usr.bin/xinstall/xinstall.c ============================================================================== --- stable/7/usr.bin/xinstall/xinstall.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/usr.bin/xinstall/xinstall.c Thu Feb 24 10:45:41 2011 (r218993) @@ -492,7 +492,7 @@ install(const char *from_name, const cha * flags, except for the dump flag. * NFS does not support flags. Ignore EOPNOTSUPP flags if we're just * trying to turn off UF_NODUMP. If we're trying to set real flags, - * then warn if the the fs doesn't support it, otherwise fail. + * then warn if the fs doesn't support it, otherwise fail. */ if (!devnull && (flags & SETFLAGS || (from_sb.st_flags & ~UF_NODUMP) != to_sb.st_flags) && Modified: stable/7/usr.sbin/moused/moused.c ============================================================================== --- stable/7/usr.sbin/moused/moused.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/usr.sbin/moused/moused.c Thu Feb 24 10:45:41 2011 (r218993) @@ -931,7 +931,7 @@ main(int argc, char *argv[]) /* * We cannot continue because of error. Exit if the * program has not become a daemon. Otherwise, block - * until the the user corrects the problem and issues SIGHUP. + * until the user corrects the problem and issues SIGHUP. */ if (!background) exit(1); Modified: stable/7/usr.sbin/rpcbind/util.c ============================================================================== --- stable/7/usr.sbin/rpcbind/util.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/usr.sbin/rpcbind/util.c Thu Feb 24 10:45:41 2011 (r218993) @@ -244,7 +244,7 @@ addrmerge(struct netbuf *caller, char *s found: /* - * Construct the new address using the the address from + * Construct the new address using the address from * `bestif', and the port number from `serv_uaddr'. */ serv_nbp = uaddr2taddr(nconf, serv_uaddr); Modified: stable/7/usr.sbin/sysinstall/install.c ============================================================================== --- stable/7/usr.sbin/sysinstall/install.c Thu Feb 24 10:23:22 2011 (r218992) +++ stable/7/usr.sbin/sysinstall/install.c Thu Feb 24 10:45:41 2011 (r218993) @@ -910,7 +910,7 @@ installFixupBase(dialogMenuItem *self) vsystem("mtree -deU -f /etc/mtree/BSD.usr.dist -p /usr"); #ifdef __ia64__ - /* Move /boot to the the EFI partition and make /boot a link to it. */ + /* Move /boot to the EFI partition and make /boot a link to it. */ efi_mntpt = (EfiChunk != NULL) ? ((PartInfo *)EfiChunk->private_data)->mountpoint : NULL; if (efi_mntpt != NULL) { vsystem("if [ ! -L /boot ]; then mv /boot %s; fi", efi_mntpt); From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 11:00:50 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A57E1065673; Thu, 24 Feb 2011 11:00:50 +0000 (UTC) (envelope-from bruce@cran.org.uk) Received: from muon.cran.org.uk (unknown [IPv6:2a01:348:0:15:5d59:5c40:0:1]) by mx1.freebsd.org (Postfix) with ESMTP id B98858FC08; Thu, 24 Feb 2011 11:00:49 +0000 (UTC) Received: from muon.cran.org.uk (localhost [127.0.0.1]) by muon.cran.org.uk (Postfix) with ESMTP id 074A4E8BA7; Thu, 24 Feb 2011 11:00:46 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=cran.org.uk; h=subject :from:to:cc:in-reply-to:references:content-type:date:message-id :mime-version:content-transfer-encoding; s=mail; bh=Pj+E1TZ6S8Rr ljBjkJF0JTwrn/g=; b=Zso2KSzzMvWa2lavfF08eOxnderzVcwxlyUsjJk866mG +n/npCC/AxP7bLT5F6Ol7Ve0RCzzA7qpBIa+RJtEmYYzHfQlLnffCbk//38sNo84 MkLly7JW97ZlPlbgnfDTfHOroW3pjsODkraFpha8MT4Bz2gqhZfi15YqIp6VyZE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=cran.org.uk; h=subject:from :to:cc:in-reply-to:references:content-type:date:message-id :mime-version:content-transfer-encoding; q=dns; s=mail; b=OzUh2T iH725IMyVypkNGWmDeVRx7nkLqmBfx2JPLHIxDj+f+fVgG6T7oYewNRubQBFlpj4 GOBXMqOq7SRvxyE5CXqxBxXcAnJ4tX+aPrEyEcZnq9D1J9q1CBu4sjrNIoqJ9QD6 eSoAYM4Y5eH4LCKy2HpOc6BKlPPk94/6sJpCk= Received: from [192.168.0.10] (client-86-31-236-253.oxfd.adsl.virginmedia.com [86.31.236.253]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by muon.cran.org.uk (Postfix) with ESMTPSA id 796E5E61BD; Thu, 24 Feb 2011 11:00:45 +0000 (GMT) From: Bruce Cran To: Bruce Cran In-Reply-To: <201102241045.p1OAjfFR034792@svn.freebsd.org> References: <201102241045.p1OAjfFR034792@svn.freebsd.org> Content-Type: text/plain; charset="us-ascii" Date: Thu, 24 Feb 2011 11:00:38 +0000 Message-ID: <1298545238.2900.3.camel@core.nessbank> Mime-Version: 1.0 X-Mailer: Evolution 2.32.1 FreeBSD GNOME Team Port Content-Transfer-Encoding: 7bit Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-7@freebsd.org Subject: Re: svn commit: r218993 - in stable/7: bin/df bin/sh lib/libc/arm/gen lib/libc/ia64/gen lib/libc/powerpc/gen sys/amd64/amd64 sys/arm/xscale/i80321 sys/boot/ficl sys/cam sys/cam/scsi sys/cddl/dev/dtrace... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 11:00:50 -0000 On Thu, 2011-02-24 at 10:45 +0000, Bruce Cran wrote: > Author: brucec > Date: Thu Feb 24 10:45:41 2011 > New Revision: 218993 > URL: http://svn.freebsd.org/changeset/base/218993 > > Log: > MFC r218909: > > Fix typos - remove duplicate "the". The change to sys/gnu/fs/xfs wasn't merged because the lack of $FreeBSD$ prevents the checkin. -- Bruce Cran From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 11:03:16 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CF06106566B; Thu, 24 Feb 2011 11:03:16 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5BD0A8FC0C; Thu, 24 Feb 2011 11:03:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OB3Gh7035508; Thu, 24 Feb 2011 11:03:16 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OB3GYs035506; Thu, 24 Feb 2011 11:03:16 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102241103.p1OB3GYs035506@svn.freebsd.org> From: Bruce Cran Date: Thu, 24 Feb 2011 11:03:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218994 - stable/8/usr.sbin/fdformat X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 11:03:16 -0000 Author: brucec Date: Thu Feb 24 11:03:16 2011 New Revision: 218994 URL: http://svn.freebsd.org/changeset/base/218994 Log: MFC r218910: The FD_FORM ioctl used to ignore errors from the floppy controller; now when it encounters an error it returns an error from the ioctl. Ignore any errors when using the FD_FORM ioctl. PR: kern/103862 Modified: stable/8/usr.sbin/fdformat/fdformat.c Directory Properties: stable/8/usr.sbin/fdformat/ (props changed) Modified: stable/8/usr.sbin/fdformat/fdformat.c ============================================================================== --- stable/8/usr.sbin/fdformat/fdformat.c Thu Feb 24 10:45:41 2011 (r218993) +++ stable/8/usr.sbin/fdformat/fdformat.c Thu Feb 24 11:03:16 2011 (r218994) @@ -75,8 +75,7 @@ format_track(int fd, int cyl, int secs, f.fd_formb_secno(i) = il[i+1]; f.fd_formb_secsize(i) = secsize; } - if(ioctl(fd, FD_FORM, (caddr_t)&f) < 0) - err(EX_OSERR, "ioctl(FD_FORM)"); + (void)ioctl(fd, FD_FORM, (caddr_t)&f); } static int From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 11:04:47 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B7461065696; Thu, 24 Feb 2011 11:04:47 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7A3928FC1D; Thu, 24 Feb 2011 11:04:47 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OB4lmf035600; Thu, 24 Feb 2011 11:04:47 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OB4l8p035598; Thu, 24 Feb 2011 11:04:47 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102241104.p1OB4l8p035598@svn.freebsd.org> From: Bruce Cran Date: Thu, 24 Feb 2011 11:04:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218995 - stable/7/usr.sbin/fdformat X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 11:04:47 -0000 Author: brucec Date: Thu Feb 24 11:04:47 2011 New Revision: 218995 URL: http://svn.freebsd.org/changeset/base/218995 Log: MFC r218910: The FD_FORM ioctl used to ignore errors from the floppy controller; now when it encounters an error it returns an error from the ioctl. Ignore any errors when using the FD_FORM ioctl. PR: kern/103862 Modified: stable/7/usr.sbin/fdformat/fdformat.c Directory Properties: stable/7/usr.sbin/fdformat/ (props changed) Modified: stable/7/usr.sbin/fdformat/fdformat.c ============================================================================== --- stable/7/usr.sbin/fdformat/fdformat.c Thu Feb 24 11:03:16 2011 (r218994) +++ stable/7/usr.sbin/fdformat/fdformat.c Thu Feb 24 11:04:47 2011 (r218995) @@ -75,8 +75,7 @@ format_track(int fd, int cyl, int secs, f.fd_formb_secno(i) = il[i+1]; f.fd_formb_secsize(i) = secsize; } - if(ioctl(fd, FD_FORM, (caddr_t)&f) < 0) - err(EX_OSERR, "ioctl(FD_FORM)"); + (void)ioctl(fd, FD_FORM, (caddr_t)&f); } static int From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 11:08:23 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD525106566B; Thu, 24 Feb 2011 11:08:23 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B17518FC1C; Thu, 24 Feb 2011 11:08:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OB8NGR035754; Thu, 24 Feb 2011 11:08:23 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OB8NaQ035752; Thu, 24 Feb 2011 11:08:23 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102241108.p1OB8NaQ035752@svn.freebsd.org> From: Bruce Cran Date: Thu, 24 Feb 2011 11:08:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218996 - stable/8/sys/crypto/sha2 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 11:08:24 -0000 Author: brucec Date: Thu Feb 24 11:08:23 2011 New Revision: 218996 URL: http://svn.freebsd.org/changeset/base/218996 Log: MFC r218918: Make private functions static. PR: kern/43611 Submitted by: Matt Emmerton Modified: stable/8/sys/crypto/sha2/sha2.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/crypto/sha2/sha2.c ============================================================================== --- stable/8/sys/crypto/sha2/sha2.c Thu Feb 24 11:04:47 2011 (r218995) +++ stable/8/sys/crypto/sha2/sha2.c Thu Feb 24 11:08:23 2011 (r218996) @@ -206,9 +206,9 @@ typedef u_int64_t sha2_word64; /* Exactl * library -- they are intended for private internal visibility/use * only. */ -void SHA512_Last(SHA512_CTX*); -void SHA256_Transform(SHA256_CTX*, const sha2_word32*); -void SHA512_Transform(SHA512_CTX*, const sha2_word64*); +static void SHA512_Last(SHA512_CTX*); +static void SHA256_Transform(SHA256_CTX*, const sha2_word32*); +static void SHA512_Transform(SHA512_CTX*, const sha2_word64*); /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/ @@ -366,7 +366,7 @@ void SHA256_Init(SHA256_CTX* context) { (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \ j++ -void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { +static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 T1, *W256; int j; @@ -424,7 +424,7 @@ void SHA256_Transform(SHA256_CTX* contex #else /* SHA2_UNROLL_TRANSFORM */ -void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { +static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 T1, T2, *W256; int j; @@ -693,7 +693,7 @@ void SHA512_Init(SHA512_CTX* context) { (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \ j++ -void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { +static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 T1, *W512 = (sha2_word64*)context->buffer; int j; @@ -748,7 +748,7 @@ void SHA512_Transform(SHA512_CTX* contex #else /* SHA2_UNROLL_TRANSFORM */ -void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { +static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 T1 = 0, T2 = 0, *W512 = (sha2_word64*)context->buffer; int j; @@ -874,7 +874,7 @@ void SHA512_Update(SHA512_CTX* context, usedspace = freespace = 0; } -void SHA512_Last(SHA512_CTX* context) { +static void SHA512_Last(SHA512_CTX* context) { unsigned int usedspace; usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH; From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 11:09:41 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6CAA3106564A; Thu, 24 Feb 2011 11:09:41 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 50B8E8FC13; Thu, 24 Feb 2011 11:09:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OB9fpB035842; Thu, 24 Feb 2011 11:09:41 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OB9fIc035840; Thu, 24 Feb 2011 11:09:41 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102241109.p1OB9fIc035840@svn.freebsd.org> From: Bruce Cran Date: Thu, 24 Feb 2011 11:09:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218997 - stable/7/sys/crypto/sha2 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 11:09:41 -0000 Author: brucec Date: Thu Feb 24 11:09:41 2011 New Revision: 218997 URL: http://svn.freebsd.org/changeset/base/218997 Log: MFC r218918: Make private functions static. PR: kern/43611 Submitted by: Matt Emmerton Modified: stable/7/sys/crypto/sha2/sha2.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/crypto/sha2/sha2.c ============================================================================== --- stable/7/sys/crypto/sha2/sha2.c Thu Feb 24 11:08:23 2011 (r218996) +++ stable/7/sys/crypto/sha2/sha2.c Thu Feb 24 11:09:41 2011 (r218997) @@ -206,9 +206,9 @@ typedef u_int64_t sha2_word64; /* Exactl * library -- they are intended for private internal visibility/use * only. */ -void SHA512_Last(SHA512_CTX*); -void SHA256_Transform(SHA256_CTX*, const sha2_word32*); -void SHA512_Transform(SHA512_CTX*, const sha2_word64*); +static void SHA512_Last(SHA512_CTX*); +static void SHA256_Transform(SHA256_CTX*, const sha2_word32*); +static void SHA512_Transform(SHA512_CTX*, const sha2_word64*); /*** SHA-XYZ INITIAL HASH VALUES AND CONSTANTS ************************/ @@ -366,7 +366,7 @@ void SHA256_Init(SHA256_CTX* context) { (h) = T1 + Sigma0_256(a) + Maj((a), (b), (c)); \ j++ -void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { +static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 T1, *W256; int j; @@ -424,7 +424,7 @@ void SHA256_Transform(SHA256_CTX* contex #else /* SHA2_UNROLL_TRANSFORM */ -void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { +static void SHA256_Transform(SHA256_CTX* context, const sha2_word32* data) { sha2_word32 a, b, c, d, e, f, g, h, s0, s1; sha2_word32 T1, T2, *W256; int j; @@ -693,7 +693,7 @@ void SHA512_Init(SHA512_CTX* context) { (h) = T1 + Sigma0_512(a) + Maj((a), (b), (c)); \ j++ -void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { +static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 T1, *W512 = (sha2_word64*)context->buffer; int j; @@ -748,7 +748,7 @@ void SHA512_Transform(SHA512_CTX* contex #else /* SHA2_UNROLL_TRANSFORM */ -void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { +static void SHA512_Transform(SHA512_CTX* context, const sha2_word64* data) { sha2_word64 a, b, c, d, e, f, g, h, s0, s1; sha2_word64 T1 = 0, T2 = 0, *W512 = (sha2_word64*)context->buffer; int j; @@ -874,7 +874,7 @@ void SHA512_Update(SHA512_CTX* context, usedspace = freespace = 0; } -void SHA512_Last(SHA512_CTX* context) { +static void SHA512_Last(SHA512_CTX* context) { unsigned int usedspace; usedspace = (context->bitcount[0] >> 3) % SHA512_BLOCK_LENGTH; From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 19:11:28 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50C3C106566B; Thu, 24 Feb 2011 19:11:28 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3E1478FC14; Thu, 24 Feb 2011 19:11:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OJBSZZ056318; Thu, 24 Feb 2011 19:11:28 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OJBS1c056316; Thu, 24 Feb 2011 19:11:28 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102241911.p1OJBS1c056316@svn.freebsd.org> From: Hiroki Sato Date: Thu, 24 Feb 2011 19:11:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219006 - stable/8/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 19:11:28 -0000 Author: hrs Date: Thu Feb 24 19:11:27 2011 New Revision: 219006 URL: http://svn.freebsd.org/changeset/base/219006 Log: Add more relnotes item: a carp(4) and linkstate change issue is fixed. Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Thu Feb 24 18:13:53 2011 (r219005) +++ stable/8/release/doc/en_US.ISO8859-1/relnotes/article.sgml Thu Feb 24 19:11:27 2011 (r219006) @@ -610,6 +610,12 @@ Network Protocols + An issue in the &man.carp.4; pseudo + interface and linkstate changes of the underlying interfaces + has been fixed. This happened when a &man.carp.4; interface + was created before the underlying interface and its + linkstate became UP. + A bug in the &man.ipfw.4; packet filter subsystem has been fixed. The &man.sysctl.8; variable net.inet.ip.fw.one_pass did not From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 19:22:04 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E10D7106566C; Thu, 24 Feb 2011 19:22:04 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CCC4B8FC13; Thu, 24 Feb 2011 19:22:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OJM4xJ056854; Thu, 24 Feb 2011 19:22:04 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OJM4V4056852; Thu, 24 Feb 2011 19:22:04 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102241922.p1OJM4V4056852@svn.freebsd.org> From: Hiroki Sato Date: Thu, 24 Feb 2011 19:22:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219007 - stable/7/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 19:22:05 -0000 Author: hrs Date: Thu Feb 24 19:22:04 2011 New Revision: 219007 URL: http://svn.freebsd.org/changeset/base/219007 Log: Add relnotes items for 7.4R. Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Thu Feb 24 19:11:27 2011 (r219006) +++ stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Thu Feb 24 19:22:04 2011 (r219007) @@ -4,11 +4,6 @@ %release; - - - - - ]>
@@ -20,16 +15,7 @@ $FreeBSD$ - 2000 - 2001 - 2002 - 2003 - 2004 - 2005 - 2006 - 2007 - 2008 - 2009 + 2011 The &os; Documentation Project @@ -124,102 +110,580 @@ Security Advisories - + Problems described in the following security advisories have + been fixed. For more information, consult the individual + advisories available from + . + + + + + + + + + Advisory + Date + Topic + + + + + + SA-10:08.bzip2 + 20 September 2010 + Integer overflow in bzip2 decompression + + + SA-10:09.pseudofs + 10 October 2010 + Spurious mutex unlock + + + SA-10:10.openssl + 29 November 2010 + OpenSSL multiple vulnerabilities + + + + Kernel Changes - - - - Boot Loader Changes - - - + &os;/sparc64 now supports reservation-based + physical memory allocation which provides better + performance. + + &os;/sparc64 now supports UltraSPARC IV, IV+, and + SPARC64 V CPUs. + + The &man.alq.9; support has been improved. The + alq_writen() and + alq_getn() KPIs have been extended to + support variable length messages, which is enabled at ALQ + creation time depending on the arguments passed to + alq_open(). Also, the + ALQ_NOACTIVATE and + ALQ_ORDERED flags have been added to allow + ALQ consumers to have more control over I/O scheduling and + resource acquisition respectively. These extensions are fully + backward compatible. + + The &man.alq.9; support is now provided as a kernel module + alq.ko. + + The &os; &man.memguard.9; framework has been improved to + make it able to detect use-after-free of allocated memories + over a longer time. For more details, see &man.memguard.9; + manual page. + + The following + &man.sysctl.8; variables have been added: + vm.kmem_map_size for the current kmem map + size and vm.kmem_map_free for largest + contiguous free range in kmem map. Hardware Support + The &man.ichwd.4; driver now supports + Intel NM10 Express chipset watchdog timer. + + The qpi(4) pseudo bus driver has been + added. This supports extra PCI buses on Intel QPI chipsets + where various hardware such as memory controllers for each + socket is connected. + Multimedia Support - + The &man.acpi.video.4; driver has been updated. LCD + brightness control notify handler has been + implemented. + + The &man.acpi.sony.4; helper driver now supports + default display brightness, wired LAN power, and bass + gain. Network Interface Support - - + The &man.alc.4; driver now supports Atheros + AR8151/AR8152 PCIe Gigabit/Fast Ethernet + controllers. + + The TX interrupt moderation timer in + the &man.alc.4; driver has been reduced from 50ms to 1ms. + The 50ms timer resulted in a poor UDP performance. + + The &man.bge.4; driver now supports + BCM5718 x2 PCI Express dual-port gigabit Ethernet + controller family. This family is the successor to the + BCM5714/BCM5715 family and supports IPv4/IPv6 checksum + offloading, TSO, VLAN hardware tagging, jumbo frames, + MSI/MSIX, IOV, RSS and TSS. The current version of the + driver supports all hardware features except IOV and + RSS/TSS. + + The &man.bge.4; driver now supports hardware MAC + statistics in controller's internal memory for BCM5705 or + newer Broadcom controllers. These counters can be + accessed via &man.sysctl.8; variable + dev.bge.N.stats.* + and provide useful information to diagnose driver + issues. + + A long-standing bug of ASF heartbeat sending in the + &man.bge.4; driver has been fixed. + + UDP checksum offloading in the + &man.bge.4; driver has been disabled by default. This is + because Broadcom controllers have a bug which can generate + UDP datagrams with checksum value 0 + when TX UDP checksum offloading is enabled. The checksum + offloading can be enabled by using the following loader + tunable: + + dev.bge.N.forced_udpcsum + + A bug in the &man.bge.4; driver which prevented TSO + from working in BCM57780 has been fixed. + + A bug in the &man.bge.4; driver that + could lead to poor performance on a system with more than + 4 GB RAM has been fixed. The cause was that all of + Broadcom controllers except the BCM5755 and later have a + bug in 4 GB-boundary DMA processing and used the bounce + buffer in an inefficient way. + + The &man.cxgb.4; driver now supports hardware + filtering based on inspection of L2/L3/L4 headers. + Filtering based on source IP address, destination IP + address, source port number, destination port number, + 802.1q VLAN frame tag, UDP, TCP, and MAC address is + possible. The configuration can be done by the + cxgbtool(8) utility. Note that cxgbtool(8) is in + src/usr.sbin/cxgbtool but not + compiled by default. + + The &man.em.4; driver has been updated to version + 7.1.9. + + The &man.em.4; and &man.igb.4; drivers now provide + statistics counters as &man.sysctl.8; MIB objects. + + The &man.fxp.4; driver now exports the hardware MAC + statistics via &man.sysctl.8; variables. + + The &man.fxp.4; driver now supports + TSO over VLAN on i82550 and i82551 controllers. + + The &man.igb.4; driver has been updated to version + 2.0.7. + + The &man.miibus.4; has been rewritten for the generic + IEEE 802.3 annex 31B full duplex flow control support. + The &man.alc.4;, &man.bge.4;, &man.bce.4;, &man.cas.4;, + &man.fxp.4;, &man.gem.4;, &man.jme.4;, &man.msk.4;, + &man.nfe.4;, &man.re.4;, &man.stge.4;, and &man.xl.4; + drivers along with atphy(4), bmtphy(4), brgphy(4), + e1000phy(4), gentbi(4), inphy(4), ip1000phy(4), jmphy(4), + nsgphy(4), nsphyter(4), and &man.rgephy.4; have been + updated to support flow control via this facility. + + The &man.msk.4; driver has been improved: + + + + It now supports 88E8059 (Marvell Yukon Optima) devices. + + + + A rudimentary interrupt moderation with + programmable countdown timer register has been + implemented. The default parameter of the holdoff + time is 100us and this can be changed via sysctl + variable + dev.mskc.0.int_holdoff. + Note that the interrupt moderation is shared resource + on a dual-port controllers and it is impossible to use + separate interrupt moderation values for each + port. + + + + A bug in the &man.mxge.4; driver that prevented TSO + from working has been fixed. + + The &man.nfe.4; driver now supports WoL (Wake on + LAN). + + The &man.re.4; driver now uses 2048 + as PCIe Maximum Read Request Size. This improves bulk + transfer performance. + + The &man.re.4; driver now supports 64-bit DMA + addressing for RTL810xE/RTL8168/RTL8111 PCIe + controllers. + + The &man.re.4; driver now supports hardware interrupt + moderation of TX completion interrupts on RTL8169/RTL8168 + controllers. + + The &man.rl.4; driver now supports WoL (Wake on LAN) + on RTL8139B or newer controllers. + + The &man.rl.4; driver now supports a device hint to + change a way of register access. Although some newer + RTL8139 controllers support memory-mapped register access, + it is difficult to detect the support automatically. For + this reason the driver uses I/O mapping by default and + provides the following device hint. If it is set to + 0, the driver uses memory mapping for + register access. + + hint.rl.N.prefer_iomap="0" + + Note that the default value is 1. + + The &man.rl.4; driver has improved interrupt handling. + It now has better TX performance under high RX + load. + + The &man.sk.4; driver now disables TX checksum + offloading by default. This is because some revisions of + the Yukon controller generate corrupted frames. The + checksum offloading can be enabled manually by using + option in the &man.ifconfig.8; + utility. + + A bug in the &man.sk.4; driver has been fixed. It did + not program the station address for Yukon controllers and + overriding the station address with &man.ifconfig.8; was + not possible. + + The &man.sge.4; driver for Silicon Integrated Systems + SiS190/191 Fast/Gigabit Ethernet has been added. This + supports TSO and TSO over VLAN. + + The &man.sis.4; driver now supports WoL (Wake on LAN) + on NS DP8315 controller. + + A tunable + dev.sis.N.manual_pad + for the &man.sis.4; driver has been added. This controls + whether padding with 0x00 for short frames is done by CPU, + rather than the controller. The reason why this tunable + has been added is that NS DP83815/DP83816 pads them with + 0xff though RFC 1042 specifies it should be 0x00. The + tunable is disabled by default, which means padding with + 0xff is used because padding with 0x00 by software needs + extra CPU cycles. Enabling manual_pad, + by setting this &man.sysctl.8; variable to a non-zero + value, forces the use of software padding. + + The &man.ste.4; driver now supports a device hint to + change the device register access mode. The driver uses + memory-mapped register access by default, but this caused + stability problems with some old IC Plus Corp (formerly + Sundace) controllers. The following device hint makes the + driver use I/O mapping for register access: + + hint.ste.N.prefer_iomap="1" + + The &man.xl.4; driver now supports WoL (Wake on LAN). + Note that not all controllers support this functionality + and some need an additional remote wakeup cable. Network Protocols - - + An issue in the &man.carp.4; pseudo interface and + linkstate changes of the underlying interfaces has been + fixed. This happened when a &man.carp.4; interface was + created before the underlying interface and its linkstate + became UP. + + A new loader tunable + net.link.ifqmaxlen has been added. It + specifies the default value of send interface queue length. + The default value for this parameter is + 50. + + The &os; NFS subsystem now supports a timeout for the + negative name cache entries in the client. This avoids a + bogus negative name cache entry from persisting forever when + another client creates an entry with the same name within + the same NFS server time of day clock tick. A system-wide + &man.sysctl.8; sysctl variable + vfs.nfs.negative_name_timeout can be used + to adjust the timeout. Setting this variable to + 0 disables negative name caching. + + A new &man.netgraph.4; node &man.ng.patch.4; has been + added. This performs data modification of packets passing + through. Modifications are restricted to a subset of C + language operations on unsigned integers of 8, 16, 32 or + 64-bit size. + + The TCP initial window increase in RFC 3390 which can be + controlled by a &man.sysctl.8; variable + net.inet.tcp.rfc3390 now reduces the + congestion window to the restart window if a TCP connection + has been idle for one retransmit timeout or more. For more + details, see RFC 5681 Section 4.1. + + A bug in &os; TCP Path MTU discovery which could lead to + a wrong calculation for an MTU smaller than 256 octets has + been fixed. Note that this bug did not affect MTUs equal to + or larger than 256 octets. + + The &man.siftr.4;, Statistical + Information For TCP Research (SIFTR) kernel module has been + added. This is a facility that logs a range of statistics + on active TCP connections to a log file. It provides the + ability to make highly granular measurements of TCP + connection state, aimed at system administrators, developers + and researchers. + + The &os; TCP reassembly implementation has been + improved. A long-standing accounting bug affecting SMP + systems has been fixed and the + net.inet.tcp.reass.maxqlen &man.sysctl.8; + variable has been retired in favor of a per-connection + dynamic limit based on the receive socket buffer size. &os; + receivers now handle packet loss (particularly losses caused + by queue overflows) significantly better than before which + improves connection throughput. + + The &man.tun.4; pseudo interface driver now supports + explicit UP/DOWN linkstate. + + The &man.vlan.4; pseudo interface now supports TSO (TCP + Segmentation Offloading). The capability flag is named as + IFCAP_VLAN_HWTSO and it is separated from + IFCAP_VLAN_HWTAGGING. The &man.age.4;, + &man.alc.4;, &man.ale.4;, &man.bce.4;, &man.bge.4;, + &man.cxgb.4;, &man.jme.4;, &man.re.4;, and &man.mxge.4; + driver support this feature. Disks and Storage - + The &man.arcmsr.4; driver has been updated to version + 1.20.00.19. + + The &man.ata.4; driver now supports + spindown facility of ATA disks. The + &man.atacontrol.8; utility has a new subcommand + spindown to support this from + userland. + + The &man.gconcat.8; GEOM class now supports kernel crash + dump. The dumping is performed to the component where a + dump partition begins. + + The &man.gmultipath.8; utility now supports + destroy, rotate, + getactive commands. + The &man.ispfw.4;, the firmware for &man.isp.4; driver + has been added. + + The &man.twa.4; driver has been updated. The version + number is 3.70.05.010. File Systems - ZFS has been updated from version 6 to version 13. - This update includes numerous new ZFS features, such as - permitting non-root users to perform - some administrative functions, supporting additional disks - for caching or the ZFS Intent Log, and partial &man.chflags.2; - support. It also includes some &os;-specific additions, - such as booting from ZFS file systems, removal of ARC - size limitations, ARC backpressure (which allows ZFS to work - without tunables on &arch.amd64;), and many bugfixes. + The inode number handling in &man.ffs.7; file system is + now unsigned. Previously some large inode numbers can be + treated as negative, and this issue shows up at file systems + with the size of more than 16Tb in 16k block case. The + &man.newfs.8; utility never create a file system with more + than 2^32 inodes by cutting back on the number of inodes per + cylinder group if necessary to stay under the limit. + + A possible deadlock of zfs receive + has been fixed. Userland Changes - + The &man.arp.8; utility has been improved. It now runs + faster even when a single interface has a number of + aliases. + + A bug in the &man.b64decode.1; utility that prevented an + option from handling arbitrary breaks in a + base64 encoded string has been fixed. + + The &man.chgrp.1; and &man.chown.8; now support a + flag to make it not traverse across + multiple mount points for the recursive operation. + + The &man.cp.1; now supports a flag to + make it not traverse across multiple mount points for the + recursive operation. + + The &man.dhclient.8; utility now reports a reason for + exiting and the 10-second period in which the &man.dhclient.8; + ignores routing messages has been changed to start just after + dhclient-script starts instead of just + after it finished. This change fixes a symptom that + &man.dhclient.8; silently exits under a certain + condition. + + A bug in &man.find.1; utility has been fixed. An option + was interpreted as the same as + . + + The &man.tftp.1; and &man.tftpd.8; utilities have been + improved for better interoperability and they now support RFC + 1350, 2347, 2348, 2349, and 3617. + + An accuracy issue in the &man.jn.3; and &man.jnf.3; + functions in libm has been fixed. + + The &man.indent.1; utility now supports a + flag to treat all + _t-suffixed identifiers as types. + + The option in the &man.mount.8; + utility now displays the rw mount option + correctly as in the &man.fstab.5; format. + + The &man.ncal.1; utility has been updated. The option + has been replaced with + and . + Options to show previous, current and next + month, and to show months + after current month have been added. The option now prints only the + month, not the whole year. + + An issue in the &man.newfs.8; utility has been fixed. A + UFS1 file system created with 64KB blocksize was incorrectly + recognized as one with a broken superblock. This is because + the &os; kernel checks a partition first for a UFS2 superblock + at 64KB offset while it is possible that a UFS1 file systems + with 64KB blocksize has an alternative superblock at the same + location. For example, a file system created by + newfs -U -O 1 -b 65536 -f 8192 could lead + to this symptom. + + The &man.newsyslog.8; utility does not consider + non-existence of a PID file as an error now. A new flag + reverts it to the old behavior. + + The &man.newsyslog.8; utility now supports an option to override + the default &man.syslogd.8; PID file. + + The &man.pmcstat.8; utility now supports a file and a + network socket as a top source. A new option specifies to send + log output to filename, and another + new option specifies to + receive events from filename. For + a socket, the filename is in a form + of ipaddr:port. This allows top + monitoring over TCP on a system with no local symbols, for + example. + + The &man.powerd.8; utility now supports an and to control the + minimum and maximum frequency, respectively. + + The &man.ruptime.1; utility now displays hostnames longer + than 12 characters. + + The &man.stat.1; utility now supports + %Sf output specifier to display the file + flags symbolically. + + The &man.sysctl.8; utility now supports a + flag to ignore failures while retrieving + individual OIDs. This allows the same list of OIDs to be + passed to &man.sysctl.8; across different systems where + particular OIDs may not exist, and still get as much + information as possible from them. <filename>/etc/rc.d</filename> Scripts - + The &man.rc.conf.5; now supports a + firewall_coscripts variable. This should + contain a list of commands which should be executed after + firewall starts or stops. + + The rc.d/tmp script now uses a + unique directory name prefixed with + /tmp/.diskless instead of + /tmp/.diskless itself. This fixes an + issue when /tmp/.diskless exists before + the script runs. Contributed Software - sendmail has been updated from - version 8.14.3 to version 8.14.4. - + ISC BIND has been updated to + version 9.4-ESV-R4. - - Ports/Packages Collection Infrastructure + The GNU &man.cpio.1; program has been updated to version + 2.8. - + The &man.less.1; program has been updated to version + v436. - + The netcat program has been + updated to version 4.8. - - Release Engineering and Integration + OpenSSL has been updated to + version 0.9.8q. + + The &man.tcsh.1; program has been updated to version + 6.17.00. - + The timezone database has been updated to the + tzdata2010o release. - - Documentation + + Release Engineering and Integration - + The &man.sysinstall.8; utility now uses the following + numbers for default and minimum partition sizes: 1GB for + /, 4GB for /var, and + 1GB for /tmp. + + The supported version of the + GNOME desktop environment + (x11/gnome2) has been + updated to 2.32.1. + + The supported version of the + KDE desktop environment (x11/kde4) has been updated to + 4.5.5. From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 19:22:59 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A98411065674; Thu, 24 Feb 2011 19:22:59 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 971F88FC18; Thu, 24 Feb 2011 19:22:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OJMx3W056916; Thu, 24 Feb 2011 19:22:59 GMT (envelope-from hrs@svn.freebsd.org) Received: (from hrs@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OJMxJG056914; Thu, 24 Feb 2011 19:22:59 GMT (envelope-from hrs@svn.freebsd.org) Message-Id: <201102241922.p1OJMxJG056914@svn.freebsd.org> From: Hiroki Sato Date: Thu, 24 Feb 2011 19:22:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219008 - stable/7/release/doc/en_US.ISO8859-1/relnotes X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 19:22:59 -0000 Author: hrs Date: Thu Feb 24 19:22:59 2011 New Revision: 219008 URL: http://svn.freebsd.org/changeset/base/219008 Log: Fix a typo. Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Modified: stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml ============================================================================== --- stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Thu Feb 24 19:22:04 2011 (r219007) +++ stable/7/release/doc/en_US.ISO8859-1/relnotes/article.sgml Thu Feb 24 19:22:59 2011 (r219008) @@ -334,7 +334,7 @@ The &man.re.4; driver now supports hardware interrupt moderation of TX completion interrupts on RTL8169/RTL8168 - controllers. + controllers. The &man.rl.4; driver now supports WoL (Wake on LAN) on RTL8139B or newer controllers. From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 20:44:12 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 117FD10656A4; Thu, 24 Feb 2011 20:44:12 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F3C418FC16; Thu, 24 Feb 2011 20:44:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OKiBH3060279; Thu, 24 Feb 2011 20:44:11 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OKiBpB060277; Thu, 24 Feb 2011 20:44:11 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201102242044.p1OKiBpB060277@svn.freebsd.org> From: Ken Smith Date: Thu, 24 Feb 2011 20:44:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219009 - stable/8/sys/conf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 20:44:12 -0000 Author: kensmith Date: Thu Feb 24 20:44:11 2011 New Revision: 219009 URL: http://svn.freebsd.org/changeset/base/219009 Log: 8.2-RELEASE has been announced, shift to -STABLE. Modified: stable/8/sys/conf/newvers.sh Modified: stable/8/sys/conf/newvers.sh ============================================================================== --- stable/8/sys/conf/newvers.sh Thu Feb 24 19:22:59 2011 (r219008) +++ stable/8/sys/conf/newvers.sh Thu Feb 24 20:44:11 2011 (r219009) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="8.2" -BRANCH="PRERELEASE" +BRANCH="STABLE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 21:19:31 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13A0C1065672; Thu, 24 Feb 2011 21:19:31 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 022F88FC1A; Thu, 24 Feb 2011 21:19:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1OLJUGE061866; Thu, 24 Feb 2011 21:19:30 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1OLJULc061864; Thu, 24 Feb 2011 21:19:30 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201102242119.p1OLJULc061864@svn.freebsd.org> From: Ken Smith Date: Thu, 24 Feb 2011 21:19:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219010 - stable/7/sys/conf X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 21:19:31 -0000 Author: kensmith Date: Thu Feb 24 21:19:30 2011 New Revision: 219010 URL: http://svn.freebsd.org/changeset/base/219010 Log: 7.4-RELEASE has been announced, shift to -STABLE. Modified: stable/7/sys/conf/newvers.sh Modified: stable/7/sys/conf/newvers.sh ============================================================================== --- stable/7/sys/conf/newvers.sh Thu Feb 24 20:44:11 2011 (r219009) +++ stable/7/sys/conf/newvers.sh Thu Feb 24 21:19:30 2011 (r219010) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="7.4" -BRANCH="PRERELEASE" +BRANCH="STABLE" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 23:43:56 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8267B106566C; Thu, 24 Feb 2011 23:43:56 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 712348FC0C; Thu, 24 Feb 2011 23:43:56 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1ONhuiW068334; Thu, 24 Feb 2011 23:43:56 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1ONhuoA068332; Thu, 24 Feb 2011 23:43:56 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102242343.p1ONhuoA068332@svn.freebsd.org> From: Doug Barton Date: Thu, 24 Feb 2011 23:43:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219016 - stable/8/etc/namedb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 23:43:56 -0000 Author: dougb Date: Thu Feb 24 23:43:56 2011 New Revision: 219016 URL: http://svn.freebsd.org/changeset/base/219016 Log: MFC r218753: Remove in-addr.arpa from the list of zones it is possible to slave locally MFC r218865: Add a note about AXFR of important zones being available from ICANN Modified: stable/8/etc/namedb/named.conf Directory Properties: stable/8/etc/ (props changed) Modified: stable/8/etc/namedb/named.conf ============================================================================== --- stable/8/etc/namedb/named.conf Thu Feb 24 22:59:24 2011 (r219015) +++ stable/8/etc/namedb/named.conf Thu Feb 24 23:43:56 2011 (r219016) @@ -91,6 +91,11 @@ zone "." { type hint; file "/etc/namedb/ To use this mechanism, uncomment the entries below, and comment the hint zone above. + + As documented at http://dns.icann.org/services/axfr/ these zones: + "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET + are availble for AXFR from these servers on IPv4 and IPv6: + xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ /* zone "." { @@ -109,14 +114,6 @@ zone "arpa" { }; notify no; }; -zone "in-addr.arpa" { - type slave; - file "/etc/namedb/slave/in-addr.arpa.slave"; - masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. - }; - notify no; -}; */ /* Serving the following zones locally will prevent any queries From owner-svn-src-stable@FreeBSD.ORG Thu Feb 24 23:45:14 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A5421065674; Thu, 24 Feb 2011 23:45:14 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2937C8FC28; Thu, 24 Feb 2011 23:45:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1ONjELD068471; Thu, 24 Feb 2011 23:45:14 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1ONjEM0068469; Thu, 24 Feb 2011 23:45:14 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102242345.p1ONjEM0068469@svn.freebsd.org> From: Doug Barton Date: Thu, 24 Feb 2011 23:45:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219017 - stable/7/etc/namedb X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Feb 2011 23:45:14 -0000 Author: dougb Date: Thu Feb 24 23:45:13 2011 New Revision: 219017 URL: http://svn.freebsd.org/changeset/base/219017 Log: MFC r218753: Remove in-addr.arpa from the list of zones it is possible to slave locally MFC r218865: Add a note about AXFR of important zones being available from ICANN Modified: stable/7/etc/namedb/named.conf Directory Properties: stable/7/etc/ (props changed) Modified: stable/7/etc/namedb/named.conf ============================================================================== --- stable/7/etc/namedb/named.conf Thu Feb 24 23:43:56 2011 (r219016) +++ stable/7/etc/namedb/named.conf Thu Feb 24 23:45:13 2011 (r219017) @@ -91,6 +91,11 @@ zone "." { type hint; file "/etc/namedb/ To use this mechanism, uncomment the entries below, and comment the hint zone above. + + As documented at http://dns.icann.org/services/axfr/ these zones: + "." (the root), ARPA, IN-ADDR.ARPA, IP6.ARPA, and ROOT-SERVERS.NET + are availble for AXFR from these servers on IPv4 and IPv6: + xfr.lax.dns.icann.org, xfr.cjr.dns.icann.org */ /* zone "." { @@ -109,14 +114,6 @@ zone "arpa" { }; notify no; }; -zone "in-addr.arpa" { - type slave; - file "/etc/namedb/slave/in-addr.arpa.slave"; - masters { - 192.5.5.241; // F.ROOT-SERVERS.NET. - }; - notify no; -}; */ /* Serving the following zones locally will prevent any queries From owner-svn-src-stable@FreeBSD.ORG Fri Feb 25 14:54:58 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 397441065672; Fri, 25 Feb 2011 14:54:58 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 274A18FC08; Fri, 25 Feb 2011 14:54:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PEswTu068295; Fri, 25 Feb 2011 14:54:58 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PEswS1068293; Fri, 25 Feb 2011 14:54:58 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201102251454.p1PEswS1068293@svn.freebsd.org> From: Jilles Tjoelker Date: Fri, 25 Feb 2011 14:54:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219032 - stable/8/bin/test X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 14:54:58 -0000 Author: jilles Date: Fri Feb 25 14:54:57 2011 New Revision: 219032 URL: http://svn.freebsd.org/changeset/base/219032 Log: MFC r218724: test: Note that this is used both as a normal program and a shell builtin. Modified: stable/8/bin/test/test.c Directory Properties: stable/8/bin/test/ (props changed) Modified: stable/8/bin/test/test.c ============================================================================== --- stable/8/bin/test/test.c Fri Feb 25 13:59:59 2011 (r219031) +++ stable/8/bin/test/test.c Fri Feb 25 14:54:57 2011 (r219032) @@ -9,6 +9,10 @@ * * This program is in the Public Domain. */ +/* + * Important: This file is used both as a standalone program /bin/test and + * as a builtin for /bin/sh (#define SHELL). + */ #include __FBSDID("$FreeBSD$"); From owner-svn-src-stable@FreeBSD.ORG Fri Feb 25 14:56:07 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 95FE2106566C; Fri, 25 Feb 2011 14:56:07 +0000 (UTC) (envelope-from jilles@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 83C9E8FC08; Fri, 25 Feb 2011 14:56:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PEu7e9068700; Fri, 25 Feb 2011 14:56:07 GMT (envelope-from jilles@svn.freebsd.org) Received: (from jilles@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PEu7iG068697; Fri, 25 Feb 2011 14:56:07 GMT (envelope-from jilles@svn.freebsd.org) Message-Id: <201102251456.p1PEu7iG068697@svn.freebsd.org> From: Jilles Tjoelker Date: Fri, 25 Feb 2011 14:56:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219033 - stable/7/bin/test X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 14:56:07 -0000 Author: jilles Date: Fri Feb 25 14:56:06 2011 New Revision: 219033 URL: http://svn.freebsd.org/changeset/base/219033 Log: MFC r218724: test: Note that this is used both as a normal program and a shell builtin. Modified: stable/7/bin/test/test.c Directory Properties: stable/7/bin/test/ (props changed) Modified: stable/7/bin/test/test.c ============================================================================== --- stable/7/bin/test/test.c Fri Feb 25 14:54:57 2011 (r219032) +++ stable/7/bin/test/test.c Fri Feb 25 14:56:06 2011 (r219033) @@ -9,6 +9,10 @@ * * This program is in the Public Domain. */ +/* + * Important: This file is used both as a standalone program /bin/test and + * as a builtin for /bin/sh (#define SHELL). + */ #include __FBSDID("$FreeBSD$"); From owner-svn-src-stable@FreeBSD.ORG Fri Feb 25 15:32:45 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27517106566C; Fri, 25 Feb 2011 15:32:45 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 11F2D8FC1A; Fri, 25 Feb 2011 15:32:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PFWj4K080263; Fri, 25 Feb 2011 15:32:45 GMT (envelope-from netchild@svn.freebsd.org) Received: (from netchild@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PFWjVU080261; Fri, 25 Feb 2011 15:32:45 GMT (envelope-from netchild@svn.freebsd.org) Message-Id: <201102251532.p1PFWjVU080261@svn.freebsd.org> From: Alexander Leidinger Date: Fri, 25 Feb 2011 15:32:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219034 - in stable/8: . contrib/bsnmp/snmpd contrib/top contrib/xz gnu/usr.bin lib/libusb release/picobsd/floppy.tree/sbin sbin/geom/class/sched tools/regression/lib/msun tools/regress... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 15:32:45 -0000 Author: netchild Date: Fri Feb 25 15:32:44 2011 New Revision: 219034 URL: http://svn.freebsd.org/changeset/base/219034 Log: MFC r216591: Suggest to run the delete-old target after the second mergemaster. If you run it before, your rc scripts may still reference old files/directories and if you are in the unlucky situation to have triggered a reboot (intentionally or not) between the delete-old run and the mergemaster, your system may not start anymore. While I'm here, give a hint about delete-old-libs. Noticed by: bcr (luckily in a discussion and not by getting hit by this) Modified: stable/8/UPDATING (contents, props changed) Directory Properties: stable/8/ (props changed) stable/8/COPYRIGHT (props changed) stable/8/Makefile (props changed) stable/8/Makefile.inc1 (props changed) stable/8/ObsoleteFiles.inc (props changed) stable/8/bin/ (props changed) stable/8/bin/chio/ (props changed) stable/8/bin/chmod/ (props changed) stable/8/bin/cp/ (props changed) stable/8/bin/csh/ (props changed) stable/8/bin/date/ (props changed) stable/8/bin/df/ (props changed) stable/8/bin/echo/ (props changed) stable/8/bin/ed/ (props changed) stable/8/bin/expr/ (props changed) stable/8/bin/getfacl/ (props changed) stable/8/bin/kenv/ (props changed) stable/8/bin/kill/ (props changed) stable/8/bin/ln/ (props changed) stable/8/bin/ls/ (props changed) stable/8/bin/mv/ (props changed) stable/8/bin/pax/ (props changed) stable/8/bin/pkill/ (props changed) stable/8/bin/ps/ (props changed) stable/8/bin/pwait/ (props changed) stable/8/bin/setfacl/ (props changed) stable/8/bin/sh/ (props changed) stable/8/bin/sleep/ (props changed) stable/8/bin/test/ (props changed) stable/8/cddl/compat/opensolaris/ (props changed) stable/8/cddl/contrib/opensolaris/ (props changed) stable/8/cddl/lib/ (props changed) stable/8/cddl/lib/libnvpair/ (props changed) stable/8/cddl/lib/libzpool/ (props changed) stable/8/cddl/usr.bin/ (props changed) stable/8/cddl/usr.sbin/ (props changed) stable/8/contrib/ (props changed) stable/8/contrib/bind9/ (props changed) stable/8/contrib/binutils/ (props changed) stable/8/contrib/bsnmp/ (props changed) stable/8/contrib/bsnmp/snmpd/bsnmpd.1 (props changed) stable/8/contrib/bzip2/ (props changed) stable/8/contrib/com_err/ (props changed) stable/8/contrib/csup/ (props changed) stable/8/contrib/ee/ (props changed) stable/8/contrib/expat/ (props changed) stable/8/contrib/file/ (props changed) stable/8/contrib/gcc/ (props changed) stable/8/contrib/gdb/ (props changed) stable/8/contrib/gdtoa/ (props changed) stable/8/contrib/groff/ (props changed) stable/8/contrib/ipfilter/ (props changed) stable/8/contrib/less/ (props changed) stable/8/contrib/libpcap/ (props changed) stable/8/contrib/ncurses/ (props changed) stable/8/contrib/netcat/ (props changed) stable/8/contrib/ntp/ (props changed) stable/8/contrib/nvi/ (props changed) stable/8/contrib/one-true-awk/ (props changed) stable/8/contrib/openbsm/ (props changed) stable/8/contrib/openpam/ (props changed) stable/8/contrib/pf/ (props changed) stable/8/contrib/sendmail/ (props changed) stable/8/contrib/tcp_wrappers/ (props changed) stable/8/contrib/tcpdump/ (props changed) stable/8/contrib/tcsh/ (props changed) stable/8/contrib/telnet/ (props changed) stable/8/contrib/top/ (props changed) stable/8/contrib/top/install-sh (props changed) stable/8/contrib/traceroute/ (props changed) stable/8/contrib/wpa/ (props changed) stable/8/contrib/xz/ (props changed) stable/8/contrib/xz/AUTHORS (props changed) stable/8/contrib/xz/COPYING (props changed) stable/8/contrib/xz/ChangeLog (props changed) stable/8/contrib/xz/FREEBSD-Xlist (props changed) stable/8/contrib/xz/FREEBSD-upgrade (props changed) stable/8/contrib/xz/README (props changed) stable/8/contrib/xz/THANKS (props changed) stable/8/contrib/xz/TODO (props changed) stable/8/contrib/xz/po/ (props changed) stable/8/contrib/xz/src/ (props changed) stable/8/crypto/heimdal/ (props changed) stable/8/crypto/openssh/ (props changed) stable/8/crypto/openssl/ (props changed) stable/8/etc/ (props changed) stable/8/games/factor/ (props changed) stable/8/games/fortune/ (props changed) stable/8/games/grdc/ (props changed) stable/8/games/pom/ (props changed) stable/8/gnu/lib/csu/ (props changed) stable/8/gnu/lib/libgcc/ (props changed) stable/8/gnu/lib/libstdc++/ (props changed) stable/8/gnu/usr.bin/ (props changed) stable/8/gnu/usr.bin/Makefile (props changed) stable/8/gnu/usr.bin/dialog/ (props changed) stable/8/gnu/usr.bin/gdb/ (props changed) stable/8/gnu/usr.bin/gdb/kgdb/ (props changed) stable/8/gnu/usr.bin/groff/ (props changed) stable/8/gnu/usr.bin/patch/ (props changed) stable/8/include/ (props changed) stable/8/kerberos5/lib/libgssapi_krb5/ (props changed) stable/8/kerberos5/lib/libgssapi_spnego/ (props changed) stable/8/kerberos5/usr.bin/kdestroy/ (props changed) stable/8/kerberos5/usr.bin/kpasswd/ (props changed) stable/8/lib/ (props changed) stable/8/lib/bind/ (props changed) stable/8/lib/csu/ (props changed) stable/8/lib/libarchive/ (props changed) stable/8/lib/libbluetooth/ (props changed) stable/8/lib/libc/ (props changed) stable/8/lib/libc/stdtime/ (props changed) stable/8/lib/libc_r/ (props changed) stable/8/lib/libcam/ (props changed) stable/8/lib/libcompat/ (props changed) stable/8/lib/libdevinfo/ (props changed) stable/8/lib/libdisk/ (props changed) stable/8/lib/libedit/ (props changed) stable/8/lib/libelf/ (props changed) stable/8/lib/libexpat/ (props changed) stable/8/lib/libfetch/ (props changed) stable/8/lib/libgeom/ (props changed) stable/8/lib/libgpib/ (props changed) stable/8/lib/libgssapi/ (props changed) stable/8/lib/libjail/ (props changed) stable/8/lib/libkse/ (props changed) stable/8/lib/libkvm/ (props changed) stable/8/lib/liblzma/ (props changed) stable/8/lib/libmagic/ (props changed) stable/8/lib/libmemstat/ (props changed) stable/8/lib/libpam/ (props changed) stable/8/lib/libpmc/ (props changed) stable/8/lib/libproc/ (props changed) stable/8/lib/libradius/ (props changed) stable/8/lib/librpcsec_gss/ (props changed) stable/8/lib/librtld_db/ (props changed) stable/8/lib/libsm/ (props changed) stable/8/lib/libstand/ (props changed) stable/8/lib/libtacplus/ (props changed) stable/8/lib/libthr/ (props changed) stable/8/lib/libthread_db/ (props changed) stable/8/lib/libufs/ (props changed) stable/8/lib/libugidfw/ (props changed) stable/8/lib/libusb/ (props changed) stable/8/lib/libusb/usb.h (props changed) stable/8/lib/libusbhid/ (props changed) stable/8/lib/libutil/ (props changed) stable/8/lib/libz/ (props changed) stable/8/lib/libz/contrib/ (props changed) stable/8/lib/msun/ (props changed) stable/8/libexec/ (props changed) stable/8/libexec/ftpd/ (props changed) stable/8/libexec/rtld-elf/ (props changed) stable/8/libexec/tftpd/ (props changed) stable/8/release/ (props changed) stable/8/release/doc/en_US.ISO8859-1/hardware/ (props changed) stable/8/release/picobsd/ (props changed) stable/8/release/picobsd/floppy.tree/sbin/ (props changed) stable/8/release/picobsd/floppy.tree/sbin/dhclient-script (props changed) stable/8/release/picobsd/qemu/ (props changed) stable/8/release/picobsd/tinyware/login/ (props changed) stable/8/release/powerpc/ (props changed) stable/8/sbin/ (props changed) stable/8/sbin/atacontrol/ (props changed) stable/8/sbin/bsdlabel/ (props changed) stable/8/sbin/camcontrol/ (props changed) stable/8/sbin/ddb/ (props changed) stable/8/sbin/devd/ (props changed) stable/8/sbin/devfs/ (props changed) stable/8/sbin/dhclient/ (props changed) stable/8/sbin/dump/ (props changed) stable/8/sbin/dumpfs/ (props changed) stable/8/sbin/fdisk/ (props changed) stable/8/sbin/fsck/ (props changed) stable/8/sbin/fsck_ffs/ (props changed) stable/8/sbin/fsck_msdosfs/ (props changed) stable/8/sbin/fsirand/ (props changed) stable/8/sbin/geom/ (props changed) stable/8/sbin/geom/class/multipath/ (props changed) stable/8/sbin/geom/class/part/ (props changed) stable/8/sbin/geom/class/sched/gsched.8 (props changed) stable/8/sbin/geom/class/stripe/ (props changed) stable/8/sbin/ggate/ (props changed) stable/8/sbin/growfs/ (props changed) stable/8/sbin/hastctl/ (props changed) stable/8/sbin/hastd/ (props changed) stable/8/sbin/ifconfig/ (props changed) stable/8/sbin/ipfw/ (props changed) stable/8/sbin/iscontrol/ (props changed) stable/8/sbin/kldload/ (props changed) stable/8/sbin/kldstat/ (props changed) stable/8/sbin/mdconfig/ (props changed) stable/8/sbin/mksnap_ffs/ (props changed) stable/8/sbin/mount/ (props changed) stable/8/sbin/mount_cd9660/ (props changed) stable/8/sbin/mount_msdosfs/ (props changed) stable/8/sbin/mount_nfs/ (props changed) stable/8/sbin/natd/ (props changed) stable/8/sbin/newfs/ (props changed) stable/8/sbin/newfs_msdos/ (props changed) stable/8/sbin/ping6/ (props changed) stable/8/sbin/reboot/ (props changed) stable/8/sbin/restore/ (props changed) stable/8/sbin/route/ (props changed) stable/8/sbin/routed/ (props changed) stable/8/sbin/setkey/ (props changed) stable/8/sbin/spppcontrol/ (props changed) stable/8/sbin/sysctl/ (props changed) stable/8/sbin/tunefs/ (props changed) stable/8/sbin/umount/ (props changed) stable/8/secure/ (props changed) stable/8/secure/lib/libcrypto/ (props changed) stable/8/secure/lib/libssl/ (props changed) stable/8/secure/usr.bin/bdes/ (props changed) stable/8/secure/usr.bin/openssl/ (props changed) stable/8/share/dict/ (props changed) stable/8/share/doc/papers/jail/ (props changed) stable/8/share/doc/smm/01.setup/ (props changed) stable/8/share/examples/ (props changed) stable/8/share/examples/etc/ (props changed) stable/8/share/examples/kld/syscall/ (props changed) stable/8/share/man/ (props changed) stable/8/share/man/man1/ (props changed) stable/8/share/man/man3/ (props changed) stable/8/share/man/man4/ (props changed) stable/8/share/man/man5/ (props changed) stable/8/share/man/man7/ (props changed) stable/8/share/man/man8/ (props changed) stable/8/share/man/man9/ (props changed) stable/8/share/misc/ (props changed) stable/8/share/mk/ (props changed) stable/8/share/syscons/ (props changed) stable/8/share/termcap/ (props changed) stable/8/share/timedef/ (props changed) stable/8/share/zoneinfo/ (props changed) stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/tools/ (props changed) stable/8/tools/build/mk/ (props changed) stable/8/tools/build/options/ (props changed) stable/8/tools/debugscripts/ (props changed) stable/8/tools/kerneldoc/subsys/ (props changed) stable/8/tools/regression/acct/ (props changed) stable/8/tools/regression/acltools/ (props changed) stable/8/tools/regression/aio/aiotest/ (props changed) stable/8/tools/regression/bin/ (props changed) stable/8/tools/regression/bin/date/ (props changed) stable/8/tools/regression/bin/sh/ (props changed) stable/8/tools/regression/fifo/ (props changed) stable/8/tools/regression/geom/ (props changed) stable/8/tools/regression/lib/libc/ (props changed) stable/8/tools/regression/lib/msun/test-conj.t (props changed) stable/8/tools/regression/mqueue/mqtest1/ (props changed) stable/8/tools/regression/mqueue/mqtest2/ (props changed) stable/8/tools/regression/mqueue/mqtest3/ (props changed) stable/8/tools/regression/mqueue/mqtest4/ (props changed) stable/8/tools/regression/mqueue/mqtest5/ (props changed) stable/8/tools/regression/netinet/ (props changed) stable/8/tools/regression/poll/ (props changed) stable/8/tools/regression/posixsem/ (props changed) stable/8/tools/regression/priv/ (props changed) stable/8/tools/regression/sockets/unix_gc/ (props changed) stable/8/tools/regression/usr.bin/ (props changed) stable/8/tools/regression/usr.bin/pkill/ (props changed) stable/8/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed) stable/8/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed) stable/8/tools/regression/usr.bin/pkill/pkill-_g.t (props changed) stable/8/tools/regression/usr.bin/sed/ (props changed) stable/8/tools/regression/usr.bin/tr/ (props changed) stable/8/tools/test/ (props changed) stable/8/tools/tools/ (props changed) stable/8/tools/tools/ath/ (props changed) stable/8/tools/tools/ath/common/dumpregs.h (props changed) stable/8/tools/tools/ath/common/dumpregs_5210.c (props changed) stable/8/tools/tools/ath/common/dumpregs_5211.c (props changed) stable/8/tools/tools/ath/common/dumpregs_5212.c (props changed) stable/8/tools/tools/ath/common/dumpregs_5416.c (props changed) stable/8/tools/tools/mctest/ (props changed) stable/8/tools/tools/nanobsd/ (props changed) stable/8/tools/tools/netrate/ (props changed) stable/8/tools/tools/netrate/tcpp/ (props changed) stable/8/tools/tools/termcap/termcap.pl (props changed) stable/8/tools/tools/umastat/ (props changed) stable/8/tools/tools/vimage/ (props changed) stable/8/usr.bin/ (props changed) stable/8/usr.bin/apply/ (props changed) stable/8/usr.bin/ar/ (props changed) stable/8/usr.bin/awk/ (props changed) stable/8/usr.bin/biff/ (props changed) stable/8/usr.bin/c89/ (props changed) stable/8/usr.bin/c99/ (props changed) stable/8/usr.bin/calendar/ (props changed) stable/8/usr.bin/catman/ (props changed) stable/8/usr.bin/chpass/Makefile (props changed) stable/8/usr.bin/column/ (props changed) stable/8/usr.bin/comm/ (props changed) stable/8/usr.bin/cpio/ (props changed) stable/8/usr.bin/cpuset/ (props changed) stable/8/usr.bin/csup/ (props changed) stable/8/usr.bin/du/ (props changed) stable/8/usr.bin/ee/ (props changed) stable/8/usr.bin/enigma/ (props changed) stable/8/usr.bin/fetch/ (props changed) stable/8/usr.bin/find/ (props changed) stable/8/usr.bin/finger/ (props changed) stable/8/usr.bin/fold/ (props changed) stable/8/usr.bin/fstat/ (props changed) stable/8/usr.bin/gcore/ (props changed) stable/8/usr.bin/getopt/ (props changed) stable/8/usr.bin/gzip/ (props changed) stable/8/usr.bin/hexdump/ (props changed) stable/8/usr.bin/indent/ (props changed) stable/8/usr.bin/jot/ (props changed) stable/8/usr.bin/kdump/ (props changed) stable/8/usr.bin/killall/ (props changed) stable/8/usr.bin/ktrace/ (props changed) stable/8/usr.bin/ldd/ (props changed) stable/8/usr.bin/lex/ (props changed) stable/8/usr.bin/locale/ (props changed) stable/8/usr.bin/locate/ (props changed) stable/8/usr.bin/lockf/ (props changed) stable/8/usr.bin/look/ (props changed) stable/8/usr.bin/m4/ (props changed) stable/8/usr.bin/mail/ (props changed) stable/8/usr.bin/make/ (props changed) stable/8/usr.bin/makewhatis/ (props changed) stable/8/usr.bin/minigzip/ (props changed) stable/8/usr.bin/ncal/ (props changed) stable/8/usr.bin/netstat/ (props changed) stable/8/usr.bin/pathchk/ (props changed) stable/8/usr.bin/perror/ (props changed) stable/8/usr.bin/procstat/ (props changed) stable/8/usr.bin/rpcgen/ (props changed) stable/8/usr.bin/rpcinfo/ (props changed) stable/8/usr.bin/ruptime/ (props changed) stable/8/usr.bin/script/ (props changed) stable/8/usr.bin/sed/ (props changed) stable/8/usr.bin/sockstat/ (props changed) stable/8/usr.bin/split/ (props changed) stable/8/usr.bin/stat/ (props changed) stable/8/usr.bin/systat/ (props changed) stable/8/usr.bin/tar/ (props changed) stable/8/usr.bin/tftp/ (props changed) stable/8/usr.bin/top/ (props changed) stable/8/usr.bin/touch/ (props changed) stable/8/usr.bin/tr/ (props changed) stable/8/usr.bin/truss/ (props changed) stable/8/usr.bin/uname/ (props changed) stable/8/usr.bin/uniq/ (props changed) stable/8/usr.bin/unzip/ (props changed) stable/8/usr.bin/uudecode/ (props changed) stable/8/usr.bin/vmstat/ (props changed) stable/8/usr.bin/w/ (props changed) stable/8/usr.bin/whois/ (props changed) stable/8/usr.bin/xinstall/ (props changed) stable/8/usr.bin/xlint/ (props changed) stable/8/usr.bin/xz/ (props changed) stable/8/usr.bin/yacc/ (props changed) stable/8/usr.sbin/ (props changed) stable/8/usr.sbin/Makefile (props changed) stable/8/usr.sbin/acpi/ (props changed) stable/8/usr.sbin/arp/ (props changed) stable/8/usr.sbin/asf/ (props changed) stable/8/usr.sbin/bluetooth/ (props changed) stable/8/usr.sbin/bluetooth/bthidcontrol/ (props changed) stable/8/usr.sbin/bluetooth/bthidd/ (props changed) stable/8/usr.sbin/boot0cfg/ (props changed) stable/8/usr.sbin/bsnmpd/ (props changed) stable/8/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c (props changed) stable/8/usr.sbin/burncd/ (props changed) stable/8/usr.sbin/cdcontrol/ (props changed) stable/8/usr.sbin/chown/ (props changed) stable/8/usr.sbin/config/ (props changed) stable/8/usr.sbin/config/SMM.doc/ (props changed) stable/8/usr.sbin/cpucontrol/ (props changed) stable/8/usr.sbin/crashinfo/ (props changed) stable/8/usr.sbin/cron/ (props changed) stable/8/usr.sbin/crunch/examples/ (props changed) stable/8/usr.sbin/ctm/ (props changed) stable/8/usr.sbin/cxgbtool/ (props changed) stable/8/usr.sbin/devinfo/ (props changed) stable/8/usr.sbin/diskinfo/ (props changed) stable/8/usr.sbin/dumpcis/cardinfo.h (props changed) stable/8/usr.sbin/dumpcis/cis.h (props changed) stable/8/usr.sbin/faithd/ (props changed) stable/8/usr.sbin/fdcontrol/ (props changed) stable/8/usr.sbin/fdformat/ (props changed) stable/8/usr.sbin/fdread/ (props changed) stable/8/usr.sbin/fdwrite/ (props changed) stable/8/usr.sbin/fifolog/ (props changed) stable/8/usr.sbin/flowctl/ (props changed) stable/8/usr.sbin/freebsd-update/ (props changed) stable/8/usr.sbin/i2c/ (props changed) stable/8/usr.sbin/inetd/ (props changed) stable/8/usr.sbin/iostat/ (props changed) stable/8/usr.sbin/jail/ (props changed) stable/8/usr.sbin/jls/ (props changed) stable/8/usr.sbin/lpr/ (props changed) stable/8/usr.sbin/mailwrapper/ (props changed) stable/8/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) stable/8/usr.sbin/makefs/ffs/ffs_subr.c (props changed) stable/8/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) stable/8/usr.sbin/makefs/getid.c (props changed) stable/8/usr.sbin/mergemaster/ (props changed) stable/8/usr.sbin/mfiutil/ (props changed) stable/8/usr.sbin/mountd/ (props changed) stable/8/usr.sbin/moused/ (props changed) stable/8/usr.sbin/mptutil/ (props changed) stable/8/usr.sbin/mtest/ (props changed) stable/8/usr.sbin/mtree/ (props changed) stable/8/usr.sbin/named/ (props changed) stable/8/usr.sbin/ndp/ (props changed) stable/8/usr.sbin/newsyslog/ (props changed) stable/8/usr.sbin/nfsdumpstate/ (props changed) stable/8/usr.sbin/ntp/ (props changed) stable/8/usr.sbin/pciconf/ (props changed) stable/8/usr.sbin/periodic/ (props changed) stable/8/usr.sbin/pkg_install/ (props changed) stable/8/usr.sbin/pmcannotate/ (props changed) stable/8/usr.sbin/pmccontrol/ (props changed) stable/8/usr.sbin/pmcstat/ (props changed) stable/8/usr.sbin/powerd/ (props changed) stable/8/usr.sbin/ppp/ (props changed) stable/8/usr.sbin/pppctl/ (props changed) stable/8/usr.sbin/pstat/ (props changed) stable/8/usr.sbin/rpc.lockd/ (props changed) stable/8/usr.sbin/rpc.umntall/ (props changed) stable/8/usr.sbin/rpcbind/ (props changed) stable/8/usr.sbin/rtadvd/ (props changed) stable/8/usr.sbin/rtsold/ (props changed) stable/8/usr.sbin/sade/ (props changed) stable/8/usr.sbin/service/ (props changed) stable/8/usr.sbin/services_mkdb/ (props changed) stable/8/usr.sbin/setfmac/ (props changed) stable/8/usr.sbin/setpmac/ (props changed) stable/8/usr.sbin/smbmsg/ (props changed) stable/8/usr.sbin/sysinstall/ (props changed) stable/8/usr.sbin/syslogd/ (props changed) stable/8/usr.sbin/traceroute/ (props changed) stable/8/usr.sbin/traceroute6/ (props changed) stable/8/usr.sbin/uathload/ (props changed) stable/8/usr.sbin/ugidfw/ (props changed) stable/8/usr.sbin/uhsoctl/ (props changed) stable/8/usr.sbin/usbconfig/ (props changed) stable/8/usr.sbin/vidcontrol/ (props changed) stable/8/usr.sbin/watchdogd/ (props changed) stable/8/usr.sbin/wpa/ (props changed) stable/8/usr.sbin/ypserv/ (props changed) stable/8/usr.sbin/zic/ (props changed) Modified: stable/8/UPDATING ============================================================================== --- stable/8/UPDATING Fri Feb 25 14:56:06 2011 (r219033) +++ stable/8/UPDATING Fri Feb 25 15:32:44 2011 (r219034) @@ -1644,8 +1644,8 @@ COMMON ITEMS: [3] mergemaster -p [5] make installworld - make delete-old mergemaster [4] + make delete-old [6] @@ -1682,8 +1682,8 @@ COMMON ITEMS: [3] mergemaster -p [5] make installworld - make delete-old mergemaster -i [4] + make delete-old [6] Make sure that you've read the UPDATING file to understand the @@ -1725,6 +1725,10 @@ COMMON ITEMS: install) after the buildworld before this step if you last updated from current before 20020224 or from -stable before 20020408. + [6] This only deletes old files and directories. Old libraries + can be deleted by "make delete-old-libs", but you have to make + sure that no program is using those libraries anymore. + [8] In order to have a kernel that can run the 4.x binaries needed to do an installworld, you must include the COMPAT_FREEBSD4 option in your kernel. Failure to do so may leave you with a system From owner-svn-src-stable@FreeBSD.ORG Fri Feb 25 16:08:32 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 270581065673; Fri, 25 Feb 2011 16:08:32 +0000 (UTC) (envelope-from netchild@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 11DD08FC1E; Fri, 25 Feb 2011 16:08:32 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1PG8WTF089625; Fri, 25 Feb 2011 16:08:32 GMT (envelope-from netchild@svn.freebsd.org) Received: (from netchild@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1PG8WsG089623; Fri, 25 Feb 2011 16:08:32 GMT (envelope-from netchild@svn.freebsd.org) Message-Id: <201102251608.p1PG8WsG089623@svn.freebsd.org> From: Alexander Leidinger Date: Fri, 25 Feb 2011 16:08:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219035 - in stable/7: . contrib/bsnmp/snmpd contrib/wpa_supplicant gnu/usr.bin/groff/tmac share/misc tools/tools/nanobsd usr.sbin usr.sbin/bsnmpd/modules/snmp_hostres usr.sbin/makefs u... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Feb 2011 16:08:32 -0000 Author: netchild Date: Fri Feb 25 16:08:31 2011 New Revision: 219035 URL: http://svn.freebsd.org/changeset/base/219035 Log: MFC r216591: Suggest to run the delete-old target after the second mergemaster. If you run it before, your rc scripts may still reference old files/directories and if you are in the unlucky situation to have triggered a reboot (intentionally or not) between the delete-old run and the mergemaster, your system may not start anymore. While I'm here, give a hint about delete-old-libs. Noticed by: bcr (luckily in a discussion and not by getting hit by this) Modified: stable/7/UPDATING (contents, props changed) Directory Properties: stable/7/ (props changed) stable/7/COPYRIGHT (props changed) stable/7/Makefile (props changed) stable/7/Makefile.inc1 (props changed) stable/7/ObsoleteFiles.inc (props changed) stable/7/bin/ (props changed) stable/7/bin/chflags/ (props changed) stable/7/bin/chio/ (props changed) stable/7/bin/cp/ (props changed) stable/7/bin/csh/ (props changed) stable/7/bin/dd/ (props changed) stable/7/bin/df/ (props changed) stable/7/bin/echo/ (props changed) stable/7/bin/ed/ (props changed) stable/7/bin/expr/ (props changed) stable/7/bin/kill/ (props changed) stable/7/bin/ln/ (props changed) stable/7/bin/ls/ (props changed) stable/7/bin/pax/ (props changed) stable/7/bin/ps/ (props changed) stable/7/bin/rm/ (props changed) stable/7/bin/sh/ (props changed) stable/7/bin/test/ (props changed) stable/7/cddl/contrib/opensolaris/ (props changed) stable/7/cddl/lib/libzpool/ (props changed) stable/7/contrib/bind9/ (props changed) stable/7/contrib/binutils/ (props changed) stable/7/contrib/bsnmp/ (props changed) stable/7/contrib/bsnmp/snmpd/bsnmpd.1 (props changed) stable/7/contrib/cpio/ (props changed) stable/7/contrib/csup/ (props changed) stable/7/contrib/expat/ (props changed) stable/7/contrib/gcc/ (props changed) stable/7/contrib/gdb/ (props changed) stable/7/contrib/gdtoa/ (props changed) stable/7/contrib/groff/ (props changed) stable/7/contrib/ipfilter/ (props changed) stable/7/contrib/less/ (props changed) stable/7/contrib/libpcap/ (props changed) stable/7/contrib/ncurses/ (props changed) stable/7/contrib/netcat/ (props changed) stable/7/contrib/ntp/ (props changed) stable/7/contrib/nvi/ (props changed) stable/7/contrib/pf/ (props changed) stable/7/contrib/sendmail/ (props changed) stable/7/contrib/smbfs/ (props changed) stable/7/contrib/tcp_wrappers/ (props changed) stable/7/contrib/tcsh/ (props changed) stable/7/contrib/telnet/ (props changed) stable/7/contrib/top/ (props changed) stable/7/contrib/traceroute/ (props changed) stable/7/contrib/wpa_supplicant/ (props changed) stable/7/contrib/wpa_supplicant/wpa_supplicant.conf (props changed) stable/7/crypto/openssh/ (props changed) stable/7/crypto/openssl/ (props changed) stable/7/etc/ (props changed) stable/7/games/factor/ (props changed) stable/7/games/fortune/ (props changed) stable/7/games/grdc/ (props changed) stable/7/gnu/ (props changed) stable/7/gnu/lib/libstdc++/ (props changed) stable/7/gnu/usr.bin/ (props changed) stable/7/gnu/usr.bin/cc/ (props changed) stable/7/gnu/usr.bin/cpio/ (props changed) stable/7/gnu/usr.bin/cvs/ (props changed) stable/7/gnu/usr.bin/gdb/ (props changed) stable/7/gnu/usr.bin/gdb/kgdb/ (props changed) stable/7/gnu/usr.bin/grep/ (props changed) stable/7/gnu/usr.bin/groff/ (props changed) stable/7/gnu/usr.bin/groff/tmac/mdoc.local (props changed) stable/7/gnu/usr.bin/man/ (props changed) stable/7/gnu/usr.bin/sort/ (props changed) stable/7/include/ (props changed) stable/7/kerberos5/ (props changed) stable/7/lib/ (props changed) stable/7/lib/bind/ (props changed) stable/7/lib/csu/ (props changed) stable/7/lib/libarchive/ (props changed) stable/7/lib/libbluetooth/ (props changed) stable/7/lib/libc/ (props changed) stable/7/lib/libc/stdtime/ (props changed) stable/7/lib/libc_r/ (props changed) stable/7/lib/libcam/ (props changed) stable/7/lib/libdisk/ (props changed) stable/7/lib/libdwarf/ (props changed) stable/7/lib/libelf/ (props changed) stable/7/lib/libexpat/ (props changed) stable/7/lib/libfetch/ (props changed) stable/7/lib/libftpio/ (props changed) stable/7/lib/libgeom/ (props changed) stable/7/lib/libgssapi/ (props changed) stable/7/lib/libkse/ (props changed) stable/7/lib/libkvm/ (props changed) stable/7/lib/libmagic/ (props changed) stable/7/lib/libmemstat/ (props changed) stable/7/lib/libpmc/ (props changed) stable/7/lib/libradius/ (props changed) stable/7/lib/libsm/ (props changed) stable/7/lib/libstand/ (props changed) stable/7/lib/libthr/ (props changed) stable/7/lib/libthread_db/ (props changed) stable/7/lib/libufs/ (props changed) stable/7/lib/libutil/ (props changed) stable/7/lib/msun/ (props changed) stable/7/libexec/ (props changed) stable/7/libexec/ftpd/ (props changed) stable/7/libexec/rpc.rquotad/ (props changed) stable/7/libexec/rpc.rstatd/ (props changed) stable/7/libexec/rtld-elf/ (props changed) stable/7/libexec/tftpd/ (props changed) stable/7/release/ (props changed) stable/7/release/doc/ (props changed) stable/7/release/doc/en_US.ISO8859-1/hardware/ (props changed) stable/7/release/picobsd/tinyware/login/ (props changed) stable/7/rescue/ (props changed) stable/7/sbin/ (props changed) stable/7/sbin/atacontrol/ (props changed) stable/7/sbin/bsdlabel/ (props changed) stable/7/sbin/clri/ (props changed) stable/7/sbin/ddb/ (props changed) stable/7/sbin/devd/ (props changed) stable/7/sbin/devfs/ (props changed) stable/7/sbin/dhclient/ (props changed) stable/7/sbin/dumpfs/ (props changed) stable/7/sbin/fdisk/ (props changed) stable/7/sbin/fdisk_pc98/ (props changed) stable/7/sbin/fsck/ (props changed) stable/7/sbin/fsck_ffs/ (props changed) stable/7/sbin/fsck_msdosfs/ (props changed) stable/7/sbin/geom/ (props changed) stable/7/sbin/geom/class/journal/ (props changed) stable/7/sbin/geom/class/label/ (props changed) stable/7/sbin/geom/class/part/ (props changed) stable/7/sbin/geom/class/stripe/ (props changed) stable/7/sbin/geom/misc/ (props changed) stable/7/sbin/growfs/ (props changed) stable/7/sbin/ifconfig/ (props changed) stable/7/sbin/init/ (props changed) stable/7/sbin/ipf/ (props changed) stable/7/sbin/ipfw/ (props changed) stable/7/sbin/md5/ (props changed) stable/7/sbin/mdconfig/ (props changed) stable/7/sbin/mksnap_ffs/ (props changed) stable/7/sbin/mount/ (props changed) stable/7/sbin/mount_msdosfs/ (props changed) stable/7/sbin/natd/ (props changed) stable/7/sbin/newfs/ (props changed) stable/7/sbin/newfs_msdos/ (props changed) stable/7/sbin/ping6/ (props changed) stable/7/sbin/reboot/ (props changed) stable/7/sbin/restore/ (props changed) stable/7/sbin/route/ (props changed) stable/7/sbin/savecore/ (props changed) stable/7/sbin/sconfig/ (props changed) stable/7/sbin/shutdown/ (props changed) stable/7/sbin/sysctl/ (props changed) stable/7/sbin/tunefs/ (props changed) stable/7/secure/lib/libcrypto/ (props changed) stable/7/secure/lib/libssh/ (props changed) stable/7/secure/lib/libssl/ (props changed) stable/7/secure/libexec/sftp-server/ (props changed) stable/7/secure/usr.bin/bdes/ (props changed) stable/7/secure/usr.bin/openssl/ (props changed) stable/7/secure/usr.bin/ssh/ (props changed) stable/7/secure/usr.sbin/sshd/ (props changed) stable/7/share/ (props changed) stable/7/share/colldef/ (props changed) stable/7/share/dict/ (props changed) stable/7/share/doc/bind9/ (props changed) stable/7/share/doc/papers/jail/ (props changed) stable/7/share/doc/smm/01.setup/ (props changed) stable/7/share/examples/ (props changed) stable/7/share/man/ (props changed) stable/7/share/man/man1/ (props changed) stable/7/share/man/man3/ (props changed) stable/7/share/man/man4/ (props changed) stable/7/share/man/man5/ (props changed) stable/7/share/man/man7/ (props changed) stable/7/share/man/man8/ (props changed) stable/7/share/man/man9/ (props changed) stable/7/share/misc/ (props changed) stable/7/share/misc/iso639 (props changed) stable/7/share/misc/pci_vendors (props changed) stable/7/share/mk/ (props changed) stable/7/share/mklocale/ (props changed) stable/7/share/monetdef/ (props changed) stable/7/share/msgdef/ (props changed) stable/7/share/numericdef/ (props changed) stable/7/share/sendmail/ (props changed) stable/7/share/syscons/ (props changed) stable/7/share/syscons/keymaps/ (props changed) stable/7/share/termcap/ (props changed) stable/7/share/timedef/ (props changed) stable/7/share/zoneinfo/ (props changed) stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/tools/ (props changed) stable/7/tools/build/ (props changed) stable/7/tools/build/options/ (props changed) stable/7/tools/debugscripts/ (props changed) stable/7/tools/regression/acct/ (props changed) stable/7/tools/regression/atm/ (props changed) stable/7/tools/regression/bin/ (props changed) stable/7/tools/regression/bin/date/ (props changed) stable/7/tools/regression/bin/sh/ (props changed) stable/7/tools/regression/file/ (props changed) stable/7/tools/regression/file/flock/ (props changed) stable/7/tools/regression/lib/libc/ (props changed) stable/7/tools/regression/usr.bin/ (props changed) stable/7/tools/regression/usr.bin/jot/ (props changed) stable/7/tools/regression/usr.bin/tr/ (props changed) stable/7/tools/sched/ (props changed) stable/7/tools/test/ (props changed) stable/7/tools/tools/ (props changed) stable/7/tools/tools/aac/ (props changed) stable/7/tools/tools/crypto/ (props changed) stable/7/tools/tools/editing/ (props changed) stable/7/tools/tools/nanobsd/ (props changed) stable/7/tools/tools/nanobsd/FlashDevice.sub (props changed) stable/7/tools/tools/nanobsd/nanobsd.sh (props changed) stable/7/tools/tools/netrate/ (props changed) stable/7/tools/tools/tinybsd/ (props changed) stable/7/tools/tools/umastat/ (props changed) stable/7/tools/tools/usb/ (props changed) stable/7/usr.bin/ (props changed) stable/7/usr.bin/basename/ (props changed) stable/7/usr.bin/bluetooth/rfcomm_sppd/ (props changed) stable/7/usr.bin/calendar/ (props changed) stable/7/usr.bin/catman/ (props changed) stable/7/usr.bin/cksum/ (props changed) stable/7/usr.bin/comm/ (props changed) stable/7/usr.bin/cpuset/ (props changed) stable/7/usr.bin/csup/ (props changed) stable/7/usr.bin/dirname/ (props changed) stable/7/usr.bin/du/ (props changed) stable/7/usr.bin/fetch/ (props changed) stable/7/usr.bin/file/ (props changed) stable/7/usr.bin/find/ (props changed) stable/7/usr.bin/finger/ (props changed) stable/7/usr.bin/fold/ (props changed) stable/7/usr.bin/fstat/ (props changed) stable/7/usr.bin/gcore/ (props changed) stable/7/usr.bin/getopt/ (props changed) stable/7/usr.bin/gprof/ (props changed) stable/7/usr.bin/gzip/ (props changed) stable/7/usr.bin/hexdump/ (props changed) stable/7/usr.bin/id/ (props changed) stable/7/usr.bin/indent/ (props changed) stable/7/usr.bin/ipcrm/ (props changed) stable/7/usr.bin/ipcs/ (props changed) stable/7/usr.bin/jot/ (props changed) stable/7/usr.bin/kdump/ (props changed) stable/7/usr.bin/ktrace/ (props changed) stable/7/usr.bin/ldd/ (props changed) stable/7/usr.bin/less/ (props changed) stable/7/usr.bin/lex/ (props changed) stable/7/usr.bin/locate/ (props changed) stable/7/usr.bin/lockf/ (props changed) stable/7/usr.bin/logger/ (props changed) stable/7/usr.bin/m4/ (props changed) stable/7/usr.bin/mail/ (props changed) stable/7/usr.bin/make/ (props changed) stable/7/usr.bin/ncal/ (props changed) stable/7/usr.bin/netstat/ (props changed) stable/7/usr.bin/newgrp/ (props changed) stable/7/usr.bin/nsupdate/ (props changed) stable/7/usr.bin/pkill/ (props changed) stable/7/usr.bin/procstat/ (props changed) stable/7/usr.bin/quota/ (props changed) stable/7/usr.bin/rpcgen/ (props changed) stable/7/usr.bin/rpcinfo/ (props changed) stable/7/usr.bin/ruptime/ (props changed) stable/7/usr.bin/script/ (props changed) stable/7/usr.bin/sed/ (props changed) stable/7/usr.bin/shar/ (props changed) stable/7/usr.bin/sockstat/ (props changed) stable/7/usr.bin/stat/ (props changed) stable/7/usr.bin/su/ (props changed) stable/7/usr.bin/systat/ (props changed) stable/7/usr.bin/tail/ (props changed) stable/7/usr.bin/tar/ (props changed) stable/7/usr.bin/tftp/ (props changed) stable/7/usr.bin/tip/ (props changed) stable/7/usr.bin/top/ (props changed) stable/7/usr.bin/truncate/ (props changed) stable/7/usr.bin/truss/ (props changed) stable/7/usr.bin/uname/ (props changed) stable/7/usr.bin/unifdef/ (props changed) stable/7/usr.bin/units/ (props changed) stable/7/usr.bin/uudecode/ (props changed) stable/7/usr.bin/vmstat/ (props changed) stable/7/usr.bin/w/ (props changed) stable/7/usr.bin/wc/ (props changed) stable/7/usr.bin/whereis/ (props changed) stable/7/usr.bin/whois/ (props changed) stable/7/usr.bin/window/ (props changed) stable/7/usr.bin/xargs/ (props changed) stable/7/usr.bin/xinstall/ (props changed) stable/7/usr.bin/ypcat/ (props changed) stable/7/usr.bin/ypmatch/ (props changed) stable/7/usr.bin/ypwhich/ (props changed) stable/7/usr.sbin/ (props changed) stable/7/usr.sbin/Makefile (props changed) stable/7/usr.sbin/acpi/ (props changed) stable/7/usr.sbin/adduser/ (props changed) stable/7/usr.sbin/arp/ (props changed) stable/7/usr.sbin/bluetooth/ (props changed) stable/7/usr.sbin/bluetooth/btpand/ (props changed) stable/7/usr.sbin/bluetooth/hcsecd/ (props changed) stable/7/usr.sbin/bluetooth/hcseriald/ (props changed) stable/7/usr.sbin/bluetooth/rfcomm_pppd/ (props changed) stable/7/usr.sbin/bluetooth/sdpd/ (props changed) stable/7/usr.sbin/boot0cfg/ (props changed) stable/7/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c (props changed) stable/7/usr.sbin/bsnmpd/modules/snmp_pf/ (props changed) stable/7/usr.sbin/burncd/ (props changed) stable/7/usr.sbin/cdcontrol/ (props changed) stable/7/usr.sbin/chown/ (props changed) stable/7/usr.sbin/chroot/ (props changed) stable/7/usr.sbin/config/ (props changed) stable/7/usr.sbin/config/SMM.doc/ (props changed) stable/7/usr.sbin/cpucontrol/ (props changed) stable/7/usr.sbin/crashinfo/ (props changed) stable/7/usr.sbin/cron/ (props changed) stable/7/usr.sbin/cron/cron/ (props changed) stable/7/usr.sbin/crunch/ (props changed) stable/7/usr.sbin/cxgbtool/ (props changed) stable/7/usr.sbin/eeprom/ (props changed) stable/7/usr.sbin/extattr/ (props changed) stable/7/usr.sbin/faithd/ (props changed) stable/7/usr.sbin/fdcontrol/ (props changed) stable/7/usr.sbin/fdformat/ (props changed) stable/7/usr.sbin/fdread/ (props changed) stable/7/usr.sbin/fdwrite/ (props changed) stable/7/usr.sbin/fifolog/ (props changed) stable/7/usr.sbin/freebsd-update/ (props changed) stable/7/usr.sbin/fwcontrol/ (props changed) stable/7/usr.sbin/gstat/ (props changed) stable/7/usr.sbin/iostat/ (props changed) stable/7/usr.sbin/jail/ (props changed) stable/7/usr.sbin/jexec/ (props changed) stable/7/usr.sbin/jls/ (props changed) stable/7/usr.sbin/lpr/ (props changed) stable/7/usr.sbin/mailwrapper/ (props changed) stable/7/usr.sbin/makefs/ (props changed) stable/7/usr.sbin/makefs/ffs/ffs_bswap.c (props changed) stable/7/usr.sbin/makefs/ffs/ffs_subr.c (props changed) stable/7/usr.sbin/makefs/ffs/ufs_bswap.h (props changed) stable/7/usr.sbin/makefs/getid.c (props changed) stable/7/usr.sbin/mergemaster/ (props changed) stable/7/usr.sbin/mfiutil/ (props changed) stable/7/usr.sbin/mountd/ (props changed) stable/7/usr.sbin/moused/ (props changed) stable/7/usr.sbin/mptutil/ (props changed) stable/7/usr.sbin/mtree/ (props changed) stable/7/usr.sbin/ndiscvt/ (props changed) stable/7/usr.sbin/ndp/ (props changed) stable/7/usr.sbin/newsyslog/ (props changed) stable/7/usr.sbin/nscd/ (props changed) stable/7/usr.sbin/ntp/ (props changed) stable/7/usr.sbin/pciconf/ (props changed) stable/7/usr.sbin/pkg_install/ (props changed) stable/7/usr.sbin/pmccontrol/ (props changed) stable/7/usr.sbin/pmcstat/ (props changed) stable/7/usr.sbin/portsnap/ (props changed) stable/7/usr.sbin/powerd/ (props changed) stable/7/usr.sbin/ppp/ (props changed) stable/7/usr.sbin/pstat/ (props changed) stable/7/usr.sbin/pw/ (props changed) stable/7/usr.sbin/pwd_mkdb/ (props changed) stable/7/usr.sbin/rpc.lockd/ (props changed) stable/7/usr.sbin/rpc.statd/ (props changed) stable/7/usr.sbin/rpc.yppasswdd/ (props changed) stable/7/usr.sbin/rpcbind/ (props changed) stable/7/usr.sbin/rtadvd/ (props changed) stable/7/usr.sbin/rtsold/ (props changed) stable/7/usr.sbin/sade/ (props changed) stable/7/usr.sbin/service/ (props changed) stable/7/usr.sbin/setfib/ (props changed) stable/7/usr.sbin/sysinstall/ (props changed) stable/7/usr.sbin/syslogd/ (props changed) stable/7/usr.sbin/traceroute/ (props changed) stable/7/usr.sbin/traceroute6/ (props changed) stable/7/usr.sbin/tzsetup/ (props changed) stable/7/usr.sbin/ugidfw/ (props changed) stable/7/usr.sbin/wpa/wpa_supplicant/ (props changed) stable/7/usr.sbin/ypserv/ (props changed) stable/7/usr.sbin/zic/ (props changed) Modified: stable/7/UPDATING ============================================================================== --- stable/7/UPDATING Fri Feb 25 15:32:44 2011 (r219034) +++ stable/7/UPDATING Fri Feb 25 16:08:31 2011 (r219035) @@ -988,8 +988,8 @@ COMMON ITEMS: [3] mergemaster -p [5] make installworld - make delete-old mergemaster [4] + make delete-old [6] @@ -1026,8 +1026,8 @@ COMMON ITEMS: [3] mergemaster -p [5] make installworld - make delete-old mergemaster -i [4] + make delete-old [6] Make sure that you've read the UPDATING file to understand the @@ -1069,6 +1069,10 @@ COMMON ITEMS: install) after the buildworld before this step if you last updated from current before 20020224 or from -stable before 20020408. + [6] This only deletes old files and directories. Old libraries + can be deleted by "make delete-old-libs", but you have to make + sure that no program is using those libraries anymore. + [8] In order to have a kernel that can run the 4.x binaries needed to do an installworld, you must include the COMPAT_FREEBSD4 option in your kernel. Failure to do so may leave you with a system From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 10:29:54 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D26B1065673; Sat, 26 Feb 2011 10:29:54 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 597218FC13; Sat, 26 Feb 2011 10:29:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QATsqH054639; Sat, 26 Feb 2011 10:29:54 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QATs6c054631; Sat, 26 Feb 2011 10:29:54 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102261029.p1QATs6c054631@svn.freebsd.org> From: Bruce Cran Date: Sat, 26 Feb 2011 10:29:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219049 - in stable/8: sbin/growfs share/doc/papers/devfs sys/fs/nullfs sys/libkern sys/net80211 sys/x86/isa usr.bin/tip/tip X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 10:29:54 -0000 Author: brucec Date: Sat Feb 26 10:29:53 2011 New Revision: 219049 URL: http://svn.freebsd.org/changeset/base/219049 Log: MFC r218965: Fix typos - remove duplicate "is". PR: docs/154934 Submitted by: Eitan Adler Modified: stable/8/sbin/growfs/growfs.c stable/8/share/doc/papers/devfs/paper.me stable/8/sys/fs/nullfs/null_vnops.c stable/8/sys/libkern/jenkins.h stable/8/sys/net80211/ieee80211_ageq.c stable/8/sys/x86/isa/clock.c stable/8/usr.bin/tip/tip/tip.h Directory Properties: stable/8/sbin/growfs/ (props changed) stable/8/share/doc/papers/devfs/ (props changed) stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/usr.bin/tip/ (props changed) Modified: stable/8/sbin/growfs/growfs.c ============================================================================== --- stable/8/sbin/growfs/growfs.c Sat Feb 26 09:28:52 2011 (r219048) +++ stable/8/sbin/growfs/growfs.c Sat Feb 26 10:29:53 2011 (r219049) @@ -646,7 +646,7 @@ cond_bl_upd(ufs2_daddr_t *block, struct /* * Copy the block back immediately. * - * XXX If src is is from an indirect block we have + * XXX If src is from an indirect block we have * to implement copy on write here in case of * active snapshots. */ Modified: stable/8/share/doc/papers/devfs/paper.me ============================================================================== --- stable/8/share/doc/papers/devfs/paper.me Sat Feb 26 09:28:52 2011 (r219048) +++ stable/8/share/doc/papers/devfs/paper.me Sat Feb 26 10:29:53 2011 (r219049) @@ -779,7 +779,7 @@ The entry points to the device driver ar structure, removing the need for the devsw[] array and allowing device drivers to use separate entrypoints for various minor numbers. .lp -This is is very convenient for devices which have a ``control'' +This is very convenient for devices which have a ``control'' device for management and tuning. The control device, almost always have entirely separate open/close/ioctl implementations [MD.C]. .lp Modified: stable/8/sys/fs/nullfs/null_vnops.c ============================================================================== --- stable/8/sys/fs/nullfs/null_vnops.c Sat Feb 26 09:28:52 2011 (r219048) +++ stable/8/sys/fs/nullfs/null_vnops.c Sat Feb 26 10:29:53 2011 (r219049) @@ -672,7 +672,7 @@ null_unlock(struct vop_unlock_args *ap) * as soon as possible. * * Note, we can't release any resources nor remove vnode from hash before - * appropriate VXLOCK stuff is is done because other process can find this + * appropriate VXLOCK stuff is done because other process can find this * vnode in hash during inactivation and may be sitting in vget() and waiting * for null_inactive to unlock vnode. Thus we will do all those in VOP_RECLAIM. */ Modified: stable/8/sys/libkern/jenkins.h ============================================================================== --- stable/8/sys/libkern/jenkins.h Sat Feb 26 09:28:52 2011 (r219048) +++ stable/8/sys/libkern/jenkins.h Sat Feb 26 10:29:53 2011 (r219049) @@ -16,7 +16,7 @@ the public domain. It has no warranty. You probably want to use hashlittle(). hashlittle() and hashbig() - hash byte arrays. hashlittle() is is faster than hashbig() on + hash byte arrays. hashlittle() is faster than hashbig() on little-endian machines. Intel and AMD are little-endian machines. On second thought, you probably want hashlittle2(), which is identical to hashlittle() except it returns two 32-bit hashes for the price of one. Modified: stable/8/sys/net80211/ieee80211_ageq.c ============================================================================== --- stable/8/sys/net80211/ieee80211_ageq.c Sat Feb 26 09:28:52 2011 (r219048) +++ stable/8/sys/net80211/ieee80211_ageq.c Sat Feb 26 10:29:53 2011 (r219049) @@ -154,7 +154,7 @@ ieee80211_ageq_drain_node(struct ieee802 * deltas (in seconds) relative to the head so we can check * and/or adjust only the head of the list. If a frame's age * exceeds the time quanta then remove it. The list of removed - * frames is is returned to the caller joined by m_nextpkt. + * frames is returned to the caller joined by m_nextpkt. */ struct mbuf * ieee80211_ageq_age(struct ieee80211_ageq *aq, int quanta) Modified: stable/8/sys/x86/isa/clock.c ============================================================================== --- stable/8/sys/x86/isa/clock.c Sat Feb 26 09:28:52 2011 (r219048) +++ stable/8/sys/x86/isa/clock.c Sat Feb 26 10:29:53 2011 (r219049) @@ -622,7 +622,7 @@ sysctl_machdep_i8254_freq(SYSCTL_HANDLER /* * Use `i8254' instead of `timer' in external names because `timer' - * is is too generic. Should use it everywhere. + * is too generic. Should use it everywhere. */ freq = i8254_freq; error = sysctl_handle_int(oidp, &freq, 0, req); Modified: stable/8/usr.bin/tip/tip/tip.h ============================================================================== --- stable/8/usr.bin/tip/tip/tip.h Sat Feb 26 09:28:52 2011 (r219048) +++ stable/8/usr.bin/tip/tip/tip.h Sat Feb 26 10:29:53 2011 (r219049) @@ -259,7 +259,7 @@ int intflag; /* recognized interrupt */ int stoprompt; /* for interrupting a prompt session */ int timedout; /* ~> transfer timedout */ int cumode; /* simulating the "cu" program */ -int bits8; /* terminal is is 8-bit mode */ +int bits8; /* terminal is 8-bit mode */ #define STRIP_PAR (bits8 ? 0377 : 0177) char fname[PATH_MAX]; /* file name buffer for ~< */ From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 11:46:06 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AEB11065673; Sat, 26 Feb 2011 11:46:06 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 89AD78FC21; Sat, 26 Feb 2011 11:46:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QBk6bB069681; Sat, 26 Feb 2011 11:46:06 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QBk6I5069679; Sat, 26 Feb 2011 11:46:06 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102261146.p1QBk6I5069679@svn.freebsd.org> From: Bruce Cran Date: Sat, 26 Feb 2011 11:46:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219051 - stable/8/sys/compat/ndis X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 11:46:06 -0000 Author: brucec Date: Sat Feb 26 11:46:06 2011 New Revision: 219051 URL: http://svn.freebsd.org/changeset/base/219051 Log: MFC r218985: Use the cprd_mem field when setting the start and length for a memory resource - the layout of cprd_port is identical but using cprd_mem makes the code easier to understand. PR: kern/118493 Submitted by: Weongyo Jeong Modified: stable/8/sys/compat/ndis/kern_ndis.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/compat/ndis/kern_ndis.c ============================================================================== --- stable/8/sys/compat/ndis/kern_ndis.c Sat Feb 26 11:20:51 2011 (r219050) +++ stable/8/sys/compat/ndis/kern_ndis.c Sat Feb 26 11:46:06 2011 (r219051) @@ -591,9 +591,9 @@ ndis_convert_res(arg) CM_RESOURCE_MEMORY_READ_WRITE; prd->cprd_sharedisp = CmResourceShareDeviceExclusive; - prd->u.cprd_port.cprd_start.np_quad = + prd->u.cprd_mem.cprd_start.np_quad = brle->start; - prd->u.cprd_port.cprd_len = brle->count; + prd->u.cprd_mem.cprd_len = brle->count; break; case SYS_RES_IRQ: prd->cprd_type = CmResourceTypeInterrupt; From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 11:52:35 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2123E106566C; Sat, 26 Feb 2011 11:52:35 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 102918FC12; Sat, 26 Feb 2011 11:52:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QBqYax070009; Sat, 26 Feb 2011 11:52:34 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QBqYme070007; Sat, 26 Feb 2011 11:52:34 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102261152.p1QBqYme070007@svn.freebsd.org> From: Bruce Cran Date: Sat, 26 Feb 2011 11:52:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219052 - stable/7/sys/compat/ndis X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 11:52:35 -0000 Author: brucec Date: Sat Feb 26 11:52:34 2011 New Revision: 219052 URL: http://svn.freebsd.org/changeset/base/219052 Log: MFC r218985: Use the cprd_mem field when setting the start and length for a memory resource - the layout of cprd_port is identical but using cprd_mem makes the code easier to understand. PR: kern/118493 Submitted by: Weongyo Jeong Modified: stable/7/sys/compat/ndis/kern_ndis.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/compat/ndis/kern_ndis.c ============================================================================== --- stable/7/sys/compat/ndis/kern_ndis.c Sat Feb 26 11:46:06 2011 (r219051) +++ stable/7/sys/compat/ndis/kern_ndis.c Sat Feb 26 11:52:34 2011 (r219052) @@ -642,9 +642,9 @@ ndis_convert_res(arg) CM_RESOURCE_MEMORY_READ_WRITE; prd->cprd_sharedisp = CmResourceShareDeviceExclusive; - prd->u.cprd_port.cprd_start.np_quad = + prd->u.cprd_mem.cprd_start.np_quad = brle->start; - prd->u.cprd_port.cprd_len = brle->count; + prd->u.cprd_mem.cprd_len = brle->count; break; case SYS_RES_IRQ: prd->cprd_type = CmResourceTypeInterrupt; From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 12:04:35 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3BFB3106566C; Sat, 26 Feb 2011 12:04:35 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 107AE8FC19; Sat, 26 Feb 2011 12:04:35 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QC4YN6070634; Sat, 26 Feb 2011 12:04:34 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QC4Y7e070631; Sat, 26 Feb 2011 12:04:34 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102261204.p1QC4Y7e070631@svn.freebsd.org> From: Bruce Cran Date: Sat, 26 Feb 2011 12:04:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219053 - in stable/8/sys/boot: common efi/libefi X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 12:04:35 -0000 Author: brucec Date: Sat Feb 26 12:04:34 2011 New Revision: 219053 URL: http://svn.freebsd.org/changeset/base/219053 Log: MFC r218974: Handle memory allocation failures in include(). Fix a format specifier in libefi: status is an unsigned int, not unsigned long. PR: i386/85652 Submitted by: Ben Thomas Modified: stable/8/sys/boot/common/interp.c stable/8/sys/boot/efi/libefi/efipart.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/boot/common/interp.c ============================================================================== --- stable/8/sys/boot/common/interp.c Sat Feb 26 11:52:34 2011 (r219052) +++ stable/8/sys/boot/common/interp.c Sat Feb 26 12:04:34 2011 (r219053) @@ -246,6 +246,17 @@ include(const char *filename) if (*cp == '\0') continue; /* ignore empty line, save memory */ sp = malloc(sizeof(struct includeline) + strlen(cp) + 1); + /* On malloc failure (it happens!), free as much as possible and exit */ + if (sp == NULL) { + while (script != NULL) { + se = script; + script = script->next; + free(se); + } + sprintf(command_errbuf, "file '%s' line %d: memory allocation " + "failure - aborting\n", filename, line); + return (CMD_ERROR); + } strcpy(sp->text, cp); #ifndef BOOT_FORTH sp->flags = flags; Modified: stable/8/sys/boot/efi/libefi/efipart.c ============================================================================== --- stable/8/sys/boot/efi/libefi/efipart.c Sat Feb 26 11:52:34 2011 (r219052) +++ stable/8/sys/boot/efi/libefi/efipart.c Sat Feb 26 12:04:34 2011 (r219053) @@ -203,7 +203,7 @@ efipart_readwrite(EFI_BLOCK_IO *blkio, i } if (EFI_ERROR(status)) - printf("%s: rw=%d, status=%lu\n", __func__, rw, status); + printf("%s: rw=%d, status=%u\n", __func__, rw, status); return (efi_status_to_errno(status)); } From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 12:07:16 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EAFD2106566B; Sat, 26 Feb 2011 12:07:16 +0000 (UTC) (envelope-from brucec@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DA35B8FC08; Sat, 26 Feb 2011 12:07:16 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QC7GC4070876; Sat, 26 Feb 2011 12:07:16 GMT (envelope-from brucec@svn.freebsd.org) Received: (from brucec@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QC7G30070874; Sat, 26 Feb 2011 12:07:16 GMT (envelope-from brucec@svn.freebsd.org) Message-Id: <201102261207.p1QC7G30070874@svn.freebsd.org> From: Bruce Cran Date: Sat, 26 Feb 2011 12:07:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219054 - stable/7/sys/boot/common X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 12:07:17 -0000 Author: brucec Date: Sat Feb 26 12:07:16 2011 New Revision: 219054 URL: http://svn.freebsd.org/changeset/base/219054 Log: MFC r218974: Handle memory allocation failures in include(). PR: i386/85652 Submitted by: Ben Thomas Modified: stable/7/sys/boot/common/interp.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/boot/common/interp.c ============================================================================== --- stable/7/sys/boot/common/interp.c Sat Feb 26 12:04:34 2011 (r219053) +++ stable/7/sys/boot/common/interp.c Sat Feb 26 12:07:16 2011 (r219054) @@ -246,6 +246,17 @@ include(const char *filename) if (*cp == '\0') continue; /* ignore empty line, save memory */ sp = malloc(sizeof(struct includeline) + strlen(cp) + 1); + /* On malloc failure (it happens!), free as much as possible and exit */ + if (sp == NULL) { + while (script != NULL) { + se = script; + script = script->next; + free(se); + } + sprintf(command_errbuf, "file '%s' line %d: memory allocation " + "failure - aborting\n", filename, line); + return (CMD_ERROR); + } strcpy(sp->text, cp); #ifndef BOOT_FORTH sp->flags = flags; From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 20:04:14 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEFE41065695; Sat, 26 Feb 2011 20:04:14 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9C7CF8FC18; Sat, 26 Feb 2011 20:04:14 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QK4EV1091979; Sat, 26 Feb 2011 20:04:14 GMT (envelope-from ume@svn.freebsd.org) Received: (from ume@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QK4EMT091975; Sat, 26 Feb 2011 20:04:14 GMT (envelope-from ume@svn.freebsd.org) Message-Id: <201102262004.p1QK4EMT091975@svn.freebsd.org> From: Hajimu UMEMOTO Date: Sat, 26 Feb 2011 20:04:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219062 - stable/8/usr.bin/netstat X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 20:04:14 -0000 Author: ume Date: Sat Feb 26 20:04:14 2011 New Revision: 219062 URL: http://svn.freebsd.org/changeset/base/219062 Log: MFC r217642: - Hide the internal scope address representation of the KAME IPv6 stack from the output of `netstat -ani'. - The node-local multicast address in the output of `netstat -rn' should be handled as well. Modified: stable/8/usr.bin/netstat/if.c stable/8/usr.bin/netstat/netstat.h stable/8/usr.bin/netstat/route.c Directory Properties: stable/8/usr.bin/netstat/ (props changed) Modified: stable/8/usr.bin/netstat/if.c ============================================================================== --- stable/8/usr.bin/netstat/if.c Sat Feb 26 18:54:54 2011 (r219061) +++ stable/8/usr.bin/netstat/if.c Sat Feb 26 20:04:14 2011 (r219062) @@ -63,6 +63,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef INET6 +#include +#endif #include #include #include @@ -79,7 +82,7 @@ static void sidewaysintpr(int, u_long); static void catchalarm(int); #ifdef INET6 -static char ntop_buf[INET6_ADDRSTRLEN]; /* for inet_ntop() */ +static char addr_buf[NI_MAXHOST]; /* for getnameinfo() */ #endif /* @@ -347,13 +350,14 @@ intpr(int interval1, u_long ifnetaddr, v #ifdef INET6 case AF_INET6: sockin6 = (struct sockaddr_in6 *)sa; + in6_fillscopeid(&ifaddr.in6.ia_addr); printf("%-13.13s ", netname6(&ifaddr.in6.ia_addr, &ifaddr.in6.ia_prefixmask.sin6_addr)); - printf("%-17.17s ", - inet_ntop(AF_INET6, - &sockin6->sin6_addr, - ntop_buf, sizeof(ntop_buf))); + in6_fillscopeid(sockin6); + getnameinfo(sa, sa->sa_len, addr_buf, + sizeof(addr_buf), 0, 0, NI_NUMERICHOST); + printf("%-17.17s ", addr_buf); network_layer = 1; break; @@ -475,13 +479,13 @@ intpr(int interval1, u_long ifnetaddr, v break; #ifdef INET6 case AF_INET6: + in6_fillscopeid(&msa.in6); + getnameinfo(&msa.sa, msa.sa.sa_len, + addr_buf, sizeof(addr_buf), 0, 0, + NI_NUMERICHOST); printf("%*s %-19.19s(refs: %d)\n", Wflag ? 27 : 25, "", - inet_ntop(AF_INET6, - &msa.in6.sin6_addr, - ntop_buf, - sizeof(ntop_buf)), - ifma.ifma_refcount); + addr_buf, ifma.ifma_refcount); break; #endif /* INET6 */ case AF_LINK: Modified: stable/8/usr.bin/netstat/netstat.h ============================================================================== --- stable/8/usr.bin/netstat/netstat.h Sat Feb 26 18:54:54 2011 (r219061) +++ stable/8/usr.bin/netstat/netstat.h Sat Feb 26 20:04:14 2011 (r219062) @@ -106,6 +106,7 @@ void mrt6_stats(u_long); struct sockaddr_in6; struct in6_addr; +void in6_fillscopeid(struct sockaddr_in6 *); char *routename6(struct sockaddr_in6 *); const char *netname6(struct sockaddr_in6 *, struct in6_addr *); void inet6print(struct in6_addr *, int, const char *, int); Modified: stable/8/usr.bin/netstat/route.c ============================================================================== --- stable/8/usr.bin/netstat/route.c Sat Feb 26 18:54:54 2011 (r219061) +++ stable/8/usr.bin/netstat/route.c Sat Feb 26 20:04:14 2011 (r219062) @@ -637,18 +637,8 @@ fmt_sockaddr(struct sockaddr *sa, struct case AF_INET6: { struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)sa; - struct in6_addr *in6 = &sa6->sin6_addr; - /* - * XXX: This is a special workaround for KAME kernels. - * sin6_scope_id field of SA should be set in the future. - */ - if (IN6_IS_ADDR_LINKLOCAL(in6) || - IN6_IS_ADDR_MC_LINKLOCAL(in6)) { - /* XXX: override is ok? */ - sa6->sin6_scope_id = (u_int32_t)ntohs(*(u_short *)&in6->s6_addr[2]); - *(u_short *)&in6->s6_addr[2] = 0; - } + in6_fillscopeid(sa6); if (flags & RTF_HOST) cp = routename6(sa6); @@ -899,6 +889,25 @@ netname(in_addr_t in, u_long mask) #undef NSHIFT #ifdef INET6 +void +in6_fillscopeid(struct sockaddr_in6 *sa6) +{ +#if defined(__KAME__) + /* + * XXX: This is a special workaround for KAME kernels. + * sin6_scope_id field of SA should be set in the future. + */ + if (IN6_IS_ADDR_LINKLOCAL(&sa6->sin6_addr) || + IN6_IS_ADDR_MC_NODELOCAL(&sa6->sin6_addr) || + IN6_IS_ADDR_MC_LINKLOCAL(&sa6->sin6_addr)) { + /* XXX: override is ok? */ + sa6->sin6_scope_id = + ntohs(*(u_int16_t *)&sa6->sin6_addr.s6_addr[2]); + sa6->sin6_addr.s6_addr[2] = sa6->sin6_addr.s6_addr[3] = 0; + } +#endif +} + const char * netname6(struct sockaddr_in6 *sa6, struct in6_addr *mask) { From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 21:08:10 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10C4D1065670; Sat, 26 Feb 2011 21:08:10 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D8CE48FC08; Sat, 26 Feb 2011 21:08:09 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QL89uR094984; Sat, 26 Feb 2011 21:08:09 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QL89QW094982; Sat, 26 Feb 2011 21:08:09 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201102262108.p1QL89QW094982@svn.freebsd.org> From: Alan Cox Date: Sat, 26 Feb 2011 21:08:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219063 - stable/8/sys/vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 21:08:10 -0000 Author: alc Date: Sat Feb 26 21:08:09 2011 New Revision: 219063 URL: http://svn.freebsd.org/changeset/base/219063 Log: MFC r216090 Correct an error in the allocation of the vm_page_dump array in vm_page_startup(). Specifically, the dump_avail array should be used instead of the phys_avail array to calculate the size of vm_page_dump. Modified: stable/8/sys/vm/vm_page.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/vm/vm_page.c ============================================================================== --- stable/8/sys/vm/vm_page.c Sat Feb 26 20:04:14 2011 (r219062) +++ stable/8/sys/vm/vm_page.c Sat Feb 26 21:08:09 2011 (r219063) @@ -220,7 +220,6 @@ vm_page_startup(vm_offset_t vaddr) vm_paddr_t new_end; int i; vm_paddr_t pa; - int nblocks; vm_paddr_t last_pa; char *list; @@ -232,7 +231,6 @@ vm_page_startup(vm_offset_t vaddr) biggestsize = 0; biggestone = 0; - nblocks = 0; vaddr = round_page(vaddr); for (i = 0; phys_avail[i + 1]; i += 2) { @@ -254,7 +252,6 @@ vm_page_startup(vm_offset_t vaddr) low_water = phys_avail[i]; if (phys_avail[i + 1] > high_water) high_water = phys_avail[i + 1]; - ++nblocks; } #ifdef XEN @@ -305,7 +302,11 @@ vm_page_startup(vm_offset_t vaddr) * minidump code. In theory, they are not needed on i386, but are * included should the sf_buf code decide to use them. */ - page_range = phys_avail[(nblocks - 1) * 2 + 1] / PAGE_SIZE; + last_pa = 0; + for (i = 0; dump_avail[i + 1] != 0; i += 2) + if (dump_avail[i + 1] > last_pa) + last_pa = dump_avail[i + 1]; + page_range = last_pa / PAGE_SIZE; vm_page_dump_size = round_page(roundup2(page_range, NBBY) / NBBY); new_end -= vm_page_dump_size; vm_page_dump = (void *)(uintptr_t)pmap_map(&vaddr, new_end, From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 21:18:38 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A860D106564A; Sat, 26 Feb 2011 21:18:38 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 945818FC0C; Sat, 26 Feb 2011 21:18:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QLIcE3095425; Sat, 26 Feb 2011 21:18:38 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QLIc4t095423; Sat, 26 Feb 2011 21:18:38 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201102262118.p1QLIc4t095423@svn.freebsd.org> From: Alan Cox Date: Sat, 26 Feb 2011 21:18:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219064 - stable/8/sys/vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 21:18:38 -0000 Author: alc Date: Sat Feb 26 21:18:38 2011 New Revision: 219064 URL: http://svn.freebsd.org/changeset/base/219064 Log: MFC r206140 Re-enable the call to pmap_release() by vmspace_dofree(). Modified: stable/8/sys/vm/vm_map.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/vm/vm_map.c ============================================================================== --- stable/8/sys/vm/vm_map.c Sat Feb 26 21:08:09 2011 (r219063) +++ stable/8/sys/vm/vm_map.c Sat Feb 26 21:18:38 2011 (r219064) @@ -316,6 +316,7 @@ vm_init2(void) static inline void vmspace_dofree(struct vmspace *vm) { + CTR1(KTR_VM, "vmspace_free: %p", vm); /* @@ -332,12 +333,8 @@ vmspace_dofree(struct vmspace *vm) (void)vm_map_remove(&vm->vm_map, vm->vm_map.min_offset, vm->vm_map.max_offset); - /* - * XXX Comment out the pmap_release call for now. The - * vmspace_zone is marked as UMA_ZONE_NOFREE, and bugs cause - * pmap.resident_count to be != 0 on exit sometimes. - */ -/* pmap_release(vmspace_pmap(vm)); */ + pmap_release(vmspace_pmap(vm)); + vm->vm_map.pmap = NULL; uma_zfree(vmspace_zone, vm); } From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 21:24:14 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F38A7106566B; Sat, 26 Feb 2011 21:24:13 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E1E628FC1C; Sat, 26 Feb 2011 21:24:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QLODGV095691; Sat, 26 Feb 2011 21:24:13 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QLODd6095689; Sat, 26 Feb 2011 21:24:13 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201102262124.p1QLODd6095689@svn.freebsd.org> From: Alan Cox Date: Sat, 26 Feb 2011 21:24:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219065 - stable/8/sys/vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 21:24:14 -0000 Author: alc Date: Sat Feb 26 21:24:13 2011 New Revision: 219065 URL: http://svn.freebsd.org/changeset/base/219065 Log: MFC r217477 Clean up the start of vm_page_alloc(). Modified: stable/8/sys/vm/vm_page.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/vm/vm_page.c ============================================================================== --- stable/8/sys/vm/vm_page.c Sat Feb 26 21:18:38 2011 (r219064) +++ stable/8/sys/vm/vm_page.c Sat Feb 26 21:24:13 2011 (r219065) @@ -1102,23 +1102,19 @@ vm_page_alloc(vm_object_t object, vm_pin vm_page_t m; int flags, page_req; - page_req = req & VM_ALLOC_CLASS_MASK; - KASSERT(curthread->td_intr_nesting_level == 0 || - page_req == VM_ALLOC_INTERRUPT, - ("vm_page_alloc(NORMAL|SYSTEM) in interrupt context")); - if ((req & VM_ALLOC_NOOBJ) == 0) { KASSERT(object != NULL, ("vm_page_alloc: NULL object.")); VM_OBJECT_LOCK_ASSERT(object, MA_OWNED); } + page_req = req & VM_ALLOC_CLASS_MASK; + /* * The pager is allowed to eat deeper into the free page list. */ - if ((curproc == pageproc) && (page_req != VM_ALLOC_INTERRUPT)) { + if ((curproc == pageproc) && (page_req != VM_ALLOC_INTERRUPT)) page_req = VM_ALLOC_SYSTEM; - }; mtx_lock(&vm_page_queue_free_mtx); if (cnt.v_free_count + cnt.v_cache_count > cnt.v_free_reserved || From owner-svn-src-stable@FreeBSD.ORG Sat Feb 26 21:27:41 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C3129106566C; Sat, 26 Feb 2011 21:27:41 +0000 (UTC) (envelope-from alc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B17118FC08; Sat, 26 Feb 2011 21:27:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1QLRfep095877; Sat, 26 Feb 2011 21:27:41 GMT (envelope-from alc@svn.freebsd.org) Received: (from alc@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1QLRffU095875; Sat, 26 Feb 2011 21:27:41 GMT (envelope-from alc@svn.freebsd.org) Message-Id: <201102262127.p1QLRffU095875@svn.freebsd.org> From: Alan Cox Date: Sat, 26 Feb 2011 21:27:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r219066 - stable/8/sys/vm X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Feb 2011 21:27:41 -0000 Author: alc Date: Sat Feb 26 21:27:41 2011 New Revision: 219066 URL: http://svn.freebsd.org/changeset/base/219066 Log: MFC r217453 For some time now, the kernel and kmem objects have been ordinary OBJT_PHYS objects. Thus, there is no need for handling them specially in vm_fault(). In fact, this special case handling would have led to an assertion failure just before the call to pmap_enter(). Modified: stable/8/sys/vm/vm_fault.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/vm/vm_fault.c ============================================================================== --- stable/8/sys/vm/vm_fault.c Sat Feb 26 21:24:13 2011 (r219065) +++ stable/8/sys/vm/vm_fault.c Sat Feb 26 21:27:41 2011 (r219066) @@ -397,11 +397,8 @@ RetryFault:; * found the page ). */ vm_page_busy(fs.m); - if (fs.m->valid != VM_PAGE_BITS_ALL && - fs.m->object != kernel_object && fs.m->object != kmem_object) { + if (fs.m->valid != VM_PAGE_BITS_ALL) goto readrest; - } - break; }