Re: svn commit: r254286 - head/sys/fs/ext2fs
On Aug 13, 2013, at 20:39, Pedro F. Giffuni wrote: > Author: pfg > Date: Tue Aug 13 18:39:36 2013 > New Revision: 254286 > URL: http://svnweb.freebsd.org/changeset/base/254286 > > Log: > ext2fs: update format specifiers for ext4 type. > > Reported by: Sam Fourman Jr. > MFC after: 3 weeks > > Modified: > head/sys/fs/ext2fs/ext2_subr.c > > Modified: head/sys/fs/ext2fs/ext2_subr.c > == > --- head/sys/fs/ext2fs/ext2_subr.cTue Aug 13 18:14:53 2013 > (r254285) > +++ head/sys/fs/ext2fs/ext2_subr.cTue Aug 13 18:39:36 2013 > (r254286) > @@ -150,7 +150,7 @@ ext2_checkoverlap(struct buf *bp, struct > ep->b_blkno + btodb(ep->b_bcount) <= start) > continue; > vprint("Disk overlap", vp); > - (void)printf("\tstart %d, end %d overlap start %lld, end %ld\n", > + (void)printf("\tstart %ld, end %ld overlap start %lld, end > %ld\n", > start, last, (long long)ep->b_blkno, > (long)(ep->b_blkno + btodb(ep->b_bcount) - 1)); > panic("Disk buffer overlap"); This still fails on arches where int64_t is aliased to long long (basically, the 32-bit arches). Since using PRId64 is apparently frowned upon, the easiest solution is to cast the 'start' and 'last' variables to long long, and print them using %lld. -Dimitry ___ 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: r254286 - head/sys/fs/ext2fs
On Wed, Aug 14, 2013 at 12:11 AM, Dimitry Andric wrote: > This still fails on arches where int64_t is aliased to long long > (basically, the 32-bit arches). Since using PRId64 is apparently > frowned upon, the easiest solution is to cast the 'start' and 'last' > variables to long long, and print them using %lld. > That can't be the easiest solution, it's not even that easy :) It seems like intmax_t or uintmax_t as appropriate and cast to %jd or %ju respectively would be better. Juli. ___ 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: r254286 - head/sys/fs/ext2fs
On Aug 14, 2013, at 09:14, Juli Mallett wrote: > On Wed, Aug 14, 2013 at 12:11 AM, Dimitry Andric wrote: > This still fails on arches where int64_t is aliased to long long > (basically, the 32-bit arches). Since using PRId64 is apparently > frowned upon, the easiest solution is to cast the 'start' and 'last' > variables to long long, and print them using %lld. > > That can't be the easiest solution, it's not even that easy :) It seems like > intmax_t or uintmax_t as appropriate and cast to %jd or %ju respectively > would be better. I was simply looking at the surrounding code, and that already casts several items to long long. So I wanted to keep the style there. :-) -Dimitry ___ 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: r254319 - head/sys/modules/dtrace/sdt
Author: uqs Date: Wed Aug 14 08:03:57 2013 New Revision: 254319 URL: http://svnweb.freebsd.org/changeset/base/254319 Log: Fix make depend Modified: head/sys/modules/dtrace/sdt/Makefile Modified: head/sys/modules/dtrace/sdt/Makefile == --- head/sys/modules/dtrace/sdt/MakefileWed Aug 14 06:36:32 2013 (r254318) +++ head/sys/modules/dtrace/sdt/MakefileWed Aug 14 08:03:57 2013 (r254319) @@ -4,7 +4,7 @@ KMOD= sdt SRCS= sdt.c -SRCS+= vnode_if.h +SRCS+= vnode_if.h opt_kdtrace.h CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris \ -I${.CURDIR}/../../../cddl/contrib/opensolaris/uts/common \ ___ 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: r254320 - head/usr.bin/calendar/calendars
Author: uqs Date: Wed Aug 14 08:10:54 2013 New Revision: 254320 URL: http://svnweb.freebsd.org/changeset/base/254320 Log: Belatedly add my birthday and fix a typo. Modified: head/usr.bin/calendar/calendars/calendar.freebsd Modified: head/usr.bin/calendar/calendars/calendar.freebsd == --- head/usr.bin/calendar/calendars/calendar.freebsdWed Aug 14 08:03:57 2013(r254319) +++ head/usr.bin/calendar/calendars/calendar.freebsdWed Aug 14 08:10:54 2013(r254320) @@ -152,6 +152,7 @@ 05/10 Markus Brueffer born in Gronau, Nordrhein-Westfalen, Germany, 1977 05/11 Jesus Rodriguez born in Barcelona, Spain, 1972 05/11 Roman Kurakin born in Moscow, USSR, 1979 +05/11 Ulrich Spoerlein born in Schesslitz, Bayern, Germany, 1981 05/13 Pete Fritchman born in Lansdale, Pennsylvania, United States, 1983 05/14 Tatsumi Hosokawa born in Tokyo, Japan, 1968 05/14 Shigeyuku Fukushima born in Osaka, Japan, 1974 @@ -194,7 +195,7 @@ 06/07 Jimmy Olgeni born in Milano, Italy, 1976 06/07 Benjamin Close born in Adelaide, Australia, 1978 06/14 Josh Paetzel born in Minneapolis, Minnesota, United States, 1973 -06/17 Tilman Linneweh born in Weinheim, Baden-Wuertemberg, Germany, 1978 +06/17 Tilman Linneweh born in Weinheim, Baden-Wuerttemberg, Germany, 1978 06/18 Li-Wen Hsu born in Taipei, Taiwan, Republic of China, 1984 06/18 Roman Bogorodskiy born in Saratov, Russian Federation, 1986 06/19 Charlie Root born in Portland, Oregon, United States, 1993 ___ 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: r253802 - head/contrib/llvm/tools/clang/lib/Headers
On 13 Aug 2013, at 21:57, Jilles Tjoelker wrote: > Given that JIT is for performance and larger addresses increase code > size and register pressure, the mmap() flag is probably useful. > Alternatively, all the JITted code could be placed in one block and use > relative addressing. This would be a good thing to have in for 10.0, as the LLVM 3.4 JIT will require it unless someone wants to contribute support for the large code model... David ___ 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: r254286 - head/sys/fs/ext2fs
On Wed, 14 Aug 2013, Dimitry Andric wrote: On Aug 13, 2013, at 20:39, Pedro F. Giffuni wrote: Log: ext2fs: update format specifiers for ext4 type. This is still quite broken. Modified: head/sys/fs/ext2fs/ext2_subr.c == --- head/sys/fs/ext2fs/ext2_subr.c Tue Aug 13 18:14:53 2013 (r254285) +++ head/sys/fs/ext2fs/ext2_subr.c Tue Aug 13 18:39:36 2013 (r254286) @@ -150,7 +150,7 @@ ext2_checkoverlap(struct buf *bp, struct ep->b_blkno + btodb(ep->b_bcount) <= start) continue; vprint("Disk overlap", vp); - (void)printf("\tstart %d, end %d overlap start %lld, end %ld\n", + (void)printf("\tstart %ld, end %ld overlap start %lld, end %ld\n", start, last, (long long)ep->b_blkno, (long)(ep->b_blkno + btodb(ep->b_bcount) - 1)); panic("Disk buffer overlap"); This still fails on arches where int64_t is aliased to long long (basically, the 32-bit arches). Since using PRId64 is apparently frowned upon, the easiest solution is to cast the 'start' and 'last' variables to long long, and print them using %lld. Gak. Later you said that this is to match the surrounding style. But the surrounding style is bad, and has lots of type errors that become bugs after changes like the recent ones: - (void)'ing printf() is a style bug - the above change breaks the lexical style by blindly expanding the line beyond 80 columns. (void)ing printf() helps give such style bugs by wastin6 6 columns - the continuation indent for the printf() is 8 columns, unlike the KNF continuation indent of 5 columns which is used a few lines earlier - it is nonsense to cast the overlap-starting block numer to a wider type than the overlap-ending block number, since the latter is at least as large. At least after recent changes, the cast to long became a type error on arches with 32-bit longs, since the block number type is now wider. I think it is now 64 bits. I disapprove of any changes to make block number types unsigned. If the block number type was actually changed to uint32_t for ext2, then printing it it using long is still a type error on arches with 32-bit longs. The cast to long is bogus and mainly breaks compile-time detection of the error. - the long long abomination is used. The cast to long long is bogus, but doesn't hide any error provided the block number type remains at most 64 bits signed. - since (apparently) no printf error is detected for the non-overlap start and end, these variables must have type long to match their printf format. But they actually have type e4fs_daddr_r, which is int64_t, at least now. int64_t happens to be the same as long on 64-bit arches. On 32-bit arches, it is very far from matches. So the non-detection of printf format errors from this just shows null testing on 32-bit arches. This function is a sanity check under KDB. Hopefully it is more insane than what it checks. Until recently it used int32_t for start and end. The hard-coded printf format of %d for them only assumed 32-bit ints. The bogus cast to long was defense against an old printf format error in one of the args (the overlap-ending block number) in 2000. Versions before that were broken on 64-bit arches. The bogus cast to long long was defense in 2002 against the expansion of the system-wide block number type daddr_t a little earlier. A previous buggy change changed the out of data format %d to %lld. %d matched daddr_t == int32_t accidentally on all arches. %lld matched daddr_t == int64_t accidentally only on 32-bit arches. It shouldn't take 4 commits per arg to get printf formats right. Bruce ___ 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: r254309 - in head: share/man/man9 sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/dev/dtrace sys/cddl/dev/sdt sys/kern sys/sys
On Tuesday, August 13, 2013 8:42:22 pm Mark Johnston wrote: > Author: markj > Date: Wed Aug 14 00:42:21 2013 > New Revision: 254309 > URL: http://svnweb.freebsd.org/changeset/base/254309 > > Log: > Use kld_{load,unload} instead of mod_{load,unload} for the linker file load > and unload event handlers added in r254266. > > Reported by:jhb > X-MFC with: r254266 Thanks! BTW, it would be really nice to replace HWPMC_HOOKS in kern_linker.c with EVENTHANDLER calls. I think kld_load would just work (though you might need to downgrade the lock before you run it). For kld_unload it seems you want two events, a kld_unload_try for your newly added event (since it can reject a kld_unload), and perhaps kld_unload at the end where the current HWPMC_HOOK is. Just an idea if someone is looking for something to do. I know there are other modules that need to hook into linker events like this, and making HWPMC_HOOKS more generic would be a big help. -- John Baldwin ___ 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: r253802 - head/contrib/llvm/tools/clang/lib/Headers
On Wednesday, August 14, 2013 4:23:11 am David Chisnall wrote: > On 13 Aug 2013, at 21:57, Jilles Tjoelker wrote: > > > Given that JIT is for performance and larger addresses increase code > > size and register pressure, the mmap() flag is probably useful. > > Alternatively, all the JITted code could be placed in one block and use > > relative addressing. > > This would be a good thing to have in for 10.0, as the LLVM 3.4 JIT will > require it unless someone wants to contribute support for the large code > model... So you just need a flag to cap the virtual address at 2GB? Do you think we need an arbitrary address flag for this, or is a hardcoded 2GB flag ok? Linux has a MAP_32BIT that does what you want I think. -- John Baldwin ___ 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: r253802 - head/contrib/llvm/tools/clang/lib/Headers
On 14 Aug 2013, at 13:21, John Baldwin wrote: > On Wednesday, August 14, 2013 4:23:11 am David Chisnall wrote: >> On 13 Aug 2013, at 21:57, Jilles Tjoelker wrote: >> >>> Given that JIT is for performance and larger addresses increase code >>> size and register pressure, the mmap() flag is probably useful. >>> Alternatively, all the JITted code could be placed in one block and use >>> relative addressing. >> >> This would be a good thing to have in for 10.0, as the LLVM 3.4 JIT will >> require it unless someone wants to contribute support for the large code >> model... > > So you just need a flag to cap the virtual address at 2GB? Do you think we > need an arbitrary address flag for this, or is a hardcoded 2GB flag ok? > > Linux has a MAP_32BIT that does what you want I think. Yes, MAP_32BIT is used on Linux to solve this. David ___ 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: r254326 - head/sys/fs/ext2fs
Author: pfg Date: Wed Aug 14 14:22:46 2013 New Revision: 254326 URL: http://svnweb.freebsd.org/changeset/base/254326 Log: ext2fs: update format specifiers for ext4 type. Previous bandaid was not appropriate and didn't really work for all platforms. While here, cleanup the surrounding code to match ffs_checkoverlap() Reported by: dim, jmallet and bde MFC after:3 weeks Modified: head/sys/fs/ext2fs/ext2_subr.c Modified: head/sys/fs/ext2fs/ext2_subr.c == --- head/sys/fs/ext2fs/ext2_subr.c Wed Aug 14 12:43:01 2013 (r254325) +++ head/sys/fs/ext2fs/ext2_subr.c Wed Aug 14 14:22:46 2013 (r254326) @@ -150,10 +150,10 @@ ext2_checkoverlap(struct buf *bp, struct ep->b_blkno + btodb(ep->b_bcount) <= start) continue; vprint("Disk overlap", vp); - (void)printf("\tstart %ld, end %ld overlap start %lld, end %ld\n", - start, last, (long long)ep->b_blkno, - (long)(ep->b_blkno + btodb(ep->b_bcount) - 1)); - panic("Disk buffer overlap"); + printf("\tstart %jd, end %jd overlap start %jd, end %jd\n", + (intmax_t)start, (intmax_t)last, (intmax_t)ep->b_blkno, + (intmax_t)(ep->b_blkno + btodb(ep->b_bcount) - 1)); + panic("ext2_checkoverlap: Disk buffer overlap"); } } #endif /* KDB */ ___ 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: r254327 - head/usr.bin/dtc
Author: theraven Date: Wed Aug 14 14:34:02 2013 New Revision: 254327 URL: http://svnweb.freebsd.org/changeset/base/254327 Log: Make carets line up in dtc diagnostics if the line starts with a tab. Modified: head/usr.bin/dtc/input_buffer.cc Modified: head/usr.bin/dtc/input_buffer.cc == --- head/usr.bin/dtc/input_buffer.ccWed Aug 14 14:22:46 2013 (r254326) +++ head/usr.bin/dtc/input_buffer.ccWed Aug 14 14:34:02 2013 (r254327) @@ -216,7 +216,8 @@ input_buffer::parse_error(const char *ms putc('\n', stderr); for (int i=0 ; i<(cursor-line_start) ; ++i) { - putc(' ', stderr); + char c = (buffer[i+line_start] == '\t') ? '\t' : ' '; + putc(c, stderr); } putc('^', stderr); putc('\n', stderr); ___ 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: r254293 - head/release
On 08/13/13 13:16, Glen Barber wrote: > Author: gjb > Date: Tue Aug 13 20:16:14 2013 > New Revision: 254293 > URL: http://svnweb.freebsd.org/changeset/base/254293 > > Log: > - Only set ARCH_FLAGS (TARGET/TARGET_ARCH) if specified, otherwise > allow the toolchain to detect the correct values. > > - Remove {SRC,DOC,PORT}REVISION variables, and use 'branch@rNN' > as the {SRC,DOC,PORT}BRANCH variables. > > - Only set default KERNEL_FLAGS and WORLD_FLAGS make(1) jobs if the > number of CPUs is greater than 1. > Could you update the "Clean Release Generation" section of release(7) as you make changes like this? -Nathan ___ 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: r254293 - head/release
On Wed, Aug 14, 2013 at 07:38:02AM -0700, Nathan Whitehorn wrote: > On 08/13/13 13:16, Glen Barber wrote: > > Author: gjb > > Date: Tue Aug 13 20:16:14 2013 > > New Revision: 254293 > > URL: http://svnweb.freebsd.org/changeset/base/254293 > > > > Log: > > - Only set ARCH_FLAGS (TARGET/TARGET_ARCH) if specified, otherwise > > allow the toolchain to detect the correct values. > > > > - Remove {SRC,DOC,PORT}REVISION variables, and use 'branch@rNN' > > as the {SRC,DOC,PORT}BRANCH variables. > > > > - Only set default KERNEL_FLAGS and WORLD_FLAGS make(1) jobs if the > > number of CPUs is greater than 1. > > > > Could you update the "Clean Release Generation" section of release(7) as > you make changes like this? Oops, I forgot to remove the *REVISION entries. Thanks. Glen pgpGayqMCwJBN.pgp Description: PGP signature
svn commit: r254328 - head/share/man/man7
Author: gjb Date: Wed Aug 14 14:45:47 2013 New Revision: 254328 URL: http://svnweb.freebsd.org/changeset/base/254328 Log: Remove the {SRC,DOC,PORT}REVISION variables from release(7), and update the default {SRC,DOC,PORT}BRANCH defaults. Submitted by: nwhitehorn X-MFC-With: r254224, r254294 X-MFC-To: stable/9, releng/9.2 Modified: head/share/man/man7/release.7 Modified: head/share/man/man7/release.7 == --- head/share/man/man7/release.7 Wed Aug 14 14:34:02 2013 (r254327) +++ head/share/man/man7/release.7 Wed Aug 14 14:45:47 2013 (r254328) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 13, 2013 +.Dd August 14, 2013 .Dt RELEASE 7 .Os .Sh NAME @@ -149,34 +149,19 @@ The .Li src/ branch to use. Defaults to -.Va head/ . +.Va head/@rHEAD . .It Va DOCBRANCH The .Li doc/ branch to use. Defaults to -.Va head/ . +.Va head/@rHEAD . .It Va PORTBRANCH The .Li ports/ branch to use. Defaults to -.Va head/ . -.It Va SRCREVISION -The revision of the -.Li src/ -tree to use. -Defaults to the current top of tree revision. -.It Va DOCREVISION -The revision of the -.Li doc/ -tree to use. -Defaults to the current top of tree revision. -.It Va PORTREVISION -The revision of the -.Li ports/ -tree to use. -Defaults to the current top of tree revision. +.Va head/@rHEAD . .It Va TARGET The target machine type for cross-building a release. .It Va TARGET_ARCH ___ 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: r254293 - head/release
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 08/14/13 07:42, Glen Barber wrote: > On Wed, Aug 14, 2013 at 07:38:02AM -0700, Nathan Whitehorn wrote: >> On 08/13/13 13:16, Glen Barber wrote: >>> Author: gjb >>> Date: Tue Aug 13 20:16:14 2013 >>> New Revision: 254293 >>> URL: http://svnweb.freebsd.org/changeset/base/254293 >>> >>> Log: >>> - Only set ARCH_FLAGS (TARGET/TARGET_ARCH) if specified, otherwise >>> allow the toolchain to detect the correct values. >>> >>> - Remove {SRC,DOC,PORT}REVISION variables, and use 'branch@rNN' >>> as the {SRC,DOC,PORT}BRANCH variables. >>> >>> - Only set default KERNEL_FLAGS and WORLD_FLAGS make(1) jobs if the >>> number of CPUs is greater than 1. >>> >> >> Could you update the "Clean Release Generation" section of release(7) as >> you make changes like this? > > Oops, I forgot to remove the *REVISION entries. Thanks. > > Glen > Thanks! - -Nathan -BEGIN PGP SIGNATURE- Version: GnuPG v2.0.20 (FreeBSD) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlILmTkACgkQhRNblvwRglj2uACeNC1hui65qC1siJUnqNItNrLi SR8AnijIk10l+stMqJhGMN9MyZmbxFVA =RUpk -END PGP SIGNATURE- ___ 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: r254329 - in head/sys/cam: ata scsi
Author: smh Date: Wed Aug 14 15:18:28 2013 New Revision: 254329 URL: http://svnweb.freebsd.org/changeset/base/254329 Log: Added 4K quirks for:- * OCZ Agility 2 SSDs * Marvell SSDs * Intel X25-M Series SSDs Modified: head/sys/cam/ata/ata_da.c head/sys/cam/scsi/scsi_da.c Modified: head/sys/cam/ata/ata_da.c == --- head/sys/cam/ata/ata_da.c Wed Aug 14 14:45:47 2013(r254328) +++ head/sys/cam/ata/ata_da.c Wed Aug 14 15:18:28 2013(r254329) @@ -349,6 +349,14 @@ static struct ada_quirk_entry ada_quirk_ }, { /* +* Intel X25-M Series SSDs +* 4k optimised & trim only works in 4k requests + 4k aligned +*/ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "INTEL SSDSA2M*", "*" }, + /*quirks*/ADA_Q_4K + }, + { + /* * Kingston E100 Series SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ @@ -365,6 +373,22 @@ static struct ada_quirk_entry ada_quirk_ }, { /* +* Marvell SSDs (entry taken from OpenSolaris) +* 4k optimised & trim only works in 4k requests + 4k aligned +*/ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "MARVELL SD88SA02*", "*" }, + /*quirks*/ADA_Q_4K + }, + { + /* +* OCZ Agility 2 SSDs +* 4k optimised & trim only works in 4k requests + 4k aligned +*/ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ-AGILITY2*", "*" }, + /*quirks*/ADA_Q_4K + }, + { + /* * OCZ Agility 3 SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ Modified: head/sys/cam/scsi/scsi_da.c == --- head/sys/cam/scsi/scsi_da.c Wed Aug 14 14:45:47 2013(r254328) +++ head/sys/cam/scsi/scsi_da.c Wed Aug 14 15:18:28 2013(r254329) @@ -1008,6 +1008,14 @@ static struct da_quirk_entry da_quirk_ta }, { /* +* Intel X25-M Series SSDs +* 4k optimised & trim only works in 4k requests + 4k aligned +*/ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "INTEL SSDSA2M*", "*" }, + /*quirks*/DA_Q_4K + }, + { + /* * Kingston E100 Series SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ @@ -1024,6 +1032,22 @@ static struct da_quirk_entry da_quirk_ta }, { /* +* Marvell SSDs (entry taken from OpenSolaris) +* 4k optimised & trim only works in 4k requests + 4k aligned +*/ + { T_DIRECT, SIP_MEDIA_FIXED, "ATA", "MARVELL SD88SA02*", "*" }, + /*quirks*/DA_Q_4K + }, + { + /* +* OCZ Agility 2 SSDs +* 4k optimised & trim only works in 4k requests + 4k aligned +*/ + { T_DIRECT, SIP_MEDIA_FIXED, "*", "OCZ-AGILITY2*", "*" }, + /*quirks*/DA_Q_4K + }, + { + /* * OCZ Agility 3 SSDs * 4k optimised & trim only works in 4k requests + 4k aligned */ ___ 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: r254330 - head/sys/dev/mfi
Author: sbruno Date: Wed Aug 14 15:50:34 2013 New Revision: 254330 URL: http://svnweb.freebsd.org/changeset/base/254330 Log: If sys/param.h MAXPHYS has been tuned to exceed MFI_MAXPHYS, the mfi(4) real JBOD mode (SYS PD) would fail fairly reliably during I/O. Steal the mfi_disk.c check for this condition (indirectly) when establishing d_maxsize. Reviewed by: ambrisko@ MFC after:4 weeks Sponsored by: Yahoo! Inc. Modified: head/sys/dev/mfi/mfi_syspd.c Modified: head/sys/dev/mfi/mfi_syspd.c == --- head/sys/dev/mfi/mfi_syspd.cWed Aug 14 15:18:28 2013 (r254329) +++ head/sys/dev/mfi/mfi_syspd.cWed Aug 14 15:50:34 2013 (r254330) @@ -126,7 +126,8 @@ mfi_syspd_attach(device_t dev) sectors / (1024 * 1024 / secsize), sectors, sc->pd_id); sc->pd_disk = disk_alloc(); sc->pd_disk->d_drv1 = sc; - sc->pd_disk->d_maxsize = sc->pd_controller->mfi_max_io * secsize; + sc->pd_disk->d_maxsize = min(sc->pd_controller->mfi_max_io * secsize, + (sc->pd_controller->mfi_max_sge - 1) * PAGE_SIZE); sc->pd_disk->d_name = "mfisyspd"; sc->pd_disk->d_open = mfi_syspd_open; sc->pd_disk->d_close = mfi_syspd_close; ___ 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: r254309 - in head: share/man/man9 sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/dev/dtrace sys/cddl/dev/sdt sys/kern sys/sys
On Wed, Aug 14, 2013 at 8:19 AM, John Baldwin wrote: > On Tuesday, August 13, 2013 8:42:22 pm Mark Johnston wrote: > > Author: markj > > Date: Wed Aug 14 00:42:21 2013 > > New Revision: 254309 > > URL: http://svnweb.freebsd.org/changeset/base/254309 > > > > Log: > > Use kld_{load,unload} instead of mod_{load,unload} for the linker file > load > > and unload event handlers added in r254266. > > > > Reported by:jhb > > X-MFC with: r254266 > > Thanks! BTW, it would be really nice to replace HWPMC_HOOKS in > kern_linker.c with > EVENTHANDLER calls. I think kld_load would just work (though you might > need to > downgrade the lock before you run it). For kld_unload it seems you want > two events, > a kld_unload_try for your newly added event (since it can reject a > kld_unload), and > perhaps kld_unload at the end where the current HWPMC_HOOK is. Just an > idea if > someone is looking for something to do. I know there are other modules > that need > to hook into linker events like this, and making HWPMC_HOOKS more generic > would be > a big help. > I will look into doing this. The DTrace SDT kld_load handler will not work properly if the linker lock is downgraded first because of the following code in linker_file_lookup_set(): locked = KLD_LOCK(); if (!locked) KLD_LOCK(); In particular, it checks to see if the kld lock is exclusively held and locks it if not, which obviously causes problems if the thread holds the shared lock. The answer might be to just run the hwpmc handler with the exclusive lock held. Or perhaps we just need a linker_file_lookup_set_locked(), assuming that it's ok to look up a linker set with the shared lock held. -Mark ___ 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: r254335 - in head: bin/sh tools/regression/bin/sh/parser
Author: jilles Date: Wed Aug 14 19:34:13 2013 New Revision: 254335 URL: http://svnweb.freebsd.org/changeset/base/254335 Log: sh: Allow a lone redirection before '|', ';;' or ';&'. Example: http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r254309 - in head: share/man/man9 sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/dev/dtrace sys/cddl/dev/sdt sys/kern sys/sys
On Wednesday, August 14, 2013 2:14:53 pm Mark Johnston wrote: > On Wed, Aug 14, 2013 at 8:19 AM, John Baldwin wrote: > > > On Tuesday, August 13, 2013 8:42:22 pm Mark Johnston wrote: > > > Author: markj > > > Date: Wed Aug 14 00:42:21 2013 > > > New Revision: 254309 > > > URL: http://svnweb.freebsd.org/changeset/base/254309 > > > > > > Log: > > > Use kld_{load,unload} instead of mod_{load,unload} for the linker file > > load > > > and unload event handlers added in r254266. > > > > > > Reported by:jhb > > > X-MFC with: r254266 > > > > Thanks! BTW, it would be really nice to replace HWPMC_HOOKS in > > kern_linker.c with > > EVENTHANDLER calls. I think kld_load would just work (though you might > > need to > > downgrade the lock before you run it). For kld_unload it seems you want > > two events, > > a kld_unload_try for your newly added event (since it can reject a > > kld_unload), and > > perhaps kld_unload at the end where the current HWPMC_HOOK is. Just an > > idea if > > someone is looking for something to do. I know there are other modules > > that need > > to hook into linker events like this, and making HWPMC_HOOKS more generic > > would be > > a big help. > > > > I will look into doing this. The DTrace SDT kld_load handler will not work > properly if the > linker lock is downgraded first because of the following code in > linker_file_lookup_set(): > > locked = KLD_LOCK(); > if (!locked) > KLD_LOCK(); > > In particular, it checks to see if the kld lock is exclusively held and > locks it if not, which > obviously causes problems if the thread holds the shared lock. > > The answer might be to just run the hwpmc handler with the exclusive lock > held. Or perhaps > we just need a linker_file_lookup_set_locked(), assuming that it's ok to > look up a linker set > with the shared lock held. It is probably fine to do a lookup with a shared lock. We could also fix the linker code to only lock if there is not an existing shared or exclusive lock. -- John Baldwin ___ 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: r254309 - in head: share/man/man9 sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/dev/dtrace sys/cddl/dev/sdt sys/kern sys/sys
On Wed, Aug 14, 2013 at 3:48 PM, John Baldwin wrote: > On Wednesday, August 14, 2013 2:14:53 pm Mark Johnston wrote: > > On Wed, Aug 14, 2013 at 8:19 AM, John Baldwin wrote: > > > > > On Tuesday, August 13, 2013 8:42:22 pm Mark Johnston wrote: > > > > Author: markj > > > > Date: Wed Aug 14 00:42:21 2013 > > > > New Revision: 254309 > > > > URL: http://svnweb.freebsd.org/changeset/base/254309 > > > > > > > > Log: > > > > Use kld_{load,unload} instead of mod_{load,unload} for the linker > file > > > load > > > > and unload event handlers added in r254266. > > > > > > > > Reported by:jhb > > > > X-MFC with: r254266 > > > > > > Thanks! BTW, it would be really nice to replace HWPMC_HOOKS in > > > kern_linker.c with > > > EVENTHANDLER calls. I think kld_load would just work (though you might > > > need to > > > downgrade the lock before you run it). For kld_unload it seems you > want > > > two events, > > > a kld_unload_try for your newly added event (since it can reject a > > > kld_unload), and > > > perhaps kld_unload at the end where the current HWPMC_HOOK is. Just an > > > idea if > > > someone is looking for something to do. I know there are other modules > > > that need > > > to hook into linker events like this, and making HWPMC_HOOKS more > generic > > > would be > > > a big help. > > > > > > > I will look into doing this. The DTrace SDT kld_load handler will not > work > > properly if the > > linker lock is downgraded first because of the following code in > > linker_file_lookup_set(): > > > > locked = KLD_LOCK(); > > if (!locked) > > KLD_LOCK(); > > > > In particular, it checks to see if the kld lock is exclusively held and > > locks it if not, which > > obviously causes problems if the thread holds the shared lock. > > > > The answer might be to just run the hwpmc handler with the exclusive lock > > held. Or perhaps > > we just need a linker_file_lookup_set_locked(), assuming that it's ok to > > look up a linker set > > with the shared lock held. > > It is probably fine to do a lookup with a shared lock. We could also fix > the > linker code to only lock if there is not an existing shared or exclusive > lock. > Sorry if I'm being dense, but I thought it wasn't generally possible to determine whether curthread holds a given shared lock. ___ 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: r254309 - in head: share/man/man9 sys/cddl/contrib/opensolaris/uts/common/dtrace sys/cddl/dev/dtrace sys/cddl/dev/sdt sys/kern sys/sys
On Wednesday, August 14, 2013 5:06:06 pm Mark Johnston wrote: > On Wed, Aug 14, 2013 at 3:48 PM, John Baldwin wrote: > > > On Wednesday, August 14, 2013 2:14:53 pm Mark Johnston wrote: > > > On Wed, Aug 14, 2013 at 8:19 AM, John Baldwin wrote: > > > > > > > On Tuesday, August 13, 2013 8:42:22 pm Mark Johnston wrote: > > > > > Author: markj > > > > > Date: Wed Aug 14 00:42:21 2013 > > > > > New Revision: 254309 > > > > > URL: http://svnweb.freebsd.org/changeset/base/254309 > > > > > > > > > > Log: > > > > > Use kld_{load,unload} instead of mod_{load,unload} for the linker > > file > > > > load > > > > > and unload event handlers added in r254266. > > > > > > > > > > Reported by:jhb > > > > > X-MFC with: r254266 > > > > > > > > Thanks! BTW, it would be really nice to replace HWPMC_HOOKS in > > > > kern_linker.c with > > > > EVENTHANDLER calls. I think kld_load would just work (though you might > > > > need to > > > > downgrade the lock before you run it). For kld_unload it seems you > > want > > > > two events, > > > > a kld_unload_try for your newly added event (since it can reject a > > > > kld_unload), and > > > > perhaps kld_unload at the end where the current HWPMC_HOOK is. Just an > > > > idea if > > > > someone is looking for something to do. I know there are other modules > > > > that need > > > > to hook into linker events like this, and making HWPMC_HOOKS more > > generic > > > > would be > > > > a big help. > > > > > > > > > > I will look into doing this. The DTrace SDT kld_load handler will not > > work > > > properly if the > > > linker lock is downgraded first because of the following code in > > > linker_file_lookup_set(): > > > > > > locked = KLD_LOCK(); > > > if (!locked) > > > KLD_LOCK(); > > > > > > In particular, it checks to see if the kld lock is exclusively held and > > > locks it if not, which > > > obviously causes problems if the thread holds the shared lock. > > > > > > The answer might be to just run the hwpmc handler with the exclusive lock > > > held. Or perhaps > > > we just need a linker_file_lookup_set_locked(), assuming that it's ok to > > > look up a linker set > > > with the shared lock held. > > > > It is probably fine to do a lookup with a shared lock. We could also fix > > the > > linker code to only lock if there is not an existing shared or exclusive > > lock. > > > > Sorry if I'm being dense, but I thought it wasn't generally possible to > determine > whether curthread holds a given shared lock. Fair enough. We could probably either add _locked variant that asserts either one (you can do an assert for a shared lock), or just require all callers to get the lock and make the non _locked variant basically be the _locked variant. I would prefer the latter if it is not too invasive. -- John Baldwin ___ 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: r254337 - in head/sys/fs: nfs nfsserver
Author: rmacklem Date: Wed Aug 14 21:11:26 2013 New Revision: 254337 URL: http://svnweb.freebsd.org/changeset/base/254337 Log: Fix several performance related issues in the new NFS server's DRC for NFS over TCP. - Increase the size of the hash tables. - Create a separate mutex for each hash list of the TCP hash table. - Single thread the code that deletes stale cache entries. - Add a tunable called vfs.nfsd.tcphighwater, which can be increased to allow the cache to grow larger, avoiding the overhead of frequent scans to delete stale cache entries. (The default value will result in frequent scans to delete stale cache entries, analagous to what the pre-patched code does.) - Add a tunable called vfs.nfsd.cachetcp that can be used to disable DRC caching for NFS over TCP, since the old NFS server didn't DRC cache TCP. It also adjusts the size of nfsrc_floodlevel dynamically, so that it is always greater than vfs.nfsd.tcphighwater. For UDP the algorithm remains the same as the pre-patched code, but the tunable vfs.nfsd.udphighwater can be used to allow the cache to grow larger and reduce the overhead caused by frequent scans for stale entries. UDP also uses a larger hash table size than the pre-patched code. Reported by: wollman Tested by:wollman (earlier version of patch) Submitted by: ivoras (earlier patch) Reviewed by: jhb (earlier version of patch) MFC after:1 month Modified: head/sys/fs/nfs/nfsport.h head/sys/fs/nfs/nfsrvcache.h head/sys/fs/nfsserver/nfs_nfsdcache.c head/sys/fs/nfsserver/nfs_nfsdport.c Modified: head/sys/fs/nfs/nfsport.h == --- head/sys/fs/nfs/nfsport.h Wed Aug 14 20:20:42 2013(r254336) +++ head/sys/fs/nfs/nfsport.h Wed Aug 14 21:11:26 2013(r254337) @@ -603,11 +603,6 @@ void nfsrvd_rcv(struct socket *, void *, #defineNFSREQSPINLOCK extern struct mtx nfs_req_mutex #defineNFSLOCKREQ()mtx_lock(&nfs_req_mutex) #defineNFSUNLOCKREQ() mtx_unlock(&nfs_req_mutex) -#defineNFSCACHEMUTEX extern struct mtx nfs_cache_mutex -#defineNFSCACHEMUTEXPTR(&nfs_cache_mutex) -#defineNFSLOCKCACHE() mtx_lock(&nfs_cache_mutex) -#defineNFSUNLOCKCACHE()mtx_unlock(&nfs_cache_mutex) -#defineNFSCACHELOCKREQUIRED() mtx_assert(&nfs_cache_mutex, MA_OWNED) #defineNFSSOCKMUTEXextern struct mtx nfs_slock_mutex #defineNFSSOCKMUTEXPTR (&nfs_slock_mutex) #defineNFSLOCKSOCK() mtx_lock(&nfs_slock_mutex) Modified: head/sys/fs/nfs/nfsrvcache.h == --- head/sys/fs/nfs/nfsrvcache.hWed Aug 14 20:20:42 2013 (r254336) +++ head/sys/fs/nfs/nfsrvcache.hWed Aug 14 21:11:26 2013 (r254337) @@ -41,8 +41,9 @@ #defineNFSRVCACHE_MAX_SIZE 2048 #defineNFSRVCACHE_MIN_SIZE 64 -#defineNFSRVCACHE_HASHSIZE 20 +#defineNFSRVCACHE_HASHSIZE 500 +/* Cache table entry. */ struct nfsrvcache { LIST_ENTRY(nfsrvcache) rc_hash; /* Hash chain */ TAILQ_ENTRY(nfsrvcache) rc_lru; /* UDP lru chain */ @@ -104,4 +105,11 @@ struct nfsrvcache { LIST_HEAD(nfsrvhashhead, nfsrvcache); +/* The fine-grained locked cache hash table for TCP. */ +struct nfsrchash_bucket { + struct mtx mtx; + charlock_name[16]; + struct nfsrvhashheadtbl; +}; + #endif /* _NFS_NFSRVCACHE_H_ */ Modified: head/sys/fs/nfsserver/nfs_nfsdcache.c == --- head/sys/fs/nfsserver/nfs_nfsdcache.c Wed Aug 14 20:20:42 2013 (r254336) +++ head/sys/fs/nfsserver/nfs_nfsdcache.c Wed Aug 14 21:11:26 2013 (r254337) @@ -160,15 +160,51 @@ __FBSDID("$FreeBSD$"); #include extern struct nfsstats newnfsstats; -NFSCACHEMUTEX; +extern struct mtx nfsrc_udpmtx; +extern struct nfsrchash_bucket nfsrchash_table[NFSRVCACHE_HASHSIZE]; int nfsrc_floodlevel = NFSRVCACHE_FLOODLEVEL, nfsrc_tcpsavedreplies = 0; #endif /* !APPLEKEXT */ -static int nfsrc_tcpnonidempotent = 1; -static int nfsrc_udphighwater = NFSRVCACHE_UDPHIGHWATER, nfsrc_udpcachesize = 0; +SYSCTL_DECL(_vfs_nfsd); + +static u_int nfsrc_tcphighwater = 0; +static int +sysctl_tcphighwater(SYSCTL_HANDLER_ARGS) +{ + int error, newhighwater; + + newhighwater = nfsrc_tcphighwater; + error = sysctl_handle_int(oidp, &newhighwater, 0, req); + if (error != 0 || req->newptr == NULL) + return (error); + if (newhighwater < 0) + return (EINVAL); + if (newhighwater >= nfsrc_floodlevel) + nfsrc_floodlevel = newhighwater + newhighwater / 5; + nfsrc_tcphighwater = newhighwater; +
svn commit: r254338 - head/sys/netinet
Author: tuexen Date: Wed Aug 14 21:51:32 2013 New Revision: 254338 URL: http://svnweb.freebsd.org/changeset/base/254338 Log: Don't send uninitialized memory (two instances of 4 bytes) in every cookie on the wire. This bug was reported in https://bugzilla.mozilla.org/show_bug.cgi?id=905080 MFC after: 3 days Modified: head/sys/netinet/sctp_output.c Modified: head/sys/netinet/sctp_output.c == --- head/sys/netinet/sctp_output.c Wed Aug 14 21:11:26 2013 (r254337) +++ head/sys/netinet/sctp_output.c Wed Aug 14 21:51:32 2013 (r254338) @@ -5406,6 +5406,14 @@ do_a_abort: } SCTP_BUF_LEN(m) = sizeof(struct sctp_init_chunk); + /* +* We might not overwrite the identification[] completely and on +* some platforms time_entered will contain some padding. Therefore +* zero out the cookie to avoid putting uninitialized memory on the +* wire. +*/ + memset(&stc, 0, sizeof(struct sctp_state_cookie)); + /* the time I built cookie */ (void)SCTP_GETTIME_TIMEVAL(&stc.time_entered); ___ 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: r254339 - in head: bin/sh tools/regression/bin/sh/builtins
Author: jilles Date: Wed Aug 14 21:59:48 2013 New Revision: 254339 URL: http://svnweb.freebsd.org/changeset/base/254339 Log: sh: Recognize "--" as end of options in local builtin. Added: head/tools/regression/bin/sh/builtins/local4.0 (contents, props changed) Modified: head/bin/sh/var.c Modified: head/bin/sh/var.c == --- head/bin/sh/var.c Wed Aug 14 21:51:32 2013(r254338) +++ head/bin/sh/var.c Wed Aug 14 21:59:48 2013(r254339) @@ -710,6 +710,7 @@ localcmd(int argc __unused, char **argv { char *name; + nextopt(""); if (! in_function()) error("Not in a function"); while ((name = *argptr++) != NULL) { Added: head/tools/regression/bin/sh/builtins/local4.0 == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/tools/regression/bin/sh/builtins/local4.0 Wed Aug 14 21:59:48 2013(r254339) @@ -0,0 +1,12 @@ +# $FreeBSD$ + +f() { + local -- x + x=2 + [ "$x" = 2 ] +} +x=1 +f || exit 3 +[ "$x" = 1 ] || exit 3 +f || exit 3 +[ "$x" = 1 ] || exit 3 ___ 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: r254340 - head/sys/conf
Author: sjg Date: Wed Aug 14 22:19:29 2013 New Revision: 254340 URL: http://svnweb.freebsd.org/changeset/base/254340 Log: Some objects - such as *_genassym.o are not hooked into SRCS OBJS or anything else, yet have a dependency on symlinks such as machine/ Reviewed by: obrien Modified: head/sys/conf/kern.post.mk Modified: head/sys/conf/kern.post.mk == --- head/sys/conf/kern.post.mk Wed Aug 14 21:59:48 2013(r254339) +++ head/sys/conf/kern.post.mk Wed Aug 14 22:19:29 2013(r254340) @@ -219,7 +219,7 @@ _ILINKS+= x86 # Ensure that the link exists without depending on it when it exists. .for _link in ${_ILINKS} .if !exists(${.OBJDIR}/${_link}) -${SRCS}: ${_link} +${SRCS} ${CLEAN:M*.o}: ${_link} .endif .endfor ___ 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: r254350 - in head/sys: kern netinet
Author: markj Date: Thu Aug 15 04:08:55 2013 New Revision: 254350 URL: http://svnweb.freebsd.org/changeset/base/254350 Log: Specify SDT probe argument types in the probe definition itself rather than using SDT_PROBE_ARGTYPE(). This will make it easy to extend the SDT(9) API to allow probes with dynamically-translated types. There is no functional change. MFC after:2 weeks Modified: head/sys/kern/kern_exec.c head/sys/kern/kern_exit.c head/sys/kern/kern_fork.c head/sys/kern/kern_proc.c head/sys/kern/kern_sig.c head/sys/kern/kern_timeout.c head/sys/kern/vfs_syscalls.c head/sys/netinet/sctp_dtrace_define.h Modified: head/sys/kern/kern_exec.c == --- head/sys/kern/kern_exec.c Thu Aug 15 01:42:46 2013(r254349) +++ head/sys/kern/kern_exec.c Thu Aug 15 04:08:55 2013(r254350) @@ -96,12 +96,9 @@ dtrace_execexit_func_t dtrace_fasttrap_e #endif SDT_PROVIDER_DECLARE(proc); -SDT_PROBE_DEFINE(proc, kernel, , exec, exec); -SDT_PROBE_ARGTYPE(proc, kernel, , exec, 0, "char *"); -SDT_PROBE_DEFINE(proc, kernel, , exec_failure, exec-failure); -SDT_PROBE_ARGTYPE(proc, kernel, , exec_failure, 0, "int"); -SDT_PROBE_DEFINE(proc, kernel, , exec_success, exec-success); -SDT_PROBE_ARGTYPE(proc, kernel, , exec_success, 0, "char *"); +SDT_PROBE_DEFINE1(proc, kernel, , exec, exec, "char *"); +SDT_PROBE_DEFINE1(proc, kernel, , exec_failure, exec-failure, "int"); +SDT_PROBE_DEFINE1(proc, kernel, , exec_success, exec-success, "char *"); MALLOC_DEFINE(M_PARGS, "proc-args", "Process arguments"); Modified: head/sys/kern/kern_exit.c == --- head/sys/kern/kern_exit.c Thu Aug 15 01:42:46 2013(r254349) +++ head/sys/kern/kern_exit.c Thu Aug 15 04:08:55 2013(r254350) @@ -94,8 +94,7 @@ dtrace_execexit_func_tdtrace_fasttrap_e #endif SDT_PROVIDER_DECLARE(proc); -SDT_PROBE_DEFINE(proc, kernel, , exit, exit); -SDT_PROBE_ARGTYPE(proc, kernel, , exit, 0, "int"); +SDT_PROBE_DEFINE1(proc, kernel, , exit, exit, "int"); /* Hook for NFS teardown procedure. */ void (*nlminfo_release_p)(struct proc *p); Modified: head/sys/kern/kern_fork.c == --- head/sys/kern/kern_fork.c Thu Aug 15 01:42:46 2013(r254349) +++ head/sys/kern/kern_fork.c Thu Aug 15 04:08:55 2013(r254350) @@ -89,10 +89,8 @@ dtrace_fork_func_t dtrace_fasttrap_fork; #endif SDT_PROVIDER_DECLARE(proc); -SDT_PROBE_DEFINE(proc, kernel, , create, create); -SDT_PROBE_ARGTYPE(proc, kernel, , create, 0, "struct proc *"); -SDT_PROBE_ARGTYPE(proc, kernel, , create, 1, "struct proc *"); -SDT_PROBE_ARGTYPE(proc, kernel, , create, 2, "int"); +SDT_PROBE_DEFINE3(proc, kernel, , create, create, "struct proc *", +"struct proc *", "int"); #ifndef _SYS_SYSPROTO_H_ struct fork_args { Modified: head/sys/kern/kern_proc.c == --- head/sys/kern/kern_proc.c Thu Aug 15 01:42:46 2013(r254349) +++ head/sys/kern/kern_proc.c Thu Aug 15 04:08:55 2013(r254350) @@ -92,33 +92,18 @@ __FBSDID("$FreeBSD$"); #endif SDT_PROVIDER_DEFINE(proc); -SDT_PROBE_DEFINE(proc, kernel, ctor, entry, entry); -SDT_PROBE_ARGTYPE(proc, kernel, ctor, entry, 0, "struct proc *"); -SDT_PROBE_ARGTYPE(proc, kernel, ctor, entry, 1, "int"); -SDT_PROBE_ARGTYPE(proc, kernel, ctor, entry, 2, "void *"); -SDT_PROBE_ARGTYPE(proc, kernel, ctor, entry, 3, "int"); -SDT_PROBE_DEFINE(proc, kernel, ctor, return, return); -SDT_PROBE_ARGTYPE(proc, kernel, ctor, return, 0, "struct proc *"); -SDT_PROBE_ARGTYPE(proc, kernel, ctor, return, 1, "int"); -SDT_PROBE_ARGTYPE(proc, kernel, ctor, return, 2, "void *"); -SDT_PROBE_ARGTYPE(proc, kernel, ctor, return, 3, "int"); -SDT_PROBE_DEFINE(proc, kernel, dtor, entry, entry); -SDT_PROBE_ARGTYPE(proc, kernel, dtor, entry, 0, "struct proc *"); -SDT_PROBE_ARGTYPE(proc, kernel, dtor, entry, 1, "int"); -SDT_PROBE_ARGTYPE(proc, kernel, dtor, entry, 2, "void *"); -SDT_PROBE_ARGTYPE(proc, kernel, dtor, entry, 3, "struct thread *"); -SDT_PROBE_DEFINE(proc, kernel, dtor, return, return); -SDT_PROBE_ARGTYPE(proc, kernel, dtor, return, 0, "struct proc *"); -SDT_PROBE_ARGTYPE(proc, kernel, dtor, return, 1, "int"); -SDT_PROBE_ARGTYPE(proc, kernel, dtor, return, 2, "void *"); -SDT_PROBE_DEFINE(proc, kernel, init, entry, entry); -SDT_PROBE_ARGTYPE(proc, kernel, init, entry, 0, "struct proc *"); -SDT_PROBE_ARGTYPE(proc, kernel, init, entry, 1, "int"); -SDT_PROBE_ARGTYPE(proc, kernel, init, entry, 2, "int"); -SDT_PROBE_DEFINE(proc, kernel, init, return, return); -SDT_PROBE_ARGTYPE(proc, kernel, init, return, 0, "struct proc *"); -SDT_PROBE_ARGTYPE(proc, kernel, init, return, 1, "int"); -SDT_PROBE_ARGTYPE(proc, kernel, init, return, 2, "int"); +SDT_PROBE_DEFINE4(proc, kernel, ctor, entry, entry,
svn commit: r254351 - head/share/man/man9
Author: markj Date: Thu Aug 15 04:10:15 2013 New Revision: 254351 URL: http://svnweb.freebsd.org/changeset/base/254351 Log: Fix a typo. MFC after:3 days Modified: head/share/man/man9/netisr.9 Modified: head/share/man/man9/netisr.9 == --- head/share/man/man9/netisr.9Thu Aug 15 04:08:55 2013 (r254350) +++ head/share/man/man9/netisr.9Thu Aug 15 04:10:15 2013 (r254351) @@ -83,7 +83,7 @@ and .Nm supports multi-processor execution of handlers, and relies on a combination of source ordering and protocol-specific ordering and work-placement -policies to decide how do distribute work across one or more worker +policies to decide how to distribute work across one or more worker threads. Registering protocols will declare one of three policies: .Bl -tag -width NETISR_POLICY_SOURCE ___ 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"