From owner-svn-src-stable-7@FreeBSD.ORG Mon Sep 28 15:10:09 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 770F4106566B; Mon, 28 Sep 2009 15:10:09 +0000 (UTC) (envelope-from gallatin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 64EA68FC17; Mon, 28 Sep 2009 15:10: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 n8SFA9F7058134; Mon, 28 Sep 2009 15:10:09 GMT (envelope-from gallatin@svn.freebsd.org) Received: (from gallatin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8SFA9sx058132; Mon, 28 Sep 2009 15:10:09 GMT (envelope-from gallatin@svn.freebsd.org) Message-Id: <200909281510.n8SFA9sx058132@svn.freebsd.org> From: Andrew Gallatin Date: Mon, 28 Sep 2009 15:10:09 +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: r197577 - in stable/7/sys: . contrib/pf dev/mxge X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 15:10:09 -0000 Author: gallatin Date: Mon Sep 28 15:10:08 2009 New Revision: 197577 URL: http://svn.freebsd.org/changeset/base/197577 Log: MFC 197395: Improve mxge watchdog routine's ability to reliably reset a failed NIC Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/mxge/if_mxge.c Modified: stable/7/sys/dev/mxge/if_mxge.c ============================================================================== --- stable/7/sys/dev/mxge/if_mxge.c Mon Sep 28 11:31:21 2009 (r197576) +++ stable/7/sys/dev/mxge/if_mxge.c Mon Sep 28 15:10:08 2009 (r197577) @@ -135,7 +135,7 @@ MODULE_DEPEND(mxge, zlib, 1, 1, 1); static int mxge_load_firmware(mxge_softc_t *sc, int adopt); static int mxge_send_cmd(mxge_softc_t *sc, uint32_t cmd, mxge_cmd_t *data); -static int mxge_close(mxge_softc_t *sc); +static int mxge_close(mxge_softc_t *sc, int down); static int mxge_open(mxge_softc_t *sc); static void mxge_tick(void *arg); @@ -1291,8 +1291,7 @@ mxge_reset(mxge_softc_t *sc, int interru ss->lro_queued = 0; ss->lro_flushed = 0; if (ss->fw_stats != NULL) { - ss->fw_stats->valid = 0; - ss->fw_stats->send_done_count = 0; + bzero(ss->fw_stats, sizeof *ss->fw_stats); } } sc->rdma_tags_available = 15; @@ -1365,7 +1364,7 @@ mxge_change_lro_locked(mxge_softc_t *sc, ifp->if_capenable |= IFCAP_LRO; sc->lro_cnt = lro_cnt; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - mxge_close(sc); + mxge_close(sc, 0); err = mxge_open(sc); } return err; @@ -1481,6 +1480,10 @@ mxge_add_sysctls(mxge_softc_t *sc) "read_write_dma_MBs", CTLFLAG_RD, &sc->read_write_dma, 0, "DMA concurrent Read/Write speed in MB/s"); + SYSCTL_ADD_INT(ctx, children, OID_AUTO, + "watchdog_resets", + CTLFLAG_RD, &sc->watchdog_resets, + 0, "Number of times NIC was reset"); /* performance related tunables */ @@ -3377,28 +3380,29 @@ abort: } static int -mxge_close(mxge_softc_t *sc) +mxge_close(mxge_softc_t *sc, int down) { mxge_cmd_t cmd; int err, old_down_cnt; callout_stop(&sc->co_hdl); sc->ifp->if_drv_flags &= ~IFF_DRV_RUNNING; - old_down_cnt = sc->down_cnt; - mb(); - err = mxge_send_cmd(sc, MXGEFW_CMD_ETHERNET_DOWN, &cmd); - if (err) { - device_printf(sc->dev, "Couldn't bring down link\n"); - } - if (old_down_cnt == sc->down_cnt) { - /* wait for down irq */ - DELAY(10 * sc->intr_coal_delay); - } - mb(); - if (old_down_cnt == sc->down_cnt) { - device_printf(sc->dev, "never got down irq\n"); + if (!down) { + old_down_cnt = sc->down_cnt; + mb(); + err = mxge_send_cmd(sc, MXGEFW_CMD_ETHERNET_DOWN, &cmd); + if (err) { + device_printf(sc->dev, "Couldn't bring down link\n"); + } + if (old_down_cnt == sc->down_cnt) { + /* wait for down irq */ + DELAY(10 * sc->intr_coal_delay); + } + mb(); + if (old_down_cnt == sc->down_cnt) { + device_printf(sc->dev, "never got down irq\n"); + } } - mxge_free_mbufs(sc); return 0; @@ -3451,7 +3455,8 @@ static int mxge_watchdog_reset(mxge_softc_t *sc) { struct pci_devinfo *dinfo; - int err; + struct mxge_slice_state *ss; + int err, running, s, num_tx_slices = 1; uint32_t reboot; uint16_t cmd; @@ -3485,6 +3490,30 @@ mxge_watchdog_reset(mxge_softc_t *sc) reboot = mxge_read_reboot(sc); device_printf(sc->dev, "NIC rebooted, status = 0x%x\n", reboot); + running = sc->ifp->if_drv_flags & IFF_DRV_RUNNING; + if (running) { + + /* + * quiesce NIC so that TX routines will not try to + * xmit after restoration of BAR + */ + + /* Mark the link as down */ + if (sc->link_state) { + sc->link_state = 0; + if_link_state_change(sc->ifp, + LINK_STATE_DOWN); + } +#ifdef IFNET_BUF_RING + num_tx_slices = sc->num_slices; +#endif + /* grab all TX locks to ensure no tx */ + for (s = 0; s < num_tx_slices; s++) { + ss = &sc->ss[s]; + mtx_lock(&ss->tx.mtx); + } + mxge_close(sc, 1); + } /* restore PCI configuration space */ dinfo = device_get_ivars(sc->dev); pci_cfg_restore(sc->dev, dinfo); @@ -3492,10 +3521,22 @@ mxge_watchdog_reset(mxge_softc_t *sc) /* and redo any changes we made to our config space */ mxge_setup_cfg_space(sc); - if (sc->ifp->if_drv_flags & IFF_DRV_RUNNING) { - mxge_close(sc); - err = mxge_open(sc); + /* reload f/w */ + err = mxge_load_firmware(sc, 0); + if (err) { + device_printf(sc->dev, + "Unable to re-load f/w\n"); } + if (running) { + if (!err) + err = mxge_open(sc); + /* release all TX locks */ + for (s = 0; s < num_tx_slices; s++) { + ss = &sc->ss[s]; + mtx_unlock(&ss->tx.mtx); + } + } + sc->watchdog_resets++; } else { device_printf(sc->dev, "NIC did not reboot, ring state:\n"); device_printf(sc->dev, "tx.req=%d tx.done=%d\n", @@ -3505,6 +3546,9 @@ mxge_watchdog_reset(mxge_softc_t *sc) be32toh(sc->ss->fw_stats->send_done_count)); device_printf(sc->dev, "not resetting\n"); } + if (err) + device_printf(sc->dev, "watchdog reset failed\n"); + return (err); } @@ -3590,11 +3634,11 @@ mxge_change_mtu(mxge_softc_t *sc, int mt old_mtu = ifp->if_mtu; ifp->if_mtu = mtu; if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - mxge_close(sc); + mxge_close(sc, 0); err = mxge_open(sc); if (err != 0) { ifp->if_mtu = old_mtu; - mxge_close(sc); + mxge_close(sc, 0); (void) mxge_open(sc); } } @@ -3648,7 +3692,7 @@ mxge_ioctl(struct ifnet *ifp, u_long com } } else { if (ifp->if_drv_flags & IFF_DRV_RUNNING) { - mxge_close(sc); + mxge_close(sc, 0); } } mtx_unlock(&sc->driver_mtx); @@ -4345,7 +4389,7 @@ mxge_detach(device_t dev) } mtx_lock(&sc->driver_mtx); if (sc->ifp->if_drv_flags & IFF_DRV_RUNNING) - mxge_close(sc); + mxge_close(sc, 0); mtx_unlock(&sc->driver_mtx); ether_ifdetach(sc->ifp); callout_drain(&sc->co_hdl); From owner-svn-src-stable-7@FreeBSD.ORG Mon Sep 28 22:03:02 2009 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2427D1065695; Mon, 28 Sep 2009 22:03:02 +0000 (UTC) (envelope-from edwin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C55FB8FC19; Mon, 28 Sep 2009 22:03: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 n8SM31LF067432; Mon, 28 Sep 2009 22:03:01 GMT (envelope-from edwin@svn.freebsd.org) Received: (from edwin@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8SM318J067429; Mon, 28 Sep 2009 22:03:01 GMT (envelope-from edwin@svn.freebsd.org) Message-Id: <200909282203.n8SM318J067429@svn.freebsd.org> From: Edwin Groothuis Date: Mon, 28 Sep 2009 22:03: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: r197598 - stable/7/share/zoneinfo X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Sep 2009 22:03:02 -0000 Author: edwin Date: Mon Sep 28 22:03:01 2009 New Revision: 197598 URL: http://svn.freebsd.org/changeset/base/197598 Log: MFC of r197597 Update to tzdata2009n: Pakistan will go back from DST at 1 October. Headsup for changes in Argentina. Modified: stable/7/share/zoneinfo/ (props changed) stable/7/share/zoneinfo/asia stable/7/share/zoneinfo/southamerica Modified: stable/7/share/zoneinfo/asia ============================================================================== --- stable/7/share/zoneinfo/asia Mon Sep 28 21:53:28 2009 (r197597) +++ stable/7/share/zoneinfo/asia Mon Sep 28 22:03:01 2009 (r197598) @@ -1,5 +1,5 @@ # 
-# @(#)asia	8.40
+# @(#)asia	8.41
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -1674,8 +1674,15 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 # advance clocks in the country by one hour from April 15 to
 # conserve energy"
 
-# From Arthur David Olson (2009-04-10):
-# Assume for now that Pakistan will end DST in 2009 as it did in 2008.
+# From Steffen Thorsen (2009-09-17):
+# "The News International," Pakistan reports that: "The Federal
+# Government has decided to restore the previous time by moving the
+# clocks backward by one hour from October 1. A formal announcement to
+# this effect will be made after the Prime Minister grants approval in
+# this regard." 
+# 
+# http://www.thenews.com.pk/updates.asp?id=87168
+# 
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
@@ -1683,7 +1690,7 @@ Rule Pakistan	2002	only	-	Oct	Sun>=2	0:0
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
 Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
 Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
-Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
+Rule Pakistan	2009	only	-	Oct	1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep

Modified: stable/7/share/zoneinfo/southamerica
==============================================================================
--- stable/7/share/zoneinfo/southamerica	Mon Sep 28 21:53:28 2009	(r197597)
+++ stable/7/share/zoneinfo/southamerica	Mon Sep 28 22:03:01 2009	(r197598)
@@ -1,5 +1,5 @@
 # 
-# @(#)southamerica	8.36
+# @(#)southamerica	8.37
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 
@@ -397,7 +397,37 @@ Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:0
 # is that "The province will most likely follow the next daylight saving schedule,
 # which is planned for the second Sunday in October."
 
-#
+# From Alexander Krivenyshev (2009-09-19):
+# Some  Argentinian Provinces (Buenos Aires, Entre Ríos) are opposing to the
+# Daylight Saving Time for the 2009-2010 season.
+#
+# (Spanish)
+# "El cambio de huso horario en Entre Ríos deberá ser aprobado por la
+# Legislatura":
+# 
+# http://www.analisisdigital.com.ar/noticias.php?ed=1&di=0&no=110168
+# 
+# English translation - "The time zone change in Entre Rios must be approved by
+# the Legislature."
+#
+# (Spanish)
+# "Mar del Plata no quiere cambiar la hora."
+# 
+# http://www.mensajeroweb.com.ar/index.php?x=nota/33861/1/mar-del-plata-no-quiere-cambiar-la-hora
+# 
+# English translation - "Mar del Plata is not to change the time"
+#
+# or
+# (some English translation)
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_argentina07.html
+# 
+
+# From Arthur David Olson (2009-09-22):
+# "Mar del Plata no quiere cambiar la hora" translates to
+# "Mar del Plata doesn't want to change the time"
+# (less definitive than "is not to").
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
 # Buenos Aires (BA), Capital Federal (CF),

From owner-svn-src-stable-7@FreeBSD.ORG  Mon Sep 28 22:29:29 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C9C7106568F;
	Mon, 28 Sep 2009 22:29:29 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AAE48FC18;
	Mon, 28 Sep 2009 22:29: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 n8SMTTiQ068089;
	Mon, 28 Sep 2009 22:29:29 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8SMTTGM068086;
	Mon, 28 Sep 2009 22:29:29 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <200909282229.n8SMTTGM068086@svn.freebsd.org>
From: Xin LI 
Date: Mon, 28 Sep 2009 22:29: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: r197601 - in stable/7/lib/libc: . net resolv
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Mon, 28 Sep 2009 22:29:29 -0000

Author: delphij
Date: Mon Sep 28 22:29:28 2009
New Revision: 197601
URL: http://svn.freebsd.org/changeset/base/197601

Log:
  MFC 193023+193024:
  
  Add an option to enforce strict RFC 1034 compliance.
  Document how to enable strict RFC 1034 enforcements.
  
  PR:		kern/129477

Modified:
  stable/7/lib/libc/   (props changed)
  stable/7/lib/libc/net/resolver.3
  stable/7/lib/libc/resolv/res_comp.c

Modified: stable/7/lib/libc/net/resolver.3
==============================================================================
--- stable/7/lib/libc/net/resolver.3	Mon Sep 28 22:18:38 2009	(r197600)
+++ stable/7/lib/libc/net/resolver.3	Mon Sep 28 22:29:28 2009	(r197601)
@@ -28,7 +28,7 @@
 .\"     @(#)resolver.3	8.1 (Berkeley) 6/4/93
 .\" $FreeBSD$
 .\"
-.Dd November 4, 2006
+.Dd May 29, 2009
 .Dt RESOLVER 3
 .Os
 .Sh NAME
@@ -401,6 +401,19 @@ function properly if the programmer atte
 .Va _res
 structure in an attempt to replace the per-thread version referred to
 by that macro.
+.Pp
+The following compile-time option can be specified to change the default
+behavior of resolver routines when necessary.
+.Bl -tag -width RES_ENFORCE_RFC1034
+.It Dv RES_ENFORCE_RFC1034
+If this symbol is defined during compile-time,
+.Fn res_search
+will enforce RFC 1034 check, namely, disallow using of underscore character
+within host names.
+This is used by the standard host lookup routines like
+.Xr gethostbyname 3 .
+For compatibility reasons this option is not enabled by default.
+.El
 .Sh RETURN VALUES
 The
 .Fn res_init

Modified: stable/7/lib/libc/resolv/res_comp.c
==============================================================================
--- stable/7/lib/libc/resolv/res_comp.c	Mon Sep 28 22:18:38 2009	(r197600)
+++ stable/7/lib/libc/resolv/res_comp.c	Mon Sep 28 22:29:28 2009	(r197601)
@@ -148,7 +148,11 @@ dn_skipname(const u_char *ptr, const u_c
 #define digitchar(c) ((c) >= 0x30 && (c) <= 0x39)
 
 #define borderchar(c) (alphachar(c) || digitchar(c))
+#ifdef	RES_ENFORCE_RFC1034
+#define middlechar(c) (borderchar(c) || hyphenchar(c))
+#else
 #define middlechar(c) (borderchar(c) || hyphenchar(c) || underscorechar(c))
+#endif
 #define	domainchar(c) ((c) > 0x20 && (c) < 0x7f)
 
 int

From owner-svn-src-stable-7@FreeBSD.ORG  Tue Sep 29 16:19:49 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 27EBA106566C;
	Tue, 29 Sep 2009 16:19:49 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 15D058FC15;
	Tue, 29 Sep 2009 16:19: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 n8TGJmOq089761;
	Tue, 29 Sep 2009 16:19:48 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8TGJmRg089759;
	Tue, 29 Sep 2009 16:19:48 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <200909291619.n8TGJmRg089759@svn.freebsd.org>
From: Alexander Motin 
Date: Tue, 29 Sep 2009 16:19: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: r197617 - stable/7/sys/dev/ata
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Tue, 29 Sep 2009 16:19:49 -0000

Author: mav
Date: Tue Sep 29 16:19:48 2009
New Revision: 197617
URL: http://svn.freebsd.org/changeset/base/197617

Log:
  Partial MFC rev. 191568:
  Do not hide second channel of ATI IXP700 ATA controller.
  While this chip indeed has only one PATA channel, second channel of the
  controller is used by two SATA channels working in legacy emulation mode.

Modified:
  stable/7/sys/dev/ata/ata-chipset.c

Modified: stable/7/sys/dev/ata/ata-chipset.c
==============================================================================
--- stable/7/sys/dev/ata/ata-chipset.c	Tue Sep 29 12:59:31 2009	(r197616)
+++ stable/7/sys/dev/ata/ata-chipset.c	Tue Sep 29 16:19:48 2009	(r197617)
@@ -1406,9 +1406,8 @@ ata_ati_chipinit(device_t dev)
     if (ata_setup_interrupt(dev))
 	return ENXIO;
 
-    /* IXP600 & IXP700 only have 1 PATA channel */
-    if ((ctlr->chip->chipid == ATA_ATI_IXP600) ||
-	(ctlr->chip->chipid == ATA_ATI_IXP700))
+    /* IXP600 only have 1 PATA channel */
+    if (ctlr->chip->chipid == ATA_ATI_IXP600)
 	ctlr->channels = 1;
 
     ctlr->setmode = ata_ati_setmode;

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Sep 30 19:40:51 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 806001065692;
	Wed, 30 Sep 2009 19:40:51 +0000 (UTC) (envelope-from zml@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 65FCF8FC22;
	Wed, 30 Sep 2009 19:40: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 n8UJep8j024251;
	Wed, 30 Sep 2009 19:40:51 GMT (envelope-from zml@svn.freebsd.org)
Received: (from zml@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n8UJep9X024249;
	Wed, 30 Sep 2009 19:40:51 GMT (envelope-from zml@svn.freebsd.org)
Message-Id: <200909301940.n8UJep9X024249@svn.freebsd.org>
From: Zachary Loafman 
Date: Wed, 30 Sep 2009 19:40:51 +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: r197652 - stable/7/sys/kern
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 30 Sep 2009 19:40:51 -0000

Author: zml
Date: Wed Sep 30 19:40:51 2009
New Revision: 197652
URL: http://svn.freebsd.org/changeset/base/197652

Log:
  sched_ule in stable/7 has a bug (introduced in r180607) where a thread
  that is running often will appear to not be running much at all.
  
  sched_ule has a much less accurate mechanism for determining how much
  various threads are running.  Every tick, hardclock_cpu() calls
  sched_tick(), and the currently running thread gets it's ts_ticks
  incremented.  Whenever an event of interest happens to a thread, the
  ts_ticks value may be decayed; it's supposed to be a rough running
  average of the last 10 seconds.  So there's a ts_ltick which is the last
  tick we looked at decaying ts_ticks.
  
  The increment in sched_tick() was slightly buggy on SMP, because a
  thread could get incremented on two different CPUs in the rare case
  where it was swapped from one which had run sched_tick() this tick to
  one which hadn't.  The fix that was used relied on ts_ltick and only
  incremented ts_ticks if ts_ltick was not from the current tick.
  This is buggy, because any time the thread began running on a CPU in the
  current tick, we would have set ts_ltick to ticks, so if it was still
  running at sched_tick() we wouldn't increment.
  
  A system with a single process that hogs the CPU and is otherwise idle,
  therefore, would look like all threads were at 0%. The threads not
  running are really at 0%, and the hog is not getting its ts_ticks
  incremented since it went through some other runq stats that set
  ts_ltick.  On a 2-way SMP the thread used to get shuffled regularly
  between CPUs (I think fallout from this bug), so it would appear a
  little over 50% busy.
  
  The fix is to use a separate variable to record when the last
  sched_tick() increment happened.
  
  Submitted by:       Matthew Fleming (matthew.fleming at isilon.com)
  Reviewed by:        zml, dfr
  Approved by:        dfr (mentor)

Modified:
  stable/7/sys/kern/sched_ule.c

Modified: stable/7/sys/kern/sched_ule.c
==============================================================================
--- stable/7/sys/kern/sched_ule.c	Wed Sep 30 19:19:53 2009	(r197651)
+++ stable/7/sys/kern/sched_ule.c	Wed Sep 30 19:40:51 2009	(r197652)
@@ -101,6 +101,7 @@ struct td_sched {	
 	u_int		ts_runtime;	/* Number of ticks we were running */
 	/* The following variables are only used for pctcpu calculation */
 	int		ts_ltick;	/* Last tick that we were running on */
+	int		ts_incrtick;	/* Last tick that we incremented on */
 	int		ts_ftick;	/* First tick that we were running on */
 	int		ts_ticks;	/* Tick count */
 #ifdef SMP
@@ -2075,6 +2076,7 @@ sched_fork_thread(struct thread *td, str
 	 */
 	ts2->ts_ticks = ts->ts_ticks;
 	ts2->ts_ltick = ts->ts_ltick;
+	ts2->ts_incrtick = ts->ts_incrtick;
 	ts2->ts_ftick = ts->ts_ftick;
 	child->td_user_pri = td->td_user_pri;
 	child->td_base_user_pri = td->td_base_user_pri;
@@ -2266,10 +2268,11 @@ sched_tick(void)
 	 * Ticks is updated asynchronously on a single cpu.  Check here to
 	 * avoid incrementing ts_ticks multiple times in a single tick.
 	 */
-	if (ts->ts_ltick == ticks)
+	if (ts->ts_incrtick == ticks)
 		return;
 	/* Adjust ticks for pctcpu */
 	ts->ts_ticks += 1 << SCHED_TICK_SHIFT;
+	ts->ts_incrtick = ticks;
 	ts->ts_ltick = ticks;
 	/*
 	 * Update if we've exceeded our desired tick threshhold by over one

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Sep 30 19:53:02 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 576AE1065693;
	Wed, 30 Sep 2009 19:53:02 +0000 (UTC)
	(envelope-from kostikbel@gmail.com)
Received: from mail.zoral.com.ua (skuns.zoral.com.ua [91.193.166.194])
	by mx1.freebsd.org (Postfix) with ESMTP id DF88A8FC13;
	Wed, 30 Sep 2009 19:53:01 +0000 (UTC)
Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua
	[10.1.1.148])
	by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id n8UJqsv9038009
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
	Wed, 30 Sep 2009 22:52:54 +0300 (EEST)
	(envelope-from kostikbel@gmail.com)
Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1])
	by deviant.kiev.zoral.com.ua (8.14.3/8.14.3) with ESMTP id
	n8UJqsGQ039860; Wed, 30 Sep 2009 22:52:54 +0300 (EEST)
	(envelope-from kostikbel@gmail.com)
Received: (from kostik@localhost)
	by deviant.kiev.zoral.com.ua (8.14.3/8.14.3/Submit) id n8UJqsU9039859; 
	Wed, 30 Sep 2009 22:52:54 +0300 (EEST)
	(envelope-from kostikbel@gmail.com)
X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to
	kostikbel@gmail.com using -f
Date: Wed, 30 Sep 2009 22:52:54 +0300
From: Kostik Belousov 
To: Zachary Loafman 
Message-ID: <20090930195254.GK3130@deviant.kiev.zoral.com.ua>
References: <200909301940.n8UJep9X024249@svn.freebsd.org>
Mime-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
	protocol="application/pgp-signature"; boundary="fLj60tP2PZ34xyqD"
Content-Disposition: inline
In-Reply-To: <200909301940.n8UJep9X024249@svn.freebsd.org>
User-Agent: Mutt/1.4.2.3i
X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua
X-Virus-Status: Clean
X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00
	autolearn=ham version=3.2.5
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	skuns.kiev.zoral.com.ua
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: r197652 - stable/7/sys/kern
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 30 Sep 2009 19:53:02 -0000


--fLj60tP2PZ34xyqD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Wed, Sep 30, 2009 at 07:40:51PM +0000, Zachary Loafman wrote:
> Author: zml
> Date: Wed Sep 30 19:40:51 2009
> New Revision: 197652
> URL: http://svn.freebsd.org/changeset/base/197652
>=20
> Log:
>   sched_ule in stable/7 has a bug (introduced in r180607) where a thread
>   that is running often will appear to not be running much at all.
Why is this not a problem on HEAD ?

>  =20
>   sched_ule has a much less accurate mechanism for determining how much
>   various threads are running.  Every tick, hardclock_cpu() calls
>   sched_tick(), and the currently running thread gets it's ts_ticks
>   incremented.  Whenever an event of interest happens to a thread, the
>   ts_ticks value may be decayed; it's supposed to be a rough running
>   average of the last 10 seconds.  So there's a ts_ltick which is the last
>   tick we looked at decaying ts_ticks.
>  =20
>   The increment in sched_tick() was slightly buggy on SMP, because a
>   thread could get incremented on two different CPUs in the rare case
>   where it was swapped from one which had run sched_tick() this tick to
>   one which hadn't.  The fix that was used relied on ts_ltick and only
>   incremented ts_ticks if ts_ltick was not from the current tick.
>   This is buggy, because any time the thread began running on a CPU in the
>   current tick, we would have set ts_ltick to ticks, so if it was still
>   running at sched_tick() we wouldn't increment.
>  =20
>   A system with a single process that hogs the CPU and is otherwise idle,
>   therefore, would look like all threads were at 0%. The threads not
>   running are really at 0%, and the hog is not getting its ts_ticks
>   incremented since it went through some other runq stats that set
>   ts_ltick.  On a 2-way SMP the thread used to get shuffled regularly
>   between CPUs (I think fallout from this bug), so it would appear a
>   little over 50% busy.
>  =20
>   The fix is to use a separate variable to record when the last
>   sched_tick() increment happened.
>  =20
>   Submitted by:       Matthew Fleming (matthew.fleming at isilon.com)
>   Reviewed by:        zml, dfr
>   Approved by:        dfr (mentor)

--fLj60tP2PZ34xyqD
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (FreeBSD)

iEYEARECAAYFAkrDtxUACgkQC3+MBN1Mb4hxLwCgkNdUEoc7cNwLLUFe4zy68Qe4
zFEAoOXuU7ZABaWvR/2PbqDjxsy0lRfR
=MzlZ
-----END PGP SIGNATURE-----

--fLj60tP2PZ34xyqD--

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Sep 30 20:01:45 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 25B3C106566B;
	Wed, 30 Sep 2009 20:01:45 +0000 (UTC) (envelope-from bms@FreeBSD.org)
Received: from out1.smtp.messagingengine.com (out1.smtp.messagingengine.com
	[66.111.4.25]) by mx1.freebsd.org (Postfix) with ESMTP id D273A8FC1A;
	Wed, 30 Sep 2009 20:01:44 +0000 (UTC)
Received: from compute1.internal (compute1.internal [10.202.2.41])
	by gateway1.messagingengine.com (Postfix) with ESMTP id 0696B7F5B9;
	Wed, 30 Sep 2009 15:44:14 -0400 (EDT)
Received: from heartbeat2.messagingengine.com ([10.202.2.161])
	by compute1.internal (MEProxy); Wed, 30 Sep 2009 15:44:14 -0400
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=messagingengine.com;
	h=message-id:date:from:mime-version:to:cc:subject:references:in-reply-to:content-type:content-transfer-encoding;
	s=smtpout; bh=WXZHGeOR+k6H+9KFe29DiepQGwE=;
	b=p9aub6QLZ6hQuD0hGAwFfgAVtwJSq05BpkKnS4j9xZ9D8kw1tFHWOJ2uvj5NiSand53qc20ZI6+xRAcxtZQVNwX6hd1hg6R8TJuypRMAEUfsBRwPBp+IClL+rJLAu6oE8r+ViPkhsXyHdaoH6PyLyAPkTN7aSAqYcWq8/UkjY88=
X-Sasl-enc: UIeMoVvKB+HUlXyc3JcbcrFqcwig5KdskpOTGG55QiF4 1254339853
Received: from empiric.lon.incunabulum.net
	(82-35-112-254.cable.ubr07.dals.blueyonder.co.uk [82.35.112.254])
	by mail.messagingengine.com (Postfix) with ESMTPSA id 3A3B419F3A;
	Wed, 30 Sep 2009 15:44:13 -0400 (EDT)
Message-ID: <4AC3B50B.60806@FreeBSD.org>
Date: Wed, 30 Sep 2009 20:44:11 +0100
From: Bruce Simpson 
User-Agent: Thunderbird 2.0.0.23 (X11/20090827)
MIME-Version: 1.0
To: Zachary Loafman 
References: <200909301940.n8UJep9X024249@svn.freebsd.org>
In-Reply-To: <200909301940.n8UJep9X024249@svn.freebsd.org>
X-Enigmail-Version: 0.95.6
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
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: r197652 - stable/7/sys/kern
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 30 Sep 2009 20:01:45 -0000

Nice fix.

Timing problems are the subtlest.

From owner-svn-src-stable-7@FreeBSD.ORG  Wed Sep 30 20:21:41 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B947106568D;
	Wed, 30 Sep 2009 20:21:41 +0000 (UTC)
	(envelope-from matthew.fleming@isilon.com)
Received: from seaxch09.isilon.com (seaxch09.isilon.com [74.85.160.25])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D91B8FC0C;
	Wed, 30 Sep 2009 20:21:41 +0000 (UTC)
x-mimeole: Produced By Microsoft Exchange V6.5
Content-class: urn:content-classes:message
MIME-Version: 1.0
Content-Type: text/plain;
	charset="US-ASCII"
Content-Transfer-Encoding: quoted-printable
Date: Wed, 30 Sep 2009 13:09:40 -0700
Message-ID: <06D5F9F6F655AD4C92E28B662F7F853E03171462@seaxch09.desktop.isilon.com>
In-Reply-To: <20090930195254.GK3130@deviant.kiev.zoral.com.ua>
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
Thread-Topic: svn commit: r197652 - stable/7/sys/kern
Thread-Index: AcpCB/F4hoEOPZEATdG5OhhIomenHQAACIUA
References: <200909301940.n8UJep9X024249@svn.freebsd.org>
	<20090930195254.GK3130@deviant.kiev.zoral.com.ua>
From: "Matthew Fleming" 
To: "Kostik Belousov" ,
	"Zachary Loafman" 
Cc: svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject: RE: svn commit: r197652 - stable/7/sys/kern
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Wed, 30 Sep 2009 20:21:41 -0000

> >   sched_ule in stable/7 has a bug (introduced in r180607) where a
thread
> >   that is running often will appear to not be running much at all.
> Why is this not a problem on HEAD ?

I can't say definitively there's not a bug on HEAD of some kind, but
when I ran a CPU hog and looked at the output of top(1), on HEAD the hog
was listed as near 100%, and on stable/7 it was listed as 0% after a few
seconds for the system to settle.  Since the code looked at least
somewhat different and the bug did not reproduce on HEAD, I assumed it
was only a problem on stable/7.  I had to run HEAD code in a virtual
machine, perhaps this made a difference?

>From a code inspection standpoint, I don't see anything obvious.  On
stable/7, the set of ts_ltick in tdq_runq_rem() appears to be the reason
a cpu hog was not getting incremented by sched_tick().  On HEAD this set
is moved to sched_choose().

Thanks,
matthew

From owner-svn-src-stable-7@FreeBSD.ORG  Thu Oct  1 15:40:09 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5E6D2106566B;
	Thu,  1 Oct 2009 15:40:09 +0000 (UTC)
	(envelope-from gallatin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 32B928FC13;
	Thu,  1 Oct 2009 15:40: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 n91Fe9um056135;
	Thu, 1 Oct 2009 15:40:09 GMT (envelope-from gallatin@svn.freebsd.org)
Received: (from gallatin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n91Fe9gg056132;
	Thu, 1 Oct 2009 15:40:09 GMT (envelope-from gallatin@svn.freebsd.org)
Message-Id: <200910011540.n91Fe9gg056132@svn.freebsd.org>
From: Andrew Gallatin 
Date: Thu, 1 Oct 2009 15:40:09 +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: r197675 - in stable/7/sys: . contrib/pf dev/mxge
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Thu, 01 Oct 2009 15:40:09 -0000

Author: gallatin
Date: Thu Oct  1 15:40:08 2009
New Revision: 197675
URL: http://svn.freebsd.org/changeset/base/197675

Log:
  MFC: more fixes for mxge watchdog reset handling (194761 197645)
  
  194761: Fix bug where device would loose promisc setting when reset.
  197645: Restore the PCI Express control register after reset

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/mxge/if_mxge.c
  stable/7/sys/dev/mxge/if_mxge_var.h

Modified: stable/7/sys/dev/mxge/if_mxge.c
==============================================================================
--- stable/7/sys/dev/mxge/if_mxge.c	Thu Oct  1 15:33:53 2009	(r197674)
+++ stable/7/sys/dev/mxge/if_mxge.c	Thu Oct  1 15:40:08 2009	(r197675)
@@ -1296,7 +1296,7 @@ mxge_reset(mxge_softc_t *sc, int interru
 	}
 	sc->rdma_tags_available = 15;
 	status = mxge_update_mac_address(sc);
-	mxge_change_promisc(sc, 0);
+	mxge_change_promisc(sc, sc->ifp->if_flags & IFF_PROMISC);
 	mxge_change_pause(sc, sc->pause);
 	mxge_set_multicast_list(sc);
 	return status;
@@ -3419,10 +3419,16 @@ mxge_setup_cfg_space(mxge_softc_t *sc)
 	if (pci_find_extcap(dev, PCIY_EXPRESS, ®) == 0) {
 		lnk = pci_read_config(dev, reg + 0x12, 2);
 		sc->link_width = (lnk >> 4) & 0x3f;
-		
-		pectl = pci_read_config(dev, reg + 0x8, 2);
-		pectl = (pectl & ~0x7000) | (5 << 12);
-		pci_write_config(dev, reg + 0x8, pectl, 2);
+
+		if (sc->pectl == 0) {
+			pectl = pci_read_config(dev, reg + 0x8, 2);
+			pectl = (pectl & ~0x7000) | (5 << 12);
+			pci_write_config(dev, reg + 0x8, pectl, 2);
+			sc->pectl = pectl;
+		} else {
+			/* restore saved pectl after watchdog reset */
+			pci_write_config(dev, reg + 0x8, sc->pectl, 2);
+		}
 	}
 
 	/* Enable DMA and Memory space access */
@@ -3533,6 +3539,9 @@ mxge_watchdog_reset(mxge_softc_t *sc)
 			/* release all TX locks */
 			for (s = 0; s < num_tx_slices; s++) {
 				ss = &sc->ss[s];
+#ifdef IFNET_BUF_RING
+				mxge_start_locked(ss);
+#endif
 				mtx_unlock(&ss->tx.mtx);
 			}
 		}
@@ -3795,7 +3804,7 @@ mxge_fetch_tunables(mxge_softc_t *sc)
 		mxge_ticks = hz / 2;
 	sc->pause = mxge_flow_control;
 	if (mxge_rss_hash_type < MXGEFW_RSS_HASH_TYPE_IPV4 
-	    || mxge_rss_hash_type > MXGEFW_RSS_HASH_TYPE_SRC_PORT) {
+	    || mxge_rss_hash_type > MXGEFW_RSS_HASH_TYPE_MAX) {
 		mxge_rss_hash_type = MXGEFW_RSS_HASH_TYPE_SRC_PORT;
 	}
 }

Modified: stable/7/sys/dev/mxge/if_mxge_var.h
==============================================================================
--- stable/7/sys/dev/mxge/if_mxge_var.h	Thu Oct  1 15:33:53 2009	(r197674)
+++ stable/7/sys/dev/mxge/if_mxge_var.h	Thu Oct  1 15:40:08 2009	(r197675)
@@ -254,6 +254,7 @@ struct mxge_softc {
 	struct sysctl_ctx_list slice_sysctl_ctx;
 	char *mac_addr_string;
 	uint8_t	mac_addr[6];		/* eeprom mac address */
+	uint16_t pectl;			/* save PCIe CTL state */
 	char product_code_string[64];
 	char serial_number_string[64];
 	char cmd_mtx_name[16];

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Oct  2 18:09:57 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 38F821065670;
	Fri,  2 Oct 2009 18:09:57 +0000 (UTC)
	(envelope-from simon@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 23F248FC12;
	Fri,  2 Oct 2009 18:09:57 +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 n92I9u83009086;
	Fri, 2 Oct 2009 18:09:56 GMT (envelope-from simon@svn.freebsd.org)
Received: (from simon@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n92I9u1r009085;
	Fri, 2 Oct 2009 18:09:56 GMT (envelope-from simon@svn.freebsd.org)
Message-Id: <200910021809.n92I9u1r009085@svn.freebsd.org>
From: "Simon L. Nielsen" 
Date: Fri, 2 Oct 2009 18:09: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: r197715 - releng/6.3 releng/6.3/sys/conf
	releng/6.3/sys/fs/devfs releng/6.3/sys/kern
	releng/6.3/sys/sys releng/6.4 releng/6.4/sys/conf
	releng/6.4/sys/fs/devfs releng/6.4/sys/kern releng...
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 02 Oct 2009 18:09:57 -0000

Author: simon
Date: Fri Oct  2 18:09:56 2009
New Revision: 197715
URL: http://svn.freebsd.org/changeset/base/197715

Log:
  MFC r197711 (partial) to 6.x and 7.x:
  
  - Add no zero mapping feature, disabled by default. [EN-09:05]
  
  MFC 178913,178914,179242,179243,180336,180340 to 6.x:
  
  - Fix kqueue pipe race conditions. [SA-09:13]
  
  MFC r192301 to 7.x; 6.x has slightly different fix:
  
  - Fix devfs / VFS NULL pointer race condition. [SA-09:14]
  
  Security:	FreeBSD-SA-09:13.pipe
  Security:	FreeBSD-SA-09:14.devfs
  Errata:		FreeBSD-EN-09:05.null
  Submitted by:	kib [SA-09:13] [SA-09:14]
  Submitted by:	bz [EN-09:05]
  In collaboration with:	jhb, kib, alc [EN-09:05]
  Approved by:	so (simon)

Modified:
  stable/7/sys/kern/kern_exec.c

Changes in other areas also in this revision:
Modified:
  releng/6.3/UPDATING
  releng/6.3/sys/conf/newvers.sh
  releng/6.3/sys/fs/devfs/devfs_vnops.c
  releng/6.3/sys/kern/kern_event.c
  releng/6.3/sys/kern/kern_exec.c
  releng/6.3/sys/kern/kern_fork.c
  releng/6.3/sys/kern/sys_pipe.c
  releng/6.3/sys/sys/event.h
  releng/6.3/sys/sys/pipe.h
  releng/6.4/UPDATING
  releng/6.4/sys/conf/newvers.sh
  releng/6.4/sys/fs/devfs/devfs_vnops.c
  releng/6.4/sys/kern/kern_event.c
  releng/6.4/sys/kern/kern_exec.c
  releng/6.4/sys/kern/kern_fork.c
  releng/6.4/sys/kern/sys_pipe.c
  releng/6.4/sys/sys/event.h
  releng/6.4/sys/sys/pipe.h
  releng/7.1/UPDATING
  releng/7.1/sys/conf/newvers.sh
  releng/7.1/sys/fs/devfs/devfs_vnops.c
  releng/7.1/sys/kern/kern_exec.c
  releng/7.2/UPDATING
  releng/7.2/sys/conf/newvers.sh
  releng/7.2/sys/fs/devfs/devfs_vnops.c
  releng/7.2/sys/kern/kern_exec.c
  stable/6/sys/fs/devfs/devfs_vnops.c
  stable/6/sys/kern/kern_event.c
  stable/6/sys/kern/kern_exec.c
  stable/6/sys/kern/kern_fork.c
  stable/6/sys/kern/sys_pipe.c
  stable/6/sys/sys/event.h
  stable/6/sys/sys/pipe.h

Modified: stable/7/sys/kern/kern_exec.c
==============================================================================
--- stable/7/sys/kern/kern_exec.c	Fri Oct  2 17:58:47 2009	(r197714)
+++ stable/7/sys/kern/kern_exec.c	Fri Oct  2 18:09:56 2009	(r197715)
@@ -122,6 +122,11 @@ u_long ps_arg_cache_limit = PAGE_SIZE / 
 SYSCTL_ULONG(_kern, OID_AUTO, ps_arg_cache_limit, CTLFLAG_RW, 
     &ps_arg_cache_limit, 0, "");
 
+static int map_at_zero = 1;
+TUNABLE_INT("security.bsd.map_at_zero", &map_at_zero);
+SYSCTL_INT(_security_bsd, OID_AUTO, map_at_zero, CTLFLAG_RW, &map_at_zero, 0,
+    "Permit processes to map an object at virtual address 0.");
+
 static int
 sysctl_kern_ps_strings(SYSCTL_HANDLER_ARGS)
 {
@@ -939,7 +944,7 @@ exec_new_vmspace(imgp, sv)
 	int error;
 	struct proc *p = imgp->proc;
 	struct vmspace *vmspace = p->p_vmspace;
-	vm_offset_t stack_addr;
+	vm_offset_t sv_minuser, stack_addr;
 	vm_map_t map;
 	u_long ssiz;
 
@@ -955,13 +960,17 @@ exec_new_vmspace(imgp, sv)
 	 * not disrupted
 	 */
 	map = &vmspace->vm_map;
-	if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv->sv_minuser &&
+	if (map_at_zero)
+		sv_minuser = sv->sv_minuser;
+	else
+		sv_minuser = MAX(sv->sv_minuser, PAGE_SIZE);
+	if (vmspace->vm_refcnt == 1 && vm_map_min(map) == sv_minuser &&
 	    vm_map_max(map) == sv->sv_maxuser) {
 		shmexit(vmspace);
 		pmap_remove_pages(vmspace_pmap(vmspace));
 		vm_map_remove(map, vm_map_min(map), vm_map_max(map));
 	} else {
-		error = vmspace_exec(p, sv->sv_minuser, sv->sv_maxuser);
+		error = vmspace_exec(p, sv_minuser, sv->sv_maxuser);
 		if (error)
 			return (error);
 		vmspace = p->p_vmspace;

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Oct  2 18:13:19 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7D1B510656A3;
	Fri,  2 Oct 2009 18:13:19 +0000 (UTC) (envelope-from simon@nitro.dk)
Received: from mx.nitro.dk (zarniwoop.nitro.dk [83.92.207.38])
	by mx1.freebsd.org (Postfix) with ESMTP id 382478FC28;
	Fri,  2 Oct 2009 18:13:19 +0000 (UTC)
Received: from arthur.nitro.dk (arthur.bofh [192.168.2.3])
	by mx.nitro.dk (Postfix) with ESMTP id 3DBA92D4930;
	Fri,  2 Oct 2009 18:13:18 +0000 (UTC)
Received: by arthur.nitro.dk (Postfix, from userid 1000)
	id 25B9B5C0A; Fri,  2 Oct 2009 20:13:18 +0200 (CEST)
Date: Fri, 2 Oct 2009 20:13:18 +0200
From: "Simon L. Nielsen" 
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Message-ID: <20091002181317.GD1227@arthur.nitro.dk>
References: <200910021809.n92I9u1r009085@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200910021809.n92I9u1r009085@svn.freebsd.org>
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: 
Subject: Re: svn commit: r197715 - releng/6.3 releng/6.3/sys/conf
 releng/6.3/sys/fs/devfs releng/6.3/sys/kern releng/6.3/sys/sys releng/6.4
 releng/6.4/sys/conf releng/6.4/sys/fs/devfs releng/6.4/sys/kern releng...
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 02 Oct 2009 18:13:19 -0000

On 2009.10.02 18:09:56 +0000, Simon L. Nielsen wrote:
> Author: simon
> Date: Fri Oct  2 18:09:56 2009
> New Revision: 197715
> URL: http://svn.freebsd.org/changeset/base/197715
> 
> Log:
>   MFC r197711 (partial) to 6.x and 7.x:
>   
>   - Add no zero mapping feature, disabled by default. [EN-09:05]
>   
>   MFC 178913,178914,179242,179243,180336,180340 to 6.x:
>   
>   - Fix kqueue pipe race conditions. [SA-09:13]
>   
>   MFC r192301 to 7.x; 6.x has slightly different fix:
>   
>   - Fix devfs / VFS NULL pointer race condition. [SA-09:14]
>   
>   Security:	FreeBSD-SA-09:13.pipe
>   Security:	FreeBSD-SA-09:14.devfs
>   Errata:		FreeBSD-EN-09:05.null
>   Submitted by:	kib [SA-09:13] [SA-09:14]
>   Submitted by:	bz [EN-09:05]
>   In collaboration with:	jhb, kib, alc [EN-09:05]
>   Approved by:	so (simon)

Just FYI, I plan to fix up the merge info for the stable/[67]
branches, but I probably won't get to it until Saturday or Sunday.

-- 
Simon L. Nielsen

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Oct  2 20:10:29 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3D3951065670;
	Fri,  2 Oct 2009 20:10:29 +0000 (UTC) (envelope-from simon@nitro.dk)
Received: from mx.nitro.dk (zarniwoop.nitro.dk [83.92.207.38])
	by mx1.freebsd.org (Postfix) with ESMTP id EC2978FC0C;
	Fri,  2 Oct 2009 20:10:28 +0000 (UTC)
Received: from arthur.nitro.dk (arthur.bofh [192.168.2.3])
	by mx.nitro.dk (Postfix) with ESMTP id F2D882D4906;
	Fri,  2 Oct 2009 20:10:27 +0000 (UTC)
Received: by arthur.nitro.dk (Postfix, from userid 1000)
	id D3BBC5C0A; Fri,  2 Oct 2009 22:10:27 +0200 (CEST)
Date: Fri, 2 Oct 2009 22:10:27 +0200
From: "Simon L. Nielsen" 
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Message-ID: <20091002201027.GE1227@arthur.nitro.dk>
References: <200910021809.n92I9u1r009085@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <200910021809.n92I9u1r009085@svn.freebsd.org>
User-Agent: Mutt/1.5.20 (2009-06-14)
Cc: 
Subject: Re: svn commit: r197715 - releng/6.3 releng/6.3/sys/conf
 releng/6.3/sys/fs/devfs releng/6.3/sys/kern releng/6.3/sys/sys releng/6.4
 releng/6.4/sys/conf releng/6.4/sys/fs/devfs releng/6.4/sys/kern releng...
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 02 Oct 2009 20:10:29 -0000

On 2009.10.02 18:09:56 +0000, Simon L. Nielsen wrote:
> Author: simon
> Date: Fri Oct  2 18:09:56 2009
> New Revision: 197715
> URL: http://svn.freebsd.org/changeset/base/197715
> 
> Log:
>   MFC r197711 (partial) to 6.x and 7.x:
>   
>   - Add no zero mapping feature, disabled by default. [EN-09:05]
>   
>   MFC 178913,178914,179242,179243,180336,180340 to 6.x:
>   
>   - Fix kqueue pipe race conditions. [SA-09:13]
>   
>   MFC r192301 to 7.x; 6.x has slightly different fix:
>   
>   - Fix devfs / VFS NULL pointer race condition. [SA-09:14]
>   
>   Security:	FreeBSD-SA-09:13.pipe
>   Security:	FreeBSD-SA-09:14.devfs
>   Errata:		FreeBSD-EN-09:05.null
>   Submitted by:	kib [SA-09:13] [SA-09:14]
>   Submitted by:	bz [EN-09:05]
>   In collaboration with:	jhb, kib, alc [EN-09:05]
>   Approved by:	so (simon)

Oh, and I initially forgot:

Tested by:	pho

(and that was testing both reproducing the problems in the first place
and helping in testing that the patches actually closes the races
etc. - so thanks to pho as well as the other people mentioned above!
:-) )

-- 
Simon L. Nielsen

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Oct  2 20:31:15 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1EA4B10656AD;
	Fri,  2 Oct 2009 20:31:15 +0000 (UTC)
	(envelope-from oliver.pntr@gmail.com)
Received: from mail-yw0-f197.google.com (mail-yw0-f197.google.com
	[209.85.211.197])
	by mx1.freebsd.org (Postfix) with ESMTP id 6C6FA8FC2F;
	Fri,  2 Oct 2009 20:31:13 +0000 (UTC)
Received: by ywh35 with SMTP id 35so3485920ywh.7
	for ; Fri, 02 Oct 2009 13:31:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:received:in-reply-to:references
	:date:message-id:subject:from:to:cc:content-type;
	bh=JoLWKP8yoSMMZqE3PMsuPzB0lJHFtkmzw/LdV3NZDYY=;
	b=nbkOBpi/8XB6W7ktJ74so43/3xImqQh2vKPvue4aftS0VXaOB/sGQtnoZYuezCkiSL
	R2RQ92Luc1phI81tVCuwUwTsptUJ+LOtDLQLnP+MWPM0AJfPuEGvZUP43vl53IubkuCC
	oC2cD3d6BxVsqN4Zh1RhGO9QVG6swHsXwg1Ws=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:cc:content-type;
	b=R/Ow23yP3ZWnym+/otd/B5QIVxgMEp+OaQe9IQEKIXHcz+yIPJXB1OQJ2wNHKncpMU
	GHA/qDJX86k2BKcUZ1Ag0UgfZZ4NQpIi9bFBJiHBBNQlo1C26gexJyjBeX1bsjc42/6O
	4Fx72skUSYuOb+dZ8rQeFTtc9nDETUF03p5cg=
MIME-Version: 1.0
Received: by 10.91.19.4 with SMTP id w4mr1670374agi.0.1254515472238; Fri, 02 
	Oct 2009 13:31:12 -0700 (PDT)
In-Reply-To: <20091002201027.GE1227@arthur.nitro.dk>
References: <200910021809.n92I9u1r009085@svn.freebsd.org>
	<20091002201027.GE1227@arthur.nitro.dk>
Date: Fri, 2 Oct 2009 22:31:11 +0200
Message-ID: <6101e8c40910021331g3747f4e1g2b7c2dbfe504712@mail.gmail.com>
From: Oliver Pinter 
To: "Simon L. Nielsen" 
Content-Type: text/plain; charset=ISO-8859-1
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: r197715 - releng/6.3 releng/6.3/sys/conf 
	releng/6.3/sys/fs/devfs releng/6.3/sys/kern releng/6.3/sys/sys
	releng/6.4 
	releng/6.4/sys/conf releng/6.4/sys/fs/devfs releng/6.4/sys/kern
	releng...
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 02 Oct 2009 20:31:15 -0000

Hi!

And what's the status of these exploits fix:
http://hup.hu/cikkek/200909/freebsd_6.4_es_7.2_local_root_0day-ek

?

On 10/2/09, Simon L. Nielsen  wrote:
> On 2009.10.02 18:09:56 +0000, Simon L. Nielsen wrote:
>> Author: simon
>> Date: Fri Oct  2 18:09:56 2009
>> New Revision: 197715
>> URL: http://svn.freebsd.org/changeset/base/197715
>>
>> Log:
>>   MFC r197711 (partial) to 6.x and 7.x:
>>
>>   - Add no zero mapping feature, disabled by default. [EN-09:05]
>>
>>   MFC 178913,178914,179242,179243,180336,180340 to 6.x:
>>
>>   - Fix kqueue pipe race conditions. [SA-09:13]
>>
>>   MFC r192301 to 7.x; 6.x has slightly different fix:
>>
>>   - Fix devfs / VFS NULL pointer race condition. [SA-09:14]
>>
>>   Security:	FreeBSD-SA-09:13.pipe
>>   Security:	FreeBSD-SA-09:14.devfs
>>   Errata:		FreeBSD-EN-09:05.null
>>   Submitted by:	kib [SA-09:13] [SA-09:14]
>>   Submitted by:	bz [EN-09:05]
>>   In collaboration with:	jhb, kib, alc [EN-09:05]
>>   Approved by:	so (simon)
>
> Oh, and I initially forgot:
>
> Tested by:	pho
>
> (and that was testing both reproducing the problems in the first place
> and helping in testing that the patches actually closes the races
> etc. - so thanks to pho as well as the other people mentioned above!
> :-) )
>
> --
> Simon L. Nielsen
> _______________________________________________
> svn-src-stable@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/svn-src-stable
> To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org"
>

From owner-svn-src-stable-7@FreeBSD.ORG  Fri Oct  2 20:41:37 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7F401065694;
	Fri,  2 Oct 2009 20:41:37 +0000 (UTC)
	(envelope-from remko@elvandar.org)
Received: from websrv01.jr-hosting.nl (websrv01.jr-hosting.nl [78.47.69.233])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F0F18FC2E;
	Fri,  2 Oct 2009 20:41:37 +0000 (UTC)
Received: from a83-163-38-147.adsl.xs4all.nl ([83.163.38.147]
	helo=axantucar.elvandar.int)
	by websrv01.jr-hosting.nl with esmtpsa (TLSv1:AES128-SHA:128)
	(Exim 4.69 (FreeBSD)) (envelope-from )
	id 1Mtowa-0002uX-I9; Fri, 02 Oct 2009 22:41:36 +0200
Mime-Version: 1.0 (Apple Message framework v1076)
Content-Type: text/plain; charset=us-ascii; format=flowed; delsp=yes
From: Remko Lodder 
In-Reply-To: <6101e8c40910021331g3747f4e1g2b7c2dbfe504712@mail.gmail.com>
Date: Fri, 2 Oct 2009 22:41:35 +0200
Content-Transfer-Encoding: 7bit
Message-Id: 
References: <200910021809.n92I9u1r009085@svn.freebsd.org>
	<20091002201027.GE1227@arthur.nitro.dk>
	<6101e8c40910021331g3747f4e1g2b7c2dbfe504712@mail.gmail.com>
To: Oliver Pinter 
X-Mailer: Apple Mail (2.1076)
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-7@freebsd.org,
	"Simon L. Nielsen" 
Subject: Re: svn commit: r197715 - releng/6.3 releng/6.3/sys/conf
	releng/6.3/sys/fs/devfs releng/6.3/sys/kern
	releng/6.3/sys/sys releng/6.4 releng/6.4/sys/conf
	releng/6.4/sys/fs/devfs releng/6.4/sys/kern releng...
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 02 Oct 2009 20:41:38 -0000


Please wait for the advisories to popup and see whether these match  
the question you have.

Thanks,
Remko

On Oct 2, 2009, at 10:31 PM, Oliver Pinter wrote:

> Hi!
>
> And what's the status of these exploits fix:
> http://hup.hu/cikkek/200909/freebsd_6.4_es_7.2_local_root_0day-ek
>
> ?
>
> On 10/2/09, Simon L. Nielsen  wrote:
>> On 2009.10.02 18:09:56 +0000, Simon L. Nielsen wrote:
>>> Author: simon
>>> Date: Fri Oct  2 18:09:56 2009
>>> New Revision: 197715
>>> URL: http://svn.freebsd.org/changeset/base/197715
>>>
>>> Log:
>>>  MFC r197711 (partial) to 6.x and 7.x:
>>>
>>>  - Add no zero mapping feature, disabled by default. [EN-09:05]
>>>
>>>  MFC 178913,178914,179242,179243,180336,180340 to 6.x:
>>>
>>>  - Fix kqueue pipe race conditions. [SA-09:13]
>>>
>>>  MFC r192301 to 7.x; 6.x has slightly different fix:
>>>
>>>  - Fix devfs / VFS NULL pointer race condition. [SA-09:14]
>>>
>>>  Security:	FreeBSD-SA-09:13.pipe
>>>  Security:	FreeBSD-SA-09:14.devfs
>>>  Errata:		FreeBSD-EN-09:05.null
>>>  Submitted by:	kib [SA-09:13] [SA-09:14]
>>>  Submitted by:	bz [EN-09:05]
>>>  In collaboration with:	jhb, kib, alc [EN-09:05]
>>>  Approved by:	so (simon)
>>
>> Oh, and I initially forgot:
>>
>> Tested by:	pho
>>
>> (and that was testing both reproducing the problems in the first  
>> place
>> and helping in testing that the patches actually closes the races
>> etc. - so thanks to pho as well as the other people mentioned above!
>> :-) )
>>
>> --
>> Simon L. Nielsen
>> _______________________________________________
>> svn-src-stable@freebsd.org mailing list
>> http://lists.freebsd.org/mailman/listinfo/svn-src-stable
>> To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org 
>> "
>>

-- 
/"\   Best regards,                        | remko@FreeBSD.org
\ /   Remko Lodder                      | remko@EFnet
X    http://www.evilcoder.org/    |
/ \   ASCII Ribbon Campaign    | Against HTML Mail and News


From owner-svn-src-stable-7@FreeBSD.ORG  Fri Oct  2 20:44:46 2009
Return-Path: 
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 33B731065695;
	Fri,  2 Oct 2009 20:44:46 +0000 (UTC)
	(envelope-from oliver.pntr@gmail.com)
Received: from mail-yw0-f197.google.com (mail-yw0-f197.google.com
	[209.85.211.197])
	by mx1.freebsd.org (Postfix) with ESMTP id 86C578FC22;
	Fri,  2 Oct 2009 20:44:45 +0000 (UTC)
Received: by ywh35 with SMTP id 35so3532720ywh.7
	for ; Fri, 02 Oct 2009 13:44:44 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:mime-version:received:in-reply-to:references
	:date:message-id:subject:from:to:cc:content-type;
	bh=YzuUyBoI5a0DJCuuEputs1OMjwMQBpmeuCXFiSDIedQ=;
	b=ctlH1JYfKeVlm5RAAJLq0RNl4HQ5gV58D+fbbyRwAWXe3bWFtgn0KiSAd8AkyaKOyP
	6XPozhP+CCLSWo17IIaaoGr7pKle4Y76QZTkoQYbdr1Zse76pxghB0NF0v2zZuEXKsRh
	fVHhoWJSEhlhdQnssoOqm7uUj53/UCpvCr+98=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=mime-version:in-reply-to:references:date:message-id:subject:from:to
	:cc:content-type;
	b=x3oR+R1JsY8/yw19IPM9X/pXiWtXZVljrW2XrccK9k0xEmEHfbFyDKfAM7W2Ri7N06
	cJ/gb4zUfyNmExuHhW51KX0SE05ntUB0AH3YujN/eujDNJr4Sbn4fZTqR8wmmadzbht9
	oM/+LaT2eacOXiQR/vmNqTt4/sASoE+/aOVQY=
MIME-Version: 1.0
Received: by 10.91.21.25 with SMTP id y25mr1695285agi.66.1254516283237; Fri, 
	02 Oct 2009 13:44:43 -0700 (PDT)
In-Reply-To: 
References: <200910021809.n92I9u1r009085@svn.freebsd.org>
	<20091002201027.GE1227@arthur.nitro.dk>
	<6101e8c40910021331g3747f4e1g2b7c2dbfe504712@mail.gmail.com>
	
Date: Fri, 2 Oct 2009 22:44:43 +0200
Message-ID: <6101e8c40910021344s514ea9fdg24e1e391efbbf956@mail.gmail.com>
From: Oliver Pinter 
To: Remko Lodder 
Content-Type: text/plain; charset=ISO-8859-1
Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org,
	src-committers@freebsd.org, svn-src-stable-7@freebsd.org,
	"Simon L. Nielsen" 
Subject: Re: svn commit: r197715 - releng/6.3 releng/6.3/sys/conf 
	releng/6.3/sys/fs/devfs releng/6.3/sys/kern releng/6.3/sys/sys
	releng/6.4 
	releng/6.4/sys/conf releng/6.4/sys/fs/devfs releng/6.4/sys/kern
	releng...
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	
List-Unsubscribe: , 
	
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
	
X-List-Received-Date: Fri, 02 Oct 2009 20:44:46 -0000

After I send the previous mail, see the advisories.

On 10/2/09, Remko Lodder  wrote:
>
> Please wait for the advisories to popup and see whether these match
> the question you have.
>
> Thanks,
> Remko
>
> On Oct 2, 2009, at 10:31 PM, Oliver Pinter wrote:
>
>> Hi!
>>
>> And what's the status of these exploits fix:
>> http://hup.hu/cikkek/200909/freebsd_6.4_es_7.2_local_root_0day-ek
>>
>> ?
>>
>> On 10/2/09, Simon L. Nielsen  wrote:
>>> On 2009.10.02 18:09:56 +0000, Simon L. Nielsen wrote:
>>>> Author: simon
>>>> Date: Fri Oct  2 18:09:56 2009
>>>> New Revision: 197715
>>>> URL: http://svn.freebsd.org/changeset/base/197715
>>>>
>>>> Log:
>>>>  MFC r197711 (partial) to 6.x and 7.x:
>>>>
>>>>  - Add no zero mapping feature, disabled by default. [EN-09:05]
>>>>
>>>>  MFC 178913,178914,179242,179243,180336,180340 to 6.x:
>>>>
>>>>  - Fix kqueue pipe race conditions. [SA-09:13]
>>>>
>>>>  MFC r192301 to 7.x; 6.x has slightly different fix:
>>>>
>>>>  - Fix devfs / VFS NULL pointer race condition. [SA-09:14]
>>>>
>>>>  Security:	FreeBSD-SA-09:13.pipe
>>>>  Security:	FreeBSD-SA-09:14.devfs
>>>>  Errata:		FreeBSD-EN-09:05.null
>>>>  Submitted by:	kib [SA-09:13] [SA-09:14]
>>>>  Submitted by:	bz [EN-09:05]
>>>>  In collaboration with:	jhb, kib, alc [EN-09:05]
>>>>  Approved by:	so (simon)
>>>
>>> Oh, and I initially forgot:
>>>
>>> Tested by:	pho
>>>
>>> (and that was testing both reproducing the problems in the first
>>> place
>>> and helping in testing that the patches actually closes the races
>>> etc. - so thanks to pho as well as the other people mentioned above!
>>> :-) )
>>>
>>> --
>>> Simon L. Nielsen
>>> _______________________________________________
>>> svn-src-stable@freebsd.org mailing list
>>> http://lists.freebsd.org/mailman/listinfo/svn-src-stable
>>> To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org
>>> "
>>>
>
> --
> /"\   Best regards,                        | remko@FreeBSD.org
> \ /   Remko Lodder                      | remko@EFnet
> X    http://www.evilcoder.org/    |
> / \   ASCII Ribbon Campaign    | Against HTML Mail and News
>
>