svn commit: r216651 - head/usr.sbin/sysinstall
Author: brucec
Date: Wed Dec 22 13:06:51 2010
New Revision: 216651
URL: http://svn.freebsd.org/changeset/base/216651
Log:
Add an option to disable the screensaver.
Modified:
head/usr.sbin/sysinstall/menus.c
Modified: head/usr.sbin/sysinstall/menus.c
==
--- head/usr.sbin/sysinstall/menus.cWed Dec 22 11:58:31 2010
(r216650)
+++ head/usr.sbin/sysinstall/menus.cWed Dec 22 13:06:51 2010
(r216651)
@@ -1958,7 +1958,7 @@ DMenu MenuSysconsKeyrate = {
{ Normal, \Normal\ keyboard repeat rate, dmenuVarCheck,
dmenuSetVariable, NULL, keyrate=normal },
{ Fast,Fast keyboard repeat rate,dmenuVarCheck,
dmenuSetVariable, NULL, keyrate=fast },
{ Default, Use default keyboard repeat rate, dmenuVarCheck,
dmenuSetVariable, NULL, keyrate=NO },
- { NULL } },
+ { NULL } }
};
DMenu MenuSysconsSaver = {
@@ -1994,9 +1994,11 @@ DMenu MenuSysconsSaver = {
dmenuVarCheck, configSaver, NULL, saver=star },
{ c Warp, A \stars warping\ effect,
dmenuVarCheck, configSaver, NULL, saver=warp },
+ { d None, Disable the screensaver,
+dmenuVarCheck, configSaver, NULL, saver=NO },
{ Timeout, Set the screen saver timeout interval,
NULL, configSaverTimeout, NULL, NULL, ' ', ' ', ' ' },
- { NULL } },
+ { NULL } }
};
#ifndef PC98
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216652 - stable/8/gnu/usr.bin/groff/tmac
Author: kensmith Date: Wed Dec 22 14:25:56 2010 New Revision: 216652 URL: http://svn.freebsd.org/changeset/base/216652 Log: Adjust the version of FreeBSD printed on the manual pages. Approved by: re (implicit) Modified: stable/8/gnu/usr.bin/groff/tmac/mdoc.local Modified: stable/8/gnu/usr.bin/groff/tmac/mdoc.local == --- stable/8/gnu/usr.bin/groff/tmac/mdoc.local Wed Dec 22 13:06:51 2010 (r216651) +++ stable/8/gnu/usr.bin/groff/tmac/mdoc.local Wed Dec 22 14:25:56 2010 (r216652) @@ -67,7 +67,7 @@ .ds doc-volume-as-arm arm . .\ Default .Os value -.ds doc-default-operating-system FreeBSD\~8.1 +.ds doc-default-operating-system FreeBSD\~8.2 . .\ FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-7.27.2 @@ -76,6 +76,7 @@ .ds doc-operating-system-FreeBSD-8.08.0 .ds doc-operating-system-FreeBSD-8.18.1 .ds doc-operating-system-FreeBSD-8.28.2 +.ds doc-operating-system-FreeBSD-8.38.3 .ds doc-operating-system-FreeBSD-9.09.0 . .\ Definitions not (yet) in doc-syms ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216653 - stable/8/release
Author: kensmith
Date: Wed Dec 22 14:27:13 2010
New Revision: 216653
URL: http://svn.freebsd.org/changeset/base/216653
Log:
Misc. 8.1 - 8.2 shifts as part of progress with FreeBSD 8.2 release.
Approved by: re (implicit)
Modified:
stable/8/release/Makefile
Modified: stable/8/release/Makefile
==
--- stable/8/release/Makefile Wed Dec 22 14:25:56 2010(r216652)
+++ stable/8/release/Makefile Wed Dec 22 14:27:13 2010(r216653)
@@ -24,11 +24,11 @@
# Set these, release builder!
#
# Fixed version:
-#BUILDNAME=8.1-STABLE
+#BUILDNAME=8.2-STABLE
#
# Automatic SNAP versioning:
DATE != date +%Y%m%d
-BASE = 8.1
+BASE = 8.2
BUILDNAME?=${BASE}-${DATE}-SNAP
#
#CHROOTDIR=/junk/release
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216654 - stable/8/sys/sys
Author: kensmith Date: Wed Dec 22 14:29:42 2010 New Revision: 216654 URL: http://svn.freebsd.org/changeset/base/216654 Log: Adjust __FreeBSD_version to reflect we're past the point of branching releng/8.2 in preparation for the FreeBSD 8.2 release. Approved by: re (implicit) Modified: stable/8/sys/sys/param.h Modified: stable/8/sys/sys/param.h == --- stable/8/sys/sys/param.hWed Dec 22 14:27:13 2010(r216653) +++ stable/8/sys/sys/param.hWed Dec 22 14:29:42 2010(r216654) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 801501 /* Master, propagated to newvers */ +#define __FreeBSD_version 802500 /* Master, propagated to newvers */ #ifdef _KERNEL #defineP_OSREL_SIGSEGV 74 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216655 - stable/8/usr.sbin/pkg_install/add
Author: kensmith
Date: Wed Dec 22 14:31:42 2010
New Revision: 216655
URL: http://svn.freebsd.org/changeset/base/216655
Log:
Add the packages directories that will be used for the upcoming
8.2/7.4 releases.
Approved by: re (implicit)
Modified:
stable/8/usr.sbin/pkg_install/add/main.c
Modified: stable/8/usr.sbin/pkg_install/add/main.c
==
--- stable/8/usr.sbin/pkg_install/add/main.cWed Dec 22 14:29:42 2010
(r216654)
+++ stable/8/usr.sbin/pkg_install/add/main.cWed Dec 22 14:31:42 2010
(r216655)
@@ -83,8 +83,10 @@ struct {
{ 701000, 701099, /packages-7.1-release },
{ 702000, 702099, /packages-7.2-release },
{ 703000, 703099, /packages-7.3-release },
+ { 704000, 704099, /packages-7.4-release },
{ 80, 800499, /packages-8.0-release },
{ 801000, 801499, /packages-8.1-release },
+ { 802000, 802499, /packages-8.2-release },
{ 30, 399000, /packages-3-stable },
{ 40, 499000, /packages-4-stable },
{ 502100, 502128, /packages-5-current },
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216656 - stable/7/gnu/usr.bin/groff/tmac
Author: kensmith Date: Wed Dec 22 14:43:20 2010 New Revision: 216656 URL: http://svn.freebsd.org/changeset/base/216656 Log: Adjust the version of FreeBSD printed on the manual pages. Approved by: re (implicit) Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local Modified: stable/7/gnu/usr.bin/groff/tmac/mdoc.local == --- stable/7/gnu/usr.bin/groff/tmac/mdoc.local Wed Dec 22 14:31:42 2010 (r216655) +++ stable/7/gnu/usr.bin/groff/tmac/mdoc.local Wed Dec 22 14:43:20 2010 (r216656) @@ -64,7 +64,7 @@ .ds doc-volume-as-arm arm . .\ Default .Os value -.ds doc-default-operating-system FreeBSD\~7.3 +.ds doc-default-operating-system FreeBSD\~7.4 . .\ FreeBSD releases not found in doc-common .ds doc-operating-system-FreeBSD-6.36.3 @@ -75,6 +75,7 @@ .ds doc-operating-system-FreeBSD-7.47.4 .ds doc-operating-system-FreeBSD-8.08.0 .ds doc-operating-system-FreeBSD-8.18.1 +.ds doc-operating-system-FreeBSD-8.28.2 .ds doc-operating-system-FreeBSD-9.09.0 . .ec ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216657 - stable/7/release
Author: kensmith
Date: Wed Dec 22 14:44:22 2010
New Revision: 216657
URL: http://svn.freebsd.org/changeset/base/216657
Log:
Misc. 7.3 - 7.4 adjustments as part of progress on the FreeBSD 7.4 release.
Approved by: re (implicit)
Modified:
stable/7/release/Makefile
Modified: stable/7/release/Makefile
==
--- stable/7/release/Makefile Wed Dec 22 14:43:20 2010(r216656)
+++ stable/7/release/Makefile Wed Dec 22 14:44:22 2010(r216657)
@@ -24,11 +24,11 @@
# Set these, release builder!
#
# Fixed version:
-#BUILDNAME=7.3-STABLE
+#BUILDNAME=7.4-STABLE
#
# Automatic SNAP versioning:
DATE != date +%Y%m%d
-BASE = 7.3
+BASE = 7.4
BUILDNAME?=${BASE}-${DATE}-SNAP
#
#CHROOTDIR=/junk/release
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216658 - stable/7/sys/sys
Author: kensmith Date: Wed Dec 22 14:45:43 2010 New Revision: 216658 URL: http://svn.freebsd.org/changeset/base/216658 Log: Adjust __FreeBSD_version to reflect that the branch for the FreeBSD 7.4 release has happened. Approved by: re (implicit) Modified: stable/7/sys/sys/param.h Modified: stable/7/sys/sys/param.h == --- stable/7/sys/sys/param.hWed Dec 22 14:44:22 2010(r216657) +++ stable/7/sys/sys/param.hWed Dec 22 14:45:43 2010(r216658) @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 703100 /* Master, propagated to newvers */ +#define __FreeBSD_version 704100 /* Master, propagated to newvers */ #ifndef LOCORE #include sys/types.h ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216659 - stable/8/release/powerpc
Author: nwhitehorn
Date: Wed Dec 22 14:46:38 2010
New Revision: 216659
URL: http://svn.freebsd.org/changeset/base/216659
Log:
MFC r216469:
Fix the overflowing livefs ISO by removing man pages from the HFS part of
the hybrid disk. This is a stopgap until a better solution can be found,
but lets the powerpc release build complete for the time being.
Approved by: re (kensmith)
Modified:
stable/8/release/powerpc/mkisoimages.sh
Directory Properties:
stable/8/release/powerpc/ (props changed)
Modified: stable/8/release/powerpc/mkisoimages.sh
==
--- stable/8/release/powerpc/mkisoimages.sh Wed Dec 22 14:45:43 2010
(r216658)
+++ stable/8/release/powerpc/mkisoimages.sh Wed Dec 22 14:46:38 2010
(r216659)
@@ -25,7 +25,7 @@
if [ x$1 = x-b ]; then
cp /usr/src/release/powerpc/boot.tbxi ${4}/boot
- bootable=-hfs-bless ${4}/boot -map /usr/src/release/powerpc/hfs.map
+ bootable=-hfs -hfs-bless ${4}/boot -map
/usr/src/release/powerpc/hfs.map -hide-hfs ${4}/usr/share/man
shift
else
bootable=
@@ -54,4 +54,4 @@ fi
LABEL=$1; shift
NAME=$1; shift
-mkisofs $bootable -r -hfs -part -no-desktop -hfs-volid $LABEL -l -J
-allow-leading-dots -o $NAME $*
+mkisofs $bootable -l -r -part -no-desktop -V $LABEL -o $NAME $*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216660 - stable/7/usr.sbin/pkg_install/add
Author: kensmith
Date: Wed Dec 22 14:47:45 2010
New Revision: 216660
URL: http://svn.freebsd.org/changeset/base/216660
Log:
Add the package directories for the 7.4, 8.1, and 8.2 releases.
Approved by: re (implicit)
Modified:
stable/7/usr.sbin/pkg_install/add/main.c
Modified: stable/7/usr.sbin/pkg_install/add/main.c
==
--- stable/7/usr.sbin/pkg_install/add/main.cWed Dec 22 14:46:38 2010
(r216659)
+++ stable/7/usr.sbin/pkg_install/add/main.cWed Dec 22 14:47:45 2010
(r216660)
@@ -83,7 +83,10 @@ struct {
{ 701000, 701099, /packages-7.1-release },
{ 702000, 702099, /packages-7.2-release },
{ 703000, 703099, /packages-7.3-release },
+ { 704000, 704099, /packages-7.4-release },
{ 80, 800499, /packages-8.0-release },
+ { 801000, 801499, /packages-8.1-release },
+ { 802000, 802499, /packages-8.2-release },
{ 30, 399000, /packages-3-stable },
{ 40, 499000, /packages-4-stable },
{ 502100, 502128, /packages-5-current },
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216661 - releng/8.2/release/powerpc
Author: nwhitehorn
Date: Wed Dec 22 14:49:18 2010
New Revision: 216661
URL: http://svn.freebsd.org/changeset/base/216661
Log:
MFC r216469:
Fix the overflowing livefs ISO by removing man pages from the HFS part of
the hybrid disk. This is a stopgap until a better solution can be found,
but lets the powerpc release build complete for the time being.
Approved by: re (kensmith)
Modified:
releng/8.2/release/powerpc/mkisoimages.sh
Directory Properties:
releng/8.2/release/powerpc/ (props changed)
Modified: releng/8.2/release/powerpc/mkisoimages.sh
==
--- releng/8.2/release/powerpc/mkisoimages.sh Wed Dec 22 14:47:45 2010
(r216660)
+++ releng/8.2/release/powerpc/mkisoimages.sh Wed Dec 22 14:49:18 2010
(r216661)
@@ -25,7 +25,7 @@
if [ x$1 = x-b ]; then
cp /usr/src/release/powerpc/boot.tbxi ${4}/boot
- bootable=-hfs-bless ${4}/boot -map /usr/src/release/powerpc/hfs.map
+ bootable=-hfs -hfs-bless ${4}/boot -map
/usr/src/release/powerpc/hfs.map -hide-hfs ${4}/usr/share/man
shift
else
bootable=
@@ -54,4 +54,4 @@ fi
LABEL=$1; shift
NAME=$1; shift
-mkisofs $bootable -r -hfs -part -no-desktop -hfs-volid $LABEL -l -J
-allow-leading-dots -o $NAME $*
+mkisofs $bootable -l -r -part -no-desktop -V $LABEL -o $NAME $*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216634 - in head/sys/amd64: amd64 ia32 include linux32
On Tuesday, December 21, 2010 7:18:42 pm Jung-uk Kim wrote: Author: jkim Date: Wed Dec 22 00:18:42 2010 New Revision: 216634 URL: http://svn.freebsd.org/changeset/base/216634 Log: Improve PCB flags handling and make it more robust. Add two new functions for manipulating pcb_flags. These inline functions are very similar to atomic_set_char(9) and atomic_clear_char(9) but without unnecessary LOCK prefix for SMP. Add comments about the rationale[1]. Use these functions wherever possible. Although there are some places where it is not strictly necessary (e.g., a PCB is copied to create a new PCB), it is done across the board for sake of consistency. Turn pcb_full_iret into a PCB flag as it is safe now. Move rarely used fields before pcb_flags and reduce size of pcb_flags to one byte. Fix some style(9) nits in pcb.h while I am in the neighborhood. Reviewed by:kib Submitted by: kib[1] MFC after: 2 months Is there really a need to have the flags field be a char instead of an int or long? It seems to me that flags fields in general should be an int unless there is a strong need otherwise (e.g. hardware-defined flag). 'orl' will work just as well as 'orb'. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216662 - head/share/mk
Author: nwhitehorn
Date: Wed Dec 22 14:59:22 2010
New Revision: 216662
URL: http://svn.freebsd.org/changeset/base/216662
Log:
Enable build of FDT components by default. dtc is a required build tool
for all FDT-enabled kernels, and having it off by default means that
building these kernels fails by default. This fixes FDT-related build
failures in make universe on ARM and PowerPC.
Reviewed by: imp
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkWed Dec 22 14:49:18 2010(r216661)
+++ head/share/mk/bsd.own.mkWed Dec 22 14:59:22 2010(r216662)
@@ -326,6 +326,7 @@ _clang_no=CLANG
DICT \
DYNAMICROOT \
EXAMPLES \
+FDT \
FLOPPY \
FORTH \
FP_LIBC \
@@ -421,7 +422,6 @@ MK_${var}:= yes
BIND_XML \
BSD_GREP \
${_clang_no} \
-FDT \
GPIO \
HESIOD \
IDEA
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216663 - releng/8.2/sys/conf
Author: kensmith
Date: Wed Dec 22 15:06:45 2010
New Revision: 216663
URL: http://svn.freebsd.org/changeset/base/216663
Log:
Ready for RC1 builds.
Approved by: re (implicit)
Modified:
releng/8.2/sys/conf/newvers.sh
Modified: releng/8.2/sys/conf/newvers.sh
==
--- releng/8.2/sys/conf/newvers.sh Wed Dec 22 14:59:22 2010
(r216662)
+++ releng/8.2/sys/conf/newvers.sh Wed Dec 22 15:06:45 2010
(r216663)
@@ -32,7 +32,7 @@
TYPE=FreeBSD
REVISION=8.2
-BRANCH=PRERELEASE
+BRANCH=RC1
if [ X${BRANCH_OVERRIDE} != X ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216664 - releng/7.4/sys/conf
Author: kensmith
Date: Wed Dec 22 15:07:40 2010
New Revision: 216664
URL: http://svn.freebsd.org/changeset/base/216664
Log:
Ready for RC1 builds.
Approved by: re (implicit)
Modified:
releng/7.4/sys/conf/newvers.sh
Modified: releng/7.4/sys/conf/newvers.sh
==
--- releng/7.4/sys/conf/newvers.sh Wed Dec 22 15:06:45 2010
(r216663)
+++ releng/7.4/sys/conf/newvers.sh Wed Dec 22 15:07:40 2010
(r216664)
@@ -32,7 +32,7 @@
TYPE=FreeBSD
REVISION=7.4
-BRANCH=PRERELEASE
+BRANCH=RC1
if [ X${BRANCH_OVERRIDE} != X ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216662 - head/share/mk
On 2010-12-22, at 15:59, Nathan Whitehorn wrote: Author: nwhitehorn Date: Wed Dec 22 14:59:22 2010 New Revision: 216662 URL: http://svn.freebsd.org/changeset/base/216662 Log: Enable build of FDT components by default. dtc is a required build tool for all FDT-enabled kernels, and having it off by default means that building these kernels fails by default. This fixes FDT-related build failures in make universe on ARM and PowerPC. Reviewed by: imp Thanks a lot for taking care of this! Rafal ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216665 - head/usr.sbin/pkg_install/add
Author: kensmith
Date: Wed Dec 22 15:44:25 2010
New Revision: 216665
URL: http://svn.freebsd.org/changeset/base/216665
Log:
Add package directories used for the upcoming 8.2 and 7.4 releases,
and catch up on a few from previous releases.
Modified:
head/usr.sbin/pkg_install/add/main.c
Modified: head/usr.sbin/pkg_install/add/main.c
==
--- head/usr.sbin/pkg_install/add/main.cWed Dec 22 15:07:40 2010
(r216664)
+++ head/usr.sbin/pkg_install/add/main.cWed Dec 22 15:44:25 2010
(r216665)
@@ -82,7 +82,11 @@ struct {
{ 70, 700099, /packages-7.0-release },
{ 701000, 701099, /packages-7.1-release },
{ 702000, 702099, /packages-7.2-release },
+ { 703000, 703099, /packages-7.3-release },
+ { 704000, 704099, /packages-7.4-release },
{ 80, 800499, /packages-8.0-release },
+ { 801000, 801499, /packages-8.1-release },
+ { 802000, 802499, /packages-8.2-release },
{ 30, 399000, /packages-3-stable },
{ 40, 499000, /packages-4-stable },
{ 502100, 502128, /packages-5-current },
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216662 - head/share/mk
On Wed, 22 Dec 2010, Nathan Whitehorn wrote:
Author: nwhitehorn
Date: Wed Dec 22 14:59:22 2010
New Revision: 216662
URL: http://svn.freebsd.org/changeset/base/216662
Log:
Enable build of FDT components by default. dtc is a required build tool
for all FDT-enabled kernels, and having it off by default means that
building these kernels fails by default. This fixes FDT-related build
failures in make universe on ARM and PowerPC.
Thanks a lot! I wonder if it is arch specific conditional? Is there
any value in having it on non-FDT kernels/architectures?
I am happily looking forward to a usable universe output again:-))
Reviewed by: imp
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkWed Dec 22 14:49:18 2010(r216661)
+++ head/share/mk/bsd.own.mkWed Dec 22 14:59:22 2010(r216662)
@@ -326,6 +326,7 @@ _clang_no=CLANG
DICT \
DYNAMICROOT \
EXAMPLES \
+FDT \
FLOPPY \
FORTH \
FP_LIBC \
@@ -421,7 +422,6 @@ MK_${var}:= yes
BIND_XML \
BSD_GREP \
${_clang_no} \
-FDT \
GPIO \
HESIOD \
IDEA
--
Bjoern A. Zeeb Welcome a new stage of life.
ks Going to jail sucks -- bz All my daemons like it!
http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/jails.html
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216662 - head/share/mk
On 12/22/10 10:18, Bjoern A. Zeeb wrote: On Wed, 22 Dec 2010, Nathan Whitehorn wrote: Author: nwhitehorn Date: Wed Dec 22 14:59:22 2010 New Revision: 216662 URL: http://svn.freebsd.org/changeset/base/216662 Log: Enable build of FDT components by default. dtc is a required build tool for all FDT-enabled kernels, and having it off by default means that building these kernels fails by default. This fixes FDT-related build failures in make universe on ARM and PowerPC. Thanks a lot! I wonder if it is arch specific conditional? Is there any value in having it on non-FDT kernels/architectures? There's no good way to make it arch-specific, according to Warner. If we grow such support, it could be made that way, but I don't think the 300 K is enough to worry about. Also (hopefully), the list of architectures requiring it will continue to grow in the future. I am happily looking forward to a usable universe output again:-)) Aside from some MIPS kernels requiring 64-bit toolchains not yet connected to the build, all make universe failures are now 100% genuine problems. Have fun, all :) -Nathan ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216667 - head/share/man/man5
Author: trasz Date: Wed Dec 22 17:02:01 2010 New Revision: 216667 URL: http://svn.freebsd.org/changeset/base/216667 Log: The 'kern.corefile=whatever' syntax won't work with sysctl.conf; remove the quotes to not mislead people. MFC after:1 month Modified: head/share/man/man5/core.5 Modified: head/share/man/man5/core.5 == --- head/share/man/man5/core.5 Wed Dec 22 16:33:40 2010(r21) +++ head/share/man/man5/core.5 Wed Dec 22 17:02:01 2010(r216667) @@ -32,7 +32,7 @@ .\ @(#)core.5 8.3 (Berkeley) 12/11/93 .\ $FreeBSD$ .\ -.Dd January 9, 2002 +.Dd December 2002, 2010 .Dt CORE 5 .Os .Sh NAME @@ -130,7 +130,7 @@ the following .Xr sysctl 8 command can be used: .Pp -.Dl sysctl kern.corefile=/var/coredumps/\%U/\%N.core +.Dl sysctl kern.corefile=/var/coredumps/\%U/\%N.core .Sh SEE ALSO .Xr gdb 1 , .Xr kgdb 1 , ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216634 - in head/sys/amd64: amd64 ia32 include linux32
On Wednesday 22 December 2010 08:03 am, John Baldwin wrote: On Tuesday, December 21, 2010 7:18:42 pm Jung-uk Kim wrote: Author: jkim Date: Wed Dec 22 00:18:42 2010 New Revision: 216634 URL: http://svn.freebsd.org/changeset/base/216634 Log: Improve PCB flags handling and make it more robust. Add two new functions for manipulating pcb_flags. These inline functions are very similar to atomic_set_char(9) and atomic_clear_char(9) but without unnecessary LOCK prefix for SMP. Add comments about the rationale[1]. Use these functions wherever possible. Although there are some places where it is not strictly necessary (e.g., a PCB is copied to create a new PCB), it is done across the board for sake of consistency. Turn pcb_full_iret into a PCB flag as it is safe now. Move rarely used fields before pcb_flags and reduce size of pcb_flags to one byte. Fix some style(9) nits in pcb.h while I am in the neighborhood. Reviewed by: kib Submitted by: kib[1] MFC after:2 months Is there really a need to have the flags field be a char instead of an int or long? It seems to me that flags fields in general should be an int unless there is a strong need otherwise (e.g. hardware-defined flag). 'orl' will work just as well as 'orb'. Actually, there was little disagreement between kib and me and committed version was fifth reincarnation of original patch. I originally used 'u_int pcb_flags' but used byte byte opcodes for assembly to make it consistent with compiler generated code. kib disliked the inconsistencies and told me to reconsider. After several versions, I proposed we use char and move forward for now, then we increase the size if it ever grows more than 8 bits. So, we settled. I have no problem with int version if there is no measurable performance change. I'll test it soon. Jung-uk Kim ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216668 - head/share/man/man5
Author: trasz Date: Wed Dec 22 17:12:58 2010 New Revision: 216668 URL: http://svn.freebsd.org/changeset/base/216668 Log: Fix date, broken in r216667. Submitted by: stefanf@ Modified: head/share/man/man5/core.5 Modified: head/share/man/man5/core.5 == --- head/share/man/man5/core.5 Wed Dec 22 17:02:01 2010(r216667) +++ head/share/man/man5/core.5 Wed Dec 22 17:12:58 2010(r216668) @@ -32,7 +32,7 @@ .\ @(#)core.5 8.3 (Berkeley) 12/11/93 .\ $FreeBSD$ .\ -.Dd December 2002, 2010 +.Dd December 22, 2010 .Dt CORE 5 .Os .Sh NAME ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216669 - in head/sys: netinet netinet6
Author: tuexen
Date: Wed Dec 22 17:59:38 2010
New Revision: 216669
URL: http://svn.freebsd.org/changeset/base/216669
Log:
Improve plausibility check in sctp_handle_sack().
Allow cmt_on_off to support values 0 (no CMT), 1 (CMT), and 2 (CMT/RP).
MFC after: 3 months.
Modified:
head/sys/netinet/sctp_cc_functions.c
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_output.c
head/sys/netinet/sctp_sysctl.h
head/sys/netinet/sctp_timer.c
head/sys/netinet/sctp_usrreq.c
head/sys/netinet6/sctp6_usrreq.c
Modified: head/sys/netinet/sctp_cc_functions.c
==
--- head/sys/netinet/sctp_cc_functions.cWed Dec 22 17:12:58 2010
(r216668)
+++ head/sys/netinet/sctp_cc_functions.cWed Dec 22 17:59:38 2010
(r216669)
@@ -80,12 +80,12 @@ sctp_cwnd_update_after_fr(struct sctp_tc
struct sctp_nets *net;
/*-
-* CMT fast recovery code. Need to debug. ((sctp_cmt_on_off == 1)
+* CMT fast recovery code. Need to debug. ((sctp_cmt_on_off 0)
* (net-fast_retran_loss_recovery == 0)))
*/
TAILQ_FOREACH(net, asoc-nets, sctp_next) {
if ((asoc-fast_retran_loss_recovery == 0) ||
- (asoc-sctp_cmt_on_off == 1)) {
+ (asoc-sctp_cmt_on_off 0)) {
/* out of a RFC2582 Fast recovery window? */
if (net-net_ack 0) {
/*
@@ -250,7 +250,7 @@ sctp_cwnd_update_after_sack(struct sctp_
*
* Should we stop any running T3 timer here?
*/
- if ((asoc-sctp_cmt_on_off == 1)
+ if ((asoc-sctp_cmt_on_off 0)
(asoc-sctp_cmt_pf 0)
((net-dest_state SCTP_ADDR_PF) == SCTP_ADDR_PF))
{
net-dest_state = ~SCTP_ADDR_PF;
@@ -274,10 +274,9 @@ sctp_cwnd_update_after_sack(struct sctp_
* CMT fast recovery code
*/
/*
-* if (sctp_cmt_on_off == 1
-* net-fast_retran_loss_recovery
-* net-will_exit_fast_recovery == 0) { @@@ Do something }
-* else if (sctp_cmt_on_off == 0
+* if (sctp_cmt_on_off 0 net-fast_retran_loss_recovery
+* net-will_exit_fast_recovery == 0) { @@@ Do something
+* } else if (sctp_cmt_on_off == 0
* asoc-fast_retran_loss_recovery will_exit == 0) {
*/
#endif
@@ -296,7 +295,7 @@ sctp_cwnd_update_after_sack(struct sctp_
* moved.
*/
if (accum_moved ||
- ((asoc-sctp_cmt_on_off == 1) net-new_pseudo_cumack)) {
+ ((asoc-sctp_cmt_on_off 0) net-new_pseudo_cumack)) {
/* If the cumulative ack moved we can proceed */
if (net-cwnd = net-ssthresh) {
/* We are in slow start */
@@ -759,12 +758,12 @@ sctp_hs_cwnd_update_after_fr(struct sctp
struct sctp_nets *net;
/*
-* CMT fast recovery code. Need to debug. ((sctp_cmt_on_off == 1)
+* CMT fast recovery code. Need to debug. ((sctp_cmt_on_off 0)
* (net-fast_retran_loss_recovery == 0)))
*/
TAILQ_FOREACH(net, asoc-nets, sctp_next) {
if ((asoc-fast_retran_loss_recovery == 0) ||
- (asoc-sctp_cmt_on_off == 1)) {
+ (asoc-sctp_cmt_on_off 0)) {
/* out of a RFC2582 Fast recovery window? */
if (net-net_ack 0) {
/*
@@ -917,7 +916,7 @@ sctp_hs_cwnd_update_after_sack(struct sc
*
* Should we stop any running T3 timer here?
*/
- if ((asoc-sctp_cmt_on_off == 1)
+ if ((asoc-sctp_cmt_on_off 0)
(asoc-sctp_cmt_pf 0)
((net-dest_state SCTP_ADDR_PF) == SCTP_ADDR_PF))
{
net-dest_state = ~SCTP_ADDR_PF;
@@ -937,10 +936,9 @@ sctp_hs_cwnd_update_after_sack(struct sc
* CMT fast recovery code
*/
/*
-* if (sctp_cmt_on_off == 1
-* net-fast_retran_loss_recovery
-* net-will_exit_fast_recovery == 0) { @@@ Do something }
-* else if (sctp_cmt_on_off == 0
+* if (sctp_cmt_on_off 0 net-fast_retran_loss_recovery
+* net-will_exit_fast_recovery == 0) { @@@ Do something
+* } else if (sctp_cmt_on_off == 0
* asoc-fast_retran_loss_recovery will_exit == 0) {
*/
Re: svn commit: r216634 - in head/sys/amd64: amd64 ia32 include linux32
On Wed, 22 Dec 2010, Jung-uk Kim wrote:
On Wednesday 22 December 2010 08:03 am, John Baldwin wrote:
On Tuesday, December 21, 2010 7:18:42 pm Jung-uk Kim wrote:
Log:
Improve PCB flags handling and make it more robust. Add two
new functions for manipulating pcb_flags. These inline functions
are very similar to atomic_set_char(9) and atomic_clear_char(9)
but without unnecessary LOCK prefix for SMP. Add comments about
the rationale[1]. Use these functions wherever possible.
Although there are some places where it is not strictly necessary
(e.g., a PCB is copied to create a new PCB), it is done across
the board for sake of consistency. Turn pcb_full_iret into a PCB
flag as it is safe now. Move rarely used fields before pcb_flags
and reduce size of pcb_flags to one byte. Fix some style(9) nits
in pcb.h while I am in the neighborhood.
Reviewed by: kib
Submitted by: kib[1]
MFC after:2 months
Is there really a need to have the flags field be a char instead of
an int or long? It seems to me that flags fields in general should
be an int unless there is a strong need otherwise (e.g.
hardware-defined flag). 'orl' will work just as well as 'orb'.
Actually, there was little disagreement between kib and me and
committed version was fifth reincarnation of original patch. I
I would have a big disagreement :-). I don't like using macros or
functions to obfuscate setting and clearing of boolean flags. Here
the function may be needed for locking, but... I already asked kib
not to use a function for (partially) managing 2 FPU flags (there
should be only one of these and then the management becomes simple
boolean again).
Putting pcb_full_iret in with the other flags gives a tiny pessimization
-- it now takes a load-modify-store to set it, where it only took a store.
I think this and any other flags that need special management should be
in a separate struct member (possibly in a separate cache line) like
pcb_full_iret was. This corresponds to td_flags being separate from
td_pflags. Accesses to these td flags are not obfuscated.
Many of the accesses still aren't atomic unless there is higher-level
locking, since they are of the form { set one flag; clear another; }.
It's unclear if there is any higher-level locking for the FPU flags,
whose management has become quite complicated:
- fpudna(), fpudrop(): everything is locked by a critical section. This
was needed only for the fpucurthread switch. It is unclear if it is
now also needed for the flags management. Here the flags must be managed
inside the critical section due to the ordering.
- fpugetregs(): does all flags managament outside of its critical sections
- fpuuserinited(): in critical section iff caller provided one (same for
fpudrop(), but it asserts that the caller provided one)
- fpusetregs(): carefully exits from its critical section before managing
flags. Now the ordering permits this.
- fpu_kern_enter(): no critical sections in sight (but when it abuses
fpuexit() to enter, fpuexit() will use one.
- fpuexit(): doesn't manage flags. Probably not needed, especially since
it is never used to exit (thread exit abuses fpudrop() instead), and
when it is used to enter as above, its caller manages the flags.
- fpu_kern_leave(): carefully exits from its critical section before managing
flags. This is the main fpu place that has to set one flag and clear
another.
- fpu_kern_thread(): no critical section in sight for flags management.
- is_fpu_kern_thread(): only reads flags. Since there is no locking in
sight, the flags are presumably non-volatile. The one in td_pflags
certainly is, as is made clear by documented locking for td_pflags.
The one in pcb_flags is presumably the same, so it very naturally
belongs in a pcb analog of td_pflags.
originally used 'u_int pcb_flags' but used byte byte opcodes for
assembly to make it consistent with compiler generated code. kib
Unfortuneatly its easier for the compiler to maintain the optimization
of doing byte accesses if that is good.
disliked the inconsistencies and told me to reconsider. After
several versions, I proposed we use char and move forward for now,
then we increase the size if it ever grows more than 8 bits. So, we
settled. I have no problem with int version if there is no
measurable performance change. I'll test it soon.
I've never seen any performance loss from using 32-bit accesses, except
with the original i386 since it had no cache and a worse instruction
fetcher so that even the extra length of 32-bit immediate operands
slowed it down. With not-so-old CPUs it is the 8-bit accesses that
are more likely to be slower, since they may be misaligned and/or
cause store-to-load mismatch penalties.
There are a couple of (read-only) accesses to td_flags and td_pflags in
asm code very need the pcb_full_iret ones. The former use simple testl's.
Bruce
___
svn-src-all@freebsd.org mailing list
svn commit: r216671 - head/sys/mips/conf
Author: nwhitehorn Date: Wed Dec 22 19:01:48 2010 New Revision: 216671 URL: http://svn.freebsd.org/changeset/base/216671 Log: Include std.sentry5 from the SENTRY5 kernel configuration. This was apparently missed in r215270. Modified: head/sys/mips/conf/SENTRY5 Modified: head/sys/mips/conf/SENTRY5 == --- head/sys/mips/conf/SENTRY5 Wed Dec 22 18:42:23 2010(r216670) +++ head/sys/mips/conf/SENTRY5 Wed Dec 22 19:01:48 2010(r216671) @@ -29,6 +29,7 @@ ident SENTRY5 # XXX only siba should be hardwired for now; we will use # bus enumeration there hints SENTRY5.hints +include../sentry5/std.sentry5 # sentry5 normally ships with cfe firmware; use the console for now optionsCFE ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216672 - head/sys/netinet
Author: tuexen
Date: Wed Dec 22 19:04:14 2010
New Revision: 216672
URL: http://svn.freebsd.org/changeset/base/216672
Log:
Provide a possibility to configure the inital congestion window to the
value defined in RFC 4960.
MFC after: 3 months.
Modified:
head/sys/netinet/sctp_cc_functions.c
head/sys/netinet/sctp_sysctl.h
Modified: head/sys/netinet/sctp_cc_functions.c
==
--- head/sys/netinet/sctp_cc_functions.cWed Dec 22 19:01:48 2010
(r216671)
+++ head/sys/netinet/sctp_cc_functions.cWed Dec 22 19:04:14 2010
(r216672)
@@ -53,15 +53,19 @@ sctp_set_initial_cc_param(struct sctp_tc
uint32_t cwnd_in_mtu;
assoc = stcb-asoc;
- /*
-* We take the minimum of the burst limit and the initial congestion
-* window. The initial congestion window is at least two times the
-* MTU.
-*/
cwnd_in_mtu = SCTP_BASE_SYSCTL(sctp_initial_cwnd);
- if ((assoc-max_burst 0) (cwnd_in_mtu assoc-max_burst))
- cwnd_in_mtu = assoc-max_burst;
- net-cwnd = (net-mtu - sizeof(struct sctphdr)) * cwnd_in_mtu;
+ if (cwnd_in_mtu == 0) {
+ /* Using 0 means that the value of RFC 4960 is used. */
+ net-cwnd = min((net-mtu * 4), max((2 * net-mtu),
SCTP_INITIAL_CWND));
+ } else {
+ /*
+* We take the minimum of the burst limit and the initial
+* congestion window.
+*/
+ if ((assoc-max_burst 0) (cwnd_in_mtu assoc-max_burst))
+ cwnd_in_mtu = assoc-max_burst;
+ net-cwnd = (net-mtu - sizeof(struct sctphdr)) * cwnd_in_mtu;
+ }
net-ssthresh = assoc-peers_rwnd;
SDT_PROBE(sctp, cwnd, net, init,
Modified: head/sys/netinet/sctp_sysctl.h
==
--- head/sys/netinet/sctp_sysctl.h Wed Dec 22 19:01:48 2010
(r216671)
+++ head/sys/netinet/sctp_sysctl.h Wed Dec 22 19:04:14 2010
(r216672)
@@ -500,7 +500,7 @@ struct sctp_sysctl {
/* Initial congestion window in MTU */
#define SCTPCTL_INITIAL_CWND_DESC Initial congestion window in MTUs
-#define SCTPCTL_INITIAL_CWND_MIN 1
+#define SCTPCTL_INITIAL_CWND_MIN 0
#define SCTPCTL_INITIAL_CWND_MAX 0x
#define SCTPCTL_INITIAL_CWND_DEFAULT 3
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216662 - head/share/mk
On 12/22/2010 09:18, Bjoern A. Zeeb wrote:
On Wed, 22 Dec 2010, Nathan Whitehorn wrote:
Author: nwhitehorn
Date: Wed Dec 22 14:59:22 2010
New Revision: 216662
URL: http://svn.freebsd.org/changeset/base/216662
Log:
Enable build of FDT components by default. dtc is a required build tool
for all FDT-enabled kernels, and having it off by default means that
building these kernels fails by default. This fixes FDT-related build
failures in make universe on ARM and PowerPC.
Thanks a lot! I wonder if it is arch specific conditional? Is there
any value in having it on non-FDT kernels/architectures?
I am happily looking forward to a usable universe output again:-))
FDT enables building a tool that is sometimes used when building the kernel.
The problem is that it is a cross tool, and building things
conditionally based on the architecture for cross tools is not well
supported today. The gross hack that attempted to do this was too hard
to fix, so it is better to be always on. The resulting bloat is tiny,
it can be turned off if you want and it can be made conditional again
once we have a better way to specify things like this conditionally.
Warner
Reviewed by:imp
Modified:
head/share/mk/bsd.own.mk
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkWed Dec 22 14:49:18 2010(r216661)
+++ head/share/mk/bsd.own.mkWed Dec 22 14:59:22 2010(r216662)
@@ -326,6 +326,7 @@ _clang_no=CLANG
DICT \
DYNAMICROOT \
EXAMPLES \
+FDT \
FLOPPY \
FORTH \
FP_LIBC \
@@ -421,7 +422,6 @@ MK_${var}:=yes
BIND_XML \
BSD_GREP \
${_clang_no} \
-FDT \
GPIO \
HESIOD \
IDEA
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
Re: svn commit: r216662 - head/share/mk
On 12/22/2010 09:25, Nathan Whitehorn wrote: On 12/22/10 10:18, Bjoern A. Zeeb wrote: On Wed, 22 Dec 2010, Nathan Whitehorn wrote: Author: nwhitehorn Date: Wed Dec 22 14:59:22 2010 New Revision: 216662 URL: http://svn.freebsd.org/changeset/base/216662 Log: Enable build of FDT components by default. dtc is a required build tool for all FDT-enabled kernels, and having it off by default means that building these kernels fails by default. This fixes FDT-related build failures in make universe on ARM and PowerPC. Thanks a lot! I wonder if it is arch specific conditional? Is there any value in having it on non-FDT kernels/architectures? There's no good way to make it arch-specific, according to Warner. If we grow such support, it could be made that way, but I don't think the 300 K is enough to worry about. Also (hopefully), the list of architectures requiring it will continue to grow in the future. I am happily looking forward to a usable universe output again:-)) Aside from some MIPS kernels requiring 64-bit toolchains not yet connected to the build, all make universe failures are now 100% genuine problems. Have fun, all :) I was going to do a universe run after all the latest changes and try to fix that part of things, since those are rather important mips platforms to have connected and working :) Warner -Nathan ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216673 - in head/sys/amd64: amd64 include
Author: jkim
Date: Wed Dec 22 19:57:03 2010
New Revision: 216673
URL: http://svn.freebsd.org/changeset/base/216673
Log:
Increase size of pcb_flags to four bytes.
Requested by: bde, jhb
Modified:
head/sys/amd64/amd64/cpu_switch.S
head/sys/amd64/amd64/exception.S
head/sys/amd64/include/pcb.h
Modified: head/sys/amd64/amd64/cpu_switch.S
==
--- head/sys/amd64/amd64/cpu_switch.S Wed Dec 22 19:04:14 2010
(r216672)
+++ head/sys/amd64/amd64/cpu_switch.S Wed Dec 22 19:57:03 2010
(r216673)
@@ -94,7 +94,7 @@ END(cpu_throw)
ENTRY(cpu_switch)
/* Switch to new thread. First, save context. */
movqTD_PCB(%rdi),%r8
- orb $PCB_FULL_IRET,PCB_FLAGS(%r8)
+ orl $PCB_FULL_IRET,PCB_FLAGS(%r8)
movq(%rsp),%rax /* Hardware registers */
movq%r15,PCB_R15(%r8)
@@ -106,7 +106,7 @@ ENTRY(cpu_switch)
movq%rbx,PCB_RBX(%r8)
movq%rax,PCB_RIP(%r8)
- testb $PCB_DBREGS,PCB_FLAGS(%r8)
+ testl $PCB_DBREGS,PCB_FLAGS(%r8)
jnz store_dr/* static predict not taken */
done_store_dr:
@@ -210,7 +210,7 @@ done_tss:
movq%rsi,PCPU(CURTHREAD)/* into next thread */
/* Test if debug registers should be restored. */
- testb $PCB_DBREGS,PCB_FLAGS(%r8)
+ testl $PCB_DBREGS,PCB_FLAGS(%r8)
jnz load_dr /* static predict not taken */
done_load_dr:
Modified: head/sys/amd64/amd64/exception.S
==
--- head/sys/amd64/amd64/exception.SWed Dec 22 19:04:14 2010
(r216672)
+++ head/sys/amd64/amd64/exception.SWed Dec 22 19:57:03 2010
(r216673)
@@ -170,7 +170,7 @@ alltraps:
jz alltraps_testi /* already running with kernel GS.base
*/
swapgs
movqPCPU(CURPCB),%rdi
- andb$~PCB_FULL_IRET,PCB_FLAGS(%rdi)
+ andl$~PCB_FULL_IRET,PCB_FLAGS(%rdi)
movw%fs,TF_FS(%rsp)
movw%gs,TF_GS(%rsp)
movw%es,TF_ES(%rsp)
@@ -243,7 +243,7 @@ alltraps_noen:
jz 1f /* already running with kernel GS.base */
swapgs
movqPCPU(CURPCB),%rdi
- andb$~PCB_FULL_IRET,PCB_FLAGS(%rdi)
+ andl$~PCB_FULL_IRET,PCB_FLAGS(%rdi)
1: movw%fs,TF_FS(%rsp)
movw%gs,TF_GS(%rsp)
movw%es,TF_ES(%rsp)
@@ -294,7 +294,7 @@ IDTVEC(page)
jz 1f /* already running with kernel GS.base
*/
swapgs
movqPCPU(CURPCB),%rdi
- andb$~PCB_FULL_IRET,PCB_FLAGS(%rdi)
+ andl$~PCB_FULL_IRET,PCB_FLAGS(%rdi)
1: movq%cr2,%rdi /* preserve %cr2 before .. */
movq%rdi,TF_ADDR(%rsp) /* enabling interrupts. */
movw%fs,TF_FS(%rsp)
@@ -324,7 +324,7 @@ IDTVEC(prot)
jz 2f /* already running with kernel GS.base
*/
1: swapgs
2: movqPCPU(CURPCB),%rdi
- orb $PCB_FULL_IRET,PCB_FLAGS(%rdi) /* always full iret from GPF */
+ orl $PCB_FULL_IRET,PCB_FLAGS(%rdi) /* always full iret from GPF */
movw%fs,TF_FS(%rsp)
movw%gs,TF_GS(%rsp)
movw%es,TF_ES(%rsp)
@@ -356,7 +356,7 @@ IDTVEC(fast_syscall)
movw%es,TF_ES(%rsp)
movw%ds,TF_DS(%rsp)
movqPCPU(CURPCB),%r11
- andb$~PCB_FULL_IRET,PCB_FLAGS(%r11)
+ andl$~PCB_FULL_IRET,PCB_FLAGS(%r11)
sti
movq$KUDSEL,TF_SS(%rsp)
movq$KUCSEL,TF_CS(%rsp)
@@ -661,7 +661,7 @@ doreti_exit:
*/
testb $SEL_RPL_MASK,TF_CS(%rsp)
jz ld_regs
- testb $PCB_FULL_IRET,PCB_FLAGS(%r8)
+ testl $PCB_FULL_IRET,PCB_FLAGS(%r8)
jz ld_regs
testl $TF_HASSEGS,TF_FLAGS(%rsp)
je set_segs
Modified: head/sys/amd64/include/pcb.h
==
--- head/sys/amd64/include/pcb.hWed Dec 22 19:04:14 2010
(r216672)
+++ head/sys/amd64/include/pcb.hWed Dec 22 19:57:03 2010
(r216673)
@@ -71,7 +71,7 @@ struct pcb {
struct region_descriptor pcb_ldt;
uint16_tpcb_tr;
- u_char pcb_flags;
+ u_int pcb_flags;
#definePCB_FULL_IRET 0x01/* full iret is required */
#definePCB_DBREGS 0x02/* process using debug registers */
#definePCB_KERNFPU 0x04/* kernel uses fpu */
@@ -111,20 +111,20 @@ struct trapframe;
* because traps and interrupts are executed only on instruction boundary.
*/
static __inline void
-set_pcb_flags(struct pcb *pcb, const u_char flags)
+set_pcb_flags(struct pcb *pcb, const u_int flags)
{
- __asm __volatile(orb %b1,%0
- : =m
Re: svn commit: r216634 - in head/sys/amd64: amd64 ia32 include linux32
On Wednesday 22 December 2010 01:02 pm, Bruce Evans wrote: On Wed, 22 Dec 2010, Jung-uk Kim wrote: On Wednesday 22 December 2010 08:03 am, John Baldwin wrote: On Tuesday, December 21, 2010 7:18:42 pm Jung-uk Kim wrote: Log: Improve PCB flags handling and make it more robust. Add two new functions for manipulating pcb_flags. These inline functions are very similar to atomic_set_char(9) and atomic_clear_char(9) but without unnecessary LOCK prefix for SMP. Add comments about the rationale[1]. Use these functions wherever possible. Although there are some places where it is not strictly necessary (e.g., a PCB is copied to create a new PCB), it is done across the board for sake of consistency. Turn pcb_full_iret into a PCB flag as it is safe now. Move rarely used fields before pcb_flags and reduce size of pcb_flags to one byte. Fix some style(9) nits in pcb.h while I am in the neighborhood. Reviewed by:kib Submitted by: kib[1] MFC after: 2 months Is there really a need to have the flags field be a char instead of an int or long? It seems to me that flags fields in general should be an int unless there is a strong need otherwise (e.g. hardware-defined flag). 'orl' will work just as well as 'orb'. Actually, there was little disagreement between kib and me and committed version was fifth reincarnation of original patch. I I would have a big disagreement :-). I don't like using macros or functions to obfuscate setting and clearing of boolean flags. Here the function may be needed for locking, but... [Snipped FPU related comments] originally used 'u_int pcb_flags' but used byte byte opcodes for assembly to make it consistent with compiler generated code. kib Unfortuneatly its easier for the compiler to maintain the optimization of doing byte accesses if that is good. disliked the inconsistencies and told me to reconsider. After several versions, I proposed we use char and move forward for now, then we increase the size if it ever grows more than 8 bits. So, we settled. I have no problem with int version if there is no measurable performance change. I'll test it soon. I've never seen any performance loss from using 32-bit accesses, except with the original i386 since it had no cache and a worse instruction fetcher so that even the extra length of 32-bit immediate operands slowed it down. With not-so-old CPUs it is the 8-bit accesses that are more likely to be slower, since they may be misaligned and/or cause store-to-load mismatch penalties. There are a couple of (read-only) accesses to td_flags and td_pflags in asm code very need the pcb_full_iret ones. The former use simple testl's. You're right, int is (marginally) better for pcb_flags. Fixed. Thanks, Jung-uk Kim ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216674 - head/sys/dev/acpica
Author: jhb
Date: Wed Dec 22 20:27:20 2010
New Revision: 216674
URL: http://svn.freebsd.org/changeset/base/216674
Log:
Use resource_list_reserve() to reserve I/O port and memory resources for
ACPI devices even if they are not allocated by a device driver since the
resources are in use and should not be allocated to another device.
Modified:
head/sys/dev/acpica/acpi.c
head/sys/dev/acpica/acpivar.h
Modified: head/sys/dev/acpica/acpi.c
==
--- head/sys/dev/acpica/acpi.c Wed Dec 22 19:57:03 2010(r216673)
+++ head/sys/dev/acpica/acpi.c Wed Dec 22 20:27:20 2010(r216674)
@@ -116,7 +116,10 @@ static int acpi_read_ivar(device_t dev,
static int acpi_write_ivar(device_t dev, device_t child, int index,
uintptr_t value);
static struct resource_list *acpi_get_rlist(device_t dev, device_t child);
+static voidacpi_reserve_resources(device_t dev);
static int acpi_sysres_alloc(device_t dev);
+static int acpi_set_resource(device_t dev, device_t child, int type,
+ int rid, u_long start, u_long count);
static struct resource *acpi_alloc_resource(device_t bus, device_t child,
int type, int *rid, u_long start, u_long end,
u_long count, u_int flags);
@@ -187,7 +190,7 @@ static device_method_t acpi_methods[] =
DEVMETHOD(bus_read_ivar, acpi_read_ivar),
DEVMETHOD(bus_write_ivar, acpi_write_ivar),
DEVMETHOD(bus_get_resource_list, acpi_get_rlist),
-DEVMETHOD(bus_set_resource,bus_generic_rl_set_resource),
+DEVMETHOD(bus_set_resource,acpi_set_resource),
DEVMETHOD(bus_get_resource,bus_generic_rl_get_resource),
DEVMETHOD(bus_alloc_resource, acpi_alloc_resource),
DEVMETHOD(bus_release_resource,acpi_release_resource),
@@ -1109,73 +1112,144 @@ acpi_sysres_alloc(device_t dev)
return (0);
}
-static struct resource *
-acpi_alloc_resource(device_t bus, device_t child, int type, int *rid,
-u_long start, u_long end, u_long count, u_int flags)
+static char *pcilink_ids[] = { PNP0C0F, NULL };
+static char *sysres_ids[] = { PNP0C01, PNP0C02, NULL };
+
+/*
+ * Reserve declared resources for devices found during attach once system
+ * resources have been allocated.
+ */
+static void
+acpi_reserve_resources(device_t dev)
{
-ACPI_RESOURCE ares;
-struct acpi_device *ad = device_get_ivars(child);
-struct resource_list *rl = ad-ad_rl;
struct resource_list_entry *rle;
-struct resource *res;
-struct rman *rm;
+struct resource_list *rl;
+struct acpi_device *ad;
+struct acpi_softc *sc;
+device_t *children;
+int child_count, i;
-res = NULL;
+sc = device_get_softc(dev);
+if (device_get_children(dev, children, child_count) != 0)
+ return;
+for (i = 0; i child_count; i++) {
+ ad = device_get_ivars(children[i]);
+ rl = ad-ad_rl;
-/* We only handle memory and IO resources through rman. */
-switch (type) {
-case SYS_RES_IOPORT:
- rm = acpi_rman_io;
- break;
-case SYS_RES_MEMORY:
- rm = acpi_rman_mem;
- break;
-default:
- rm = NULL;
+ /* Don't reserve system resources. */
+ if (ACPI_ID_PROBE(dev, children[i], sysres_ids) != NULL)
+ continue;
+
+ STAILQ_FOREACH(rle, rl, link) {
+ /*
+* Don't reserve IRQ resources. There are many sticky things
+* to get right otherwise (e.g. IRQs for psm, atkbd, and HPET
+* when using legacy routing).
+*/
+ if (rle-type == SYS_RES_IRQ)
+ continue;
+
+ /*
+* Try to reserve the resource from our parent. If this
+* fails because the resource is a system resource, just
+* let it be. The resource range is already reserved so
+* that other devices will not use it. If the driver
+* needs to allocate the resource, then
+* acpi_alloc_resource() will sub-alloc from the system
+* resource.
+*/
+ resource_list_reserve(rl, dev, children[i], rle-type, rle-rid,
+ rle-start, rle-end, rle-count, 0);
+ }
}
-
-ACPI_SERIAL_BEGIN(acpi);
+free(children, M_TEMP);
+sc-acpi_resources_reserved = 1;
+}
+
+static int
+acpi_set_resource(device_t dev, device_t child, int type, int rid,
+u_long start, u_long count)
+{
+struct acpi_softc *sc = device_get_softc(dev);
+struct acpi_device *ad = device_get_ivars(child);
+struct resource_list *rl = ad-ad_rl;
+u_long end;
+
+/* Ignore IRQ resources for PCI link devices. */
+if (type == SYS_RES_IRQ ACPI_ID_PROBE(dev, child, pcilink_ids) != NULL)
+ return (0);
+
+/* If the resource is already allocated, fail. */
+if
svn commit: r216675 - head/usr.sbin/rtadvd
Author: delphij
Date: Wed Dec 22 23:58:21 2010
New Revision: 216675
URL: http://svn.freebsd.org/changeset/base/216675
Log:
Allow overriding pidfile and dumpfile.
PR: bin/153362
Submitted by: Joe Holden joe rewt org uk
MFC after:1 month
Modified:
head/usr.sbin/rtadvd/Makefile
head/usr.sbin/rtadvd/rtadvd.8
head/usr.sbin/rtadvd/rtadvd.c
Modified: head/usr.sbin/rtadvd/Makefile
==
--- head/usr.sbin/rtadvd/Makefile Wed Dec 22 20:27:20 2010
(r216674)
+++ head/usr.sbin/rtadvd/Makefile Wed Dec 22 23:58:21 2010
(r216675)
@@ -18,6 +18,9 @@ PROG= rtadvd
MAN= rtadvd.conf.5 rtadvd.8
SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c
+DPADD= ${LIBUTIL}
+LDADD= -lutil
+
CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO
WARNS?=1
Modified: head/usr.sbin/rtadvd/rtadvd.8
==
--- head/usr.sbin/rtadvd/rtadvd.8 Wed Dec 22 20:27:20 2010
(r216674)
+++ head/usr.sbin/rtadvd/rtadvd.8 Wed Dec 22 23:58:21 2010
(r216675)
@@ -29,7 +29,7 @@
.\
.\ $FreeBSD$
.\
-.Dd May 17, 1998
+.Dd December 22, 2010
.Dt RTADVD 8
.Os
.Sh NAME
@@ -39,6 +39,8 @@
.Nm
.Op Fl dDfMRs
.Op Fl c Ar configfile
+.Op Fl F Ar dumpfile
+.Op Fl p Ar pidfile
.Ar interface ...
.Sh DESCRIPTION
.Nm
@@ -126,6 +128,13 @@ Even more debugging information is print
.It Fl f
Foreground mode (useful when debugging).
Log messages will be dumped to stderr when this option is specified.
+.It Fl F
+Specify an alternative file in which to dump internal states when
+.Nm
+receives signal
+.Dv SIGUSR1 .
+The default is
+.Pa /var/run/rtadvd.dump .
.It Fl M
Specify an interface to join the all-routers site-local multicast group.
By default,
@@ -135,6 +144,10 @@ line.
This option has meaning only with the
.Fl R
option, which enables routing renumbering protocol support.
+.It Fl p
+Specify an alternative file in which to store the process ID.
+The default is
+.Pa /var/run/rtadvd.pid.
.It Fl R
Accept router renumbering requests.
If you enable it, certain IPsec setup is suggested for security reasons.
@@ -150,7 +163,9 @@ Upon receipt of signal
.Dv SIGUSR1 ,
.Nm
will dump the current internal state into
-.Pa /var/run/rtadvd.dump .
+.Pa /var/run/rtadvd.dump
+or the file specified with option
+.Fl F .
.Pp
Use
.Dv SIGTERM
@@ -167,10 +182,9 @@ to all the interfaces
.It Pa /etc/rtadvd.conf
The default configuration file.
.It Pa /var/run/rtadvd.pid
-contains the pid of the currently running
-.Nm .
+The default process ID file.
.It Pa /var/run/rtadvd.dump
-The file in which
+The default file in which
.Nm
dumps its internal state.
.El
Modified: head/usr.sbin/rtadvd/rtadvd.c
==
--- head/usr.sbin/rtadvd/rtadvd.c Wed Dec 22 20:27:20 2010
(r216674)
+++ head/usr.sbin/rtadvd/rtadvd.c Wed Dec 22 23:58:21 2010
(r216675)
@@ -51,6 +51,7 @@
#include stdio.h
#include err.h
#include errno.h
+#include libutil.h
#include string.h
#include stdlib.h
#include syslog.h
@@ -79,8 +80,9 @@ struct iovec sndiov[2];
struct sockaddr_in6 rcvfrom;
struct sockaddr_in6 sin6_allnodes = {sizeof(sin6_allnodes), AF_INET6};
struct in6_addr in6a_site_allrouters;
-static char *dumpfilename = /var/run/rtadvd.dump; /* XXX: should be
configurable */
-static char *pidfilename = /var/run/rtadvd.pid; /* should be configurable */
+static char *dumpfilename = /var/run/rtadvd.dump;
+static char *pidfilename = /var/run/rtadvd.pid;
+static struct pidfh *pfh;
static char *mcastif;
int sock;
int rtsock = -1;
@@ -159,11 +161,10 @@ main(argc, argv)
struct timeval *timeout;
int i, ch;
int fflag = 0, logopt;
- FILE *pidfp;
- pid_t pid;
+ pid_t pid, otherpid;
/* get command line options and arguments */
- while ((ch = getopt(argc, argv, c:dDfM:Rs)) != -1) {
+ while ((ch = getopt(argc, argv, c:dDF:fMp:Rs)) != -1) {
switch (ch) {
case 'c':
conffile = optarg;
@@ -189,6 +190,12 @@ main(argc, argv)
case 's':
sflag = 1;
break;
+ case 'p':
+ pidfilename = optarg;
+ break;
+ case 'F':
+ dumpfilename = optarg;
+ break;
}
}
argc -= optind;
@@ -196,7 +203,7 @@ main(argc, argv)
if (argc == 0) {
fprintf(stderr,
usage: rtadvd [-dDfMRs] [-c conffile]
- interfaces...\n);
+ [-F dumpfile] [-p pidfile] interfaces...\n);
exit(1);
}
@@ -234,6 +241,16 @@ main(argc, argv)
exit(1);
}
+
svn commit: r216676 - head/sys/ufs/ffs
Author: mckusick Date: Thu Dec 23 00:38:57 2010 New Revision: 216676 URL: http://svn.freebsd.org/changeset/base/216676 Log: This patch fixes a soft update panic while running perl 5.12 tests which produced: panic: indir_trunc: Index out of range -148 parent -2061 lbn -305164 Reported by: Dimitry Andric Fixed by: Jeff Roberson Modified: head/sys/ufs/ffs/ffs_softdep.c Modified: head/sys/ufs/ffs/ffs_softdep.c == --- head/sys/ufs/ffs/ffs_softdep.c Wed Dec 22 23:58:21 2010 (r216675) +++ head/sys/ufs/ffs/ffs_softdep.c Thu Dec 23 00:38:57 2010 (r216676) @@ -6153,7 +6153,8 @@ indir_trunc(freework, dbn, lbn) if (jnewblk-jn_lbn 0) i = (jnewblk-jn_lbn - -lbn) / lbnadd; else - i = (jnewblk-jn_lbn - (lbn + 1)) / lbnadd; + i = (-(jnewblk-jn_lbn + level - 1) - -(lbn + level)) / + lbnadd; KASSERT(i = 0 i NINDIR(fs), (indir_trunc: Index out of range %d parent %jd lbn %jd, i, lbn, jnewblk-jn_lbn)); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216677 - head/usr.sbin/rtadvd
Author: delphij
Date: Thu Dec 23 01:45:48 2010
New Revision: 216677
URL: http://svn.freebsd.org/changeset/base/216677
Log:
style.Makefile says tab between var= and value.
Modified:
head/usr.sbin/rtadvd/Makefile
Modified: head/usr.sbin/rtadvd/Makefile
==
--- head/usr.sbin/rtadvd/Makefile Thu Dec 23 00:38:57 2010
(r216676)
+++ head/usr.sbin/rtadvd/Makefile Thu Dec 23 01:45:48 2010
(r216677)
@@ -18,8 +18,8 @@ PROG= rtadvd
MAN= rtadvd.conf.5 rtadvd.8
SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c
-DPADD= ${LIBUTIL}
-LDADD= -lutil
+DPADD= ${LIBUTIL}
+LDADD= -lutil
CFLAGS+= -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DROUTEINFO
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
svn commit: r216678 - head/sys/kern
Author: davidxu
Date: Thu Dec 23 03:12:03 2010
New Revision: 216678
URL: http://svn.freebsd.org/changeset/base/216678
Log:
Enlarge hash table for new condition variable.
Modified:
head/sys/kern/kern_umtx.c
Modified: head/sys/kern/kern_umtx.c
==
--- head/sys/kern/kern_umtx.c Thu Dec 23 01:45:48 2010(r216677)
+++ head/sys/kern/kern_umtx.c Thu Dec 23 03:12:03 2010(r216678)
@@ -205,8 +205,8 @@ struct umtxq_chain {
PRI_MAX_TIMESHARE : (td)-td_user_pri)
#defineGOLDEN_RATIO_PRIME 2654404609U
-#defineUMTX_CHAINS 128
-#defineUMTX_SHIFTS (__WORD_BIT - 7)
+#defineUMTX_CHAINS 512
+#defineUMTX_SHIFTS (__WORD_BIT - 9)
#define THREAD_SHARE 0
#define PROCESS_SHARE 1
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to svn-src-all-unsubscr...@freebsd.org
