From owner-svn-src-head@FreeBSD.ORG Sun Aug 28 00:14:41 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14A11106566C; Sun, 28 Aug 2011 00:14:41 +0000 (UTC) (envelope-from qingli@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 047C68FC13; Sun, 28 Aug 2011 00:14:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7S0Ee0T026609; Sun, 28 Aug 2011 00:14:40 GMT (envelope-from qingli@svn.freebsd.org) Received: (from qingli@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7S0Eec7026607; Sun, 28 Aug 2011 00:14:40 GMT (envelope-from qingli@svn.freebsd.org) Message-Id: <201108280014.p7S0Eec7026607@svn.freebsd.org> From: Qing Li Date: Sun, 28 Aug 2011 00:14:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225223 - head/sys/netinet X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 00:14:41 -0000 Author: qingli Date: Sun Aug 28 00:14:40 2011 New Revision: 225223 URL: http://svn.freebsd.org/changeset/base/225223 Log: When an interface address route is removed from the system, another route with the same prefix is searched for as a replacement. The current code did not bypass routes that have non-operational interfaces. This patch fixes that bug and will find a replacement route with an active interface. PR: kern/159603 Submitted by: pluknet, ambrisko at ambrisko dot com Reviewed by: discussed on net@ Approved by: re (bz) MFC after: 3 days Modified: head/sys/netinet/in.c Modified: head/sys/netinet/in.c ============================================================================== --- head/sys/netinet/in.c Sat Aug 27 22:10:53 2011 (r225222) +++ head/sys/netinet/in.c Sun Aug 28 00:14:40 2011 (r225223) @@ -1163,7 +1163,8 @@ in_scrubprefix(struct in_ifaddr *target, p.s_addr &= ia->ia_sockmask.sin_addr.s_addr; } - if (prefix.s_addr != p.s_addr) + if ((prefix.s_addr != p.s_addr) || + !(ia->ia_ifp->if_flags & IFF_UP)) continue; /* From owner-svn-src-head@FreeBSD.ORG Sun Aug 28 07:45:26 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7FB4C106564A; Sun, 28 Aug 2011 07:45:26 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) by mx1.freebsd.org (Postfix) with ESMTP id D32578FC0A; Sun, 28 Aug 2011 07:45:25 +0000 (UTC) Received: from slw by zxy.spb.ru with local (Exim 4.69 (FreeBSD)) (envelope-from ) id 1Qxa3j-0004Jy-T0; Sun, 28 Aug 2011 11:45:35 +0400 Date: Sun, 28 Aug 2011 11:45:35 +0400 From: Slawa Olhovchenkov To: Doug Barton Message-ID: <20110828074535.GI21676@zxy.spb.ru> References: <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307@FreeBSD.org> <20110827212355.GG21676@zxy.spb.ru> <4E59832F.9000602@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4E59832F.9000602@FreeBSD.org> User-Agent: Mutt/1.5.20 (2009-06-14) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false Cc: Eric Masson , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, John Baldwin Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 07:45:26 -0000 On Sat, Aug 27, 2011 at 04:52:15PM -0700, Doug Barton wrote: > On 08/27/2011 14:23, Slawa Olhovchenkov wrote: > > GENERIC need not for me, GENERIC need for everyone: this is kernel on > > installation image and kernel for first boot after install. > > We covered this a few weeks ago. The mechanism used to load modules by > loader.conf is veeeerrrrrryyyyyyy sllllllooooooooowwwwwwwww. Many times > slower than loading the modules from disk after the system has booted. Yes, I see this discursion. This is because /boot/loader sllllllooooooooowwwwwwwww to read any, monolithic kernel too. Cache of CD/DVD directory and correct rearange files on CD/DVD (for elimination unneed seeks) also reduce time of loading modules. From owner-svn-src-head@FreeBSD.ORG Sun Aug 28 09:26:49 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2414F106566C; Sun, 28 Aug 2011 09:26:49 +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 11AB48FC15; Sun, 28 Aug 2011 09:26:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7S9Qmbv042960; Sun, 28 Aug 2011 09:26:48 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7S9Qmaf042948; Sun, 28 Aug 2011 09:26:48 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201108280926.p7S9Qmaf042948@svn.freebsd.org> From: Konstantin Belousov Date: Sun, 28 Aug 2011 09:26:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225227 - in head: . lib/libbsnmp/libbsnmp lib/libcam lib/libdwarf lib/libopie lib/libpcap lib/librtld_db lib/libtacplus lib/libufs sys/sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 09:26:49 -0000 Author: kib Date: Sun Aug 28 09:26:48 2011 New Revision: 225227 URL: http://svn.freebsd.org/changeset/base/225227 Log: Bump shared libraries version numbers in preparation for 9.0. This time, only libraries which ABI has been changed compared to stable/8, are bumped. ABI analysis done by: Gleb Kurtsou Approved by: re (kensmith) Modified: head/ObsoleteFiles.inc head/UPDATING head/lib/libbsnmp/libbsnmp/Makefile head/lib/libcam/Makefile head/lib/libdwarf/Makefile head/lib/libopie/Makefile head/lib/libpcap/Makefile head/lib/librtld_db/Makefile head/lib/libtacplus/Makefile head/lib/libufs/Makefile head/sys/sys/param.h Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Sun Aug 28 05:27:34 2011 (r225226) +++ head/ObsoleteFiles.inc Sun Aug 28 09:26:48 2011 (r225227) @@ -38,6 +38,23 @@ # xargs -n1 | sort | uniq -d; # done +# 20110828: library version bump for 9.0 +OLD_LIBS+=lib/libufs.so.5 +OLD_LIBS+=usr/lib/libbsnmp.so.5 +OLD_LIBS+=usr/lib/libdwarf.so.2 +OLD_LIBS+=usr/lib/libopie.so.6 +OLD_LIBS+=usr/lib/libpcap.so.7 +OLD_LIBS+=usr/lib/librtld_db.so.1 +OLD_LIBS+=usr/lib/libtacplus.so.4 +.if ${TARGET_ARCH} == "amd64" +OLD_LIBS+=usr/lib32/libufs.so.5 +OLD_LIBS+=usr/lib32/libbsnmp.so.5 +OLD_LIBS+=usr/lib32/libdwarf.so.2 +OLD_LIBS+=usr/lib32/libopie.so.6 +OLD_LIBS+=usr/lib32/libpcap.so.7 +OLD_LIBS+=usr/lib32/librtld_db.so.1 +OLD_LIBS+=usr/lib32/libtacplus.so.4 +.endif # 20110709: vm_map_clean.9 -> vm_map_sync.9 OLD_FILES+=usr/share/man/man9/vm_map_clean.9.gz # 20110709: Catch up with removal of these functions. Modified: head/UPDATING ============================================================================== --- head/UPDATING Sun Aug 28 05:27:34 2011 (r225226) +++ head/UPDATING Sun Aug 28 09:26:48 2011 (r225227) @@ -22,6 +22,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 9. machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20110828: + Bump the shared library version numbers for libraries that + do not use symbol versioning, have changed the ABI compared + to stable/8 and which shared library version was not bumped. + Done as part of 9.0-RELEASE cycle. + 20110815: During the merge of Capsicum features, the fget(9) KPI was modified. This may require the rebuilding of out-of-tree device drivers -- Modified: head/lib/libbsnmp/libbsnmp/Makefile ============================================================================== --- head/lib/libbsnmp/libbsnmp/Makefile Sun Aug 28 05:27:34 2011 (r225226) +++ head/lib/libbsnmp/libbsnmp/Makefile Sun Aug 28 09:26:48 2011 (r225227) @@ -8,7 +8,7 @@ CONTRIB= ${.CURDIR}/../../../contrib/bsn .PATH: ${CONTRIB} LIB= bsnmp -SHLIBDIR?= /lib +SHLIB_MAJOR= 6 CFLAGS+= -I${CONTRIB} -DHAVE_ERR_H -DHAVE_GETADDRINFO -DHAVE_STRLCPY CFLAGS+= -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DQUADFMT='"llu"' -DQUADXFMT='"llx"' Modified: head/lib/libcam/Makefile ============================================================================== --- head/lib/libcam/Makefile Sun Aug 28 05:27:34 2011 (r225226) +++ head/lib/libcam/Makefile Sun Aug 28 09:26:48 2011 (r225227) @@ -42,4 +42,6 @@ MLINKS+= cam.3 cam_open_device.3 \ SDIR= ${.CURDIR}/../../sys CFLAGS+= -I${.CURDIR} -I${SDIR} +SHLIB_MAJOR= 6 + .include Modified: head/lib/libdwarf/Makefile ============================================================================== --- head/lib/libdwarf/Makefile Sun Aug 28 05:27:34 2011 (r225226) +++ head/lib/libdwarf/Makefile Sun Aug 28 09:26:48 2011 (r225227) @@ -22,7 +22,7 @@ INCS= dwarf.h libdwarf.h CFLAGS+= -I${.CURDIR} -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 WITHOUT_MAN= Modified: head/lib/libopie/Makefile ============================================================================== --- head/lib/libopie/Makefile Sun Aug 28 05:27:34 2011 (r225226) +++ head/lib/libopie/Makefile Sun Aug 28 09:26:48 2011 (r225227) @@ -4,7 +4,7 @@ # OPIE_DIST?= ${.CURDIR}/../../contrib/opie DIST_DIR= ${OPIE_DIST}/${.CURDIR:T} -SHLIB_MAJOR= 6 +SHLIB_MAJOR= 7 KEYFILE?= \"/etc/opiekeys\" Modified: head/lib/libpcap/Makefile ============================================================================== --- head/lib/libpcap/Makefile Sun Aug 28 05:27:34 2011 (r225226) +++ head/lib/libpcap/Makefile Sun Aug 28 09:26:48 2011 (r225227) @@ -99,7 +99,7 @@ CFLAGS+=-DHAVE_NET_PFVAR_H WARNS?= 0 -SHLIB_MAJOR=7 +SHLIB_MAJOR= 8 # # Magic to grab sources out of src/contrib Modified: head/lib/librtld_db/Makefile ============================================================================== --- head/lib/librtld_db/Makefile Sun Aug 28 05:27:34 2011 (r225226) +++ head/lib/librtld_db/Makefile Sun Aug 28 09:26:48 2011 (r225227) @@ -3,7 +3,7 @@ .include LIB= rtld_db -SHLIB_MAJOR= 1 +SHLIB_MAJOR= 2 MAN= librtld_db.3 SRCS= rtld_db.c Modified: head/lib/libtacplus/Makefile ============================================================================== --- head/lib/libtacplus/Makefile Sun Aug 28 05:27:34 2011 (r225226) +++ head/lib/libtacplus/Makefile Sun Aug 28 09:26:48 2011 (r225227) @@ -30,7 +30,7 @@ INCS= taclib.h CFLAGS+= -Wall DPADD= ${LIBMD} LDADD= -lmd -SHLIB_MAJOR= 4 +SHLIB_MAJOR= 5 MAN= libtacplus.3 tacplus.conf.5 WARNS?= 2 Modified: head/lib/libufs/Makefile ============================================================================== --- head/lib/libufs/Makefile Sun Aug 28 05:27:34 2011 (r225226) +++ head/lib/libufs/Makefile Sun Aug 28 09:26:48 2011 (r225227) @@ -2,6 +2,7 @@ LIB= ufs SHLIBDIR?= /lib +SHLIB_MAJOR= 6 SRCS= block.c cgroup.c inode.c sblock.c type.c ffs_subr.c ffs_tables.c INCS= libufs.h Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Sun Aug 28 05:27:34 2011 (r225226) +++ head/sys/sys/param.h Sun Aug 28 09:26:48 2011 (r225227) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 900041 /* Master, propagated to newvers */ +#define __FreeBSD_version 900042 /* Master, propagated to newvers */ #ifdef _KERNEL #define P_OSREL_SIGSEGV 700004 From owner-svn-src-head@FreeBSD.ORG Sun Aug 28 10:10:31 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1BC5106566B; Sun, 28 Aug 2011 10:10:31 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E130C8FC13; Sun, 28 Aug 2011 10:10:31 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7SAAVoJ044266; Sun, 28 Aug 2011 10:10:31 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7SAAVSJ044263; Sun, 28 Aug 2011 10:10:31 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201108281010.p7SAAVSJ044263@svn.freebsd.org> From: Christian Brueffer Date: Sun, 28 Aug 2011 10:10:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225228 - head/share/man/man4 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 10:10:32 -0000 Author: brueffer Date: Sun Aug 28 10:10:31 2011 New Revision: 225228 URL: http://svn.freebsd.org/changeset/base/225228 Log: Remove broken link to supported wifi cards. There doesn't appear to be an equivalent list anywhere else. PR: 157778 Submitted by: Ted Mittelstaedt Approved by: re (blackend) MFC after: 1 week Modified: head/share/man/man4/ath.4 head/share/man/man4/ath_hal.4 Modified: head/share/man/man4/ath.4 ============================================================================== --- head/share/man/man4/ath.4 Sun Aug 28 09:26:48 2011 (r225227) +++ head/share/man/man4/ath.4 Sun Aug 28 10:10:31 2011 (r225228) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd March 21, 2010 +.Dd August 28, 2011 .Dt ATH 4 .Os .Sh NAME @@ -156,9 +156,6 @@ The .Nm driver supports all Atheros Cardbus and PCI cards, except those that are based on the AR5005VL chipset. -.Pp -A list of cards that are supported can be found at -.Pa http://customerproducts.atheros.com/customerproducts/default.asp . .Sh EXAMPLES Join a specific BSS network with WEP encryption: .Bd -literal -offset indent Modified: head/share/man/man4/ath_hal.4 ============================================================================== --- head/share/man/man4/ath_hal.4 Sun Aug 28 09:26:48 2011 (r225227) +++ head/share/man/man4/ath_hal.4 Sun Aug 28 10:10:31 2011 (r225228) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\"/ -.Dd March 25, 2009 +.Dd August 28, 2011 .Dt ATH_HAL 4 .Os .Sh NAME @@ -129,9 +129,6 @@ module: .It "Sony PCWA-C500 AR5210 Cardbus a" .It "3Com 3CRPAG175 AR5212 CardBus a/b/g" .El -.Pp -An up to date list can be found at -.Pa http://customerproducts.atheros.com/customerproducts . .Sh SEE ALSO .Xr ath 4 .Sh HISTORY From owner-svn-src-head@FreeBSD.ORG Sun Aug 28 11:49:53 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E5248106566B; Sun, 28 Aug 2011 11:49:53 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D4FEF8FC16; Sun, 28 Aug 2011 11:49:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7SBnrXE050833; Sun, 28 Aug 2011 11:49:53 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7SBnrbG050831; Sun, 28 Aug 2011 11:49:53 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201108281149.p7SBnrbG050831@svn.freebsd.org> From: Marius Strobl Date: Sun, 28 Aug 2011 11:49:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225229 - head/sys/sparc64/sbus X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 11:49:54 -0000 Author: marius Date: Sun Aug 28 11:49:53 2011 New Revision: 225229 URL: http://svn.freebsd.org/changeset/base/225229 Log: Since r221218 rman_manage_region(9) actually honors rm_start and rm_end which may cause problems when these contain garbage so zero the range descriptors embedding the rmans when allocating them. Approved by: re (kib) MFC after: 3 days Modified: head/sys/sparc64/sbus/sbus.c Modified: head/sys/sparc64/sbus/sbus.c ============================================================================== --- head/sys/sparc64/sbus/sbus.c Sun Aug 28 10:10:31 2011 (r225228) +++ head/sys/sparc64/sbus/sbus.c Sun Aug 28 11:49:53 2011 (r225229) @@ -303,8 +303,8 @@ sbus_attach(device_t dev) sizeof(*range), (void **)&range)) == -1) { panic("%s: error getting ranges property", __func__); } - sc->sc_rd = (struct sbus_rd *)malloc(sizeof(*sc->sc_rd) * sc->sc_nrange, - M_DEVBUF, M_NOWAIT); + sc->sc_rd = malloc(sizeof(*sc->sc_rd) * sc->sc_nrange, M_DEVBUF, + M_NOWAIT | M_ZERO); if (sc->sc_rd == NULL) panic("%s: cannot allocate rmans", __func__); /* From owner-svn-src-head@FreeBSD.ORG Sun Aug 28 18:09:17 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69B69106566B; Sun, 28 Aug 2011 18:09:17 +0000 (UTC) (envelope-from art@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5A16F8FC18; Sun, 28 Aug 2011 18:09:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7SI9HQQ062010; Sun, 28 Aug 2011 18:09:17 GMT (envelope-from art@svn.freebsd.org) Received: (from art@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7SI9H6q062008; Sun, 28 Aug 2011 18:09:17 GMT (envelope-from art@svn.freebsd.org) Message-Id: <201108281809.p7SI9H6q062008@svn.freebsd.org> From: Artem Belevich Date: Sun, 28 Aug 2011 18:09:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225234 - head/sys/rpc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 18:09:17 -0000 Author: art Date: Sun Aug 28 18:09:17 2011 New Revision: 225234 URL: http://svn.freebsd.org/changeset/base/225234 Log: Make sure RPC calls over UDP return RPC_INTR status is the process has been interrupted in a restartable syscall. Otherwise we could end up in an (almost) endless loop in clnt_reconnect_call(). PR: kern/160198 Reviewed by: rmacklem Approved by: re (kib), avg (mentor) MFC after: 1 week Modified: head/sys/rpc/clnt_dg.c Modified: head/sys/rpc/clnt_dg.c ============================================================================== --- head/sys/rpc/clnt_dg.c Sun Aug 28 16:11:24 2011 (r225233) +++ head/sys/rpc/clnt_dg.c Sun Aug 28 18:09:17 2011 (r225234) @@ -467,7 +467,10 @@ send_again: cu->cu_waitflag, "rpccwnd", 0); if (error) { errp->re_errno = error; - errp->re_status = stat = RPC_CANTSEND; + if (error == EINTR || error == ERESTART) + errp->re_status = stat = RPC_INTR; + else + errp->re_status = stat = RPC_CANTSEND; goto out; } } @@ -636,7 +639,7 @@ get_reply: */ if (error != EWOULDBLOCK) { errp->re_errno = error; - if (error == EINTR) + if (error == EINTR || error == ERESTART) errp->re_status = stat = RPC_INTR; else errp->re_status = stat = RPC_CANTRECV; From owner-svn-src-head@FreeBSD.ORG Sun Aug 28 19:38:05 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71048106564A; Sun, 28 Aug 2011 19:38:05 +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 47F518FC0A; Sun, 28 Aug 2011 19:38:05 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7SJc5fV064649; Sun, 28 Aug 2011 19:38:05 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7SJc5NL064647; Sun, 28 Aug 2011 19:38:05 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201108281938.p7SJc5NL064647@svn.freebsd.org> From: Ken Smith Date: Sun, 28 Aug 2011 19:38:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225237 - head/sys/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 19:38:05 -0000 Author: kensmith Date: Sun Aug 28 19:38:04 2011 New Revision: 225237 URL: http://svn.freebsd.org/changeset/base/225237 Log: Ready for 9.0-BETA2. Approved by: re (implicit) Modified: head/sys/conf/newvers.sh Modified: head/sys/conf/newvers.sh ============================================================================== --- head/sys/conf/newvers.sh Sun Aug 28 19:02:45 2011 (r225236) +++ head/sys/conf/newvers.sh Sun Aug 28 19:38:04 2011 (r225237) @@ -32,7 +32,7 @@ TYPE="FreeBSD" REVISION="9.0" -BRANCH="BETA1" +BRANCH="BETA2" if [ "X${BRANCH_OVERRIDE}" != "X" ]; then BRANCH=${BRANCH_OVERRIDE} fi From owner-svn-src-head@FreeBSD.ORG Sun Aug 28 22:57:38 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C176106564A; Sun, 28 Aug 2011 22:57:38 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-qy0-f182.google.com (mail-qy0-f182.google.com [209.85.216.182]) by mx1.freebsd.org (Postfix) with ESMTP id 9E60A8FC13; Sun, 28 Aug 2011 22:57:37 +0000 (UTC) Received: by qyk9 with SMTP id 9so3779944qyk.13 for ; Sun, 28 Aug 2011 15:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; bh=y3hbGX7DQJxvB9NVUgLbUFzaAIqdxeYXl0LHahF4LNg=; b=FUcjoBxgs4k1iUNHFthFHRNu78Zpd1Us9g6eRZpOhrcGaK/L1z8xTjo3dWMPlKAUOP QOfuaEcdyUXcSDmOASm61CV0MkOGOWmpGDm9WOXLvVCbSmDW7AON509K4oSn85vPMNK1 Tjkz93vYiNBGxpD+dtVdVl87hVrkuCjKfauEw= MIME-Version: 1.0 Received: by 10.224.200.3 with SMTP id eu3mr746918qab.279.1314572256642; Sun, 28 Aug 2011 15:57:36 -0700 (PDT) Received: by 10.224.19.131 with HTTP; Sun, 28 Aug 2011 15:57:36 -0700 (PDT) In-Reply-To: <4E598221.6080104@FreeBSD.org> References: <201108262122.p7QLMZXW071323@svn.freebsd.org> <4E583B92.3060100@FreeBSD.org> <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307@FreeBSD.org> <4E598221.6080104@FreeBSD.org> Date: Sun, 28 Aug 2011 15:57:36 -0700 Message-ID: From: Garrett Cooper To: Doug Barton Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: src-committers@freebsd.org, John Baldwin , Eric Masson , svn-src-all@freebsd.org, Slawa Olhovchenkov , svn-src-head@freebsd.org Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 22:57:38 -0000 On Sat, Aug 27, 2011 at 4:47 PM, Doug Barton wrote: > On 08/27/2011 14:39, Garrett Cooper wrote: >> =A0 =A0 A certain set of quick guidelines (< 1 page should suffice) for >> kld_list should be devised though. > > I look forward to reviewing your draft of that. :) I wish I had the docs stuff setup -- I would generate a draft for that if sgml functioned for me. The docs really need dusting off for 9.0 in the booting and rc area. The base premise is: put everything in /boot/loader.conf that's required to initial mount the system (aka mountcritlocal). Which means in the following generic, simple use cases: 1. When booting off USB media, you must put the USB stack (ehci, uhci, xhci, umass) etc in /boot/loader.conf (wash, rinse, repeat for firewire). 2. When booting off CD/DVD media, you must put the appropriate drivers (e.g. ata_cam, ahci, etc) in /boot/loader.conf . 3. When PXE booting, you must put the proper network driver (e.g. if_em, if_msk, if_re) in /boot/loader.conf . 4. When booting off a local disk, you must put the appropriate disk controller driver (e.g. ahci, ata_cam, mfi, twa, etc) in /boot/loader.conf . If the requirements for the boot process are non-standard (i.e. your boot starts out as PXE, then switches over to disk access), then a cross product of those permutations should be performed. Thanks, -Garrett From owner-svn-src-head@FreeBSD.ORG Sun Aug 28 23:10:49 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx2.freebsd.org (mx2.freebsd.org [IPv6:2001:4f8:fff6::35]) by hub.freebsd.org (Postfix) with ESMTP id 802901065672; Sun, 28 Aug 2011 23:10:49 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from [127.0.0.1] (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 4E9E714E2C0; Sun, 28 Aug 2011 23:10:49 +0000 (UTC) Message-ID: <4E5ACAF9.6080101@FreeBSD.org> Date: Sun, 28 Aug 2011 16:10:49 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:6.0) Gecko/20110812 Thunderbird/6.0 MIME-Version: 1.0 To: Garrett Cooper References: <201108262122.p7QLMZXW071323@svn.freebsd.org> <4E583B92.3060100@FreeBSD.org> <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307@FreeBSD.org> <4E598221.6080104@FreeBSD.org> In-Reply-To: X-Enigmail-Version: 1.3.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: src-committers@freebsd.org, John Baldwin , Eric Masson , svn-src-all@freebsd.org, Slawa Olhovchenkov , svn-src-head@freebsd.org Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Aug 2011 23:10:49 -0000 On 8/28/2011 3:57 PM, Garrett Cooper wrote: > I wish I had the docs stuff setup -- I would generate a draft for that > if sgml functioned for me. I'm assuming you're aware of the FDP, and merely lack the time to grind through the process. Meanwhile, there are plenty of people on freebsd-doc@ who are willing to help you with the SGML part of the process if you're willing to write the material. I think the outline you have is a good start, and I don't see any obvious errors. :) hth, Doug -- Nothin' ever doesn't change, but nothin' changes much. -- OK Go Breadth of IT experience, and depth of knowledge in the DNS. Yours for the right price. :) http://SupersetSolutions.com/ From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 10:40:39 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 82F9D106566C; Mon, 29 Aug 2011 10:40:39 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) by mx1.freebsd.org (Postfix) with ESMTP id D71F78FC0C; Mon, 29 Aug 2011 10:40:38 +0000 (UTC) Received: from slw by zxy.spb.ru with local (Exim 4.69 (FreeBSD)) (envelope-from ) id 1QxzGs-000Np1-1d; Mon, 29 Aug 2011 14:40:50 +0400 Date: Mon, 29 Aug 2011 14:40:50 +0400 From: Slawa Olhovchenkov To: Vadim Goncharov Message-ID: <20110829104050.GJ21676@zxy.spb.ru> References: <4E583B92.3060100@FreeBSD.org> <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307__41269.9701650583$1314479863$gmane$org@FreeBSD.org> <201108291032.p7TAWZ6p023254@kernblitz.nuclight.avtf.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201108291032.p7TAWZ6p023254@kernblitz.nuclight.avtf.net> User-Agent: Mutt/1.5.20 (2009-06-14) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Doug Barton , John Baldwin Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 10:40:39 -0000 On Mon, Aug 29, 2011 at 05:32:34PM +0700, Vadim Goncharov wrote: > So what could be really axed from there? Just agp, PCMCIA, parallel ports, Not PCMCIA -- PCMCIA CF, PCMCIA falsh card etc. Not parallel ports -- plip interface > some of firewire drivers (not all - some needed for SCSI). Not firewire -- firewire disks. > > The possible solution to this may be to have a MINIMAL kernel, also updated > by freebsd-update(8), but that will double requirements for space in /boot... Why? Only minimal kernel on installation media and large /boot/loader.conf (on installation media) with all current drivers from GENERIC don't double requirements for space, on the contrary, space requirements reduced by reducing new GENERIC. Next step: after install sysincstall/bsdinstall/pc-install may reduce /boot/loader.conf and move some drivers to kld_list. From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 10:49:45 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4BD75106566B; Mon, 29 Aug 2011 10:49:45 +0000 (UTC) (envelope-from marck@rinet.ru) Received: from woozle.rinet.ru (woozle.rinet.ru [195.54.192.68]) by mx1.freebsd.org (Postfix) with ESMTP id AFD1E8FC0A; Mon, 29 Aug 2011 10:49:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by woozle.rinet.ru (8.14.4/8.14.4) with ESMTP id p7TAbDl1064370; Mon, 29 Aug 2011 14:37:13 +0400 (MSD) (envelope-from marck@rinet.ru) Date: Mon, 29 Aug 2011 14:37:13 +0400 (MSD) From: Dmitry Morozovsky To: Vadim Goncharov In-Reply-To: <201108291032.p7TAWZ6p023254@kernblitz.nuclight.avtf.net> Message-ID: References: <201108262122.p7QLMZXW071323@svn.freebsd.org> <4E583B92.3060100@FreeBSD.org> <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307__41269.9701650583$1314479863$gmane$org@FreeBSD.org> <201108291032.p7TAWZ6p023254@kernblitz.nuclight.avtf.net> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) X-NCC-RegID: ru.rinet X-OpenPGP-Key-ID: 6B691B03 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.7 (woozle.rinet.ru [0.0.0.0]); Mon, 29 Aug 2011 14:37:13 +0400 (MSD) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Doug Barton , John Baldwin Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 10:49:45 -0000 On Mon, 29 Aug 2011, Vadim Goncharov wrote: [snip] > The possible solution to this may be to have a MINIMAL kernel, also updated > by freebsd-update(8), but that will double requirements for space in /boot... Axing .symbols from boot (and storing them elsewhere, say, /var/crash) would actually decreases /boot space usage by a factor of ~3 ;) -- Sincerely, D.Marck [DM5020, MCK-RIPE, DM3-RIPN] [ FreeBSD committer: marck@FreeBSD.org ] ------------------------------------------------------------------------ *** Dmitry Morozovsky --- D.Marck --- Wild Woozle --- marck@rinet.ru *** ------------------------------------------------------------------------ From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 10:55:39 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7B2A21065674; Mon, 29 Aug 2011 10:55:39 +0000 (UTC) (envelope-from vadim@nuclight.avtf.net) Received: from nuclight.avtf.net (208.88.188.90.adsl.tomsknet.ru [90.188.88.208]) by mx1.freebsd.org (Postfix) with ESMTP id 14F808FC0A; Mon, 29 Aug 2011 10:55:37 +0000 (UTC) Received: from kernblitz.nuclight.avtf.net (vadim@localhost [127.0.0.1]) by nuclight.avtf.net (8.14.4/8.14.4) with ESMTP id p7TAtZXN023375; Mon, 29 Aug 2011 17:55:35 +0700 (NOVST) (envelope-from vadim@kernblitz.nuclight.avtf.net) Received: (from vadim@localhost) by kernblitz.nuclight.avtf.net (8.14.4/8.14.4/Submit) id p7TAtY2U023372; Mon, 29 Aug 2011 17:55:34 +0700 (NOVST) (envelope-from vadim) Message-Id: <201108291055.p7TAtY2U023372@kernblitz.nuclight.avtf.net> To: Slawa Olhovchenkov From: Vadim Goncharov In-Reply-To: <20110829104050.GJ21676@zxy.spb.ru> References: <4E583B92.3060100@FreeBSD.org> <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307__41269.9701650583$1314479863$gmane$org@FreeBSD.org> <201108291032.p7TAWZ6p023254@kernblitz.nuclight.avtf.net> <20110829104050.GJ21676@zxy.spb.ru> X-Comment-To: Slawa Olhovchenkov Date: Mon, 29 Aug 2011 17:55:33 +0700 User-Agent: slrn/0.9.9p1 (FreeBSD) Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Doug Barton , John Baldwin Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: vadim_nuclight@mail.ru List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 10:55:39 -0000 Hi Slawa Olhovchenkov! On Mon, 29 Aug 2011 14:40:50 +0400; Slawa Olhovchenkov wrote: > Not parallel ports -- plip interface Is someone somewhere boots over a known-to-be-long-broken slow interface? I doubt. >> The possible solution to this may be to have a MINIMAL kernel, also updated >> by freebsd-update(8), but that will double requirements for space in /boot... > Why? > Only minimal kernel on installation media and large /boot/loader.conf > (on installation media) with all current drivers from GENERIC don't > double requirements for space, on the contrary, space requirements > reduced by reducing new GENERIC. No. Space requirements are not reduced signinficantly because kernel always has all it's modules in same subdir. And if freebsd-update(8) updates, you have to have two kernels in /boot, both MINIMAL and GENERIC, haven't you? > Next step: after install sysincstall/bsdinstall/pc-install may reduce > /boot/loader.conf and move some drivers to kld_list. Sounds good, but will all-in-loader.conf sllooww down installation media boot considerably? -- WBR, Vadim Goncharov. ICQ#166852181 mailto:vadim_nuclight@mail.ru [Anti-Greenpeace][Sober FreeBSD zealot][http://nuclight.livejournal.com] From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 11:10:17 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 866F010656DB; Mon, 29 Aug 2011 11:10:17 +0000 (UTC) (envelope-from vadim@nuclight.avtf.net) Received: from nuclight.avtf.net (208.88.188.90.adsl.tomsknet.ru [90.188.88.208]) by mx1.freebsd.org (Postfix) with ESMTP id 68C3F8FC25; Mon, 29 Aug 2011 11:10:16 +0000 (UTC) Received: from kernblitz.nuclight.avtf.net (vadim@localhost [127.0.0.1]) by nuclight.avtf.net (8.14.4/8.14.4) with ESMTP id p7TAWaCL023257; Mon, 29 Aug 2011 17:32:36 +0700 (NOVST) (envelope-from vadim@kernblitz.nuclight.avtf.net) Received: (from vadim@localhost) by kernblitz.nuclight.avtf.net (8.14.4/8.14.4/Submit) id p7TAWZ6p023254; Mon, 29 Aug 2011 17:32:35 +0700 (NOVST) (envelope-from vadim) Message-Id: <201108291032.p7TAWZ6p023254@kernblitz.nuclight.avtf.net> To: Doug Barton From: Vadim Goncharov In-Reply-To: =?UTF-8?Q?=3C4E595EC8=2E40307=5F=5F41269=2E9701650583=24131?= =?UTF-8?Q?4479863=24gmane=24org=40FreeBSD=2Eorg=3E?= References: <201108262122.p7QLMZXW071323@svn.freebsd.org> <4E583B92.3060100@FreeBSD.org> <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307__41269.9701650583$1314479863$gmane$org@FreeBSD.org> X-Comment-To: Doug Barton Date: Mon, 29 Aug 2011 17:32:34 +0700 User-Agent: slrn/0.9.9p1 (FreeBSD) Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, John Baldwin Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: vadim_nuclight@mail.ru List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 11:10:17 -0000 Hi Doug Barton! On Sat, 27 Aug 2011 14:16:56 -0700; Doug Barton wrote: >>>>>> May be for fist step: w/o devd, simle remove all posible from GENERIC and include all removed >>>>>> drivers in /boot/loader.conf? >>>>> >>>>> You're better off using kld_list in rc.conf for anything that doesn't >>>>> absolutely have to be loaded with the kernel. >>>> >>>> What drivers in GENERIC don't need to boot from disk or network? >>>> sound only? >>> >>> man rc.conf, search for kld_list. >> >> Sorry for bad english. >> What drivers (from current GENERIC) don't need for network or disk >> boot and can be moved to kld_list? >> >> I see only sound and agp. > > I'm not going to do your homework for you. :) Try it and find out for > yourself. I will tell you that given that rc.d/kld runs right after the > disks are mounted means that (unless you are netbooting) you can put > just about everything that isn't directly related to mounting your disks > in kld_list. Beyond that, you just need to experiment on your own. No, you've misunderstood him. For the installation or simple boot you may need *all* network drivers and _all_ storage drivers (including USB) already on boot, you can't move them to kld_list as it is after initial boot. And most lines in GENERIC are exactly for storage and network cards. Also, as only GENERIC is updated by freebsd-update(8), you can't workaround such things for installation media but also need to keep in kernel/loader for production use, too. So what could be really axed from there? Just agp, PCMCIA, parallel ports, some of firewire drivers (not all - some needed for SCSI). The possible solution to this may be to have a MINIMAL kernel, also updated by freebsd-update(8), but that will double requirements for space in /boot... -- WBR, Vadim Goncharov. ICQ#166852181 mailto:vadim_nuclight@mail.ru [Anti-Greenpeace][Sober FreeBSD zealot][http://nuclight.livejournal.com] From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 11:26:06 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AF3561065675; Mon, 29 Aug 2011 11:26:06 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) by mx1.freebsd.org (Postfix) with ESMTP id 0DCB18FC1C; Mon, 29 Aug 2011 11:26:05 +0000 (UTC) Received: from slw by zxy.spb.ru with local (Exim 4.69 (FreeBSD)) (envelope-from ) id 1Qxzyq-000OVn-Ht; Mon, 29 Aug 2011 15:26:16 +0400 Date: Mon, 29 Aug 2011 15:26:16 +0400 From: Slawa Olhovchenkov To: Vadim Goncharov Message-ID: <20110829112616.GK21676@zxy.spb.ru> References: <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307__41269.9701650583$1314479863$gmane$org@FreeBSD.org> <201108291032.p7TAWZ6p023254@kernblitz.nuclight.avtf.net> <20110829104050.GJ21676@zxy.spb.ru> <201108291055.p7TAtY2U023372@kernblitz.nuclight.avtf.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201108291055.p7TAtY2U023372@kernblitz.nuclight.avtf.net> User-Agent: Mutt/1.5.20 (2009-06-14) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, Doug Barton , John Baldwin Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 11:26:06 -0000 On Mon, Aug 29, 2011 at 05:55:33PM +0700, Vadim Goncharov wrote: > > Not parallel ports -- plip interface > > Is someone somewhere boots over a known-to-be-long-broken slow interface? Broken? And not removed from GENERIC 9.0? > I doubt. > > >> The possible solution to this may be to have a MINIMAL kernel, also updated > >> by freebsd-update(8), but that will double requirements for space in /boot... > > > Why? > > Only minimal kernel on installation media and large /boot/loader.conf > > (on installation media) with all current drivers from GENERIC don't > > double requirements for space, on the contrary, space requirements > > reduced by reducing new GENERIC. > > No. Space requirements are not reduced signinficantly because kernel always > has all it's modules in same subdir. And if freebsd-update(8) updates, you > have to have two kernels in /boot, both MINIMAL and GENERIC, haven't you? No, only minimal kernel named as 'GENERIC'. > > Next step: after install sysincstall/bsdinstall/pc-install may reduce > > /boot/loader.conf and move some drivers to kld_list. > > Sounds good, but will all-in-loader.conf sllooww down installation media > boot considerably? /boot/loader sllooww independent what reading -- monolithic kernel or reduced monolithic kernel + modules. Total reading size approximately same. So and reading time approximately same. /boot/loader now sllooww reading big monolithic GENERIC from install CD/DVD. From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 11:48:03 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 892F2106564A; Mon, 29 Aug 2011 11:48:03 +0000 (UTC) (envelope-from yanegomi@gmail.com) Received: from mail-pz0-f45.google.com (mail-pz0-f45.google.com [209.85.210.45]) by mx1.freebsd.org (Postfix) with ESMTP id 4375C8FC0C; Mon, 29 Aug 2011 11:48:03 +0000 (UTC) Received: by pzk33 with SMTP id 33so18957160pzk.18 for ; Mon, 29 Aug 2011 04:48:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=date:from:to:cc:subject:in-reply-to:message-id:references :user-agent:mime-version:content-type; bh=QGigdtMkrovKv7SmFEti22vKW/K7fGpTYpeXIEAmM6k=; b=GWBksJxo/JaYDoiLyvVeAh6evrFxKShmQsZO/VHZ/tF4l6I3PZexy+VAivHtzkohRz PGkMY4/KLnIodiXLd2tLLUKZxFDuhkpG/LspgeYOfven64ismyysjyTqI4dWagDOtrev WL582fO2T1fePS3iISxpMNUGO7Y5pGCK6vPj8= Received: by 10.142.152.32 with SMTP id z32mr2454119wfd.200.1314618482896; Mon, 29 Aug 2011 04:48:02 -0700 (PDT) Received: from c-24-6-49-154.hsd1.ca.comcast.net (c-24-6-49-154.hsd1.ca.comcast.net. [24.6.49.154]) by mx.google.com with ESMTPS id i1sm18258958pbi.10.2011.08.29.04.48.00 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Aug 2011 04:48:01 -0700 (PDT) Date: Mon, 29 Aug 2011 04:47:59 -0700 (PDT) From: Garrett Cooper To: Vadim Goncharov In-Reply-To: <201108291032.p7TAWZ6p023254@kernblitz.nuclight.avtf.net> Message-ID: References: <201108262122.p7QLMZXW071323@svn.freebsd.org> <4E583B92.3060100@FreeBSD.org> <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307__41269.9701650583$1314479863$gmane$org@FreeBSD.org> <201108291032.p7TAWZ6p023254@kernblitz.nuclight.avtf.net> User-Agent: Alpine 2.00 (BSF 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Doug Barton , John Baldwin Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 11:48:03 -0000 On Mon, 29 Aug 2011, Vadim Goncharov wrote: > Hi Doug Barton! > > On Sat, 27 Aug 2011 14:16:56 -0700; Doug Barton wrote: > >>>>>>> May be for fist step: w/o devd, simle remove all posible from GENERIC and include all removed >>>>>>> drivers in /boot/loader.conf? >>>>>> >>>>>> You're better off using kld_list in rc.conf for anything that doesn't >>>>>> absolutely have to be loaded with the kernel. >>>>> >>>>> What drivers in GENERIC don't need to boot from disk or network? >>>>> sound only? >>>> >>>> man rc.conf, search for kld_list. >>> >>> Sorry for bad english. >>> What drivers (from current GENERIC) don't need for network or disk >>> boot and can be moved to kld_list? >>> >>> I see only sound and agp. >> >> I'm not going to do your homework for you. :) Try it and find out for >> yourself. I will tell you that given that rc.d/kld runs right after the >> disks are mounted means that (unless you are netbooting) you can put >> just about everything that isn't directly related to mounting your disks >> in kld_list. Beyond that, you just need to experiment on your own. > > No, you've misunderstood him. For the installation or simple boot you may > need *all* network drivers and _all_ storage drivers (including USB) already > on boot, you can't move them to kld_list as it is after initial boot. Not true. Network interfaces are only truly critical in PXE boot applications for boot, unless you're doing something unsupported early on in the boot process. > And most lines in GENERIC are exactly for storage and network cards. Also, > as only GENERIC is updated by freebsd-update(8), you can't workaround such > things for installation media but also need to keep in kernel/loader for > production use, too. Some are some aren't. If someone understands what hardware they're dealing with and take the time to strip down their kernel (takes about 5 minutes), then it's not too hard to determine what needs to stay and go given you have experience rolling your own kernel. > So what could be really axed from there? Just agp, PCMCIA, parallel ports, > some of firewire drivers (not all - some needed for SCSI). Again, this varies (and there isn't really a one-size fits all). Hence, that's why I recommended a list of guidelines for what should be removed that should be added to the handbook after some polishing. > The possible solution to this may be to have a MINIMAL kernel, also updated > by freebsd-update(8), but that will double requirements for space in /boot... Trying to define what is minimal won't be an easy task, unless you're removing some support like tape drives, mostly EOLed or broken RAID controllers (aac, iir comes to mind), etc. Thanks! -Garrett From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 13:11:45 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F653106564A; Mon, 29 Aug 2011 13:11:45 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 08CA48FC08; Mon, 29 Aug 2011 13:11:43 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id QAA06537; Mon, 29 Aug 2011 16:06:26 +0300 (EEST) (envelope-from avg@FreeBSD.org) Message-ID: <4E5B8ED2.8030109@FreeBSD.org> Date: Mon, 29 Aug 2011 16:06:26 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110705 Thunderbird/5.0 MIME-Version: 1.0 To: Bruce Evans References: <201107181610.49443.hselasky@c2i.net> <4E26AFF8.8080107@FreeBSD.org> <201107201249.39550.hselasky@c2i.net> <20110720221325.E1436@besplex.bde.org> In-Reply-To: <20110720221325.E1436@besplex.bde.org> X-Enigmail-Version: 1.2pre Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: "svn-src-head@FreeBSD.org" , "svn-src-all@FreeBSD.org" , "src-committers@FreeBSD.org" , Hans Petter Selasky Subject: Re: svn commit: r223989 - head/sys/dev/usb/input X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 13:11:45 -0000 Having got my feet a little bit wet in this code I have only the following to add: on 20/07/2011 18:32 Bruce Evans said the following: [snip] > A non-broken API needs cn_open() and cn_close() functions which would > normally switch the driver in an out of polling mode. Given these > interfaces easy to fix the per-character poll to work as well as before > the multiple console changes, including for multiple active consoles. > Just call cn_open() and cn_close() on every active console around the > whole polling loop. A little more is required to prevent races between > characters, and to avoid the races inherent in the cn_checkc() API. > For multi-char input like that at the mountroot prompt, calling > cn_open() and cn_close() around the loop in gets(9) is adequate. The > functions should be almost no-ops when called nested for things like > this. I completely agree. > BTW, gets(9) is bogusly named. It is not harmful like gets(3), > since it takes a buffer size arg. It is used approximately once, > for mountroot input, so renaming it would be easy. Perhaps it > should be named cn_gets() and be implemented closer to the console > driver, or be implemented closer to printf() (it is now in libkern). Again, I completely agree. Perhaps there should also be a variant that works in an interrupt driven mode, if possible, exactly for the mountroot prompt and similar. > For debugger entry and panics, the whole operation should be wrapped > by cn_open()/cn_close(). This covers most cases. Some console drivers > now sort of work in debugger mode by abusing the kdb_active variable, > or because debugger entry stops interrupts and other CPUs. Yes and yes. [snip] > There should be significant differences, but were only small ones > in practice, between being in debugger mode and being in polling > mode. For example, entering console i/o mode for syscons should > involve switching the video mode and perhaps the frame buffer to > a special one, in case the current one is unusable for some reason > (it might be controlled by X, or in the middle of an initialization, > or you might just want to avoid scribbling on its frame buffer). > Thus, entering console i/o mode might be an extemely heavyweight > operation. You don't want to do it on every entry to debugger mode. > Even if the switch is very fast, it would make the screen flicker > to switch the frame buffer on every entry to the debugger for things > like tracing (but not displaying) every instruction when single > stepping using 'n' in ddb. This is a little bit different from the main topic, but I agree that entering kdb should ensure that the video console is fully usable if it's configured. [snip] So, all in all, just voicing my agreement in a hope that these ideas do not get forgotten again. P.S. I would like to forward this email to arch@ if nobody objects. -- Andriy Gapon From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 13:25:11 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E0179106566C; Mon, 29 Aug 2011 13:25:11 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 873438FC0A; Mon, 29 Aug 2011 13:25:10 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id QAA06930; Mon, 29 Aug 2011 16:25:08 +0300 (EEST) (envelope-from avg@FreeBSD.org) Message-ID: <4E5B9334.5020502@FreeBSD.org> Date: Mon, 29 Aug 2011 16:25:08 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110705 Thunderbird/5.0 MIME-Version: 1.0 To: Hans Petter Selasky References: <201107132107.p6DL7ojq099900@svn.freebsd.org> In-Reply-To: <201107132107.p6DL7ojq099900@svn.freebsd.org> X-Enigmail-Version: 1.2pre Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r223989 - head/sys/dev/usb/input X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 13:25:12 -0000 on 14/07/2011 00:07 Hans Petter Selasky said the following: > Author: hselasky > Date: Wed Jul 13 21:07:50 2011 > New Revision: 223989 > URL: http://svn.freebsd.org/changeset/base/223989 > > Log: > Fix for dump after shutdown with USB keyboard plugged in. It appears that the > system timer is stopped during shutdown and that the pause() statement in ukbd > causes infinite hang in this regard. The fix is to use mi_switch() instead of > pause() to do the required task switch to ensure that the required USB processes > get executed. > > Reported by: Mike_Karels@mcafee.com > MFC after: 1 week > > Modified: > head/sys/dev/usb/input/ukbd.c > > Modified: head/sys/dev/usb/input/ukbd.c > ============================================================================== > --- head/sys/dev/usb/input/ukbd.c Wed Jul 13 21:07:41 2011 (r223988) > +++ head/sys/dev/usb/input/ukbd.c Wed Jul 13 21:07:50 2011 (r223989) > @@ -59,6 +59,8 @@ __FBSDID("$FreeBSD$"); > #include > #include > #include > +#include > +#include > #include > > #include > @@ -386,6 +388,33 @@ ukbd_put_key(struct ukbd_softc *sc, uint > } > > static void > +ukbd_yield(void) > +{ > + struct thread *td = curthread; > + uint32_t old_prio; > + > + DROP_GIANT(); > + > + thread_lock(td); > + > + /* get current priority */ > + old_prio = td->td_base_pri; > + > + /* set new priority */ > + sched_prio(td, td->td_user_pri); > + > + /* cause a task switch */ > + mi_switch(SW_INVOL | SWT_RELINQUISH, NULL); > + > + /* restore priority */ > + sched_prio(td, old_prio); > + > + thread_unlock(td); > + > + PICKUP_GIANT(); > +} > + Another question - why ukbd_yield() is needed? Why kern_yield() would not be good here? What are the priority manipulations in ukbd_yield? Not saying that the code is incorrect, just that this is not explained in the commit message. -- Andriy Gapon From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 14:30:19 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2F05C106566C; Mon, 29 Aug 2011 14:30:19 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe03.c2i.net [212.247.154.66]) by mx1.freebsd.org (Postfix) with ESMTP id 289288FC0A; Mon, 29 Aug 2011 14:30:17 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=yVKV3zusvCapyMfYJBNW2j35FMEuTKq6vh/tt/1L5+g= c=1 sm=1 a=SvYTsOw2Z4kA:10 a=Bjjt3Ia5OwMA:10 a=dBRESv0yCI8A:10 a=N659UExz7-8A:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=5fQSd4wB9WT8dlvhfs8A:9 a=pILNOxqGKmIA:10 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe03.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 4585598; Mon, 29 Aug 2011 16:30:16 +0200 Received-SPF: softfail receiver=mailfe03.swip.net; client-ip=188.126.198.129; envelope-from=hselasky@freebsd.org From: Hans Petter Selasky To: Andriy Gapon Date: Mon, 29 Aug 2011 16:27:42 +0200 User-Agent: KMail/1.13.5 (FreeBSD/8.2-STABLE; KDE/4.4.5; amd64; ; ) References: <201107132107.p6DL7ojq099900@svn.freebsd.org> <4E5B9334.5020502@FreeBSD.org> In-Reply-To: <4E5B9334.5020502@FreeBSD.org> X-Face: *nPdTl_}RuAI6^PVpA02T?$%Xa^>@hE0uyUIoiha$pC:9TVgl.Oq, NwSZ4V"|LR.+tj}g5 %V,x^qOs~mnU3]Gn; cQLv&.N>TrxmSFf+p6(30a/{)KUU!s}w\IhQBj}[g}bj0I3^glmC( :AuzV9:.hESm-x4h240C`9=w MIME-Version: 1.0 Content-Type: Text/Plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Message-Id: <201108291627.42477.hselasky@freebsd.org> Cc: "svn-src-head@FreeBSD.org" , "svn-src-all@FreeBSD.org" , "src-committers@FreeBSD.org" Subject: Re: svn commit: r223989 - head/sys/dev/usb/input X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 14:30:19 -0000 On Monday 29 August 2011 15:25:08 Andriy Gapon wrote: > Another question - why ukbd_yield() is needed? > Why kern_yield() would not be good here? > What are the priority manipulations in ukbd_yield? > Not saying that the code is incorrect, just that this is not explained in > the commit message. This is needed during mountroot prompt, to allow the worker threads of the USB code to run, because the mountroot code is like: while (1) { cngetc(); } instead of: while (1) { cngetc(); pause("WAIT_A_BIT", 1); } --HPS From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 14:33:03 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFF68106564A; Mon, 29 Aug 2011 14:33:03 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id A1A908FC16; Mon, 29 Aug 2011 14:33:02 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id RAA08209; Mon, 29 Aug 2011 17:33:00 +0300 (EEST) (envelope-from avg@FreeBSD.org) Message-ID: <4E5BA31C.7070103@FreeBSD.org> Date: Mon, 29 Aug 2011 17:33:00 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110705 Thunderbird/5.0 MIME-Version: 1.0 To: Hans Petter Selasky References: <201107132107.p6DL7ojq099900@svn.freebsd.org> <4E5B9334.5020502@FreeBSD.org> <201108291627.42477.hselasky@freebsd.org> In-Reply-To: <201108291627.42477.hselasky@freebsd.org> X-Enigmail-Version: 1.2pre Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: "svn-src-head@FreeBSD.org" , "svn-src-all@FreeBSD.org" , "src-committers@FreeBSD.org" Subject: Re: svn commit: r223989 - head/sys/dev/usb/input X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 14:33:04 -0000 on 29/08/2011 17:27 Hans Petter Selasky said the following: > On Monday 29 August 2011 15:25:08 Andriy Gapon wrote: >> Another question - why ukbd_yield() is needed? >> Why kern_yield() would not be good here? >> What are the priority manipulations in ukbd_yield? >> Not saying that the code is incorrect, just that this is not explained in >> the commit message. > > This is needed during mountroot prompt, to allow the worker threads of the USB > code to run, because the mountroot code is like: > > while (1) { > cngetc(); > } > > instead of: > > while (1) { > cngetc(); > pause("WAIT_A_BIT", 1); > } Not sure if this answers my question, which is not about pause vs ukbd_yield, but is about ukbd_yield vs kern_yield. In other words, why you couldn't simply use kern_yield where you used ukbd_yield? -- Andriy Gapon From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 14:57:00 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06004106566C; Mon, 29 Aug 2011 14:57:00 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe01.c2i.net [212.247.154.2]) by mx1.freebsd.org (Postfix) with ESMTP id E4E5F8FC08; Mon, 29 Aug 2011 14:56:58 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=wJvnH89EauZH5CtPccDXCoR3S15XcsUHhRLViNeYhtc= c=1 sm=1 a=SvYTsOw2Z4kA:10 a=Bjjt3Ia5OwMA:10 a=dBRESv0yCI8A:10 a=N659UExz7-8A:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=D77xU_VBKiNl670GMyQA:9 a=pILNOxqGKmIA:10 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe01.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 172968065; Mon, 29 Aug 2011 16:56:56 +0200 Received-SPF: softfail receiver=mailfe01.swip.net; client-ip=188.126.198.129; envelope-from=hselasky@freebsd.org From: Hans Petter Selasky To: Andriy Gapon Date: Mon, 29 Aug 2011 16:54:22 +0200 User-Agent: KMail/1.13.5 (FreeBSD/8.2-STABLE; KDE/4.4.5; amd64; ; ) References: <201108291627.42477.hselasky@freebsd.org> <4E5BA31C.7070103@FreeBSD.org> In-Reply-To: <4E5BA31C.7070103@FreeBSD.org> X-Face: *nPdTl_}RuAI6^PVpA02T?$%Xa^>@hE0uyUIoiha$pC:9TVgl.Oq, NwSZ4V"|LR.+tj}g5 %V,x^qOs~mnU3]Gn; cQLv&.N>TrxmSFf+p6(30a/{)KUU!s}w\IhQBj}[g}bj0I3^glmC( :AuzV9:.hESm-x4h240C`9=w MIME-Version: 1.0 Content-Type: Text/Plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Message-Id: <201108291654.23054.hselasky@freebsd.org> Cc: "svn-src-head@FreeBSD.org" , "svn-src-all@FreeBSD.org" , "src-committers@FreeBSD.org" Subject: Re: svn commit: r223989 - head/sys/dev/usb/input X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 14:57:00 -0000 On Monday 29 August 2011 16:33:00 Andriy Gapon wrote: > Not sure if this answers my question, which is not about pause vs > ukbd_yield, but is about ukbd_yield vs kern_yield. > In other words, why you couldn't simply use kern_yield where you used > ukbd_yield? Is this a new function. I think I used the following as an example: void uio_yield(void) { struct thread *td; td = curthread; DROP_GIANT(); thread_lock(td); sched_prio(td, td->td_user_pri); mi_switch(SW_INVOL | SWT_RELINQUISH, NULL); thread_unlock(td); PICKUP_GIANT(); } As long as the kern_yield() lets the USB worker threads and XHCI interrupts run it should be fine. pause() is better though. --HPS From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 15:19:59 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CF0F01065675; Mon, 29 Aug 2011 15:19:59 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id 829D78FC0C; Mon, 29 Aug 2011 15:19:58 +0000 (UTC) Received: from odyssey.starpoint.kiev.ua (alpha-e.starpoint.kiev.ua [212.40.38.101]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id SAA08906; Mon, 29 Aug 2011 18:19:57 +0300 (EEST) (envelope-from avg@FreeBSD.org) Message-ID: <4E5BAE1C.7040100@FreeBSD.org> Date: Mon, 29 Aug 2011 18:19:56 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:5.0) Gecko/20110705 Thunderbird/5.0 MIME-Version: 1.0 To: Hans Petter Selasky References: <201108291627.42477.hselasky@freebsd.org> <4E5BA31C.7070103@FreeBSD.org> <201108291654.23054.hselasky@freebsd.org> In-Reply-To: <201108291654.23054.hselasky@freebsd.org> X-Enigmail-Version: 1.2pre Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: "svn-src-head@FreeBSD.org" , "svn-src-all@FreeBSD.org" , "src-committers@FreeBSD.org" Subject: Re: svn commit: r223989 - head/sys/dev/usb/input X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 15:19:59 -0000 on 29/08/2011 17:54 Hans Petter Selasky said the following: > On Monday 29 August 2011 16:33:00 Andriy Gapon wrote: >> Not sure if this answers my question, which is not about pause vs >> ukbd_yield, but is about ukbd_yield vs kern_yield. >> In other words, why you couldn't simply use kern_yield where you used >> ukbd_yield? > > Is this a new function. I think I used the following as an example: > > void > uio_yield(void) > { > struct thread *td; > > td = curthread; > DROP_GIANT(); > thread_lock(td); > sched_prio(td, td->td_user_pri); > mi_switch(SW_INVOL | SWT_RELINQUISH, NULL); > thread_unlock(td); > PICKUP_GIANT(); > } > > As long as the kern_yield() lets the USB worker threads and XHCI interrupts > run it should be fine. pause() is better though. kern_yield is sufficiently recent, ~ 1/2 year old, and it has replaced uio_yield. r218424 is the commit. -- Andriy Gapon From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 17:30:38 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A65C106564A; Mon, 29 Aug 2011 17:30:38 +0000 (UTC) (envelope-from brde@optusnet.com.au) Received: from mail06.syd.optusnet.com.au (mail06.syd.optusnet.com.au [211.29.132.187]) by mx1.freebsd.org (Postfix) with ESMTP id 043FF8FC21; Mon, 29 Aug 2011 17:30:37 +0000 (UTC) Received: from c122-106-165-191.carlnfd1.nsw.optusnet.com.au (c122-106-165-191.carlnfd1.nsw.optusnet.com.au [122.106.165.191]) by mail06.syd.optusnet.com.au (8.13.1/8.13.1) with ESMTP id p7THUMK5028613 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 30 Aug 2011 03:30:28 +1000 Date: Tue, 30 Aug 2011 03:30:22 +1000 (EST) From: Bruce Evans X-X-Sender: bde@besplex.bde.org To: Andriy Gapon In-Reply-To: <4E5B8ED2.8030109@FreeBSD.org> Message-ID: <20110830032933.I2425@besplex.bde.org> References: <201107181610.49443.hselasky@c2i.net> <4E26AFF8.8080107@FreeBSD.org> <201107201249.39550.hselasky@c2i.net> <20110720221325.E1436@besplex.bde.org> <4E5B8ED2.8030109@FreeBSD.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: "svn-src-head@FreeBSD.org" , "svn-src-all@FreeBSD.org" , "src-committers@FreeBSD.org" , Bruce Evans , Hans Petter Selasky Subject: Re: svn commit: r223989 - head/sys/dev/usb/input X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 17:30:38 -0000 On Mon, 29 Aug 2011, Andriy Gapon wrote: > > Having got my feet a little bit wet in this code I have only the following to add: > > on 20/07/2011 18:32 Bruce Evans said the following: > [snip] >> A non-broken API needs cn_open() and cn_close() functions which would >> normally switch the driver in an out of polling mode. Given these >> interfaces easy to fix the per-character poll to work as well as before >> the multiple console changes, including for multiple active consoles. >> ... > > I completely agree. Thanks. >> ... > > P.S. I would like to forward this email to arch@ if nobody objects. Fine with me. Bruce From owner-svn-src-head@FreeBSD.ORG Mon Aug 29 18:21:24 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94A651065673; Mon, 29 Aug 2011 18:21:24 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [65.122.17.42]) by mx1.freebsd.org (Postfix) with ESMTP id 66F1E8FC0C; Mon, 29 Aug 2011 18:21:24 +0000 (UTC) Received: from bigwig.baldwin.cx (66.111.2.69.static.nyinternet.net [66.111.2.69]) by cyrus.watson.org (Postfix) with ESMTPSA id D81FA46B0A; Mon, 29 Aug 2011 14:21:20 -0400 (EDT) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id 1E29B8A02F; Mon, 29 Aug 2011 14:21:20 -0400 (EDT) From: John Baldwin To: Eric Masson Date: Mon, 29 Aug 2011 14:13:25 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110617; KDE/4.5.5; amd64; ; ) References: <201108262122.p7QLMZXW071323@svn.freebsd.org> <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> In-Reply-To: <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201108291413.26197.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.6 (bigwig.baldwin.cx); Mon, 29 Aug 2011 14:21:20 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, Doug Barton , src-committers@freebsd.org, Slawa Olhovchenkov Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2011 18:21:24 -0000 On Saturday, August 27, 2011 4:35:16 am Eric Masson wrote: > Slawa Olhovchenkov writes: > > Hello, > > > Yes, from FreeBSD 6.x puc.ko don't work. Only in-kernel version work. > > Nope puc.ko module can't attach drivers compiled in kernel, but if both > puc & uart are loaded as modules, they work fine : The issue is that the uart and ppc drivers compiled into GENERIC do not include the puc attachments (ppc_puc.c and uart_bus_puc.c). One possibility would be to include those if the either 'pci' or 'pccard' was in the kernel, but after talking with Marcel, enabling 'puc' in GENERIC seemed to be the least ugly solution. -- John Baldwin From owner-svn-src-head@FreeBSD.ORG Tue Aug 30 03:31:22 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B757106566B; Tue, 30 Aug 2011 03:31:22 +0000 (UTC) (envelope-from crodr001@gmail.com) Received: from mail-bw0-f54.google.com (mail-bw0-f54.google.com [209.85.214.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3D6BE8FC13; Tue, 30 Aug 2011 03:31:20 +0000 (UTC) Received: by bkat8 with SMTP id t8so6357230bka.13 for ; Mon, 29 Aug 2011 20:31:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=mZ8DmI1wKLrp8DlibgyFPH0frPIHpwvGrcYl3ddtQJY=; b=WfAlVba3kqSmL5hOZz8sTXBbX0Q4QHgGOvNOt471yrgOhQzXA+J9HnSS1BLiP+IW0n p8EK+zJHtoZCJ2/IPNlbbHPQOCa+0ZTCVeqFe1eMc4QzmHmeiW1Z5s0a+G22Y+RCvF/F OnWAvJfMR0JiCMZAlOgyue8oRIE58BNi/bgGs= MIME-Version: 1.0 Received: by 10.204.130.129 with SMTP id t1mr2647257bks.231.1314673271390; Mon, 29 Aug 2011 20:01:11 -0700 (PDT) Sender: crodr001@gmail.com Received: by 10.204.49.144 with HTTP; Mon, 29 Aug 2011 20:01:11 -0700 (PDT) In-Reply-To: References: <201108262122.p7QLMZXW071323@svn.freebsd.org> <4E583B92.3060100@FreeBSD.org> <20110827081103.GB21676@zxy.spb.ru> <86obzbi75n.fsf@srvbsdfenssv.interne.associated-bears.org> <20110827105342.GC21676@zxy.spb.ru> <4E58D8E8.3090603@FreeBSD.org> <20110827124432.GD21676@zxy.spb.ru> <4E595447.8000104@FreeBSD.org> <20110827210448.GE21676@zxy.spb.ru> <4E595EC8.40307@FreeBSD.org> <4E598221.6080104@FreeBSD.org> Date: Mon, 29 Aug 2011 20:01:11 -0700 X-Google-Sender-Auth: IWQZxfnc224yErOrZd-i5DNpY4M Message-ID: From: Craig Rodrigues To: Garrett Cooper Content-Type: text/plain; charset=ISO-8859-1 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r225201 - in head/sys: amd64/conf i386/conf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Aug 2011 03:31:22 -0000 Hi, You have two options: (1) Log into freefall, and use all the doc stuff which is set up there. or (2) Set the docs stuff up yourself by following the setup steps at the FreeBSD Documentation Project Primer page: http://www.freebsd.org/doc/en/books/fdp-primer/ . It's not too bad. -- Craig Rodrigues rodrigc@crodrigues.org On Sun, Aug 28, 2011 at 3:57 PM, Garrett Cooper wrote: > I wish I had the docs stuff setup -- I would generate a draft for that > if sgml functioned for me. The docs really need dusting off for 9.0 in > the booting and rc area. From owner-svn-src-head@FreeBSD.ORG Tue Aug 30 09:44:25 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6AB53106566C for ; Tue, 30 Aug 2011 09:44:25 +0000 (UTC) (envelope-from apache@192979-DRLIN.thefirstgroupuk.com) Received: from 192979-DRLIN.thefirstgroupuk.com (192979-DRLIN.thefirstgroupuk.com [92.52.110.242]) by mx1.freebsd.org (Postfix) with ESMTP id 359728FC08 for ; Tue, 30 Aug 2011 09:44:24 +0000 (UTC) Received: by 192979-DRLIN.thefirstgroupuk.com (Postfix, from userid 48) id BD1F5F2B613; Tue, 30 Aug 2011 10:22:21 +0100 (BST) To: svn-src-head@freebsd.org From: Charles Eze MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 8bit Message-Id: <20110830092221.BD1F5F2B613@192979-DRLIN.thefirstgroupuk.com> Date: Tue, 30 Aug 2011 10:22:21 +0100 (BST) Subject: Your Payment is Ready X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: mtcn_transferss@skymail.mn List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Aug 2011 09:44:25 -0000 Attn: Beneficiary, Be informed that your part-payment of (US$300,000.00) from International Monetary Fund Unit (IMF) has been approved to transfer via our department of Western Union, Meanwhile your urgent respond is highly needed with the re-confirmation of your details where and how to receive your funds in our office such as: Your Name:..... Country:...... State and City.......Address..........Telephone Number............Age...........Sex.........Occupation......... Also the payment of US$9000.00 has already been made through Western Union for you to pick it up, but due to the instruction we received from International Monetary Fund Unit (IMF), You are required to pay sum of($210.00 Dollars) to activate your payment files and also to ensure you are the right person to receive the fund. Upon reception of the Activation fee,you can pick up the first transfer of US$9000.00 Sender`s First Name: John Sender's Last Name: Nteli MTCN:877241675 Amount;= 9,000, USD Test Question;= When? Test Answer;= Today Amount.......$9000.000 USD Call me or email me once you picked up this $9,000 USD today. Here is the western union information, you can also track it on-line at ( https://wumt.westernunion.com/asp/orderStatus.asp?country=global ) for confirmation before going to their office to pick up. You can easily get back to us via email or telephone# for more details while the amount you will be confirming daily is (US$9000.00) starting from the day we receive the Activation fee. You are to use the name below to send the Activation Fee via Western Union money transfer and send payment details to this E-mail: mtcn_transferss@skymail.mn You must send the $210.00 Dollars before your first payment can be sent to you. RECEIVER NAME.......Dominic Chidubem COUNTRY...................... LAGOS NIGERIA TEXT QUESTION..........GOOD ANSWER.................GOD SENDER NAME.............. MTCN............. We are looking forward to hearing from you. Thank you. Mr.Charles Eze Tel: +234-80-34444408 Email: mtcn_transferss@skymail.mn Manager Western Union Nigeria. From owner-svn-src-head@FreeBSD.ORG Tue Aug 30 18:23:37 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 503B5106566B; Tue, 30 Aug 2011 18:23:37 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3EA1D8FC0C; Tue, 30 Aug 2011 18:23:37 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7UINbGV062219; Tue, 30 Aug 2011 18:23:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7UINbjn062217; Tue, 30 Aug 2011 18:23:37 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201108301823.p7UINbjn062217@svn.freebsd.org> From: Nathan Whitehorn Date: Tue, 30 Aug 2011 18:23:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225270 - head/usr.sbin/bsdinstall/scripts X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Aug 2011 18:23:37 -0000 Author: nwhitehorn Date: Tue Aug 30 18:23:36 2011 New Revision: 225270 URL: http://svn.freebsd.org/changeset/base/225270 Log: Swap FTP paths to be MACHINE/MACHINE_ARCH instead of MACHINE_ARCH/MACHINE. This follows what the output of make targets looks like, and reduces the number of directories needed on the FTP server, since we now have only one architecture with multiple machine types (i386, which has i386 and pc98), but 3 machines with 9 architectures between them (powerpc, mips, and arm). Requested by: kensmith, bz Approved by: re(kensmith) Modified: head/usr.sbin/bsdinstall/scripts/mirrorselect Modified: head/usr.sbin/bsdinstall/scripts/mirrorselect ============================================================================== --- head/usr.sbin/bsdinstall/scripts/mirrorselect Tue Aug 30 17:21:55 2011 (r225269) +++ head/usr.sbin/bsdinstall/scripts/mirrorselect Tue Aug 30 18:23:36 2011 (r225270) @@ -191,7 +191,7 @@ MIRROR=`dialog --backtitle "FreeBSD Inst MIRROR_BUTTON=$? exec 3>&- -BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/releases/`uname -p`/`uname -m`/`uname -r`" +BSDINSTALL_DISTSITE="$MIRROR/pub/FreeBSD/releases/`uname -m`/`uname -p`/`uname -r`" case $MIRROR_BUTTON in $DIALOG_CANCEL) From owner-svn-src-head@FreeBSD.ORG Wed Aug 31 12:50:46 2011 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CEA11065672; Wed, 31 Aug 2011 12:50:46 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 37BC18FC08; Wed, 31 Aug 2011 12:50:46 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 5AD741FFC5C; Wed, 31 Aug 2011 12:31:32 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 2B4A9844D9; Wed, 31 Aug 2011 14:31:32 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Peter Jeremy References: <201104292300.p3TN0N8N019287@svn.freebsd.org> <20110827232532.GA57602@server.vk2pj.dyndns.org> Date: Wed, 31 Aug 2011 14:31:32 +0200 In-Reply-To: <20110827232532.GA57602@server.vk2pj.dyndns.org> (Peter Jeremy's message of "Sun, 28 Aug 2011 09:25:32 +1000") Message-ID: <86fwkh7oez.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r221233 - head/sbin/fsck_ffs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Aug 2011 12:50:46 -0000 Peter Jeremy writes: > It's now nearly 4 months later. Was there a technical issue why this > wasn't MFC'd or was it just lack of time or oversight? The latter. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 13:03:57 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33A07106566B; Fri, 2 Sep 2011 13:03:57 +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 0A81F8FC18; Fri, 2 Sep 2011 13:03:57 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82D3ujS099649; Fri, 2 Sep 2011 13:03:56 GMT (envelope-from mm@svn.freebsd.org) Received: (from mm@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82D3uBJ099647; Fri, 2 Sep 2011 13:03:56 GMT (envelope-from mm@svn.freebsd.org) Message-Id: <201109021303.p82D3uBJ099647@svn.freebsd.org> From: Martin Matuska Date: Fri, 2 Sep 2011 13:03:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225329 - head/lib/libarchive X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 13:03:57 -0000 Author: mm Date: Fri Sep 2 13:03:56 2011 New Revision: 225329 URL: http://svn.freebsd.org/changeset/base/225329 Log: Import additional bugfix for reading and extracting makefs-created ISO images with tar. Vendor revision 3648 (merge of 3647): Additional fix to issue 168 because the change of r3642 was not sufficient. - Make sure "CL" entry appear after its "RE" entry which the "CL" entry should be connected with. - Give consideration to the case that the top level "RE" entry has already been exposed outside before its tree. Approved by: re (kib) Obtained from: libarchive (release/2.8, svn rev 3648) MFC after: 3 days Modified: head/lib/libarchive/archive_read_support_format_iso9660.c Modified: head/lib/libarchive/archive_read_support_format_iso9660.c ============================================================================== --- head/lib/libarchive/archive_read_support_format_iso9660.c Fri Sep 2 09:55:35 2011 (r225328) +++ head/lib/libarchive/archive_read_support_format_iso9660.c Fri Sep 2 13:03:56 2011 (r225329) @@ -1815,8 +1815,11 @@ parse_file_info(struct archive_read *a, file->re_descendant = 1; if (file->cl_offset != 0) { parent->subdirs++; - /* To be appeared before other dirs. */ - file->offset = file->number = file->cl_offset; + /* Overwrite an offset and a number of this "CL" entry + * to appear before other dirs. "+1" to those is to + * make sure to appear after "RE" entry which this + * "CL" entry should be connected with. */ + file->offset = file->number = file->cl_offset + 1; } } @@ -2581,13 +2584,16 @@ next_cache_entry(struct archive_read *a, continue; } else if (file->re_descendant) { /* - * Do not expose this at this time - * because we have not gotten its full-path - * name yet. + * If the top level "RE" entry of this entry + * is not exposed, we, accordingly, should not + * expose this entry at this time because + * we cannot make its proper full-path name. */ - if (rede_add_entry(file) < 0) - goto fatal_rr; - continue; + if (rede_add_entry(file) == 0) + continue; + /* Otherwise we can expose this entry because + * it seems its top level "RE" has already been + * exposed. */ } } break; From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 14:10:42 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A972A1065679; Fri, 2 Sep 2011 14:10:42 +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 999CA8FC1F; Fri, 2 Sep 2011 14:10:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82EAg5v001755; Fri, 2 Sep 2011 14:10:42 GMT (envelope-from pluknet@svn.freebsd.org) Received: (from pluknet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82EAgtB001753; Fri, 2 Sep 2011 14:10:42 GMT (envelope-from pluknet@svn.freebsd.org) Message-Id: <201109021410.p82EAgtB001753@svn.freebsd.org> From: Sergey Kandaurov Date: Fri, 2 Sep 2011 14:10:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225330 - head/lib/libmemstat X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 14:10:42 -0000 Author: pluknet Date: Fri Sep 2 14:10:42 2011 New Revision: 225330 URL: http://svn.freebsd.org/changeset/base/225330 Log: Cosmetic cleanup: remove #define LIBMEMSTAT used to prevent a nested include of opt_vmpage.h from vm/vm_page.h. opt_vmpage.h was retired before 7.0 together with options PQ_NOOPT. Approved by: re (kib) MFC after: 3 days Modified: head/lib/libmemstat/memstat_uma.c Modified: head/lib/libmemstat/memstat_uma.c ============================================================================== --- head/lib/libmemstat/memstat_uma.c Fri Sep 2 13:03:56 2011 (r225329) +++ head/lib/libmemstat/memstat_uma.c Fri Sep 2 14:10:42 2011 (r225330) @@ -30,7 +30,6 @@ #include #include -#define LIBMEMSTAT /* Cause vm_page.h not to include opt_vmpage.h */ #include #include From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 16:00:52 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 09DFE106566C; Fri, 2 Sep 2011 16:00:52 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id E2D218FC1B; Fri, 2 Sep 2011 16:00:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82G0pi9005946; Fri, 2 Sep 2011 16:00:51 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82G0pOS005943; Fri, 2 Sep 2011 16:00:51 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201109021600.p82G0pOS005943@svn.freebsd.org> From: John Baldwin Date: Fri, 2 Sep 2011 16:00:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225331 - head/usr.sbin/mfiutil X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 16:00:52 -0000 Author: jhb Date: Fri Sep 2 16:00:51 2011 New Revision: 225331 URL: http://svn.freebsd.org/changeset/base/225331 Log: Move the logic to parse volume cache commands out into a separate function and use a loop so that multiple cache commands can be strung together on the command line into a single update to the volume's properties. Reviewed by: bz Approved by: re (kib) MFC after: 1 week Modified: head/usr.sbin/mfiutil/mfi_volume.c head/usr.sbin/mfiutil/mfiutil.8 Modified: head/usr.sbin/mfiutil/mfi_volume.c ============================================================================== --- head/usr.sbin/mfiutil/mfi_volume.c Fri Sep 2 14:10:42 2011 (r225330) +++ head/usr.sbin/mfiutil/mfi_volume.c Fri Sep 2 16:00:51 2011 (r225331) @@ -111,16 +111,16 @@ mfi_ld_set_props(int fd, struct mfi_ld_p } static int -update_cache_policy(int fd, struct mfi_ld_props *props, uint8_t new_policy, - uint8_t mask) +update_cache_policy(int fd, struct mfi_ld_props *old, struct mfi_ld_props *new) { int error; uint8_t changes, policy; - policy = (props->default_cache_policy & ~mask) | new_policy; - if (policy == props->default_cache_policy) + if (old->default_cache_policy == new->default_cache_policy && + old->disk_cache_policy == new->disk_cache_policy) return (0); - changes = policy ^ props->default_cache_policy; + policy = new->default_cache_policy; + changes = policy ^ old->default_cache_policy; if (changes & MR_LD_CACHE_ALLOW_WRITE_CACHE) printf("%s caching of I/O writes\n", policy & MR_LD_CACHE_ALLOW_WRITE_CACHE ? "Enabling" : @@ -142,9 +142,21 @@ update_cache_policy(int fd, struct mfi_l printf("%s write caching with bad BBU\n", policy & MR_LD_CACHE_WRITE_CACHE_BAD_BBU ? "Enabling" : "Disabling"); + if (old->disk_cache_policy != new->disk_cache_policy) { + switch (new->disk_cache_policy) { + case MR_PD_CACHE_ENABLE: + printf("Enabling write-cache on physical drives\n"); + break; + case MR_PD_CACHE_DISABLE: + printf("Disabling write-cache on physical drives\n"); + break; + case MR_PD_CACHE_UNCHANGED: + printf("Using default write-cache setting on physical drives\n"); + break; + } + } - props->default_cache_policy = policy; - if (mfi_ld_set_props(fd, props) < 0) { + if (mfi_ld_set_props(fd, new) < 0) { error = errno; warn("Failed to set volume properties"); return (error); @@ -152,12 +164,130 @@ update_cache_policy(int fd, struct mfi_l return (0); } +static void +stage_cache_setting(struct mfi_ld_props *props, uint8_t new_policy, + uint8_t mask) +{ + + props->default_cache_policy &= ~mask; + props->default_cache_policy |= new_policy; +} + +/* + * Parse a single cache directive modifying the passed in policy. + * Returns -1 on a parse error and the number of arguments consumed + * on success. + */ +static int +process_cache_command(int ac, char **av, struct mfi_ld_props *props) +{ + uint8_t policy; + + /* I/O cache settings. */ + if (strcmp(av[0], "all") == 0 || strcmp(av[0], "enable") == 0) { + stage_cache_setting(props, MR_LD_CACHE_ALLOW_READ_CACHE | + MR_LD_CACHE_ALLOW_WRITE_CACHE, + MR_LD_CACHE_ALLOW_READ_CACHE | + MR_LD_CACHE_ALLOW_WRITE_CACHE); + return (1); + } + if (strcmp(av[0], "none") == 0 || strcmp(av[0], "disable") == 0) { + stage_cache_setting(props, 0, MR_LD_CACHE_ALLOW_READ_CACHE | + MR_LD_CACHE_ALLOW_WRITE_CACHE); + return (1); + } + if (strcmp(av[0], "reads") == 0) { + stage_cache_setting(props, MR_LD_CACHE_ALLOW_READ_CACHE, + MR_LD_CACHE_ALLOW_READ_CACHE | + MR_LD_CACHE_ALLOW_WRITE_CACHE); + return (1); + } + if (strcmp(av[0], "writes") == 0) { + stage_cache_setting(props, MR_LD_CACHE_ALLOW_WRITE_CACHE, + MR_LD_CACHE_ALLOW_READ_CACHE | + MR_LD_CACHE_ALLOW_WRITE_CACHE); + return (1); + } + + /* Write cache behavior. */ + if (strcmp(av[0], "write-back") == 0) { + stage_cache_setting(props, MR_LD_CACHE_WRITE_BACK, + MR_LD_CACHE_WRITE_BACK); + return (1); + } + if (strcmp(av[0], "write-through") == 0) { + stage_cache_setting(props, 0, MR_LD_CACHE_WRITE_BACK); + return (1); + } + if (strcmp(av[0], "bad-bbu-write-cache") == 0) { + if (ac < 2) { + warnx("cache: bad BBU setting required"); + return (-1); + } + if (strcmp(av[1], "enable") == 0) + policy = MR_LD_CACHE_WRITE_CACHE_BAD_BBU; + else if (strcmp(av[1], "disable") == 0) + policy = 0; + else { + warnx("cache: invalid bad BBU setting"); + return (-1); + } + stage_cache_setting(props, policy, + MR_LD_CACHE_WRITE_CACHE_BAD_BBU); + return (2); + } + + /* Read cache behavior. */ + if (strcmp(av[0], "read-ahead") == 0) { + if (ac < 2) { + warnx("cache: read-ahead setting required"); + return (-1); + } + if (strcmp(av[1], "none") == 0) + policy = 0; + else if (strcmp(av[1], "always") == 0) + policy = MR_LD_CACHE_READ_AHEAD; + else if (strcmp(av[1], "adaptive") == 0) + policy = MR_LD_CACHE_READ_AHEAD | + MR_LD_CACHE_READ_ADAPTIVE; + else { + warnx("cache: invalid read-ahead setting"); + return (-1); + } + stage_cache_setting(props, policy, MR_LD_CACHE_READ_AHEAD | + MR_LD_CACHE_READ_ADAPTIVE); + return (2); + } + + /* Drive write-cache behavior. */ + if (strcmp(av[0], "write-cache") == 0) { + if (ac < 2) { + warnx("cache: write-cache setting required"); + return (-1); + } + if (strcmp(av[1], "enable") == 0) + props->disk_cache_policy = MR_PD_CACHE_ENABLE; + else if (strcmp(av[1], "disable") == 0) + props->disk_cache_policy = MR_PD_CACHE_DISABLE; + else if (strcmp(av[1], "default") == 0) + props->disk_cache_policy = MR_PD_CACHE_UNCHANGED; + else { + warnx("cache: invalid write-cache setting"); + return (-1); + } + return (2); + } + + warnx("cache: Invalid command"); + return (-1); +} + static int volume_cache(int ac, char **av) { - struct mfi_ld_props props; - int error, fd; - uint8_t target_id, policy; + struct mfi_ld_props props, new; + int error, fd, consumed; + uint8_t target_id; if (ac < 2) { warnx("cache: volume required"); @@ -235,113 +365,19 @@ volume_cache(int ac, char **av) printf("Cache Disabled Due to Dead Battery\n"); error = 0; } else { - if (strcmp(av[2], "all") == 0 || strcmp(av[2], "enable") == 0) - error = update_cache_policy(fd, &props, - MR_LD_CACHE_ALLOW_READ_CACHE | - MR_LD_CACHE_ALLOW_WRITE_CACHE, - MR_LD_CACHE_ALLOW_READ_CACHE | - MR_LD_CACHE_ALLOW_WRITE_CACHE); - else if (strcmp(av[2], "none") == 0 || - strcmp(av[2], "disable") == 0) - error = update_cache_policy(fd, &props, 0, - MR_LD_CACHE_ALLOW_READ_CACHE | - MR_LD_CACHE_ALLOW_WRITE_CACHE); - else if (strcmp(av[2], "reads") == 0) - error = update_cache_policy(fd, &props, - MR_LD_CACHE_ALLOW_READ_CACHE, - MR_LD_CACHE_ALLOW_READ_CACHE | - MR_LD_CACHE_ALLOW_WRITE_CACHE); - else if (strcmp(av[2], "writes") == 0) - error = update_cache_policy(fd, &props, - MR_LD_CACHE_ALLOW_WRITE_CACHE, - MR_LD_CACHE_ALLOW_READ_CACHE | - MR_LD_CACHE_ALLOW_WRITE_CACHE); - else if (strcmp(av[2], "write-back") == 0) - error = update_cache_policy(fd, &props, - MR_LD_CACHE_WRITE_BACK, - MR_LD_CACHE_WRITE_BACK); - else if (strcmp(av[2], "write-through") == 0) - error = update_cache_policy(fd, &props, 0, - MR_LD_CACHE_WRITE_BACK); - else if (strcmp(av[2], "read-ahead") == 0) { - if (ac < 4) { - warnx("cache: read-ahead setting required"); - close(fd); - return (EINVAL); - } - if (strcmp(av[3], "none") == 0) - policy = 0; - else if (strcmp(av[3], "always") == 0) - policy = MR_LD_CACHE_READ_AHEAD; - else if (strcmp(av[3], "adaptive") == 0) - policy = MR_LD_CACHE_READ_AHEAD | - MR_LD_CACHE_READ_ADAPTIVE; - else { - warnx("cache: invalid read-ahead setting"); - close(fd); - return (EINVAL); - } - error = update_cache_policy(fd, &props, policy, - MR_LD_CACHE_READ_AHEAD | - MR_LD_CACHE_READ_ADAPTIVE); - } else if (strcmp(av[2], "bad-bbu-write-cache") == 0) { - if (ac < 4) { - warnx("cache: bad BBU setting required"); + new = props; + av += 2; + ac -= 2; + while (ac > 0) { + consumed = process_cache_command(ac, av, &new); + if (consumed < 0) { close(fd); return (EINVAL); } - if (strcmp(av[3], "enable") == 0) - policy = MR_LD_CACHE_WRITE_CACHE_BAD_BBU; - else if (strcmp(av[3], "disable") == 0) - policy = 0; - else { - warnx("cache: invalid bad BBU setting"); - close(fd); - return (EINVAL); - } - error = update_cache_policy(fd, &props, policy, - MR_LD_CACHE_WRITE_CACHE_BAD_BBU); - } else if (strcmp(av[2], "write-cache") == 0) { - if (ac < 4) { - warnx("cache: write-cache setting required"); - close(fd); - return (EINVAL); - } - if (strcmp(av[3], "enable") == 0) - policy = MR_PD_CACHE_ENABLE; - else if (strcmp(av[3], "disable") == 0) - policy = MR_PD_CACHE_DISABLE; - else if (strcmp(av[3], "default") == 0) - policy = MR_PD_CACHE_UNCHANGED; - else { - warnx("cache: invalid write-cache setting"); - close(fd); - return (EINVAL); - } - error = 0; - if (policy != props.disk_cache_policy) { - switch (policy) { - case MR_PD_CACHE_ENABLE: - printf("Enabling write-cache on physical drives\n"); - break; - case MR_PD_CACHE_DISABLE: - printf("Disabling write-cache on physical drives\n"); - break; - case MR_PD_CACHE_UNCHANGED: - printf("Using default write-cache setting on physical drives\n"); - break; - } - props.disk_cache_policy = policy; - if (mfi_ld_set_props(fd, &props) < 0) { - error = errno; - warn("Failed to set volume properties"); - } - } - } else { - warnx("cache: Invalid command"); - close(fd); - return (EINVAL); + av += consumed; + ac -= consumed; } + error = update_cache_policy(fd, &props, &new); } close(fd); Modified: head/usr.sbin/mfiutil/mfiutil.8 ============================================================================== --- head/usr.sbin/mfiutil/mfiutil.8 Fri Sep 2 14:10:42 2011 (r225330) +++ head/usr.sbin/mfiutil/mfiutil.8 Fri Sep 2 16:00:51 2011 (r225331) @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 20, 2011 +.Dd September 2, 2011 .Dt MFIUTIL 8 .Os .Sh NAME @@ -103,7 +103,7 @@ .Cm locate Ar drive Brq "on | off" .Nm .Op Fl u Ar unit -.Cm cache Ar volume Op Ar setting Op Ar value +.Cm cache Ar volume Op Ar setting Oo Ar value Oc Op ... .Nm .Op Fl u Ar unit .Cm name Ar volume Ar name @@ -367,19 +367,23 @@ Change the state of the external LED ass .Pp The logical volume management commands include: .Bl -tag -width indent -.It Cm cache Ar volume Op Ar setting Op Ar value +.It Cm cache Ar volume Op Ar setting Oo Ar value Oc Op ... If no .Ar setting -argument is supplied, then the current cache policy for +arguments are supplied, then the current cache policy for .Ar volume is displayed; otherwise, the cache policy for .Ar volume is modified. -The optional +One or more .Ar setting -argument can be one of the following values: +arguments may be given. +Some settings take an additional +.Ar value +argument as noted below. +The valid settings are: .Bl -tag -width indent .It Cm enable Enable caching for both read and write I/O operations. From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 16:40:18 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DC642106564A; Fri, 2 Sep 2011 16:40:18 +0000 (UTC) (envelope-from marius@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B1DFB8FC08; Fri, 2 Sep 2011 16:40:18 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82GeIXM007219; Fri, 2 Sep 2011 16:40:18 GMT (envelope-from marius@svn.freebsd.org) Received: (from marius@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82GeIws007216; Fri, 2 Sep 2011 16:40:18 GMT (envelope-from marius@svn.freebsd.org) Message-Id: <201109021640.p82GeIws007216@svn.freebsd.org> From: Marius Strobl Date: Fri, 2 Sep 2011 16:40:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225334 - in head/tools/tools/netrate: netblast netsend X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 16:40:19 -0000 Author: marius Date: Fri Sep 2 16:40:18 2011 New Revision: 225334 URL: http://svn.freebsd.org/changeset/base/225334 Log: Fix alignment assumptions. PR: 160289 Approved by: re (kib) MFC after: 3 days Modified: head/tools/tools/netrate/netblast/netblast.c head/tools/tools/netrate/netsend/netsend.c Modified: head/tools/tools/netrate/netblast/netblast.c ============================================================================== --- head/tools/tools/netrate/netblast/netblast.c Fri Sep 2 16:18:06 2011 (r225333) +++ head/tools/tools/netrate/netblast/netblast.c Fri Sep 2 16:40:18 2011 (r225334) @@ -26,6 +26,7 @@ * $FreeBSD$ */ +#include #include #include #include @@ -108,11 +109,9 @@ blast_loop(int s, long duration, u_char * previous send, the error will turn up the current send * operation, causing the current sequence number also to be * skipped. - * - * XXXRW: Note alignment assumption. */ if (packet_len >= 4) { - *((u_int32_t *)packet) = htonl(counter); + be32enc(packet, counter); counter++; } if (send(s, packet, packet_len, 0) < 0) Modified: head/tools/tools/netrate/netsend/netsend.c ============================================================================== --- head/tools/tools/netrate/netsend/netsend.c Fri Sep 2 16:18:06 2011 (r225333) +++ head/tools/tools/netrate/netsend/netsend.c Fri Sep 2 16:40:18 2011 (r225334) @@ -26,6 +26,7 @@ * $FreeBSD$ */ +#include #include #include #include @@ -203,11 +204,9 @@ timing_loop(struct _a *a) * skipped. * The counter is incremented only on the initial port number, * so all destinations will see the same set of packets. - * - * XXXRW: Note alignment assumption. */ if (cur_port == a->port && a->packet_len >= 4) { - *((u_int32_t *)a->packet) = htonl(counter); + be32enc(a->packet, counter); counter++; } if (a->port == a->port_max) { /* socket already bound */ From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 17:05:34 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB86E1065670; Fri, 2 Sep 2011 17:05:34 +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 A9A838FC13; Fri, 2 Sep 2011 17:05:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82H5YDX008185; Fri, 2 Sep 2011 17:05:34 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82H5YlB008183; Fri, 2 Sep 2011 17:05:34 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201109021705.p82H5YlB008183@svn.freebsd.org> From: Xin LI Date: Fri, 2 Sep 2011 17:05:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225338 - head/sbin/fsck_ffs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 17:05:34 -0000 Author: delphij Date: Fri Sep 2 17:05:34 2011 New Revision: 225338 URL: http://svn.freebsd.org/changeset/base/225338 Log: Fix the check in dircheck() on namlen. The value of namlen is copied from on-disk d_namlen, which is a 8-bit unsigned integer which can never exceed MAXNAMLEN (255) so the test is always true. Moreover, UFS does not allow d_namelen being zero. Change namlen from u_int to u_int8_t, and replace the unneeded test with a useful test. PR: bin/160339 Submitted by: Eugene Grosbein MFC after: 2 weeks Approved by: re (kib) Modified: head/sbin/fsck_ffs/dir.c Modified: head/sbin/fsck_ffs/dir.c ============================================================================== --- head/sbin/fsck_ffs/dir.c Fri Sep 2 17:05:11 2011 (r225337) +++ head/sbin/fsck_ffs/dir.c Fri Sep 2 17:05:34 2011 (r225338) @@ -210,7 +210,7 @@ dircheck(struct inodesc *idesc, struct d size_t size; char *cp; u_char type; - u_int namlen; + u_int8_t namlen; int spaceleft; spaceleft = DIRBLKSIZ - (idesc->id_loc % DIRBLKSIZ); @@ -225,7 +225,7 @@ dircheck(struct inodesc *idesc, struct d type = dp->d_type; if (dp->d_reclen < size || idesc->id_filesize < size || - namlen > MAXNAMLEN || + namlen == 0 || type > 15) goto bad; for (cp = dp->d_name, size = 0; size < namlen; size++) From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 17:06:23 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E000A106564A; Fri, 2 Sep 2011 17:06:23 +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 CEC288FC18; Fri, 2 Sep 2011 17:06:23 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82H6NwS008253; Fri, 2 Sep 2011 17:06:23 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82H6NLT008251; Fri, 2 Sep 2011 17:06:23 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201109021706.p82H6NLT008251@svn.freebsd.org> From: Xin LI Date: Fri, 2 Sep 2011 17:06:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225339 - head/sys/dev/coretemp X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 17:06:24 -0000 Author: delphij Date: Fri Sep 2 17:06:23 2011 New Revision: 225339 URL: http://svn.freebsd.org/changeset/base/225339 Log: Expose more variables from coretemp(4) via sysctl: - tjmax - Tj(max) value from the CPU - delta - current delta reading - resolution - sensor resolution in Celsius - throttle_log - whether a #PROCHOT was asserted since last reset Submitted by: Mark Johnston (mostly) MFC after: 1 month Approved by: re (kib) Modified: head/sys/dev/coretemp/coretemp.c Modified: head/sys/dev/coretemp/coretemp.c ============================================================================== --- head/sys/dev/coretemp/coretemp.c Fri Sep 2 17:05:34 2011 (r225338) +++ head/sys/dev/coretemp/coretemp.c Fri Sep 2 17:06:23 2011 (r225339) @@ -48,12 +48,21 @@ __FBSDID("$FreeBSD$"); #include #include -#define TZ_ZEROC 2732 +#define TZ_ZEROC 2732 + +#define THERM_STATUS_LOG 0x02 +#define THERM_STATUS 0x01 +#define THERM_STATUS_TEMP_SHIFT 16 +#define THERM_STATUS_TEMP_MASK 0x7f +#define THERM_STATUS_RES_SHIFT 27 +#define THERM_STATUS_RES_MASK 0x0f +#define THERM_STATUS_VALID_SHIFT 31 +#define THERM_STATUS_VALID_MASK 0x01 struct coretemp_softc { device_t sc_dev; int sc_tjmax; - struct sysctl_oid *sc_oid; + unsigned int sc_throttle_log; }; /* @@ -64,8 +73,10 @@ static int coretemp_probe(device_t dev); static int coretemp_attach(device_t dev); static int coretemp_detach(device_t dev); -static int coretemp_get_temp(device_t dev); -static int coretemp_get_temp_sysctl(SYSCTL_HANDLER_ARGS); +static uint64_t coretemp_get_thermal_msr(int cpu); +static void coretemp_clear_thermal_msr(int cpu); +static int coretemp_get_val_sysctl(SYSCTL_HANDLER_ARGS); +static int coretemp_throttle_log_sysctl(SYSCTL_HANDLER_ARGS); static device_method_t coretemp_methods[] = { /* Device interface */ @@ -83,8 +94,16 @@ static driver_t coretemp_driver = { sizeof(struct coretemp_softc), }; +enum therm_info { + CORETEMP_TEMP, + CORETEMP_DELTA, + CORETEMP_RESOLUTION, + CORETEMP_TJMAX, +}; + static devclass_t coretemp_devclass; -DRIVER_MODULE(coretemp, cpu, coretemp_driver, coretemp_devclass, NULL, NULL); +DRIVER_MODULE(coretemp, cpu, coretemp_driver, coretemp_devclass, NULL, + NULL); static void coretemp_identify(driver_t *driver, device_t parent) @@ -135,6 +154,8 @@ coretemp_attach(device_t dev) uint64_t msr; int cpu_model, cpu_stepping; int ret, tjtarget; + struct sysctl_oid *oid; + struct sysctl_ctx_list *ctx; sc->sc_dev = dev; pdev = device_get_parent(dev); @@ -149,7 +170,7 @@ coretemp_attach(device_t dev) */ if (cpu_model < 0xe) return (ENXIO); - + #if 0 /* * XXXrpaulo: I have this CPU model and when it returns from C3 * coretemp continues to function properly. @@ -216,7 +237,7 @@ coretemp_attach(device_t dev) ret = rdmsr_safe(MSR_IA32_TEMPERATURE_TARGET, &msr); if (ret == 0) { tjtarget = (msr >> 16) & 0xff; - + /* * On earlier generation of processors, the value * obtained from IA32_TEMPERATURE_TARGET register is @@ -243,15 +264,35 @@ coretemp_attach(device_t dev) if (bootverbose) device_printf(dev, "Setting TjMax=%d\n", sc->sc_tjmax); + ctx = device_get_sysctl_ctx(dev); + + oid = SYSCTL_ADD_NODE(ctx, + SYSCTL_CHILDREN(device_get_sysctl_tree(pdev)), OID_AUTO, + "coretemp", CTLFLAG_RD, NULL, "Per-CPU thermal information"); + /* - * Add the "temperature" MIB to dev.cpu.N. + * Add the MIBs to dev.cpu.N and dev.cpu.N.coretemp. */ - sc->sc_oid = SYSCTL_ADD_PROC(device_get_sysctl_ctx(pdev), - SYSCTL_CHILDREN(device_get_sysctl_tree(pdev)), - OID_AUTO, "temperature", - CTLTYPE_INT | CTLFLAG_RD, - dev, 0, coretemp_get_temp_sysctl, "IK", + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(device_get_sysctl_tree(pdev)), + OID_AUTO, "temperature", CTLTYPE_INT | CTLFLAG_RD, dev, + CORETEMP_TEMP, coretemp_get_val_sysctl, "IK", "Current temperature"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "delta", + CTLTYPE_INT | CTLFLAG_RD, dev, CORETEMP_DELTA, + coretemp_get_val_sysctl, "I", + "Delta between TCC activation and current temperature"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "resolution", + CTLTYPE_INT | CTLFLAG_RD, dev, CORETEMP_RESOLUTION, + coretemp_get_val_sysctl, "I", + "Resolution of CPU thermal sensor"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, "tjmax", + CTLTYPE_INT | CTLFLAG_RD, dev, CORETEMP_TJMAX, + coretemp_get_val_sysctl, "IK", + "TCC activation temperature"); + SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(oid), OID_AUTO, + "throttle_log", CTLTYPE_INT | CTLFLAG_RW, dev, 0, + coretemp_throttle_log_sysctl, "I", + "Set to 1 if the thermal sensor has tripped"); return (0); } @@ -259,22 +300,13 @@ coretemp_attach(device_t dev) static int coretemp_detach(device_t dev) { - struct coretemp_softc *sc = device_get_softc(dev); - - sysctl_remove_oid(sc->sc_oid, 1, 0); - return (0); } - -static int -coretemp_get_temp(device_t dev) +static uint64_t +coretemp_get_thermal_msr(int cpu) { uint64_t msr; - int temp; - int cpu = device_get_unit(dev); - struct coretemp_softc *sc = device_get_softc(dev); - char stemp[16]; thread_lock(curthread); sched_bind(curthread, cpu); @@ -296,51 +328,116 @@ coretemp_get_temp(device_t dev) sched_unbind(curthread); thread_unlock(curthread); - /* - * Check for Thermal Status and Thermal Status Log. - */ - if ((msr & 0x3) == 0x3) - device_printf(dev, "PROCHOT asserted\n"); + return (msr); +} + +static void +coretemp_clear_thermal_msr(int cpu) +{ + thread_lock(curthread); + sched_bind(curthread, cpu); + thread_unlock(curthread); + + wrmsr(MSR_THERM_STATUS, 0); + + thread_lock(curthread); + sched_unbind(curthread); + thread_unlock(curthread); +} + +static int +coretemp_get_val_sysctl(SYSCTL_HANDLER_ARGS) +{ + device_t dev; + uint64_t msr; + int val, tmp; + struct coretemp_softc *sc; + enum therm_info type; + char stemp[16]; + + dev = (device_t) arg1; + msr = coretemp_get_thermal_msr(device_get_unit(dev)); + sc = device_get_softc(dev); + type = arg2; + + if (((msr >> THERM_STATUS_VALID_SHIFT) & THERM_STATUS_VALID_MASK) != 1) { + val = -1; + } else { + switch (type) { + case CORETEMP_TEMP: + tmp = (msr >> THERM_STATUS_TEMP_SHIFT) & + THERM_STATUS_TEMP_MASK; + val = (sc->sc_tjmax - tmp) * 10 + TZ_ZEROC; + break; + case CORETEMP_DELTA: + val = (msr >> THERM_STATUS_TEMP_SHIFT) & + THERM_STATUS_TEMP_MASK; + break; + case CORETEMP_RESOLUTION: + val = (msr >> THERM_STATUS_RES_SHIFT) & + THERM_STATUS_RES_MASK; + break; + case CORETEMP_TJMAX: + val = sc->sc_tjmax * 10 + TZ_ZEROC; + break; + } + } + + if (msr & THERM_STATUS_LOG) { + sc->sc_throttle_log = 1; - /* - * Bit 31 contains "Reading valid" - */ - if (((msr >> 31) & 0x1) == 1) { /* - * Starting on bit 16 and ending on bit 22. + * Check for Critical Temperature Status and Critical + * Temperature Log. It doesn't really matter if the + * current temperature is invalid because the "Critical + * Temperature Log" bit will tell us if the Critical + * Temperature has * been reached in past. It's not + * directly related to the current temperature. + * + * If we reach a critical level, allow devctl(4) + * to catch this and shutdown the system. */ - temp = sc->sc_tjmax - ((msr >> 16) & 0x7f); - } else - temp = -1; - - /* - * Check for Critical Temperature Status and Critical - * Temperature Log. - * It doesn't really matter if the current temperature is - * invalid because the "Critical Temperature Log" bit will - * tell us if the Critical Temperature has been reached in - * past. It's not directly related to the current temperature. - * - * If we reach a critical level, allow devctl(4) to catch this - * and shutdown the system. - */ - if (((msr >> 4) & 0x3) == 0x3) { - device_printf(dev, "critical temperature detected, " - "suggest system shutdown\n"); - snprintf(stemp, sizeof(stemp), "%d", temp); - devctl_notify("coretemp", "Thermal", stemp, "notify=0xcc"); + if (msr & THERM_STATUS) { + tmp = (msr >> THERM_STATUS_TEMP_SHIFT) & + THERM_STATUS_TEMP_MASK; + tmp = (sc->sc_tjmax - tmp) * 10 + TZ_ZEROC; + device_printf(dev, "critical temperature detected, " + "suggest system shutdown\n"); + snprintf(stemp, sizeof(stemp), "%d", tmp); + devctl_notify("coretemp", "Thermal", stemp, + "notify=0xcc"); + } } - return (temp); + return (sysctl_handle_int(oidp, &val, 0, req)); } static int -coretemp_get_temp_sysctl(SYSCTL_HANDLER_ARGS) +coretemp_throttle_log_sysctl(SYSCTL_HANDLER_ARGS) { - device_t dev = (device_t) arg1; - int temp; + device_t dev; + uint64_t msr; + int error, val; + struct coretemp_softc *sc; + + dev = (device_t) arg1; + msr = coretemp_get_thermal_msr(device_get_unit(dev)); + sc = device_get_softc(dev); + + if (msr & THERM_STATUS_LOG) + sc->sc_throttle_log = 1; + + val = sc->sc_throttle_log; - temp = coretemp_get_temp(dev) * 10 + TZ_ZEROC; + error = sysctl_handle_int(oidp, &val, 0, req); - return (sysctl_handle_int(oidp, &temp, 0, req)); + if (error || !req->newptr) + return (error); + else if (val != 0) + return (EINVAL); + + coretemp_clear_thermal_msr(device_get_unit(dev)); + sc->sc_throttle_log = 0; + + return (0); } From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 17:06:51 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 397141065677; Fri, 2 Sep 2011 17:06:51 +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 2917A8FC18; Fri, 2 Sep 2011 17:06:51 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82H6p98008300; Fri, 2 Sep 2011 17:06:51 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82H6p8n008298; Fri, 2 Sep 2011 17:06:51 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201109021706.p82H6p8n008298@svn.freebsd.org> From: Xin LI Date: Fri, 2 Sep 2011 17:06:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225340 - head/sys/dev/ichwd X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 17:06:51 -0000 Author: delphij Date: Fri Sep 2 17:06:50 2011 New Revision: 225340 URL: http://svn.freebsd.org/changeset/base/225340 Log: Fix a bug in ichwd(4) which prevents it from beig enabled if the new timeout is the same timeout. Submitted by: Dmitrij Tejblum PR: kern/139604 MFC after: 2 weeks Approved by: re (kib) Modified: head/sys/dev/ichwd/ichwd.c Modified: head/sys/dev/ichwd/ichwd.c ============================================================================== --- head/sys/dev/ichwd/ichwd.c Fri Sep 2 17:06:23 2011 (r225339) +++ head/sys/dev/ichwd/ichwd.c Fri Sep 2 17:06:50 2011 (r225340) @@ -402,11 +402,10 @@ ichwd_event(void *arg, unsigned int cmd, cmd &= WD_INTERVAL; timeout = ((uint64_t)1 << cmd) / ICHWD_TICK; if (cmd) { - if (timeout != sc->timeout) { - if (!sc->active) - ichwd_tmr_enable(sc); + if (!sc->active) + ichwd_tmr_enable(sc); + if (timeout != sc->timeout) ichwd_tmr_set(sc, timeout); - } ichwd_tmr_reload(sc); *error = 0; } else { From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 17:12:00 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 287541065670; Fri, 2 Sep 2011 17:12:00 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1845A8FC0C; Fri, 2 Sep 2011 17:12:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82HBxxp008503; Fri, 2 Sep 2011 17:11:59 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82HBxSS008501; Fri, 2 Sep 2011 17:11:59 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201109021711.p82HBxSS008501@svn.freebsd.org> From: John Baldwin Date: Fri, 2 Sep 2011 17:11:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225341 - head/sbin/mount X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 17:12:00 -0000 Author: jhb Date: Fri Sep 2 17:11:59 2011 New Revision: 225341 URL: http://svn.freebsd.org/changeset/base/225341 Log: Clear the mountprog variable after each mountfs() call so that mountprog options don't leak over into subsequent mounts listed in /etc/fstab. While here, fix a memory leak in debug mode. Reported by: rank1seeker @ gmail Approved by: re (kib) MFC after: 1 week Modified: head/sbin/mount/mount.c Modified: head/sbin/mount/mount.c ============================================================================== --- head/sbin/mount/mount.c Fri Sep 2 17:06:50 2011 (r225340) +++ head/sbin/mount/mount.c Fri Sep 2 17:11:59 2011 (r225341) @@ -589,6 +589,9 @@ mountfs(const char *vfstype, const char for (i = 1; i < mnt_argv.c; i++) (void)printf(" %s", mnt_argv.a[i]); (void)printf("\n"); + free(optbuf); + free(mountprog); + mountprog = NULL; return (0); } @@ -599,6 +602,8 @@ mountfs(const char *vfstype, const char } free(optbuf); + free(mountprog); + mountprog = NULL; if (verbose) { if (statfs(name, &sf) < 0) { From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 17:36:01 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BB40B106564A; Fri, 2 Sep 2011 17:36:01 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7232A8FC0A; Fri, 2 Sep 2011 17:36:01 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82Ha1fG009307; Fri, 2 Sep 2011 17:36:01 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82Ha1QN009305; Fri, 2 Sep 2011 17:36:01 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201109021736.p82Ha1QN009305@svn.freebsd.org> From: Robert Watson Date: Fri, 2 Sep 2011 17:36:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225343 - head/sys/dev/xen/console X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 17:36:01 -0000 Author: rwatson Date: Fri Sep 2 17:36:01 2011 New Revision: 225343 URL: http://svn.freebsd.org/changeset/base/225343 Log: Add support for alternative break-to-debugger support on the Xen console. This should help debug boot-time hangs experienced in 9.0-BETA. MFC after: 3 weeks Tested by: sbruno Approved by: re (kib) Modified: head/sys/dev/xen/console/console.c Modified: head/sys/dev/xen/console/console.c ============================================================================== --- head/sys/dev/xen/console/console.c Fri Sep 2 17:30:50 2011 (r225342) +++ head/sys/dev/xen/console/console.c Fri Sep 2 17:36:01 2011 (r225343) @@ -70,6 +70,10 @@ static int rc, rp; static unsigned int cnsl_evt_reg; static unsigned int wc, wp; /* write_cons, write_prod */ +#ifdef KDB +static int xc_altbrk; +#endif + #define CDEV_MAJOR 12 #define XCUNIT(x) (dev2unit(x)) #define ISTTYOPEN(tp) ((tp) && ((tp)->t_state & TS_ISOPEN)) @@ -268,8 +272,12 @@ xencons_rx(char *buf, unsigned len) #endif ) { tty_lock(tp); - for (i = 0; i < len; i++) + for (i = 0; i < len; i++) { +#ifdef KDB + kdb_alt_break(buf[i], &xc_altbrk); +#endif ttydisc_rint(tp, buf[i], 0); + } ttydisc_rint_done(tp); tty_unlock(tp); } else { From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 17:40:40 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EF5E106566B; Fri, 2 Sep 2011 17:40:40 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0B7D68FC0C; Fri, 2 Sep 2011 17:40:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82HeeEc009479; Fri, 2 Sep 2011 17:40:40 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82Hedjp009470; Fri, 2 Sep 2011 17:40:39 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <201109021740.p82Hedjp009470@svn.freebsd.org> From: Robert Watson Date: Fri, 2 Sep 2011 17:40:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225344 - in head/sys: kern security/mac security/mac_biba security/mac_mls security/mac_stub security/mac_test X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 17:40:40 -0000 Author: rwatson Date: Fri Sep 2 17:40:39 2011 New Revision: 225344 URL: http://svn.freebsd.org/changeset/base/225344 Log: Correct several issues in the integration of POSIX shared memory objects and the new setmode and setowner fileops in FreeBSD 9.0: - Add new MAC Framework entry point mac_posixshm_check_create() to allow MAC policies to authorise shared memory use. Provide a stub policy and test policy templates. - Add missing Biba and MLS implementations of mac_posixshm_check_setmode() and mac_posixshm_check_setowner(). - Add 'accmode' argument to mac_posixshm_check_open() -- unlike the mac_posixsem_check_open() entry point it was modeled on, the access mode is required as shared memory access can be read-only as well as writable; this isn't true of POSIX semaphores. - Implement full range of POSIX shared memory entry points for Biba and MLS. Sponsored by: Google Inc. Obtained from: TrustedBSD Project Approved by: re (kib) Modified: head/sys/kern/uipc_shm.c head/sys/security/mac/mac_framework.h head/sys/security/mac/mac_policy.h head/sys/security/mac/mac_posix_shm.c head/sys/security/mac_biba/mac_biba.c head/sys/security/mac_mls/mac_mls.c head/sys/security/mac_stub/mac_stub.c head/sys/security/mac_test/mac_test.c Modified: head/sys/kern/uipc_shm.c ============================================================================== --- head/sys/kern/uipc_shm.c Fri Sep 2 17:36:01 2011 (r225343) +++ head/sys/kern/uipc_shm.c Fri Sep 2 17:40:39 2011 (r225344) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 Robert N. M. Watson + * Copyright (c) 2006, 2011 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -31,25 +31,21 @@ * * TODO: * - * (2) Need to export data to a userland tool via a sysctl. Should ipcs(1) + * (1) Need to export data to a userland tool via a sysctl. Should ipcs(1) * and ipcrm(1) be expanded or should new tools to manage both POSIX * kernel semaphores and POSIX shared memory be written? * - * (3) Add support for this file type to fstat(1). + * (2) Add support for this file type to fstat(1). * - * (4) Resource limits? Does this need its own resource limits or are the + * (3) Resource limits? Does this need its own resource limits or are the * existing limits in mmap(2) sufficient? * - * (5) Partial page truncation. vnode_pager_setsize() will zero any parts + * (4) Partial page truncation. vnode_pager_setsize() will zero any parts * of a partially mapped page as a result of ftruncate(2)/truncate(2). * We can do the same (with the same pmap evil), but do we need to * worry about the bits on disk if the page is swapped out or will the * swapper zero the parts of a page that are invalid if the page is * swapped back in for us? - * - * (6) Add MAC support in mac_biba(4) and mac_mls(4). - * - * (7) Add a MAC check_create() hook for creating new named objects. */ #include @@ -551,8 +547,16 @@ shm_open(struct thread *td, struct shm_o if (shmfd == NULL) { /* Object does not yet exist, create it if requested. */ if (uap->flags & O_CREAT) { - shmfd = shm_alloc(td->td_ucred, cmode); - shm_insert(path, fnv, shmfd); +#ifdef MAC + error = mac_posixshm_check_create(td->td_ucred, + path); + if (error == 0) { +#endif + shmfd = shm_alloc(td->td_ucred, cmode); + shm_insert(path, fnv, shmfd); +#ifdef MAC + } +#endif } else { free(path, M_SHMFD); error = ENOENT; @@ -569,7 +573,7 @@ shm_open(struct thread *td, struct shm_o else { #ifdef MAC error = mac_posixshm_check_open(td->td_ucred, - shmfd); + shmfd, FFLAGS(uap->flags & O_ACCMODE)); if (error == 0) #endif error = shm_access(shmfd, td->td_ucred, Modified: head/sys/security/mac/mac_framework.h ============================================================================== --- head/sys/security/mac/mac_framework.h Fri Sep 2 17:36:01 2011 (r225343) +++ head/sys/security/mac/mac_framework.h Fri Sep 2 17:40:39 2011 (r225344) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002, 2007-2009 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007-2011 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * Copyright (c) 2005-2006 SPARTA, Inc. * All rights reserved. @@ -238,9 +238,11 @@ void mac_posixsem_create(struct ucred * void mac_posixsem_destroy(struct ksem *); void mac_posixsem_init(struct ksem *); +int mac_posixshm_check_create(struct ucred *cred, const char *path); int mac_posixshm_check_mmap(struct ucred *cred, struct shmfd *shmfd, int prot, int flags); -int mac_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd); +int mac_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd, + accmode_t accmode); int mac_posixshm_check_setmode(struct ucred *cred, struct shmfd *shmfd, mode_t mode); int mac_posixshm_check_setowner(struct ucred *cred, struct shmfd *shmfd, Modified: head/sys/security/mac/mac_policy.h ============================================================================== --- head/sys/security/mac/mac_policy.h Fri Sep 2 17:36:01 2011 (r225343) +++ head/sys/security/mac/mac_policy.h Fri Sep 2 17:40:39 2011 (r225344) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002, 2007-2009 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007-2011 Robert N. M. Watson * Copyright (c) 2001-2005 Networks Associates Technology, Inc. * Copyright (c) 2005-2006 SPARTA, Inc. * Copyright (c) 2008 Apple Inc. @@ -355,11 +355,14 @@ typedef void (*mpo_posixsem_create_t)(st typedef void (*mpo_posixsem_destroy_label_t)(struct label *label); typedef void (*mpo_posixsem_init_label_t)(struct label *label); +typedef int (*mpo_posixshm_check_create_t)(struct ucred *cred, + const char *path); typedef int (*mpo_posixshm_check_mmap_t)(struct ucred *cred, struct shmfd *shmfd, struct label *shmlabel, int prot, int flags); typedef int (*mpo_posixshm_check_open_t)(struct ucred *cred, - struct shmfd *shmfd, struct label *shmlabel); + struct shmfd *shmfd, struct label *shmlabel, + accmode_t accmode); typedef int (*mpo_posixshm_check_setmode_t)(struct ucred *cred, struct shmfd *shmfd, struct label *shmlabel, mode_t mode); @@ -812,6 +815,7 @@ struct mac_policy_ops { mpo_posixsem_destroy_label_t mpo_posixsem_destroy_label; mpo_posixsem_init_label_t mpo_posixsem_init_label; + mpo_posixshm_check_create_t mpo_posixshm_check_create; mpo_posixshm_check_mmap_t mpo_posixshm_check_mmap; mpo_posixshm_check_open_t mpo_posixshm_check_open; mpo_posixshm_check_setmode_t mpo_posixshm_check_setmode; Modified: head/sys/security/mac/mac_posix_shm.c ============================================================================== --- head/sys/security/mac/mac_posix_shm.c Fri Sep 2 17:36:01 2011 (r225343) +++ head/sys/security/mac/mac_posix_shm.c Fri Sep 2 17:40:39 2011 (r225344) @@ -1,6 +1,6 @@ /*- * Copyright (c) 2003-2006 SPARTA, Inc. - * Copyright (c) 2009 Robert N. M. Watson + * Copyright (c) 2009-2011 Robert N. M. Watson * All rights reserved. * * This software was developed for the FreeBSD Project in part by Network @@ -101,6 +101,20 @@ mac_posixshm_create(struct ucred *cred, shmfd->shm_label); } +MAC_CHECK_PROBE_DEFINE2(posixshm_check_create, "struct ucred *", + "const char *"); + +int +mac_posixshm_check_create(struct ucred *cred, const char *path) +{ + int error; + + MAC_POLICY_CHECK_NOSLEEP(posixshm_check_create, cred, path); + MAC_CHECK_PROBE2(posixshm_check_create, error, cred, path); + + return (error); +} + MAC_CHECK_PROBE_DEFINE4(posixshm_check_mmap, "struct ucred *", "struct shmfd *", "int", "int"); @@ -118,17 +132,18 @@ mac_posixshm_check_mmap(struct ucred *cr return (error); } -MAC_CHECK_PROBE_DEFINE2(posixshm_check_open, "struct ucred *", - "struct shmfd *"); +MAC_CHECK_PROBE_DEFINE3(posixshm_check_open, "struct ucred *", + "struct shmfd *", "accmode_t accmode"); int -mac_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd) +mac_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd, + accmode_t accmode) { int error; MAC_POLICY_CHECK_NOSLEEP(posixshm_check_open, cred, shmfd, - shmfd->shm_label); - MAC_CHECK_PROBE2(posixshm_check_open, error, cred, shmfd); + shmfd->shm_label, accmode); + MAC_CHECK_PROBE3(posixshm_check_open, error, cred, shmfd, accmode); return (error); } Modified: head/sys/security/mac_biba/mac_biba.c ============================================================================== --- head/sys/security/mac_biba/mac_biba.c Fri Sep 2 17:36:01 2011 (r225343) +++ head/sys/security/mac_biba/mac_biba.c Fri Sep 2 17:40:39 2011 (r225344) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002, 2007-2009 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007-2011 Robert N. M. Watson * Copyright (c) 2001-2005 McAfee, Inc. * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. @@ -14,6 +14,9 @@ * This software was enhanced by SPARTA ISSO under SPAWAR contract * N66001-04-C-6019 ("SEFOS"). * + * This software was developed at the University of Cambridge Computer + * Laboratory with support from a grant from Google, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -1622,6 +1625,42 @@ biba_posixsem_check_openunlink(struct uc } static int +biba_posixsem_check_setmode(struct ucred *cred, struct ksem *ks, + struct label *kslabel, mode_t mode) +{ + struct mac_biba *subj, *obj; + + if (!biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(kslabel); + + if (!biba_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int +biba_posixsem_check_setowner(struct ucred *cred, struct ksem *ks, + struct label *kslabel, uid_t uid, gid_t gid) +{ + struct mac_biba *subj, *obj; + + if (!biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(kslabel); + + if (!biba_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int biba_posixsem_check_write(struct ucred *active_cred, struct ucred *file_cred, struct ksem *ks, struct label *kslabel) { @@ -1669,6 +1708,156 @@ biba_posixsem_create(struct ucred *cred, biba_copy_effective(source, dest); } +static int +biba_posixshm_check_mmap(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel, int prot, int flags) +{ + struct mac_biba *subj, *obj; + + if (!biba_enabled || !revocation_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { + if (!biba_dominate_effective(obj, subj)) + return (EACCES); + } + if (((prot & VM_PROT_WRITE) != 0) && ((flags & MAP_SHARED) != 0)) { + if (!biba_dominate_effective(subj, obj)) + return (EACCES); + } + + return (0); +} + +static int +biba_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel, accmode_t accmode) +{ + struct mac_biba *subj, *obj; + + if (!biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (accmode & (VREAD | VEXEC | VSTAT_PERMS)) { + if (!biba_dominate_effective(obj, subj)) + return (EACCES); + } + if (accmode & VMODIFY_PERMS) { + if (!biba_dominate_effective(subj, obj)) + return (EACCES); + } + + return (0); +} + +static int +biba_posixshm_check_setmode(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel, mode_t mode) +{ + struct mac_biba *subj, *obj; + + if (!biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (!biba_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int +biba_posixshm_check_setowner(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel, uid_t uid, gid_t gid) +{ + struct mac_biba *subj, *obj; + + if (!biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (!biba_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int +biba_posixshm_check_stat(struct ucred *active_cred, struct ucred *file_cred, + struct shmfd *shmfd, struct label *shmlabel) +{ + struct mac_biba *subj, *obj; + + if (!biba_enabled) + return (0); + + subj = SLOT(active_cred->cr_label); + obj = SLOT(shmlabel); + + if (!biba_dominate_effective(obj, subj)) + return (EACCES); + + return (0); +} + +static int +biba_posixshm_check_truncate(struct ucred *active_cred, + struct ucred *file_cred, struct shmfd *shmfd, struct label *shmlabel) +{ + struct mac_biba *subj, *obj; + + if (!biba_enabled) + return (0); + + subj = SLOT(active_cred->cr_label); + obj = SLOT(shmlabel); + + if (!biba_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int +biba_posixshm_check_unlink(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel) +{ + struct mac_biba *subj, *obj; + + if (!biba_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (!biba_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static void +biba_posixshm_create(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel) +{ + struct mac_biba *source, *dest; + + source = SLOT(cred->cr_label); + dest = SLOT(shmlabel); + + biba_copy_effective(source, dest); +} + /* * Some system privileges are allowed regardless of integrity grade; others * are allowed only when running with privilege with respect to the Biba @@ -3455,6 +3644,8 @@ static struct mac_policy_ops mac_biba_op .mpo_posixsem_check_getvalue = biba_posixsem_check_rdonly, .mpo_posixsem_check_open = biba_posixsem_check_openunlink, .mpo_posixsem_check_post = biba_posixsem_check_write, + .mpo_posixsem_check_setmode = biba_posixsem_check_setmode, + .mpo_posixsem_check_setowner = biba_posixsem_check_setowner, .mpo_posixsem_check_stat = biba_posixsem_check_rdonly, .mpo_posixsem_check_unlink = biba_posixsem_check_openunlink, .mpo_posixsem_check_wait = biba_posixsem_check_write, @@ -3462,6 +3653,17 @@ static struct mac_policy_ops mac_biba_op .mpo_posixsem_destroy_label = biba_destroy_label, .mpo_posixsem_init_label = biba_init_label, + .mpo_posixshm_check_mmap = biba_posixshm_check_mmap, + .mpo_posixshm_check_open = biba_posixshm_check_open, + .mpo_posixshm_check_setmode = biba_posixshm_check_setmode, + .mpo_posixshm_check_setowner = biba_posixshm_check_setowner, + .mpo_posixshm_check_stat = biba_posixshm_check_stat, + .mpo_posixshm_check_truncate = biba_posixshm_check_truncate, + .mpo_posixshm_check_unlink = biba_posixshm_check_unlink, + .mpo_posixshm_create = biba_posixshm_create, + .mpo_posixshm_destroy_label = biba_destroy_label, + .mpo_posixshm_init_label = biba_init_label, + .mpo_priv_check = biba_priv_check, .mpo_proc_check_debug = biba_proc_check_debug, Modified: head/sys/security/mac_mls/mac_mls.c ============================================================================== --- head/sys/security/mac_mls/mac_mls.c Fri Sep 2 17:36:01 2011 (r225343) +++ head/sys/security/mac_mls/mac_mls.c Fri Sep 2 17:40:39 2011 (r225344) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002, 2007-2009 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007-2011 Robert N. M. Watson * Copyright (c) 2001-2005 McAfee, Inc. * Copyright (c) 2006 SPARTA, Inc. * All rights reserved. @@ -14,6 +14,9 @@ * This software was enhanced by SPARTA ISSO under SPAWAR contract * N66001-04-C-6019 ("SEFOS"). * + * This software was developed at the University of Cambridge Computer + * Laboratory with support from a grant from Google, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -1532,6 +1535,42 @@ mls_posixsem_check_rdonly(struct ucred * } static int +mls_posixsem_check_setmode(struct ucred *cred, struct ksem *ks, + struct label *shmlabel, mode_t mode) +{ + struct mac_mls *subj, *obj; + + if (!mls_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (!mls_dominate_effective(obj, subj)) + return (EACCES); + + return (0); +} + +static int +mls_posixsem_check_setowner(struct ucred *cred, struct ksem *ks, + struct label *shmlabel, uid_t uid, gid_t gid) +{ + struct mac_mls *subj, *obj; + + if (!mls_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (!mls_dominate_effective(obj, subj)) + return (EACCES); + + return (0); +} + +static int mls_posixsem_check_write(struct ucred *active_cred, struct ucred *file_cred, struct ksem *ks, struct label *kslabel) { @@ -1562,6 +1601,159 @@ mls_posixsem_create(struct ucred *cred, } static int +mls_posixshm_check_mmap(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel, int prot, int flags) +{ + struct mac_mls *subj, *obj; + + if (!mls_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { + if (!mls_dominate_effective(subj, obj)) + return (EACCES); + } + if (((prot & VM_PROT_WRITE) != 0) && ((flags & MAP_SHARED) != 0)) { + if (!mls_dominate_effective(obj, subj)) + return (EACCES); + } + + return (0); +} + +static int +mls_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel, accmode_t accmode) +{ + struct mac_mls *subj, *obj; + + if (!mls_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (accmode & (VREAD | VEXEC | VSTAT_PERMS)) { + if (!mls_dominate_effective(subj, obj)) + return (EACCES); + } + if (accmode & VMODIFY_PERMS) { + if (!mls_dominate_effective(obj, subj)) + return (EACCES); + } + + return (0); +} + +static int +mls_posixshm_check_setmode(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel, mode_t mode) +{ + struct mac_mls *subj, *obj; + + if (!mls_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (!mls_dominate_effective(obj, subj)) + return (EACCES); + + return (0); +} + +static int +mls_posixshm_check_setowner(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel, uid_t uid, gid_t gid) +{ + struct mac_mls *subj, *obj; + + if (!mls_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (!mls_dominate_effective(obj, subj)) + return (EACCES); + + return (0); +} + +static int +mls_posixshm_check_stat(struct ucred *active_cred, struct ucred *file_cred, + struct shmfd *shmfd, struct label *shmlabel) +{ + struct mac_mls *subj, *obj; + + if (!mls_enabled) + return (0); + + subj = SLOT(active_cred->cr_label); + obj = SLOT(shmlabel); + + if (!mls_dominate_effective(subj, obj)) + return (EACCES); + + return (0); +} + +static int +mls_posixshm_check_truncate(struct ucred *active_cred, + struct ucred *file_cred, struct shmfd *shmfd, struct label *shmlabel) +{ + struct mac_mls *subj, *obj; + + if (!mls_enabled) + return (0); + + subj = SLOT(active_cred->cr_label); + obj = SLOT(shmlabel); + + if (!mls_dominate_effective(obj, subj)) + return (EACCES); + + return (0); +} + +static int +mls_posixshm_check_unlink(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel) +{ + struct mac_mls *subj, *obj; + + if (!mls_enabled) + return (0); + + subj = SLOT(cred->cr_label); + obj = SLOT(shmlabel); + + if (!mls_dominate_effective(obj, subj)) + return (EACCES); + + return (0); +} + +static void +mls_posixshm_create(struct ucred *cred, struct shmfd *shmfd, + struct label *shmlabel) +{ + struct mac_mls *source, *dest; + + source = SLOT(cred->cr_label); + dest = SLOT(shmlabel); + + mls_copy_effective(source, dest); +} + +static int mls_proc_check_debug(struct ucred *cred, struct proc *p) { struct mac_mls *subj, *obj; @@ -3075,6 +3267,8 @@ static struct mac_policy_ops mls_ops = .mpo_posixsem_check_getvalue = mls_posixsem_check_rdonly, .mpo_posixsem_check_open = mls_posixsem_check_openunlink, .mpo_posixsem_check_post = mls_posixsem_check_write, + .mpo_posixsem_check_setmode = mls_posixsem_check_setmode, + .mpo_posixsem_check_setowner = mls_posixsem_check_setowner, .mpo_posixsem_check_stat = mls_posixsem_check_rdonly, .mpo_posixsem_check_unlink = mls_posixsem_check_openunlink, .mpo_posixsem_check_wait = mls_posixsem_check_write, @@ -3082,6 +3276,17 @@ static struct mac_policy_ops mls_ops = .mpo_posixsem_destroy_label = mls_destroy_label, .mpo_posixsem_init_label = mls_init_label, + .mpo_posixshm_check_mmap = mls_posixshm_check_mmap, + .mpo_posixshm_check_open = mls_posixshm_check_open, + .mpo_posixshm_check_setmode = mls_posixshm_check_setmode, + .mpo_posixshm_check_setowner = mls_posixshm_check_setowner, + .mpo_posixshm_check_stat = mls_posixshm_check_stat, + .mpo_posixshm_check_truncate = mls_posixshm_check_truncate, + .mpo_posixshm_check_unlink = mls_posixshm_check_unlink, + .mpo_posixshm_create = mls_posixshm_create, + .mpo_posixshm_destroy_label = mls_destroy_label, + .mpo_posixshm_init_label = mls_init_label, + .mpo_proc_check_debug = mls_proc_check_debug, .mpo_proc_check_sched = mls_proc_check_sched, .mpo_proc_check_signal = mls_proc_check_signal, Modified: head/sys/security/mac_stub/mac_stub.c ============================================================================== --- head/sys/security/mac_stub/mac_stub.c Fri Sep 2 17:36:01 2011 (r225343) +++ head/sys/security/mac_stub/mac_stub.c Fri Sep 2 17:40:39 2011 (r225344) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002, 2007-2009 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007-2011 Robert N. M. Watson * Copyright (c) 2001-2005 McAfee, Inc. * Copyright (c) 2005-2006 SPARTA, Inc. * Copyright (c) 2008 Apple Inc. @@ -734,6 +734,13 @@ stub_posixsem_create(struct ucred *cred, } static int +stub_posixshm_check_create(struct ucred *cred, const char *path) +{ + + return (0); +} + +static int stub_posixshm_check_mmap(struct ucred *cred, struct shmfd *shmfd, struct label *shmlabel, int prot, int flags) { @@ -743,7 +750,7 @@ stub_posixshm_check_mmap(struct ucred *c static int stub_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd, - struct label *shmlabel) + struct label *shmlabel, accmode_t accmode) { return (0); @@ -1772,6 +1779,7 @@ static struct mac_policy_ops stub_ops = .mpo_posixsem_destroy_label = stub_destroy_label, .mpo_posixsem_init_label = stub_init_label, + .mpo_posixshm_check_create = stub_posixshm_check_create, .mpo_posixshm_check_mmap = stub_posixshm_check_mmap, .mpo_posixshm_check_open = stub_posixshm_check_open, .mpo_posixshm_check_setmode = stub_posixshm_check_setmode, Modified: head/sys/security/mac_test/mac_test.c ============================================================================== --- head/sys/security/mac_test/mac_test.c Fri Sep 2 17:36:01 2011 (r225343) +++ head/sys/security/mac_test/mac_test.c Fri Sep 2 17:40:39 2011 (r225344) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 1999-2002, 2007-2009 Robert N. M. Watson + * Copyright (c) 1999-2002, 2007-2011 Robert N. M. Watson * Copyright (c) 2001-2005 McAfee, Inc. * Copyright (c) 2006 SPARTA, Inc. * Copyright (c) 2008 Apple Inc. @@ -1390,6 +1390,15 @@ test_posixsem_init_label(struct label *l COUNTER_INC(posixsem_init_label); } +COUNTER_DECL(posixshm_check_create); +static int +test_posixshm_check_create(struct ucred *cred, const char *path) +{ + + COUNTER_INC(posixshm_check_create); + return (0); +} + COUNTER_DECL(posixshm_check_mmap); static int test_posixshm_check_mmap(struct ucred *cred, struct shmfd *shmfd, @@ -1405,7 +1414,7 @@ test_posixshm_check_mmap(struct ucred *c COUNTER_DECL(posixshm_check_open); static int test_posixshm_check_open(struct ucred *cred, struct shmfd *shmfd, - struct label *shmfdlabel) + struct label *shmfdlabel, accmode_t accmode) { LABEL_CHECK(cred->cr_label, MAGIC_CRED); @@ -3102,6 +3111,7 @@ static struct mac_policy_ops test_ops = .mpo_posixsem_destroy_label = test_posixsem_destroy_label, .mpo_posixsem_init_label = test_posixsem_init_label, + .mpo_posixshm_check_create = test_posixshm_check_create, .mpo_posixshm_check_mmap = test_posixshm_check_mmap, .mpo_posixshm_check_open = test_posixshm_check_open, .mpo_posixshm_check_setmode = test_posixshm_check_setmode, From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 18:13:46 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3A80106564A; Fri, 2 Sep 2011 18:13:46 +0000 (UTC) (envelope-from rse@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D314F8FC0A; Fri, 2 Sep 2011 18:13:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82IDk9T010553; Fri, 2 Sep 2011 18:13:46 GMT (envelope-from rse@svn.freebsd.org) Received: (from rse@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82IDkEa010551; Fri, 2 Sep 2011 18:13:46 GMT (envelope-from rse@svn.freebsd.org) Message-Id: <201109021813.p82IDkEa010551@svn.freebsd.org> From: "Ralf S. Engelschall" Date: Fri, 2 Sep 2011 18:13:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225346 - head/share/man/man3 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 18:13:47 -0000 Author: rse Date: Fri Sep 2 18:13:46 2011 New Revision: 225346 URL: http://svn.freebsd.org/changeset/base/225346 Log: Fix a little typo and get rid of a cryptic description by aligning the text to the remaining description. Approved by: re Modified: head/share/man/man3/queue.3 Modified: head/share/man/man3/queue.3 ============================================================================== --- head/share/man/man3/queue.3 Fri Sep 2 18:04:26 2011 (r225345) +++ head/share/man/man3/queue.3 Fri Sep 2 18:13:46 2011 (r225346) @@ -193,7 +193,7 @@ O(1) removal of an entry from the head o .It Forward traversal through the list. .It -Swawpping the contents of two lists. +Swapping the contents of two lists. .El .Pp Singly-linked lists are the simplest of the four data structures @@ -227,7 +227,7 @@ Code size is about 15% greater and opera than singly-linked lists. .El .Pp -Singly-linked tailqs are ideal for applications with large datasets and +Singly-linked tail queues are ideal for applications with large datasets and few or no removals, or for implementing a FIFO queue. .Pp From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 18:37:48 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A8FC1065670; Fri, 2 Sep 2011 18:37:48 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 69F2F8FC17; Fri, 2 Sep 2011 18:37:48 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82IbmY8011309; Fri, 2 Sep 2011 18:37:48 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82IbmDb011307; Fri, 2 Sep 2011 18:37:48 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201109021837.p82IbmDb011307@svn.freebsd.org> From: Christian Brueffer Date: Fri, 2 Sep 2011 18:37:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225348 - head/share/man/man4 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 18:37:48 -0000 Author: brueffer Date: Fri Sep 2 18:37:48 2011 New Revision: 225348 URL: http://svn.freebsd.org/changeset/base/225348 Log: Remove an incorrect apostrophe. PR: 160267 Submitted by: Warren Block Approved by: re (kib) MFC after: 1 week Modified: head/share/man/man4/wlan.4 Modified: head/share/man/man4/wlan.4 ============================================================================== --- head/share/man/man4/wlan.4 Fri Sep 2 18:18:24 2011 (r225347) +++ head/share/man/man4/wlan.4 Fri Sep 2 18:37:48 2011 (r225348) @@ -121,7 +121,7 @@ Note that an interface's type cannot be .Pp .Nm defines several mechanisms by which plugin modules may -be used to extend its' functionality. +be used to extend its functionality. Cryptographic support such as WEP, TKIP, and AES-CCMP are implemented as standalone modules (if not statically configured into a system) that register with From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 18:50:44 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1A391065673; Fri, 2 Sep 2011 18:50:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9ECDB8FC0A; Fri, 2 Sep 2011 18:50:44 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82Ioi9Z011763; Fri, 2 Sep 2011 18:50:44 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82IoiW1011751; Fri, 2 Sep 2011 18:50:44 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201109021850.p82IoiW1011751@svn.freebsd.org> From: Hans Petter Selasky Date: Fri, 2 Sep 2011 18:50:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225350 - in head/sys: dev/usb dev/usb/quirk dev/usb/storage sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 18:50:44 -0000 Author: hselasky Date: Fri Sep 2 18:50:44 2011 New Revision: 225350 URL: http://svn.freebsd.org/changeset/base/225350 Log: This patch adds automatic detection of USB mass storage devices which does not support the no synchronize cache SCSI command. The __FreeBSD_version version macro has been bumped and external kernel modules needs to be recompiled after this patch. Approved by: re (kib) MFC after: 1 week PR: usb/160299 Modified: head/sys/dev/usb/quirk/usb_quirk.c head/sys/dev/usb/storage/umass.c head/sys/dev/usb/usb_device.c head/sys/dev/usb/usb_device.h head/sys/dev/usb/usb_dynamic.c head/sys/dev/usb/usb_dynamic.h head/sys/dev/usb/usb_freebsd.h head/sys/dev/usb/usb_msctest.c head/sys/dev/usb/usb_msctest.h head/sys/dev/usb/usbdi.h head/sys/sys/param.h Modified: head/sys/dev/usb/quirk/usb_quirk.c ============================================================================== --- head/sys/dev/usb/quirk/usb_quirk.c Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/quirk/usb_quirk.c Fri Sep 2 18:50:44 2011 (r225350) @@ -148,12 +148,10 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(AIPTEK, POCKETCAM3M, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), - USB_QUIRK(AIPTEK2, SUNPLUS_TECH, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, SDCR_6335, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, SDCR_6362, 0x0000, 0xffff, UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(ALCOR, AU6390, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(ALCOR, UMCR_9361, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), USB_QUIRK(ALCOR, TRANSCEND, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN, @@ -173,14 +171,12 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(CENTURY, EX35QUAT, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE), - USB_QUIRK(CENTURY, EX35SW4_SB4, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(CYPRESS, XX6830XX, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(DESKNOTE, UCR_61S2B, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(DMI, CFSM_RW, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN), - USB_QUIRK(DMI, DISK, 0x000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(EPSON, STYLUS_875DC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), USB_QUIRK(EPSON, STYLUS_895, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, @@ -188,7 +184,6 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(FEIYA, 5IN1, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(FREECOM, DVD, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_SCSI), - USB_QUIRK(FREECOM, HDD, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(FUJIPHOTO, MASS0100, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_RS_CLEAR_UA, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(GENESYS, GL641USB2IDE, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, @@ -232,7 +227,6 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(IOMEGA, ZIP100, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_TEST_UNIT_READY), /* XXX ZIP drives can also use ATAPI */ - USB_QUIRK(JMICRON, JM20336, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(JMICRON, JM20337, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE), @@ -279,8 +273,6 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_ATAPI), USB_QUIRK(MYSON, HEDEN, 0x0000, 0xffff, UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(MYSON, HEDEN_8813, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(MYSON, STARREADER, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(NEODIO, ND3260, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_FORCE_SHORT_INQ), USB_QUIRK(NETAC, CF_CARD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, @@ -317,7 +309,6 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK(PANASONIC, KXLCB35AN, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI), USB_QUIRK(PANASONIC, LS120CAM, 0x0000, 0xffff, UQ_MSC_FORCE_PROTO_UFI), - USB_QUIRK(PHILIPS, SPE3030CC, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(PLEXTOR, 40_12_40U, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_TEST_UNIT_READY), USB_QUIRK(PNY, ATTACHE2, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, @@ -328,7 +319,6 @@ static struct usb_quirk_entry usb_quirks USB_QUIRK_VP(USB_VENDOR_SAMSUNG_TECHWIN, USB_PRODUCT_SAMSUNG_TECHWIN_DIGIMAX_410, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY), - USB_QUIRK(SAMSUNG, YP_U4, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(SANDISK, SDDR05A, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_READ_CAP_OFFBY1, UQ_MSC_NO_GETMAXLUN), @@ -448,12 +438,6 @@ static struct usb_quirk_entry usb_quirks UQ_MSC_FORCE_PROTO_ATAPI), USB_QUIRK(MEIZU, M6_SL, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(ACTIONS, MP4, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB, - UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(ASUS, GMSC, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(CHIPSBANK, USBMEMSTICK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(CHIPSBANK, USBMEMSTICK1, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), - USB_QUIRK(NEWLINK, USB2IDEBRIDGE, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), /* Non-standard USB MIDI devices */ USB_QUIRK(ROLAND, UM1, 0x0000, 0xffff, UQ_AU_VENDOR_CLASS), @@ -567,9 +551,9 @@ usb_test_quirk_by_info(const struct usbd uint16_t x; uint16_t y; - if (quirk == UQ_NONE) { - return (0); - } + if (quirk == UQ_NONE) + goto done; + mtx_lock(&usb_quirk_mtx); for (x = 0; x != USB_DEV_QUIRKS_MAX; x++) { @@ -603,7 +587,8 @@ usb_test_quirk_by_info(const struct usbd break; } mtx_unlock(&usb_quirk_mtx); - return (0); +done: + return (usb_test_quirk_w(info, quirk)); } static struct usb_quirk_entry * Modified: head/sys/dev/usb/storage/umass.c ============================================================================== --- head/sys/dev/usb/storage/umass.c Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/storage/umass.c Fri Sep 2 18:50:44 2011 (r225350) @@ -1025,12 +1025,6 @@ umass_attach(device_t dev) sc->cam_scsi_sense.opcode = REQUEST_SENSE; sc->cam_scsi_test_unit_ready.opcode = TEST_UNIT_READY; - /* - * some devices need a delay after that the configuration value is - * set to function properly: - */ - usb_pause_mtx(NULL, hz); - /* register the SIM */ err = umass_cam_attach_sim(sc); if (err) { Modified: head/sys/dev/usb/usb_device.c ============================================================================== --- head/sys/dev/usb/usb_device.c Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/usb_device.c Fri Sep 2 18:50:44 2011 (r225350) @@ -1239,7 +1239,9 @@ static void usb_init_attach_arg(struct usb_device *udev, struct usb_attach_arg *uaa) { - bzero(uaa, sizeof(*uaa)); + uint8_t x; + + memset(uaa, 0, sizeof(*uaa)); uaa->device = udev; uaa->usb_mode = udev->flags.usb_mode; @@ -1254,6 +1256,9 @@ usb_init_attach_arg(struct usb_device *u uaa->info.bDeviceProtocol = udev->ddesc.bDeviceProtocol; uaa->info.bConfigIndex = udev->curr_config_index; uaa->info.bConfigNum = udev->curr_config_no; + + for (x = 0; x != USB_MAX_AUTO_QUIRK; x++) + uaa->info.autoQuirk[x] = udev->autoQuirk[x]; } /*------------------------------------------------------------------------* @@ -1850,6 +1855,20 @@ repeat_set_config: } } } + if (set_config_failed == 0 && config_index == 0 && + usb_test_quirk(&uaa, UQ_MSC_NO_SYNC_CACHE) == 0) { + + /* + * Try to figure out if there are any MSC quirks we + * should apply automatically: + */ + err = usb_msc_auto_quirk(udev, 0); + + if (err != 0) { + set_config_failed = 1; + goto repeat_set_config; + } + } config_done: DPRINTF("new dev (addr %d), udev=%p, parent_hub=%p\n", @@ -2698,3 +2717,16 @@ usbd_set_pnpinfo(struct usb_device *udev return (0); /* success */ } +usb_error_t +usbd_add_dynamic_quirk(struct usb_device *udev, uint16_t quirk) +{ + uint8_t x; + + for (x = 0; x != USB_MAX_AUTO_QUIRK; x++) { + if (udev->autoQuirk[x] == 0) { + udev->autoQuirk[x] = quirk; + return (0); /* success */ + } + } + return (USB_ERR_NOMEM); +} Modified: head/sys/dev/usb/usb_device.h ============================================================================== --- head/sys/dev/usb/usb_device.h Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/usb_device.h Fri Sep 2 18:50:44 2011 (r225350) @@ -149,6 +149,7 @@ struct usb_device { uint16_t power; /* mA the device uses */ uint16_t langid; /* language for strings */ + uint16_t autoQuirk[USB_MAX_AUTO_QUIRK]; /* dynamic quirks */ uint8_t address; /* device addess */ uint8_t device_index; /* device index in "bus->devices" */ Modified: head/sys/dev/usb/usb_dynamic.c ============================================================================== --- head/sys/dev/usb/usb_dynamic.c Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/usb_dynamic.c Fri Sep 2 18:50:44 2011 (r225350) @@ -50,12 +50,12 @@ #include #include #include +#include /* function prototypes */ static usb_handle_req_t usb_temp_get_desc_w; static usb_temp_setup_by_index_t usb_temp_setup_by_index_w; static usb_temp_unsetup_t usb_temp_unsetup_w; -static usb_test_quirk_t usb_test_quirk_w; static usb_quirk_ioctl_t usb_quirk_ioctl_w; /* global variables */ @@ -72,9 +72,19 @@ usb_temp_setup_by_index_w(struct usb_dev return (USB_ERR_INVAL); } -static uint8_t +uint8_t usb_test_quirk_w(const struct usbd_lookup_info *info, uint16_t quirk) { + uint8_t x; + + if (quirk == UQ_NONE) + return (0); /* no match */ + + for (x = 0; x != USB_MAX_AUTO_QUIRK; x++) { + if (info->autoQuirk[x] == quirk) + return (1); /* match */ + } + return (0); /* no match */ } Modified: head/sys/dev/usb/usb_dynamic.h ============================================================================== --- head/sys/dev/usb/usb_dynamic.h Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/usb_dynamic.h Fri Sep 2 18:50:44 2011 (r225350) @@ -57,5 +57,6 @@ extern devclass_t usb_devclass_ptr; void usb_temp_unload(void *); void usb_quirk_unload(void *); void usb_bus_unload(void *); +usb_test_quirk_t usb_test_quirk_w; #endif /* _USB_DYNAMIC_H_ */ Modified: head/sys/dev/usb/usb_freebsd.h ============================================================================== --- head/sys/dev/usb/usb_freebsd.h Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/usb_freebsd.h Fri Sep 2 18:50:44 2011 (r225350) @@ -68,6 +68,8 @@ #define USB_EP0_BUFSIZE 1024 /* bytes */ #define USB_CS_RESET_LIMIT 20 /* failures = 20 * 50 ms = 1sec */ +#define USB_MAX_AUTO_QUIRK 4 /* maximum number of dynamic quirks */ + typedef uint32_t usb_timeout_t; /* milliseconds */ typedef uint32_t usb_frlength_t; /* bytes */ typedef uint32_t usb_frcount_t; /* units */ Modified: head/sys/dev/usb/usb_msctest.c ============================================================================== --- head/sys/dev/usb/usb_msctest.c Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/usb_msctest.c Fri Sep 2 18:50:44 2011 (r225350) @@ -96,6 +96,8 @@ static uint8_t scsi_huawei_eject[] = { 0 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static uint8_t scsi_tct_eject[] = { 0x06, 0xf5, 0x04, 0x02, 0x52, 0x70 }; +static uint8_t scsi_sync_cache[] = { 0x35, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }; #define BULK_SIZE 64 /* dummy */ #define ERR_CSW_FAILED -1 @@ -163,7 +165,7 @@ static void bbb_done(struct bbb_transfer static void bbb_transfer_start(struct bbb_transfer *, uint8_t); static void bbb_data_clear_stall_callback(struct usb_xfer *, uint8_t, uint8_t); -static uint8_t bbb_command_start(struct bbb_transfer *, uint8_t, uint8_t, +static int bbb_command_start(struct bbb_transfer *, uint8_t, uint8_t, void *, size_t, void *, size_t, usb_timeout_t); static struct bbb_transfer *bbb_attach(struct usb_device *, uint8_t); static void bbb_detach(struct bbb_transfer *); @@ -454,7 +456,7 @@ bbb_status_callback(struct usb_xfer *xfe * 0: Success * Else: Failure *------------------------------------------------------------------------*/ -static uint8_t +static int bbb_command_start(struct bbb_transfer *sc, uint8_t dir, uint8_t lun, void *data_ptr, size_t data_len, void *cmd_ptr, size_t cmd_len, usb_timeout_t data_timeout) @@ -566,9 +568,10 @@ int usb_iface_is_cdrom(struct usb_device *udev, uint8_t iface_index) { struct bbb_transfer *sc; - usb_error_t err; - uint8_t timeout, is_cdrom; + uint8_t timeout; + uint8_t is_cdrom; uint8_t sid_type; + int err; sc = bbb_attach(udev, iface_index); if (sc == NULL) @@ -595,6 +598,88 @@ usb_iface_is_cdrom(struct usb_device *ud } usb_error_t +usb_msc_auto_quirk(struct usb_device *udev, uint8_t iface_index) +{ + struct bbb_transfer *sc; + uint8_t timeout; + uint8_t is_no_direct; + uint8_t sid_type; + int err; + + sc = bbb_attach(udev, iface_index); + if (sc == NULL) + return (0); + + /* + * Some devices need a delay after that the configuration + * value is set to function properly: + */ + usb_pause_mtx(NULL, hz); + + is_no_direct = 1; + for (timeout = 4; timeout; timeout--) { + err = bbb_command_start(sc, DIR_IN, 0, sc->buffer, + SCSI_INQ_LEN, &scsi_inquiry, sizeof(scsi_inquiry), + USB_MS_HZ); + + if (err == 0 && sc->actlen > 0) { + sid_type = sc->buffer[0] & 0x1F; + if (sid_type == 0x00) + is_no_direct = 0; + break; + } else if (err != ERR_CSW_FAILED) + break; /* non retryable error */ + usb_pause_mtx(NULL, hz); + } + + if (is_no_direct) { + DPRINTF("Device is not direct access.\n"); + goto done; + } + + err = bbb_command_start(sc, DIR_IN, 0, NULL, 0, + &scsi_test_unit_ready, sizeof(scsi_test_unit_ready), + USB_MS_HZ); + + if (err != 0) { + + if (err != ERR_CSW_FAILED) + goto error; + } + + err = bbb_command_start(sc, DIR_IN, 0, NULL, 0, + &scsi_sync_cache, sizeof(scsi_sync_cache), + USB_MS_HZ); + + if (err != 0) { + + if (err != ERR_CSW_FAILED) + goto error; + + DPRINTF("Device doesn't handle synchronize cache\n"); + + usbd_add_dynamic_quirk(udev, UQ_MSC_NO_SYNC_CACHE); + } + +done: + bbb_detach(sc); + return (0); + +error: + bbb_detach(sc); + + DPRINTF("Device did not respond, enabling all quirks\n"); + + usbd_add_dynamic_quirk(udev, UQ_MSC_NO_SYNC_CACHE); + usbd_add_dynamic_quirk(udev, UQ_MSC_NO_TEST_UNIT_READY); + + /* Need to re-enumerate the device */ + usbd_req_re_enumerate(udev, NULL); + + return (USB_ERR_STALLED); +} + +usb_error_t usb_msc_eject(struct usb_device *udev, uint8_t iface_index, int method) { struct bbb_transfer *sc; Modified: head/sys/dev/usb/usb_msctest.h ============================================================================== --- head/sys/dev/usb/usb_msctest.h Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/usb_msctest.h Fri Sep 2 18:50:44 2011 (r225350) @@ -40,5 +40,7 @@ int usb_iface_is_cdrom(struct usb_device uint8_t iface_index); usb_error_t usb_msc_eject(struct usb_device *udev, uint8_t iface_index, int method); +usb_error_t usb_msc_auto_quirk(struct usb_device *udev, + uint8_t iface_index); #endif /* _USB_MSCTEST_H_ */ Modified: head/sys/dev/usb/usbdi.h ============================================================================== --- head/sys/dev/usb/usbdi.h Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/dev/usb/usbdi.h Fri Sep 2 18:50:44 2011 (r225350) @@ -353,6 +353,7 @@ struct usbd_lookup_info { uint16_t idVendor; uint16_t idProduct; uint16_t bcdDevice; + uint16_t autoQuirk[USB_MAX_AUTO_QUIRK]; uint8_t bDeviceClass; uint8_t bDeviceSubClass; uint8_t bDeviceProtocol; @@ -475,6 +476,8 @@ void device_set_usb_desc(device_t dev); void usb_pause_mtx(struct mtx *mtx, int _ticks); usb_error_t usbd_set_pnpinfo(struct usb_device *udev, uint8_t iface_index, const char *pnpinfo); +usb_error_t usbd_add_dynamic_quirk(struct usb_device *udev, + uint16_t quirk); const struct usb_device_id *usbd_lookup_id_by_info( const struct usb_device_id *id, usb_size_t sizeof_id, Modified: head/sys/sys/param.h ============================================================================== --- head/sys/sys/param.h Fri Sep 2 18:44:57 2011 (r225349) +++ head/sys/sys/param.h Fri Sep 2 18:50:44 2011 (r225350) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 900042 /* Master, propagated to newvers */ +#define __FreeBSD_version 900043 /* Master, propagated to newvers */ #ifdef _KERNEL #define P_OSREL_SIGSEGV 700004 From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 18:52:28 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 78749106566B; Fri, 2 Sep 2011 18:52:28 +0000 (UTC) (envelope-from brueffer@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5DEB98FC0A; Fri, 2 Sep 2011 18:52:28 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82IqSjs011894; Fri, 2 Sep 2011 18:52:28 GMT (envelope-from brueffer@svn.freebsd.org) Received: (from brueffer@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82IqS0w011892; Fri, 2 Sep 2011 18:52:28 GMT (envelope-from brueffer@svn.freebsd.org) Message-Id: <201109021852.p82IqS0w011892@svn.freebsd.org> From: Christian Brueffer Date: Fri, 2 Sep 2011 18:52:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225352 - head/share/man/man4 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 18:52:28 -0000 Author: brueffer Date: Fri Sep 2 18:52:28 2011 New Revision: 225352 URL: http://svn.freebsd.org/changeset/base/225352 Log: Wording, grammar and markup cleanup. PR: 159948 Submitted by: Ben Kaduk Approved by: re (kib) Modified: head/share/man/man4/ata.4 Modified: head/share/man/man4/ata.4 ============================================================================== --- head/share/man/man4/ata.4 Fri Sep 2 18:52:17 2011 (r225351) +++ head/share/man/man4/ata.4 Fri Sep 2 18:52:28 2011 (r225352) @@ -74,47 +74,56 @@ atasis_load="YES" atavia_load="YES" .Ed .Pp -First line is common hardware independent code. -Next three lines are generic bus-specific drivers. -ataahci is AHCI driver. -The rest are vendor-specific PCI drivers. -ATA_CAM option should always remain in kernel configuration to make -the driver work as CAM(4) subsystem module. +The first line is for the common hardware independent code, and is a +prerequisite for the other modules. +The next three lines are generic bus-specific drivers. +Of the rest, ataahci is the AHCI driver. +The others are vendor-specific PCI drivers. +The +.Dv ATA_CAM +option should always remain in the kernel configuration, to make +the driver work as a +.Xr CAM 4 +subsystem module. .Pp The following tunables are settable from the .Xr loader 8 : .Bl -ohang .It Va hw.ata.ata_dma_check_80pin -set to 0 to disable the 80pin cable check (default is 1, check the cable) +set to 0 to disable the 80pin cable check (the default is 1, check the cable) .It Va hint.atapci.X.msi -set to 1 to allow Message Signalled Interrupts (MSI) to be used by +set to 1 to allow Message Signalled Interrupts (MSI) to be used by the specified PCI ATA controller, if supported. .It Va hint.ata.X.devX.mode -limits initial ATA mode for specified device on specified channel. +limits the initial ATA mode for the specified device on specified the channel. .It Va hint.ata.X.mode -limits initial ATA mode for every device on specified channel. +limits the initial ATA mode for every device on the specified channel. .It Va hint.ata.X.pm_level -controls SATA interface Power Management for specified channel, -allowing to save some power by the cost of additional command latency. +controls SATA interface Power Management for the specified channel, +allowing some power savings at the cost of additional command latency. Possible values: .Bl -tag -compact .It 0 -interface Power Management is disabled, default value. +Interface Power Management is disabled. +This is the default value. .It 1 -device is allowed to initiate PM state change, host is passive. +The device is allowed to initiate a PM state change; the host is passive. .It 2 -host initiates PARTIAL PM state transition every time port becomes idle. +The host initiates a PARTIAL PM state transition every time a port becomes idle. .It 3 host initiates SLUMBER PM state transition every time port becomes idle. .El -Modes 2 and 3 are supported only for AHCI. +Modes 2 and 3 are only supported for AHCI. .El .Sh DESCRIPTION The .Nm -driver provides the CAM(4) subsystem access to ATA (IDE) and SATA ports +driver gives the +.Xr CAM 4 +subsystem access to the ATA (IDE) and SATA ports of many generic controllers. -Depending on controller, each PATA port or each one or two SATA ports are +Depending on the controller, each PATA (IDE) +port or each one or two SATA ports are represented to CAM as a separate bus with one or two targets. Most of the bus-management details are handled by the ATA/SATA-specific transport of CAM. @@ -126,22 +135,23 @@ ATAPI devices are handled by the SCSI pr .Xr sa 4 , etc. .Pp -Driver supports ATA and for the most of controllers ATAPI devices. +This driver supports ATA, and for the most of controllers, ATAPI devices. Command queuing and SATA port multipliers are not supported. -Device hot-plug and SATA interface power management supported only on +Device hot-plug and SATA interface power management is supported only on some controllers. .Pp The .Nm driver can change the transfer mode when the system is up and running. -See -.Xr camcontrol 8 -negotiate subcommand. +See the +.Cm negotiate +subcommand of +.Xr camcontrol 8 . .Pp The .Nm driver sets the maximum transfer mode supported by the hardware as default. -However the +However, the .Nm driver sometimes warns: .Dq Sy "DMA limited to UDMA33, non-ATA66 cable or device". @@ -247,10 +257,12 @@ The .Nm driver first appeared in .Fx 4.0 . -Turned into CAM(4) interface module in +It was turned into a +.Xr CAM 4 +interface module in .Fx 9.0 . .Sh AUTHORS .An Alexander Motin .Aq mav@FreeBSD.org , .An S\(/oren Schmidt -.Aq sos@FreeBSD.org . +.Aq sos@FreeBSD.org From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 19:29:38 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 40B5C106566C; Fri, 2 Sep 2011 19:29:38 +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 303698FC0A; Fri, 2 Sep 2011 19:29:38 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82JTca2013071; Fri, 2 Sep 2011 19:29:38 GMT (envelope-from jh@svn.freebsd.org) Received: (from jh@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82JTccS013068; Fri, 2 Sep 2011 19:29:38 GMT (envelope-from jh@svn.freebsd.org) Message-Id: <201109021929.p82JTccS013068@svn.freebsd.org> From: Jaakko Heinonen Date: Fri, 2 Sep 2011 19:29:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225353 - head/sys/boot/forth X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 19:29:38 -0000 Author: jh Date: Fri Sep 2 19:29:37 2011 New Revision: 225353 URL: http://svn.freebsd.org/changeset/base/225353 Log: Restore behavior of the autoboot_delay="-1" boot menu setting to the pre-r222417 state. The behavior was essentially reversed in r222417 which can cause confusion. PR: 159775 Submitted by: Devin Teske Approved by: re (kib) Modified: head/sys/boot/forth/menu.4th head/sys/boot/forth/menu.4th.8 Modified: head/sys/boot/forth/menu.4th ============================================================================== --- head/sys/boot/forth/menu.4th Fri Sep 2 18:52:28 2011 (r225352) +++ head/sys/boot/forth/menu.4th Fri Sep 2 19:29:37 2011 (r225353) @@ -742,11 +742,12 @@ create init_text8 255 allot else -rot 2drop - \ disable timeout if less than zero + \ boot immediately if less than zero dup 0< if drop - 0 menu_timeout_enabled ! - 0 ( assigned to menu_timeout below ) + menu-create + 0 25 at-xy + 0 boot then then then Modified: head/sys/boot/forth/menu.4th.8 ============================================================================== --- head/sys/boot/forth/menu.4th.8 Fri Sep 2 18:52:28 2011 (r225352) +++ head/sys/boot/forth/menu.4th.8 Fri Sep 2 19:29:37 2011 (r225353) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 18, 2011 +.Dd Aug 29, 2011 .Dt MENU.4TH 8 .Os .Sh NAME @@ -96,11 +96,15 @@ will wait before executing by default) unless a key is pressed. If set to .Dq Li NO -(case-insensitive) or -.Dq Li -1 , +(case-insensitive) .Ic menu-display will wait for user input and never execute .Ic menu_timeout_command . +If set to +.Dq Li -1 , +.Ic menu-display +will boot immediately, preventing both interruption of the autoboot process and +escaping to the loader prompt. Default is .Dq Li 10 . See From owner-svn-src-head@FreeBSD.ORG Fri Sep 2 20:35:22 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B77B21065674; Fri, 2 Sep 2011 20:35:22 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A6A7F8FC1C; Fri, 2 Sep 2011 20:35:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p82KZMbo015061; Fri, 2 Sep 2011 20:35:22 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p82KZMJr015059; Fri, 2 Sep 2011 20:35:22 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <201109022035.p82KZMJr015059@svn.freebsd.org> From: Stanislav Sedov Date: Fri, 2 Sep 2011 20:35:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225354 - head/sys/dev/smc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Sep 2011 20:35:22 -0000 Author: stas Date: Fri Sep 2 20:35:22 2011 New Revision: 225354 URL: http://svn.freebsd.org/changeset/base/225354 Log: - Fix NULL pointer dereference when a packet of uneven size is being transmitted. Approved by: re (kib) MFC after: 3 days Modified: head/sys/dev/smc/if_smc.c Modified: head/sys/dev/smc/if_smc.c ============================================================================== --- head/sys/dev/smc/if_smc.c Fri Sep 2 19:29:37 2011 (r225353) +++ head/sys/dev/smc/if_smc.c Fri Sep 2 20:35:22 2011 (r225354) @@ -538,6 +538,7 @@ smc_task_tx(void *context, int pending) struct smc_softc *sc; struct mbuf *m, *m0; u_int packet, len; + int last_len; uint8_t *data; (void)pending; @@ -590,16 +591,18 @@ smc_task_tx(void *context, int pending) * Push the data out to the device. */ data = NULL; + last_len = 0; for (; m != NULL; m = m->m_next) { data = mtod(m, uint8_t *); smc_write_multi_2(sc, DATA0, (uint16_t *)data, m->m_len / 2); + last_len = m->m_len; } /* * Push out the control byte and and the odd byte if needed. */ if ((len & 1) != 0 && data != NULL) - smc_write_2(sc, DATA0, (CTRL_ODD << 8) | data[m->m_len - 1]); + smc_write_2(sc, DATA0, (CTRL_ODD << 8) | data[last_len - 1]); else smc_write_2(sc, DATA0, 0); From owner-svn-src-head@FreeBSD.ORG Sat Sep 3 00:28:54 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B429106564A; Sat, 3 Sep 2011 00:28:54 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 0A0138FC14; Sat, 3 Sep 2011 00:28:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p830SrHO022070; Sat, 3 Sep 2011 00:28:53 GMT (envelope-from rmacklem@svn.freebsd.org) Received: (from rmacklem@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p830SrK8022067; Sat, 3 Sep 2011 00:28:53 GMT (envelope-from rmacklem@svn.freebsd.org) Message-Id: <201109030028.p830SrK8022067@svn.freebsd.org> From: Rick Macklem Date: Sat, 3 Sep 2011 00:28:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225356 - in head/sys: fs/nfsserver nfsserver X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 00:28:54 -0000 Author: rmacklem Date: Sat Sep 3 00:28:53 2011 New Revision: 225356 URL: http://svn.freebsd.org/changeset/base/225356 Log: Fix the NFS servers so that they can do a Lookup of "..", which requires that ni_strictrelative be set to 0, post-r224810. Tested by: swills (earlier version), geo dot liaskos at gmail.com Approved by: re (kib) Modified: head/sys/fs/nfsserver/nfs_nfsdport.c head/sys/nfsserver/nfs_serv.c Modified: head/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdport.c Fri Sep 2 23:51:55 2011 (r225355) +++ head/sys/fs/nfsserver/nfs_nfsdport.c Sat Sep 3 00:28:53 2011 (r225356) @@ -282,6 +282,7 @@ nfsvno_namei(struct nfsrv_descript *nd, *retdirp = NULL; cnp->cn_nameptr = cnp->cn_pnbuf; + ndp->ni_strictrelative = 0; /* * Extract and set starting directory. */ Modified: head/sys/nfsserver/nfs_serv.c ============================================================================== --- head/sys/nfsserver/nfs_serv.c Fri Sep 2 23:51:55 2011 (r225355) +++ head/sys/nfsserver/nfs_serv.c Sat Sep 3 00:28:53 2011 (r225356) @@ -157,6 +157,7 @@ ndclear(struct nameidata *nd) nd->ni_vp = NULL; nd->ni_dvp = NULL; nd->ni_startdir = NULL; + nd->ni_strictrelative = 0; } /* From owner-svn-src-head@FreeBSD.ORG Sat Sep 3 03:12:34 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2156A106566B; Sat, 3 Sep 2011 03:12:34 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 118278FC0A; Sat, 3 Sep 2011 03:12:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p833CXTk027235; Sat, 3 Sep 2011 03:12:33 GMT (envelope-from des@svn.freebsd.org) Received: (from des@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p833CXJS027233; Sat, 3 Sep 2011 03:12:33 GMT (envelope-from des@svn.freebsd.org) Message-Id: <201109030312.p833CXJS027233@svn.freebsd.org> From: Dag-Erling Smorgrav Date: Sat, 3 Sep 2011 03:12:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225359 - head/sbin/fsck_ffs X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 03:12:34 -0000 Author: des Date: Sat Sep 3 03:12:33 2011 New Revision: 225359 URL: http://svn.freebsd.org/changeset/base/225359 Log: Forgot this nit in r221107. Approved by: re (kib) Modified: head/sbin/fsck_ffs/main.c Modified: head/sbin/fsck_ffs/main.c ============================================================================== --- head/sbin/fsck_ffs/main.c Sat Sep 3 01:45:37 2011 (r225358) +++ head/sbin/fsck_ffs/main.c Sat Sep 3 03:12:33 2011 (r225359) @@ -636,7 +636,7 @@ static void usage(void) { (void) fprintf(stderr, - "usage: %s [-BEFprfny] [-b block] [-c level] [-m mode] " + "usage: %s [-BEFfnpry] [-b block] [-c level] [-m mode] " "filesystem ...\n", getprogname()); exit(1); From owner-svn-src-head@FreeBSD.ORG Sat Sep 3 07:13:46 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8CB7D106564A; Sat, 3 Sep 2011 07:13:46 +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 789C88FC08; Sat, 3 Sep 2011 07:13:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p837DkNN034471; Sat, 3 Sep 2011 07:13:46 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p837DktO034467; Sat, 3 Sep 2011 07:13:46 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201109030713.p837DktO034467@svn.freebsd.org> From: Doug Barton Date: Sat, 3 Sep 2011 07:13:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225361 - in head: contrib/bind9 contrib/bind9/bin/check contrib/bind9/bin/confgen contrib/bind9/bin/dig contrib/bind9/bin/dig/include/dig contrib/bind9/bin/dnssec contrib/bind9/bin/nam... X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 07:13:46 -0000 Author: dougb Date: Sat Sep 3 07:13:45 2011 New Revision: 225361 URL: http://svn.freebsd.org/changeset/base/225361 Log: Upgrade to BIND version 9.8.1. Release notes at: https://deepthought.isc.org/article/AA-00446/81/ or /usr/src/contrib/bind9/ Approved by: re (kib) Added: head/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.html - copied unchanged from r225360, vendor/bind9/dist/RELEASE-NOTES-BIND-9.8.1.html head/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.pdf - copied unchanged from r225360, vendor/bind9/dist/RELEASE-NOTES-BIND-9.8.1.pdf head/contrib/bind9/RELEASE-NOTES-BIND-9.8.1.txt - copied unchanged from r225360, vendor/bind9/dist/RELEASE-NOTES-BIND-9.8.1.txt head/contrib/bind9/bin/named/include/dlz/ - copied from r225360, vendor/bind9/dist/bin/named/include/dlz/ head/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c - copied unchanged from r225360, vendor/bind9/dist/bin/named/unix/dlz_dlopen_driver.c head/contrib/bind9/lib/dns/include/dns/dlz_dlopen.h - copied unchanged from r225360, vendor/bind9/dist/lib/dns/include/dns/dlz_dlopen.h head/contrib/bind9/release-notes.css - copied unchanged from r225360, vendor/bind9/dist/release-notes.css Modified: head/contrib/bind9/CHANGES head/contrib/bind9/COPYRIGHT head/contrib/bind9/Makefile.in head/contrib/bind9/README head/contrib/bind9/bin/check/named-checkconf.c head/contrib/bind9/bin/confgen/ddns-confgen.c head/contrib/bind9/bin/confgen/rndc-confgen.c head/contrib/bind9/bin/dig/dig.c head/contrib/bind9/bin/dig/dighost.c head/contrib/bind9/bin/dig/host.c head/contrib/bind9/bin/dig/include/dig/dig.h head/contrib/bind9/bin/dig/nslookup.c head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.8 head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.docbook head/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.html head/contrib/bind9/bin/dnssec/dnssec-keygen.c head/contrib/bind9/bin/dnssec/dnssec-settime.8 head/contrib/bind9/bin/dnssec/dnssec-settime.c head/contrib/bind9/bin/dnssec/dnssec-settime.docbook head/contrib/bind9/bin/dnssec/dnssec-settime.html head/contrib/bind9/bin/dnssec/dnssec-signzone.c head/contrib/bind9/bin/named/Makefile.in head/contrib/bind9/bin/named/client.c head/contrib/bind9/bin/named/config.c head/contrib/bind9/bin/named/controlconf.c head/contrib/bind9/bin/named/include/named/globals.h head/contrib/bind9/bin/named/interfacemgr.c head/contrib/bind9/bin/named/logconf.c head/contrib/bind9/bin/named/main.c head/contrib/bind9/bin/named/query.c head/contrib/bind9/bin/named/server.c head/contrib/bind9/bin/named/statschannel.c head/contrib/bind9/bin/named/unix/Makefile.in head/contrib/bind9/bin/named/unix/os.c head/contrib/bind9/bin/named/update.c head/contrib/bind9/bin/named/xfrout.c head/contrib/bind9/bin/named/zoneconf.c head/contrib/bind9/bin/nsupdate/nsupdate.c head/contrib/bind9/bin/rndc/rndc.c head/contrib/bind9/bin/tools/genrandom.8 head/contrib/bind9/bin/tools/genrandom.docbook head/contrib/bind9/bin/tools/genrandom.html head/contrib/bind9/config.h.in head/contrib/bind9/configure.in head/contrib/bind9/doc/arm/Bv9ARM-book.xml head/contrib/bind9/doc/arm/Bv9ARM.ch01.html head/contrib/bind9/doc/arm/Bv9ARM.ch03.html head/contrib/bind9/doc/arm/Bv9ARM.ch04.html head/contrib/bind9/doc/arm/Bv9ARM.ch05.html head/contrib/bind9/doc/arm/Bv9ARM.ch06.html head/contrib/bind9/doc/arm/Bv9ARM.ch07.html head/contrib/bind9/doc/arm/Bv9ARM.ch08.html head/contrib/bind9/doc/arm/Bv9ARM.ch09.html head/contrib/bind9/doc/arm/Bv9ARM.html head/contrib/bind9/doc/arm/Bv9ARM.pdf head/contrib/bind9/doc/arm/man.arpaname.html head/contrib/bind9/doc/arm/man.ddns-confgen.html head/contrib/bind9/doc/arm/man.dig.html head/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html head/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html head/contrib/bind9/doc/arm/man.dnssec-keygen.html head/contrib/bind9/doc/arm/man.dnssec-revoke.html head/contrib/bind9/doc/arm/man.dnssec-settime.html head/contrib/bind9/doc/arm/man.dnssec-signzone.html head/contrib/bind9/doc/arm/man.genrandom.html head/contrib/bind9/doc/arm/man.host.html head/contrib/bind9/doc/arm/man.isc-hmac-fixup.html head/contrib/bind9/doc/arm/man.named-checkconf.html head/contrib/bind9/doc/arm/man.named-checkzone.html head/contrib/bind9/doc/arm/man.named-journalprint.html head/contrib/bind9/doc/arm/man.named.html head/contrib/bind9/doc/arm/man.nsec3hash.html head/contrib/bind9/doc/arm/man.nsupdate.html head/contrib/bind9/doc/arm/man.rndc-confgen.html head/contrib/bind9/doc/arm/man.rndc.conf.html head/contrib/bind9/doc/arm/man.rndc.html head/contrib/bind9/doc/misc/options head/contrib/bind9/lib/bind9/api head/contrib/bind9/lib/bind9/check.c head/contrib/bind9/lib/dns/Makefile.in head/contrib/bind9/lib/dns/acl.c head/contrib/bind9/lib/dns/adb.c head/contrib/bind9/lib/dns/api head/contrib/bind9/lib/dns/cache.c head/contrib/bind9/lib/dns/client.c head/contrib/bind9/lib/dns/diff.c head/contrib/bind9/lib/dns/dispatch.c head/contrib/bind9/lib/dns/dlz.c head/contrib/bind9/lib/dns/dns64.c head/contrib/bind9/lib/dns/dnssec.c head/contrib/bind9/lib/dns/dst_api.c head/contrib/bind9/lib/dns/dst_openssl.h head/contrib/bind9/lib/dns/gssapi_link.c head/contrib/bind9/lib/dns/gssapictx.c head/contrib/bind9/lib/dns/include/dns/Makefile.in head/contrib/bind9/lib/dns/include/dns/acl.h head/contrib/bind9/lib/dns/include/dns/cache.h head/contrib/bind9/lib/dns/include/dns/db.h head/contrib/bind9/lib/dns/include/dns/dlz.h head/contrib/bind9/lib/dns/include/dns/dnssec.h head/contrib/bind9/lib/dns/include/dns/masterdump.h head/contrib/bind9/lib/dns/include/dns/rdataset.h head/contrib/bind9/lib/dns/include/dns/resolver.h head/contrib/bind9/lib/dns/include/dns/sdlz.h head/contrib/bind9/lib/dns/include/dns/zone.h head/contrib/bind9/lib/dns/include/dst/dst.h head/contrib/bind9/lib/dns/journal.c head/contrib/bind9/lib/dns/master.c head/contrib/bind9/lib/dns/masterdump.c head/contrib/bind9/lib/dns/message.c head/contrib/bind9/lib/dns/name.c head/contrib/bind9/lib/dns/ncache.c head/contrib/bind9/lib/dns/nsec.c head/contrib/bind9/lib/dns/nsec3.c head/contrib/bind9/lib/dns/openssl_link.c head/contrib/bind9/lib/dns/openssldsa_link.c head/contrib/bind9/lib/dns/opensslrsa_link.c head/contrib/bind9/lib/dns/rbt.c head/contrib/bind9/lib/dns/rbtdb.c head/contrib/bind9/lib/dns/rbtdb.h head/contrib/bind9/lib/dns/rcode.c head/contrib/bind9/lib/dns/rdata.c head/contrib/bind9/lib/dns/rdatalist.c head/contrib/bind9/lib/dns/rdataset.c head/contrib/bind9/lib/dns/rdataslab.c head/contrib/bind9/lib/dns/request.c head/contrib/bind9/lib/dns/resolver.c head/contrib/bind9/lib/dns/sdb.c head/contrib/bind9/lib/dns/sdlz.c head/contrib/bind9/lib/dns/spnego.c head/contrib/bind9/lib/dns/ssu_external.c head/contrib/bind9/lib/dns/time.c head/contrib/bind9/lib/dns/tkey.c head/contrib/bind9/lib/dns/tsig.c head/contrib/bind9/lib/dns/ttl.c head/contrib/bind9/lib/dns/validator.c head/contrib/bind9/lib/dns/view.c head/contrib/bind9/lib/dns/xfrin.c head/contrib/bind9/lib/dns/zone.c head/contrib/bind9/lib/dns/zt.c head/contrib/bind9/lib/export/dns/Makefile.in head/contrib/bind9/lib/export/irs/Makefile.in head/contrib/bind9/lib/export/isccfg/Makefile.in head/contrib/bind9/lib/export/samples/nsprobe.c head/contrib/bind9/lib/irs/api head/contrib/bind9/lib/irs/getnameinfo.c head/contrib/bind9/lib/irs/resconf.c head/contrib/bind9/lib/isc/Makefile.in head/contrib/bind9/lib/isc/api head/contrib/bind9/lib/isc/heap.c head/contrib/bind9/lib/isc/httpd.c head/contrib/bind9/lib/isc/include/isc/file.h head/contrib/bind9/lib/isc/include/isc/task.h head/contrib/bind9/lib/isc/include/isc/taskpool.h head/contrib/bind9/lib/isc/include/isc/util.h head/contrib/bind9/lib/isc/log.c head/contrib/bind9/lib/isc/netaddr.c head/contrib/bind9/lib/isc/powerpc/include/isc/atomic.h head/contrib/bind9/lib/isc/radix.c head/contrib/bind9/lib/isc/rwlock.c head/contrib/bind9/lib/isc/sha1.c head/contrib/bind9/lib/isc/sha2.c head/contrib/bind9/lib/isc/sockaddr.c head/contrib/bind9/lib/isc/string.c head/contrib/bind9/lib/isc/task.c head/contrib/bind9/lib/isc/taskpool.c head/contrib/bind9/lib/isc/timer.c head/contrib/bind9/lib/isc/unix/dir.c head/contrib/bind9/lib/isc/unix/file.c head/contrib/bind9/lib/isc/unix/include/isc/stdtime.h head/contrib/bind9/lib/isc/unix/socket.c head/contrib/bind9/lib/isc/unix/stdio.c head/contrib/bind9/lib/isc/unix/time.c head/contrib/bind9/lib/isccc/Makefile.in head/contrib/bind9/lib/isccfg/Makefile.in head/contrib/bind9/lib/isccfg/aclconf.c head/contrib/bind9/lib/isccfg/api head/contrib/bind9/lib/isccfg/include/isccfg/aclconf.h head/contrib/bind9/lib/isccfg/namedconf.c head/contrib/bind9/lib/isccfg/parser.c head/contrib/bind9/lib/lwres/api head/contrib/bind9/lib/lwres/assert_p.h head/contrib/bind9/lib/lwres/herror.c head/contrib/bind9/lib/lwres/lwconfig.c head/contrib/bind9/lib/lwres/man/lwres.html head/contrib/bind9/lib/lwres/man/lwres_buffer.html head/contrib/bind9/lib/lwres/man/lwres_config.html head/contrib/bind9/lib/lwres/man/lwres_context.html head/contrib/bind9/lib/lwres/man/lwres_gabn.html head/contrib/bind9/lib/lwres/man/lwres_gai_strerror.html head/contrib/bind9/lib/lwres/man/lwres_getaddrinfo.html head/contrib/bind9/lib/lwres/man/lwres_gethostent.html head/contrib/bind9/lib/lwres/man/lwres_getipnode.html head/contrib/bind9/lib/lwres/man/lwres_getnameinfo.html head/contrib/bind9/lib/lwres/man/lwres_getrrsetbyname.html head/contrib/bind9/lib/lwres/man/lwres_gnba.html head/contrib/bind9/lib/lwres/man/lwres_hstrerror.html head/contrib/bind9/lib/lwres/man/lwres_inetntop.html head/contrib/bind9/lib/lwres/man/lwres_noop.html head/contrib/bind9/lib/lwres/man/lwres_packet.html head/contrib/bind9/lib/lwres/man/lwres_resutil.html head/contrib/bind9/lib/lwres/print.c head/contrib/bind9/make/rules.in head/contrib/bind9/version head/lib/bind/config.h head/share/doc/bind9/Makefile head/usr.sbin/named/Makefile Directory Properties: head/contrib/bind9/ (props changed) Modified: head/contrib/bind9/CHANGES ============================================================================== --- head/contrib/bind9/CHANGES Sat Sep 3 03:13:35 2011 (r225360) +++ head/contrib/bind9/CHANGES Sat Sep 3 07:13:45 2011 (r225361) @@ -1,28 +1,60 @@ - --- 9.8.0-P4 released --- + --- 9.8.1 released --- -3124. [bug] Use an rdataset attribute flag to indicate - negative-cache records rather than using rrtype 0; - this will prevent problems when that rrtype is - used in actual DNS packets. [RT #24777] + --- 9.8.1rc1 released --- + +3141. [bug] Silence spurious "zone serial (0) unchanged" messages + associated with empty zones. [RT #25079] + +3138. [bug] Address memory leaks and out-of-order operations when + shutting named down. [RT #25210] + +3136. [func] Add RFC 1918 reverse zones to the list of built-in + empty zones switched on by the 'empty-zones-enable' + option. [RT #24990] + + Note: empty-zones-enable must be "yes;" or a empty + zone needs to be disabled in named.conf for RFC 1918 + zones to be activated. This requirement may be + removed in future releases. + +3135. [port] FreeBSD: workaround broken IPV6_USE_MIN_MTU processing. + See http://www.freebsd.org/cgi/query-pr.cgi?pr=158307 + [RT #24950] + +3134. [bug] Improve the accuracy of dnssec-signzone's signing + statistics. [RT #16030] + + --- 9.8.1b3 released --- + +3133. [bug] Change #3114 was incomplete. [RT #24577] + +3131. [tuning] Improve scalability by allocating one zone task + per 100 zones at startup time, rather than using a + fixed-size task table. [RT #24406] + +3129. [bug] Named could crash on 'rndc reconfig' when + allow-new-zones was set to yes and named ACLs + were used. [RT #22739] - --- 9.8.0-P3 released (withdrawn) --- + --- 9.8.1b2 released --- 3126. [security] Using DNAME record to generate replacements caused - RPZ to exit with a assertion failure. [RT #23766] + RPZ to exit with a assertion failure. [RT #24766] 3125. [security] Using wildcard CNAME records as a replacement with RPZ caused named to exit with a assertion failure. [RT #24715] +3124. [bug] Use an rdataset attribute flag to indicate + negative-cache records rather than using rrtype 0; + this will prevent problems when that rrtype is + used in actual DNS packets. [RT #24777] + 3123. [security] Change #2912 exposed a latent flaw in dns_rdataset_totext() that could cause named to crash with an assertion failure. [RT #24777] -3115. [bug] Named could fail to return requested data when - following a CNAME that points into the same zone. - [RT #2445] - - --- 9.8.0-P2 released --- +3122. [cleanup] dnssec-settime: corrected usage message. [RT #24664] 3121. [security] An authoritative name server sending a negative response containing a very large RRset could @@ -33,12 +65,256 @@ that validated insecure without using DLV and had DS records in the parent zone. [RT #24631] - --- 9.8.0-P1 released --- +3119. [bug] When rolling to a new DNSSEC key, a private-type + record could be created and never marked complete. + [RT #23253] + +3118. [bug] nsupdate could dump core on shutdown when using + SIG(0) keys. [RT #24604] + +3117. [cleanup] Remove doc and parser references to the + never-implemented 'auto-dnssec create' option. + [RT #24533] + +3115. [bug] Named could fail to return requested data when + following a CNAME that points into the same zone. + [RT #24455] + +3114. [bug] Retain expired RRSIGs in dynamic zones if key is + inactive and there is no replacement key. [RT #23136] + +3113. [doc] Document the relationship between serial-query-rate + and NOTIFY messages. + + --- 9.8.1b1 released --- + +3112. [doc] Add missing descriptions of the update policy name + types "ms-self", "ms-subdomain", "krb5-self" and + "krb5-subdomain", which allow machines to update + their own records, to the BIND 9 ARM. + +3111. [bug] Improved consistency checks for dnssec-enable and + dnssec-validation, added test cases to the + checkconf system test. [RT #24398] + +3110. [bug] dnssec-signzone: Wrong error message could appear + when attempting to sign with no KSK. [RT #24369] + +3107. [bug] dnssec-signzone: Report the correct number of ZSKs + when using -x. [RT #20852] + +3105. [bug] GOST support can be suppressed by "configure + --without-gost" [RT #24367] + +3104. [bug] Better support for cross-compiling. [RT #24367] + +3103. [bug] Configuring 'dnssec-validation auto' in a view + instead of in the options statement could trigger + an assertion failure in named-checkconf. [RT #24382] + +3101. [bug] Zones using automatic key maintenance could fail + to check the key repository for updates. [RT #23744] 3100. [security] Certain response policy zone configurations could trigger an INSIST when receiving a query of type RRSIG. [RT #24280] +3099. [test] "dlz" system test now runs but gives R:SKIPPED if + not compiled with --with-dlz-filesystem. [RT #24146] + +3098. [bug] DLZ zones were answering without setting the AA bit. + [RT #24146] + +3097. [test] Add a tool to test handling of malformed packets. + [RT #24096] + +3096. [bug] Set KRB5_KTNAME before calling log_cred() in + dst_gssapi_acceptctx(). [RT #24004] + +3095. [bug] Handle isolated reserved ports in the port range. + [RT #23957] + +3094. [doc] Expand dns64 documentation. + +3093. [bug] Fix gssapi/kerberos dependencies [RT #23836] + +3092. [bug] Signatures for records at the zone apex could go + stale due to an incorrect timer setting. [RT #23769] + +3091. [bug] Fixed a bug in which zone keys that were published + and then subsequently activated could fail to trigger + automatic signing. [RT #22911] + +3090. [func] Make --with-gssapi default [RT #23738] + +3088. [bug] Remove bin/tests/system/logfileconfig/ns1/named.conf + and add setup.sh in order to resolve changing + named.conf issue. [RT #23687] + +3087. [bug] DDNS updates using SIG(0) with update-policy match + type "external" could cause a crash. [RT #23735] + +3086. [bug] Running dnssec-settime -f on an old-style key will + now force an update to the new key format even if no + other change has been specified, using "-P now -A now" + as default values. [RT #22474] + +3083. [bug] NOTIFY messages were not being sent when generating + a NSEC3 chain incrementally. [RT #23702] + +3082. [port] strtok_r is threads only. [RT #23747] + +3081. [bug] Failure of DNAME substitution did not return + YXDOMAIN. [RT #23591] + +3080. [cleanup] Replaced compile time constant by STDTIME_ON_32BITS. + [RT #23587] + +3079. [bug] Handle isc_event_allocate failures in t_tasks. + [RT #23572] + +3078. [func] Added a new include file with function typedefs + for the DLZ "dlopen" driver. [RT #23629] + +3077. [bug] zone.c:zone_refreshkeys() incorrectly called + dns_zone_attach(), use zone->irefs instead. [RT #23303] + +3075. [bug] dns_dnssec_findzonekeys{2} used a inconsistant + timestamp when determining which keys are active. + [RT #23642] + +3074. [bug] Make the adb cache read through for zone data and + glue learn for zone named is authoritative for. + [RT #22842] + +3073. [bug] managed-keys changes were not properly being recorded. + [RT #20256] + +3072. [bug] dns_dns64_aaaaok() potential NULL pointer dereference. + [RT #20256] + +3071. [bug] has_nsec could be used unintialised in + update.c:next_active. [RT #20256] + +3070. [bug] dnssec-signzone potential NULL pointer dereference. + [RT #20256] + +3069. [cleanup] Silence warnings messages from clang static analysis. + [RT #20256] + +3068. [bug] Named failed to build with a OpenSSL without engine + support. [RT #23473] + +3067. [bug] ixfr-from-differences {master|slave}; failed to + select the master/slave zones. [RT #23580] + +3066. [func] The DLZ "dlopen" driver is now built by default, + no longer requiring a configure option. To + disable it, use "configure --without-dlopen". + (Note: driver not supported on win32.) [RT #23467] + +3065. [bug] RRSIG could have time stamps too far in the future. + [RT #23356] + +3064. [bug] powerpc: add sync instructions to the end of atomic + operations. [RT #23469] + +3063. [contrib] More verbose error reporting from DLZ LDAP. [RT #23402] + +3059. [test] Added a regression test for change #3023. + +3058. [bug] Cause named to terminate at startup or rndc reconfig/ + reload to fail, if a log file specified in the conf + file isn't a plain file. [RT #22771] + +3057. [bug] "rndc secroots" would abort after the first error + and so could miss some views. [RT #23488] + +3054. [bug] Added elliptic curve support check in + GOST OpenSSL engine detection. [RT #23485] + +3053. [bug] Under a sustained high query load with a finite + max-cache-size, it was possible for cache memory + to be exhausted and not recovered. [RT #23371] + +3052. [test] Fixed last autosign test report. [RT #23256] + +3051. [bug] NS records obsure DNAME records at the bottom of the + zone if both are present. [RT #23035] + +3050. [bug] The autosign system test was timing dependent. + Wait for the initial autosigning to complete + before running the rest of the test. [RT #23035] + +3049. [bug] Save and restore the gid when creating creating + named.pid at startup. [RT #23290] + +3048. [bug] Fully separate view key mangement. [RT #23419] + +3047. [bug] DNSKEY NODATA responses not cached fixed in + validator.c. Tests added to dnssec system test. + [RT #22908] + +3046. [bug] Use RRSIG original TTL to compute validated RRset + and RRSIG TTL. [RT #23332] + +3044. [bug] Hold the socket manager lock while freeing the socket. + [RT #23333] + +3043. [test] Merged in the NetBSD ATF test framework (currently + version 0.12) for development of future unit tests. + Use configure --with-atf to build ATF internally + or configure --with-atf=prefix to use an external + copy. [RT #23209] + +3042. [bug] dig +trace could fail attempting to use IPv6 + addresses on systems with only IPv4 connectivity. + [RT #23297] + +3041. [bug] dnssec-signzone failed to generate new signatures on + ttl changes. [RT #23330] + +3040. [bug] Named failed to validate insecure zones where a node + with a CNAME existed between the trust anchor and the + top of the zone. [RT #23338] + +3038. [bug] Install . [RT #23342] + +3037. [doc] Update COPYRIGHT to contain all the individual + copyright notices that cover various parts. + +3036. [bug] Check built-in zone arguments to see if the zone + is re-usable or not. [RT #21914] + +3035. [cleanup] Simplify by using strlcpy. [RT #22521] + +3034. [cleanup] nslookup: use strlcpy instead of safecopy. [RT #22521] + +3033. [cleanup] Add two INSIST(bucket != DNS_ADB_INVALIDBUCKET). + [RT #22521] + +3032. [bug] rdatalist.c: add missing REQUIREs. [RT #22521] + +3031. [bug] dns_rdataclass_format() handle a zero sized buffer. + [RT #22521] + +3030. [bug] dns_rdatatype_format() handle a zero sized buffer. + [RT #22521] + +3029. [bug] isc_netaddr_format() handle a zero sized buffer. + [RT #22521] + +3028. [bug] isc_sockaddr_format() handle a zero sized buffer. + [RT #22521] + +3027. [bug] Add documented REQUIREs to cfg_obj_asnetprefix() to + catch NULL pointer dereferences before they happen. + [RT #22521] + +3026. [bug] lib/isc/httpd.c: check that we have enough space + after calling grow_headerspace() and if not + re-call grow_headerspace() until we do. [RT #22521] + --- 9.8.0 released --- 3025. [bug] Fixed a possible deadlock due to zone resigning. @@ -51,8 +327,8 @@ receiving multiple AXFR response messages that were not all TSIG-signed. [RT #23254] -3022. [bug] Fixed rpz SERVFAILs after failed zone transfers - [RT #23246] +3022. [bug] Fixed rpz SERVFAILs after failed zone transfers + [RT #23246] 3021. [bug] Change #3010 was incomplete. [RT #22296] @@ -86,7 +362,7 @@ 'resolver-query-timeout' option, which specifies a max time in seconds. 0 means 'default' and anything longer than 30 will be silently set to 30. [RT #22852] - + 3010. [bug] Fixed a bug where "rndc reconfig" stopped the timer for refreshing managed-keys. [RT #22296] @@ -436,7 +712,7 @@ 2927. [placeholder] 2926. [placeholder] -h + 2925. [bug] Named failed to accept uncachable negative responses from insecure zones. [RT# 21555] @@ -495,7 +771,7 @@ h 2905. [port] aix: set use_atomic=yes with native compiler. [RT #21402] -2904. [bug] When using DLV, sub-zones of the zones in the DLV, +2904. [bug] When using DLV, sub-zones of the zones in the DLV, could be incorrectly marked as insecure instead of secure leading to negative proofs failing. This was a unintended outcome from change 2890. [RT# 21392] @@ -783,7 +1059,7 @@ h [RT #20710] 2812. [bug] Make sure updates can't result in a zone with - NSEC-only keys and NSEC3 records. [RT 20748] + NSEC-only keys and NSEC3 records. [RT #20748] 2811. [cleanup] Add "rndc sign" to list of commands in rndc usage output. [RT #20733] @@ -864,7 +1140,7 @@ h 2790. [bug] Handle DS queries to stub zones. [RT #20440] -2789. [bug] Fixed an INSIST in dispatch.c [RT #20576] +2789. [bug] Fixed an INSIST in dispatch.c [RT #20576] 2788. [bug] dnssec-signzone could sign with keys that were not requested [RT #20625] @@ -1760,7 +2036,7 @@ h 2529. [cleanup] Upgrade libtool to silence complaints from recent version of autoconf. [RT #18657] -2528. [cleanup] Silence spurious configure warning about +2528. [cleanup] Silence spurious configure warning about --datarootdir [RT #19096] 2527. [placeholder] @@ -2045,13 +2321,13 @@ h 2441. [bug] isc_radix_insert() could copy radix tree nodes incompletely. [RT #18573] -2440. [bug] named-checkconf used an incorrect test to determine +2440. [bug] named-checkconf used an incorrect test to determine if an ACL was set to none. -2439. [bug] Potential NULL dereference in dns_acl_isanyornone(). +2439. [bug] Potential NULL dereference in dns_acl_isanyornone(). [RT #18559] -2438. [bug] Timeouts could be logged incorrectly under win32. +2438. [bug] Timeouts could be logged incorrectly under win32. 2437. [bug] Sockets could be closed too early, leading to inconsistent states in the socket module. [RT #18298] @@ -2065,7 +2341,7 @@ h 2433. [tuning] Set initial timeout to 800ms. -2432. [bug] More Windows socket handling improvements. Stop +2432. [bug] More Windows socket handling improvements. Stop using I/O events and use IO Completion Ports throughout. Rewrite the receive path logic to make it easier to support multiple simultaneous @@ -2100,7 +2376,7 @@ h epoll and /dev/poll to be selected at compile time. [RT #18277] -2423. [security] Randomize server selection on queries, so as to +2423. [security] Randomize server selection on queries, so as to make forgery a little more difficult. Instead of always preferring the server with the lowest RTT, pick a server with RTT within the same 128 @@ -2114,7 +2390,7 @@ h Use caution: this option may not work for some operating systems without rebuilding named. -2420. [bug] Windows socket handling cleanup. Let the io +2420. [bug] Windows socket handling cleanup. Let the io completion event send out canceled read/write done events, which keeps us from writing to memory we no longer have ownership of. Add debugging @@ -2436,8 +2712,8 @@ h 2316. [port] Missing #include in lib/dns/gssapictx.c. [RT #17513] -2315. [bug] Used incorrect address family for mapped IPv4 - addresses in acl.c. [RT #17519] +2315. [bug] Used incorrect address family for mapped IPv4 + addresses in acl.c. [RT #17519] 2314. [bug] Uninitialized memory use on error path in bin/named/lwdnoop.c. [RT #17476] @@ -2448,14 +2724,14 @@ h 2312. [cleanup] Silence Coverity warning in lib/isc/unix/socket.c. [RT #17458] -2311. [bug] IPv6 addresses could match IPv4 ACL entries and - vice versa. [RT #17462] +2311. [bug] IPv6 addresses could match IPv4 ACL entries and + vice versa. [RT #17462] 2310. [bug] dig, host, nslookup: flush stdout before emitting debug/fatal messages. [RT #17501] -2309. [cleanup] Fix Coverity warnings in lib/dns/acl.c and iptable.c. - [RT #17455] +2309. [cleanup] Fix Coverity warnings in lib/dns/acl.c and iptable.c. + [RT #17455] 2308. [cleanup] Silence Coverity warning in bin/named/controlconf.c. [RT #17495] @@ -2507,7 +2783,7 @@ h 2292. [bug] Log if the working directory is not writable. [RT #17312] -2291. [bug] PR_SET_DUMPABLE may be set too late. Also report +2291. [bug] PR_SET_DUMPABLE may be set too late. Also report failure to set PR_SET_DUMPABLE. [RT #17312] 2290. [bug] Let AD in the query signal that the client wants AD @@ -2545,7 +2821,7 @@ h 2280. [func] Allow the experimental http server to be reached over IPv6 as well as IPv4. [RT #17332] -2279. [bug] Use setsockopt(SO_NOSIGPIPE), when available, +2279. [bug] Use setsockopt(SO_NOSIGPIPE), when available, to protect applications from receiving spurious SIGPIPE signals when using the resolver. @@ -2580,9 +2856,9 @@ h --- 9.5.0b1 released --- -2267. [bug] Radix tree node_num value could be set incorrectly, - causing positive ACL matches to look like negative - ones. [RT #17311] +2267. [bug] Radix tree node_num value could be set incorrectly, + causing positive ACL matches to look like negative + ones. [RT #17311] 2266. [bug] client.c:get_clientmctx() returned the same mctx once the pool of mctx's was filled. [RT #17218] @@ -2598,7 +2874,7 @@ h 2262. [bug] Error status from all but the last view could be lost. [RT #17292] -2261. [bug] Fix memory leak with "any" and "none" ACLs [RT #17272] +2261. [bug] Fix memory leak with "any" and "none" ACLs [RT #17272] 2260. [bug] Reported wrong clients-per-query when increasing the value. [RT #17236] Modified: head/contrib/bind9/COPYRIGHT ============================================================================== --- head/contrib/bind9/COPYRIGHT Sat Sep 3 03:13:35 2011 (r225360) +++ head/contrib/bind9/COPYRIGHT Sat Sep 3 07:13:45 2011 (r225361) @@ -13,9 +13,15 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -$Id: COPYRIGHT,v 1.17 2011-01-04 23:47:13 tbox Exp $ +$Id: COPYRIGHT,v 1.17.14.1 2011-02-22 06:34:47 marka Exp $ -Portions Copyright (C) 1996-2001 Nominum, Inc. + Portions of this code release fall under one or more of the + following Copyright notices. Please see individual source + files for details. + + For binary releases also see: OpenSSL-LICENSE. + +Copyright (C) 1996-2001 Nominum, Inc. Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above @@ -28,3 +34,485 @@ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + ----------------------------------------------------------------------------- + +Copyright (C) 1995-2000 by Network Associates, Inc. + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND ISC AND NETWORK ASSOCIATES DISCLAIMS +ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE +FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR +IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + ----------------------------------------------------------------------------- + +Copyright (C) 2002 Stichting NLnet, Netherlands, stichting@nlnet.nl. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the +above copyright notice and this permission notice appear in all +copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND STICHTING NLNET +DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL +STICHTING NLNET BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. + +The development of Dynamically Loadable Zones (DLZ) for Bind 9 was +conceived and contributed by Rob Butler. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the +above copyright notice and this permission notice appear in all +copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND ROB BUTLER +DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL +ROB BUTLER BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS +OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE +USE OR PERFORMANCE OF THIS SOFTWARE. + + ----------------------------------------------------------------------------- + +Copyright (c) 1987, 1990, 1993, 1994 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: + This product includes software developed by the University of + California, Berkeley and its contributors. +4. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + ----------------------------------------------------------------------------- + +Copyright (C) The Internet Society 2005. This version of +this module is part of RFC 4178; see the RFC itself for +full legal notices. + +(The above copyright notice is per RFC 3978 5.6 (a), q.v.) + + ----------------------------------------------------------------------------- + +Copyright (c) 2004 Masarykova universita +(Masaryk University, Brno, Czech Republic) +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the University nor the names of its contributors may + be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. + + ----------------------------------------------------------------------------- + +Copyright (c) 1997 - 2003 Kungliga Tekniska Högskolan +(Royal Institute of Technology, Stockholm, Sweden). +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name of the Institute nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + ----------------------------------------------------------------------------- + +Copyright (c) 1998 Doug Rabson +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + ----------------------------------------------------------------------------- + +Copyright ((c)) 2002, Rice University +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Rice University (RICE) nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + +This software is provided by RICE and the contributors on an "as is" +basis, without any representations or warranties of any kind, express +or implied including, but not limited to, representations or +warranties of non-infringement, merchantability or fitness for a +particular purpose. In no event shall RICE or contributors be liable +for any direct, indirect, incidental, special, exemplary, or +consequential damages (including, but not limited to, procurement of +substitute goods or services; loss of use, data, or profits; or +business interruption) however caused and on any theory of liability, +whether in contract, strict liability, or tort (including negligence +or otherwise) arising in any way out of the use of this software, even +if advised of the possibility of such damage. + + ----------------------------------------------------------------------------- + +Copyright (c) 1993 by Digital Equipment Corporation. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies, and that +the name of Digital Equipment Corporation not be used in advertising or +publicity pertaining to distribution of the document or software without +specific, written prior permission. + +THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL +WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT +CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL +DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR +PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS +ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + ----------------------------------------------------------------------------- + +Copyright 2000 Aaron D. Gifford. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the copyright holder nor the names of contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR(S) AND CONTRIBUTOR(S) ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR(S) OR CONTRIBUTOR(S) BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + ----------------------------------------------------------------------------- + +Copyright (c) 1998 Doug Rabson. +Copyright (c) 2001 Jake Burkholder. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + ----------------------------------------------------------------------------- + +Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the project nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + ----------------------------------------------------------------------------- + +Copyright (c) 1999-2000 by Nortel Networks Corporation + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND NORTEL NETWORKS DISCLAIMS +ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NORTEL NETWORKS +BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES +OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, +WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, +ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS +SOFTWARE. + + ----------------------------------------------------------------------------- + +Copyright (c) 2000-2002 Japan Network Information Center. All rights reserved. + +By using this file, you agree to the terms and conditions set forth bellow. + + LICENSE TERMS AND CONDITIONS + +The following License Terms and Conditions apply, unless a different +license is obtained from Japan Network Information Center ("JPNIC"), +a Japanese association, Kokusai-Kougyou-Kanda Bldg 6F, 2-3-4 Uchi-Kanda, +Chiyoda-ku, Tokyo 101-0047, Japan. + +1. Use, Modification and Redistribution (including distribution of any + modified or derived work) in source and/or binary forms is permitted + under this License Terms and Conditions. + +2. Redistribution of source code must retain the copyright notices as they + appear in each source code file, this License Terms and Conditions. + +3. Redistribution in binary form must reproduce the Copyright Notice, + this License Terms and Conditions, in the documentation and/or other + materials provided with the distribution. For the purposes of binary + distribution the "Copyright Notice" refers to the following language: + "Copyright (c) 2000-2002 Japan Network Information Center. All rights + reserved." + +4. The name of JPNIC may not be used to endorse or promote products + derived from this Software without specific prior written approval of + JPNIC. + +5. Disclaimer/Limitation of Liability: THIS SOFTWARE IS PROVIDED BY JPNIC + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JPNIC BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR + BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + + ----------------------------------------------------------------------------- + +Copyright (C) 2004 Nominet, Ltd. + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND NOMINET DISCLAIMS ALL WARRANTIES WITH +REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY +AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, +INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM +LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE +OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + + ----------------------------------------------------------------------------- + +Portions Copyright RSA Security Inc. + +License to copy and use this software is granted provided that it is +identified as "RSA Security Inc. PKCS #11 Cryptographic Token Interface +(Cryptoki)" in all material mentioning or referencing this software. + +License is also granted to make and use derivative works provided that +such works are identified as "derived from the RSA Security Inc. PKCS #11 +Cryptographic Token Interface (Cryptoki)" in all material mentioning or +referencing the derived work. + +RSA Security Inc. makes no representations concerning either the +merchantability of this software or the suitability of this software for +any particular purpose. It is provided "as is" without express or implied +warranty of any kind. + + ----------------------------------------------------------------------------- + +Copyright (c) 1996, David Mazieres +Copyright (c) 2008, Damien Miller + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +----------------------------------------------------------------------------- + +Copyright (c) 2000-2001 The OpenSSL Project. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + +3. All advertising materials mentioning features or use of this + software must display the following acknowledgment: + "This product includes software developed by the OpenSSL Project + for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + +4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + endorse or promote products derived from this software without + prior written permission. For written permission, please contact + licensing@OpenSSL.org. + +5. Products derived from this software may not be called "OpenSSL" + nor may "OpenSSL" appear in their names without prior written + permission of the OpenSSL Project. + *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-head@FreeBSD.ORG Sat Sep 3 08:08:24 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6100E1065673; Sat, 3 Sep 2011 08:08:24 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5185B8FC16; Sat, 3 Sep 2011 08:08:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p8388OEr036229; Sat, 3 Sep 2011 08:08:24 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8388O67036227; Sat, 3 Sep 2011 08:08:24 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201109030808.p8388O67036227@svn.freebsd.org> From: Edward Tomasz Napierala Date: Sat, 3 Sep 2011 08:08:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225364 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 08:08:24 -0000 Author: trasz Date: Sat Sep 3 08:08:24 2011 New Revision: 225364 URL: http://svn.freebsd.org/changeset/base/225364 Log: Fix panic that happens when fork(2) fails due to a limit other than the rctl one - for example, it happens when someone reaches maximum number of processes in the system. Approved by: re (kib) Modified: head/sys/kern/kern_racct.c Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Sat Sep 3 08:03:25 2011 (r225363) +++ head/sys/kern/kern_racct.c Sat Sep 3 08:08:24 2011 (r225364) @@ -605,6 +605,7 @@ out: void racct_proc_exit(struct proc *p) { + int i; uint64_t runtime; PROC_LOCK(p); @@ -618,14 +619,18 @@ racct_proc_exit(struct proc *p) if (runtime < p->p_prev_runtime) runtime = p->p_prev_runtime; #endif - racct_set(p, RACCT_CPU, runtime); + mtx_lock(&racct_lock); + racct_set_locked(p, RACCT_CPU, runtime); - /* - * XXX: Free this some other way. - */ - racct_set(p, RACCT_NPTS, 0); - racct_set(p, RACCT_NTHR, 0); - racct_set(p, RACCT_RSS, 0); + for (i = 0; i <= RACCT_MAX; i++) { + if (p->p_racct->r_resources[i] == 0) + continue; + if (!RACCT_IS_RECLAIMABLE(i)) + continue; + racct_set_locked(p, i, 0); + } + + mtx_unlock(&racct_lock); PROC_UNLOCK(p); #ifdef RCTL From owner-svn-src-head@FreeBSD.ORG Sat Sep 3 11:41:00 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E92851065670; Sat, 3 Sep 2011 11:41:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id C59DB8FC0A; Sat, 3 Sep 2011 11:41:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p83Bf0xD044372; Sat, 3 Sep 2011 11:41:00 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p83Bf0lO044370; Sat, 3 Sep 2011 11:41:00 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201109031141.p83Bf0lO044370@svn.freebsd.org> From: Dimitry Andric Date: Sat, 3 Sep 2011 11:41:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225366 - head/libexec/rtld-elf X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 11:41:01 -0000 Author: dim Date: Sat Sep 3 11:41:00 2011 New Revision: 225366 URL: http://svn.freebsd.org/changeset/base/225366 Log: When libexec/rtld-elf/rtld.c is compiled with clang, the r_debug_state() function (a hook necessary for gdb support), is inlined, but since the function contains no code, no calls to it are generated. When gdb is debugging a dynamically linked program, this causes backtraces to be corrupted. Fix it by marking the function __noinline, and inserting an empty asm statement, that pretends to clobber memory. This forces the compiler to emit calls to r_debug_state() throughout rtld.c. Approved by: re (kib) Modified: head/libexec/rtld-elf/rtld.c Modified: head/libexec/rtld-elf/rtld.c ============================================================================== --- head/libexec/rtld-elf/rtld.c Sat Sep 3 08:31:59 2011 (r225365) +++ head/libexec/rtld-elf/rtld.c Sat Sep 3 11:41:00 2011 (r225366) @@ -144,7 +144,7 @@ static void ld_utrace_log(int, void *, v static void rtld_fill_dl_phdr_info(const Obj_Entry *obj, struct dl_phdr_info *phdr_info); -void r_debug_state(struct r_debug *, struct link_map *); +void r_debug_state(struct r_debug *, struct link_map *) __noinline; /* * Data declarations. @@ -2782,6 +2782,14 @@ linkmap_delete(Obj_Entry *obj) void r_debug_state(struct r_debug* rd, struct link_map *m) { + /* + * The following is a hack to force the compiler to emit calls to + * this function, even when optimizing. If the function is empty, + * the compiler is not obliged to emit any code for calls to it, + * even when marked __noinline. However, gdb depends on those + * calls being made. + */ + __asm __volatile("" : : : "memory"); } /* From owner-svn-src-head@FreeBSD.ORG Sat Sep 3 12:59:06 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1658D1065673; Sat, 3 Sep 2011 12:59:06 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 073F38FC12; Sat, 3 Sep 2011 12:59:06 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p83Cx5lh046727; Sat, 3 Sep 2011 12:59:05 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p83Cx5kH046725; Sat, 3 Sep 2011 12:59:05 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201109031259.p83Cx5kH046725@svn.freebsd.org> From: Gavin Atkinson Date: Sat, 3 Sep 2011 12:59:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r225367 - head/share/misc X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 12:59:06 -0000 Author: gavin Date: Sat Sep 3 12:59:05 2011 New Revision: 225367 URL: http://svn.freebsd.org/changeset/base/225367 Log: Add my doc mentor/mentee relationships. Approved by: re (kib), bcr, jkois (mentors) Modified: head/share/misc/committers-doc.dot Modified: head/share/misc/committers-doc.dot ============================================================================== --- head/share/misc/committers-doc.dot Sat Sep 3 11:41:00 2011 (r225366) +++ head/share/misc/committers-doc.dot Sat Sep 3 12:59:05 2011 (r225367) @@ -57,6 +57,7 @@ danger [label="Daniel Gerzo\ndanger@Free delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"] gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2007/02/02"] ganbold [label="Ganbold Tsagaankhuu\nganbold@FreeBSD.org\n2008/02/26"] +gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2011/07/18"] gjb [label="Glen Barber\ngjb@FreeBSD.org\n2010/09/01"] hrs [label="Hiroki Sato\nhrs@FreeBSD.org\n2000/07/06"] jkois [label="Johann Kois\njkois@FreeBSD.org\n2004/11/11"] @@ -83,6 +84,8 @@ trhodes [label="Tom Rhodes\ntrhodes@Free # Group together all the mentees for a particular mentor. # Keep the list sorted by mentor login. +bcr -> gavin + blackend -> ale brueffer -> joel @@ -110,6 +113,7 @@ jim -> trhodes jkois -> miwi jkois -> bcr +jkois -> gavin jkois -> gjb keramida -> blackend From owner-svn-src-head@FreeBSD.ORG Sat Sep 3 16:59:42 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A8C12106566B; Sat, 3 Sep 2011 16:59:42 +0000 (UTC) (envelope-from alexkozlov0@gmail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 15DC88FC18; Sat, 3 Sep 2011 16:59:41 +0000 (UTC) Received: by fxe4 with SMTP id 4so3254443fxe.13 for ; Sat, 03 Sep 2011 09:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:date:from:to:subject:message-id:mime-version:content-type :content-disposition; bh=906VLBt/2r6J5zVOLYRup2+R1gjhLVfdv0hs+xwhI7M=; b=w5iPPtw0kySVCQGkjHmQ6wG5Q3gyGkjBmcEpUwrP5ASWXwFhaq3pquEkNbcNN27QZ/ MtpfKQKehkF6midj4Zr9/LuInsGTHbKM31EucBVLky264ao7O6r6LVUVqalWIp8wmJey mqFP1/Vugs9fRZ1kV+kK7Hyz8QnxOPWEYLcn0= Received: by 10.223.28.89 with SMTP id l25mr880031fac.34.1315067591813; Sat, 03 Sep 2011 09:33:11 -0700 (PDT) Received: from ravenloft.kiev.ua (ravenloft.kiev.ua [94.244.131.95]) by mx.google.com with ESMTPS id p25sm1495855fap.26.2011.09.03.09.33.10 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 03 Sep 2011 09:33:10 -0700 (PDT) Sender: Alex Kozlov Date: Sat, 3 Sep 2011 19:32:38 +0300 From: Alex Kozlov To: Hans Petter Selasky , svn-src-head@freebsd.org, spam@rm-rf.kiev.ua Message-ID: <20110903163238.GA38118@ravenloft.kiev.ua> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Cc: Subject: Re: svn commit: r225350 - in head/sys: dev/usb dev/usb/quirk dev/usb/storage sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 16:59:42 -0000 On Fri, Sep 02, 2011 at 06:50:44PM +0000, Hans Petter Selasky wrote: > Log: > This patch adds automatic detection of USB mass storage devices > which does not support the no synchronize cache SCSI command. > > The __FreeBSD_version version macro has been bumped and > external kernel modules needs to be recompiled after > this patch. > > Approved by: re (kib) > MFC after: 1 week > PR: usb/160299 > Modified: > head/sys/dev/usb/quirk/usb_quirk.c > head/sys/dev/usb/storage/umass.c > head/sys/dev/usb/usb_device.c > head/sys/dev/usb/usb_device.h > head/sys/dev/usb/usb_dynamic.c > head/sys/dev/usb/usb_dynamic.h > head/sys/dev/usb/usb_freebsd.h > head/sys/dev/usb/usb_msctest.c > head/sys/dev/usb/usb_msctest.h > head/sys/dev/usb/usbdi.h > head/sys/sys/param.h This change broke the detection of one of my flash cards: Root mount waiting for: usbus7 ugen7.2: at usbus7 umass0: on usbus7 Root mount waiting for: usbus7 (probe0:umass-sim0:0:0:0): INQUIRY. CDB: 12 0 0 0 24 0 (probe0:umass-sim0:0:0:0): CAM status: SCSI Status Error (probe0:umass-sim0:0:0:0): SCSI status: Check Condition (probe0:umass-sim0:0:0:0): SCSI sense: ILLEGAL REQUEST asc:24.0 (Invalid field in CDB) field replaceable unit 6 Root mount waiting for: usbus7 Trying to mount root from ufs:/dev/da0a [ro]... mountroot: waiting for device /dev/da0a ... Mounting from ufs:/dev/da0a failed with error 19. -- Adios From owner-svn-src-head@FreeBSD.ORG Sat Sep 3 18:27:14 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A4641106566C for ; Sat, 3 Sep 2011 18:27:14 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe03.c2i.net [212.247.154.66]) by mx1.freebsd.org (Postfix) with ESMTP id 159078FC14 for ; Sat, 3 Sep 2011 18:27:13 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=yVKV3zusvCapyMfYJBNW2j35FMEuTKq6vh/tt/1L5+g= c=1 sm=1 a=SvYTsOw2Z4kA:10 a=yGaCp5QzH3EA:10 a=dBRESv0yCI8A:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=YCq3Qb_BBFZsq55wjxQA:9 a=pILNOxqGKmIA:10 a=Rv1Snup_ZrS8ksZP6OIA:9 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe03.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 7089204; Sat, 03 Sep 2011 20:27:11 +0200 Received-SPF: softfail receiver=mailfe03.swip.net; client-ip=188.126.198.129; envelope-from=hselasky@freebsd.org From: Hans Petter Selasky To: Alex Kozlov Date: Sat, 3 Sep 2011 20:24:32 +0200 User-Agent: KMail/1.13.5 (FreeBSD/8.2-STABLE; KDE/4.4.5; amd64; ; ) References: <20110903163238.GA38118@ravenloft.kiev.ua> In-Reply-To: <20110903163238.GA38118@ravenloft.kiev.ua> X-Face: *nPdTl_}RuAI6^PVpA02T?$%Xa^>@hE0uyUIoiha$pC:9TVgl.Oq, NwSZ4V"|LR.+tj}g5 %V,x^qOs~mnU3]Gn; cQLv&.N>TrxmSFf+p6(30a/{)KUU!s}w\IhQBj}[g}bj0I3^glmC( :AuzV9:.hESm-x4h240C`9=w MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_gDnYO7OrlsvGf8Z" Message-Id: <201109032024.32323.hselasky@freebsd.org> Cc: "svn-src-head@freebsd.org" Subject: Re: svn commit: r225350 - in head/sys: dev/usb dev/usb/quirk dev/usb/storage sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 18:27:14 -0000 --Boundary-00=_gDnYO7OrlsvGf8Z Content-Type: Text/Plain; charset="windows-1252" Content-Transfer-Encoding: 7bit On Saturday 03 September 2011 18:32:38 Alex Kozlov wrote: > On Fri, Sep 02, 2011 at 06:50:44PM +0000, Hans Petter Selasky wrote: > > Log: > > This patch adds automatic detection of USB mass storage devices > > which does not support the no synchronize cache SCSI command. > > > > The __FreeBSD_version version macro has been bumped and > > external kernel modules needs to be recompiled after > > this patch. > > > > Approved by: re (kib) > > MFC after: 1 week > > PR: usb/160299 > > > > Modified: > > head/sys/dev/usb/quirk/usb_quirk.c > > head/sys/dev/usb/storage/umass.c > > head/sys/dev/usb/usb_device.c > > head/sys/dev/usb/usb_device.h > > head/sys/dev/usb/usb_dynamic.c > > head/sys/dev/usb/usb_dynamic.h > > head/sys/dev/usb/usb_freebsd.h > > head/sys/dev/usb/usb_msctest.c > > head/sys/dev/usb/usb_msctest.h > > head/sys/dev/usb/usbdi.h > > head/sys/sys/param.h > > This change broke the detection of one of my flash cards: > > Root mount waiting for: usbus7 > ugen7.2: at usbus7 > umass0: on > usbus7 Root mount waiting for: usbus7 > (probe0:umass-sim0:0:0:0): INQUIRY. CDB: 12 0 0 0 24 0 > (probe0:umass-sim0:0:0:0): CAM status: SCSI Status Error > (probe0:umass-sim0:0:0:0): SCSI status: Check Condition > (probe0:umass-sim0:0:0:0): SCSI sense: ILLEGAL REQUEST asc:24.0 (Invalid > field in CDB) field replaceable unit 6 Root mount waiting for: usbus7 > Trying to mount root from ufs:/dev/da0a [ro]... > mountroot: waiting for device /dev/da0a ... > Mounting from ufs:/dev/da0a failed with error 19. > > > -- > Adios Hi, Can you try the attached patch? Also add: options USB_DEBUG to kernel config and set hw.usb.debug=1 during boot. --HPS --Boundary-00=_gDnYO7OrlsvGf8Z Content-Type: text/x-patch; charset="windows-1252"; name="msc_auto_quirk.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="msc_auto_quirk.patch" === sys/dev/usb/usb_msctest.c ================================================================== --- sys/dev/usb/usb_msctest.c (revision 225354) +++ sys/dev/usb/usb_msctest.c (local) @@ -605,6 +605,7 @@ uint8_t is_no_direct; uint8_t sid_type; int err; + int failed = 0; sc = bbb_attach(udev, iface_index); if (sc == NULL) @@ -645,6 +646,8 @@ if (err != ERR_CSW_FAILED) goto error; + + failed = 1; } err = bbb_command_start(sc, DIR_IN, 0, NULL, 0, @@ -659,11 +662,13 @@ DPRINTF("Device doesn't handle synchronize cache\n"); usbd_add_dynamic_quirk(udev, UQ_MSC_NO_SYNC_CACHE); + + failed = 1; } done: bbb_detach(sc); - return (0); + return (failed ? USB_ERR_STALLED : 0); error: bbb_detach(sc); --Boundary-00=_gDnYO7OrlsvGf8Z-- From owner-svn-src-head@FreeBSD.ORG Sat Sep 3 18:29:46 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9BA09106566B for ; Sat, 3 Sep 2011 18:29:46 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe08.c2i.net [212.247.154.226]) by mx1.freebsd.org (Postfix) with ESMTP id E60C18FC0A for ; Sat, 3 Sep 2011 18:29:45 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=ZrWDMTID0AMW4DNRKF44fvigJaUxxg2ESvddpUoMqyA= c=1 sm=1 a=yGaCp5QzH3EA:10 a=dBRESv0yCI8A:10 a=CL8lFSKtTFcA:10 a=i9M/sDlu2rpZ9XS819oYzg==:17 a=YCq3Qb_BBFZsq55wjxQA:9 a=pILNOxqGKmIA:10 a=Rv1Snup_ZrS8ksZP6OIA:9 a=wPNLvfGTeEIA:10 a=i9M/sDlu2rpZ9XS819oYzg==:117 Received: from [188.126.198.129] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe08.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 175011083; Sat, 03 Sep 2011 20:29:44 +0200 Received-SPF: softfail receiver=mailfe08.swip.net; client-ip=188.126.198.129; envelope-from=hselasky@freebsd.org To: Alex Kozlov From: Hans Petter Selasky X-Face: *nPdTl_}RuAI6^PVpA02T?$%Xa^>@hE0uyUIoiha$pC:9TVgl.Oq,NwSZ4V" =?iso-8859-15?q?=7CLR=2E+tj=7Dg5=0A=09=25V?=,x^qOs~mnU3]Gn; cQLv&.N>TrxmSFf+p6(30a/{)KUU!s}w\IhQBj}[g}bj0I3^glmC( =?iso-8859-15?q?=0A=09=3AAuzV9=3A=2EhESm-x4h240C=609=3Dw?= Date: Sat, 3 Sep 2011 20:27:05 +0200 MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_5FnYO+OMWGGMxmt" Message-Id: <201109032027.05511.hselasky@freebsd.org> Cc: "svn-src-head@freebsd.org" Subject: Re: svn commit: r225350 - in head/sys: dev/usb dev/usb/quirk dev/usb/storage sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2011 18:29:46 -0000 --Boundary-00=_5FnYO+OMWGGMxmt Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit On Saturday 03 September 2011 18:32:38 Alex Kozlov wrote: > On Fri, Sep 02, 2011 at 06:50:44PM +0000, Hans Petter Selasky wrote: > > Log: > > This patch adds automatic detection of USB mass storage devices > > which does not support the no synchronize cache SCSI command. > > > > The __FreeBSD_version version macro has been bumped and > > external kernel modules needs to be recompiled after > > this patch. > > > > Approved by: re (kib) > > MFC after: 1 week > > PR: usb/160299 > > > > Modified: > > head/sys/dev/usb/quirk/usb_quirk.c > > head/sys/dev/usb/storage/umass.c > > head/sys/dev/usb/usb_device.c > > head/sys/dev/usb/usb_device.h > > head/sys/dev/usb/usb_dynamic.c > > head/sys/dev/usb/usb_dynamic.h > > head/sys/dev/usb/usb_freebsd.h > > head/sys/dev/usb/usb_msctest.c > > head/sys/dev/usb/usb_msctest.h > > head/sys/dev/usb/usbdi.h > > head/sys/sys/param.h > > This change broke the detection of one of my flash cards: > > Root mount waiting for: usbus7 > ugen7.2: at usbus7 > umass0: on > usbus7 Root mount waiting for: usbus7 > (probe0:umass-sim0:0:0:0): INQUIRY. CDB: 12 0 0 0 24 0 > (probe0:umass-sim0:0:0:0): CAM status: SCSI Status Error > (probe0:umass-sim0:0:0:0): SCSI status: Check Condition > (probe0:umass-sim0:0:0:0): SCSI sense: ILLEGAL REQUEST asc:24.0 (Invalid > field in CDB) field replaceable unit 6 Root mount waiting for: usbus7 > Trying to mount root from ufs:/dev/da0a [ro]... > mountroot: waiting for device /dev/da0a ... > Mounting from ufs:/dev/da0a failed with error 19. > > > -- > Adios Hi, Forgot one line in my patch. --HPS --Boundary-00=_5FnYO+OMWGGMxmt Content-Type: text/x-patch; charset="ISO-8859-1"; name="msc_auto_quirk.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="msc_auto_quirk.patch" === sys/dev/usb/usb_msctest.c ================================================================== --- sys/dev/usb/usb_msctest.c (revision 225354) +++ sys/dev/usb/usb_msctest.c (local) @@ -605,6 +605,7 @@ uint8_t is_no_direct; uint8_t sid_type; int err; + int failed = 0; sc = bbb_attach(udev, iface_index); if (sc == NULL) @@ -645,6 +646,8 @@ if (err != ERR_CSW_FAILED) goto error; + + failed = 1; } err = bbb_command_start(sc, DIR_IN, 0, NULL, 0, @@ -659,12 +662,18 @@ DPRINTF("Device doesn't handle synchronize cache\n"); usbd_add_dynamic_quirk(udev, UQ_MSC_NO_SYNC_CACHE); + + failed = 1; } done: bbb_detach(sc); - return (0); + if (failed) + usbd_req_re_enumerate(udev, NULL); + + return (failed ? USB_ERR_STALLED : 0); + error: bbb_detach(sc); --Boundary-00=_5FnYO+OMWGGMxmt--