svn commit: r206174 - head/sys/vm
Author: alc
Date: Mon Apr 5 06:23:31 2010
New Revision: 206174
URL: http://svn.freebsd.org/changeset/base/206174
Log:
vm_reserv_alloc_page() should never be called on an OBJT_SG object, just as
it is never called on an OBJT_DEVICE object. (This change should have been
included in r195840.)
Reported by: dougb@, avg@
MFC after:3 days
Modified:
head/sys/vm/vm_page.c
Modified: head/sys/vm/vm_page.c
==
--- head/sys/vm/vm_page.c Mon Apr 5 01:51:11 2010(r206173)
+++ head/sys/vm/vm_page.c Mon Apr 5 06:23:31 2010(r206174)
@@ -1084,6 +1084,7 @@ vm_page_alloc(vm_object_t object, vm_pin
return (NULL);
#if VM_NRESERVLEVEL 0
} else if (object == NULL || object-type == OBJT_DEVICE ||
+ object-type == OBJT_SG ||
(object-flags OBJ_COLORED) == 0 ||
(m = vm_reserv_alloc_page(object, pindex)) == NULL) {
#else
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r206129 - head/sys/kern
on 05/04/2010 01:12 Peter Jeremy said the following: On 2010-Apr-05 00:27:42 +0300, Kostik Belousov kostik...@gmail.com wrote: On Mon, Apr 05, 2010 at 12:11:06AM +0300, Andriy Gapon wrote: on 05/04/2010 00:03 Peter Jeremy said the following: On 2010-Apr-03 08:39:00 +, Andriy Gapon a...@freebsd.org wrote: vn_stat: take into account va_blocksize when setting st_blksize ... I haven't verified it but, based on a quick look at the change, I suspect this will trigger the problem in bin/16. Quick summary: db(3) has restrictions on its internal bucket size but initializes it from st_blksize with no sanity checking and ZFS can report blocksizes outside the allowed bucket size range for db(3). Thank you for pointing this out. If no one objects or provides a better patch, I will commit yours. I do not think this is very satisfying solution. Pre-patched libc still suffer from the problem. You cannot run stable/8 libc on this kernel. Firstly, has someone with a post-r206129 kernel verified that it does actually trigger the issue I reported in bin/16? I'm not in a position to do so easily and it's possible that the problem is masked elsewhere. Sorry for my lack of knowledge, but what is the best way to test this? As I understand, a new db needs to be initialized in an existing file? Also, Kostik's comment is a slight exaggeration: You can't create a db(3) database from scratch in a ZFS filesystem using db(3) defaults. Note that as of now, it's exactly the same situation as running -current libc with a post-r206129 kernel. Additionally, as noted above (and if I am not mistaken), the problem would manifest itself when creating a new db in an existing file and the file has to be large enough. -current is expected to include occasions of bumpiness so I don't see this as an immediate reason to revert r206129 - though if buildworld or installworld are affected, it at least needs a heads-up. OTOH, I think some care needs to taken over any MFC of this change. At the very least, the db(3) problem needs to be fixed and there probably needs to be an extended shakedown of r206129 to ensure that there aren't any other similar nasties lurking elsewhere. I agree about the MFC. The problem I reported in bin/16 is a bug in a userland utility and IMHO, it's not the kernel's responsibility to work around userland bugs. But Kostik has a good point here. Value of st_blksize is kind of interface from kernel to userland and when it's changing it could be considered an A?I change with all the release engineering consequences. -- Andriy Gapon ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206175 - head/share/examples/indent
Author: avg Date: Mon Apr 5 09:24:24 2010 New Revision: 206175 URL: http://svn.freebsd.org/changeset/base/206175 Log: indent.pro example: correctly place -ta option The options are sorted, leading 'n' (for 'off') should be ignored. Pointed out by: bde MFC after:7 days Modified: head/share/examples/indent/indent.pro Modified: head/share/examples/indent/indent.pro == --- head/share/examples/indent/indent.pro Mon Apr 5 06:23:31 2010 (r206174) +++ head/share/examples/indent/indent.pro Mon Apr 5 09:24:24 2010 (r206175) @@ -15,5 +15,4 @@ -TSLIST_HEAD -TSLIST_ENTRY -bad -bap -nbbb -nbc -br -nbs -c41 -cd41 -cdb -ce -ci4 -cli0 -d0 -di8 -ndj --ei -nfc1 -nfcb -i8 -ip8 -l79 -lc77 -ldi0 -nlp -npcs -psl -sc -nsob -nv --ta +-ei -nfc1 -nfcb -i8 -ip8 -l79 -lc77 -ldi0 -nlp -npcs -psl -sc -nsob -ta -nv ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206176 - head/share/examples/indent
Author: avg Date: Mon Apr 5 09:26:03 2010 New Revision: 206176 URL: http://svn.freebsd.org/changeset/base/206176 Log: indent.pro example: put all options one per line This should help with modification tracking. Discussed with: bde MFC after:7 days Modified: head/share/examples/indent/indent.pro Modified: head/share/examples/indent/indent.pro == --- head/share/examples/indent/indent.pro Mon Apr 5 09:24:24 2010 (r206175) +++ head/share/examples/indent/indent.pro Mon Apr 5 09:26:03 2010 (r206176) @@ -14,5 +14,33 @@ -TSTAILQ_ENTRY -TSLIST_HEAD -TSLIST_ENTRY --bad -bap -nbbb -nbc -br -nbs -c41 -cd41 -cdb -ce -ci4 -cli0 -d0 -di8 -ndj --ei -nfc1 -nfcb -i8 -ip8 -l79 -lc77 -ldi0 -nlp -npcs -psl -sc -nsob -ta -nv +-bad +-bap +-nbbb +-nbc +-br +-nbs +-c41 +-cd41 +-cdb +-ce +-ci4 +-cli0 +-d0 +-di8 +-ndj +-ei +-nfc1 +-nfcb +-i8 +-ip8 +-l79 +-lc77 +-ldi0 +-nlp +-npcs +-psl +-sc +-nsob +-ta +-nv ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r206176 - head/share/examples/indent
On Mon, Apr 5, 2010 at 2:26 AM, Andriy Gapon a...@freebsd.org wrote: Author: avg Date: Mon Apr 5 09:26:03 2010 New Revision: 206176 URL: http://svn.freebsd.org/changeset/base/206176 Log: indent.pro example: put all options one per line This should help with modification tracking. Discussed with: bde MFC after: 7 days Modified: head/share/examples/indent/indent.pro Modified: head/share/examples/indent/indent.pro == --- head/share/examples/indent/indent.pro Mon Apr 5 09:24:24 2010 (r206175) +++ head/share/examples/indent/indent.pro Mon Apr 5 09:26:03 2010 (r206176) @@ -14,5 +14,33 @@ -TSTAILQ_ENTRY -TSLIST_HEAD -TSLIST_ENTRY --bad -bap -nbbb -nbc -br -nbs -c41 -cd41 -cdb -ce -ci4 -cli0 -d0 -di8 -ndj --ei -nfc1 -nfcb -i8 -ip8 -l79 -lc77 -ldi0 -nlp -npcs -psl -sc -nsob -ta -nv +-bad +-bap +-nbbb +-nbc +-br +-nbs +-c41 +-cd41 +-cdb +-ce +-ci4 +-cli0 +-d0 +-di8 +-ndj +-ei +-nfc1 +-nfcb +-i8 +-ip8 +-l79 +-lc77 +-ldi0 +-nlp +-npcs +-psl +-sc +-nsob +-ta +-nv Isn't doing something like this going to make merge collisions more prevalent? Thanks, -Garrett ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206177 - head/lib/libc/db/man
Author: avg Date: Mon Apr 5 10:01:53 2010 New Revision: 206177 URL: http://svn.freebsd.org/changeset/base/206177 Log: hash.3: fix a factual mistake in the man page PR: bin/16 Submitted by: Peter Jeremy peterjer...@acm.org MFC after:3 days Modified: head/lib/libc/db/man/hash.3 Modified: head/lib/libc/db/man/hash.3 == --- head/lib/libc/db/man/hash.3 Mon Apr 5 09:26:03 2010(r206176) +++ head/lib/libc/db/man/hash.3 Mon Apr 5 10:01:53 2010(r206177) @@ -78,7 +78,7 @@ The element defines the .Nm -table bucket size, and is, by default, 256 bytes. +table bucket size, and is, by default, 4096 bytes. It may be preferable to increase the page size for disk-resident tables and tables with large data items. .It Va ffactor ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206179 - head/sys/conf
Author: imp
Date: Mon Apr 5 11:00:21 2010
New Revision: 206179
URL: http://svn.freebsd.org/changeset/base/206179
Log:
Add missing @ to the NORMAL_CTFCONVERT line to keep it from appearing
in the output.
Modified:
head/sys/conf/kern.pre.mk
Modified: head/sys/conf/kern.pre.mk
==
--- head/sys/conf/kern.pre.mk Mon Apr 5 10:12:21 2010(r206178)
+++ head/sys/conf/kern.pre.mk Mon Apr 5 11:00:21 2010(r206179)
@@ -128,7 +128,7 @@ NORMAL_C_NOWERROR= ${CC} -c ${CFLAGS} ${
NORMAL_M= ${AWK} -f $S/tools/makeobjops.awk ${.IMPSRC} -c ; \
${CC} -c ${CFLAGS} ${WERROR} ${PROF} ${.PREFIX}.c
-NORMAL_CTFCONVERT= [ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || ${CTFCONVERT}
${CTFFLAGS} ${.TARGET}
+NORMAL_CTFCONVERT= @[ -z ${CTFCONVERT} -o -n ${NO_CTF} ] || ${CTFCONVERT}
${CTFFLAGS} ${.TARGET}
NORMAL_LINT= ${LINT} ${LINTFLAGS} ${CFLAGS:M-[DIU]*} ${.IMPSRC}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r206176 - head/share/examples/indent
In message: t2j7d6fde3d1004050234i291425f3h162be14ec3348...@mail.gmail.com Garrett Cooper yanef...@gmail.com writes: : On Mon, Apr 5, 2010 at 2:26 AM, Andriy Gapon a...@freebsd.org wrote: : Author: avg : Date: Mon Apr 5 09:26:03 2010 : New Revision: 206176 : URL: http://svn.freebsd.org/changeset/base/206176 : : Log: : indent.pro example: put all options one per line : : This should help with modification tracking. : : Discussed with: bde : MFC after: 7 days : : Modified: : head/share/examples/indent/indent.pro : : Modified: head/share/examples/indent/indent.pro : == : --- head/share/examples/indent/indent.pro Mon Apr 5 09:24:24 2010 (r206175) : +++ head/share/examples/indent/indent.pro Mon Apr 5 09:26:03 2010 (r206176) : @@ -14,5 +14,33 @@ : -TSTAILQ_ENTRY : -TSLIST_HEAD : -TSLIST_ENTRY : --bad -bap -nbbb -nbc -br -nbs -c41 -cd41 -cdb -ce -ci4 -cli0 -d0 -di8 -ndj : --ei -nfc1 -nfcb -i8 -ip8 -l79 -lc77 -ldi0 -nlp -npcs -psl -sc -nsob -ta -nv : +-bad : +-bap : +-nbbb : +-nbc : +-br : +-nbs : +-c41 : +-cd41 : +-cdb : +-ce : +-ci4 : +-cli0 : +-d0 : +-di8 : +-ndj : +-ei : +-nfc1 : +-nfcb : +-i8 : +-ip8 : +-l79 : +-lc77 : +-ldi0 : +-nlp : +-npcs : +-psl : +-sc : +-nsob : +-ta : +-nv : : Isn't doing something like this going to make merge collisions : more prevalent? Actually, it will allow merging more easily. If I wanted to add -nld to the list and joe wanted to add -l4d, then those would be on lines by themselves (which makes merging easier) rather than on the same line (which makes merging impossible with today's tools). Warner ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r206082 - in head: . share/man/man7 share/mk sys/conf
Quoting Kostik Belousov kostik...@gmail.com (from Sun, 4 Apr 2010 18:36:53 +0300): On Fri, Apr 02, 2010 at 06:55:32AM +, Alexander Leidinger wrote: Author: netchild Date: Fri Apr 2 06:55:31 2010 New Revision: 206082 URL: http://svn.freebsd.org/changeset/base/206082 Log: WITH_CTF can now be specified in src.conf (not recommended, there are some problems with static executables), make.conf (would also affect ports which do not use GNU make and do not override the compile targets) or in the kernel config (via makeoptions WITH_CTF=yes). I think this commit started the kernel build to emit lines like this [ -z ctfconvert -o -n 1 ] || ctfconvert -L VERSION -g vm_init.o after compilation of each file from the kernel (but not modules) source. Could you, please, look for missed '@' ? I just reviewed the diff again and there is only one place where no @ is, this is for NORMAL_CTFCONVERT. Before I committed the patch, I searched where it is used, but I didn't find a place where it is used. Maybe I overlooked something (I didn't review the Makfile which is generated by running the config program on the kernel-config, and I will not get time to do this today). Can you please confirm that you did an installworld before building the kernel? Bye, Alexander. -- http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 BOFH excuse #396: Mail server hit by UniSpammer ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r206082 - in head: . share/man/man7 share/mk sys/conf
On Mon, Apr 05, 2010 at 02:31:23PM +0200, Alexander Leidinger wrote: Quoting Kostik Belousov kostik...@gmail.com (from Sun, 4 Apr 2010 18:36:53 +0300): On Fri, Apr 02, 2010 at 06:55:32AM +, Alexander Leidinger wrote: Author: netchild Date: Fri Apr 2 06:55:31 2010 New Revision: 206082 URL: http://svn.freebsd.org/changeset/base/206082 Log: WITH_CTF can now be specified in src.conf (not recommended, there are some problems with static executables), make.conf (would also affect ports which do not use GNU make and do not override the compile targets) or in the kernel config (via makeoptions WITH_CTF=yes). I think this commit started the kernel build to emit lines like this [ -z ctfconvert -o -n 1 ] || ctfconvert -L VERSION -g vm_init.o after compilation of each file from the kernel (but not modules) source. Could you, please, look for missed '@' ? I just reviewed the diff again and there is only one place where no @ is, this is for NORMAL_CTFCONVERT. Before I committed the patch, I searched where it is used, but I didn't find a place where it is used. Maybe I overlooked something (I didn't review the Makfile which is generated by running the config program on the kernel-config, and I will not get time to do this today). Can you please confirm that you did an installworld before building the kernel? I can confirm that r206179 fixed the issue. To answer your question, no, I did not performed installworld. I do buildkernel in cross-build environment, i.e. I do buildworld and then buildkernel. pgpsxLf18Svcv.pgp Description: PGP signature
Re: svn commit: r206140 - head/sys/vm
Hi,
On 3 Apr 2010, at 17:20, Alan Cox wrote:
Author: alc
Date: Sat Apr 3 16:20:22 2010
New Revision: 206140
URL: http://svn.freebsd.org/changeset/base/206140
Log:
Re-enable the call to pmap_release() by vmspace_dofree(). The accounting
problem that is described in the comment has been addressed.
Submitted by:kib
Tested by: pho (a few months ago)
MFC after: 6 weeks
Modified:
head/sys/vm/vm_map.c
Modified: head/sys/vm/vm_map.c
==
--- head/sys/vm/vm_map.c Sat Apr 3 15:52:32 2010(r206139)
+++ head/sys/vm/vm_map.c Sat Apr 3 16:20:22 2010(r206140)
@@ -313,6 +313,7 @@ vm_init2(void)
static inline void
vmspace_dofree(struct vmspace *vm)
{
+
CTR1(KTR_VM, vmspace_free: %p, vm);
/*
@@ -329,12 +330,8 @@ vmspace_dofree(struct vmspace *vm)
(void)vm_map_remove(vm-vm_map, vm-vm_map.min_offset,
vm-vm_map.max_offset);
- /*
- * XXX Comment out the pmap_release call for now. The
- * vmspace_zone is marked as UMA_ZONE_NOFREE, and bugs cause
- * pmap.resident_count to be != 0 on exit sometimes.
- */
-/* pmap_release(vmspace_pmap(vm)); */
+ pmap_release(vmspace_pmap(vm));
+ vm-vm_map.pmap = NULL;
uma_zfree(vmspace_zone, vm);
}
Unfortunately, this causes a panic on MIPS. I don't know enough about the VM
subsystem to help with fixing this but if you want me to investigate something,
I can do it.
NFS ROOT: 192.168.5.1:/zoo/rpaulo/millipede1
warning: no time-of-day clock registered, system time will not be set accurately
warning: no time-of-day clock registered, system time will not be set accurately
Interface rge1 IP-Address 192.168.5.16 Broadcast 192.168.5.255
panic: lock pmap 0xc6c320dc already initialized
KDB: enter: panic
[ thread pid 31 tid 100042 ]
Stopped at kdb_enter+0x50: lui at,0x8047
db bt
Tracing pid 31 tid 100042 td 0xc829e260
db_trace_thread+30 (?,?,?,?) ra 8011ee48 sp d37ed820 sz 24
8011ed2c+11c (0,?,,?) ra 8011e4f0 sp d37ed838 sz 32
8011e15c+394 (?,?,?,?) ra 8011e680 sp d37ed858 sz 168
db_command_loop+78 (?,?,?,?) ra 80120c98 sp d37ed900 sz 24
80120b90+108 (?,?,?,?) ra 80227c74 sp d37ed918 sz 424
kdb_trap+10c (?,?,?,?) ra 8038b8fc sp d37edac0 sz 32
trap+b88 (?,?,?,?) ra 80383fa8 sp d37edae0 sz 168
MipsKernGenException+10c (0,a,804c2fe4,109) ra 80227ecc sp d37edb88 sz 200
kdb_enter+50 (?,?,?,?) ra 801f2184 sp d37edc50 sz 24
panic+f8 (?,803fb4e0,c6c320dc,c6c320dc) ra 80228a74 sp d37edc68 sz 40
lock_init+30 (?,?,?,?) ra 801e2114 sp d37edc90 sz 24
mtx_init+100 (?,?,?,?) ra 80386fd4 sp d37edca8 sz 32
pmap_pinit+34 (?,?,?,?) ra 8036dab8 sp d37edcc8 sz 48
vmspace_alloc+48 (?,?,?,?) ra 8036dc08 sp d37edcf8 sz 32
vmspace_fork+58 (c6c320f0,d37edd78,?,?) ra 801c7240 sp d37edd18 sz 72
fork1+234 (?,?,?,d37eddc8) ra 801c845c sp d37edd60 sz 88
fork+20 (?,?,?,?) ra 8038b694 sp d37eddb8 sz 32
trap+920 (?,?,?,?) ra 80384174 sp d37eddd8 sz 168
MipsUserGenException+10c (?,?,?,501dbd30) ra 0 sp d37ede80 sz 0
pid 31
db ps
pid ppid pgrp uid state wmesg wchancmd
311717 0 R+ CPU 0 sh
18 0 0 0 SL -0x8047b804 [nfsiod 0]
17 117 0 Ss+ wait 0xc82a1590 sh
16 0 0 0 DL -0x80471354 [schedcpu]
15 0 0 0 DL syncer 0x80476d14 [syncer]
9 0 0 0 DL vlruwt 0xc82a4000 [vnlru]
8 0 0 0 DL psleep 0x80476a3c [bufdaemon]
7 0 0 0 DL pgzero 0x8047c95c [pagezero]
6 0 0 0 DL psleep 0x8047c588 [pagedaemon]
5 0 0 0 DL ccb_scan 0x8046b57c [xpt_thrd]
14 0 0 0 WL [msg_intr0]
13 0 0 0 DL (threaded) [usb]
100021 D -0xc6cb0d0c [usbus0]
100020 D -0xc6cb0cdc [usbus0]
100019 D -0xc6cb0cac [usbus0]
100018 D -0xc6cb0c7c [usbus0]
12 0 0 0 DL -0x80471354 [yarrow]
4 0 0 0 DL -0x8046f280 [g_down]
3 0 0 0 DL -0x8046f27c [g_up]
2 0 0 0 DL -0x8046f274 [g_event]
11 0 0 0 RL (threaded) [intr]
100031 I [hard intr35: mskc]
100030 I [hard intr32: rge]
100029 I [hard intr31: rge]
100028 I [hard intr30: rge]
100027 I [hard intr29: rge]
100026 I [hard intr28: rge]
100025 I [hard intr27: rge]
100024 I
svn commit: r206182 - head/bin/sh
Author: jilles
Date: Mon Apr 5 14:15:51 2010
New Revision: 206182
URL: http://svn.freebsd.org/changeset/base/206182
Log:
sh: Automatically enable -o emacs in interactive shells with terminals.
This makes sh a bit more friendly in single user mode, make buildenv, chroot
and the like, and matches other shells.
The -o emacs can be overridden on the command line or in the ENV file.
Modified:
head/bin/sh/options.c
head/bin/sh/sh.1
Modified: head/bin/sh/options.c
==
--- head/bin/sh/options.c Mon Apr 5 13:48:23 2010(r206181)
+++ head/bin/sh/options.c Mon Apr 5 14:15:51 2010(r206182)
@@ -93,8 +93,11 @@ procargs(int argc, char **argv)
options(1);
if (*argptr == NULL minusc == NULL)
sflag = 1;
- if (iflag == 2 sflag == 1 isatty(0) isatty(1))
+ if (iflag != 0 sflag == 1 isatty(0) isatty(1)) {
iflag = 1;
+ if (Eflag == 2)
+ Eflag = 1;
+ }
if (mflag == 2)
mflag = iflag;
for (i = 0; i NOPTS; i++)
Modified: head/bin/sh/sh.1
==
--- head/bin/sh/sh.1Mon Apr 5 13:48:23 2010(r206181)
+++ head/bin/sh/sh.1Mon Apr 5 14:15:51 2010(r206182)
@@ -32,7 +32,7 @@
.\from: @(#)sh.1 8.6 (Berkeley) 5/4/95
.\ $FreeBSD$
.\
-.Dd April 4, 2010
+.Dd April 5, 2010
.Dt SH 1
.Os
.Sh NAME
@@ -210,7 +210,8 @@ Enable the built-in
.Xr emacs 1
command line editor (disables the
.Fl V
-option if it has been set).
+option if it has been set;
+set automatically when interactive on terminals).
.It Fl e Li errexit
Exit immediately if any untested command fails in non-interactive mode.
The exit status of a command is considered to be
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r206140 - head/sys/vm
On Mon, Apr 05, 2010 at 02:58:53PM +0100, Rui Paulo wrote:
Hi,
On 3 Apr 2010, at 17:20, Alan Cox wrote:
Author: alc
Date: Sat Apr 3 16:20:22 2010
New Revision: 206140
URL: http://svn.freebsd.org/changeset/base/206140
Log:
Re-enable the call to pmap_release() by vmspace_dofree(). The accounting
problem that is described in the comment has been addressed.
Submitted by: kib
Tested by: pho (a few months ago)
MFC after: 6 weeks
Modified:
head/sys/vm/vm_map.c
Modified: head/sys/vm/vm_map.c
==
--- head/sys/vm/vm_map.cSat Apr 3 15:52:32 2010(r206139)
+++ head/sys/vm/vm_map.cSat Apr 3 16:20:22 2010(r206140)
@@ -313,6 +313,7 @@ vm_init2(void)
static inline void
vmspace_dofree(struct vmspace *vm)
{
+
CTR1(KTR_VM, vmspace_free: %p, vm);
/*
@@ -329,12 +330,8 @@ vmspace_dofree(struct vmspace *vm)
(void)vm_map_remove(vm-vm_map, vm-vm_map.min_offset,
vm-vm_map.max_offset);
- /*
-* XXX Comment out the pmap_release call for now. The
-* vmspace_zone is marked as UMA_ZONE_NOFREE, and bugs cause
-* pmap.resident_count to be != 0 on exit sometimes.
-*/
-/* pmap_release(vmspace_pmap(vm)); */
+ pmap_release(vmspace_pmap(vm));
+ vm-vm_map.pmap = NULL;
uma_zfree(vmspace_zone, vm);
}
Unfortunately, this causes a panic on MIPS. I don't know enough about the VM
subsystem to help with fixing this but if you want me to investigate
something, I can do it.
NFS ROOT: 192.168.5.1:/zoo/rpaulo/millipede1
warning: no time-of-day clock registered, system time will not be set
accurately
warning: no time-of-day clock registered, system time will not be set
accurately
Interface rge1 IP-Address 192.168.5.16 Broadcast 192.168.5.255
panic: lock pmap 0xc6c320dc already initialized
KDB: enter: panic
[ thread pid 31 tid 100042 ]
Stopped at kdb_enter+0x50: lui at,0x8047
db bt
Tracing pid 31 tid 100042 td 0xc829e260
db_trace_thread+30 (?,?,?,?) ra 8011ee48 sp d37ed820 sz 24
8011ed2c+11c (0,?,,?) ra 8011e4f0 sp d37ed838 sz 32
8011e15c+394 (?,?,?,?) ra 8011e680 sp d37ed858 sz 168
db_command_loop+78 (?,?,?,?) ra 80120c98 sp d37ed900 sz 24
80120b90+108 (?,?,?,?) ra 80227c74 sp d37ed918 sz 424
kdb_trap+10c (?,?,?,?) ra 8038b8fc sp d37edac0 sz 32
trap+b88 (?,?,?,?) ra 80383fa8 sp d37edae0 sz 168
MipsKernGenException+10c (0,a,804c2fe4,109) ra 80227ecc sp d37edb88 sz 200
kdb_enter+50 (?,?,?,?) ra 801f2184 sp d37edc50 sz 24
panic+f8 (?,803fb4e0,c6c320dc,c6c320dc) ra 80228a74 sp d37edc68 sz 40
lock_init+30 (?,?,?,?) ra 801e2114 sp d37edc90 sz 24
mtx_init+100 (?,?,?,?) ra 80386fd4 sp d37edca8 sz 32
pmap_pinit+34 (?,?,?,?) ra 8036dab8 sp d37edcc8 sz 48
vmspace_alloc+48 (?,?,?,?) ra 8036dc08 sp d37edcf8 sz 32
vmspace_fork+58 (c6c320f0,d37edd78,?,?) ra 801c7240 sp d37edd18 sz 72
fork1+234 (?,?,?,d37eddc8) ra 801c845c sp d37edd60 sz 88
fork+20 (?,?,?,?) ra 8038b694 sp d37eddb8 sz 32
trap+920 (?,?,?,?) ra 80384174 sp d37eddd8 sz 168
MipsUserGenException+10c (?,?,?,501dbd30) ra 0 sp d37ede80 sz 0
pid 31
I did not even compiled the change below.
diff --git a/sys/mips/mips/pmap.c b/sys/mips/mips/pmap.c
index 73f57e4..d5765ea 100644
--- a/sys/mips/mips/pmap.c
+++ b/sys/mips/mips/pmap.c
@@ -1263,6 +1263,7 @@ pmap_release(pmap_t pmap)
ptdpg-wire_count--;
atomic_subtract_int(cnt.v_wire_count, 1);
vm_page_free_zero(ptdpg);
+ PMAP_LOCK_DESTROY(pmap);
}
/*
pgpNKWMAfFv70.pgp
Description: PGP signature
Re: svn commit: r206082 - in head: . share/man/man7 share/mk sys/conf
Quoting Kostik Belousov kostik...@gmail.com (from Mon, 5 Apr 2010 16:35:05 +0300): On Mon, Apr 05, 2010 at 02:31:23PM +0200, Alexander Leidinger wrote: Quoting Kostik Belousov kostik...@gmail.com (from Sun, 4 Apr 2010 18:36:53 +0300): On Fri, Apr 02, 2010 at 06:55:32AM +, Alexander Leidinger wrote: Author: netchild Date: Fri Apr 2 06:55:31 2010 New Revision: 206082 URL: http://svn.freebsd.org/changeset/base/206082 Log: WITH_CTF can now be specified in src.conf (not recommended, there are some problems with static executables), make.conf (would also affect ports which do not use GNU make and do not override the compile targets) or in the kernel config (via makeoptions WITH_CTF=yes). I think this commit started the kernel build to emit lines like this [ -z ctfconvert -o -n 1 ] || ctfconvert -L VERSION -g vm_init.o after compilation of each file from the kernel (but not modules) source. Could you, please, look for missed '@' ? I just reviewed the diff again and there is only one place where no @ is, this is for NORMAL_CTFCONVERT. Before I committed the patch, I searched where it is used, but I didn't find a place where it is used. Maybe I overlooked something (I didn't review the Makfile which is generated by running the config program on the kernel-config, and I will not get time to do this today). Can you please confirm that you did an installworld before building the kernel? I can confirm that r206179 fixed the issue. To answer your question, no, I did not performed installworld. I do buildkernel in cross-build environment, i.e. I do buildworld and then buildkernel. Ok, thanks for the info. Warner, do you mind if I back-out r206082 and change the place where NORMAL_CTFCONVERT is used instead (fist I have to search for it again... not today)? It would make it consistent with all other places (SYSTEM_CTFCONVERT and the plain test and use of CTFxxx). Bye, Alexander. -- http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 When the doubt vanishes and the issue becomes evident, stupidity reigns. -- Poul Henningsen [1894-1967] ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206184 - head/share/misc
Author: jacula (ports committer) Date: Mon Apr 5 17:26:23 2010 New Revision: 206184 URL: http://svn.freebsd.org/changeset/base/206184 Log: First steps as committer: - add an entry for myself to committers-ports.dot Approved by:pgj (mentor) Modified: head/share/misc/committers-ports.dot Modified: head/share/misc/committers-ports.dot == --- head/share/misc/committers-ports.dotMon Apr 5 16:11:42 2010 (r206183) +++ head/share/misc/committers-ports.dotMon Apr 5 17:26:23 2010 (r206184) @@ -86,6 +86,7 @@ glewis [label=Greg lewis\ngle...@freebs hq [label=Herve quiroz\...@freebsd.org\n2004/08/05] ijliao [label=Ying-Chieh liao\nijl...@freebsd.org\n2001/01/20] itetcu [label=Ion-Mihai tetcu\nite...@freebsd.org\n2006/06/07] +jacula [label=Giuseppe pilichi\njac...@freebsd.org\n2010/04/05] jadawin [label=Philippe audeoud\njada...@freebsd.org\n2008/03/02] jkim [label=Jung-uk kim\nj...@freebsd.org\n2007/09/12] jmelo [label=Jean Milanez melo\njm...@freebsd.org\n2006/03/31] @@ -316,6 +317,8 @@ pav - josef pav - kwm pav - mnag +pgj - jacula + philip - koitsu rafan - chinsan @@ -341,6 +344,7 @@ steve - netchild tabthorpe - avilla tabthorpe - avl +tabthorpe - jacula tabthorpe - jadawin tabthorpe - pgj ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206199 - head/cddl/contrib/opensolaris/lib/libzfs/common
Author: delphij Date: Mon Apr 5 18:27:58 2010 New Revision: 206199 URL: http://svn.freebsd.org/changeset/base/206199 Log: Refine previous partial merge of OpenSolaris onnv revision 9396:f41cf682d0d3. This fixes a regression that zfs list would crash on zfs having user properties. PR: kern/145377 Submitted by: mm Approved by: pjd Obtained from:OpenSolaris MFC after:10 days Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Modified: head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c == --- head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.cMon Apr 5 18:25:30 2010(r206198) +++ head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.cMon Apr 5 18:27:58 2010(r206199) @@ -4288,7 +4288,12 @@ zfs_prune_proplist(zfs_handle_t *zhp, ui zfs_prop_t zfs_prop = zfs_name_to_prop(nvpair_name(curr)); nvpair_t *next = nvlist_next_nvpair(zhp-zfs_props, curr); - if (props[zfs_prop] == B_FALSE) + /* +* We leave user:props in the nvlist, so there will be +* some ZPROP_INVAL. To be extra safe, don't prune +* those. +*/ + if (zfs_prop != ZPROP_INVAL props[zfs_prop] == B_FALSE) (void) nvlist_remove(zhp-zfs_props, nvpair_name(curr), nvpair_type(curr)); curr = next; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206210 - head/sys/fs/coda
Author: rwatson
Date: Mon Apr 5 20:12:54 2010
New Revision: 206210
URL: http://svn.freebsd.org/changeset/base/206210
Log:
Synchronize Coda kernel module definitions in our coda.h to Coda 6's
coda.h:
- CodaFid typdef - struct CodaFid throughout.
- Use unsigned int instead of unsigned long for venus_dirent and other
cosmetic fixes.
- Introduce cuid_t and cgid_t and use instead of uid_t and gid_t in RPCs.
- Synchronize comments and macros.
- Use u_int32_t instead of unsigned long for coda_out_hdr.
With these changes, a 64-bit Coda kernel module now works with
coda6_client, whereas previous userspace and kernel versions of RPCs
differed sufficiently to prevent using the file system. This has been
verified only with casual testing, but /coda is now usable for at least
basic operations on amd64.
MFC after:1 week
Modified:
head/sys/fs/coda/cnode.h
head/sys/fs/coda/coda.h
head/sys/fs/coda/coda_subr.c
head/sys/fs/coda/coda_subr.h
head/sys/fs/coda/coda_venus.c
head/sys/fs/coda/coda_venus.h
head/sys/fs/coda/coda_vfsops.c
head/sys/fs/coda/coda_vfsops.h
head/sys/fs/coda/coda_vnops.c
Modified: head/sys/fs/coda/cnode.h
==
--- head/sys/fs/coda/cnode.hMon Apr 5 20:01:21 2010(r206209)
+++ head/sys/fs/coda/cnode.hMon Apr 5 20:12:54 2010(r206210)
@@ -94,7 +94,7 @@ extern int coda_vfsop_print_entry;
struct cnode {
struct vnode*c_vnode;
u_short c_flags; /* flags (see below) */
- CodaFid c_fid; /* file handle */
+ struct CodaFid c_fid; /* file handle */
struct vnode*c_ovp; /* open vnode pointer */
u_short c_ocount; /* count of openers */
u_short c_owrite; /* count of open for write */
@@ -196,7 +196,8 @@ voidcoda_unmounting(struct mount *whoIa
intcoda_vmflush(struct cnode *cp);
/* cfs_vnodeops.h */
-struct cnode *make_coda_node(CodaFid *fid, struct mount *vfsp, short type);
+struct cnode *make_coda_node(struct CodaFid *fid, struct mount *vfsp,
+short type);
int coda_vnodeopstats_init(void);
/* sigh */
Modified: head/sys/fs/coda/coda.h
==
--- head/sys/fs/coda/coda.h Mon Apr 5 20:01:21 2010(r206209)
+++ head/sys/fs/coda/coda.h Mon Apr 5 20:12:54 2010(r206210)
@@ -103,6 +103,8 @@ struct timespec {
};
#endif
+typedef u_int32_t cuid_t;
+typedef u_int32_t cgid_t;
/*
* Cfs constants
@@ -132,14 +134,13 @@ struct timespec {
#define C_A_F_OK0 /* Test for existence. */
-
#ifndef _VENUS_DIRENT_T_
#define _VENUS_DIRENT_T_ 1
struct venus_dirent {
-unsigned long d_fileno; /* file number of entry */
+unsigned int d_fileno; /* file number of entry */
unsigned short d_reclen; /* length of this record */
-char d_type; /* file type, see below */
-char d_namlen; /* length of string in d_name */
+unsigned char d_type; /* file type, see below */
+unsigned char d_namlen; /* length of string in d_name */
char d_name[CODA_MAXNAMLEN + 1];/* name must be no longer
than this */
};
#undef DIRSIZ
@@ -169,19 +170,19 @@ struct venus_dirent {
#ifdef CODA_COMPAT_5
-typedef struct {
+struct CodaFid {
u_long Volume;
u_long Vnode;
u_long Unique;
-} CodaFid;
+};
-static __inline__ ino_t coda_f2i(CodaFid *fid)
+static __inline__ ino_t coda_f2i(struct CodaFid *fid)
{
if (!fid) return 0;
return (fid-Unique + (fid-Vnode10) + (fid-Volume20));
}
-static __inline__ char * coda_f2s(CodaFid *fid)
+static __inline__ char * coda_f2s(struct CodaFid *fid)
{
static char fid_str [35];
snprintf (fid_str, 35, [%lx.%lx.%lx], fid-Volume,
@@ -189,7 +190,7 @@ static __inline__ char * coda_f2s(CodaFi
return fid_str;
}
-static __inline__ int coda_fid_eq (CodaFid *fid1, CodaFid *fid2)
+static __inline__ int coda_fid_eq (struct CodaFid *fid1, struct CodaFid *fid2)
{
return (fid1-Volume == fid2-Volume
fid1-Vnode == fid2-Vnode
@@ -203,18 +204,18 @@ struct coda_cred {
#else /* CODA_COMPAT_5 */
-typedef struct {
+struct CodaFid {
u_int32_t opaque[4];
-} CodaFid;
+};
-static __inline__ ino_t coda_f2i(CodaFid *fid)
+static __inline__ ino_t coda_f2i(struct CodaFid *fid)
{
if ( ! fid )
return 0;
return (fid-opaque[3] ^ (fid-opaque[2]10) ^ (fid-opaque[1]20) ^
fid-opaque[0]);
}
-static __inline__ char * coda_f2s(CodaFid *fid)
+static __inline__ char * coda_f2s(struct CodaFid *fid)
{
static char fid_str [35];
snprintf (fid_str, 35, [%x.%x.%x.%x], fid-opaque[0],
@@ -222,7
svn commit: r206217 - head/lib/libc/stdio
Author: obrien
Date: Mon Apr 5 22:09:29 2010
New Revision: 206217
URL: http://svn.freebsd.org/changeset/base/206217
Log:
I feel this wording of the history is more clear.
ANSIfy vasprintf() while I'm here.
Modified:
head/lib/libc/stdio/printf.3
head/lib/libc/stdio/vasprintf.c
Modified: head/lib/libc/stdio/printf.3
==
--- head/lib/libc/stdio/printf.3Mon Apr 5 22:08:52 2010
(r206216)
+++ head/lib/libc/stdio/printf.3Mon Apr 5 22:09:29 2010
(r206217)
@@ -891,9 +891,9 @@ in
.Fx 2.2 ,
but were later replaced with a different implementation
from
-.An Todd C. Miller Aq todd.mil...@courtesan.com
-for
-.Ox 2.3 .
+.Ox 2.3
+by
+.An Todd C. Miller Aq todd.mil...@courtesan.com .
The
.Fn dprintf
and
Modified: head/lib/libc/stdio/vasprintf.c
==
--- head/lib/libc/stdio/vasprintf.c Mon Apr 5 22:08:52 2010
(r206216)
+++ head/lib/libc/stdio/vasprintf.c Mon Apr 5 22:09:29 2010
(r206217)
@@ -36,16 +36,13 @@ __FBSDID($FreeBSD$);
#include local.h
int
-vasprintf(str, fmt, ap)
- char **str;
- const char *fmt;
- __va_list ap;
+vasprintf(char **str, const char *fmt, __va_list ap)
{
- int ret;
FILE f = FAKE_FILE;
+ int ret;
f._flags = __SWR | __SSTR | __SALC;
- f._bf._base = f._p = (unsigned char *)malloc(128);
+ f._bf._base = f._p = malloc(128);
if (f._bf._base == NULL) {
*str = NULL;
errno = ENOMEM;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206219 - head/contrib/tzdata
Author: edwin Date: Mon Apr 5 22:15:06 2010 New Revision: 206219 URL: http://svn.freebsd.org/changeset/base/206219 Log: MFV of tzdata2010h: From tzdata2010h: - Tunis will not go into DST this year. - Pakistan will not go into DST this year. From tzdata2010g: - Bangladesh cancels DST. - Palestine goes into DST one day later than expected. - Russian timezones update: Europe/Samara goes to Moscow time. Asia/Kamchatka goes to Moscow+8 time. Asia/Anadyr goes to Moscow+8 time. Modified: head/contrib/tzdata/asia head/contrib/tzdata/europe head/contrib/tzdata/zone.tab Directory Properties: head/contrib/tzdata/ (props changed) Modified: head/contrib/tzdata/asia == --- head/contrib/tzdata/asiaMon Apr 5 22:10:24 2010(r206218) +++ head/contrib/tzdata/asiaMon Apr 5 22:15:06 2010(r206219) @@ -1,4 +1,4 @@ -# @(#)asia 8.56 +# @(#)asia 8.58 # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. @@ -214,42 +214,20 @@ Zone Asia/Bahrain3:22:20 - LMT 1920 # # 2010 midnight. The decision came at a cabinet meeting at the Prime # Minister's Office last night... -# From Danvin Ruangchan (2009-12-24): -# ...the news mentions DST will be turned off again 7 months after March -# 31st on Oct 31, 2010. - -# From Arthur David Olson (2009-12-26): -# Indeed, The government will advance again the Banglasdesh Standard -# Time by one one hour on March 31 next year by enforcing the Daylight -# Saving Time (DST) for seven months. It will continue till October 31 -# until further notice. I take that last sentence as the -# establishment of a rule. - -# From Nobutomo Nakano (2010-02-19): -# We received a report from Bangladesh saying that the start/end of -# Bangladesh DST is incorrect. Currently we have only the Bengali version -# of the official mail from BTRC which describes the following: -# -# From 2010 each year when local standard time is about to reach -# March 31 at 10:59:00 PM clocks are turned forward 1 hour (11:59:00 PM) -# and when local daylight time is about to October 31 at 11:59:00 PM -# clocks are turned backward 1 hour (10:59:00 PM). -# -# So, DST will start/end 1 minute earlier. - -# From Arthur David Olson (2010-03-03): -# The file -# a href=http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf -# http://www.cabinet.gov/bd/file_upload/news_events/en_169.pdf +# From Alexander Krivenyshev (2010-03-22): +# According to Bangladesh newspaper The Daily Star, +# Cabinet cancels Daylight Saving Time +# a href=http://www.thedailystar.net/newDesign/latest_news.php?nid=22817; +# http://www.thedailystar.net/newDesign/latest_news.php?nid=22817 +# /a +# or +# a href=http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html; +# http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html # /a -# is in Bengali; it does contain two 31s as well as two 11.59s and a 10.59 -# which is consistent with the information provided by Nobutomo Nakano. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule Dhaka 2009only- Jun 19 23:00 1:00S Rule Dhaka 2009only- Dec 31 23:59 0 - -Rule Dhaka 2010max - Mar 31 22:59 1:00S -Rule Dhaka 2010max - Oct 31 23:59 0 - # Zone NAMEGMTOFF RULES FORMAT [UNTIL] Zone Asia/Dhaka 6:01:40 - LMT 1890 @@ -2129,6 +2107,32 @@ Zone Asia/Karachi4:28:12 - LMT 1907 # http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html # /a +# From Alexander Krivenyshev (2010-03-19): +# According to Voice of Palestine DST will last for 191 days, from March +# 26, 2010 till the last Sunday before the tenth day of Tishri +# (October), each year (October 03, 2010?) +# +# a href=http://palvoice.org/forums/showthread.php?t=245697; +# http://palvoice.org/forums/showthread.php?t=245697 +# /a +# (in Arabic) +# or +# a href=http://www.worldtimezone.com/dst_news/dst_news_westbank03.html; +# http://www.worldtimezone.com/dst_news/dst_news_westbank03.html +# /a + +# From Steffen Thorsen (2010-03-24): +# ...Ma'an News Agency reports that Hamas cabinet has decided it will +# start one day later, at 12:01am. Not sure if they really mean 12:01am or +# noon though: +# +# a href=http://www.maannews.net/eng/ViewDetails.aspx?ID=271178; +# http://www.maannews.net/eng/ViewDetails.aspx?ID=271178 +# /a +# (Ma'an News Agency) +# At 12:01am Friday, clocks in Israel and the West Bank will change to +# 1:01am, while Gaza clocks will change at 12:01am Saturday morning. + # The rules for Egypt are stolen from the `africa' file. # Rule NAMEFROMTO TYPEIN ON AT SAVELETTER/S Rule EgyptAsia 1957only- May 10 0:001:00S
svn commit: r206236 - head/sys/fs/nfsserver
Author: rmacklem
Date: Tue Apr 6 01:14:49 2010
New Revision: 206236
URL: http://svn.freebsd.org/changeset/base/206236
Log:
Harden the experimental NFS server a little, by adding range
checks on the length of the client's open/lock owner name. Also,
add free()'s for one case where they were missing and would
have caused a leak if NFSERR_BADXDR had been replied. Probably
never happens, but the leak is now plugged, just in case.
MFC after:2 weeks
Modified:
head/sys/fs/nfsserver/nfs_nfsdserv.c
Modified: head/sys/fs/nfsserver/nfs_nfsdserv.c
==
--- head/sys/fs/nfsserver/nfs_nfsdserv.cTue Apr 6 01:13:29 2010
(r206235)
+++ head/sys/fs/nfsserver/nfs_nfsdserv.cTue Apr 6 01:14:49 2010
(r206236)
@@ -2086,6 +2086,10 @@ nfsrvd_lock(struct nfsrv_descript *nd, _
if (flags NFSLCK_OPENTOLOCK) {
NFSM_DISSECT(tl, u_int32_t *, 5 * NFSX_UNSIGNED + NFSX_STATEID);
i = fxdr_unsigned(int, *(tl+4+(NFSX_STATEID / NFSX_UNSIGNED)));
+ if (i = 0 || i NFSV4_OPAQUELIMIT) {
+ nd-nd_repstat = NFSERR_BADXDR;
+ goto nfsmout;
+ }
MALLOC(stp, struct nfsstate *, sizeof (struct nfsstate) + i,
M_NFSDSTATE, M_WAITOK);
stp-ls_ownerlen = i;
@@ -2229,6 +2233,10 @@ nfsrvd_lockt(struct nfsrv_descript *nd,
NFSM_DISSECT(tl, u_int32_t *, 8 * NFSX_UNSIGNED);
i = fxdr_unsigned(int, *(tl + 7));
+ if (i = 0 || i NFSV4_OPAQUELIMIT) {
+ nd-nd_repstat = NFSERR_BADXDR;
+ goto nfsmout;
+ }
MALLOC(stp, struct nfsstate *, sizeof (struct nfsstate) + i,
M_NFSDSTATE, M_WAITOK);
stp-ls_ownerlen = i;
@@ -2350,6 +2358,8 @@ nfsrvd_locku(struct nfsrv_descript *nd,
break;
default:
nd-nd_repstat = NFSERR_BADXDR;
+ free(stp, M_NFSDSTATE);
+ free(lop, M_NFSDLOCK);
goto nfsmout;
};
stp-ls_ownerlen = 0;
@@ -2439,6 +2449,14 @@ nfsrvd_open(struct nfsrv_descript *nd, _
named.ni_cnd.cn_nameiop = 0;
NFSM_DISSECT(tl, u_int32_t *, 6 * NFSX_UNSIGNED);
i = fxdr_unsigned(int, *(tl + 5));
+ if (i = 0 || i NFSV4_OPAQUELIMIT) {
+ nd-nd_repstat = NFSERR_BADXDR;
+ vrele(dp);
+#ifdef NFS4_ACL_EXTATTR_NAME
+ acl_free(aclp);
+#endif
+ return (0);
+ }
MALLOC(stp, struct nfsstate *, sizeof (struct nfsstate) + i,
M_NFSDSTATE, M_WAITOK);
stp-ls_ownerlen = i;
@@ -3391,6 +3409,10 @@ nfsrvd_releaselckown(struct nfsrv_descri
}
NFSM_DISSECT(tl, u_int32_t *, 3 * NFSX_UNSIGNED);
len = fxdr_unsigned(int, *(tl + 2));
+ if (len = 0 || len NFSV4_OPAQUELIMIT) {
+ nd-nd_repstat = NFSERR_BADXDR;
+ return (0);
+ }
MALLOC(stp, struct nfsstate *, sizeof (struct nfsstate) + len,
M_NFSDSTATE, M_WAITOK);
stp-ls_ownerlen = len;
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206241 - head/usr.bin/make
Author: imp
Date: Tue Apr 6 02:48:59 2010
New Revision: 206241
URL: http://svn.freebsd.org/changeset/base/206241
Log:
Remove yet another vestage of alpha support.
Modified:
head/usr.bin/make/main.c
Modified: head/usr.bin/make/main.c
==
--- head/usr.bin/make/main.cTue Apr 6 01:42:21 2010(r206240)
+++ head/usr.bin/make/main.cTue Apr 6 02:48:59 2010(r206241)
@@ -983,8 +983,6 @@ main(int argc, char **argv)
if ((machine_cpu = getenv(MACHINE_CPU)) == NULL) {
if (!strcmp(machine_arch, i386))
machine_cpu = i386;
- else if (!strcmp(machine_arch, alpha))
- machine_cpu = ev4;
else
machine_cpu = unknown;
}
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r206248 - head/etc
Author: dougb
Date: Tue Apr 6 05:20:46 2010
New Revision: 206248
URL: http://svn.freebsd.org/changeset/base/206248
Log:
In wait_for_pids(), pwait(1) can return when the process exits, but
still exists as a zombie. The 'kill -0' test in this function can
therefore return true even if the process isn't actually running.
This could lead to wait_for_pids() printing an endless string of the
pid number until the zombie finally exits.
Solve this problem by moving the sleep up to after the 'kill -0' test, but
only after we've run through the function once already. In the common case
(only one pid in the list) this will always do the right thing. On the rare
occasion that there is more than one pid in the list this will sleep 1
second per zombie process which will allow that process, and any other
in the list a chance to exit.
While I'm here, local'ize the variables that this function uses.
Modified:
head/etc/rc.subr
Modified: head/etc/rc.subr
==
--- head/etc/rc.subrTue Apr 6 05:13:04 2010(r206247)
+++ head/etc/rc.subrTue Apr 6 05:20:46 2010(r206248)
@@ -355,6 +355,8 @@ _find_processes()
#
wait_for_pids()
{
+ local _list _prefix _nlist _j
+
_list=$@
if [ -z $_list ]; then
return
@@ -365,6 +367,7 @@ wait_for_pids()
for _j in $_list; do
if kill -0 $_j 2/dev/null; then
_nlist=${_nlist}${_nlist:+ }$_j
+ [ -n $_prefix ] sleep 1
fi
done
if [ -z $_nlist ]; then
@@ -373,7 +376,7 @@ wait_for_pids()
_list=$_nlist
echo -n ${_prefix:-Waiting for PIDS: }$_list
_prefix=,
- pwait $_list 2/dev/null || sleep 2
+ pwait $_list 2/dev/null
done
if [ -n $_prefix ]; then
echo .
___
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
