From ddc91163077d5a13dee524efab9ab60f26f59f72 Mon Sep 17 00:00:00 2001 From: kib Date: Sun, 29 Apr 2012 09:32:44 +0000 Subject: Add src.conf option WITH_SHARED_TOOLCHAIN to enable building the toolchain binaries as dynamically linked. Option is disabled by default. Reviewed by: ru (previous version) MFC after: 2 weeks --- share/mk/bsd.own.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 55d6ba2..b0acbfd 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -425,7 +425,8 @@ __DEFAULT_NO_OPTIONS = \ ICONV \ IDEA \ LIBCPLUSPLUS \ - OFED + OFED \ + SHARED_TOOLCHAIN # # Default behaviour of some options depends on the architecture. Unfortunately -- cgit v1.1 From 6b0b09e72a82ff0e99c864ca023a9eb62f72d629 Mon Sep 17 00:00:00 2001 From: kib Date: Sun, 29 Apr 2012 09:37:02 +0000 Subject: Regenerate src.conf(5) --- share/man/man5/src.conf.5 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index e209a26..997c3b4 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd March 25, 2012 +.Dd April 29, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -270,7 +270,7 @@ When set, it also enforces the following options: Set to not build the Clang C/C++ compiler. .Pp It is a default setting on -arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. +arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and sparc64/sparc64. When set, it also enforces the following options: .Pp .Bl -item -compact @@ -284,7 +284,7 @@ When set, it also enforces the following options: Set to build the Clang C/C++ compiler. .Pp It is a default setting on -amd64/amd64, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. +amd64/amd64, i386/i386, pc98/i386 and powerpc/powerpc64. .It Va WITH_CLANG_EXTRAS .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim Set to build additional clang and llvm tools, such as bugpoint. @@ -891,6 +891,13 @@ as a set-user-ID root program. Set to not build the .Bx 4.4 legacy docs. +.It Va WITH_SHARED_TOOLCHAIN +.\" from FreeBSD: head/tools/build/options/WITH_SHARED_TOOLCHAIN 234782 2012-04-29 09:32:44Z kib +Set to build the toolchain binaries shared. +The set includes +.Xr cc 1 , +.Xr make 1 +and neccessary utilites like assembler, linker and library archive manager. .It Va WITHOUT_SOURCELESS .\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS 230972 2012-02-04 00:54:43Z rmh Set to not build kernel modules that include sourceless code (either microcode or native code for host CPU). -- cgit v1.1 From cbb800d0c5a725eb5247d0f72378034e69a095d8 Mon Sep 17 00:00:00 2001 From: eadler Date: Sun, 29 Apr 2012 22:29:48 +0000 Subject: Copy recent changes from etc/root/dot.cshrc that make the defaults more user friendly Approved by: cperciva MFC after: 3 days --- share/skel/dot.cshrc | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc index 5fa2319..b665825 100644 --- a/share/skel/dot.cshrc +++ b/share/skel/dot.cshrc @@ -3,13 +3,14 @@ # .cshrc - csh resource script, read at beginning of execution by each shell # # see also csh(1), environ(7). +# more examples available at /usr/share/examples/csh/ # alias h history 25 alias j jobs -l -alias la ls -a +alias la ls -aF alias lf ls -FA -alias ll ls -lA +alias ll ls -lAF # A righteous umask umask 22 @@ -17,18 +18,29 @@ umask 22 set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) setenv EDITOR vi -setenv PAGER more +setenv PAGER less setenv BLOCKSIZE K if ($?prompt) then # An interactive shell -- set some stuff up + if ($uid == 0) then + set user = root + endif + set prompt = "%n@%m:%/ %# " + set promptchars = "%#" + set filec - set history = 100 - set savehist = 100 + set history = 1000 + set savehist = (1000 merge) + set autolist = ambiguous + # Use history to aid expansion + set autoexpand + set autorehash set mail = (/var/mail/$USER) if ( $?tcsh ) then bindkey "^W" backward-delete-word bindkey -k up history-search-backward bindkey -k down history-search-forward endif + endif -- cgit v1.1 From 45cd6b589c22e31ca23e6ee1ed1c77b36bf8f7d2 Mon Sep 17 00:00:00 2001 From: np Date: Mon, 30 Apr 2012 09:46:05 +0000 Subject: Change the default to not use packet counters to generate rx interrupts. Rely solely on the timer based mechanism. Update man page to reflect this change. MFC after: 1 week --- share/man/man4/cxgbe.4 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4 index 88d42e3..a84ae55 100644 --- a/share/man/man4/cxgbe.4 +++ b/share/man/man4/cxgbe.4 @@ -1,4 +1,4 @@ -.\" Copyright (c) 2011, Chelsio Inc +.\" Copyright (c) 2011-2012, Chelsio Inc .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -145,10 +145,9 @@ dev.cxgbe.X.holdoff_tmr_idx sysctl. The packet-count index value to use to delay interrupts. The packet-count list has the values 1, 8, 16, and 32 by default and the index selects a value from this list. -The default value is 2 for both 10Gb and 1Gb ports, which means 16 -packets (or the holdoff timer going off) before an interrupt is -generated. --1 disables packet counting. +The default value is -1 for both 10Gb and 1Gb ports, which means packet +counting is disabled and interrupts are generated based solely on the +holdoff timer value. Different cxgbe interfaces can be assigned different values via the dev.cxgbe.X.holdoff_pktc_idx sysctl. This sysctl works only when the interface has never been marked up (as done by -- cgit v1.1 From 4f2a8a3a321ff12581a772dd9ca97d03ab81bd4d Mon Sep 17 00:00:00 2001 From: dumbbell Date: Mon, 30 Apr 2012 16:16:37 +0000 Subject: Add myself. --- share/misc/committers-src.dot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index c3f00d5..c1e60f3 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -128,6 +128,7 @@ dg [label="David Greenman\ndg@FreeBSD.org\n1993/06/14"] dim [label="Dimitry Andric\ndim@FreeBSD.org\n2010/08/30"] dougb [label="Doug Barton\ndougb@FreeBSD.org\n2000/10/26"] dteske [label="Devin Teske\ndteske@FreeBSD.org\n2012/04/10"] +dumbbell [label="Jean-Sebastien Pedron\ndumbbell@FreeBSD.org\n2004/11/29"] dwmalone [label="David Malone\ndwmalone@FreeBSD.org\n2000/07/11"] ed [label="Ed Schouten\ned@FreeBSD.org\n2008/05/22"] edwin [label="Edwin Groothuis\nedwin@FreeBSD.org\n2007/06/25"] @@ -506,6 +507,7 @@ msmith -> scottl murray -> delphij mux -> cognet +mux -> dumbbell netchild -> ariff -- cgit v1.1 From 89ed2f6036023c693e82ca528d76e6407e831c76 Mon Sep 17 00:00:00 2001 From: bapt Date: Mon, 30 Apr 2012 21:26:35 +0000 Subject: Add two special directives to libmap.conf: include : Parse the contents of file before continuing with the current file. includedir : Parse the contents of every file in dir that ends in .conf before continuing with the current file. Any file or directory encountered while processing include or includedir directives will be parsed exactly once, even if it is encountered multiple times. Reviewed by: kib, des Approved by: des (mentor) MFC after: 1 month --- share/man/man5/libmap.conf.5 | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/libmap.conf.5 b/share/man/man5/libmap.conf.5 index 6959ce2..784d5d0 100644 --- a/share/man/man5/libmap.conf.5 +++ b/share/man/man5/libmap.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 31, 2004 +.Dd April 28, 2012 .Dt LIBMAP.CONF 5 .Os .Sh NAME @@ -43,6 +43,27 @@ left hand side containing the mapping candidate and the right hand side containing the mapping. Dependencies are matched against candidates and replaced with the mappings. .Pp +Two special directives are available: +.Bl -tag -width indent +.It Cm include Ar file +Parse the contents of +.Ar file +before continuing with the current file. +.It Cm includedir Ar dir +Parse the contents of every file in +.Ar dir +that ends in +.Pa .conf +before continuing with the current file. +.El +.Pp +Any file or directory encountered while processing +.Cm include +or +.Cm includedir +directives will be parsed exactly once, even if it is encountered +multiple times. +.Pp Constrained mappings may be specified by enclosing the name of the executable or library in brackets. All mappings following a constraint will only be evaluated for that constraint. -- cgit v1.1 From 6a970d4e6106cb6c435a701beadccec79363f5b8 Mon Sep 17 00:00:00 2001 From: jwd Date: Tue, 1 May 2012 01:19:56 +0000 Subject: Add myself to this file - it didn't exist last time. Approved by: rmacklem (mentor) --- share/misc/committers-src.dot | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index c1e60f3..96b295b 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -177,6 +177,7 @@ jon [label="Jonathan Chen\njon@FreeBSD.org\n2000/10/17"] jonathan [label="Jonathan Anderson\njonathan@FreeBSD.org\n2010/10/07"] jpaetzel [label="Josh Paetzel\njpaetzel@FreeBSD.org\n2011/01/21"] julian [label="Julian Elischer\njulian@FreeBSD.org\n1993/??/??"] +jwd [label="John De Boskey\njwd@FreeBSD.org\n2000/05/19"] kaiw [label="Kai Wang\nkaiw@FreeBSD.org\n2007/09/26"] kan [label="Alexander Kabaev\nkan@FreeBSD.org\n2002/07/21"] kargl [label="Steven G. Kargl\nkargl@FreeBSD.org\n2011/01/17"] @@ -438,6 +439,7 @@ jhb -> rnoland jkh -> imp jkh -> jlemon jkh -> joerg +jkh -> jwd jkh -> phk jkh -> wes jkh -> yar @@ -541,6 +543,8 @@ pjd -> trociny rgrimes -> markm +rmacklem -> jwd + rpaulo -> avg rpaulo -> bschmidt rpaulo -> dim -- cgit v1.1 From e65958af29e7a68b4aaaf6a7f467fbdb011ee452 Mon Sep 17 00:00:00 2001 From: eadler Date: Wed, 2 May 2012 21:50:13 +0000 Subject: Prefer the use of csup to cvsup when talking about the binary. PR: docs/167459 Submitted by: "Bryan Drewery" Approved by: bcr MFC after: 1 week --- share/man/man5/make.conf.5 | 4 ++-- share/man/man7/development.7 | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) (limited to 'share') diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index d9967ea..00512d6 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 11, 2011 +.Dd May 02, 2012 .Dt MAKE.CONF 5 .Os .Sh NAME @@ -318,7 +318,7 @@ The hostname of the sup server to use when doing .It Va SUP_UPDATE .Pq Vt bool Set this to use -.Xr cvsup 1 +.Xr csup 1 to update your .Pa src , ports , doc and diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index af8db3a..a643542 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 21, 2002 +.Dd May 02, 2012 .Dt DEVELOPMENT 7 .Os .Sh NAME @@ -89,7 +89,7 @@ I recommend a partition of at least 5GB. .Pp On the master server, use -.Xr cvsup 1 Pq Pa ports/net/cvsup +.Xr csup 1 to automatically pull down and maintain the .Fx @@ -108,23 +108,23 @@ The job should look something like this (please randomize the time of day!). Note that you can use the -.Xr cvsup 1 +.Xr csup 1 configuration file example directly from .Pa /usr/share/examples without modification by supplying appropriate arguments to -.Xr cvsup 1 . +.Xr csup 1 . .Bd -literal -offset 4n -33 6 * * * /usr/local/bin/cvsup -g -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile +33 6 * * * /usr/bin/csup -r 20 -L 2 -h cvsup.freebsd.org /usr/share/examples/cvsup/cvs-supfile .Ed .Pp Run the -.Xr cvsup 1 +.Xr csup 1 manually the first time to pull down the archive. It could take all day depending on how fast your connection is! You will run all -.Xr cvsup 1 +.Xr csup 1 and .Xr cvs 1 operations as @@ -555,7 +555,7 @@ Since the main tree is based on CVS, the former is convenient. .Pp First, you need to modify your -.Xr cvsup 1 +.Xr csup 1 environment to avoid it modifying the local changes you have committed to the repository. It is important to remove the @@ -568,7 +568,7 @@ subdirectory to your .Pa refuse file. For more information, see -.Xr cvsup 1 . +.Xr csup 1 . .Pp The .Fx @@ -598,13 +598,13 @@ For more information on using CVS, see .Pp .Sy WARNING! The -.Xr cvsup 1 +.Xr csup 1 utility may blow away changes made on a local branch in some situations. This has been reported to occur when the master CVS repository is directly manipulated or an RCS file is changed. At this point, -.Xr cvsup 1 +.Xr csup 1 notices that the client and server have entirely different RCS files, so it does a full replace instead of trying to send just deltas. @@ -619,7 +619,7 @@ Bottom line is, if you value your local branch then you should back it up before every update. .Sh UPDATING VIA CVS The advantage of using -.Xr cvsup 1 +.Xr csup 1 to maintain an updated copy of the CVS repository instead of using it to maintain source trees directly is that you can then pick and choose when you bring your source tree (or pieces of your -- cgit v1.1 From fa4352cd7f9cb0b62893271a3cdaba1079e3013c Mon Sep 17 00:00:00 2001 From: bjk Date: Thu, 3 May 2012 13:08:11 +0000 Subject: Grammar and markup fixes. PR: docs/159854 Approved by: hrs (mentor) --- share/man/man4/carp.4 | 72 ++++++++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 32 deletions(-) (limited to 'share') diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4 index a734824..e1eaa51 100644 --- a/share/man/man4/carp.4 +++ b/share/man/man4/carp.4 @@ -42,8 +42,8 @@ addresses are always available. .Pp To use .Nm , -the administrator needs to configure at minimum a common virtual host ID -(vhid) and attach at least one IP address to this vhid on each machine which +the administrator needs to configure at a minimum a common virtual host ID +(vhid), and attach at least one IP address to this vhid on each machine which is to take part in the virtual group. Additional parameters can also be set on a per-vhid basis: .Cm advbase @@ -72,13 +72,13 @@ Both and .Cm advskew are put inside CARP advertisements. -These configurations can be done using +These values can be configured using .Xr ifconfig 8 , or through the .Dv SIOCSVH .Xr ioctl 2 . .Pp -CARP virtual hosts can be configured on multicast capable interfaces: Ethernet, +CARP virtual hosts can be configured on multicast-capable interfaces: Ethernet, layer 2 VLAN, FDDI and Token Ring. An arbitrary number of virtual host IDs can be configured on an interface. An arbitrary number of IPv4 or IPv6 addresses can be attached to a particular @@ -91,7 +91,7 @@ elections independently. .Pp Additionally, there are a number of global parameters which can be set using .Xr sysctl 8 : -.Bl -tag -width ".Va net.inet.carp.preempt" +.Bl -tag -width ".Va net.inet.carp.ifdown_demotion_factor" .It Va net.inet.carp.allow Accept incoming .Nm @@ -103,14 +103,17 @@ When enabled, a vhid in a backup state would preempt a master that is announcing itself with a lower advskew. Disabled by default. .It Va net.inet.carp.log -Value of 0 disables any logging. -Value of 1 enables logging state changes of +Determines what events relating to +.Nm +interfaces are logged. +A value of 0 disables any logging. +A value of 1 enables logging state changes of .Nm vhids. Values above 1 enable logging of bad .Nm packets. -Default value is 1. +The default value is 1. .It Va net.inet.carp.demotion This value shows current level of CARP demotion. The value is added to the actual advskew sent in announcements for @@ -123,44 +126,48 @@ running a vhid goes down, or while the .Xr pfsync 4 interface is not synchronized. The demotion value is writable, so that user may alter it -depending on some external conditions, for example on status of some +depending on some external conditions, for example on the status of some daemon utility. -However, altering the value should be performed with care, do +However, altering the value should be performed with care, so as to not conflict with subsystems that adjust demotion factor automatically: .Nm and .Xr pfsync 4 . .It Va net.inet.carp.ifdown_demotion_factor -Value added to +This value is added to .Va net.inet.carp.demotion -when interface running a vhid goes down. -Default value is 240 (maximum advskew value). +when an interface running a vhid goes down. +The default value is 240 (the maximum advskew value). .It Va net.inet.carp.senderr_demotion_factor -Value added to +This value is added to .Va net.inet.carp.demotion when .Nm experiences errors sending its announcements. -Default value is 240 (maximum advskew value). +The default value is 240 (the maximum advskew value). .El .\".Sh ARP level load balancing -.\"The +.\"A .\".Nm -.\"has limited abilities for load balancing the incoming connections -.\"between hosts in Ethernet network. -.\"For load balancing operation, one needs several CARP interfaces that +.\"interface has limited abilities for load balancing incoming connections +.\"between hosts in an Ethernet network. +.\"For load-balancing operation, one needs several CARP interfaces that .\"are configured to the same IP address, but to a different vhids. .\"Once an ARP request is received, the CARP protocol will use a hashing .\"function against the source IP address in the ARP request to determine -.\"which vhid should this request belong to. -.\"If the corresponding CARP interface is in master state, the ARP request -.\"will be replied, otherwise it will be ignored. +.\"which vhid the request will be assigned to. +.\"If the corresponding CARP interface is the current +.\"master interface, a reply will +.\"be sent to the ARP request; +.\"otherwise it will be ignored. .\"See the .\".Sx EXAMPLES .\"section for a practical example of load balancing. .\".Pp -.\"The ARP load balancing has some limitations. +.\"The ARP load balancing implemented in +.\".Nm +.\"has some limitations. .\"First, ARP balancing only works on the local network segment. .\"It cannot balance traffic that crosses a router, because the .\"router itself will always be balanced to the same virtual host. @@ -170,10 +177,11 @@ Default value is 240 (maximum advskew value). .\"is dangerous, because this creates a race condition between .\"balanced routers and a host they are serving. .\"Imagine an incoming packet creating state on the first router, being -.\"forwarded to its destination, and destination replying faster +.\"forwarded to its destination, and the destination replying faster .\"than the state information is packed and synced with the second router. .\"If the reply would be load balanced to second router, it will be -.\"dropped due to no state. +.\"dropped since the second router has not yet received information about +.\"the connection state. .Sh STATE CHANGE NOTIFICATIONS Sometimes it is useful to get notified about .Nm @@ -183,11 +191,12 @@ This can be accomplished by using hooks. Master/slave events are signalled under system .Dv CARP . -Subsystem specifies vhid and name of interface, where event occurred. -Type of the message displays new state of vhid. +The subsystem specifies the vhid and name of the interface where +the master/slave event occurred. +The type of the message displays the new state of the vhid. Please see .Xr devd.conf 5 -and +and the .Sx EXAMPLES section for more information. .Sh EXAMPLES @@ -195,8 +204,8 @@ For firewalls and routers with multiple interfaces, it is desirable to failover all of the addresses running .Nm together, when one of the physical interfaces goes down. -This is achieved by the preempt option. -Enable it on both host A and B: +This is achieved by the use of the preempt option. +Enable it on both hosts A and B: .Pp .Dl sysctl net.inet.carp.preempt=1 .Pp @@ -295,7 +304,6 @@ The device was imported into .Fx 5.4 . In -.Fx 10.0 -the +.Fx 10.0 , .Nm was significantly rewritten, and is no longer a pseudo-interface. -- cgit v1.1 From cbd8dc582eb04ebe1bde321b9235da1c1fa93c68 Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 4 May 2012 18:24:38 +0000 Subject: Use MADT to match ACPI Processor objects to CPUs. MADT and DSDT/SSDTs may list CPUs in different orders, especially for disabled logical cores. Now we match ACPI IDs from the MADT with Processor objects, strictly order CPUs accordingly, and ignore disabled cores. This prevents us from executing methods for other CPUs, e. g., _PSS for disabled logical core, which may not exist. Unfortunately, it is known that there are a few systems with buggy BIOSes that do not have unique ACPI IDs for MADT and Processor objects. To work around these problems --- share/man/man4/acpi.4 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4 index faedb06..91b6517 100644 --- a/share/man/man4/acpi.4 +++ b/share/man/man4/acpi.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 22, 2012 +.Dd May 4, 2012 .Dt ACPI 4 .Os .Sh NAME @@ -198,6 +198,11 @@ entry for access after boot. Enables loading of a custom ACPI DSDT. .It Va acpi_dsdt_name Name of the DSDT table to load, if loading is enabled. +.It Va debug.acpi.cpu_unordered +Do not use the MADT to match ACPI processor objects to CPUs. +This is needed on a few systems with a buggy BIOS that does not use +consistent processor IDs. +Default is 0 (disabled). .It Va debug.acpi.disabled Selectively disables portions of ACPI for debugging purposes. .It Va debug.acpi.interpreter_slack -- cgit v1.1 From 2ed237af622fef414c4b4510da5c0166d48422df Mon Sep 17 00:00:00 2001 From: jkim Date: Fri, 4 May 2012 18:54:51 +0000 Subject: Complete commit message for r235024: Use MADT to match ACPI Processor objects to CPUs. MADT and DSDT/SSDTs may list CPUs in different orders, especially for disabled logical cores. Now we match ACPI IDs from the MADT with Processor objects, strictly order CPUs accordingly, and ignore disabled cores. This prevents us from executing methods for other CPUs, e. g., _PSS for disabled logical core, which may not exist. Unfortunately, it is known that there are a few systems with buggy BIOSes that do not have unique ACPI IDs for MADT and Processor objects. To work around these problems, 'debug.acpi.cpu_unordered' tunable is added. Set this to a non-zero value to restore the old behavior. Many thanks to jhb for pointing me to the right direction and the manual page change. Reported by: Harris, James R (james dot r dot harris at intel dot com) Tested by: Harris, James R (james dot r dot harris at intel dot com) Reviewed by: jhb MFC after: 1 month --- share/man/man4/acpi.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4 index 91b6517..9d57128 100644 --- a/share/man/man4/acpi.4 +++ b/share/man/man4/acpi.4 @@ -199,7 +199,7 @@ Enables loading of a custom ACPI DSDT. .It Va acpi_dsdt_name Name of the DSDT table to load, if loading is enabled. .It Va debug.acpi.cpu_unordered -Do not use the MADT to match ACPI processor objects to CPUs. +Do not use the MADT to match ACPI Processor objects to CPUs. This is needed on a few systems with a buggy BIOS that does not use consistent processor IDs. Default is 0 (disabled). -- cgit v1.1 From ba7b3954d6c2fd94b8e666366427df50235e3a38 Mon Sep 17 00:00:00 2001 From: issyl0 Date: Sat, 5 May 2012 16:50:12 +0000 Subject: - Add my mentor/mentee relationship to committers-doc.dot. (where me = issyl0) Approved by: gabor (mentor) --- share/misc/committers-doc.dot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 9908dfa..630cb8f 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -60,6 +60,7 @@ ganbold [label="Ganbold Tsagaankhuu\nganbold@FreeBSD.org\n2008/02/26"] gavin [label="Gavin Atkinson\ngavin@FreeBSD.org\n2011/07/18"] gjb [label="Glen Barber\ngjb@FreeBSD.org\n2010/09/01"] hrs [label="Hiroki Sato\nhrs@FreeBSD.org\n2000/07/06"] +issyl0 [label="Isabell Long\nissyl0@FreeBSD.org\n2012/04/25"] jkois [label="Johann Kois\njkois@FreeBSD.org\n2004/11/11"] joel [label="Joel Dahl\njoel@FreeBSD.org\n2005/04/05"] keramida [label="Giorgos Keramidas\nkeramida@FreeBSD.org\n2001/10/12"] @@ -107,6 +108,7 @@ delphij -> loader gabor -> pgj gabor -> manolis gabor -> taras +gabor -> issyl0 gjb -> wblock -- cgit v1.1 From 98c7a528a1d53dac9a5121b55ec9b43a4ff91d2a Mon Sep 17 00:00:00 2001 From: pluknet Date: Sun, 6 May 2012 19:03:36 +0000 Subject: OpenBSD 5.1 added. --- share/misc/bsd-family-tree | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index 43ab9d6..eba25d0 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -253,7 +253,7 @@ FreeBSD 5.2 | | | | *--FreeBSD | | | | | | 9.0 | | | | DragonFly 3.0.1 | v FreeBSD | | | | - | 8.3 | | | | + | 8.3 | | OpenBSD 5.1 | | | | | | FreeBSD 10 -current | NetBSD -current OpenBSD -current | | | | | | @@ -546,6 +546,7 @@ OpenBSD 5.0 2011-11-01 [OBD] FreeBSD 9.0 2012-01-12 [FBD] DragonFly 3.0.1 2012-02-21 [DFB] FreeBSD 8.3 2012-04-18 [FBD] +OpenBSD 5.1 2012-05-01 [OBD] Bibliography ------------------------ -- cgit v1.1 From 6aab9c91f45532009529139d00284230c6c9e7c7 Mon Sep 17 00:00:00 2001 From: stas Date: Sun, 6 May 2012 21:05:58 +0000 Subject: - Document kfd(8) rc.conf variables in the manpage. --- share/man/man5/rc.conf.5 | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'share') diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index a45ee01..39be669 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -2086,6 +2086,19 @@ If is set to .Dq Li YES this is the path to Kerberos 5 Password-Changing Daemon. +.It Va kfd_enable +.Pq Vt bool +Set to +.Dq Li YES +to start +.Xr kfd 8 , +the Kerberos 5 ticket forwarding daemon, at the boot time. +.It Va kfd_program +.Pq Vt str +Path to +.Xr kfd 8 +(default +.Pa /usr/libexec/kfd ) . .It Va rwhod_enable .Pq Vt bool If set to -- cgit v1.1 From 03c86f379db31e4be0324f431a50ea7040a5c40d Mon Sep 17 00:00:00 2001 From: stas Date: Mon, 7 May 2012 02:50:52 +0000 Subject: - Bump the manpage date after kfd addition. Reported by: gjb --- share/man/man5/rc.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 39be669..2ed4a56 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 27, 2012 +.Dd May 06, 2012 .Dt RC.CONF 5 .Os .Sh NAME -- cgit v1.1 From 4b07a79925078e4a03c602b68c047474d719e2c4 Mon Sep 17 00:00:00 2001 From: jlh Date: Mon, 7 May 2012 09:00:30 +0000 Subject: Introduce the ${SHLIB_LDSCRIPT} variable to have an ld(1) script instead of a symlink for .so files. Reviewed by: kib, kan (previous version), dim Approved by: kib (mentor) Silence from: -hackers@ MFC after: 1 week --- share/mk/bsd.README | 4 ++++ share/mk/bsd.lib.mk | 27 +++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 51cfb39..e91a231 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -352,6 +352,10 @@ SRCS List of source files to build the library. Suffix types to .c files of the same name. (This is not the default for versions of make.) +SHLIB_LDSCRIPT Template file to generate shared library linker script. + Unless used, a simple symlink is created to the real + shared object. + The include file includes the file named "../Makefile.inc" if it exists, as well as the include file . diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index a4abe2f..f5fcd48 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -271,6 +271,25 @@ _libinstall: ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \ ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR} .if defined(SHLIB_LINK) +# ${_SHLIBDIRPREFIX} and ${_LDSCRIPTROOT} are both needed when cross-building +# and when building 32 bits library shims. ${_SHLIBDIRPREFIX} is the directory +# prefix where shared objects will be installed. ${_LDSCRIPTROOT} is the +# directory prefix that will be used in generated ld(1) scripts. They cannot +# be coalesced because of the way ld(1) handles the sysroot prefix (used in the +# cross-toolchain): +# - 64 bits libs are located under sysroot, so ${_LDSCRIPTROOT} must be empty. +# - 32 bits shims are not, so ${_LDSCRIPTROOT} is used to specify their full +# path. Note that ld(1) scripts are generated both during buildworld and +# installworld; in the later case ${_LDSCRIPTROOT} must be obviously empty. +# On the other hand, the use of ${_SHLIBDIRPREFIX} is more consistent since it +# does not involve the logic of a tool we do not own. +.if defined(SHLIB_LDSCRIPT) && !empty(SHLIB_LDSCRIPT) && exists(${.CURDIR}/${SHLIB_LDSCRIPT}) + sed -e 's,@@SHLIB@@,${_LDSCRIPTROOT}${SHLIBDIR}/${SHLIB_NAME},g' \ + -e 's,@@LIBDIR@@,${_LDSCRIPTROOT}${LIBDIR},g' \ + ${.CURDIR}/${SHLIB_LDSCRIPT} > lib${LIB}.ld + ${INSTALL} -S -C -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${_INSTALLFLAGS} lib${LIB}.ld ${DESTDIR}${LIBDIR}/${SHLIB_LINK} +.else .if ${SHLIBDIR} == ${LIBDIR} ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK} .else @@ -281,8 +300,9 @@ _libinstall: rm -f ${DESTDIR}${LIBDIR}/${SHLIB_NAME} .endif .endif -.endif -.endif +.endif # SHLIB_LDSCRIPT +.endif # SHLIB_LINK +.endif # SHIB_NAME .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no" ${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ ${_INSTALLFLAGS} lib${LIB}_pic.a ${DESTDIR}${LIBDIR} @@ -350,6 +370,9 @@ clean: .endif .if defined(SHLIB_NAME) .if defined(SHLIB_LINK) +.if defined(SHLIB_LDSCRIPT) && exists(${.CURDIR}/${SHLIB_LDSCRIPT}) + rm -f lib${LIB}.ld +.endif rm -f ${SHLIB_LINK} .endif .if defined(LIB) && !empty(LIB) -- cgit v1.1 From 66daa7f73f48d38f5311353ab936d0395de10047 Mon Sep 17 00:00:00 2001 From: dim Date: Mon, 7 May 2012 17:13:36 +0000 Subject: Revert r234656, and apply a proper fix for binutils PR 10474, which caused linking clang on 32-bit PowerPC to fail with "relocation truncated to fit: R_PPC_REL24" errors. Original diffs (relicensed under GPLv2 with permission from author): http://sourceware.org/git/?p=binutils.git;a=commit;h=1fd262ff7d7ea5adf4894c6b960e092e7e43e3cd http://sourceware.org/git/?p=binutils.git;a=commit;h=053c49fbff58bd33bd0d12200ea61302f92caceb Tested by: andreast MFC after: 1 week --- share/mk/bsd.own.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index b0acbfd..6b5180a 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -442,8 +442,7 @@ __T=${TARGET_ARCH} __T=${MACHINE_ARCH} .endif # Clang is only for x86 and powerpc right now, by default. -# XXX: Temporarily disabled for 32-bit powerpc, due to a binutils bug. -.if ${__T} == "amd64" || ${__T} == "i386" || ${__T} == "powerpc64" +.if ${__T} == "amd64" || ${__T} == "i386" || ${__T:Mpowerpc*} __DEFAULT_YES_OPTIONS+=CLANG .else __DEFAULT_NO_OPTIONS+=CLANG -- cgit v1.1 From 459b5e5753c871e8e8705de79f61bbc1e4e2dc52 Mon Sep 17 00:00:00 2001 From: pluknet Date: Wed, 9 May 2012 15:22:39 +0000 Subject: Mac OS X 10.8 added (belatedly). --- share/misc/bsd-family-tree | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index eba25d0..c5fc64b 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -250,8 +250,8 @@ FreeBSD 5.2 | | | | | `-----. Mac OS X | | | | \ 10.7 | | | | | | | OpenBSD 5.0 | - *--FreeBSD | | | | | - | 9.0 | | | | DragonFly 3.0.1 + *--FreeBSD | Mac OS X | | | + | 9.0 | 10.8 | | DragonFly 3.0.1 | v FreeBSD | | | | | 8.3 | | OpenBSD 5.1 | | | | | | @@ -544,6 +544,7 @@ OpenBSD 4.9 2011-05-01 [OBD] Mac OS X 10.7 2011-07-20 [APL] OpenBSD 5.0 2011-11-01 [OBD] FreeBSD 9.0 2012-01-12 [FBD] +Mac OS X 10.8 2012-02-16 [APL] DragonFly 3.0.1 2012-02-21 [DFB] FreeBSD 8.3 2012-04-18 [FBD] OpenBSD 5.1 2012-05-01 [OBD] -- cgit v1.1 From 3ec8c43aba7033113c1b0fbe801d81e37f9271e6 Mon Sep 17 00:00:00 2001 From: pluknet Date: Wed, 9 May 2012 16:06:20 +0000 Subject: Revert r235194: 10.8 appears to be a developer preview. Reported by: trasz --- share/misc/bsd-family-tree | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index c5fc64b..eba25d0 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -250,8 +250,8 @@ FreeBSD 5.2 | | | | | `-----. Mac OS X | | | | \ 10.7 | | | | | | | OpenBSD 5.0 | - *--FreeBSD | Mac OS X | | | - | 9.0 | 10.8 | | DragonFly 3.0.1 + *--FreeBSD | | | | | + | 9.0 | | | | DragonFly 3.0.1 | v FreeBSD | | | | | 8.3 | | OpenBSD 5.1 | | | | | | @@ -544,7 +544,6 @@ OpenBSD 4.9 2011-05-01 [OBD] Mac OS X 10.7 2011-07-20 [APL] OpenBSD 5.0 2011-11-01 [OBD] FreeBSD 9.0 2012-01-12 [FBD] -Mac OS X 10.8 2012-02-16 [APL] DragonFly 3.0.1 2012-02-21 [DFB] FreeBSD 8.3 2012-04-18 [FBD] OpenBSD 5.1 2012-05-01 [OBD] -- cgit v1.1 From f5b7cbb0c5bf097ecb80bb8531653a150d65e09b Mon Sep 17 00:00:00 2001 From: bschmidt Date: Thu, 10 May 2012 18:10:20 +0000 Subject: Update man page due import of RT2800/RT3000 support. Obtained from: OpenBSD MFC after: 3 weeks --- share/man/man4/ral.4 | 87 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 62 insertions(+), 25 deletions(-) (limited to 'share') diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4 index f2e0e5f..28768fa 100644 --- a/share/man/man4/ral.4 +++ b/share/man/man4/ral.4 @@ -1,5 +1,4 @@ -.\" Copyright (c) 2005, 2006 -.\" Damien Bergamini +.\" Copyright (c) 2005-2010 Damien Bergamini .\" .\" Permission to use, copy, modify, and distribute this software for any .\" purpose with or without fee is hereby granted, provided that the above @@ -15,12 +14,12 @@ .\" .\" $FreeBSD$ .\" -.Dd July 8, 2009 +.Dd May 10, 2012 .Dt RAL 4 .Os .Sh NAME .Nm ral -.Nd "Ralink Technology IEEE 802.11 wireless network driver" +.Nd "Ralink Technology IEEE 802.11a/g/n wireless network device" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -42,31 +41,43 @@ if_ral_load="YES" .Sh DESCRIPTION The .Nm -driver supports PCI/CardBus wireless adapters based on the Ralink Technology -RT2500, RT2501, and RT2600 chipsets. +driver supports PCI/PCIe/CardBus wireless adapters based on the Ralink RT2500, +RT2501, RT2600, RT2700, RT2800 and RT3090 chipsets. .Pp The RT2500 chipset is the first generation of 802.11b/g adapters from Ralink. -It consists of two integrated chips, a RT2560 MAC/BBP and a RT2525 radio +It consists of two integrated chips, an RT2560 MAC/BBP and an RT2525 radio transceiver. .Pp -The RT2501 chipset is the second generation of 802.11b/g adapters from Ralink. -It consists of two integrated chips, a RT2561 MAC/BBP and a RT2527 radio +The RT2501 chipset is the second generation of 802.11a/b/g adapters from +Ralink. +It consists of two integrated chips, an RT2561 MAC/BBP and an RT2527 radio transceiver. This chipset provides support for the IEEE 802.11e standard with multiple hardware transmission queues and allows scatter/gather for efficient DMA operations. .Pp -The RT2600 chipset consists of two integrated chips, a RT2661 MAC/BBP and a +The RT2600 chipset consists of two integrated chips, an RT2661 MAC/BBP and an RT2529 radio transceiver. This chipset uses the MIMO (multiple-input multiple-output) technology with -multiple antennas to extend the operating range of the adapter and to achieve -higher throughput. -MIMO is the basis of the forthcoming IEEE 802.11n standard. +multiple radio transceivers to extend the operating range of the adapter and +to achieve higher throughput. +However, the RT2600 chipset does not support any of the 802.11n features. .Pp -The transmit speed is user-selectable or can be adapted automatically by the -driver depending on the received signal strength and on the number of hardware -transmission retries. +The RT2700 chipset is a low-cost version of the RT2800 chipset. +It supports a single transmit path and two receiver paths (1T2R). +It consists of two integrated chips, an RT2760 or RT2790 (PCIe) MAC/BBP and +an RT2720 (2.4GHz) or RT2750 (2.4GHz/5GHz) radio transceiver. +.Pp +The RT2800 chipset is the first generation of 802.11n adapters from Ralink. +It consists of two integrated chips, an RT2860 or RT2890 (PCIe) MAC/BBP and +an RT2820 (2.4GHz) or RT2850 (2.4GHz/5GHz) radio transceiver. +The RT2800 chipset supports two transmit paths and up to three receiver +paths (2T2R/2T3R). +It can achieve speeds up to 144Mbps (20MHz bandwidth) and 300Mbps (40MHz +bandwidth.) .Pp +The RT3090 chipset is the first generation of single-chip 802.11n adapters +from Ralink. .Nm supports .Cm station , @@ -92,13 +103,16 @@ Multiple interfaces may be operated together with a .Cm hostap interface to construct a wireless repeater device. +.Pp +The transmit speed is user-selectable or can be adapted automatically by the +driver depending on the number of hardware transmission retries. For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE The .Nm -driver supports PCI/CardBus wireless adapters based on the Ralink Technology -RT2500, RT2501, and RT2600 chipsets, including: +driver supports PCI/PCIe/CardBus wireless adapters based on Ralink Technology +chipsets, including: .Pp .Bl -column -compact ".Li Atlantis Land A02-PCM-W54" "RT2561S" "CardBus" .It Em Card Ta Em MAC/BBP Ta Em Bus @@ -188,9 +202,6 @@ RT2500, RT2501, and RT2600 chipsets, including: .It "Zonet ZEW1500" Ta RT2560 Ta CardBus .It "Zonet ZEW1600" Ta RT2560 Ta PCI .El -.Pp -An up to date list can be found at -.Pa http://damien.bergamini.free.fr/ral/list.html . .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): .Pp @@ -239,6 +250,7 @@ This should not happen. .Xr hostapd 8 , .Xr ifconfig 8 , .Xr wpa_supplicant 8 . +.Xr ifconfig 8 .Rs .%T "Ralink Technology" .%U http://www.ralinktech.com/ @@ -248,12 +260,37 @@ The .Nm driver first appeared in .Ox 3.7 . +Support for the RT2501 and RT2600 chipsets was added in +.Ox 3.9 . +Support for the RT2800 chipset was added in +.Ox 4.3 . +Support for the RT2700 chipset was added in +.Ox 4.4 . +Support for the RT3090 chipset was added in +.Ox 4.9 . .Sh AUTHORS The original .Nm driver was written by -.An Damien Bergamini Aq damien@FreeBSD.org . -.Sh BUGS -Host AP mode doesn't support client power save. -Clients using power save mode will experience +.An Damien Bergamini Aq damien@openbsd.org . +.Sh CAVEATS +The +.Nm +driver does not make use of the hardware cryptographic engine. +.Pp +The +.Nm +driver does not support any of the 802.11n capabilities offered by +the RT2700 and RT2800 chipsets. +Additional work is required in before those features can be supported. +.Pp +Host AP mode doesn't support power saving. +Clients attempting to use power saving mode may experience significant packet loss (disabling power saving on the client will fix this). +.Pp +Some PCI +.Nm +adapters seem to strictly require a system supporting PCI 2.2 or greater and +will likely not work in systems based on older revisions of the PCI +specification. +Check the board's PCI version before purchasing the card. -- cgit v1.1 From 49531896cffc52852d3a02764dd6b42af0aae621 Mon Sep 17 00:00:00 2001 From: bschmidt Date: Thu, 10 May 2012 18:14:25 +0000 Subject: ifconfig(8) is important, but no need to mention it twice. MFC after: 3 weeks --- share/man/man4/ral.4 | 1 - 1 file changed, 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4 index 28768fa..d22ac55 100644 --- a/share/man/man4/ral.4 +++ b/share/man/man4/ral.4 @@ -250,7 +250,6 @@ This should not happen. .Xr hostapd 8 , .Xr ifconfig 8 , .Xr wpa_supplicant 8 . -.Xr ifconfig 8 .Rs .%T "Ralink Technology" .%U http://www.ralinktech.com/ -- cgit v1.1 From c42a8fec96fd8b2279eefb9114659cb32b3712e4 Mon Sep 17 00:00:00 2001 From: bschmidt Date: Thu, 10 May 2012 18:25:59 +0000 Subject: remove trailing '.' Poked by: gjb MFC after: 3 weeks --- share/man/man4/ral.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/ral.4 b/share/man/man4/ral.4 index d22ac55..f2a2bd1 100644 --- a/share/man/man4/ral.4 +++ b/share/man/man4/ral.4 @@ -249,7 +249,7 @@ This should not happen. .Xr wlan_xauth 4 , .Xr hostapd 8 , .Xr ifconfig 8 , -.Xr wpa_supplicant 8 . +.Xr wpa_supplicant 8 .Rs .%T "Ralink Technology" .%U http://www.ralinktech.com/ -- cgit v1.1 From f4bce0ac87404488257d1105cc0aaac05884e653 Mon Sep 17 00:00:00 2001 From: eadler Date: Thu, 10 May 2012 23:38:34 +0000 Subject: Add Spanish Dvorak keyboard model to syscons. (not verified to be accurate) PR: conf/160235 Submitted by: Alvaro Approved by: cperciva MFC after: 3 weeks --- share/syscons/keymaps/Makefile | 1 + share/syscons/keymaps/spanish.dvorak.kbd | 139 +++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 share/syscons/keymaps/spanish.dvorak.kbd (limited to 'share') diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index 3eefc2c..883ffba 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -36,6 +36,7 @@ FILES= INDEX.keymaps \ ru.cp866.kbd ru.iso5.kbd \ si.iso.kbd \ sk.iso2.kbd \ + spanish.dvorak.kbd \ spanish.iso.kbd spanish.iso.acc.kbd spanish.iso15.acc.kbd \ swedish.iso.kbd swedish.cp850.kbd \ swissfrench.iso.kbd swissfrench.iso.acc.kbd swissfrench.cp850.kbd \ diff --git a/share/syscons/keymaps/spanish.dvorak.kbd b/share/syscons/keymaps/spanish.dvorak.kbd new file mode 100644 index 0000000..022a87d --- /dev/null +++ b/share/syscons/keymaps/spanish.dvorak.kbd @@ -0,0 +1,139 @@ +# $FreeBSD$ +# alt +# scan cntrl alt alt cntrl lock +# code base shift cntrl shift alt shift cntrl shift state +# ------------------------------------------------------------------ + 000 nop nop nop nop nop nop nop nop O + 001 esc esc esc esc esc esc debug esc O + 002 '1' '!' nop nop '|' '!' nop nop O + 003 '2' '"' nop nop '@' '"' nop nop O + 004 '3' 183 nop nop '#' '#' nop nop O + 005 '4' '$' nop nop '~' '~' nop nop O + 006 '5' '%' nop nop '5' '%' nop nop O + 007 '6' '&' nop nop 172 172 nop nop O + 008 '7' '/' nop nop '7' '/' nop nop O + 009 '8' '(' nop nop '8' '(' nop nop O + 010 '9' ')' nop nop '9' ')' nop nop O + 011 '0' '=' nop nop '0' '=' nop nop O + 012 ''' '?' nop nop ''' '?' nop nop O + 013 161 191 nop nop 161 191 nop nop O + 014 bs bs del del bs bs del del O + 015 ht btab nop nop ht btab nop nop O + 016 '.' ':' nop nop '.' ':' nop nop O + 017 ',' ';' nop nop ',' ';' nop nop O + 018 241 209 nop nop '~' '~' nop nop O + 019 'p' 'P' dle dle 'p' 'P' dle dle C + 020 'y' 'Y' em em 'y' 'Y' em em C + 021 'f' 'F' ack ack 'f' 'F' ack ack C + 022 'g' 'G' bel bel 'g' 'G' bel bel C + 023 'c' 'C' etx etx 'c' 'C' etx etx C + 024 'h' 'H' bs bs 'h' 'H' bs bs C + 025 'l' 'L' ff ff 'l' 'L' ff ff C + 026 dgra dcir esc esc '[' '[' esc esc O + 027 '+' '*' gs gs ']' ']' gs gs O + 028 cr cr nl nl cr cr nl nl O + 029 lctrl lctrl lctrl lctrl lctrl lctrl lctrl lctrl O + 030 'a' 'A' soh soh 'a' 'A' soh soh C + 031 'o' 'O' si si 243 211 si si C + 032 'e' 'E' enq enq 164 164 enq enq C + 033 'u' 'U' nak nak 250 218 nak nak C + 034 'i' 'I' ht ht 237 205 ht ht C + 035 'd' 'D' eot eot 'd' 'D' eot eot C + 036 'r' 'R' dc2 dc2 'r' 'R' dc2 dc2 C + 037 't' 'T' dc4 dc4 't' 'T' dc4 dc4 C + 038 'n' 'N' so so 'n' 'N' so so C + 039 's' 'S' dc3 dc3 's' 'S' dc3 dc3 C + 040 dacu duml nop nop '{' '{' nop nop O + 041 '\' '|' fs fs '\' '|' fs fs O + 042 lshift lshift lshift lshift lshift lshift lshift lshift O + 043 231 199 rs rs '}' '}' rs rs O + 044 '-' '_' us us '-' '_' us us O + 045 'q' 'Q' dc1 dc1 'q' 'Q' dc1 dc1 C + 046 'j' 'J' nl nl 'j' 'J' nl nl C + 047 'k' 'K' vt vt 'k' 'K' vt vt C + 048 'x' 'X' can can 'x' 'X' can can C + 049 'b' 'B' stx stx 'b' 'B' stx stx C + 050 'm' 'M' cr cr 'm' 'M' cr cr C + 051 'w' 'W' etb etb 'w' 'W' etb etb C + 052 'v' 'V' syn syn 'v' 'V' syn syn C + 053 'z' 'Z' sub sub 'z' 'Z' sub sub C + 054 rshift rshift rshift rshift rshift rshift rshift rshift O + 055 '*' '*' '*' '*' '*' '*' '*' '*' O + 056 lalt lalt lalt lalt lalt lalt lalt lalt O + 057 ' ' ' ' nul ' ' ' ' ' ' susp ' ' O + 058 clock clock clock clock clock clock clock clock O + 059 fkey01 fkey13 fkey25 fkey37 scr01 scr11 scr01 scr11 O + 060 fkey02 fkey14 fkey26 fkey38 scr02 scr12 scr02 scr12 O + 061 fkey03 fkey15 fkey27 fkey39 scr03 scr13 scr03 scr13 O + 062 fkey04 fkey16 fkey28 fkey40 scr04 scr14 scr04 scr14 O + 063 fkey05 fkey17 fkey29 fkey41 scr05 scr15 scr05 scr15 O + 064 fkey06 fkey18 fkey30 fkey42 scr06 scr16 scr06 scr16 O + 065 fkey07 fkey19 fkey31 fkey43 scr07 scr07 scr07 scr07 O + 066 fkey08 fkey20 fkey32 fkey44 scr08 scr08 scr08 scr08 O + 067 fkey09 fkey21 fkey33 fkey45 scr09 scr09 scr09 scr09 O + 068 fkey10 fkey22 fkey34 fkey46 scr10 scr10 scr10 scr10 O + 069 nlock nlock nlock nlock nlock nlock nlock nlock O + 070 slock slock slock slock slock slock slock slock O + 071 fkey49 '7' '7' '7' '7' '7' '7' '7' N + 072 fkey50 '8' '8' '8' '8' '8' '8' '8' N + 073 fkey51 '9' '9' '9' '9' '9' '9' '9' N + 074 fkey52 '-' '-' '-' '-' '-' '-' '-' N + 075 fkey53 '4' '4' '4' '4' '4' '4' '4' N + 076 fkey54 '5' '5' '5' '5' '5' '5' '5' N + 077 fkey55 '6' '6' '6' '6' '6' '6' '6' N + 078 fkey56 '+' '+' '+' '+' '+' '+' '+' N + 079 fkey57 '1' '1' '1' '1' '1' '1' '1' N + 080 fkey58 '2' '2' '2' '2' '2' '2' '2' N + 081 fkey59 '3' '3' '3' '3' '3' '3' '3' N + 082 fkey60 '0' '0' '0' '0' '0' '0' '0' N + 083 del '.' '.' '.' '.' '.' boot boot N + 084 nop nop nop nop nop nop nop nop O + 085 nop nop nop nop nop nop nop nop O + 086 '<' '>' nop nop '<' '>' nop nop O + 087 fkey11 fkey23 fkey35 fkey47 scr11 scr11 scr11 scr11 O + 088 fkey12 fkey24 fkey36 fkey48 scr12 scr12 scr12 scr12 O + 089 cr cr nl nl cr cr nl nl O + 090 rctrl rctrl rctrl rctrl rctrl rctrl rctrl rctrl O + 091 '/' '/' '/' '/' '/' '/' '/' '/' N + 092 nscr pscr debug debug nop nop nop nop O + 093 ralt ralt ralt ralt ralt ralt ralt ralt O + 094 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 O + 095 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 O + 096 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 O + 097 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 O + 098 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 O + 099 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 O + 100 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 O + 101 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 O + 102 fkey60 paste fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 O + 103 fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot fkey61 O + 104 slock saver slock saver susp nop susp nop O + 105 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 O + 106 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 O + 107 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 O + 108 nop nop nop nop nop nop nop nop O + + dgra '`' ( 'a' 224 ) ( 'A' 192 ) ( 'e' 232 ) ( 'E' 200 ) + ( 'i' 236 ) ( 'I' 204 ) ( 'o' 242 ) ( 'O' 210 ) + ( 'u' 249 ) ( 'U' 217 ) + dacu 180 ( 'a' 225 ) ( 'A' 193 ) ( 'e' 233 ) ( 'E' 201 ) + ( 'i' 237 ) ( 'I' 205 ) ( 'o' 243 ) ( 'O' 211 ) + ( 'u' 250 ) ( 'U' 218 ) ( 'y' 253 ) ( 'Y' 221 ) + dcir '^' ( 'a' 226 ) ( 'A' 194 ) ( 'e' 234 ) ( 'E' 202 ) + ( 'i' 238 ) ( 'I' 206 ) ( 'o' 244 ) ( 'O' 212 ) + ( 'u' 251 ) ( 'U' 219 ) + dtil '~' ( 'a' 227 ) ( 'A' 195 ) ( 'n' 241 ) ( 'N' 209 ) + ( 'o' 245 ) ( 'O' 213 ) + dmac 000 + dbre 000 + ddot 000 + duml 168 ( 'a' 228 ) ( 'A' 196 ) ( 'e' 235 ) ( 'E' 203 ) + ( 'i' 239 ) ( 'I' 207 ) ( 'o' 246 ) ( 'O' 214 ) + ( 'u' 252 ) ( 'U' 220 ) ( 'y' 255 ) + dsla 000 + drin 176 ( 'a' 229 ) ( 'A' 197 ) + dced 184 ( 'c' 231 ) ( 'C' 199 ) + dapo 000 + ddac 000 + dogo 000 + dcar 000 -- cgit v1.1 From de60317f67ebe09acba5170c8ecb3ce44229d388 Mon Sep 17 00:00:00 2001 From: uqs Date: Fri, 11 May 2012 10:13:34 +0000 Subject: Stop lying about default UFS blocksizes. This catches up with the year-old change to default blocksizes. Also reduce the variants of spelling gigabyte from 3 down to 2 (GB and GiB). Suggested by: arundel (about a year ago now ...) --- share/man/man7/tuning.7 | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'share') diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7 index 76b3439..a3aa296 100644 --- a/share/man/man7/tuning.7 +++ b/share/man/man7/tuning.7 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 16, 2010 +.Dd May 11, 2012 .Dt TUNING 7 .Os .Sh NAME @@ -148,15 +148,15 @@ If you do not use ports all that much and do not intend to keep system source .Pq Pa /usr/src on the machine, you can get away with -a 1 gigabyte +a 1 GB .Pa /usr partition. However, if you install a lot of ports (especially window managers and Linux-emulated binaries), we recommend -at least a 2 gigabyte +at least a 2 GB .Pa /usr and if you also intend to keep system source -on the machine, we recommend a 3 gigabyte +on the machine, we recommend a 3 GB .Pa /usr . Do not underestimate the amount of space you will need in this partition, it can creep up and @@ -218,22 +218,22 @@ and .Em cylinders/group . .Pp .Fx -performs best when using 8K or 16K file system block sizes. -The default file system block size is 16K, +performs best when using 16K or 32K file system block sizes. +The default file system block size is 32K, which provides best performance for most applications, with the exception of those that perform random access on large files (such as database server software). Such applications tend to perform better with a smaller block size, although modern disk characteristics are such that the performance gain from using a smaller block size may not be worth consideration. -Using a block size larger than 16K +Using a block size larger than 32K can cause fragmentation of the buffer cache and lead to lower performance. .Pp The defaults may be unsuitable for a file system that requires a very large number of i-nodes or is intended to hold a large number of very small files. -Such a file system should be created with an 8K or 4K block size. +Such a file system should be created with an 4K, 8K, or 16K block size. This also requires you to specify a smaller fragment size. We recommend always using a fragment size that is 1/8 @@ -256,13 +256,13 @@ Do not use this option unless you are actually storing large files on the partition, because if you overcompensate you can wind up with a file system that has lots of free space remaining but cannot accommodate any more files. -Using 32768, 65536, or 262144 bytes/i-node is recommended. +Using 65536, 131072, or 262144 bytes/i-node is recommended. You can go higher but it will have only incremental effects on .Xr fsck 8 recovery times. For example, -.Dq Li "newfs -i 32768 ..." . +.Dq Li "newfs -i 65536 ..." . .Pp .Xr tunefs 8 may be used to further tune a file system. @@ -525,8 +525,8 @@ sysctl governs VFS read-ahead and is expressed as the number of blocks to pre-read if the heuristics algorithm decides that the reads are issued sequentially. It is used by the UFS, ext2fs and msdosfs file systems. -With the default UFS block size of 16 KiB, a setting of 32 will allow -speculatively reading up to 512 KiB. +With the default UFS block size of 32 KiB, a setting of 64 will allow +speculatively reading up to 2 MiB. This setting may be increased to get around disk I/O latencies, especially where these latencies are large such as in virtual machine emulated environments. -- cgit v1.1 From 52bc32b6b5375223eeb386b2825c3d811166c8ba Mon Sep 17 00:00:00 2001 From: gabor Date: Fri, 11 May 2012 12:47:21 +0000 Subject: - Hook up BSD sort to the build. By default, it will be installed as "bsdsort" and GNU sort will be the default "sort". When WITH_BSD_SORT is set, BSD sort will be the default "sort" and GNU sort will be installed as "gnusort". --- share/mk/bsd.own.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 6b5180a..9802e79 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -413,6 +413,7 @@ __DEFAULT_YES_OPTIONS = \ __DEFAULT_NO_OPTIONS = \ BSD_GREP \ + BSD_SORT \ BIND_IDN \ BIND_LARGE_FILE \ BIND_LIBS \ -- cgit v1.1 From 60e2e3c08cd431d8e161da65e2b224909783f748 Mon Sep 17 00:00:00 2001 From: gabor Date: Fri, 11 May 2012 13:03:52 +0000 Subject: - Regen --- share/man/man5/src.conf.5 | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 997c3b4..26cb4da 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd April 29, 2012 +.Dd May 11, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -227,6 +227,9 @@ Set to not build the BSD licensed version of cpio based on .It Va WITH_BSD_GREP .\" from FreeBSD: head/tools/build/options/WITH_BSD_GREP 222273 2011-05-25 01:04:12Z obrien Install BSD-licensed grep as '[ef]grep' instead of GNU grep. +.It Va WITH_BSD_SORT +.\" from FreeBSD: head/tools/build/options/WITH_BSD_SORT 235268 2012-05-11 12:47:21Z gabor +Install BSD-licensed sort as 'sort' instead of GNU sort. .It Va WITHOUT_BSNMP .\" from FreeBSD: head/tools/build/options/WITHOUT_BSNMP 183306 2008-09-23 16:15:42Z sam Set to not build or install @@ -270,7 +273,7 @@ When set, it also enforces the following options: Set to not build the Clang C/C++ compiler. .Pp It is a default setting on -arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and sparc64/sparc64. +arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. When set, it also enforces the following options: .Pp .Bl -item -compact @@ -284,7 +287,7 @@ When set, it also enforces the following options: Set to build the Clang C/C++ compiler. .Pp It is a default setting on -amd64/amd64, i386/i386, pc98/i386 and powerpc/powerpc64. +amd64/amd64, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. .It Va WITH_CLANG_EXTRAS .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim Set to build additional clang and llvm tools, such as bugpoint. -- cgit v1.1 From 8670397617a81b2ecea7375cbd0af3c77821459b Mon Sep 17 00:00:00 2001 From: gjb Date: Fri, 11 May 2012 20:06:46 +0000 Subject: General mdoc(7) and typo fixes. PR: 167734 Submitted by: Nobuyuki Koganemaru (kogane!jp.freebsd.org) MFC after: 3 days --- share/man/man3/ATOMIC_VAR_INIT.3 | 4 ++-- share/man/man3/pthread.3 | 2 +- share/man/man3/pthread_condattr.3 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man3/ATOMIC_VAR_INIT.3 b/share/man/man3/ATOMIC_VAR_INIT.3 index 1f85d3b..e2fc5c0 100644 --- a/share/man/man3/ATOMIC_VAR_INIT.3 +++ b/share/man/man3/ATOMIC_VAR_INIT.3 @@ -139,7 +139,7 @@ It sets the atomic variable .Fa object to its desired .Fa value -and returs the original contents of the atomic variable. +and returns the original contents of the atomic variable. .Pp The .Fn atomic_compare_exchange_strong @@ -203,7 +203,7 @@ The .Fn atomic_fetch_sub macro subtracts the value .Fa operand -to atomic variable +from atomic variable .Fa object and returns the original contents of the atomic variable. .Pp diff --git a/share/man/man3/pthread.3 b/share/man/man3/pthread.3 index caa7f74..9c80f70 100644 --- a/share/man/man3/pthread.3 +++ b/share/man/man3/pthread.3 @@ -452,7 +452,7 @@ Set the thread-specific value for the specified key. .Fa "void \*[lp]*child\*[rp]\*[lp]void\*[rp]" .Fc .Xc -Register fork handlers +Register fork handlers. .It Xo .Ft void .Fn pthread_cleanup_pop "int execute" diff --git a/share/man/man3/pthread_condattr.3 b/share/man/man3/pthread_condattr.3 index e232ef6..d7f8f6b 100644 --- a/share/man/man3/pthread_condattr.3 +++ b/share/man/man3/pthread_condattr.3 @@ -35,7 +35,7 @@ .Nm pthread_condattr_getclock , .Nm pthread_condattr_setclock , .Nm pthread_condattr_getpshared , -.Nm pthread_condattr_setpshared , +.Nm pthread_condattr_setpshared .Nd condition attribute operations .Sh LIBRARY .Lb libpthread -- cgit v1.1 From 6c7125e2ba9d92835b639af9fb0ed530e46df9ab Mon Sep 17 00:00:00 2001 From: imp Date: Fri, 11 May 2012 21:25:59 +0000 Subject: Add pointers for how to setup debugging over firewire. --- share/man/man4/firewire.4 | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'share') diff --git a/share/man/man4/firewire.4 b/share/man/man4/firewire.4 index 9f909f2..3c8f3fe 100644 --- a/share/man/man4/firewire.4 +++ b/share/man/man4/firewire.4 @@ -82,12 +82,20 @@ manager, are dynamically assigned, after bus reset is initiated. On the .Nm bus, every device is identified by an EUI 64 address. +.Pp +Debugging over the firewire interace is possible with the +.Xr dcons 4 +driver. +Please see +.Pa http://wiki.freebsd.org/DebugWithDcons +for details on how to setup debugging with firewire. .Sh FILES .Bl -tag -compact .It Pa /dev/fw0.0 .It Pa /dev/fwmem0.0 .El .Sh SEE ALSO +.Xr dcons 4 , .Xr fwe 4 , .Xr fwip 4 , .Xr fwohci 4 , -- cgit v1.1 From f7c356b6029242f685b49bf7fd411c8421f7748e Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 00:30:54 +0000 Subject: Bump .Dd --- share/man/man4/firewire.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/firewire.4 b/share/man/man4/firewire.4 index 3c8f3fe..6541aeb 100644 --- a/share/man/man4/firewire.4 +++ b/share/man/man4/firewire.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 1, 2006 +.Dd May 11, 2012 .Dt FIREWIRE 4 .Os .Sh NAME -- cgit v1.1 From ed459e330b5bef0aa237c175988a31c682825239 Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 03:25:46 +0000 Subject: General mdoc(7) and typo fixes. PR: 167776 Submitted by: Nobuyuki Koganemaru (kogane!jp.freebsd.org) MFC after: 3 days --- share/man/man4/acpi_hp.4 | 4 ++-- share/man/man4/acpi_wmi.4 | 6 +++--- share/man/man4/ahci.4 | 2 +- share/man/man4/ath.4 | 4 ++-- share/man/man4/atp.4 | 4 ++-- share/man/man4/bpf.4 | 4 ++-- share/man/man4/bridge.4 | 3 ++- share/man/man4/capsicum.4 | 2 +- share/man/man4/ch.4 | 5 +++-- share/man/man4/cpuctl.4 | 4 ++-- share/man/man4/cxgbe.4 | 2 +- share/man/man4/dcons.4 | 2 +- share/man/man4/ddb.4 | 4 ++-- share/man/man4/epair.4 | 2 +- share/man/man4/fdt.4 | 8 +++++--- share/man/man4/fdtbus.4 | 5 +++-- share/man/man4/gdb.4 | 4 ++-- share/man/man4/ip.4 | 12 ++++++++---- share/man/man4/ipmi.4 | 6 +++--- share/man/man4/ipw.4 | 4 ++-- share/man/man4/isci.4 | 3 ++- share/man/man4/isp.4 | 2 +- share/man/man4/iwn.4 | 2 +- share/man/man4/mac_none.4 | 4 ++-- share/man/man4/mac_stub.4 | 6 +++--- share/man/man4/mps.4 | 2 +- share/man/man4/net80211.4 | 6 +++--- share/man/man4/netmap.4 | 2 +- share/man/man4/ng_etf.4 | 1 - share/man/man4/ng_nat.4 | 4 ++-- share/man/man4/ng_netflow.4 | 4 ++-- share/man/man4/ng_socket.4 | 3 ++- share/man/man4/pcm.4 | 4 ++-- share/man/man4/pcn.4 | 2 +- share/man/man4/psm.4 | 2 +- share/man/man4/rl.4 | 2 +- share/man/man4/run.4 | 2 +- share/man/man4/ses.4 | 2 +- share/man/man4/siftr.4 | 8 ++++---- share/man/man4/simplebus.4 | 5 +++-- share/man/man4/sis.4 | 2 +- share/man/man4/sk.4 | 2 +- share/man/man4/snd_hda.4 | 8 ++++---- share/man/man4/snd_hdspe.4 | 2 +- share/man/man4/splash.4 | 3 +-- share/man/man4/ste.4 | 2 +- share/man/man4/termios.4 | 3 ++- share/man/man4/ti.4 | 14 +++++++------- share/man/man4/tl.4 | 6 +++--- share/man/man4/tws.4 | 4 ++-- share/man/man4/uhso.4 | 2 +- share/man/man4/ulpt.4 | 2 +- share/man/man4/umcs.4 | 2 +- share/man/man4/uslcom.4 | 2 +- share/man/man4/vr.4 | 2 +- share/man/man4/watchdog.4 | 1 + share/man/man4/wb.4 | 2 +- share/man/man4/wpi.4 | 4 ++-- share/man/man4/xl.4 | 2 +- share/man/man4/xnb.4 | 6 +++--- 60 files changed, 118 insertions(+), 106 deletions(-) (limited to 'share') diff --git a/share/man/man4/acpi_hp.4 b/share/man/man4/acpi_hp.4 index dbb0ca0..028d19a 100644 --- a/share/man/man4/acpi_hp.4 +++ b/share/man/man4/acpi_hp.4 @@ -261,7 +261,7 @@ device driver first appeared in The .Nm driver was written by -.An Michael Gmelin Aq freebsd@grem.de +.An Michael Gmelin Aq freebsd@grem.de . .Pp It has been inspired by hp-wmi driver, which implements a subset of these features (hotkeys) on Linux. @@ -275,7 +275,7 @@ http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx .El .Pp This manual page was written by -.An Michael Gmelin Aq freebsd@grem.de +.An Michael Gmelin Aq freebsd@grem.de . .Sh BUGS This driver is experimental and has only been tested on i386 on an HP Compaq 8510p which featured all supported wireless devices (WWAN/BT/WLAN). diff --git a/share/man/man4/acpi_wmi.4 b/share/man/man4/acpi_wmi.4 index 12ecdfa..28bd0da 100644 --- a/share/man/man4/acpi_wmi.4 +++ b/share/man/man4/acpi_wmi.4 @@ -85,12 +85,12 @@ device driver first appeared in The .Nm driver was written by -.An Michael Gmelin Aq freebsd@grem.de +.An Michael Gmelin Aq freebsd@grem.de . .Pp -Work has been inspired by the Linux acpi-wmi driver written by Carlos Corbacho +Work has been inspired by the Linux acpi-wmi driver written by Carlos Corbacho. .Pp See http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx for the specification of ACPI-WMI. .Pp This manual page was written by -.An Michael Gmelin Aq freebsd@grem.de +.An Michael Gmelin Aq freebsd@grem.de . diff --git a/share/man/man4/ahci.4 b/share/man/man4/ahci.4 index 622875c..75426e7 100644 --- a/share/man/man4/ahci.4 +++ b/share/man/man4/ahci.4 @@ -51,7 +51,7 @@ The following tunables are settable from the .Xr loader 8 : .Bl -ohang .It Va hint.ahci. Ns Ar X Ns Va .msi -controls Message Signaled Interrupts (MSI) usage by the specified controller +controls Message Signaled Interrupts (MSI) usage by the specified controller. .Bl -tag -compact .It 0 MSI disabled; diff --git a/share/man/man4/ath.4 b/share/man/man4/ath.4 index e145853..8ae8cd7 100644 --- a/share/man/man4/ath.4 +++ b/share/man/man4/ath.4 @@ -186,7 +186,7 @@ ifconfig wlan0 meshid my_mesh mode 11a inet 192.168.0.10/24 .Ed .Pp Create two virtual 802.11a host-based access points, one with -with WEP enabled and one with no security, and bridge them to +WEP enabled and one with no security, and bridge them to the fxp0 (wired) device: .Bd -literal -offset indent ifconfig wlan0 create wlandev ath0 wlanmode hostap \e @@ -221,7 +221,7 @@ data frames failed. This should not happen. .It "ath%d: unable to setup a beacon xmit queue!" The request to the HAL to set up the transmit queue for 802.11 beacon frames -frames failed. +failed. This should not happen. .It "ath%d: 802.11 address: %s" The MAC address programmed in the EEPROM is displayed. diff --git a/share/man/man4/atp.4 b/share/man/man4/atp.4 index ed7b4d3..10bb41f 100644 --- a/share/man/man4/atp.4 +++ b/share/man/man4/atp.4 @@ -171,10 +171,10 @@ consoles as well as in X change it to: .Xr loader.conf 5 , .Xr xorg.conf 5 Pq Pa ports/x11/xorg , .Xr moused 8 , -.Xr sysctl 8 . +.Xr sysctl 8 .Sh AUTHORS .An -nosplit The .Nm driver was written by -.An Rohit Grover Aq rgrover1@gmail.com +.An Rohit Grover Aq rgrover1@gmail.com . diff --git a/share/man/man4/bpf.4 b/share/man/man4/bpf.4 index a317920..4095f5e 100644 --- a/share/man/man4/bpf.4 +++ b/share/man/man4/bpf.4 @@ -642,7 +642,7 @@ struct bpf_xhdr { uint32_t bh_caplen; /* length of captured portion */ uint32_t bh_datalen; /* original length of packet */ u_short bh_hdrlen; /* length of bpf header (this struct - plus alignment padding */ + plus alignment padding) */ }; struct bpf_hdr { @@ -650,7 +650,7 @@ struct bpf_hdr { uint32_t bh_caplen; /* length of captured portion */ uint32_t bh_datalen; /* original length of packet */ u_short bh_hdrlen; /* length of bpf header (this struct - plus alignment padding */ + plus alignment padding) */ }; .Ed .Pp diff --git a/share/man/man4/bridge.4 b/share/man/man4/bridge.4 index 09e1dad..1fadc57 100644 --- a/share/man/man4/bridge.4 +++ b/share/man/man4/bridge.4 @@ -410,7 +410,8 @@ Note that .Fx 6.1, 6.2, 6.3, 7.0, 7.1, and 7.2 have a bug in the EtherIP protocol. For more details and workaround, see -.Xr gif 4 manual page. +.Xr gif 4 +manual page. .Sh SEE ALSO .Xr gif 4 , .Xr ipf 4 , diff --git a/share/man/man4/capsicum.4 b/share/man/man4/capsicum.4 index 980ab79..39619f9 100644 --- a/share/man/man4/capsicum.4 +++ b/share/man/man4/capsicum.4 @@ -55,7 +55,7 @@ A process mode, entered by invoking in which access to global OS namespaces (such as the file system and PID namespaces) is restricted; only explicitly delegated rights, referenced by memory mappings or file descriptors, may be used. -Once set, the flag is inherited by future children proceses, and may not be +Once set, the flag is inherited by future children processes, and may not be cleared. .It capabilities File descriptors that wrap other file descriptors, masking operations that can diff --git a/share/man/man4/ch.4 b/share/man/man4/ch.4 index b45ecaa..d097d54 100644 --- a/share/man/man4/ch.4 +++ b/share/man/man4/ch.4 @@ -187,7 +187,7 @@ u_int cp_ndrives; /* number of drives */ This call can be used by applications to query the dimensions of the jukebox before using the .Dv CHIGSTATUS -ioctl to query the jukebox' status. +ioctl to query the jukebox status. .It Dv CHIOIELEM Perform the .Sy INITIALIZE ELEMENT STATUS @@ -230,7 +230,8 @@ base address and number of elements for which information is to be returned in the array of .Vt changer_element_status structures pointed to by the -.Va cesr_element_status field . +.Va cesr_element_status +field. The application must allocate enough memory for .Va cesr_element_count diff --git a/share/man/man4/cpuctl.4 b/share/man/man4/cpuctl.4 index 9e3a2aa..ed80f8a 100644 --- a/share/man/man4/cpuctl.4 +++ b/share/man/man4/cpuctl.4 @@ -124,8 +124,8 @@ For additional information refer to .Sh RETURN VALUES .Bl -tag -width Er .It Bq Er ENXIO -The operation requested is not supported by the device (e.g. unsupported -architecture or the CPU is disabled) +The operation requested is not supported by the device (e.g., unsupported +architecture or the CPU is disabled). .It Bq Er EINVAL Incorrect request was supplied, or microcode image is not correct. .It Bq Er ENOMEM diff --git a/share/man/man4/cxgbe.4 b/share/man/man4/cxgbe.4 index a84ae55..882bcf7 100644 --- a/share/man/man4/cxgbe.4 +++ b/share/man/man4/cxgbe.4 @@ -220,7 +220,7 @@ email all the specific information related to the issue to The .Nm device driver first appeared in -.Fx 9.0 +.Fx 9.0 . .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/dcons.4 b/share/man/man4/dcons.4 index d3a49c2..91bb4b4 100644 --- a/share/man/man4/dcons.4 +++ b/share/man/man4/dcons.4 @@ -104,7 +104,7 @@ If you want to use as a .Xr gdb 1 port, add the following line into -.Xr loader.conf 5 +.Xr loader.conf 5 : .Bd -literal -offset indent dcons_gdb="1" .Ed diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index c174b51..bb1214f 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -1031,14 +1031,14 @@ Number of allocations requests to the given zone. .Pp The very same information might be gathered in the userspace with the help of -.Dq Nm vmstat Fl z +.Dq Nm vmstat Fl z . .\" .Pp .It Ic show Cm unpcb Ar addr Shows UNIX domain socket private control block .Vt struct unpcb present at the address -.Ar addr +.Ar addr . .\" .Pp .It Ic show Cm vmochk diff --git a/share/man/man4/epair.4 b/share/man/man4/epair.4 index 899bd5f..85e2ea01 100644 --- a/share/man/man4/epair.4 +++ b/share/man/man4/epair.4 @@ -33,7 +33,7 @@ .Os .Sh NAME .Nm epair -.Nd A pair of virtual back-to-back connected Ethernet interfaces. +.Nd A pair of virtual back-to-back connected Ethernet interfaces .Sh SYNOPSIS To compile this driver into the kernel, place the following line in your diff --git a/share/man/man4/fdt.4 b/share/man/man4/fdt.4 index cd3312b..12542d0 100644 --- a/share/man/man4/fdt.4 +++ b/share/man/man4/fdt.4 @@ -143,8 +143,10 @@ The primary option for enabling support in the kernel. It covers all low-level and infrastructure parts of .Nm kernel support, which primarily are the -.Xr fdtbus 4 and -.Xr simplebus 4 drivers, as well as helper routines and libraries. +.Xr fdtbus 4 +and +.Xr simplebus 4 +drivers, as well as helper routines and libraries. .It Va makeoptions FDT_DTS_FILE=.dts Specifies a preferred (default) device tree source (DTS) file for a given kernel. The indicated DTS file will be converted (compiled) into a binary form @@ -163,7 +165,7 @@ specified in order to embed it into the kernel image). .Sh SEE ALSO .Xr fdtbus 4 , .Xr openfirm 4 , -.Xr simplebus 4 , +.Xr simplebus 4 .Sh STANDARDS IEEE Std 1275: IEEE Standard for Boot (Initialization Configuration) Firmware: Core Requirements and Practices diff --git a/share/man/man4/fdtbus.4 b/share/man/man4/fdtbus.4 index 0956c47..7141655 100644 --- a/share/man/man4/fdtbus.4 +++ b/share/man/man4/fdtbus.4 @@ -51,7 +51,8 @@ represents peripherals typically found on a highly integrated chip The .Nm driver provides generic, common infrastructure for all -.Xr fdt 4 oriented device drivers, and its main responsibilities are the +.Xr fdt 4 +oriented device drivers, and its main responsibilities are the following: .Bl -bullet .It @@ -66,7 +67,7 @@ Managing SYS_RES_MEMORY, SYS_RES_IOPORT resources. .Sh SEE ALSO .Xr fdt 4 , .Xr openfirm 4 , -.Xr simplebus 4 , +.Xr simplebus 4 .Sh STANDARDS IEEE Std 1275: IEEE Standard for Boot (Initialization Configuration) Firmware: Core Requirements and Practices diff --git a/share/man/man4/gdb.4 b/share/man/man4/gdb.4 index b92958b..3a502c8 100644 --- a/share/man/man4/gdb.4 +++ b/share/man/man4/gdb.4 @@ -508,7 +508,7 @@ pointed to by the local variable .It Ic checkmem Check unallocated memory for modifications. This assumes that the kernel has been compiled with -.Cd "options DIAGNOSTIC" +.Cd "options DIAGNOSTIC" . This causes the contents of free memory to be set to .Li 0xdeadc0de . .It Ic dmesg @@ -595,7 +595,7 @@ run the link at more than 9600 bps. Firewire connections do not have this problem. .Pp The debugging macros -.Dq "just growed" . +.Dq "just grown" . In general, the person who wrote them did so while looking for a specific problem, so they may not be general enough, and they may behave badly when used in ways for which they were not intended, even if those ways make sense. diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4 index cf16d65..50a11c3 100644 --- a/share/man/man4/ip.4 +++ b/share/man/man4/ip.4 @@ -215,7 +215,8 @@ before transmission. This is in contrast to the default behavior of the system, which is to transmit undirected broadcasts via the first network interface with the -.Dv IFF_BROADCAST flag set. +.Dv IFF_BROADCAST +flag set. .Pp This option allows applications to choose which interface is used to transmit an undirected broadcast @@ -235,12 +236,14 @@ sendto(s, msg, sizeof(msg), 0, &sin, sizeof(sin)); .Ed .Pp It is the application's responsibility to set the -.Dv IP_TTL option +.Dv IP_TTL +option to an appropriate value in order to prevent broadcast storms. The application must have sufficient credentials to set the .Dv SO_BROADCAST socket level option, otherwise the -.Dv IP_ONESBCAST option has no effect. +.Dv IP_ONESBCAST +option has no effect. .Pp If the .Dv IP_BINDANY @@ -851,4 +854,5 @@ Before packets received on raw IP sockets had the .Va ip_hl subtracted from the -.Va ip_len field. +.Va ip_len +field. diff --git a/share/man/man4/ipmi.4 b/share/man/man4/ipmi.4 index 08dd0b0..25dc341 100644 --- a/share/man/man4/ipmi.4 +++ b/share/man/man4/ipmi.4 @@ -130,7 +130,7 @@ Send a message to the interface. Possible error values: .Bl -tag -width Er .It Bq Er EFAULT -An address supplied was invalid +An address supplied was invalid. .It Bq Er ENOMEM Buffers could not be allowed for the command, out of memory. .El @@ -146,7 +146,7 @@ Get the slave LUN for source messages. .Ss Unimplemented Ioctls .Bl -tag -width indent .It Dv IPMICTL_REGISTER_FOR_CMD Pq Vt "struct ipmi_cmdspec" -Register to receive a specific command +Register to receive a specific command. Possible error values: .Bl -tag -width Er .It Bq Er EFAULT @@ -157,7 +157,7 @@ The network function/command is already in use. Could not allocate memory. .El .It Dv IPMICTL_UNREGISTER_FOR_CMD Pq Vt "struct ipmi_cmdspec" -Unregister to receive a specific command +Unregister to receive a specific command. Possible error values: .Bl -tag -width Er .It Bq Er EFAULT diff --git a/share/man/man4/ipw.4 b/share/man/man4/ipw.4 index 21ec44c..9becdfa 100644 --- a/share/man/man4/ipw.4 +++ b/share/man/man4/ipw.4 @@ -147,9 +147,9 @@ This should not happen. .Xr wlan_tkip 4 , .Xr wlan_wep 4 , .Xr ifconfig 8 , -.Xr wpa_supplicant 8 . +.Xr wpa_supplicant 8 .Sh AUTHORS The original .Nm driver was written by -.An Damien Bergamini Aq damien.bergamini@free.fr +.An Damien Bergamini Aq damien.bergamini@free.fr . diff --git a/share/man/man4/isci.4 b/share/man/man4/isci.4 index 0179a76..1d9353d 100644 --- a/share/man/man4/isci.4 +++ b/share/man/man4/isci.4 @@ -98,7 +98,8 @@ to the kernel configuration file. The .Nm driver first appeared in -.Fx 8.3 and 9.1 . +.Fx 8.3 +and 9.1. .Sh AUTHORS .An -nosplit The diff --git a/share/man/man4/isp.4 b/share/man/man4/isp.4 index 914fec4..23fd4b1 100644 --- a/share/man/man4/isp.4 +++ b/share/man/man4/isp.4 @@ -64,7 +64,7 @@ Ultra2 LVD (for the ISP1080 and ISP1280), and Ultra3 LVD (for the ISP12160). .Pp Fibre Channel support uses FCP SCSI profile for -.Tn FibreChannel . +.Tn FibreChannel , and utilizes Class 3 and Class 2 connections (Qlogic 2100 is Class 3 only, minor patches to the Qlogic 2200 to force Class 2 mode). Support is available for Public and Private loops, and for diff --git a/share/man/man4/iwn.4 b/share/man/man4/iwn.4 index 2c47f6f..5fe055e 100644 --- a/share/man/man4/iwn.4 +++ b/share/man/man4/iwn.4 @@ -179,4 +179,4 @@ This should not happen. The original .Nm driver was written by -.An Damien Bergamini Aq damien.bergamini@free.fr +.An Damien Bergamini Aq damien.bergamini@free.fr . diff --git a/share/man/man4/mac_none.4 b/share/man/man4/mac_none.4 index 8f46029..ed13ca6 100644 --- a/share/man/man4/mac_none.4 +++ b/share/man/man4/mac_none.4 @@ -45,7 +45,7 @@ configuration file: .Cd "options MAC_NONE" .Ed .Pp -Alternately, to load the sample module at boot time, place the following line +Alternately, to load the none module at boot time, place the following line in your kernel configuration file: .Bd -ragged -offset indent .Cd "options MAC" @@ -59,7 +59,7 @@ mac_none_load="YES" .Sh DESCRIPTION The .Nm -policy module implements a sample MAC policy that has no effect on +policy module implements a none MAC policy that has no effect on access control in the system. Unlike .Xr mac_stub 4 , diff --git a/share/man/man4/mac_stub.4 b/share/man/man4/mac_stub.4 index 79326df..89491f1 100644 --- a/share/man/man4/mac_stub.4 +++ b/share/man/man4/mac_stub.4 @@ -37,7 +37,7 @@ .Nm mac_stub .Nd "MAC policy stub module" .Sh SYNOPSIS -To compile the sample policy +To compile the stub policy into your kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent @@ -45,7 +45,7 @@ configuration file: .Cd "options MAC_STUB" .Ed .Pp -Alternately, to load the sample module at boot time, place the following line +Alternately, to load the stub module at boot time, place the following line in your kernel configuration file: .Bd -ragged -offset indent .Cd "options MAC" @@ -59,7 +59,7 @@ mac_stub_load="YES" .Sh DESCRIPTION The .Nm -policy module implements a sample MAC policy that has no effect on +policy module implements a stub MAC policy that has no effect on access control in the system. Unlike .Xr mac_none 4 , diff --git a/share/man/man4/mps.4 b/share/man/man4/mps.4 index dbf35cd..ce19737 100644 --- a/share/man/man4/mps.4 +++ b/share/man/man4/mps.4 @@ -209,7 +209,7 @@ Not endian safe. It only works on little endian machines (e.g. amd64 and i386). .It No userland utility available (e.g. -.Xr mptutil 8) +.Xr mptutil 8 ) . .It The driver probes devices sequentially. If your system has a large number of devices, the probe will take a while. diff --git a/share/man/man4/net80211.4 b/share/man/man4/net80211.4 index 20d71fe..3773b98 100644 --- a/share/man/man4/net80211.4 +++ b/share/man/man4/net80211.4 @@ -366,7 +366,7 @@ Valid values are: 0 (do not promote, use legacy), 1 (promote to HT20), and -2 (promote to HT40), +2 (promote to HT40). .It Dv IEEE80211_IOC_HTPROTMODE Return, in .Va i_val , @@ -447,7 +447,7 @@ Return the number of SSIDs supported in .Va i_val . .It Dv IEEE80211_IOC_NUMWEPKEYS Return the number of WEP keys supported in -.Va i_val +.Va i_val . .It Dv IEEE80211_IOC_POWERSAVE Return the current powersaving mode in .Va i_val . @@ -923,8 +923,8 @@ using the value in .Va i_val . .It Dv IEEE80211_IOC_DTIM_PERIOD Set the period (in beacon intervals) between DTIM events to the value in -This request causes a running interface to be restarted. .Va i_val . +This request causes a running interface to be restarted. .It Dv IEEE80211_IOC_DWDS Set whether or not Dynamic WDS support is enabled using the value in .Va i_val . diff --git a/share/man/man4/netmap.4 b/share/man/man4/netmap.4 index 8edcb02..9ac9fd0 100644 --- a/share/man/man4/netmap.4 +++ b/share/man/man4/netmap.4 @@ -46,7 +46,7 @@ uses memory mapped buffers and metadata which is in charge of validating information through .Pa ioctl() and -.Pa select()/poll(). +.Pa select()/poll() . .Nm can exploit the parallelism in multiqueue devices and multicore systems. diff --git a/share/man/man4/ng_etf.4 b/share/man/man4/ng_etf.4 index bc42726..adc3fba 100644 --- a/share/man/man4/ng_etf.4 +++ b/share/man/man4/ng_etf.4 @@ -135,7 +135,6 @@ nghook -a etf: newproto & # Filter two random ethertypes to that hook. ngctl 'msg etf: setfilter { matchhook="newproto" ethertype=${MATCH1} } ngctl 'msg etf: setfilter { matchhook="newproto" ethertype=${MATCH2} } -DONE .Ed .Sh SHUTDOWN This node shuts down upon receipt of a diff --git a/share/man/man4/ng_nat.4 b/share/man/man4/ng_nat.4 index 9a3e9bc..b2cff1f 100644 --- a/share/man/man4/ng_nat.4 +++ b/share/man/man4/ng_nat.4 @@ -61,7 +61,7 @@ After both hooks have been connected and aliasing address was configured, a node is ready for aliasing operation. .It Dv NGM_NAT_SET_MODE Pq Li setmode Set node's operation mode using supplied -.Vt "struct ng_nat_mode". +.Vt "struct ng_nat_mode" . .Bd -literal struct ng_nat_mode { uint32_t flags; @@ -193,7 +193,7 @@ are also ignored after was used (they are effectively replaced by server pool). .It Dv NGM_NAT_LIST_REDIRECTS Pq Li listredirects Return list of configured static redirects as -.Vt "struct ng_nat_list_redirects". +.Vt "struct ng_nat_list_redirects" . .Bd -literal struct ng_nat_listrdrs_entry { uint32_t id; /* Anything except zero */ diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4 index ca00201..9431c62 100644 --- a/share/man/man4/ng_netflow.4 +++ b/share/man/man4/ng_netflow.4 @@ -218,7 +218,7 @@ struct ng_netflow_settemtu { }; .Ed .Pp -Default is 1500 bytes +Default is 1500 bytes. .It Dv NGM_NETFLOW_SHOW This control message asks a node to dump the entire contents of the flow cache. It is called from @@ -284,7 +284,7 @@ node in this example is connected to The latter sends us a copy of IP packets, which we analyze and free. On .Va fxp0: -we do not use tee, but send packets back to ether node. +we do not use tee, but send packets back to either node. .Bd -literal -offset indent /usr/sbin/ngctl -f- <<-SEQ # connect ng0's tee to iface0 hook diff --git a/share/man/man4/ng_socket.4 b/share/man/man4/ng_socket.4 index 22c6638..84ddd15 100644 --- a/share/man/man4/ng_socket.4 +++ b/share/man/man4/ng_socket.4 @@ -93,7 +93,8 @@ socket must also be created using and associated with a .Nm node. -.Dv NG_DATA sockets do not automatically +.Dv NG_DATA +sockets do not automatically have nodes associated with them; they are bound to a specific node via the .Xr connect 2 system call. diff --git a/share/man/man4/pcm.4 b/share/man/man4/pcm.4 index 1ac5844..c92b1e6 100644 --- a/share/man/man4/pcm.4 +++ b/share/man/man4/pcm.4 @@ -390,7 +390,7 @@ Quality values are 100dB stopband, 8 taps and 85% bandwidth. Continuation of the bandlimited SINC interpolator, with 100dB stopband, 36 taps and 90% bandwidth as quality values. .It 4 -Continuation of the bandlimited SINC inteprolator, with 100dB stopband, 164 +Continuation of the bandlimited SINC interprolator, with 100dB stopband, 164 taps and 97% bandwidth as quality values. .El .It Va hw.snd.feeder_rate_round @@ -519,7 +519,7 @@ By default only 2 channels are enabled. Available options include: .Bl -tag -width 2n .It s16le:1.0 -Mono +Mono. .It s16le:2.0 Stereo, 2 channels (left, right). .It s16le:2.1 diff --git a/share/man/man4/pcn.4 b/share/man/man4/pcn.4 index 82720c9..b86e4fb 100644 --- a/share/man/man4/pcn.4 +++ b/share/man/man4/pcn.4 @@ -104,7 +104,7 @@ The driver supports the following media options: .Bl -tag -width full-duplex .It full-duplex -Force full duplex operation +Force full duplex operation. .It half-duplex Force half duplex operation. .El diff --git a/share/man/man4/psm.4 b/share/man/man4/psm.4 index caf0135..ffcd1d5 100644 --- a/share/man/man4/psm.4 +++ b/share/man/man4/psm.4 @@ -725,7 +725,7 @@ psm0: syncmask:xx, syncbits:yy .Pp The first line shows the command byte value of the keyboard controller just before the auxiliary port is probed. -It usually is 4D, 45, 47 or 65, depending on how the motherboard BIOS +It usually is 40, 45, 47 or 65, depending on how the motherboard BIOS initialized the keyboard controller upon power-up. .Pp The second line shows the result of the keyboard controller's diff --git a/share/man/man4/rl.4 b/share/man/man4/rl.4 index 33db966..4cbf6e9 100644 --- a/share/man/man4/rl.4 +++ b/share/man/man4/rl.4 @@ -119,7 +119,7 @@ The driver supports the following media options: .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It full-duplex -Force full duplex operation +Force full duplex operation. .It half-duplex Force half duplex operation. .El diff --git a/share/man/man4/run.4 b/share/man/man4/run.4 index 5f895e1..469e904 100644 --- a/share/man/man4/run.4 +++ b/share/man/man4/run.4 @@ -208,7 +208,7 @@ This should not happen. .Xr wlan_xauth 4 , .Xr ifconfig 8 , .Xr hostapd 8 , -.Xr wpa_supplicant 8 . +.Xr wpa_supplicant 8 .Pp Ralink Technology: .Pa http://www.ralinktech.com/ diff --git a/share/man/man4/ses.4 b/share/man/man4/ses.4 index 3d95285..42ec529 100644 --- a/share/man/man4/ses.4 +++ b/share/man/man4/ses.4 @@ -101,7 +101,7 @@ Set the status of a particular object. Get the associated help text for an object (not yet implemented). .Nm devices often have descriptive text for an object which can tell -you things like location (e.g, "left power supply"). +you things like location (e.g., "left power supply"). .It Dv SESIOC_INIT Initialize the enclosure. .El diff --git a/share/man/man4/siftr.4 b/share/man/man4/siftr.4 index 08d20e3..d0349ca 100644 --- a/share/man/man4/siftr.4 +++ b/share/man/man4/siftr.4 @@ -137,7 +137,7 @@ All messages are written in plain ASCII text. Note: The .Qq \e present in the example log messages in this section indicates a -line continuation and is not part of the actual log message +line continuation and is not part of the actual log message. .Pp The first type of log message is written to the file when the module is enabled and starts collecting data from the running kernel. The text below @@ -169,15 +169,15 @@ tick rate of the kernel in ticks per second. .El .Bl -tag -offset indent .It Va tcp_rtt_scale -smoothed RTT estimate scaling factor +smoothed RTT estimate scaling factor. .El .Bl -tag -offset indent .It Va sysname -operating system name +operating system name. .El .Bl -tag -offset indent .It Va sysver -operating system version +operating system version. .El .Bl -tag -offset indent .It Va ipmode diff --git a/share/man/man4/simplebus.4 b/share/man/man4/simplebus.4 index 72bc0e8..6834b38 100644 --- a/share/man/man4/simplebus.4 +++ b/share/man/man4/simplebus.4 @@ -60,11 +60,12 @@ configuration data retrieved from the nodes properties in Note the .Nm does not manage device resources and passes through any requests to the -.Xr fdtbus 4 layer. +.Xr fdtbus 4 +layer. .Sh SEE ALSO .Xr fdt 4 , .Xr fdtbus 4 , -.Xr openfirm 4 , +.Xr openfirm 4 .Sh STANDARDS Power.org Standard for Embedded Power Architecture Platform Requirements .Pq Vt ePAPR . diff --git a/share/man/man4/sis.4 b/share/man/man4/sis.4 index 365b0a2..414f0d8 100644 --- a/share/man/man4/sis.4 +++ b/share/man/man4/sis.4 @@ -113,7 +113,7 @@ The driver supports the following media options: .Bl -tag -width full-duplex .It full-duplex -Force full duplex operation +Force full duplex operation. .It half-duplex Force half duplex operation. .El diff --git a/share/man/man4/sk.4 b/share/man/man4/sk.4 index 71e30c9..4710f58 100644 --- a/share/man/man4/sk.4 +++ b/share/man/man4/sk.4 @@ -127,7 +127,7 @@ The driver supports the following media options: .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It full-duplex -Force full duplex operation +Force full duplex operation. .It half-duplex Force half duplex operation. .El diff --git a/share/man/man4/snd_hda.4 b/share/man/man4/snd_hda.4 index 6f7e8bd..84e0b22 100644 --- a/share/man/man4/snd_hda.4 +++ b/share/man/man4/snd_hda.4 @@ -235,10 +235,10 @@ first pin in that association. .Pp The sequence numbers 14 and 15 has a special meaning for input associations. Their presence in association defines it as multiplexed or mixed respectively. -If none of them present and there are more then one pin in association, +If none of them are present and there are more than one pin in association, the association will provide multichannel input. .Pp -For multichannel input/output assotiations sequence numbers encode +For multichannel input/output associations sequence numbers encode channel pairs positions: 0 - Front, 1 - Center/LFE, 2 - Back, 3 - Front Wide Center, 4 - Side. Standard combinations are: (0) - Stereo; (0, 2), (0, 4) - Quadro; @@ -368,7 +368,7 @@ Original pin configuration written by BIOS. .It Va dev.hdaa.%d.reconfig Setting this to a non-zero value makes driver to destroy existing pcm devices and process new pins configuration set via -.Va dev.hdaa.%d.nid%d_config. +.Va dev.hdaa.%d.nid%d_config . .It Va dev.pcm.%d.play.32bit , dev.pcm.%d.rec.32bit HDA controller uses 32bit representation for all samples of more then 16 bits. These variables allow to specify how many bits of these 32 should be @@ -586,7 +586,7 @@ subclass 3 (HDA), compatible with Intel HDA specification. .Pp The .Nm -driver supports more then two hundred different controllers and CODECs. +driver supports more than two hundred different controllers and CODECs. There is no sense to list all of them here, as in most cases specific CODEC configuration and wiring are more important then type of the CODEC itself. .Sh SEE ALSO diff --git a/share/man/man4/snd_hdspe.4 b/share/man/man4/snd_hdspe.4 index a403a17..676b945 100644 --- a/share/man/man4/snd_hdspe.4 +++ b/share/man/man4/snd_hdspe.4 @@ -29,7 +29,7 @@ .Os .Sh NAME .Nm snd_hdspe -.Nd "RME HDSPe brigde device driver" +.Nd "RME HDSPe bridge device driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: diff --git a/share/man/man4/splash.4 b/share/man/man4/splash.4 index 4b5f224..2a9a297 100644 --- a/share/man/man4/splash.4 +++ b/share/man/man4/splash.4 @@ -234,8 +234,7 @@ first example above. .Pp To load a binary ASCII drawing and display this while booting, include the following into your -.Pa /boot/loader.conf -: +.Pa /boot/loader.conf : .Bd -literal -offset indent splash_txt_load="YES" bitmap_load="YES" diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4 index 02644ae..f81f620 100644 --- a/share/man/man4/ste.4 +++ b/share/man/man4/ste.4 @@ -103,7 +103,7 @@ The driver supports the following media options: .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It full-duplex -Force full duplex operation +Force full duplex operation. .It half-duplex Force half duplex operation. .El diff --git a/share/man/man4/termios.4 b/share/man/man4/termios.4 index 2a69d7b..b914884 100644 --- a/share/man/man4/termios.4 +++ b/share/man/man4/termios.4 @@ -197,7 +197,8 @@ signal, or if the process group of the reading process is orphaned, the .Xr read 2 returns -1 with -.Va errno set to +.Va errno +set to .Er EIO and no signal is sent. diff --git a/share/man/man4/ti.4 b/share/man/man4/ti.4 index 2ef606c..f415459 100644 --- a/share/man/man4/ti.4 +++ b/share/man/man4/ti.4 @@ -144,7 +144,7 @@ or modes. .It 1000baseSX Set 1000Mbps (Gigabit Ethernet) operation. -Only full +Only .Ar full-duplex mode is supported at this speed. .El @@ -154,7 +154,7 @@ The driver supports the following media options: .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It full-duplex -Force full duplex operation +Force full-duplex operation. .It half-duplex Force half duplex operation. .El @@ -240,14 +240,14 @@ when either of the thresholds is exceeded. A value of 0 means that this parameter is ignored and receive BDs will only be returned when the receive max coalesced BDs value is reached. -The default valus is 170. +The default value is 170. .It Va dev.ti.%d.rx_max_coal_bds This value, receive max coalesced BDs, controls the number of receive buffer descriptors that will be coalesced before the NIC updates the receive return ring producer index. If this value is set to 0 it will disable receive buffer descriptor coalescing. -The default valus is 64. +The default value is 64. .It Va dev.ti.%d.ti_tx_coal_ticks This value, send coalesced ticks, controls the number of clock ticks (of 1 microseconds each) that must elapse before the NIC DMAs @@ -263,9 +263,9 @@ The default value is 2000. This value, send max coalesced BDs, controls the number of send buffer descriptors that will be coalesced before the NIC updates the send consumer index. -If this valus is set to 0 it will disable send buffer descriptor +If this value is set to 0 it will disable send buffer descriptor coalescing. -The default valus is 32. +The default value is 32. .It Va dev.ti.%d.tx_buf_ratio This value controls the ratio of the remaining memory in the NIC that should be devoted to transmit buffer vs. receive buffer. @@ -348,7 +348,7 @@ Write to the requested memory region on the Tigon board. The argument is .Vt "struct tg_mem" . .It Dv ALT_READ_TG_REG -Read the requested register on the Tigon board. +Read the requested register from the Tigon board. The argument is .Vt "struct tg_reg" . .It Dv ALT_WRITE_TG_REG diff --git a/share/man/man4/tl.4 b/share/man/man4/tl.4 index eb8351d..0716ce0 100644 --- a/share/man/man4/tl.4 +++ b/share/man/man4/tl.4 @@ -82,9 +82,9 @@ option is only available on those PHYs that support autonegotiation. Also, the PHY will not advertise those modes that have been explicitly disabled using the following media options. .It 10baseT/UTP -Set 10Mbps operation +Set 10Mbps operation. .It 100baseTX -Set 100Mbps (Fast Ethernet) operation +Set 100Mbps (Fast Ethernet) operation. .It 10base5/AUI Enable AUI/BNC interface (useful only with the built-in PHY). .El @@ -94,7 +94,7 @@ The driver supports the following media options: .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It full-duplex -Force full duplex operation +Force full duplex operation. .It half-duplex Force half duplex operation. .It hw-loopback diff --git a/share/man/man4/tws.4 b/share/man/man4/tws.4 index 9ce154e..3f2ab66 100644 --- a/share/man/man4/tws.4 +++ b/share/man/man4/tws.4 @@ -74,13 +74,13 @@ prompt before booting the kernel or stored in .Xr loader.conf 5 . .Bl -tag -width "hw.tws.use_32bit_sgls" .It Va hw.tws.cam_depth -The maximium queued CAM SIM requests for one controller. +The maximum queued CAM SIM requests for one controller. The default value is 256. .It Va hw.tws.enable_msi This tunable enables MSI support on the controller if set to a non-zero value. The default value is 0. .It Va hw.tws.queue_depth -The maximium queued requests for one controller. +The maximum queued requests for one controller. .It Va hw.tws.use_32bit_sgls Limit the driver to use only 32-bit SG elements regardless whether the operating system is running in 64-bit mode. diff --git a/share/man/man4/uhso.4 b/share/man/man4/uhso.4 index 26d169b..cc2e9ae 100644 --- a/share/man/man4/uhso.4 +++ b/share/man/man4/uhso.4 @@ -100,7 +100,7 @@ mode to modem mode. This behavior can be disabled by setting .Va hw.usb.uhso.auto_switch to 0 using -.Xr sysctl 8 +.Xr sysctl 8 . .Sh FILES .Bl -tag -width "XXXXXX" .It Pa /dev/cuaU?.? diff --git a/share/man/man4/ulpt.4 b/share/man/man4/ulpt.4 index cd92bfd..e0f5eb6 100644 --- a/share/man/man4/ulpt.4 +++ b/share/man/man4/ulpt.4 @@ -57,7 +57,7 @@ bi- or uni-directional protocol. The bits in the minor number select various features of the driver. .Bl -column "Minor Bit" "Functionxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -offset indent .Em "Minor Bit Function" -64 "Do not initialize (reset) the device on the port." +64 Do not initialize (reset) the device on the port. .El .Pp Some printers cannot handle the reset on open; in case of problems try the diff --git a/share/man/man4/umcs.4 b/share/man/man4/umcs.4 index 8ccd2ca..fc96ad2 100644 --- a/share/man/man4/umcs.4 +++ b/share/man/man4/umcs.4 @@ -68,7 +68,7 @@ driver which makes it behave like a Different ports on device are presented as sub-units, like .Pa /dev/ttyU0.1 and -.Pa /dev/ttyU0.2 +.Pa /dev/ttyU0.2 . .Sh HARDWARE The .Nm diff --git a/share/man/man4/uslcom.4 b/share/man/man4/uslcom.4 index a2a2dcc..14c78ff 100644 --- a/share/man/man4/uslcom.4 +++ b/share/man/man4/uslcom.4 @@ -41,7 +41,7 @@ uslcom_load="YES" .Sh DESCRIPTION The .Nm -driver supports Silicon Laboratories CP2101/CP2102 based serial adapters. +driver supports Silicon Laboratories CP2101/CP2102 based USB serial adapters. .Sh HARDWARE The following devices should work with the .Nm diff --git a/share/man/man4/vr.4 b/share/man/man4/vr.4 index cd49f4b..1390cc9 100644 --- a/share/man/man4/vr.4 +++ b/share/man/man4/vr.4 @@ -109,7 +109,7 @@ The driver supports the following media options: .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It full-duplex -Force full duplex operation +Force full duplex operation. .It half-duplex Force half duplex operation. .El diff --git a/share/man/man4/watchdog.4 b/share/man/man4/watchdog.4 index b0a52b1..4d953d6 100644 --- a/share/man/man4/watchdog.4 +++ b/share/man/man4/watchdog.4 @@ -38,6 +38,7 @@ The .Nm facility is used for controlling hardware and software watchdogs. .Pp +The device .Pa /dev/fido responds to a single .Xr ioctl 2 diff --git a/share/man/man4/wb.4 b/share/man/man4/wb.4 index 038af89..22a6706 100644 --- a/share/man/man4/wb.4 +++ b/share/man/man4/wb.4 @@ -108,7 +108,7 @@ The driver supports the following media options: .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It full-duplex -Force full duplex operation +Force full duplex operation. .It half-duplex Force half duplex operation. .El diff --git a/share/man/man4/wpi.4 b/share/man/man4/wpi.4 index efcfdba..f1bc15e 100644 --- a/share/man/man4/wpi.4 +++ b/share/man/man4/wpi.4 @@ -56,7 +56,7 @@ The .Nm driver provides support for the .Tn Intel -3945ABG Wireless network adapter +3945ABG Wireless network adapter. .Nm supports .Cm station , @@ -124,7 +124,7 @@ Data transmission is not possible in this state. .Xr wlan_tkip 4 , .Xr wlan_wep 4 , .Xr ifconfig 8 , -.Xr wpa_supplicant 8 . +.Xr wpa_supplicant 8 .Sh AUTHORS .An -nosplit The original diff --git a/share/man/man4/xl.4 b/share/man/man4/xl.4 index 9c8e8b0..d10d270 100644 --- a/share/man/man4/xl.4 +++ b/share/man/man4/xl.4 @@ -115,7 +115,7 @@ The driver supports the following media options: .Bl -tag -width xxxxxxxxxxxxxxxxxxxx .It full-duplex -Force full duplex operation +Force full duplex operation. .It half-duplex Force half duplex operation. .El diff --git a/share/man/man4/xnb.4 b/share/man/man4/xnb.4 index d4ebae8..9c65636 100644 --- a/share/man/man4/xnb.4 +++ b/share/man/man4/xnb.4 @@ -83,7 +83,7 @@ get traffic statistics. Runs a builtin suite of unit tests and displays the results. Does not affect the operation of the driver in any way. Note that the test suite simulates error conditions; this will result in -error messages being printed to the system system log. +error messages being printed to the system log. .El .Sh SEE ALSO .Xr arp 4 , @@ -104,7 +104,7 @@ driver was written by .Aq alans@spectralogic.com and .An John Suykerbuyk -.Aq johns@spectralogic.com +.Aq johns@spectralogic.com . .Sh CAVEATS Packets sent through Xennet pass over shared memory, so the protocol includes no form of link-layer checksum or CRC. @@ -127,7 +127,7 @@ to the OS. .Pp For this reason, it is recommended that if .Nm -is bridged to a physcal interface, then transmit checksum offloading should be +is bridged to a physical interface, then transmit checksum offloading should be disabled on the netfront. The Xennet protocol does not have any mechanism for the netback to request the netfront to do this; the operator must do it manually. -- cgit v1.1 From 8c3a5f5c354500d6905f4642f2b31794eb16cfa3 Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 03:46:43 +0000 Subject: Remove duplicate words in mdoc(7) pages. PR: 167810 Submitted by: Bryan Drewery {bryan!shatow%net} (hackers lounge) Found with: textproc/igor MFC after: 3 days --- share/man/man4/mk48txx.4 | 2 +- share/man/man4/mwl.4 | 2 +- share/man/man4/ng_patch.4 | 2 +- share/man/man4/ste.4 | 2 +- share/man/man4/vge.4 | 2 +- share/man/man7/tuning.7 | 2 +- share/man/man9/VOP_GETACL.9 | 2 +- share/man/man9/VOP_GETEXTATTR.9 | 2 +- share/man/man9/VOP_SETACL.9 | 2 +- share/man/man9/VOP_SETEXTATTR.9 | 2 +- share/man/man9/locking.9 | 2 +- share/man/man9/store.9 | 6 +++--- 12 files changed, 14 insertions(+), 14 deletions(-) (limited to 'share') diff --git a/share/man/man4/mk48txx.4 b/share/man/man4/mk48txx.4 index 66f9519..303ccc9 100644 --- a/share/man/man4/mk48txx.4 +++ b/share/man/man4/mk48txx.4 @@ -123,7 +123,7 @@ function. The offset into the control registers of the .Tn Mostek chip, -which is set by the the +which is set by the .Fn mk48txx_attach function. .It Fa sc_year0 diff --git a/share/man/man4/mwl.4 b/share/man/man4/mwl.4 index 62dc29e..910ae08 100644 --- a/share/man/man4/mwl.4 +++ b/share/man/man4/mwl.4 @@ -144,7 +144,7 @@ ifconfig wlan0 create wlandev mwl0 wlanmode mesh ifconfig wlan0 meshid my_mesh mode 11a inet 192.168.0.10/24 .Ed .Pp -Create two virtual 802.11a host-based access points, one with +Create two virtual 802.11a host-based access points, one with WEP enabled and one with no security, and bridge them to the fxp0 (wired) device: .Bd -literal -offset indent diff --git a/share/man/man4/ng_patch.4 b/share/man/man4/ng_patch.4 index e223c39..b1ddf4a 100644 --- a/share/man/man4/ng_patch.4 +++ b/share/man/man4/ng_patch.4 @@ -140,7 +140,7 @@ node allows to modify TTL and TOS/DSCP fields in IP packets. Suppose you have two adjacent simplex links to remote network (e.g.\& satellite), so that the packets expiring in between will generate unwanted ICMP-replies which have to go forth, not back. -Thus you need to raise TTL of every packet entering link link by 2 +Thus you need to raise TTL of every packet entering link by 2 to ensure the TTL will not reach zero there. So you setup .Xr ipfw 8 diff --git a/share/man/man4/ste.4 b/share/man/man4/ste.4 index f81f620..22982b1 100644 --- a/share/man/man4/ste.4 +++ b/share/man/man4/ste.4 @@ -136,7 +136,7 @@ Maximum number of time to delay RX interrupts. The valid range is 0 to 209712 in units of 1us, the default is 150 (150us). The value 0 effectively disables the RX interrupt moderation. -The resolution of of timer is about 3.2us so finer tuning than +The resolution of timer is about 3.2us so finer tuning than 3.2us wouldn't be available. The interface does not need to be brought down and up again before a change takes effect. diff --git a/share/man/man4/vge.4 b/share/man/man4/vge.4 index 5d48850..f8fd8f7 100644 --- a/share/man/man4/vge.4 +++ b/share/man/man4/vge.4 @@ -177,7 +177,7 @@ tunables: Maximum number of time to delay interrupts. The valid range is 0 to 5100 in units of 1us, the default is 150 (150us). -The resolution of of timer is about 20us so finer tuning than +The resolution of timer is about 20us so finer tuning than 20us wouldn't be available. The interface should be brought down and up again before a change takes effect. diff --git a/share/man/man7/tuning.7 b/share/man/man7/tuning.7 index a3aa296..b859c28 100644 --- a/share/man/man7/tuning.7 +++ b/share/man/man7/tuning.7 @@ -447,7 +447,7 @@ the content of mapped buffer to the reader. Increasing this value to a higher setting, such as `25165824' might improve performance on systems where space for mapping pipe buffers is quickly exhausted. -This exhaustion is not fatal; however, and it will only cause pipes to +This exhaustion is not fatal; however, and it will only cause pipes to fall back to using double-copy. .Pp The diff --git a/share/man/man9/VOP_GETACL.9 b/share/man/man9/VOP_GETACL.9 index d230340..6dbaca2 100644 --- a/share/man/man9/VOP_GETACL.9 +++ b/share/man/man9/VOP_GETACL.9 @@ -79,7 +79,7 @@ Otherwise, an appropriate error code is returned. .It Bq Er EINVAL The ACL type passed is invalid for this vnode. .It Bq Er EACCES -The the caller does not have the appropriate privilege. +The caller does not have the appropriate privilege. .It Bq Er ENOMEM Sufficient memory is not available to fulfill the request. .It Bq Er EOPNOTSUPP diff --git a/share/man/man9/VOP_GETEXTATTR.9 b/share/man/man9/VOP_GETEXTATTR.9 index cf00d26..e3abcb9 100644 --- a/share/man/man9/VOP_GETEXTATTR.9 +++ b/share/man/man9/VOP_GETEXTATTR.9 @@ -102,7 +102,7 @@ Otherwise, an appropriate error code is returned. .It Bq Er ENOATTR The requested attribute was not defined for this vnode. .It Bq Er EACCES -The the caller does not have the appropriate privilege. +The caller does not have the appropriate privilege. .It Bq Er ENXIO The request was not valid in this file system for the specified vnode and attribute name. diff --git a/share/man/man9/VOP_SETACL.9 b/share/man/man9/VOP_SETACL.9 index 482d289..b587771 100644 --- a/share/man/man9/VOP_SETACL.9 +++ b/share/man/man9/VOP_SETACL.9 @@ -84,7 +84,7 @@ Otherwise, an appropriate error code is returned. .It Bq Er EINVAL The ACL type passed is invalid for this vnode, or the ACL data is invalid. .It Bq Er EACCES -The the caller does not have the appropriate privilege. +The caller does not have the appropriate privilege. .It Bq Er ENOMEM Sufficient memory is not available to fulfill the request. .It Bq Er EOPNOTSUPP diff --git a/share/man/man9/VOP_SETEXTATTR.9 b/share/man/man9/VOP_SETEXTATTR.9 index 4bc5387..29f8cc2 100644 --- a/share/man/man9/VOP_SETEXTATTR.9 +++ b/share/man/man9/VOP_SETEXTATTR.9 @@ -91,7 +91,7 @@ Otherwise, an appropriate error code is returned. .Sh ERRORS .Bl -tag -width Er .It Bq Er EACCES -The the caller does not have the appropriate privilege. +The caller does not have the appropriate privilege. .It Bq Er ENXIO The request was not valid in this file system for the specified vnode and attribute name. diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index 00478bf..871dffe 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -280,7 +280,7 @@ This is often a bad idea because it generally relies on the programmer having good knowledge of all of the call graph above the place where .Fn mtx_sleep is being called and assumptions the calling code has made. -Because the lock gets dropped during sleep, one one must re-test all +Because the lock gets dropped during sleep, one must re-test all the assumptions that were made before, all the way up the call graph to the place where the lock was acquired. .Pp diff --git a/share/man/man9/store.9 b/share/man/man9/store.9 index e3297e1..d333eff 100644 --- a/share/man/man9/store.9 +++ b/share/man/man9/store.9 @@ -76,13 +76,13 @@ Stores a byte of data to the user-space address Stores a word of data to the user-space address .Pa base . .It Fn suword16 -Stores 16 bits of of data to the user-space address +Stores 16 bits of data to the user-space address .Pa base . .It Fn suword32 -Stores 32 bits of of data to the user-space address +Stores 32 bits of data to the user-space address .Pa base . .It Fn suword64 -Stores 64 bits of of data to the user-space address +Stores 64 bits of data to the user-space address .Pa base . .It Fn suswintr Stores a short word of data to the user-space address -- cgit v1.1 From a68d81c8cc91494ab9ac6d1f3db251662ee98b55 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 12 May 2012 07:01:21 +0000 Subject: mdoc: list items should be specified with the It macro. --- share/man/man4/ulpt.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/ulpt.4 b/share/man/man4/ulpt.4 index e0f5eb6..cd3b300 100644 --- a/share/man/man4/ulpt.4 +++ b/share/man/man4/ulpt.4 @@ -56,8 +56,8 @@ driver provides support for USB printers that follow the printer bi- or uni-directional protocol. The bits in the minor number select various features of the driver. .Bl -column "Minor Bit" "Functionxxxxxxxxxxxxxxxxxxxxxxxxxxxx" -offset indent -.Em "Minor Bit Function" -64 Do not initialize (reset) the device on the port. +.It Em "Minor Bit" Ta Em "Function" +.It "64" Ta "Do not initialize (reset) the device on the port." .El .Pp Some printers cannot handle the reset on open; in case of problems try the -- cgit v1.1 From 67d88d49d47f7e24f595399aff7b0180170a9fd8 Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 15:08:22 +0000 Subject: General mdoc(7) and typo fixes. PR: 167804 Submitted by: Nobuyuki Koganemaru (kogane!jp.freebsd.org) MFC after: 3 days --- share/man/man5/device.hints.5 | 2 +- share/man/man5/make.conf.5 | 2 +- share/man/man5/nsmb.conf.5 | 1 - share/man/man5/portsnap.conf.5 | 12 ++++++++---- share/man/man5/rc.conf.5 | 11 ++++++----- share/termcap/termcap.5 | 4 ++-- 6 files changed, 18 insertions(+), 14 deletions(-) (limited to 'share') diff --git a/share/man/man5/device.hints.5 b/share/man/man5/device.hints.5 index 9dcaccd..16d4627 100644 --- a/share/man/man5/device.hints.5 +++ b/share/man/man5/device.hints.5 @@ -162,7 +162,7 @@ hint.acpi.0.disabled="1" .Xr kenv 1 , .Xr loader.conf 5 , .Xr loader 8 , -.Xr resource_int_value 9 . +.Xr resource_int_value 9 .Sh HISTORY The .Nm diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 00512d6..9723f4c 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -575,7 +575,7 @@ files at build time. The value should include the full path to the .Pa .mc file(s), e.g., -.Pa /etc/mail/foo.mc +.Pa /etc/mail/foo.mc , .Pa /etc/mail/bar.mc . .It Va SENDMAIL_ALIASES .Pq Vt str diff --git a/share/man/man5/nsmb.conf.5 b/share/man/man5/nsmb.conf.5 index 2548a05..30fbecd 100644 --- a/share/man/man5/nsmb.conf.5 +++ b/share/man/man5/nsmb.conf.5 @@ -96,7 +96,6 @@ Possible keywords may include: .Bl -tag -width ".Pa /etc/nsmb.conf" .It Pa /etc/nsmb.conf The default remote mount-point configuration file. -.Pa "~/nsmb.conf" .It Pa ~/nsmb.conf The user specific remote mount-point configuration file. .El diff --git a/share/man/man5/portsnap.conf.5 b/share/man/man5/portsnap.conf.5 index b936d98..90225b2 100644 --- a/share/man/man5/portsnap.conf.5 +++ b/share/man/man5/portsnap.conf.5 @@ -47,7 +47,8 @@ specifies the source from which snapshots should be fetched. This is equivalent to the .Fl s Ar server option to -.Xr portsnap 8 , and will be ignored if the command-line +.Xr portsnap 8 , +and will be ignored if the command-line option is used. .Pp A line of the form @@ -58,7 +59,8 @@ belonging to an RSA keypair which is trusted to sign updates. This is equivalent to the .Fl k Ar KEY option to -.Xr portsnap 8 , and will be ignored if the command-line +.Xr portsnap 8 , +and will be ignored if the command-line option is used. .Pp A line of the form @@ -68,7 +70,8 @@ snapshot of the ports tree. This is equivalent to the .Fl d Ar workdir option to -.Xr portsnap 8 , and will be ignored if the command-line option +.Xr portsnap 8 , +and will be ignored if the command-line option is used. .Pp A line of the form @@ -82,7 +85,8 @@ commands. This is equivalent to the .Fl p Ar portsdir option to -.Xr portsnap 8 , and will be ignored if the command-line option +.Xr portsnap 8 , +and will be ignored if the command-line option is used. .Pp If more than one line of any of the above forms is included in diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 2ed4a56..f419335 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -386,7 +386,7 @@ is used to set the hostname via DHCP, this variable should be set to an empty string. If this value remains unset when the system is done booting your console login will display the default hostname of -.Dq Amnesiac. +.Dq Amnesiac . .It Va nisdomainname .Pq Vt str The NIS domain name of this host, or @@ -1299,6 +1299,7 @@ ifconfig_ed0_name="net0" ifconfig_net0="inet 192.0.2.1 netmask 0xffffff00" .Ed .It Va ipv6_enable +.Pq Vt bool This variable is deprecated. Use .Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6 @@ -1306,7 +1307,6 @@ and .Va ipv6_activate_all_interfaces if necessary. .Pp -.Pq Vt bool If the variable is .Dq Li YES , .Dq Li inet6 accept_rtadv @@ -1317,12 +1317,12 @@ and the is defined as .Dq Li YES . .It Va ipv6_prefer +.Pq Vt bool This variable is deprecated. Use .Va ip6addrctl_policy instead. .Pp -.Pq Vt bool If the variable is .Dq Li YES , the default address selection policy table set by @@ -3286,9 +3286,10 @@ is enabled, and a daemon is started for a non-default port, the .Va "moused_" Ns Ar XXX Ns Va "_flags" set of options has precedence over and replaces the default -.Va moused_flags (where +.Va moused_flags +(where .Ar XXX -is the name of the non-default port, i.e.\& +is the name of the non-default port, i.e.,\& .Ar ums0 ) . By setting .Va "moused_" Ns Ar XXX Ns Va "_flags" diff --git a/share/termcap/termcap.5 b/share/termcap/termcap.5 index 1fae963..1f9c7ea 100644 --- a/share/termcap/termcap.5 +++ b/share/termcap/termcap.5 @@ -1821,7 +1821,7 @@ from the status line can be given as .Sy \&ts and .Sy \&fs . -.Pf ( Xr \&fs +.Pf ( Sy \&fs must leave the cursor position in the same place that it was before .Sy \&ts . If necessary, the @@ -2067,7 +2067,7 @@ for ^C. .Pp Other specific terminal problems may be corrected by adding more capabilities of the form -.Sy x Em x . +.Sy x Ns Em x . .Ss Similar Terminals If there are two very similar terminals, one can be defined as being just like the other with certain exceptions. -- cgit v1.1 From 9507326d1fe188ab2a45d0290e92575f0b835f1a Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 16:12:36 +0000 Subject: Regenerate src.conf(5) for mdoc(7) and typo corrections. PR: 167804 Submitted by: Nobuyuki Koganemaru (kogane!jp.freebsd.org) MFC after: 3 days --- share/man/man5/src.conf.5 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 26cb4da..29d7abf 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd May 11, 2012 +.Dd May 12, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -209,7 +209,7 @@ This requires ports/textproc/libxml2 to be installed in /usr/local. .It Va WITHOUT_BINUTILS .\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 222090 2011-05-19 05:13:25Z imp Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib, -ld, nm, objcopy, objdump, readelf, size and strip) +ld, nm, objcopy, objdump, readelf, size and strip). .Bf -symbolic The option does not generally work for build targets, unless some alternative toolchain is enabled. @@ -294,12 +294,10 @@ Set to build additional clang and llvm tools, such as bugpoint. .It Va WITH_CLANG_IS_CC .\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 232322 2012-02-29 22:58:51Z dim Set to install the Clang C/C++ compiler as -.Pa /usr/bin/cc -, +.Pa /usr/bin/cc , .Pa /usr/bin/c++ and -.Pa /usr/bin/cpp -. +.Pa /usr/bin/cpp . .It Va WITHOUT_CPP .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru Set to not build @@ -900,7 +898,7 @@ Set to build the toolchain binaries shared. The set includes .Xr cc 1 , .Xr make 1 -and neccessary utilites like assembler, linker and library archive manager. +and necessary utilities like assembler, linker and library archive manager. .It Va WITHOUT_SOURCELESS .\" from FreeBSD: head/tools/build/options/WITHOUT_SOURCELESS 230972 2012-02-04 00:54:43Z rmh Set to not build kernel modules that include sourceless code (either microcode or native code for host CPU). @@ -1018,7 +1016,7 @@ protocols (usable only via 802.1X). Set to not build ZFS file system. .It Va WITHOUT_ZONEINFO .\" from FreeBSD: head/tools/build/options/WITHOUT_ZONEINFO 171994 2007-08-27 20:01:08Z remko -Set to not build the timezone database +Set to not build the timezone database. .El .Sh FILES .Bl -tag -compact -- cgit v1.1 From 1f9ce5f4a106d2a030f3613016cd6e3cd5cf9502 Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 18:10:27 +0000 Subject: Docuement requirement to alter some sysctls when using igb(4) with jumbo frames. PR: 153738 Submitted by: Tom Judge (tom!tomjudge.com) Discussed with: jfv (in part, a long time ago...) MFC after: 1 week --- share/man/man4/igb.4 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/igb.4 b/share/man/man4/igb.4 index 169d057..f487048 100644 --- a/share/man/man4/igb.4 +++ b/share/man/man4/igb.4 @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 11, 2011 +.Dd May 12, 2012 .Dt IGB 4 .Os .Sh NAME @@ -160,6 +160,14 @@ The minimum is 80, and the maximum is 4096. .It Va hw.igb.enable_aim If set to 1, enable Adaptive Interrupt Moderation. The default is to enable Adaptive Interrupt Moderation. +.It Va kern.ipc.nmbclusters +The maximum number of mbuf clusters allowed. +If the system has more than one igb card or jumbo frames are +enabled, this value will need to be increased. +.It Va kern.ipc.nmbjumbo9k +The maximum number of mbuf 9k jumbo clusters allowed. +Increasing this to allow for at least 8192 extra clusters +per interface can allow for an mtu of 8192. .El .Sh FILES .Bl -tag -width /dev/led/igb* -- cgit v1.1 From b7c89a0edb9e406ba8f5d96be69e3b21a419ba72 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 12 May 2012 19:53:44 +0000 Subject: Minor mdoc nit. --- share/man/man4/ddb.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/ddb.4 b/share/man/man4/ddb.4 index bb1214f..cefa7dd 100644 --- a/share/man/man4/ddb.4 +++ b/share/man/man4/ddb.4 @@ -1305,7 +1305,7 @@ command may be used to define a script by name. Scripts consist of a series of .Nm commands separated with the -.Ic ; +.Ql \&; character. For example: .Bd -literal -offset indent -- cgit v1.1 From 3a772ce0a64262ca826628f10e0ef71530545d74 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 12 May 2012 19:59:37 +0000 Subject: Remove end of line whitespace. --- share/man/man4/firewire.4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/firewire.4 b/share/man/man4/firewire.4 index 6541aeb..82e3622 100644 --- a/share/man/man4/firewire.4 +++ b/share/man/man4/firewire.4 @@ -83,11 +83,11 @@ On the .Nm bus, every device is identified by an EUI 64 address. .Pp -Debugging over the firewire interace is possible with the -.Xr dcons 4 +Debugging over the firewire interace is possible with the +.Xr dcons 4 driver. Please see -.Pa http://wiki.freebsd.org/DebugWithDcons +.Pa http://wiki.freebsd.org/DebugWithDcons for details on how to setup debugging with firewire. .Sh FILES .Bl -tag -compact -- cgit v1.1 From b11eebdff9fea4ae63e09ac8aaa83ee2f7634907 Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 20:06:17 +0000 Subject: Fix an mdoc(7) nit. --- share/man/man9/bus_space.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/bus_space.9 b/share/man/man9/bus_space.9 index 59c3607..0f0425a 100644 --- a/share/man/man9/bus_space.9 +++ b/share/man/man9/bus_space.9 @@ -1610,7 +1610,7 @@ Access to these types of memory regions should be with the .Fn bus_space_*_stream_N functions. .Pp -.Bl -tag -compact +.Bl -tag -compact -width Fn .It Fn bus_space_read_stream_1 .It Fn bus_space_read_stream_2 .It Fn bus_space_read_stream_4 -- cgit v1.1 From 29c01a336dcea48ea62dab087ad02e32e50c7ccd Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 20:08:16 +0000 Subject: Set formatting width and offset in DB_COMMAND(9). --- share/man/man9/DB_COMMAND.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/DB_COMMAND.9 b/share/man/man9/DB_COMMAND.9 index d452057..bcb550c 100644 --- a/share/man/man9/DB_COMMAND.9 +++ b/share/man/man9/DB_COMMAND.9 @@ -71,7 +71,7 @@ The general command syntax: .Ar address Ns Op Li , Ns Ar count , translates into the following parameters for .Fa command_function : -.Bl -tag +.Bl -tag -width Fa -offset indent .It Fa addr The address passed to the command as an argument. .It Fa have_addr -- cgit v1.1 From 1ad1048d19f6c3f268b6cd701a9aa01021fea708 Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 20:41:40 +0000 Subject: Fix mdoc(7) markup. --- share/man/man9/DECLARE_GEOM_CLASS.9 | 2 +- share/man/man9/namei.9 | 2 +- share/man/man9/usbdi.9 | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'share') diff --git a/share/man/man9/DECLARE_GEOM_CLASS.9 b/share/man/man9/DECLARE_GEOM_CLASS.9 index a47ea8e..01f074d 100644 --- a/share/man/man9/DECLARE_GEOM_CLASS.9 +++ b/share/man/man9/DECLARE_GEOM_CLASS.9 @@ -49,7 +49,7 @@ modules GEOM classes and it is the only official way for class registration. The arguments to .Fn DECLARE_GEOM_CLASS are: -.Bl -tag -offset indent +.Bl -tag -offset indent -width Fa .It Fa class The .Vt g_class diff --git a/share/man/man9/namei.9 b/share/man/man9/namei.9 index 1ba475a..dc9ef8e 100644 --- a/share/man/man9/namei.9 +++ b/share/man/man9/namei.9 @@ -316,7 +316,7 @@ If successful, .Fn namei will return 0, otherwise it will return an error. .Sh FILES -.Bl -tag +.Bl -tag -width Pa .It Pa src/sys/kern/vfs_lookup.c .El .Sh ERRORS diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9 index c04c946..72fec96 100644 --- a/share/man/man9/usbdi.9 +++ b/share/man/man9/usbdi.9 @@ -435,7 +435,7 @@ The value of this field is given in milliseconds and is independent of device speed. . Depending on the endpoint type, this field has different meaning: -.Bl -tag +.Bl -tag -width "UE_ISOCHRONOUS" .It UE_INTERRUPT "0" use the default interrupt interval based on endpoint descriptor. "Else" use the given value for polling rate. @@ -461,7 +461,7 @@ timeout of 250ms will be used. .Fa frames field sets the maximum number of frames. If zero is specified it will yield the following results: -.Bl -tag +.Bl -tag -width "UE_INTERRUPT" .It UE_BULK xfer->nframes = 1; .It UE_INTERRUPT @@ -487,7 +487,7 @@ be used when setting up the given USB transfer. .Fa flags field has type "struct usb_xfer_flags" and allows one to set initial flags an USB transfer. Valid flags are: -.Bl -tag +.Bl -tag -width "force_short_xfer" .It force_short_xfer This flag forces the last transmitted USB packet to be short. A short packet has a length of less than "xfer->max_packet_size", which @@ -507,7 +507,7 @@ This flag causes a failing USB transfer to remain first in the PIPE queue except in the case of "xfer->error" equal to "USB_ERR_CANCELLED". No other USB transfers in the affected PIPE queue will be started until either: -.Bl -tag +.Bl -tag -width "1" .It 1 The failing USB transfer is stopped using "usbd_transfer_stop()". .It 2 @@ -574,7 +574,7 @@ flag can not be changed during operation. . . .It stall_pipe -.Bl -tag +.Bl -tag -width "Device Side Mode" .It Device Side Mode Setting this flag will cause STALL pids to be sent to the endpoint belonging to this transfer before the transfer is started. -- cgit v1.1 From 2bbcb90c8497481a621bfdc8f51f8dee788890ca Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 20:46:19 +0000 Subject: mdoc(7) markup cleanup. --- share/man/man9/eventtimers.9 | 4 ++-- share/man/man9/fail.9 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man9/eventtimers.9 b/share/man/man9/eventtimers.9 index 2ed15d0..2f528bf 100644 --- a/share/man/man9/eventtimers.9 +++ b/share/man/man9/eventtimers.9 @@ -86,7 +86,7 @@ struct eventtimer { Event timers are responsible for generating interrupts at specified time or periodically, to run different time-based events. Subsystem consists of three main parts: -.Bl -tag +.Bl -tag -width "Consumers" .It Drivers Manage hardware to generate requested time events. .It Consumers @@ -107,7 +107,7 @@ Driver API is built around eventtimer structure. To register its functionality driver allocates that structure and calls .Fn et_register . Driver should fill following fields there: -.Bl -tag +.Bl -tag -width Va .It Va et_name Unique name of the event timer for management purposes. .It Va et_flags diff --git a/share/man/man9/fail.9 b/share/man/man9/fail.9 index 5505d13..6a3d815 100644 --- a/share/man/man9/fail.9 +++ b/share/man/man9/fail.9 @@ -166,7 +166,7 @@ A pid can optionally be specified. The fail point term is only executed when invoked by a process with a matching p_pid. .Sh EXAMPLES -.Bl -tag +.Bl -tag -width Sy .It Sy sysctl debug.fail_point.foobar="2.1%return(5)" 21/1000ths of the time, execute .Fa code -- cgit v1.1 From 567e856364e9a6c28ce5aa474be3a80885480ce5 Mon Sep 17 00:00:00 2001 From: gjb Date: Sat, 12 May 2012 20:53:00 +0000 Subject: Remove leading .Ns macro to silence mdoc(7) warning. --- share/man/man9/spl.9 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9 index 08fd4d4..a71918c 100644 --- a/share/man/man9/spl.9 +++ b/share/man/man9/spl.9 @@ -112,8 +112,7 @@ The system automatically arranges for interrupts in the .Em xxx group to be called at a priority >= -.Ns spl Ns Em xxx -\&(). +.Em spl Ns Fn xxx .Pp The function .Fn splx -- cgit v1.1 From f2a3e3a59495487d1cfe84e23aae790cd03852c4 Mon Sep 17 00:00:00 2001 From: gjb Date: Mon, 14 May 2012 14:33:08 +0000 Subject: Fix an mdoc(7) formatting nit. --- share/man/man8/rc.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index 56a33ce..ed8b706 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -452,7 +452,7 @@ before starting the daemon. Following tradition, all startup files reside in .Pa /etc . .Sh FILES -.Bl -tag -compact +.Bl -tag -compact -width Pa .It Pa /etc/rc .It Pa /etc/rc.conf .It Pa /etc/rc.conf.local -- cgit v1.1 From ec1de9262db190b7356128f7e8fc6326910a02f3 Mon Sep 17 00:00:00 2001 From: joel Date: Mon, 14 May 2012 16:25:17 +0000 Subject: mdoc: Avoid playing tricks with Ns: If Nm is present in the SYNOPSIS section, it will be output on its own line. Ns cancels this effect however. This change is also consistent with the rest of our manual pages. --- share/man/man4/divert.4 | 2 +- share/man/man4/gre.4 | 6 ++---- share/man/man4/ipfirewall.4 | 7 +++---- share/man/man4/send.4 | 5 +---- share/man/man4/siftr.4 | 13 ++++++++----- 5 files changed, 15 insertions(+), 18 deletions(-) (limited to 'share') diff --git a/share/man/man4/divert.4 b/share/man/man4/divert.4 index d0e6785..d22275e 100644 --- a/share/man/man4/divert.4 +++ b/share/man/man4/divert.4 @@ -21,7 +21,7 @@ kernel configuration file: .Ed .Pp Alternatively, to load -.Ns Nm +the driver as a module at boot time, add the following lines into the .Xr loader.conf 5 file: diff --git a/share/man/man4/gre.4 b/share/man/man4/gre.4 index 827c93e..da33fd3 100644 --- a/share/man/man4/gre.4 +++ b/share/man/man4/gre.4 @@ -37,16 +37,14 @@ .Nd encapsulating network device .Sh SYNOPSIS To compile the -.Ns Nm -device into the kernel, place the following line in the kernel +driver into the kernel, place the following line in the kernel configuration file: .Bd -ragged -offset indent .Cd "device gre" .Ed .Pp Alternatively, to load the -.Ns Nm -device as a module at boot time, place the following line in +driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent if_gre_load="YES" diff --git a/share/man/man4/ipfirewall.4 b/share/man/man4/ipfirewall.4 index e1c9a8a..f19d024 100644 --- a/share/man/man4/ipfirewall.4 +++ b/share/man/man4/ipfirewall.4 @@ -9,15 +9,14 @@ .Nd IP packet filter and traffic accounting .Sh SYNOPSIS To compile -.Ns Nm +the driver into the kernel, place the following option in the kernel configuration file: .Bd -ragged -offset indent .Cd "options IPFIREWALL" .Ed .Pp -Other kernel options related to -.Ns Nm +Other related kernel options which may also be useful are: .Bd -ragged -offset indent .Cd "options IPFIREWALL_DEFAULT_TO_ACCEPT" @@ -27,7 +26,7 @@ which may also be useful are: .Ed .Pp To load -.Ns Nm +the driver as a module at boot time, add the following line into the .Xr loader.conf 5 file: diff --git a/share/man/man4/send.4 b/share/man/man4/send.4 index 9cfcd53..3f90eaf 100644 --- a/share/man/man4/send.4 +++ b/share/man/man4/send.4 @@ -38,10 +38,7 @@ .Ft int .Fn socket PF_INET6 SOCK_RAW IPPROTO_SEND .Pp -To enable -.Ns Nm -support, load the kernel side SeND as a module. -To load it at boot time, add the following line to +To load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent send_load="YES" diff --git a/share/man/man4/siftr.4 b/share/man/man4/siftr.4 index d0349ca..625c657 100644 --- a/share/man/man4/siftr.4 +++ b/share/man/man4/siftr.4 @@ -38,14 +38,14 @@ .Nd Statistical Information For TCP Research .Sh SYNOPSIS To load -.Ns Nm +the driver as a module at run-time, run the following command as root: .Bd -literal -offset indent kldload siftr .Ed .Pp Alternatively, to load -.Ns Nm +the driver as a module at boot time, add the following line into the .Xr loader.conf 5 file: @@ -53,13 +53,16 @@ file: siftr_load="YES" .Ed .Sh DESCRIPTION +The .Nm -.Ns ( Em S Ns tatistical +.Po +.Em S Ns tatistical .Em I Ns nformation .Em F Ns or .Em T Ns CP -.Em R Ns esearch ) -is a kernel module that logs a range of statistics on active TCP connections to +.Em R Ns esearch +.Pc +kernel module logs a range of statistics on active TCP connections to a log file. It provides the ability to make highly granular measurements of TCP connection state, aimed at system administrators, developers and researchers. -- cgit v1.1 From 2179867a54092808aee0c148d893d946050fba07 Mon Sep 17 00:00:00 2001 From: eadler Date: Tue, 15 May 2012 20:15:17 +0000 Subject: Rework sample code which sets SSH_AUTH_SOCK to the user's ssh-agent socket path if running PR: 167932 Submitted by: madpilot (pr) Submitted by: wblock (final patch) Reviewed by: If someone else reviewed your modification. Approved by: cperciva (implicit) MFC after: 3 days --- share/examples/csh/dot.cshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/examples/csh/dot.cshrc b/share/examples/csh/dot.cshrc index 17951d4..175bfd2 100644 --- a/share/examples/csh/dot.cshrc +++ b/share/examples/csh/dot.cshrc @@ -5,7 +5,7 @@ # Sets SSH_AUTH_SOCK to the user's ssh-agent socket path if running if (${?SSH_AUTH_SOCK} != "1") then - setenv SSH_AUTH_SOCK `sockstat | grep "${USER}" | cut -d ' ' -f 6` + setenv SSH_AUTH_SOCK `sockstat | grep "^${USER} " | awk '/ssh-agent/ { print $6 }'` endif # Change only root's prompt -- cgit v1.1 From 6f7c7353004e2ff9709b326a4008ce8ea63d9270 Mon Sep 17 00:00:00 2001 From: gber Date: Thu, 17 May 2012 10:11:18 +0000 Subject: Import work done under project/nand (@235533) into head. The NAND Flash environment consists of several distinct components: - NAND framework (drivers harness for NAND controllers and NAND chips) - NAND simulator (NANDsim) - NAND file system (NAND FS) - Companion tools and utilities - Documentation (manual pages) This work is still experimental. Please use with caution. Obtained from: Semihalf Supported by: FreeBSD Foundation, Juniper Networks --- share/man/man4/Makefile | 2 + share/man/man4/nand.4 | 140 ++++++++++++++++++++++++++++++++++++ share/man/man4/nandsim.4 | 184 +++++++++++++++++++++++++++++++++++++++++++++++ share/man/man5/Makefile | 4 ++ share/man/man5/nandfs.5 | 129 +++++++++++++++++++++++++++++++++ share/mk/bsd.own.mk | 1 + 6 files changed, 460 insertions(+) create mode 100644 share/man/man4/nand.4 create mode 100644 share/man/man4/nandsim.4 create mode 100644 share/man/man5/nandfs.5 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index dffe304..2c23a9c 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -250,6 +250,8 @@ MAN= aac.4 \ mwlfw.4 \ mxge.4 \ my.4 \ + nand.4 \ + nandsim.4 \ natm.4 \ natmip.4 \ ncr.4 \ diff --git a/share/man/man4/nand.4 b/share/man/man4/nand.4 new file mode 100644 index 0000000..d23e292 --- /dev/null +++ b/share/man/man4/nand.4 @@ -0,0 +1,140 @@ +.\" +.\" Copyright (c) 2012 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written by Semihalf under sponsorship from +.\" the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 8, 2012 +.Dt NAND 4 +.Os +.Sh NAME +.Nm nand +.Nd NAND Flash framework +.Sh SYNOPSIS +.Cd "device nand" +.Sh DESCRIPTION +The +.Fx +.Nm +framework consists of a set of interfaces that aim to provide an extensible, +object oriented environement for NAND controllers and NAND Flash memory chips +from various hardware vendors, and to allow for uniform and flexible +management of the NAND devices. It comprises of the following major +components: +.Bl -bullet +.It +NAND Flash controller (NFC) interface. +.Pp +Defines methods which allow to send commands as well as send/receive data +between the controller and a NAND chip. Back-end drivers for specific NAND +controllers plug into this interface and implement low-level routines for a +given NAND controller. +.Pp +This layer implements basic functionality of a NAND Flash controller. It +allows to send command and address to chip, drive CS (chip select line), as +well as read/write to the selected NAND chip. This layer is independent of +NAND chip devices actually connected to the controller. +.It +NAND chip interface. +.Pp +Provides basic operations like read page, program page, erase block. Currently +three generic classes of drivers are available, which provide support for the +following chips: +.Bl -bullet +.It +large page +.It +small page +.It +ONFI-compliant +.El +.Pp +This layer implements basic operations to be performed on a NAND chip, like +read, program, erase, get status etc. Since these operations use specific +commands (depending on the vendor), each chip has potentially its own +implementation of the commands set. +.Pp +The framework is extensible so it is also possible to create a custom command +set for a non standard chip support. +.It +NANDbus. +.Pp +This layer is responsible for enumerating NAND chips in the system and +establishing the hierarchy between chips and their supervising controllers. +.Pp +Its main purpose is detecting type of NAND chips connected to a given chip +select (CS line). It also allows manages locking access to the NAND +controller. NANDbus passes requests from an active chip to the chip +controller. +.It +NAND character / GEOM device. +.Pp +For each NAND chip found in a system a character and GEOM devices are created +which allows to read / write directly to a device, as well as perform other +specific operations (like via ioctl). +.Pp +There are two GEOM devices created for each NAND chip: +.Bl -bullet +.It +raw device +.It +normal device +.El +.Pp +Raw device allows to bypass ECC checking when reading/writing to it, while +normal device always uses ECC algorithm to validate the read data. +.Pp +NAND character devices will be created for each NAND chip detected while +probing the NAND controller. +.El +.Sh SEE ALSO +.Xr libnandfs 3 , +.Xr gnand 4 , +.Xr nandsim 4 , +.Xr nandfs 5 , +.Xr makefs 8 , +.Xr mount_nandfs 8 , +.Xr nandfs 8 , +.Xr nandsim 8 , +.Xr nandtool 8 , +.Xr newfs_nandfs 8 , +.Xr umount_nandfs 8 +.Sh STANDARDS +Open NAND Flash Interface Working Group +.Pq Vt ONFI . +.Sh HISTORY +The +.Nm +framework support first appeared in +.Fx 10.0 . +.Sh AUTHOR +The +.Nm +framework was designed and developed by +.An Grzegorz Bernacki . +This manual page was written by +.An Rafal Jaworowski . diff --git a/share/man/man4/nandsim.4 b/share/man/man4/nandsim.4 new file mode 100644 index 0000000..154d1ff --- /dev/null +++ b/share/man/man4/nandsim.4 @@ -0,0 +1,184 @@ +.\" +.\" Copyright (c) 2012 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written by Semihalf under sponsorship from +.\" the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 8, 2012 +.Dt NANDSIM 4 +.Os +.Sh NAME +.Nm nandsim +.Nd NAND Flash simulator driver +.Sh SYNOPSIS +.Cd "device nand" +.Cd "device nandsim" +.Cd "options ALQ" +.Sh DESCRIPTION +The +.Nm +is part of the +.Fx +NAND framework +.Xr nand 4 +and can be characterized with the following highlights: +.Bl -bullet +.It +plugs into the +.Xr nand 4 +framework APIs as if it were a hardware controller (hanging on the nexus bus) +with real NAND chips connected to it +.It +physically part of the kernel code (either statically linked into the kernel +image or built as a module) +.It +controlled with a user space program +.Xr nandsim 8 +.El +.Pp +From the user perspective, the +.Nm +allows for imitating ONFI-compliant NAND Flash devices as if they were +attached to the system via a virtual controller. +.Pp +Some +.Nm +features rely on the ability to log contents to a file, which is achieved +through the +.Xr alq 9 +facility. +.Sh SEE ALSO +.Xr nand 4 , +.Xr nandsim.conf 5 , +.Xr nandsim 8 +.Sh STANDARDS +Open NAND Flash Interface Working Group +.Pq Vt ONFI . +.Sh HISTORY +The +.Nm +support first appeared in +.Fx 10.0 . +.Sh AUTHOR +The +.Nm +kernel driver was developed by +.An Grzegorz Bernacki . +This manual page was written by +.An Rafal Jaworowski . +.\" +.\" Copyright (c) 2012 The FreeBSD Foundation +.\" All rights reserved. +.\" +.\" This documentation was written by Semihalf under sponsorship from +.\" the FreeBSD Foundation. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd March 8, 2012 +.Dt NANDSIM 4 +.Os +.Sh NAME +.Nm nandsim +.Nd NAND Flash simulator driver +.Sh SYNOPSIS +.Cd "device nand" +.Cd "device nandsim" +.Cd "options ALQ" +.Sh DESCRIPTION +The +.Nm +is part of the +.Fx +NAND framework +.Xr nand 4 +and can be characterized with the following highlights: +.Bl -bullet +.It +plugs into the +.Xr nand 4 +framework APIs as if it were a hardware controller (hanging on the nexus bus) +with real NAND chips connected to it +.It +physically part of the kernel code (either statically linked into the kernel +image or built as a module) +.It +controlled with a user space program +.Xr nandsim 8 +.El +.Pp +From the user perspective, the +.Nm +allows for imitating ONFI-compliant NAND Flash devices as if they were +attached to the system via a virtual controller. +.Pp +Some +.Nm +features rely on the ability to log contents to a file, which is achieved +through the +.Xr alq 9 +facility. +.Sh SEE ALSO +.Xr nand 4 , +.Xr nandsim.conf 5 , +.Xr nandsim 8 +.Sh STANDARDS +Open NAND Flash Interface Working Group +.Pq Vt ONFI . +.Sh HISTORY +The +.Nm +support first appeared in +.Fx 10.0 . +.Sh AUTHOR +The +.Nm +kernel driver was developed by +.An Grzegorz Bernacki . +This manual page was written by +.An Rafal Jaworowski . diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index b05c1eb..c7a3c59 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -85,6 +85,10 @@ MLINKS+=resolver.5 resolv.conf.5 MAN+= hesiod.conf.5 .endif +.if ${MK_NAND} != "no" +MAN+= nandfs.5 +.endif + .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" _boot.config.5= boot.config.5 .endif diff --git a/share/man/man5/nandfs.5 b/share/man/man5/nandfs.5 new file mode 100644 index 0000000..43d586c --- /dev/null +++ b/share/man/man5/nandfs.5 @@ -0,0 +1,129 @@ +.\" +.\" Copyright (c) 2010 Semihalf +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd Nov 11, 2010 +.Dt NANDFS 5 +.Os +.Sh NAME +.Nm nandfs +.Nd NAND Flash file system +.Sh SYNOPSIS +To compile support for the +.Nm , +place the following in your kernel configuration file: +.Bd -ragged -offset indent +.Cd "options NANDFS" +.Ed +.Pp +Even though the NAND FS can be used with any storage media, it has been +optimized and designed towards NAND Flash devices, so typically the following +driver is used: +.Bd -ragged -offset indent +.Cd "device nand" +.Ed +.Sh DESCRIPTION +The +.Nm +driver enables +.Fx +with support for NAND-oriented file system. +.Pp +It is a log-structured style file system with the following major features and +characteristics: +.Bl -bullet +.It +Hard links, symbolic links support +.It +Block journaling +.It +Copy-On-Write +.It +Snapshots (continuous, taken automatically, simultaneously mountable) +.It +Quick crash recovery at mount time +.It +64-bit data structures; supports many files, large files and volumes +.It +POSIX file permissions +.It +Checksum / ECC +.El +.Sh EXAMPLES +The most common usage is mounting the file system: +.Pp +.Dl "mount -t nandfs /dev/ /mnt" +.Pp +or: +.Dl "mount_nandfs /dev/ /mnt" +.Pp +where +.Ar gnandN +is the GEOM device representing a Flash partition (slice) containing the +.Nm +structure, and +.Pa /mnt +is a mount point. +.Pp +.Pp +It is possible to define an entry in +.Pa /etc/fstab +for the +.Nm : +.Bd -literal +/dev/gnand0 /flash nandfs rw 0 0 +.Ed +.Pp +This will mount a +.Nm +partition at the specified mount point during system boot. +.Sh SEE ALSO +.Xr gnand 4 , +.Xr nand 4 , +.Xr mount_nandfs 8 , +.Xr nandfs 8 , +.Xr nandsim 8 , +.Xr nandtool 8 , +.Xr umount_nandfs 8 +.Sh HISTORY +The NAND FS concepts are based on NILFS principles and initial implementation +was derived from early NILFS NetBSD code (read only). Since then the NAND FS +code diverged significantly and is by no means compatible with NILFS. +.Pp +The NAND Flash file system first appeared in +.Fx 10.0 . +.Sh AUTHOR +The NAND FS was written by +.An Grzegorz Bernacki with the help of +.An Mateusz Guzik , +based on the NetBSD code created by +.An Reinoud Zandijk . +Additional help and support by +.An Lukasz Plachno , +.An Jan Sieka and +.An Lukasz Wojcik . +This manual page was written by +.An Rafal Jaworowski . diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 9802e79..b19253e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -426,6 +426,7 @@ __DEFAULT_NO_OPTIONS = \ ICONV \ IDEA \ LIBCPLUSPLUS \ + NAND \ OFED \ SHARED_TOOLCHAIN -- cgit v1.1 From b7cd9ae8800ae9b80f18379f93bb1498e2d523d1 Mon Sep 17 00:00:00 2001 From: joel Date: Thu, 17 May 2012 11:29:22 +0000 Subject: mdoc: remove superfluous paragraph macro. --- share/man/man5/nandfs.5 | 1 - 1 file changed, 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/nandfs.5 b/share/man/man5/nandfs.5 index 43d586c..2ef3259 100644 --- a/share/man/man5/nandfs.5 +++ b/share/man/man5/nandfs.5 @@ -88,7 +88,6 @@ structure, and .Pa /mnt is a mount point. .Pp -.Pp It is possible to define an entry in .Pa /etc/fstab for the -- cgit v1.1 From 8d93169f7ccbcc10d289a7352120964d91d3e78a Mon Sep 17 00:00:00 2001 From: gber Date: Thu, 17 May 2012 11:53:38 +0000 Subject: Removed repeated content from man page. --- share/man/man4/nandsim.4 | 92 ------------------------------------------------ 1 file changed, 92 deletions(-) (limited to 'share') diff --git a/share/man/man4/nandsim.4 b/share/man/man4/nandsim.4 index 154d1ff..ebb5452 100644 --- a/share/man/man4/nandsim.4 +++ b/share/man/man4/nandsim.4 @@ -90,95 +90,3 @@ kernel driver was developed by .An Grzegorz Bernacki . This manual page was written by .An Rafal Jaworowski . -.\" -.\" Copyright (c) 2012 The FreeBSD Foundation -.\" All rights reserved. -.\" -.\" This documentation was written by Semihalf under sponsorship from -.\" the FreeBSD Foundation. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" -.\" $FreeBSD$ -.\" -.Dd March 8, 2012 -.Dt NANDSIM 4 -.Os -.Sh NAME -.Nm nandsim -.Nd NAND Flash simulator driver -.Sh SYNOPSIS -.Cd "device nand" -.Cd "device nandsim" -.Cd "options ALQ" -.Sh DESCRIPTION -The -.Nm -is part of the -.Fx -NAND framework -.Xr nand 4 -and can be characterized with the following highlights: -.Bl -bullet -.It -plugs into the -.Xr nand 4 -framework APIs as if it were a hardware controller (hanging on the nexus bus) -with real NAND chips connected to it -.It -physically part of the kernel code (either statically linked into the kernel -image or built as a module) -.It -controlled with a user space program -.Xr nandsim 8 -.El -.Pp -From the user perspective, the -.Nm -allows for imitating ONFI-compliant NAND Flash devices as if they were -attached to the system via a virtual controller. -.Pp -Some -.Nm -features rely on the ability to log contents to a file, which is achieved -through the -.Xr alq 9 -facility. -.Sh SEE ALSO -.Xr nand 4 , -.Xr nandsim.conf 5 , -.Xr nandsim 8 -.Sh STANDARDS -Open NAND Flash Interface Working Group -.Pq Vt ONFI . -.Sh HISTORY -The -.Nm -support first appeared in -.Fx 10.0 . -.Sh AUTHOR -The -.Nm -kernel driver was developed by -.An Grzegorz Bernacki . -This manual page was written by -.An Rafal Jaworowski . -- cgit v1.1 From 61ebbeb1e130c2a1a8cdab44f3f0baf5f5568ede Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 17 May 2012 20:49:44 +0000 Subject: mdoc(7) style/formatting fixes. While here, fix a few nits igor(1) does not like. MFC after: 3 days --- share/man/man4/siftr.4 | 114 ++++++++++++++++++++++++------------------------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'share') diff --git a/share/man/man4/siftr.4 b/share/man/man4/siftr.4 index 625c657..ab92f77 100644 --- a/share/man/man4/siftr.4 +++ b/share/man/man4/siftr.4 @@ -94,7 +94,7 @@ utilises the .Xr sysctl 8 interface to export its configuration variables to user-space. The following variables are available: -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va net.inet.siftr.enabled controls whether the module performs its measurements or not. @@ -107,7 +107,7 @@ packet filtering hooks are only inserted when .Va net.inet.siftr.enabled is set to 1. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va net.inet.siftr.ppl controls how many inbound/outbound packets for a given TCP connection will cause a log message to be generated for the connection. @@ -116,13 +116,13 @@ every packet of every TCP connection. The value can be set to any integer in the range [1,2^32], and can be changed at any time, even while the module is enabled. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va net.inet.siftr.logfile controls the path to the file that the module writes its log messages to. By default, the file /var/log/siftr.log is used. The path can be changed at any time, even while the module is enabled. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va net.inet.siftr.genhashes controls whether a hash is generated for each TCP packet seen by .Nm . @@ -153,36 +153,36 @@ sysname=FreeBSD sysver=604000 ipmode=4 .Ed .Pp Field descriptions are as follows: -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va enable_time_secs time at which the module was enabled, in seconds since the UNIX epoch. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va enable_time_usecs time at which the module was enabled, in microseconds since enable_time_secs. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va siftrver version of .Nm . .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va hz tick rate of the kernel in ticks per second. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va tcp_rtt_scale smoothed RTT estimate scaling factor. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va sysname operating system name. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va sysver operating system version. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va ipmode IP mode as defined at compile time. An ipmode of "4" means IPv6 is not supported and IP addresses are logged in @@ -205,7 +205,7 @@ o,0xbec491a5,1238556193.463551,172.16.7.28,22,172.16.2.5,55931, \\ .Ed .Pp Field descriptions are as follows: -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 1 Direction of packet that triggered the log message. Either @@ -214,77 +214,77 @@ for in, or .Qq o for out. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 2 Hash of the packet that triggered the log message. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 3 Time at which the packet that triggered the log message was processed by the .Xr pfil 9 hook function, in seconds and microseconds since the UNIX epoch. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 4 The IPv4 or IPv6 address of the local host, in dotted quad (IPv4 packet) or colon-separated hex (IPv6 packet) notation. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 5 The TCP port that the local host is communicating via. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 6 The IPv4 or IPv6 address of the foreign host, in dotted quad (IPv4 packet) or colon-separated hex (IPv6 packet) notation. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 7 The TCP port that the foreign host is communicating via. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 8 The slow start threshold for the flow, in bytes. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 9 The current congestion window for the flow, in bytes. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 10 The current bandwidth-controlled window for the flow, in bytes. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 11 The current sending window for the flow, in bytes. The post scaled value is reported, except during the initial handshake (first few packets), during which time the unscaled value is reported. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 12 The current receive window for the flow, in bytes. The post scaled value is always reported. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 13 The current window scaling factor for the sending window. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 14 The current window scaling factor for the receiving window. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 15 The current state of the TCP finite state machine, as defined in .Aq Pa netinet/tcp_fsm.h . .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 16 The maximum segment size for the flow, in bytes. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 17 The current smoothed RTT estimate for the flow, in units of TCP_RTT_SCALE * HZ, where TCP_RTT_SCALE is a define found in tcp_var.h, and HZ is the kernel's tick @@ -292,46 +292,46 @@ timer. Divide by TCP_RTT_SCALE * HZ to get the RTT in secs. TCP_RTT_SCALE and HZ are reported in the enable log message. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 18 SACK enabled indicator. 1 if SACK enabled, 0 otherwise. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 19 The current state of the TCP flags for the flow. See .Aq Pa netinet/tcp_var.h for information about the various flags. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 20 The current retransmission timeout length for the flow, in units of HZ, where HZ is the kernel's tick timer. Divide by HZ to get the timeout length in seconds. HZ is reported in the enable log message. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 21 The current size of the socket send buffer in bytes. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 22 The current number of bytes in the socket send buffer. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 23 The current size of the socket receive buffer in bytes. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 24 The current number of bytes in the socket receive buffer. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 25 The current number of unacknowledged bytes in-flight. Bytes acknowledged via SACK are not excluded from this count. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va 26 The current number of segments in the reassembly queue. .El @@ -353,82 +353,82 @@ flow_list=172.16.7.28;22-172.16.2.5;55931, .Ed .Pp Field descriptions are as follows: -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va disable_time_secs Time at which the module was disabled, in seconds since the UNIX epoch. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va disable_time_usecs Time at which the module was disabled, in microseconds since disable_time_secs. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_inbound_tcp_pkts Number of TCP packets that traversed up the network stack. This only includes inbound TCP packets during the periods when .Nm was enabled. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_outbound_tcp_pkts Number of TCP packets that traversed down the network stack. This only includes outbound TCP packets during the periods when .Nm was enabled. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va total_tcp_pkts The summation of num_inbound_tcp_pkts and num_outbound_tcp_pkts. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_inbound_skipped_pkts_malloc Number of inbound packets that were not processed because of failed malloc() calls. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_outbound_skipped_pkts_malloc Number of outbound packets that were not processed because of failed malloc() calls. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_inbound_skipped_pkts_mtx Number of inbound packets that were not processed because of failure to add the packet to the packet processing queue. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_outbound_skipped_pkts_mtx Number of outbound packets that were not processed because of failure to add the packet to the packet processing queue. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_inbound_skipped_pkts_tcb Number of inbound packets that were not processed because of failure to find the TCP control block associated with the packet. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_outbound_skipped_pkts_tcb Number of outbound packets that were not processed because of failure to find the TCP control block associated with the packet. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_inbound_skipped_pkts_icb Number of inbound packets that were not processed because of failure to find the IP control block associated with the packet. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va num_outbound_skipped_pkts_icb Number of outbound packets that were not processed because of failure to find the IP control block associated with the packet. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va total_skipped_tcp_pkts The summation of all skipped packet counters. .El -.Bl -tag -offset indent +.Bl -tag -offset indent -width Va .It Va flow_list A CSV list of TCP flows that triggered data log messages to be generated since the module was loaded. Each flow entry in the CSV list is formatted as .Qq local_ip;local_port-foreign_ip;foreign_port . -If there are no entries in the list (i.e. no data log messages were generated), +If there are no entries in the list (i.e., no data log messages were generated), the value will be blank. If there is at least one entry in the list, a trailing comma will always be present. @@ -501,10 +501,10 @@ the system to trigger a dump of the state of the TCP control block for that flow. With the PPL set to 1, we are in effect sampling each TCP flow's control block state as frequently as flow packets enter/leave the system. -For example, setting PPL to 2 halves the sampling rate i.e. every second flow +For example, setting PPL to 2 halves the sampling rate i.e., every second flow packet (inbound OR outbound) causes a dump of the control block state. .Pp -The distinction between interrogating individual packets vs interrogating the +The distinction between interrogating individual packets versus interrogating the control block is important, because .Nm does not remove the need for packet capturing tools like @@ -546,7 +546,7 @@ If one thread holds the lock, the other must wait before it can obtain it. This does introduce some additional bounded delay into the kernel's packet processing code path. .Pp -In some cases (e.g. low memory, connection termination), TCP packets that enter +In some cases (e.g., low memory, connection termination), TCP packets that enter the .Nm .Xr pfil 9 -- cgit v1.1 From a20823e0697f4717b9c26b0f5aaa723dd2d82f23 Mon Sep 17 00:00:00 2001 From: gnn Date: Fri, 18 May 2012 16:40:15 +0000 Subject: Add support for our own DTrace scripts and those from the DTraceToolkit to the build system. FreeBSD written scripts are stored in src/share and the toolkit scripts are brought from the cddl directory into a working tree via install. MFC after: 2 weeks --- share/Makefile | 1 + share/dtrace/Makefile | 21 +++++++++++++++++++++ share/dtrace/README | 11 +++++++++++ share/dtrace/toolkit/Makefile | 17 +++++++++++++++++ 4 files changed, 50 insertions(+) create mode 100644 share/dtrace/Makefile create mode 100644 share/dtrace/README create mode 100644 share/dtrace/toolkit/Makefile (limited to 'share') diff --git a/share/Makefile b/share/Makefile index 5ccf165..e39da7f 100644 --- a/share/Makefile +++ b/share/Makefile @@ -8,6 +8,7 @@ SUBDIR= ${_colldef} \ ${_dict} \ ${_doc} \ + dtrace \ ${_examples} \ ${_i18n} \ ${_man} \ diff --git a/share/dtrace/Makefile b/share/dtrace/Makefile new file mode 100644 index 0000000..71f1e4e --- /dev/null +++ b/share/dtrace/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ +# +# Hand installing our scripts and optionally (based on MK_CDDL) installing +# the DTraceToolkit. +# + +.include + +SUBDIR= ${_toolkit} + +.if ${MK_CDDL} != "no" +_toolkit= toolkit +.endif + +SCRIPTS= nfsclienttime + +SCRIPTSDIR= ${SHAREDIR}/dtrace/ + +NO_OBJ= + +.include diff --git a/share/dtrace/README b/share/dtrace/README new file mode 100644 index 0000000..de28264 --- /dev/null +++ b/share/dtrace/README @@ -0,0 +1,11 @@ +$FreeBSD$ + +This directory contains scripts for use with the DTrace system. The +toolkit/ directory contains the latest vendor import of Brendan +Gregg's DTRaceToolkit while all the other files and directories +contain code generated by the FreeBSD Project for use with DTrace on +FreeBSD. + +NOTE: Do not add new scripts to the DTraceToolkit contained in this +directory. New DTraceToolkit scripts should be send to the maintainer +of the toolkit and then brought back into FreeBSD via future vendor imports. diff --git a/share/dtrace/toolkit/Makefile b/share/dtrace/toolkit/Makefile new file mode 100644 index 0000000..0eb7ff2 --- /dev/null +++ b/share/dtrace/toolkit/Makefile @@ -0,0 +1,17 @@ +#$FreeBSD$ +# +# Install scripts from the DTraceToolkit +# +DTRACETOOLKIT= ../../../cddl/contrib/dtracetoolkit + +SCRIPTS= ${DTRACETOOLKIT}/execsnoop \ + ${DTRACETOOLKIT}/hotuser \ + ${DTRACETOOLKIT}/hotkernel \ + ${DTRACETOOLKIT}/opensnoop \ + ${DTRACETOOLKIT}/procsystime \ + +SCRIPTSDIR= ${SHAREDIR}/dtrace/toolkit + +NO_OBJ= + +.include -- cgit v1.1 From 8cfd0497b1d53953aa60fb698b32d4e11cb6d965 Mon Sep 17 00:00:00 2001 From: gnn Date: Fri, 18 May 2012 16:47:15 +0000 Subject: Add a DTrace script to show the frequency and latency of NFS client calls. Submitted by: rwatson --- share/dtrace/nfsclienttime | 74 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100755 share/dtrace/nfsclienttime (limited to 'share') diff --git a/share/dtrace/nfsclienttime b/share/dtrace/nfsclienttime new file mode 100755 index 0000000..335f067 --- /dev/null +++ b/share/dtrace/nfsclienttime @@ -0,0 +1,74 @@ +#!/bin/sh +# +# Copyright (c) 2012 Robert N. M. Watson +# All rights reserved. +# +# This software was developed at the University of Cambridge Computer +# Laboratory with support from a grant from Google, Inc. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# +# $FreeBSD$ +# +# This script measures all time spent waiting on RPC replies for each +# system call, and then generates a histogram of those times sorted by +# system call name. +# +# Currently only supports NFSv3 +# +# Usage: nfsclienttime +# +# Press Ctrl-C to exit and display statistics. +# + +/usr/sbin/dtrace -n ' +#pragma D option quiet + +dtrace:::BEGIN +{ + printf("Collecting data...press Ctrl-C to exit.\n"); +} + +syscall:::entry +{ + + self->count = 0; +} + +nfsclient:nfs3::start +{ + + self->timestamp = timestamp; +} + +nfsclient:nfs3::done +{ + + self->count += (timestamp - self->timestamp); +} + +syscall:::return +/self->count != 0/ { + + @syscalls[probefunc] = quantize(self->count); +} +' -- cgit v1.1 From 986701592af1a28bebe6737f3cc02c0b433d1728 Mon Sep 17 00:00:00 2001 From: gnn Date: Fri, 18 May 2012 20:34:08 +0000 Subject: Fix a case typo. Pointed out by: jlh@ --- share/dtrace/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/dtrace/README b/share/dtrace/README index de28264..e446cee 100644 --- a/share/dtrace/README +++ b/share/dtrace/README @@ -2,7 +2,7 @@ $FreeBSD$ This directory contains scripts for use with the DTrace system. The toolkit/ directory contains the latest vendor import of Brendan -Gregg's DTRaceToolkit while all the other files and directories +Gregg's DTraceToolkit while all the other files and directories contain code generated by the FreeBSD Project for use with DTrace on FreeBSD. -- cgit v1.1 From da710a8ff4880497c8bc3c85dd6292d1d1f63087 Mon Sep 17 00:00:00 2001 From: marcel Date: Sat, 19 May 2012 04:57:37 +0000 Subject: Add missing LIBPROCSTAT. --- share/mk/bsd.libnames.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index d477c0e..075833b 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -135,6 +135,7 @@ LIBPANEL?= ${DESTDIR}${LIBDIR}/libpanel.a LIBPCAP?= ${DESTDIR}${LIBDIR}/libpcap.a LIBPMC?= ${DESTDIR}${LIBDIR}/libpmc.a LIBPROC?= ${DESTDIR}${LIBDIR}/libproc.a +LIBPROCSTAT?= ${DESTDIR}${LIBDIR}/libprocstat.a LIBPTHREAD?= ${DESTDIR}${LIBDIR}/libpthread.a LIBRADIUS?= ${DESTDIR}${LIBDIR}/libradius.a LIBREADLINE?= ${DESTDIR}${LIBDIR}/libreadline.a -- cgit v1.1 From c2132f894f2faf5bf926c486b5dc392749576312 Mon Sep 17 00:00:00 2001 From: marcel Date: Sat, 19 May 2012 17:55:49 +0000 Subject: Add build option MK_ED_CRYPTO to control whether ed(1) is to have the ability to encrypt/decrypt files. Embedded systems can typically have OpenSSL, but not for ed(1) to use it. Obtained from: Juniper Networks, Inc. --- share/mk/bsd.own.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index b19253e..2da997b 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -334,6 +334,7 @@ __DEFAULT_YES_OPTIONS = \ CXX \ DICT \ DYNAMICROOT \ + ED_CRYPTO \ EXAMPLES \ FLOPPY \ FORTH \ -- cgit v1.1 From 23744f4adf091dc055613bde36a09cfd90bcdd6c Mon Sep 17 00:00:00 2001 From: marcel Date: Sat, 19 May 2012 18:05:00 +0000 Subject: Add build opton MK_LS_COLORS to control whether ls(1) supports colors (and thus needs to depend on libtermcap). Embedded systems may not want or need colors. Obtained from: Juniper Networks, Inc. --- share/mk/bsd.own.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 2da997b..924e9ce 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -367,6 +367,7 @@ __DEFAULT_YES_OPTIONS = \ LOCALES \ LOCATE \ LPR \ + LS_COLORS \ MAIL \ MAILWRAPPER \ MAKE \ -- cgit v1.1 From 1e1aafe3d81f37eb62fdfe14b4ee3ea1dacde074 Mon Sep 17 00:00:00 2001 From: marcel Date: Sat, 19 May 2012 21:29:18 +0000 Subject: Regenerate after the additions of: WITHOUT_ED_CRYPTO WITHOUT_LS_COLORS WITH_NAND Pointed out by: Garrett Cooper --- share/man/man5/src.conf.5 | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 29d7abf..9eb67f3 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru .\" $FreeBSD$ -.Dd May 12, 2012 +.Dd May 19, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -207,7 +207,7 @@ and Set to enable the http statistics interface for named. This requires ports/textproc/libxml2 to be installed in /usr/local. .It Va WITHOUT_BINUTILS -.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 222090 2011-05-19 05:13:25Z imp +.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 235342 2012-05-12 16:12:36Z gjb Set to not install binutils (as, c++-filt, gconv, gnu-ar, gnu-randlib, ld, nm, objcopy, objdump, readelf, size and strip). .Bf -symbolic @@ -292,7 +292,7 @@ amd64/amd64, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim Set to build additional clang and llvm tools, such as bugpoint. .It Va WITH_CLANG_IS_CC -.\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 232322 2012-02-29 22:58:51Z dim +.\" from FreeBSD: head/tools/build/options/WITH_CLANG_IS_CC 235342 2012-05-12 16:12:36Z gjb Set to install the Clang C/C++ compiler as .Pa /usr/bin/cc , .Pa /usr/bin/c++ @@ -368,6 +368,11 @@ Set this if you do not want to link and .Pa /sbin dynamically. +.It Va WITHOUT_ED_CRYPTO +.\" from FreeBSD: head/tools/build/options/WITHOUT_ED_CRYPTO 235660 2012-05-19 20:05:27Z marcel +Set to build +.Xr ed 1 +without support for encryption/decryption. .It Va WITHOUT_EXAMPLES .\" from FreeBSD: head/tools/build/options/WITHOUT_EXAMPLES 156938 2006-03-21 09:06:24Z ru Set to avoid installing examples to @@ -667,6 +672,11 @@ and related programs. Set to not build .Xr lpr 1 and related programs. +.It Va WITHOUT_LS_COLORS +.\" from FreeBSD: head/tools/build/options/WITHOUT_LS_COLORS 235660 2012-05-19 20:05:27Z marcel +Set to build +.Xr ls 1 +without support for colors to distinguish file types. .It Va WITHOUT_MAIL .\" from FreeBSD: head/tools/build/options/WITHOUT_MAIL 183242 2008-09-21 22:02:26Z sam Set to not build any mail support (MUA or MTA). @@ -709,6 +719,9 @@ Set to not build utilities for manual pages, .Xr whatis 1 , .Xr manctl 8 , and related support files. +.It Va WITH_NAND +.\" from FreeBSD: head/tools/build/options/WITH_NAND 235537 2012-05-17 10:11:18Z gber +Set to build the NAND Flash components. .It Va WITHOUT_NCP .\" from FreeBSD: head/tools/build/options/WITHOUT_NCP 156932 2006-03-21 07:50:50Z ru Set to not build programs, libraries, and kernel modules @@ -893,7 +906,7 @@ Set to not build the .Bx 4.4 legacy docs. .It Va WITH_SHARED_TOOLCHAIN -.\" from FreeBSD: head/tools/build/options/WITH_SHARED_TOOLCHAIN 234782 2012-04-29 09:32:44Z kib +.\" from FreeBSD: head/tools/build/options/WITH_SHARED_TOOLCHAIN 235342 2012-05-12 16:12:36Z gjb Set to build the toolchain binaries shared. The set includes .Xr cc 1 , @@ -1015,7 +1028,7 @@ protocols (usable only via 802.1X). .\" from FreeBSD: head/tools/build/options/WITHOUT_ZFS 168409 2007-04-06 02:13:30Z pjd Set to not build ZFS file system. .It Va WITHOUT_ZONEINFO -.\" from FreeBSD: head/tools/build/options/WITHOUT_ZONEINFO 171994 2007-08-27 20:01:08Z remko +.\" from FreeBSD: head/tools/build/options/WITHOUT_ZONEINFO 235342 2012-05-12 16:12:36Z gjb Set to not build the timezone database. .El .Sh FILES -- cgit v1.1 From 9dc8674ed3b897d5f09284bbc8a3433a81d6b3d5 Mon Sep 17 00:00:00 2001 From: gjb Date: Sun, 20 May 2012 16:09:40 +0000 Subject: Typo and mdoc(7) style fixes. PR: 167890 Submitted by: Nobuyuki Koganemaru (kogane&jp!freebsd!org) MFC after: 3 days --- share/man/man7/c99.7 | 2 +- share/man/man7/release.7 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man7/c99.7 b/share/man/man7/c99.7 index 8c7d5e2..e12d000 100644 --- a/share/man/man7/c99.7 +++ b/share/man/man7/c99.7 @@ -103,7 +103,7 @@ The ISO C standard was later extended with an amendment as ISO/IEC 9899 AM1 in 1995. This contained, for example, the wide-character support in wchar.h and wctype.h. -Two corregenda were also published: Technical Corrigendum 1 as +Two corrigenda were also published: Technical Corrigendum 1 as ISO/IEC 9899 TCOR1 in 1995 and Technical Corrigendum 2 as ISO/IEC 9899 TCOR1 in 1996. The continuous development and growth made it necessary to work out a new diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index a725fc6..19cf41c 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -221,7 +221,7 @@ hardware guide, and installation instructions. Other documentation (e.g. the Handbook) is built during the .Cm base.txz target invoked by -.Cm packagesystem. +.Cm packagesystem . .El .Sh ENVIRONMENT Optional variables: -- cgit v1.1 From cae1f5b99464a45f06cd5a6ba5b1b606de6f7a15 Mon Sep 17 00:00:00 2001 From: gjb Date: Sun, 20 May 2012 16:43:47 +0000 Subject: Typo and mdoc(7) style fixes. PR: 168117 Submitted by: Nobuyuki Koganemaru (kogane&jp!freebsd!org) MFC after: 3 days --- share/man/man9/BUF_ISLOCKED.9 | 2 +- share/man/man9/DB_COMMAND.9 | 2 +- share/man/man9/VOP_GETEXTATTR.9 | 4 ++-- share/man/man9/VOP_GETPAGES.9 | 2 +- share/man/man9/VOP_GETVOBJECT.9 | 2 +- share/man/man9/VOP_SETEXTATTR.9 | 2 +- share/man/man9/acl.9 | 2 +- share/man/man9/bus_generic_print_child.9 | 2 +- share/man/man9/bus_release_resource.9 | 2 +- share/man/man9/bus_space.9 | 3 ++- share/man/man9/byteorder.9 | 2 +- share/man/man9/devclass_get_maxunit.9 | 2 +- share/man/man9/device_find_child.9 | 2 +- share/man/man9/firmware.9 | 8 +++++--- share/man/man9/hashinit.9 | 2 +- share/man/man9/ieee80211_proto.9 | 2 +- share/man/man9/ifnet.9 | 2 +- share/man/man9/kqueue.9 | 3 +-- share/man/man9/lock.9 | 2 +- share/man/man9/locking.9 | 5 ++--- share/man/man9/mbuf.9 | 6 ++++-- share/man/man9/mod_cc.9 | 2 +- share/man/man9/netisr.9 | 2 +- share/man/man9/pci.9 | 10 ++++++---- share/man/man9/spl.9 | 3 ++- share/man/man9/sysctl.9 | 2 +- share/man/man9/taskqueue.9 | 4 ++-- share/man/man9/usbdi.9 | 2 +- share/man/man9/vm_page_aflag.9 | 2 +- 29 files changed, 46 insertions(+), 40 deletions(-) (limited to 'share') diff --git a/share/man/man9/BUF_ISLOCKED.9 b/share/man/man9/BUF_ISLOCKED.9 index d55f2f5..5970388 100644 --- a/share/man/man9/BUF_ISLOCKED.9 +++ b/share/man/man9/BUF_ISLOCKED.9 @@ -52,7 +52,7 @@ It can return: .It Dv LK_EXCLUSIVE An exclusive lock is held by curthread. .It Dv LK_EXCLOTHER -An exclusive lock is held by someone other than curthread +An exclusive lock is held by someone other than curthread. .It Dv LK_SHARED A shared lock is held. .It Li 0 diff --git a/share/man/man9/DB_COMMAND.9 b/share/man/man9/DB_COMMAND.9 index bcb550c..179f3f3 100644 --- a/share/man/man9/DB_COMMAND.9 +++ b/share/man/man9/DB_COMMAND.9 @@ -32,7 +32,7 @@ .Nm DB_COMMAND , .Nm DB_SHOW_COMMAND , .Nm DB_SHOW_ALL_COMMAND -.Nd Extends the ddb command set. +.Nd Extends the ddb command set .Sh SYNOPSIS .In ddb/ddb.h .Fo DB_COMMAND diff --git a/share/man/man9/VOP_GETEXTATTR.9 b/share/man/man9/VOP_GETEXTATTR.9 index e3abcb9..998ed2c 100644 --- a/share/man/man9/VOP_GETEXTATTR.9 +++ b/share/man/man9/VOP_GETEXTATTR.9 @@ -71,7 +71,7 @@ will be .Dv NULL when .Fa size -is not, and vise versa. +is not, and vice versa. .It Fa cred The user credentials to use in authorizing the request. .It Fa td @@ -113,7 +113,7 @@ The uio structure refers to an invalid userspace address. .It Bq Er EINVAL The .Fa name , -.Fa namespace, +.Fa namespace , or .Fa uio argument is invalid. diff --git a/share/man/man9/VOP_GETPAGES.9 b/share/man/man9/VOP_GETPAGES.9 index e490862..b165162 100644 --- a/share/man/man9/VOP_GETPAGES.9 +++ b/share/man/man9/VOP_GETPAGES.9 @@ -115,7 +115,7 @@ The page could not be written because of an error on the underlying storage medium or protocol. .It Dv VM_PAGER_FAIL Treated identically to -.Dv VM_PAGER_ERROR +.Dv VM_PAGER_ERROR . .It Dv VM_PAGER_AGAIN The page was not handled by this request. .El diff --git a/share/man/man9/VOP_GETVOBJECT.9 b/share/man/man9/VOP_GETVOBJECT.9 index 2490da7..47741d1 100644 --- a/share/man/man9/VOP_GETVOBJECT.9 +++ b/share/man/man9/VOP_GETVOBJECT.9 @@ -53,7 +53,7 @@ The vnode of the file. The VM object being returned, or .Dv NULL if the caller wants to test for the existence -of the VM object). +of the VM object. .El .Pp .Xr VFS 9 diff --git a/share/man/man9/VOP_SETEXTATTR.9 b/share/man/man9/VOP_SETEXTATTR.9 index 29f8cc2..edae937 100644 --- a/share/man/man9/VOP_SETEXTATTR.9 +++ b/share/man/man9/VOP_SETEXTATTR.9 @@ -96,7 +96,7 @@ The caller does not have the appropriate privilege. The request was not valid in this file system for the specified vnode and attribute name. .It Bq Er ENOMEM -Insufficient memory available to fulfill request +Insufficient memory available to fulfill the request. .It Bq Er EFAULT The uio structure refers to an invalid userspace address. .It Bq Er EINVAL diff --git a/share/man/man9/acl.9 b/share/man/man9/acl.9 index 21640bd..c6c7159 100644 --- a/share/man/man9/acl.9 +++ b/share/man/man9/acl.9 @@ -210,7 +210,7 @@ The following values are valid: .Xr vaccess_acl_nfs4 9 , .Xr vaccess_acl_posix1e 9 , .Xr VFS 9 , -.Xr vnaccess 9 , +.Xr vaccess 9 , .Xr VOP_ACLCHECK 9 , .Xr VOP_GETACL 9 , .Xr VOP_SETACL 9 diff --git a/share/man/man9/bus_generic_print_child.9 b/share/man/man9/bus_generic_print_child.9 index 80a04ff..388c0a0 100644 --- a/share/man/man9/bus_generic_print_child.9 +++ b/share/man/man9/bus_generic_print_child.9 @@ -51,7 +51,7 @@ foo0: on bar0 bus_generic_print_child itself calls two functions .Fn bus_print_child_header and -.Fn bus_print_child_footer +.Fn bus_print_child_footer . The former prints "foo0: " and the latter "on bar0". These routines should be used if possible in your own code if .Fn bus_generic_print_child diff --git a/share/man/man9/bus_release_resource.9 b/share/man/man9/bus_release_resource.9 index 68187cc..35e70d9 100644 --- a/share/man/man9/bus_release_resource.9 +++ b/share/man/man9/bus_release_resource.9 @@ -71,7 +71,7 @@ value must be the same as the one returned by .It .Fa r is the pointer to -.Va struct res , +.Va struct resource , i.e., the resource itself, returned by .Xr bus_alloc_resource 9 . diff --git a/share/man/man9/bus_space.9 b/share/man/man9/bus_space.9 index 0f0425a..6bf03b4 100644 --- a/share/man/man9/bus_space.9 +++ b/share/man/man9/bus_space.9 @@ -1380,7 +1380,8 @@ functions may be executed in any order. They may also be executed out of order with respect to other pending read and write operations unless order is enforced by use of the -.Fn bus_space_barrier function . +.Fn bus_space_barrier +function. There is no way to insert barriers between reads or writes of individual bus space locations executed by the .Fn bus_space_copy_region_N diff --git a/share/man/man9/byteorder.9 b/share/man/man9/byteorder.9 index 20e3136..e5737f6 100644 --- a/share/man/man9/byteorder.9 +++ b/share/man/man9/byteorder.9 @@ -158,7 +158,7 @@ in big/little endian format. The .Fn hto* and -.Fn toh* +.Fn *toh functions first appeared in .Fx 5.0 , and were originally developed by the diff --git a/share/man/man9/devclass_get_maxunit.9 b/share/man/man9/devclass_get_maxunit.9 index c3be627..40a2d79 100644 --- a/share/man/man9/devclass_get_maxunit.9 +++ b/share/man/man9/devclass_get_maxunit.9 @@ -49,7 +49,7 @@ The function returns -1 if .Fa dc is -.Dv NULL; +.Dv NULL , otherwise it returns the next unit number in .Fa dc's diff --git a/share/man/man9/device_find_child.9 b/share/man/man9/device_find_child.9 index a23b2b2..391f44b 100644 --- a/share/man/man9/device_find_child.9 +++ b/share/man/man9/device_find_child.9 @@ -41,7 +41,7 @@ .Fn device_find_child "device_t dev" "const char *classname" "int unit" .Sh DESCRIPTION This function looks for a specific child of -.Dv dev . +.Dv dev with the given .Fa classname and diff --git a/share/man/man9/firmware.9 b/share/man/man9/firmware.9 index 9987e09..0f4fa9a 100644 --- a/share/man/man9/firmware.9 +++ b/share/man/man9/firmware.9 @@ -101,11 +101,13 @@ they want as an argument. If a matching image is not already registered, the firmware subsystem will try to load it using the mechanisms specified below (typically, a kernel module with -.Nm the same name +.Nm +the same name as the image). .Sh API DESCRIPTION The kernel -.Nm firmware API +.Nm +firmware API is made of the following functions: .Pp .Fn firmware_register @@ -225,7 +227,7 @@ in the module, the imagename and version of each firmware image. If you need to embed firmware images into a system, you should write appropriate entries in the file, e.g. this example is from -.Nm sys/arm/xscale/ixp425/files.ixp425: +.Nm sys/arm/xscale/ixp425/files.ixp425 : .Bd -literal ixp425_npe_fw.c optional npe_fw \\ compile-with "${AWK} -f $S/tools/fw_stub.awk \\ diff --git a/share/man/man9/hashinit.9 b/share/man/man9/hashinit.9 index d186dcf..b72cd75 100644 --- a/share/man/man9/hashinit.9 +++ b/share/man/man9/hashinit.9 @@ -29,7 +29,7 @@ .Dt HASHINIT 9 .Os .Sh NAME -.Nm hashinit , hashinit_flags, hashdestroy , phashinit +.Nm hashinit , hashinit_flags , hashdestroy , phashinit .Nd manage kernel hash tables .Sh SYNOPSIS .In sys/malloc.h diff --git a/share/man/man9/ieee80211_proto.9 b/share/man/man9/ieee80211_proto.9 index 88412eb..6b0da06 100644 --- a/share/man/man9/ieee80211_proto.9 +++ b/share/man/man9/ieee80211_proto.9 @@ -238,4 +238,4 @@ work will be initiated outside the driver. The state machine concept was part of the original .Nm ieee80211 code base that first appeared in -.Nx 1.5 , +.Nx 1.5 . diff --git a/share/man/man9/ifnet.9 b/share/man/man9/ifnet.9 index dd4fdf5..1059c88 100644 --- a/share/man/man9/ifnet.9 +++ b/share/man/man9/ifnet.9 @@ -637,7 +637,7 @@ interfaces registered at the interface list. .Aq D This interface blocks transmission of packets and discards incoming packets after BPF processing. -Used to monitor network trafic but not interact +Used to monitor network traffic but not interact with the network in question. .It Dv IFF_STATICARP .Aq D diff --git a/share/man/man9/kqueue.9 b/share/man/man9/kqueue.9 index 555fe54..29ae5f7 100644 --- a/share/man/man9/kqueue.9 +++ b/share/man/man9/kqueue.9 @@ -260,8 +260,7 @@ is not required, but is commonly used. If used, the .Vt knlist must be initialized with either -.Fn knlist_init -, +.Fn knlist_init , .Fn knlist_init_mtx or .Fn knlist_init_rw_reader . diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9 index 0e5cfb1..bbcf5e8 100644 --- a/share/man/man9/lock.9 +++ b/share/man/man9/lock.9 @@ -230,7 +230,7 @@ and The .Fn lockmgr_disown function switches the owner from the current thread to be -.Dv LK_KERNPROC, +.Dv LK_KERNPROC , if the lock is already held. .Pp The diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index 871dffe..6a0107f 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -315,8 +315,7 @@ and reacquire it on wakeup (e.g. .Fn mtx_sleep , .Fn rw_sleep and -.Fn msleep_spin -). +.Fn msleep_spin ) . .Pp .Em *4 Though one can sleep holding an sx lock, one can also use @@ -358,6 +357,6 @@ These functions appeared in .Bsx 4.1 through -.Fx 7.0 +.Fx 7.0 . .Sh BUGS There are too many locking primitives to choose from. diff --git a/share/man/man9/mbuf.9 b/share/man/man9/mbuf.9 index b029c52..5c94029 100644 --- a/share/man/man9/mbuf.9 +++ b/share/man/man9/mbuf.9 @@ -403,7 +403,8 @@ for details. Associate externally managed data with .Fa mbuf . Any internal data contained in the mbuf will be discarded, and the -.Dv M_EXT flag will be set. +.Dv M_EXT +flag will be set. The .Fa buf and @@ -722,7 +723,8 @@ are contiguous and lay in the data area of .Fa mbuf , so they are accessible with .Fn mtod mbuf type . -.Fa len must be smaller than, or equal to, the size of an +.Fa len +must be smaller than, or equal to, the size of an .Vt mbuf cluster . Return a pointer to an intermediate .Vt mbuf diff --git a/share/man/man9/mod_cc.9 b/share/man/man9/mod_cc.9 index 75e2db0..d753a3c 100644 --- a/share/man/man9/mod_cc.9 +++ b/share/man/man9/mod_cc.9 @@ -287,7 +287,7 @@ The CCF_CWND_LIMITED flag is relevant in .Va ack_received and is set when the connection's ability to send data is currently constrained by the value of the congestion window. -Algorithms should use the abscence of this flag being set to avoid accumulating +Algorithms should use the absence of this flag being set to avoid accumulating a large difference between the congestion window and send window. .Sh SEE ALSO .Xr cc_chd 4 , diff --git a/share/man/man9/netisr.9 b/share/man/man9/netisr.9 index bb64b0e..4377e02 100644 --- a/share/man/man9/netisr.9 +++ b/share/man/man9/netisr.9 @@ -78,7 +78,7 @@ and may also manage queue limits and statistics using the .Fn netisr_getqdrops , .Fn netisr_getqlimit , and -.Fn netisr_setqlimit. +.Fn netisr_setqlimit . .Pp .Nm supports multi-processor execution of handlers, and relies on a combination diff --git a/share/man/man9/pci.9 b/share/man/man9/pci.9 index 4089ee8..adc78b5 100644 --- a/share/man/man9/pci.9 +++ b/share/man/man9/pci.9 @@ -488,7 +488,7 @@ The .Fn pci_count_msi function returns the maximum number of MSI messages supported by the device -.Fa dev. +.Fa dev . If the device does not support MSI, then .Fn pci_count_msi @@ -567,7 +567,8 @@ is set to the number of messages allocated and returns zero. For MSI-X messages, the resource ID for each -.Dv SYS_RES_IRQ resource identifies the index in the MSI-X table of the +.Dv SYS_RES_IRQ +resource identifies the index in the MSI-X table of the corresponding message. A resource ID of one maps to the first index of the MSI-X table; a resource ID two identifies the second index in the table, etc. @@ -608,7 +609,7 @@ A driver may use a different distribution of available messages to table entries via the .Fn pci_remap_msix function. -Note that this function must be called after a succesful call to +Note that this function must be called after a successful call to .Fn pci_alloc_msix but before any of the .Dv SYS_RES_IRQ @@ -649,7 +650,8 @@ above for .Fn pci_alloc_msix . MSI-X table entries that with a vector of zero will not have an associated -.Dv SYS_RES_IRQ resource. +.Dv SYS_RES_IRQ +resource. Additionally, if any of the original messages allocated by .Fn pci_alloc_msix diff --git a/share/man/man9/spl.9 b/share/man/man9/spl.9 index a71918c..3bfa556 100644 --- a/share/man/man9/spl.9 +++ b/share/man/man9/spl.9 @@ -220,7 +220,8 @@ the system. The historical number scheme can be considered as a simple linearly ordered set of interrupt priority groups. .Pp -.Fx 5.0 eliminated spl entirely in favor of locking primitives which scale +.Fx 5.0 +eliminated spl entirely in favor of locking primitives which scale to more than one processor. .Sh AUTHORS This manual page was written by diff --git a/share/man/man9/sysctl.9 b/share/man/man9/sysctl.9 index d58573b..5399b56 100644 --- a/share/man/man9/sysctl.9 +++ b/share/man/man9/sysctl.9 @@ -107,7 +107,7 @@ This is a 64-bit signed integer. This is an opaque data structure. .It Dv CTLTYPE_STRUCT Alias for -.Dv CTLTYPE_OPAQUE. +.Dv CTLTYPE_OPAQUE . .It Dv CTLTYPE_UINT This is an unsigned integer. .It Dv CTLTYPE_LONG diff --git a/share/man/man9/taskqueue.9 b/share/man/man9/taskqueue.9 index 319aa2f..f1a43b6 100644 --- a/share/man/man9/taskqueue.9 +++ b/share/man/man9/taskqueue.9 @@ -189,8 +189,8 @@ The count is cleared, and the old value returned in the reference parameter .Fa pendp , -if it is non- -.Dv NULL . +if it is +.Pf non- Dv NULL . If the task is currently running, .Dv EBUSY is returned, otherwise 0. diff --git a/share/man/man9/usbdi.9 b/share/man/man9/usbdi.9 index 72fec96..03cc305 100644 --- a/share/man/man9/usbdi.9 +++ b/share/man/man9/usbdi.9 @@ -524,7 +524,7 @@ executed on the USB control endpoint. . This flag can be changed during operation. .Pp -"BOF" is short for "Block On Failure" +"BOF" is short for "Block On Failure". .Pp NOTE: This flag should be set on all BULK and INTERRUPT USB transfers which use an endpoint that can be shared between userland and kernel. diff --git a/share/man/man9/vm_page_aflag.9 b/share/man/man9/vm_page_aflag.9 index 8ef5d87..4500bd2 100644 --- a/share/man/man9/vm_page_aflag.9 +++ b/share/man/man9/vm_page_aflag.9 @@ -27,7 +27,7 @@ .\" $FreeBSD$ .\" .Dd August 31, 2011 -.Dt VM_PAGE_FLAG 9 +.Dt VM_PAGE_AFLAG 9 .Os .Sh NAME .Nm vm_page_aflag_clear , vm_page_aflag_set , vm_page_reference -- cgit v1.1 From 1c776bfa6e8c09481f7796562d3b3f95d7f76aa8 Mon Sep 17 00:00:00 2001 From: melifaro Date: Mon, 21 May 2012 22:13:48 +0000 Subject: Fix panic on attaching to non-existent interface (introduced by r233937, pointed by hrs@) Fix panic on tcpdump being attached to interface being removed (introduced by r233937, pointed by hrs@ and adrian@) Protect most of bpf_setf() by BPF global lock Add several forgotten assertions (thanks to adrian@) Document current locking model inside bpf.c Document EVENTHANDLER(9) usage inside BPF. Approved by: kib(mentor) Tested by: gnn MFC in: 4 weeks --- share/man/man9/EVENTHANDLER.9 | 4 +++- share/man/man9/bpf.9 | 26 ++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man9/EVENTHANDLER.9 b/share/man/man9/EVENTHANDLER.9 index ed83018..4a16660 100644 --- a/share/man/man9/EVENTHANDLER.9 +++ b/share/man/man9/EVENTHANDLER.9 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" $FreeBSD$ .\" -.Dd January 7, 2005 +.Dd May 11, 2012 .Dt EVENTHANDLER 9 .Os .Sh NAME @@ -197,6 +197,8 @@ Callbacks invoked when an interface is cloned. Callbacks invoked when a new network interface appears. .It Vt ifnet_departure_event Callbacks invoked when a network interface is taken down. +.It Vt bpf_track +Callbacks invoked when a BPF listener attaches to/detaches from network interface. .It Vt power_profile_change Callbacks invoked when the power profile of the system changes. .It Vt process_exec diff --git a/share/man/man9/bpf.9 b/share/man/man9/bpf.9 index 5a3ac07..ebf26cb 100644 --- a/share/man/man9/bpf.9 +++ b/share/man/man9/bpf.9 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 13, 2006 +.Dd May 11, 2012 .Dt BPF 9 .Os .\" @@ -246,9 +246,31 @@ The function returns 0 when the program is not a valid filter program. .\" +.Sh EVENT HANDLERS +.Nm +invokes +.Fa bpf_track +.Xr EVENTHANDLER 9 +event each time listener attaches to or detaches from an interface. +Pointer to +.Pq Vt "struct ifnet *" +is passed as the first argument, interface +.Fa dlt +follows. Last argument indicates listener is attached (1) or +detached (0). +Note that handler is invoked with +.Nm +global lock held, which implies restriction on sleeping and calling +.Nm +subsystem inside +.Xr EVENTHANDLER 9 +dispatcher. +Note that handler is not called for write-only listeners. +.\" .Sh SEE ALSO .Xr tcpdump 1 , -.Xr bpf 4 +.Xr bpf 4 , +.Xr EVENTHANDLER 9 .\" .Sh HISTORY The Enet packet filter was created in 1980 by Mike Accetta and -- cgit v1.1 From 9fa9a2acad686b2ef1495297cd790912d78b85c3 Mon Sep 17 00:00:00 2001 From: wblock Date: Thu, 24 May 2012 02:24:03 +0000 Subject: Fixes to man8 groff mandoc style, usage mistakes, or typos. PR: 168016 Submitted by: Nobuyuki Koganemaru Approved by: gjb MFC after: 3 days --- share/man/man8/picobsd.8 | 7 +++++-- share/man/man8/rc.8 | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man8/picobsd.8 b/share/man/man8/picobsd.8 index 07373f6..f4c403e 100644 --- a/share/man/man8/picobsd.8 +++ b/share/man/man8/picobsd.8 @@ -54,7 +54,7 @@ The most important options for common operations are .Fl src , .Fl init , .Fl n and -.Fl v. +.Fl v . .Bl -tag -width indent .\" .It Fl -all_in_mfs @@ -94,7 +94,10 @@ subtree as necessary to subsequently build images. .\" .It Fl -iso -Generate an ISO image, picobsd.iso, in addition to the disk image picobsd.bin +Generate an ISO image, +.Pa picobsd.iso , +in addition to the disk image +.Pa picobsd.bin . .\" .It Fl -modules Also build kernel modules. diff --git a/share/man/man8/rc.8 b/share/man/man8/rc.8 index ed8b706..a92c88b 100644 --- a/share/man/man8/rc.8 +++ b/share/man/man8/rc.8 @@ -253,7 +253,7 @@ The boot does not stop if such a script terminates with a non-zero status, but a script can stop the boot if necessary by invoking the .Fn stop_boot function (from -.Xr rc.subr 8 ). +.Xr rc.subr 8 ) . .El .Pp Each script should contain -- cgit v1.1 From 96f3e42ce2c9de14b3e9a1de338ed639c1c8b596 Mon Sep 17 00:00:00 2001 From: mav Date: Thu, 24 May 2012 14:07:44 +0000 Subject: MFprojects/zfsd: Revamp the CAM enclosure services driver. This updated driver uses an in-kernel daemon to track state changes and publishes physical path location information\for disk elements into the CAM device database. Sponsored by: Spectra Logic Corporation Sponsored by: iXsystems, Inc. Submitted by: gibbs, will, mav --- share/examples/ses/Makefile.inc | 1 - share/examples/ses/srcs/eltsub.c | 109 +++++++++++++++++++---------------- share/examples/ses/srcs/getencstat.c | 81 ++++++++++++++++++-------- share/examples/ses/srcs/getnobj.c | 5 +- share/examples/ses/srcs/getobjmap.c | 5 +- share/examples/ses/srcs/getobjstat.c | 5 +- share/examples/ses/srcs/inienc.c | 5 +- share/examples/ses/srcs/sesd.c | 17 +++--- share/examples/ses/srcs/setencstat.c | 13 +++-- share/examples/ses/srcs/setobjstat.c | 13 +++-- 10 files changed, 157 insertions(+), 97 deletions(-) (limited to 'share') diff --git a/share/examples/ses/Makefile.inc b/share/examples/ses/Makefile.inc index 5ff1cd4..2b1e858 100644 --- a/share/examples/ses/Makefile.inc +++ b/share/examples/ses/Makefile.inc @@ -32,7 +32,6 @@ # mjacob@feral.com # -CFLAGS+= -I/usr/include/cam/scsi -DSESINC="" BINDIR?= /usr/sbin CLEANFILES+= ${MAN} diff --git a/share/examples/ses/srcs/eltsub.c b/share/examples/ses/srcs/eltsub.c index 8500fff..9500423 100644 --- a/share/examples/ses/srcs/eltsub.c +++ b/share/examples/ses/srcs/eltsub.c @@ -33,10 +33,13 @@ */ #include +#include +#include #include #include #include -#include SESINC +#include +#include #include "eltsub.h" @@ -46,79 +49,82 @@ geteltnm(int type) static char rbuf[132]; switch (type) { - case SESTYP_UNSPECIFIED: + case ELMTYP_UNSPECIFIED: sprintf(rbuf, "Unspecified"); break; - case SESTYP_DEVICE: - sprintf(rbuf, "Device"); + case ELMTYP_DEVICE: + sprintf(rbuf, "Device Slot"); break; - case SESTYP_POWER: - sprintf(rbuf, "Power supply"); + case ELMTYP_POWER: + sprintf(rbuf, "Power Supply"); break; - case SESTYP_FAN: - sprintf(rbuf, "Cooling element"); + case ELMTYP_FAN: + sprintf(rbuf, "Cooling"); break; - case SESTYP_THERM: - sprintf(rbuf, "Temperature sensors"); + case ELMTYP_THERM: + sprintf(rbuf, "Temperature Sensors"); break; - case SESTYP_DOORLOCK: + case ELMTYP_DOORLOCK: sprintf(rbuf, "Door Lock"); break; - case SESTYP_ALARM: + case ELMTYP_ALARM: sprintf(rbuf, "Audible alarm"); break; - case SESTYP_ESCC: - sprintf(rbuf, "Enclosure services controller electronics"); + case ELMTYP_ESCC: + sprintf(rbuf, "Enclosure Eervices Controller Electronics"); break; - case SESTYP_SCC: - sprintf(rbuf, "SCC controller electronics"); + case ELMTYP_SCC: + sprintf(rbuf, "SCC Controller Electronics"); break; - case SESTYP_NVRAM: - sprintf(rbuf, "Nonvolatile cache"); + case ELMTYP_NVRAM: + sprintf(rbuf, "Nonvolatile Cache"); break; - case SESTYP_UPS: - sprintf(rbuf, "Uninterruptible power supply"); + case ELMTYP_INV_OP_REASON: + sprintf(rbuf, "Invalid Operation Reason"); break; - case SESTYP_DISPLAY: + case ELMTYP_UPS: + sprintf(rbuf, "Uninterruptible Power Supply"); + break; + case ELMTYP_DISPLAY: sprintf(rbuf, "Display"); break; - case SESTYP_KEYPAD: - sprintf(rbuf, "Key pad entry device"); + case ELMTYP_KEYPAD: + sprintf(rbuf, "Key Pad Entry"); break; - case SESTYP_ENCLOSURE: + case ELMTYP_ENCLOSURE: sprintf(rbuf, "Enclosure"); break; - case SESTYP_SCSIXVR: - sprintf(rbuf, "SCSI port/transceiver"); + case ELMTYP_SCSIXVR: + sprintf(rbuf, "SCSI Port/Transceiver"); break; - case SESTYP_LANGUAGE: + case ELMTYP_LANGUAGE: sprintf(rbuf, "Language"); break; - case SESTYP_COMPORT: + case ELMTYP_COMPORT: sprintf(rbuf, "Communication Port"); break; - case SESTYP_VOM: + case ELMTYP_VOM: sprintf(rbuf, "Voltage Sensor"); break; - case SESTYP_AMMETER: + case ELMTYP_AMMETER: sprintf(rbuf, "Current Sensor"); break; - case SESTYP_SCSI_TGT: - sprintf(rbuf, "SCSI target port"); + case ELMTYP_SCSI_TGT: + sprintf(rbuf, "SCSI Target Port"); break; - case SESTYP_SCSI_INI: - sprintf(rbuf, "SCSI initiator port"); + case ELMTYP_SCSI_INI: + sprintf(rbuf, "SCSI Initiator Port"); break; - case SESTYP_SUBENC: - sprintf(rbuf, "Simple sub-enclosure"); + case ELMTYP_SUBENC: + sprintf(rbuf, "Simple Subenclosure"); break; - case SESTYP_ARRAY: - sprintf(rbuf, "Array device"); + case ELMTYP_ARRAY_DEV: + sprintf(rbuf, "Array Device Slot"); break; - case SESTYP_SASEXPANDER: + case ELMTYP_SAS_EXP: sprintf(rbuf, "SAS Expander"); break; - case SESTYP_SASCONNECTOR: + case ELMTYP_SAS_CONN: sprintf(rbuf, "SAS Connector"); break; default: @@ -134,31 +140,34 @@ scode2ascii(u_char code) static char rbuf[32]; switch (code & 0xf) { case SES_OBJSTAT_UNSUPPORTED: - sprintf(rbuf, "status not supported"); + sprintf(rbuf, "Unsupported"); break; case SES_OBJSTAT_OK: - sprintf(rbuf, "ok"); + sprintf(rbuf, "OK"); break; case SES_OBJSTAT_CRIT: - sprintf(rbuf, "critical"); + sprintf(rbuf, "Critical"); break; case SES_OBJSTAT_NONCRIT: - sprintf(rbuf, "non-critical"); + sprintf(rbuf, "Noncritical"); break; case SES_OBJSTAT_UNRECOV: - sprintf(rbuf, "unrecoverable"); + sprintf(rbuf, "Unrecoverable"); break; case SES_OBJSTAT_NOTINSTALLED: - sprintf(rbuf, "not installed"); + sprintf(rbuf, "Not Installed"); break; case SES_OBJSTAT_UNKNOWN: - sprintf(rbuf, "unknown status"); + sprintf(rbuf, "Unknown"); break; case SES_OBJSTAT_NOTAVAIL: - sprintf(rbuf, "status not available"); + sprintf(rbuf, "Not Available"); + break; + case SES_OBJSTAT_NOACCESS: + sprintf(rbuf, "No Access Allowed"); break; default: - sprintf(rbuf, "unknown status code %x", code & 0xf); + sprintf(rbuf, "", code & 0xf); break; } return (rbuf); @@ -171,7 +180,7 @@ stat2ascii(int eletype __unused, u_char *cstat) static char ebuf[256], *scode; scode = scode2ascii(cstat[0]); - sprintf(ebuf, "Status=%s (bytes=0x%02x 0x%02x 0x%02x 0x%02x)", + sprintf(ebuf, "status: %s (0x%02x 0x%02x 0x%02x 0x%02x)", scode, cstat[0], cstat[1], cstat[2], cstat[3]); return (ebuf); } diff --git a/share/examples/ses/srcs/getencstat.c b/share/examples/ses/srcs/getencstat.c index 3514fe4..9048f73 100644 --- a/share/examples/ses/srcs/getencstat.c +++ b/share/examples/ses/srcs/getencstat.c @@ -33,20 +33,25 @@ */ #include +#include +#include #include #include #include #include #include -#include SESINC +#include +#include #include "eltsub.h" int main(int a, char **v) { - ses_object *objp; - ses_objstat ob; + encioc_element_t *objp; + encioc_elm_status_t ob; + encioc_elm_desc_t objd; + encioc_elm_devnames_t objdn; int fd, nobj, f, i, verbose, quiet, errors; u_char estat; @@ -73,13 +78,13 @@ main(int a, char **v) perror(*v); continue; } - if (ioctl(fd, SESIOC_GETNOBJ, (caddr_t) &nobj) < 0) { - perror("SESIOC_GETNOBJ"); + if (ioctl(fd, ENCIOC_GETNELM, (caddr_t) &nobj) < 0) { + perror("ENCIOC_GETNELM"); (void) close(fd); continue; } - if (ioctl(fd, SESIOC_GETENCSTAT, (caddr_t) &estat) < 0) { - perror("SESIOC_GETENCSTAT"); + if (ioctl(fd, ENCIOC_GETENCSTAT, (caddr_t) &estat) < 0) { + perror("ENCIOC_GETENCSTAT"); (void) close(fd); continue; } @@ -113,38 +118,64 @@ main(int a, char **v) } } fprintf(stdout, ">\n"); - objp = calloc(nobj, sizeof (ses_object)); + objp = calloc(nobj, sizeof (encioc_element_t)); if (objp == NULL) { perror("calloc"); (void) close(fd); continue; } - if (ioctl(fd, SESIOC_GETOBJMAP, (caddr_t) objp) < 0) { - perror("SESIOC_GETOBJMAP"); + if (ioctl(fd, ENCIOC_GETELMMAP, (caddr_t) objp) < 0) { + perror("ENCIOC_GETELMMAP"); (void) close(fd); continue; } for (i = 0; i < nobj; i++) { - ob.obj_id = objp[i].obj_id; - if (ioctl(fd, SESIOC_GETOBJSTAT, (caddr_t) &ob) < 0) { - perror("SESIOC_GETOBJSTAT"); + ob.elm_idx = objp[i].elm_idx; + if (ioctl(fd, ENCIOC_GETELMSTAT, (caddr_t) &ob) < 0) { + perror("ENCIOC_GETELMSTAT"); (void) close(fd); break; } - if ((ob.cstat[0] & 0xf) == SES_OBJSTAT_OK) { - if (verbose) { - fprintf(stdout, - "Element 0x%x: %s OK (%s)\n", - ob.obj_id, - geteltnm(objp[i].object_type), - stat2ascii(objp[i].object_type, - ob.cstat)); - } + bzero(&objd, sizeof(objd)); + objd.elm_idx = objp[i].elm_idx; + objd.elm_desc_len = UINT16_MAX; + objd.elm_desc_str = calloc(UINT16_MAX, sizeof(char)); + if (objd.elm_desc_str == NULL) { + perror("calloc"); + (void) close(fd); continue; } - fprintf(stdout, "Element 0x%x: %s, %s\n", - ob.obj_id, geteltnm(objp[i].object_type), - stat2ascii(objp[i].object_type, ob.cstat)); + if (ioctl(fd, ENCIOC_GETELMDESC, (caddr_t)&objd) < 0) { + perror("ENCIOC_GETELMDESC"); + (void) close(fd); + break; + } + bzero(&objdn, sizeof(objdn)); + objdn.elm_idx = objp[i].elm_idx; + objdn.elm_names_size = 128; + objdn.elm_devnames = calloc(128, sizeof(char)); + if (objdn.elm_devnames == NULL) { + perror("calloc"); + (void) close(fd); + break; + } + /* + * This ioctl isn't critical and has a good chance + * of returning -1. + */ + (void)ioctl(fd, ENCIOC_GETELMDEVNAMES, (caddr_t)&objdn); + fprintf(stdout, "Element 0x%x: %s", ob.elm_idx, + geteltnm(objp[i].elm_type)); + fprintf(stdout, ", %s", + stat2ascii(objp[i].elm_type, ob.cstat)); + if (objd.elm_desc_len > 0) + fprintf(stdout, ", descriptor: '%s'", + objd.elm_desc_str); + if (objdn.elm_names_len > 0) + fprintf(stdout, ", dev: '%s'", + objdn.elm_devnames); + fprintf(stdout, "\n"); + free(objdn.elm_devnames); } free(objp); (void) close(fd); diff --git a/share/examples/ses/srcs/getnobj.c b/share/examples/ses/srcs/getnobj.c index 17a26c6..92d3458 100644 --- a/share/examples/ses/srcs/getnobj.c +++ b/share/examples/ses/srcs/getnobj.c @@ -33,12 +33,15 @@ */ #include +#include +#include #include #include #include #include #include -#include SESINC +#include +#include int main(int argc, char **argv) diff --git a/share/examples/ses/srcs/getobjmap.c b/share/examples/ses/srcs/getobjmap.c index 9798b4c..fbcc12e 100644 --- a/share/examples/ses/srcs/getobjmap.c +++ b/share/examples/ses/srcs/getobjmap.c @@ -33,11 +33,14 @@ */ #include +#include +#include #include #include #include #include -#include SESINC +#include +#include #include "eltsub.h" diff --git a/share/examples/ses/srcs/getobjstat.c b/share/examples/ses/srcs/getobjstat.c index 99fb185..d49f6f9 100644 --- a/share/examples/ses/srcs/getobjstat.c +++ b/share/examples/ses/srcs/getobjstat.c @@ -32,11 +32,14 @@ * mjacob@feral.com */ #include +#include +#include #include #include #include #include -#include SESINC +#include +#include int main(int a, char **v) diff --git a/share/examples/ses/srcs/inienc.c b/share/examples/ses/srcs/inienc.c index 7d6cc22..f418787 100644 --- a/share/examples/ses/srcs/inienc.c +++ b/share/examples/ses/srcs/inienc.c @@ -33,11 +33,14 @@ */ #include +#include +#include #include #include #include #include -#include SESINC +#include +#include int main(int a, char **v) diff --git a/share/examples/ses/srcs/sesd.c b/share/examples/ses/srcs/sesd.c index 0793077..88627e9 100644 --- a/share/examples/ses/srcs/sesd.c +++ b/share/examples/ses/srcs/sesd.c @@ -32,6 +32,8 @@ * mjacob@feral.com */ #include +#include +#include #include #include #include @@ -39,7 +41,8 @@ #include #include #include -#include SESINC +#include +#include #define ALLSTAT (SES_ENCSTAT_UNRECOV | SES_ENCSTAT_CRITICAL | \ SES_ENCSTAT_NONCRITICAL | SES_ENCSTAT_INFO) @@ -54,7 +57,7 @@ main(int a, char **v) static const char *usage = "usage: %s [ -d ] [ -t pollinterval ] device [ device ]\n"; int fd, polltime, dev, devbase, nodaemon; - ses_encstat stat, *carray; + encioc_enc_status_t stat, *carray; if (a < 2) { fprintf(stderr, usage, *v); @@ -83,7 +86,7 @@ main(int a, char **v) return (1); } for (dev = devbase; dev < a; dev++) - carray[dev] = (ses_encstat) -1; + carray[dev] = (encioc_enc_status_t) -1; /* * Check to make sure we can open all devices @@ -94,8 +97,8 @@ main(int a, char **v) perror(v[dev]); return (1); } - if (ioctl(fd, SESIOC_INIT, NULL) < 0) { - fprintf(stderr, "%s: SESIOC_INIT fails- %s\n", + if (ioctl(fd, ENCIOC_INIT, NULL) < 0) { + fprintf(stderr, "%s: ENCIOC_INIT fails- %s\n", v[dev], strerror(errno)); return (1); } @@ -122,9 +125,9 @@ main(int a, char **v) /* * Get the actual current enclosure status. */ - if (ioctl(fd, SESIOC_GETENCSTAT, (caddr_t) &stat) < 0) { + if (ioctl(fd, ENCIOC_GETENCSTAT, (caddr_t) &stat) < 0) { syslog(LOG_ERR, - "%s: SESIOC_GETENCSTAT- %m", v[dev]); + "%s: ENCIOC_GETENCSTAT- %m", v[dev]); (void) close(fd); continue; } diff --git a/share/examples/ses/srcs/setencstat.c b/share/examples/ses/srcs/setencstat.c index 127f68f..87a7fa2 100644 --- a/share/examples/ses/srcs/setencstat.c +++ b/share/examples/ses/srcs/setencstat.c @@ -33,18 +33,21 @@ */ #include +#include +#include #include #include #include #include -#include SESINC +#include +#include int main(int a, char **v) { int fd; long val; - ses_encstat stat; + encioc_enc_status_t stat; if (a != 3) { fprintf(stderr, "usage: %s device enclosure_status\n", *v); @@ -57,9 +60,9 @@ main(int a, char **v) } val = strtol(v[2], NULL, 0); - stat = (ses_encstat) val; - if (ioctl(fd, SESIOC_SETENCSTAT, (caddr_t) &stat) < 0) { - perror("SESIOC_SETENCSTAT"); + stat = (encioc_enc_status_t)val; + if (ioctl(fd, ENCIOC_SETENCSTAT, (caddr_t) &stat) < 0) { + perror("ENCIOC_SETENCSTAT"); } (void) close(fd); return (0); diff --git a/share/examples/ses/srcs/setobjstat.c b/share/examples/ses/srcs/setobjstat.c index 08fdb7b..26a5dd1 100644 --- a/share/examples/ses/srcs/setobjstat.c +++ b/share/examples/ses/srcs/setobjstat.c @@ -33,18 +33,21 @@ */ #include +#include +#include #include #include #include #include -#include SESINC +#include +#include int main(int a, char **v) { int fd; int i; - ses_objstat obj; + encioc_elm_status_t obj; long cvt; char *x; @@ -64,7 +67,7 @@ usage: if (x == v[2]) { goto usage; } - obj.obj_id = cvt; + obj.elm_idx = cvt; for (i = 0; i < 4; i++) { x = v[3 + i]; cvt = strtol(v[3 + i], &x, 0); @@ -73,8 +76,8 @@ usage: } obj.cstat[i] = cvt; } - if (ioctl(fd, SESIOC_SETOBJSTAT, (caddr_t) &obj) < 0) { - perror("SESIOC_SETOBJSTAT"); + if (ioctl(fd, ENCIOC_SETELMSTAT, (caddr_t) &obj) < 0) { + perror("ENCIOC_SETELMSTAT"); } (void) close(fd); return (0); -- cgit v1.1 From 64b0ebf1a271d49cc43e18f2c9cae23d3c6ab6ad Mon Sep 17 00:00:00 2001 From: marcel Date: Thu, 24 May 2012 20:00:58 +0000 Subject: Fix an inconsistency I just ran into for LDADD and DPADD. The description for both of them use different, and presumably wrong, variables in the example. They set LDFILES and SRCLIB respectively. I guess that's what DPADD and LDADD were called first ... --- share/mk/bsd.README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.README b/share/mk/bsd.README index e91a231..f09142e 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -228,7 +228,7 @@ LDADD Additional loader objects. Usually used for libraries. For example, to load with the compatibility and utility libraries, use: - LDFILES=-lutil -lcompat + LDADD=-lutil -lcompat LDFLAGS Additional loader flags. @@ -261,7 +261,7 @@ DPADD Additional dependencies for the program. Usually used for libraries. For example, to depend on the compatibility and utility libraries use: - SRCLIB=${LIBCOMPAT} ${LIBUTIL} + DPADD=${LIBCOMPAT} ${LIBUTIL} There is a predefined identifier for each (non-profiled, non-shared) library and object. Library file names are -- cgit v1.1 From bc5f229f6c37319271762d5fdc1cb25303d6ea97 Mon Sep 17 00:00:00 2001 From: gavin Date: Sat, 26 May 2012 14:44:18 +0000 Subject: Updates to reflect recent commit bits handed back, etc. MFC after: 1 week --- share/misc/committers-src.dot | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 96b295b..20ad004 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -39,6 +39,7 @@ billf [label="Bill Fumerola\nbillf@FreeBSD.org\n1998/11/11\n2008/11/10"] bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2002/01/29\n2009/09/13"] bmilekic [label="Bosko Milekic\nbmilekic@FreeBSD.org\n2000/09/21\n2008/11/10"] bushman [label="Michael Bushkov\nbushman@FreeBSD.org\n2007/03/10\n2010/04/29"] +ceri [label="Ceri Davies\nceri@FreeBSD.org\n2006/11/07\n2012/03/07"] cjc [label="Crist J. Clark\ncjc@FreeBSD.org\n2001/06/01\n2006/12/29"] dds [label="Diomidis Spinellis\ndds@FreeBSD.org\n2003/06/20\n2010/09/22"] dhartmei [label="Daniel Hartmeier\ndhartmei@FreeBSD.org\n2004/04/06\n2008/12/08"] @@ -58,20 +59,21 @@ jtc [label="J.T. Conklin\njtc@FreeBSD.org\n1993/06/12\n????/??/??"] kbyanc [label="Kelly Yancey\nkbyanc@FreeBSD.org\n2000/07/11\n2006/07/25"] keichii [label="Michael Wu\nkeichii@FreeBSD.org\n2001/03/07\n2006/04/28"] linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2006/09/30\n2008/05/04"] +lulf [label="Ulf Lilleengen\nlulf@FreeBSD.org\n2007/10/24\n2012/01/19"] mb [label="Maxim Bolotin\nmb@FreeBSD.org\n2000/04/06\n2003/03/08"] marks [label="Mark Santcroos\nmarks@FreeBSD.org\n2004/03/18\n2008/09/29"] mike [label="Mike Barcroft\nmike@FreeBSD.org\n2001/07/17\n2006/04/28"] msmith [label="Mike Smith\nmsmith@FreeBSD.org\n????/??/??\n2003/12/15"] murray [label="Murray Stokely\nmurray@FreeBSD.org\n2000/04/05\n2010/07/25"] +mux [label="Maxime Henrion\nmux@FreeBSD.org\n2002/03/03\n2011/06/22"] nate [label="Nate Willams\nnate@FreeBSD.org\n1993/06/12\n2003/12/15"] njl [label="Nate Lawson\nnjl@FreeBSD.org\n2002/08/07\n2008/02/16"] non [label="Noriaki Mitsnaga\nnon@FreeBSD.org\n2000/06/19\n2007/03/06"] onoe [label="Atsushi Onoe\nonoe@FreeBSD.org\n2000/07/21\n2008/11/10"] +randi [label="Randi Harper\nrandi@FreeBSD.org\n2010/04/20\n2012/05/10"] rgrimes [label="Rod Grimes\nrgrimes@FreeBSD.org\n1993/06/12\n2003/03/08"] rink [label="Rink Springer\nrink@FreeBSD.org\n2006/01/16\n2010/11/04"] robert [label="Robert Drehmel\nrobert@FreeBSD.org\n2001/08/23\n2006/05/13"] -rmh [label="Robert Millan\nrmh@FreeBSD.org\n2011/09/18"] -rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2007/09/25\n2010/12/03"] sah [label="Sam Hopkins\nsah@FreeBSD.org\n2004/12/15\n2008/11/10"] shafeeq [label="Shafeeq Sinnamohideen\nshafeeq@FreeBSD.org\n2000/06/19\n2006/04/06"] sheldonh [label="Sheldon Hearn\nsheldonh@FreeBSD.org\n1999/06/14\n2006/05/13"] @@ -82,6 +84,7 @@ tmm [label="Thomas Moestl\ntmm@FreeBSD.org\n2001/03/07\n2006/07/12"] toshi [label="Toshihiko Arai\ntoshi@FreeBSD.org\n2000/07/06\n2003/03/08"] tshiozak [label="Takuya SHIOZAKI\ntshiozak@FreeBSD.org\n2001/04/25\n2003/03/08"] uch [label="UCHIYAMA Yasushi\nuch@FreeBSD.org\n2000/06/21\n2002/04/24"] +yar [label="Yar Tikhiy\nyar@FreeBSD.org\n2001/03/25\n2012/05/23"] node [color=lightblue2, style=filled, bgcolor=black]; @@ -112,7 +115,6 @@ brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2006/02/28"] bruno [label="Bruno Ducrot\nbruno@FreeBSD.org\n2005/07/18"] bschmidt [label="Bernhard Schmidt\nbschmidt@FreeBSD.org\n2010/02/06"] bz [label="Bjoern A. Zeeb\nbz@FreeBSD.org\n2004/07/27"] -ceri [label="Ceri Davies\nceri@FreeBSD.org\n2006/11/07"] cognet [label="Olivier Houchard\ncognet@FreeBSD.org\n2002/10/09"] cokane [label="Coleman Kane\ncokane@FreeBSD.org\n2000/06/19"] cperciva [label="Colin Percival\ncperciva@FreeBSD.org\n2004/01/20"] @@ -187,7 +189,6 @@ kib [label="Konstantin Belousov\nkib@FreeBSD.org\n2006/06/03"] kmacy [label="Kip Macy\nkmacy@FreeBSD.org\n2005/06/01"] le [label="Lukas Ertl\nle@FreeBSD.org\n2004/02/02"] lstewart [label="Lawrence Stewart\nlstewart@FreeBSD.org\n2008/10/06"] -lulf [label="Ulf Lilleengen\nlulf@FreeBSD.org\n2007/10/24"] marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03"] marius [label="Marius Strobl\nmarius@FreeBSD.org\n2004/04/17"] markm [label="Mark Murray\nmarkm@FreeBSD.org\n199?/??/??"] @@ -202,7 +203,6 @@ mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"] mlaier [label="Max Laier\nmlaier@FreeBSD.org\n2004/02/10"] monthadar [label="Monthadar Al Jaberi\nmonthadar@FreeBSD.org\n2012/04/02"] mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"] -mux [label="Maxime Henrion\nmux@FreeBSD.org\n2002/03/03"] neel [label="Neel Natu\nneel@FreeBSD.org\n2009/09/20"] netchild [label="Alexander Leidinger\nnetchild@FreeBSD.org\n2005/03/31"] nork [label="Norikatsu Shigemura\nnork@FreeBSD.org\n2009/06/09"] @@ -213,7 +213,7 @@ olli [label="Oliver Fromme\nolli@FreeBSD.org\n2008/02/14"] peadar [label="Peter Edwards\npeadar@FreeBSD.org\n2004/03/08"] peter [label="Peter Wemm\npeter@FreeBSD.org\n????/??/??"] pfg [label="Pedro Giffuni\npfg@FreeBSD.org\n2011/12/01"] -philip [label="Philip Paeps\nphilip@FreBSD.org\n2004/01/21"] +philip [label="Philip Paeps\nphilip@FreeBSD.org\n2004/01/21"] phk [label="Poul-Henning Kamp\nphk@FreeBSD.org\n1994/02/21"] pho [label="Peter Holm\npho@FreeBSD.org\n2008/11/16"] pjd [label="Pawel Jakub Dawidek\npjd@FreeBSD.org\n2004/02/02"] @@ -221,14 +221,15 @@ pluknet [label="Sergey Kandaurov\npluknet@FreeBSD.org\n2010/10/05"] ps [label="Paul Saab\nps@FreeBSD.org\n2000/02/23"] qingli [label="Qing Li\nqingli@FreeBSD.org\n2005/04/13"] rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2007/01/31"] -randi [label="Randi Harper\nrandi@FreeBSD.org\n2010/04/20"] ray [label="Aleksandr Rybalko\nray@FreeBSD.org\n2011/05/25"] rdivacky [label="Roman Divacky\nrdivacky@FreeBSD.org\n2008/03/13"] remko [label="Remko Lodder\nremko@FreeBSD.org\n2007/02/23"] rik [label="Roman Kurakin\nrik@FreeBSD.org\n2003/12/18"] rmacklem [label="Rick Macklem\nrmacklem@FreeBSD.org\n2009/03/27"] +rmh [label="Robert Millan\nrmh@FreeBSD.org\n2011/09/18"] rnoland [label="Robert Noland\nrnoland@FreeBSD.org\n2008/09/15"] roberto [label="Ollivier Robert\nroberto@FreeBSD.org\n1995/02/22"] +rpaulo [label="Rui Paulo\nrpaulo@FreeBSD.org\n2007/09/25"] rrs [label="Randall R Stewart\nrrs@FreeBSD.org\n2007/02/08"] rse [label="Ralf S. Engelschall\nrse@FreeBSD.org\n1997/07/31"] rstone [label="Ryan Stone\nrstone@FreeBSD.org\n2010/04/19"] @@ -266,7 +267,6 @@ wes [label="Wes Peters\nwes@FreeBSD.org\n1998/11/25"] wilko [label="Wilko Bulte\nwilko@FreeBSD.org\n2000/01/13"] wollman [label="Garrett Wollman\nwollman@FreeBSD.org\n????/??/??"] wsalamon [label="Wayne Salamon\nwsalamon@FreeBSD.org\n2005/06/25"] -yar [label="Yar Tikhiy\nyar@FreeBSD.org\n2001/03/25"] yongari [label="Pyun YongHyeon\nyongari@FreeBSD.org\n2004/08/01"] zack [label="Zack Kirsch\nzack@FreeBSD.org\n2010/11/05"] zec [label="Marko Zec\nzec@FreeBSD.org\n2008/06/22"] -- cgit v1.1 From 00acb776a5294c827116b4c89b7f2bcbb17575b7 Mon Sep 17 00:00:00 2001 From: gavin Date: Sat, 26 May 2012 16:26:23 +0000 Subject: Update to reflect various doc commit bits taken into safekeeping. MFC after: 1 week --- share/misc/committers-doc.dot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 630cb8f..5631ed4 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -32,15 +32,19 @@ node [color=grey62, style=filled, bgcolor=black]; ache [label="Andrey Chernov\nache@FreeBSD.org\n1997/06/13\n2010/12/11"] bmah [label="Bruce A. Mah\nbmah@FreeBSD.org\n2000/08/22\n2009/09/13"] bvs [label="Vitaly Bogdanov\nbvs@FreeBSD.org\n2005/10/03\n2010/12/11"] +ceri [label="Ceri Davies\nceri@FreeBSD.org\n2002/03/17\n2012/02/29"] den [label="Denis Peplin\nden@FreeBSD.org\n2003/09/13\n2009/07/09"] garys [label="Gary W. Swearingen\ngarys@FreeBSD.org\n2005/08/21\n2008/03/02"] jcamou [label="Jesus R. Camou\njcamou@FreeBSD.org\n2005/03/02\n2008/12/20"] jesusr [label="Jesus Rodriguez Cuesta\njesusr@FreeBSD.org\n1998/12/10\n2010/12/11"] jim [label="Jim Mock\njim@FreeBSD.org\n1999/08/11\n2003/12/15"] josef [label="Josef El-Rayes\njosef@FreeBSD.org\n2004/01/15\n2008/03/29"] +marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03\n2012/04/25"] mheinen [label="Martin Heinen\nmheinen@FreeBSD.org\n2002/10/04\n2006/04/26"] +murray [label="Murray Stokely\nmurray@FreeBSD.org\n2000/04/05\n2012/04/25"] nik [label="Nik Clayton\nnik@FreeBSD.org\n1998/02/26\n2008/12/20"] pgj [label="Gabor Pali\npgj@FreeBSD.org\n2008/04/21\n2010/12/01"] +roam [label="Peter Pentchev\nroam@FreeBSD.org\n2003/02/14\n2012/02/29"] node [color=lightblue2, style=filled, bgcolor=black]; @@ -51,7 +55,6 @@ bcr [label="Benedict Reuschling\nbcr@FreeBSD.org\n2009/12/24"] blackend [label="Marc Fonvieille\nblackend@FreeBSD.org\n2002/06/16"] brd [label="Brad Davis\nbrd@FreeBSD.org\n2005/06/01"] brueffer [label="Christian Brueffer\nbrueffer@FreeBSD.org\n2003/01/13"] -ceri [label="Ceri Davies\nceri@FreeBSD.org\n2002/03/17"] chinsan [label="Chinsan Huang\nchinsan@FreeBSD.org\n2006/09/20"] danger [label="Daniel Gerzo\ndanger@FreeBSD.org\n2006/08/20"] delphij [label="Xin Li\ndelphij@FreeBSD.org\n2004/09/14"] @@ -67,16 +70,13 @@ keramida [label="Giorgos Keramidas\nkeramida@FreeBSD.org\n2001/10/12"] linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2004/03/31"] loader [label="Fukang Chen\nloader@FreeBSD.org\n2007/07/30"] manolis [label="Manolis Kiagias\nmanolis@FreeBSD.org\n2008/05/24"] -marcel [label="Marcel Moolenaar\nmarcel@FreeBSD.org\n1999/07/03"] marck [label="Dmitry Morozovsky\nmarck@FreeBSD.org\n2004/08/10"] maxim [label="Maxim Konovalov\nmaxim@FreeBSD.org\n2002/02/07"] miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2007/10/26"] -murray [label="Murray Stokely\nmurray@FreeBSD.org\n2000/04/05"] pav [label="Pav Lucistnik\npav@FreeBSD.org\n2005/08/12"] pluknet [label="Sergey Kandaurov\npluknet@FreeBSD.org\n2012/02/14"] remko [label="Remko Lodder\nremko@FreeBSD.org\n2004/10/16"] rene [label="Rene Ladan\nrene@FreeBSD.org\n2008/11/03"] -roam [label="Peter Pentchev\nroam@FreeBSD.org\n2003/02/14"] ryusuke [label="Ryusuke Suzuki\nryusuke@FreeBSD.org\n2009/12/21"] simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2003/07/20"] taras [label="Taras Korenko\ntaras@FreeBSD.org\n2010/06/25"] -- cgit v1.1 From 402b03b98acd179e14e6f53fb6c314fe6cb8f34f Mon Sep 17 00:00:00 2001 From: wblock Date: Sat, 26 May 2012 21:30:18 +0000 Subject: Wording corrections and simplifications. Approved by: gjb (mentor) MFC after: 3 days --- share/man/man4/vlan.4 | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'share') diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4 index 4ef65cb..dd36ff7 100644 --- a/share/man/man4/vlan.4 +++ b/share/man/man4/vlan.4 @@ -79,16 +79,16 @@ to a properly configured switch port. The VLAN tag should match one of those set up in the switched network. .Pp -Initially .Nm -assumes the same minimum length for tagged and untagged frames. -This mode is selected by the +initially assumes the same minimum length for tagged and untagged frames. +This mode is selected by setting the .Xr sysctl 8 variable .Va net.link.vlan.soft_pad -set to 0 (default). -However, there are network devices that fail to adjust frame length, -should it fall below the allowed minimum due to untagging. +to 0 +.Pq default . +However, there are network devices that fail to adjust frame length +when it falls below the allowed minimum due to untagging. Such devices should be able to interoperate with .Nm after changing the value of @@ -97,7 +97,7 @@ to 1. In the latter mode, .Nm will pad short frames before tagging them -so that their length stays not less than the minimum value +so that their length is not less than the minimum value after untagging by the non-compliant devices. .Sh HARDWARE The @@ -111,7 +111,7 @@ receive and transmit long frames (up to 1522 bytes including an Ethernet header and FCS). The capabilities may be user-controlled by the respective parameters to .Xr ifconfig 8 , -.Cm vlanhwtag +.Cm vlanhwtag , and .Cm vlanmtu . However, a physical interface is not obliged to react to them: @@ -119,8 +119,8 @@ It may have either capability enabled permanently without a way to turn it off. The whole issue is very specific to a particular device and its driver. .Pp -By now, the list of physical interfaces able of full VLAN processing -in the hardware is limited to the following devices: +At present, physical interfaces capable of full VLAN processing +in the hardware is limited to these devices: .Xr ae 4 , .Xr age 4 , .Xr alc 4 , @@ -146,11 +146,10 @@ in the hardware is limited to the following devices: and .Xr vge 4 . .Pp -The rest of the Ethernet interfaces can run -VLANs using software emulation in the +Other Ethernet interfaces can run VLANs using software emulation in the .Nm driver. -However, some of them lack the capability +However, some lack the capability of transmitting and receiving long frames. Assigning such an interface as the parent to .Nm @@ -163,9 +162,8 @@ connectivity problems due to massive, inadequate .Xr icmp 4 filtering that breaks the Path MTU Discovery mechanism. .Pp -The following interfaces support long frames for -.Nm -natively: +These interfaces natively support long frames for +.Nm : .Xr axe 4 , .Xr bfe 4 , .Xr cas 4 , -- cgit v1.1 From cb69eb600cac273a7b85e63780f3d7e725e25f0c Mon Sep 17 00:00:00 2001 From: trasz Date: Tue, 29 May 2012 14:41:16 +0000 Subject: Fix lock interaction table for rmlocks - by default they cannot sleep, just like rwlocks. MFC after: 1 week --- share/man/man9/locking.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index 6a0107f..f634d34 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 3, 2010 +.Dd May 25, 2012 .Dt LOCKING 9 .Os .Sh NAME @@ -298,7 +298,7 @@ one of the synchronization primitives discussed: .It mutex Ta \&ok Ta \&ok-1 Ta \&no Ta \&ok Ta \&ok Ta \&no-3 .It sx Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&ok Ta \&ok-4 .It rwlock Ta \&ok Ta \&ok Ta \&no Ta \&ok-2 Ta \&ok Ta \&no-3 -.It rmlock Ta \&ok Ta \&ok Ta \&ok-5 Ta \&ok Ta \&ok-2 Ta \&ok-5 +.It rmlock Ta \&ok Ta \&ok Ta \&no-5 Ta \&ok Ta \&ok-2 Ta \&no-5 .El .Pp .Em *1 -- cgit v1.1 From d6062cd9dd0c7b75df177b4ee6e4da3ee1819271 Mon Sep 17 00:00:00 2001 From: olivierd Date: Tue, 29 May 2012 20:16:26 +0000 Subject: Add myself and my relation to my mentors. Approved by: miwi@, rene@ --- share/misc/committers-ports.dot | 3 +++ 1 file changed, 3 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 2e897f2..c6f93d9 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -149,6 +149,7 @@ nork [label="Norikatsu Shigemura\nnork@FreeBSD.org\n2002/04/01"] novel [label="Roman Bogorodskiy\nnovel@FreeBSD.org\n2005/03/07"] nox [label="Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] obrien [label="David E. O'Brien\nobrien@FreeBSD.org\n1996/10/29"] +olivierd [label="Olivier Duchateau\nolivierd@FreeBSD.org\n2012/05/29"] mharo [label="Michael Haro\nmharo@FreeBSD.org\n1999/04/13"] osa [label="Sergey A. Osokin\nosa@FreeBSD.org\n2003/06/04"] pat [label="Patrick Li\npat@FreeBSD.org\n2001/11/14"] @@ -371,6 +372,7 @@ miwi -> makc miwi -> mandree miwi -> mva miwi -> nox +miwi -> olivierd miwi -> pawel miwi -> rm miwi -> sbz @@ -413,6 +415,7 @@ rafan -> chinsan rene -> crees rene -> jgh +rene -> olivierd sahil -> culot sahil -> eadler -- cgit v1.1 From a4dfa90779f18d611111c63af5d0e4fe365d11a2 Mon Sep 17 00:00:00 2001 From: gjb Date: Wed, 30 May 2012 01:52:01 +0000 Subject: Fix an mdoc(7) formatting nit. MFC after: 3 days --- share/man/man7/release.7 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 19cf41c..2a794c8 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -283,7 +283,7 @@ Typically, one only needs to set .Va TARGET . .El .Sh FILES -.Bl -tag -compact +.Bl -tag -compact -width Pa .It Pa /usr/doc/Makefile .It Pa /usr/doc/share/mk/doc.project.mk .It Pa /usr/ports/Mk/bsd.port.mk -- cgit v1.1 From ba87efc7e0586d2cfa10c842a4d3bd6a9c71071f Mon Sep 17 00:00:00 2001 From: kevlo Date: Wed, 30 May 2012 02:02:37 +0000 Subject: Hook up wbwd man page to the build. --- share/man/man4/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 2c23a9c..f556768 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -522,6 +522,7 @@ MAN= aac.4 \ ${_vxge.4} \ watchdog.4 \ wb.4 \ + ${_wbwd.4} \ wi.4 \ witness.4 \ wlan.4 \ @@ -735,6 +736,7 @@ _spkr.4= spkr.4 _tpm.4= tpm.4 _urtw.4= urtw.4 _viawd.4= viawd.4 +_wbwd.4= wbwd.4 _wpi.4= wpi.4 _xen.4= xen.4 _xnb.4= xnb.4 -- cgit v1.1 From dac8a344eeacafbec87dc6014e34f10a2ae60c7f Mon Sep 17 00:00:00 2001 From: gjb Date: Wed, 30 May 2012 02:29:47 +0000 Subject: Fix mdoc(7) style nits. MFC after: 3 days --- share/man/man5/devfs.conf.5 | 2 +- share/man/man5/devfs.rules.5 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man5/devfs.conf.5 b/share/man/man5/devfs.conf.5 index 9d83726..f459696 100644 --- a/share/man/man5/devfs.conf.5 +++ b/share/man/man5/devfs.conf.5 @@ -91,7 +91,7 @@ as explained in .Xr chmod 1 . .El .Sh FILES -.Bl -tag -compact +.Bl -tag -compact -width Pa .It Pa /etc/devfs.conf .It Pa /usr/share/examples/etc/devfs.conf .El diff --git a/share/man/man5/devfs.rules.5 b/share/man/man5/devfs.rules.5 index 8a7b3d6..603189e 100644 --- a/share/man/man5/devfs.rules.5 +++ b/share/man/man5/devfs.rules.5 @@ -82,7 +82,7 @@ file: devfs_system_ruleset="localrules" .Ed .Sh FILES -.Bl -tag -compact +.Bl -tag -compact -width Pa .It Pa /etc/defaults/devfs.rules Default .Nm -- cgit v1.1 From 80e7af67abd933797af5129b462bb9904203fb49 Mon Sep 17 00:00:00 2001 From: gjb Date: Wed, 30 May 2012 02:41:09 +0000 Subject: Regen src.conf.5 after r236279. MFC after: 3 days --- share/man/man5/src.conf.5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 9eb67f3..d40e4cf 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru +.\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb .\" $FreeBSD$ -.Dd May 19, 2012 +.Dd May 29, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -1032,7 +1032,7 @@ Set to not build ZFS file system. Set to not build the timezone database. .El .Sh FILES -.Bl -tag -compact +.Bl -tag -compact -width Pa .It Pa /etc/src.conf .It Pa /usr/share/mk/bsd.own.mk .El -- cgit v1.1 From bf2eae7971ca919cb4d25d7eacc99c64f109a22f Mon Sep 17 00:00:00 2001 From: eadler Date: Wed, 30 May 2012 04:14:38 +0000 Subject: Document daily_status_security_chkportsum_enable PR: docs/167980 Submitted by: "Bryan Drewery" Reported by: rank1seeker@gmail.com Approved by: cperciva MFC after: 2 weeks --- share/man/man5/periodic.conf.5 | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'share') diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index 4ab009c..d33555c 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -504,6 +504,12 @@ Set to .Dq Li YES to compare the modes and modification times of setuid executables with the previous day's values. +.It Va daily_status_security_chkportsum_enable +.Pq Vt bool +Set to +.Dq Li YES +to verify checksums of all installed packages against the known checksums in +.Pa /var/db/pkg . .It Va daily_status_security_neggrpperm_enable .Pq Vt bool Set to -- cgit v1.1 From 61c789bc4b1f64988da0266129a82be04ef20c65 Mon Sep 17 00:00:00 2001 From: bjk Date: Wed, 30 May 2012 05:42:40 +0000 Subject: Catch up to the carp rewrite and refer to vhids instead of interfaces. Pointy hat to: bjk Submitted by: glebius Approved by: hrs (mentor) --- share/man/man4/carp.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/carp.4 b/share/man/man4/carp.4 index e1eaa51..6a45703 100644 --- a/share/man/man4/carp.4 +++ b/share/man/man4/carp.4 @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 22, 2012 +.Dd May 30, 2012 .Dt CARP 4 .Os .Sh NAME @@ -105,7 +105,7 @@ Disabled by default. .It Va net.inet.carp.log Determines what events relating to .Nm -interfaces are logged. +vhids are logged. A value of 0 disables any logging. A value of 1 enables logging state changes of .Nm -- cgit v1.1 From fc5158822cc0002a6f421dcfa2e2cbcb502646b5 Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 30 May 2012 21:02:12 +0000 Subject: - Witness doesn't verify the old MTX_NOSWITCH flag's correctness (that was obsoleted when critical sections were added). Instead, list a check that witness does perform. - Note that 'show locks' in DDB takes an optional thread argument. - Document 'show all locks'. - Remove the BUGS section, the bug in question was fixed 11 years ago in r76272. --- share/man/man4/witness.4 | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) (limited to 'share') diff --git a/share/man/man4/witness.4 b/share/man/man4/witness.4 index c0014fa..ffd9f8f 100644 --- a/share/man/man4/witness.4 +++ b/share/man/man4/witness.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 18, 2001 +.Dd May 30, 2012 .Dt WITNESS 4 .Os .Sh NAME @@ -52,11 +52,8 @@ violation occurs. The .Nm code also checks various other conditions such as verifying that one -does not recurse on a non-recursive lock. -For sleep locks, -.Nm -verifies that a new process would not be switched to when a lock is released -or a lock is blocked on during an acquire while any spin locks are held. +does not recurse on a non-recursive lock, +or attempt an upgrade on a shared lock held by another thread. If any of these checks fail, then the kernel will panic. .Pp The flag that controls whether or not the kernel debugger is entered when a @@ -97,7 +94,7 @@ specifies the level of witness involvement in the system. A value of 1 specifies that witness is enabled. A value of 0 specifies that witness is disabled, but that can be enabled again. This will maintain a small amount of overhead in the system. -A value of -1 specifies that witness is disabled permanently and that +A value of -1 specifies that witness is disabled permanently and cannot be enabled again. The sysctl .Va debug.witness.watch @@ -114,10 +111,22 @@ and .Xr ddb 4 are compiled into the kernel: .Bl -ohang -.It Ic show locks -Outputs the list of locks held by the current thread to the kernel console +.It Ic show locks Op thread +Outputs the list of locks held by a thread to the kernel console along with the filename and line number at which each lock was last acquired -by this thread. +by the thread. +The optional +.Ar thread +argument may be either a TID, +PID, +or pointer to a thread structure. +If +.Ar thread +is not specified, +then the locks held by the current thread are displayed. +.It Ic show all locks +Outputs the list of locks held by all threads in the system to the +kernel console. .It Ic show witness Dump the current order list to the kernel console. The code first displays the lock order tree for all of the sleep locks. @@ -136,9 +145,3 @@ code first appeared in .Bsx 5.0 and was imported from there into .Fx 5.0 . -.Sh BUGS -The -.Nm -code currently does not handle recursion of shared -.Xr sx 9 -locks properly. -- cgit v1.1 From e58f0a7d2ffac924d6141bd8fe6b68ac99118d3a Mon Sep 17 00:00:00 2001 From: jase Date: Wed, 30 May 2012 22:48:01 +0000 Subject: Add myself and mentors relationship. Approved by: flo (mentor) --- share/misc/committers-ports.dot | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index c6f93d9..77a89cd 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -100,6 +100,7 @@ ijliao [label="Ying-Chieh Liao\nijliao@FreeBSD.org\n2001/01/20"] itetcu [label="Ion-Mihai Tetcu\nitetcu@FreeBSD.org\n2006/06/07"] jacula [label="Giuseppe Pilichi\njacula@FreeBSD.org\n2010/04/05"] jadawin [label="Philippe Audeoud\njadawin@FreeBSD.org\n2008/03/02"] +jase [label="Jase Thew\njase@FreeBSD.org\n2012/05/30"] jgh [label="Jason Helfman\njgh@FreeBSD.org\n2011/12/16"] jkim [label="Jung-uk Kim\njkim@FreeBSD.org\n2007/09/12"] jlaffaye [label="Julien Laffaye\njlaffaye@FreeBSD.org\n2011/06/06"] @@ -246,6 +247,8 @@ clsung -> tabthorpe crees -> jgh crees -> madpilot +culot -> jase + decke -> sperber delphij -> nemoliu @@ -278,6 +281,8 @@ fjoe -> flo fjoe -> krion fjoe -> osa +flo -> jase + flz -> garga flz -> johans flz -> laszlof -- cgit v1.1 From d6fdf8b827231f3dcc651cb0b7776943b16731b7 Mon Sep 17 00:00:00 2001 From: tj Date: Thu, 31 May 2012 02:36:30 +0000 Subject: Add my mentor relationships. Approved by: eadler (mentor) --- share/misc/committers-ports.dot | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 77a89cd..44b227d 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -185,6 +185,7 @@ swills [label="Steve Wills\nswills@FreeBSD.org\n2010/09/03"] tabthorpe [label="Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007/08/20"] tdb [label="Tim Bishop\ntdb@FreeBSD.org\n2005/11/30"] timur [label="Timur Bakeyev\ntimur@FreeBSD.org\n2007/06/07"] +tj [label="Tom Judge\tj@FreeBSD.org\n2012/05/28"] tota [label="TAKATSU Tomonari\ntota@FreeBSD.org\n2009/03/30"] trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12"] trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/06"] @@ -247,6 +248,8 @@ clsung -> tabthorpe crees -> jgh crees -> madpilot +db -> tj + culot -> jase decke -> sperber @@ -257,6 +260,7 @@ delphij -> rafan demon -> mat eadler -> ak +eadler -> tj edwin -> cperciva edwin -> erwin -- cgit v1.1 From 4ade65012f6305217140e627fee89ca929a712e1 Mon Sep 17 00:00:00 2001 From: eadler Date: Thu, 31 May 2012 07:16:50 +0000 Subject: Bump date for content missed in r236290 Submitted by: gjb Approved by: cperciva (implicit) MFC after: 3 days X-MFC-With: r236290 --- share/man/man5/periodic.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/periodic.conf.5 b/share/man/man5/periodic.conf.5 index d33555c..1f9eec8 100644 --- a/share/man/man5/periodic.conf.5 +++ b/share/man/man5/periodic.conf.5 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 7, 2012 +.Dd May 30, 2012 .Dt PERIODIC.CONF 5 .Os .Sh NAME -- cgit v1.1 From 9bc6e8ef34aabe62321317aa4a96d3d75dc5ee97 Mon Sep 17 00:00:00 2001 From: tj Date: Thu, 31 May 2012 19:33:51 +0000 Subject: - Fix my botched merge and correct mentor ordering. (Spotted by flo) - Fix missing new line in node block. (Spotted by gavin) - Sort the node list while I'm here. Approved by: eadler (mentor) --- share/misc/committers-ports.dot | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 44b227d..1dadc10 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -59,8 +59,8 @@ az [label="Andrej Zverev\naz@FreeBSD.org\n2005/10/03"] bapt [label="Baptiste Daroussin\nbapt@FreeBSD.org\n2010/07/27"] beat [label="Beat Gaetzi\nbeat@FreeBSD.org\n2009/01/28"] beech [label="Beech Rintoul\nbeech@FreeBSD.org\n2007/05/30"] -bland [label="Alexander Nedotsukov\nbland@FreeBSD.org\n2003/08/14"] bf [label="Brendan Fabeny\nbf@FreeBSD.org\n2010/06/02"] +bland [label="Alexander Nedotsukov\nbland@FreeBSD.org\n2003/08/14"] brix [label="Henrik Brix Andersen\nbrix@FreeBSD.org\n2007/10/31"] brooks [label="Brooks Davies\nbrooks@FreeBSD.org\n2004/05/03"] bsam [label="Boris Samorodov\nbsam@FreeBSD.org\n2006/07/20"] @@ -112,11 +112,11 @@ jpaetzel [label="Josh Paetzel\njpaetzel@FreeBSD.org\n2008/09/05"] jsa [label="Joseph S. Atkinson\njsa@FreeBSD.org\n2010/07/15"] jylefort [label="Jean-Yves Lefort\njylefort@FreeBSD.org\n2005/04/12"] kevlo [label="Kevin Lo\nkevlo@FreeBSD.org\n2003/02/21"] +kmoore [label="Kris Moore\nkmoore@FreeBSD.org\n2009/04/14"] knu [label="Akinori Musha\nknu@FreeBSD.org\n2000/03/22"] +koitsu [label="Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10"] krion [label="Kirill Ponomarew\nkrion@FreeBSD.org\n2003/07/20"] -kmoore [label="Kris Moore\nkmoore@FreeBSD.org\n2009/04/14"] kwm [label="Koop Mast\nkwm@FreeBSD.org\n2004/09/14"] -koitsu [label="Jeremy Chadwick\nkoitsu@FreeBSD.org\n2006/11/10"] laszlof [label="Frank Laszlo\nlaszlof@FreeBSD.org\n2006/11/07"] lawrance [label="Sam Lawrance\nlawrance@FreeBSD.org\n2005/04/11\n2007/02/21"] lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"] @@ -139,6 +139,7 @@ martymac [label="Ganael Laplanche\nmartymac@FreeBSD.org\n2010/09/24"] mat [label="Mathieu Arnold\nmat@FreeBSD.org\n2003/08/15"] matthew [label="Matthew Seaman\nmatthew@FreeBSD.org\n2012/02/07"] mezz [label="Jeremy Messenger\nmezz@FreeBSD.org\n2004/04/30"] +mharo [label="Michael Haro\nmharo@FreeBSD.org\n1999/04/13"] miwi [label="Martin Wilke\nmiwi@FreeBSD.org\n2006/06/04"] mm [label="Martin Matuska\nmm@FreeBSD.org\n2007/04/04"] mnag [label="Marcus Alves Grando\nmnag@FreeBSD.org\n2005/09/15"] @@ -151,14 +152,13 @@ novel [label="Roman Bogorodskiy\nnovel@FreeBSD.org\n2005/03/07"] nox [label="Juergen Lock\nnox@FreeBSD.org\n2006/12/22"] obrien [label="David E. O'Brien\nobrien@FreeBSD.org\n1996/10/29"] olivierd [label="Olivier Duchateau\nolivierd@FreeBSD.org\n2012/05/29"] -mharo [label="Michael Haro\nmharo@FreeBSD.org\n1999/04/13"] osa [label="Sergey A. Osokin\nosa@FreeBSD.org\n2003/06/04"] pat [label="Patrick Li\npat@FreeBSD.org\n2001/11/14"] pav [label="Pav Lucistnik\npav@FreeBSD.org\n2003/11/12"] pawel [label="Pawel Pekala\npawel@FreeBSD.org\n2011/03/11"] pgj [label="Gabor Pali\npgj@FreeBSD.org\n2009/04/12"] -philip [label="Philip Paeps\nphilip@FreeBSD.org\n2005/10/19"] pgollucci [label="Philip M. Gollucci\npgollucci@FreeBSD.org\n2008/07/21"] +philip [label="Philip Paeps\nphilip@FreeBSD.org\n2005/10/19"] rafan [label="Rong-En Fan\nrafan@FreeBSD.org\n2006/06/23"] rakuco [label="Raphael Kubo da Costa\nrakuco@FreeBSD.org\n2011/08/22"] rene [label="Rene Ladan\nrene@FreeBSD.org\n2010/04/11"] @@ -180,17 +180,17 @@ stas [label="Stanislav Sedov\nstas@FreeBSD.org\n2006/09/18"] stefan [label="Stefan Walter\nstefan@FreeBSD.org\n2006/05/07"] stephen [label="Stephen Montgomery-Smith\nstephen@FreeBSD.org\n2011/06/13"] sunpoet [label="Po-Chuan Hsieh\nsunpoet@FreeBSD.org\n2010/09/21"] -sylvio [label="Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009/10/29"] swills [label="Steve Wills\nswills@FreeBSD.org\n2010/09/03"] +sylvio [label="Sylvio Cesar Teixeira\nsylvio@FreeBSD.org\n2009/10/29"] tabthorpe [label="Thomas Abthorpe\ntabthorpe@FreeBSD.org\n2007/08/20"] tdb [label="Tim Bishop\ntdb@FreeBSD.org\n2005/11/30"] +thierry [label="Thierry Thomas\nthierry@FreeBSD.org\n2004/03/15"] timur [label="Timur Bakeyev\ntimur@FreeBSD.org\n2007/06/07"] -tj [label="Tom Judge\tj@FreeBSD.org\n2012/05/28"] +tj [label="Tom Judge\ntj@FreeBSD.org\n2012/05/28"] +tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15"] tota [label="TAKATSU Tomonari\ntota@FreeBSD.org\n2009/03/30"] trasz [label="Edward Tomasz Napierala\ntrasz@FreeBSD.org\n2007/04/12"] trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2004/07/06"] -thierry [label="Thierry Thomas\nthierry@FreeBSD.org\n2004/03/15"] -tmclaugh [label="Tom McLaughlin\ntmclaugh@FreeBSD.org\n2005/09/15"] uqs [label="Ulrich Spoerlein\nuqs@FreeBSD.org\n2012/01/19"] vd [label="Vasil Dimov\nvd@FreeBSD.org\n2006/01/19"] wen [label="Wen Heping\nwen@FreeBSD.org\n2010/12/13"] @@ -248,10 +248,10 @@ clsung -> tabthorpe crees -> jgh crees -> madpilot -db -> tj - culot -> jase +db -> tj + decke -> sperber delphij -> nemoliu -- cgit v1.1 From 266a4711a8db1ee2d070e57976db3c821edce597 Mon Sep 17 00:00:00 2001 From: sbruno Date: Fri, 1 Jun 2012 18:01:51 +0000 Subject: Add notes and information for exposed tuneables in bce(4). Add source of documentation for this driver. Thanks to Warren Block for the suggestions for readability. Note that strict_rx_mtu in inverted in stable/7/8/9 and is named loose_rx_mtu. Ensure that this is converted over when MFC'd hw.bce.rx_ticks hw.bce.rx_ticks_int hw.bce.rx_quick_cons_trip hw.bce.rx_quick_cons_trip_int hw.bce.tx_ticks hw.bce.tx_ticks_int hw.bce.tx_quick_cons_trip hw.bce.tx_quick_cons_trip_int hw.bce.strict_rx_mtu hw.bce.hdr_split hw.bce.tx_pages hw.bce.rx_pages hw.bce.tso_enable hw.bce.verbose Reviewed by: Warren Block MFC after: 3 days --- share/man/man4/bce.4 | 62 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4 index 090c477..c7df4cf 100644 --- a/share/man/man4/bce.4 +++ b/share/man/man4/bce.4 @@ -200,9 +200,60 @@ variables and .Xr loader 8 tunables: .Bl -tag -width indent +.It Va hw.bce.verbose +Enable/Disable verbose logging and output to the console. +Useful for debugging (default 0). .It Va hw.bce.msi_enable -Whether or not MSI support is enabled in the driver. -The default value is 1. +Enable/Disable MSI support (default 1). +.It Va hw.bce.tso_enable +Enable/Disable TSO support (default 1). +.It Va hw.bce.strict_rx_mtu +Enable/Disable strict RX frame size checking (default 0). +.It Va hw.bce.hdr_split +Enable/Disable frame header/payload splitting (default 1). +.It Va hw.bce.rx_pages +Set the number of memory pages assigned to recieve packets by the driver. +Due to alignment issues, this value can only be of the set 1, 2, 4 or 8 (default 2). +.It Va hw.bce.tx_pages +Set the number of memory pages assigned to transmit packets by the driver. +Due to alignment issues, this value can only be of the set 1, 2, 4 or 8 (default 2). +.It Va hw.bce.rx_ticks +Time in microsecond ticks to wait before generating a status block updates due to RX processing activity. +Values from 0-100 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.rx_quick_cons_trip is also 0 (default 18). +.It Va hw.bce.rx_ticks_int +Time in microsecond ticks to wait during RX interrupt processing before generating a status block update. +Values from 0-100 are valid. +Valid values are in the range from 0-100. +A value of 0 disables this status block update (default 18). +.It Va hw.bce.rx_quick_cons_trip +Number of RX Quick BD Chain entries that must be completed before a status block is generated. +Values from 0-256 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.rx_ticks is also 0 (default 6). +.It Va hw.bce.rx_quick_cons_trip_int +Number of RX quick BD entries that must be completed before a status block is generated duing interrupt processing. +Values from 0-256 are valid. +A value of 0 disables this status block update (default 6). +.It Va hw.bce.tx_ticks +Time in microsecond ticks to wait before a status block update is generated due to TX activitiy. +Values from 0-100 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.tx_quick_cons_trip is also 0 (default 80). +.It Va hw.bce.tx_ticks_int +Time in microsecond ticks to wait in interrupt processing before a status block update is generated due to TX activity +Values from 0-100 are valid. +A value of 0 disables this status block update (default 80). +.It Va hw.bce.tx_cons_trip +How many TX Quick BD Chain entries that must be completed before a status block is generated. +Values from 0-100 are valid. +A value of 0 disables this status block update. +Cannot be set to 0 if hw.bce.tx_ticks is also 0 (default 20). +.It Va hw.bce.tx_cons_trip_int +How many TX Quick BD Chain entries that must be completed before a status block is generated during an interrupt. +Values from 0-100 are valid. +A value of 0 disables this status block update (default 20). .El .Sh DIAGNOSTICS .Bl -diag @@ -266,7 +317,7 @@ address space. .It "bce%d: Could not allocate TX descriptor chain DMA tag!" The driver could not allocate a DMA tag for the controller's TX chain. -.It "bce%d: Could not allocate TX descriptor chain DMA memory!" +.It "bce%d: Could not allocate TX descriptor chain DMA memory! The driver could not allocate DMA addressable memory for the controller's TX chain. .It "bce%d: Could not map TX descriptor chain DMA memory!" @@ -346,6 +397,11 @@ with the cable connection, or a driver logic problem has occurred.. A controller hardware failure has occurred. If the problem continues replace the controller. .El +.Sh SUPPORT +For general information and support, +go to the Broadcom NIC Open Source Developer Resource Site: +.Pa http://www.broadcom.com/support/ethernet_nic/open_source.php . +.Pp .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , -- cgit v1.1 From fde5297347f44a26629d83758cd868bc3feb7282 Mon Sep 17 00:00:00 2001 From: sbruno Date: Fri, 1 Jun 2012 19:09:17 +0000 Subject: Doh! Bump the date as I touched it! Noted by: gjb@ MFC after: 3 days --- share/man/man4/bce.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4 index c7df4cf..722a784 100644 --- a/share/man/man4/bce.4 +++ b/share/man/man4/bce.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 7, 2009 +.Dd June 1, 2012 .Dt BCE 4 .Os .Sh NAME -- cgit v1.1 From 39c680fbf1afbaf958c32da06c0694c8f3c91163 Mon Sep 17 00:00:00 2001 From: joel Date: Fri, 1 Jun 2012 19:26:38 +0000 Subject: mdoc: terminate quoted string and remove unneeded paragraph macro. --- share/man/man4/bce.4 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4 index 722a784..dd7b981 100644 --- a/share/man/man4/bce.4 +++ b/share/man/man4/bce.4 @@ -317,7 +317,7 @@ address space. .It "bce%d: Could not allocate TX descriptor chain DMA tag!" The driver could not allocate a DMA tag for the controller's TX chain. -.It "bce%d: Could not allocate TX descriptor chain DMA memory! +.It "bce%d: Could not allocate TX descriptor chain DMA memory!" The driver could not allocate DMA addressable memory for the controller's TX chain. .It "bce%d: Could not map TX descriptor chain DMA memory!" @@ -401,7 +401,6 @@ If the problem continues replace the controller. For general information and support, go to the Broadcom NIC Open Source Developer Resource Site: .Pa http://www.broadcom.com/support/ethernet_nic/open_source.php . -.Pp .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , -- cgit v1.1 From f2d65ab354e575041479310ee50839819a74a270 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 2 Jun 2012 11:03:14 +0000 Subject: mdoc: minor Bl improvements. --- share/man/man4/acpi_panasonic.4 | 6 +++--- share/man/man4/ahci.4 | 7 +++++-- share/man/man4/ata.4 | 4 +++- share/man/man4/firewire.4 | 2 +- share/man/man4/man4.i386/sbni.4 | 2 +- share/man/man4/mps.4 | 2 +- share/man/man4/mvs.4 | 3 ++- share/man/man4/siis.4 | 4 +++- share/man/man4/snd_hda.4 | 2 +- share/man/man4/usb.4 | 4 ++-- 10 files changed, 22 insertions(+), 14 deletions(-) (limited to 'share') diff --git a/share/man/man4/acpi_panasonic.4 b/share/man/man4/acpi_panasonic.4 index d02a16e..5458a31 100644 --- a/share/man/man4/acpi_panasonic.4 +++ b/share/man/man4/acpi_panasonic.4 @@ -68,7 +68,7 @@ sound mute state via .Ss Hotkeys There are 9 hotkeys available on the supported hardware: .Pp -.Bl -tag -compact -offset indent +.Bl -tag -width 10n -compact -offset indent .It Sy Fn+F1 Make LCD backlight darker. .It Sy Fn+F2 @@ -105,7 +105,7 @@ When notified to .Xr devd 8 , the hotkey event provides the following information: .Pp -.Bl -tag -compact -offset indent +.Bl -tag -width 10n -compact -offset indent .It system .Qq Li ACPI .It subsystem @@ -119,7 +119,7 @@ Event code (see below). .El .Pp Event codes to be generated are assigned as follows: -.Bl -tag -offset indent +.Bl -tag -width 10n -offset indent .It 0x81-0x86, 0x89 .Sy Fn+F pressed. diff --git a/share/man/man4/ahci.4 b/share/man/man4/ahci.4 index 75426e7..602fc3e 100644 --- a/share/man/man4/ahci.4 +++ b/share/man/man4/ahci.4 @@ -52,7 +52,8 @@ The following tunables are settable from the .Bl -ohang .It Va hint.ahci. Ns Ar X Ns Va .msi controls Message Signaled Interrupts (MSI) usage by the specified controller. -.Bl -tag -compact +.Pp +.Bl -tag -width 4n -offset indent -compact .It 0 MSI disabled; .It 1 @@ -72,7 +73,8 @@ controls SATA interface Power Management for the specified channel, allowing some power to be saved at the cost of additional command latency. Possible values: -.Bl -tag -compact +.Pp +.Bl -tag -width 4n -offset indent -compact .It 0 interface Power Management is disabled (default); .It 1 @@ -86,6 +88,7 @@ driver initiates PARTIAL PM state transition 1ms after port becomes idle; .It 5 driver initiates SLUMBER PM state transition 125ms after port becomes idle. .El +.Pp Some controllers, such as ICH8, do not implement modes 2 and 3 with NCQ used. Because of artificial entering latency, performance degradation in modes 4 and 5 is much smaller then in modes 2 and 3. diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4 index d2ac57a..4c2f147 100644 --- a/share/man/man4/ata.4 +++ b/share/man/man4/ata.4 @@ -102,7 +102,8 @@ limits the initial ATA mode for every device on the specified channel. controls SATA interface Power Management for the specified channel, allowing some power savings at the cost of additional command latency. Possible values: -.Bl -tag -compact +.Pp +.Bl -tag -width 4n -offset indent -compact .It 0 Interface Power Management is disabled. This is the default value. @@ -113,6 +114,7 @@ The host initiates a PARTIAL PM state transition every time a port becomes idle. .It 3 host initiates SLUMBER PM state transition every time port becomes idle. .El +.Pp Modes 2 and 3 are only supported for AHCI. .El .Sh DESCRIPTION diff --git a/share/man/man4/firewire.4 b/share/man/man4/firewire.4 index 82e3622..9ec5dfa 100644 --- a/share/man/man4/firewire.4 +++ b/share/man/man4/firewire.4 @@ -90,7 +90,7 @@ Please see .Pa http://wiki.freebsd.org/DebugWithDcons for details on how to setup debugging with firewire. .Sh FILES -.Bl -tag -compact +.Bl -tag -width "Pa /dev/fwmem0.0" -compact .It Pa /dev/fw0.0 .It Pa /dev/fwmem0.0 .El diff --git a/share/man/man4/man4.i386/sbni.4 b/share/man/man4/man4.i386/sbni.4 index 31cf610..779deba 100644 --- a/share/man/man4/man4.i386/sbni.4 +++ b/share/man/man4/man4.i386/sbni.4 @@ -97,7 +97,7 @@ bits 4-5 value, otherwise baud rate is set to 2Mb .Sh FILES The sources for the driver reside in: .Pp -.Bl -tag -compact +.Bl -tag -width ".Pa /sys/dev/sbni/if_sbni.c" -compact .It Pa /sys/dev/sbni/if_sbni.c .It Pa /sys/dev/sbni/if_sbnireg.h .It Pa /sys/dev/sbni/if_sbnivar.h diff --git a/share/man/man4/mps.4 b/share/man/man4/mps.4 index ce19737..dfae791 100644 --- a/share/man/man4/mps.4 +++ b/share/man/man4/mps.4 @@ -166,7 +166,7 @@ variable, where X is the adapter number, either in or via .Xr sysctl 8 . The following bits have the described effects: -.Bl -tag -offset indent +.Bl -tag -width 6n -offset indent .It 0x01 Enable informational prints. .It 0x02 diff --git a/share/man/man4/mvs.4 b/share/man/man4/mvs.4 index a7bbe80..5c8d8cc 100644 --- a/share/man/man4/mvs.4 +++ b/share/man/man4/mvs.4 @@ -67,7 +67,8 @@ controls SATA interface Power Management for the specified channel, allowing some power to be saved at the cost of additional command latency. Possible values: -.Bl -tag -compact +.Pp +.Bl -tag -width 4n -offset indent -compact .It 0 interface Power Management is disabled (default); .It 1 diff --git a/share/man/man4/siis.4 b/share/man/man4/siis.4 index 8bf03dd..366c3cc 100644 --- a/share/man/man4/siis.4 +++ b/share/man/man4/siis.4 @@ -57,12 +57,13 @@ controls SATA interface Power Management for the specified channel, allowing some power to be saved at the cost of additional command latency. Possible values: -.Bl -tag -compact +.Bl -tag -width 2n -offset indent .It 0 interface Power Management is disabled (default); .It 1 device is allowed to initiate PM state change, host is passive. .El +.Pp Note that interface Power Management is not compatible with device presence detection. A manual bus reset is needed on device hot-plug. @@ -107,6 +108,7 @@ given precedence as the more functional of the two. The .Nm driver supports the following controller chips: +.Pp .Bl -bullet -compact .It SiI3124 (PCI-X 133MHz/64bit, 4 ports) diff --git a/share/man/man4/snd_hda.4 b/share/man/man4/snd_hda.4 index 84e0b22..91e599d 100644 --- a/share/man/man4/snd_hda.4 +++ b/share/man/man4/snd_hda.4 @@ -184,7 +184,7 @@ or as a set of space-separated pairs. .It Va hint.pcm.%d.rec.autosrc Controls automatic recording source feature: -.Bl -tag -compact +.Bl -tag -width 2n -compact .It 0 disabled, .It 1 diff --git a/share/man/man4/usb.4 b/share/man/man4/usb.4 index f3f8104..d3a236f 100644 --- a/share/man/man4/usb.4 +++ b/share/man/man4/usb.4 @@ -58,7 +58,7 @@ devices in host and device side mode. The .Nm driver has three layers: -.Bl -tag +.Bl -tag -width 6n -offset indent .It USB Controller (Bus) .It USB Device .It USB Driver @@ -85,7 +85,7 @@ The .Tn USB is a system where external devices can be connected to a PC. The most common USB speeds are: -.Bl -tag +.Bl -tag -width 6n -offset indent .It Low Speed (1.5MBit/sec) .It Full Speed (12MBit/sec) .It High Speed (480MBit/sec) -- cgit v1.1 From a0a31e8b37066f40c455b46339ef12ec8a9ad5e0 Mon Sep 17 00:00:00 2001 From: dim Date: Sun, 3 Jun 2012 20:35:41 +0000 Subject: During buildworld and buildkernel, define EARLY_BUILD in the earlier stages (build-tools, cross-tools, etc) of the build, so we can detect in bsd.*.mk whether to pass compiler-specific flags to ${CC}. In particular, this commit will allow using WITH_CLANG_IS_CC when the base compiler is still gcc, and when ${CC}, ${CXX} and ${CPP} are left at their defaults. The early stages will then be built using gcc, and no clang-specific flags will be passed to it. The later stages will be built as usual. The EARLY_BUILD define can also serve other uses, such as building the world stage C++ executables with libc++ instead of libstdc++: during the early build stages, we cannot assume libc++ is already available, so we must still build with libstdc++ at that time. MFC after: 1 week --- share/mk/bsd.sys.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index f023750..28c1a18 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -61,7 +61,8 @@ CWARNFLAGS+= -Wno-uninitialized CWARNFLAGS+= -Wno-pointer-sign # Clang has more warnings enabled by default, and when using -Wall, so if WARNS # is set to low values, these have to be disabled explicitly. -.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" +.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && \ + !defined(EARLY_BUILD) .if ${WARNS} <= 6 CWARNFLAGS+= -Wno-empty-body -Wno-string-plus-int .endif # WARNS <= 6 @@ -88,7 +89,8 @@ WFORMAT= 1 .if ${WFORMAT} > 0 #CWARNFLAGS+= -Wformat-nonliteral -Wformat-security -Wno-format-extra-args CWARNFLAGS+= -Wformat=2 -Wno-format-extra-args -.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" +.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && \ + !defined(EARLY_BUILD) .if ${WARNS} <= 3 CWARNFLAGS+= -Wno-format-nonliteral .endif # WARNS <= 3 @@ -109,7 +111,8 @@ CWARNFLAGS+= -Wno-format CWARNFLAGS+= -Wno-unknown-pragmas .endif # IGNORE_PRAGMA -.if ${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang" +.if (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang") && \ + !defined(EARLY_BUILD) CLANG_NO_IAS= -no-integrated-as CLANG_OPT_SMALL= -mstack-alignment=8 -mllvm -inline-threshold=3\ -mllvm -enable-load-pre=false -mllvm -simplifycfg-dup-ret -- cgit v1.1 From d351cdcdf9c9f7fac31717fabfd7259ba1e2e08c Mon Sep 17 00:00:00 2001 From: mjg Date: Mon, 4 Jun 2012 15:21:13 +0000 Subject: Add myself as a new committer. Approved by: trasz (mentor) --- share/misc/committers-src.dot | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 20ad004..66ca9bc 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -200,6 +200,7 @@ mdf [label="Matthew Fleming\nmdf@FreeBSD.org\n2010/06/04"] mdodd [label="Matthew N. Dodd\nmdodd@FreeBSD.org\n1999/07/27"] melifaro [label="Alexander V. Chernikov\nmelifaro@FreeBSD.org\n2011/10/04"] mjacob [label="Matt Jacob\nmjacob@FreeBSD.org\n1997/08/13"] +mjg [label="Mateusz Guzik\nmjg@FreeBSD.org\n2012/06/04"] mlaier [label="Max Laier\nmlaier@FreeBSD.org\n2004/02/10"] monthadar [label="Monthadar Al Jaberi\nmonthadar@FreeBSD.org\n2012/04/02"] mr [label="Michael Reifenberger\nmr@FreeBSD.org\n2001/09/30"] @@ -602,6 +603,7 @@ thompsa -> weongyo thompsa -> eri trasz -> jh +trasz -> mjg ume -> jinmei ume -> suz -- cgit v1.1 From 0dd8d2fe744efc9f42823fb6f0dd9b6294723b18 Mon Sep 17 00:00:00 2001 From: sbruno Date: Mon, 4 Jun 2012 22:46:04 +0000 Subject: Lines were a bit too long. Wrap some of them to 60 columns. Suggested by: bjk@ MFC after: 3 days --- share/man/man4/bce.4 | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) (limited to 'share') diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4 index dd7b981..869b1da 100644 --- a/share/man/man4/bce.4 +++ b/share/man/man4/bce.4 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 1, 2012 +.Dd June 4, 2012 .Dt BCE 4 .Os .Sh NAME @@ -213,45 +213,58 @@ Enable/Disable strict RX frame size checking (default 0). Enable/Disable frame header/payload splitting (default 1). .It Va hw.bce.rx_pages Set the number of memory pages assigned to recieve packets by the driver. -Due to alignment issues, this value can only be of the set 1, 2, 4 or 8 (default 2). +Due to alignment issues, this value can only be of the set +1, 2, 4 or 8 (default 2). .It Va hw.bce.tx_pages -Set the number of memory pages assigned to transmit packets by the driver. -Due to alignment issues, this value can only be of the set 1, 2, 4 or 8 (default 2). +Set the number of memory pages assigned to transmit packets +by the driver. +Due to alignment issues, this value can only be of the set +1, 2, 4 or 8 (default 2). .It Va hw.bce.rx_ticks -Time in microsecond ticks to wait before generating a status block updates due to RX processing activity. +Time in microsecond ticks to wait before generating a status +block updates due to RX processing activity. Values from 0-100 are valid. A value of 0 disables this status block update. -Cannot be set to 0 if hw.bce.rx_quick_cons_trip is also 0 (default 18). +Cannot be set to 0 if hw.bce.rx_quick_cons_trip is also 0 +(default 18). .It Va hw.bce.rx_ticks_int -Time in microsecond ticks to wait during RX interrupt processing before generating a status block update. +Time in microsecond ticks to wait during RX interrupt +processing before generating a status block update. Values from 0-100 are valid. Valid values are in the range from 0-100. A value of 0 disables this status block update (default 18). .It Va hw.bce.rx_quick_cons_trip -Number of RX Quick BD Chain entries that must be completed before a status block is generated. +Number of RX Quick BD Chain entries that must be completed +before a status block is generated. Values from 0-256 are valid. A value of 0 disables this status block update. Cannot be set to 0 if hw.bce.rx_ticks is also 0 (default 6). .It Va hw.bce.rx_quick_cons_trip_int -Number of RX quick BD entries that must be completed before a status block is generated duing interrupt processing. +Number of RX quick BD entries that must be completed before +a status block is generated duing interrupt processing. Values from 0-256 are valid. A value of 0 disables this status block update (default 6). .It Va hw.bce.tx_ticks -Time in microsecond ticks to wait before a status block update is generated due to TX activitiy. +Time in microsecond ticks to wait before a status block +update is generated due to TX activitiy. Values from 0-100 are valid. A value of 0 disables this status block update. -Cannot be set to 0 if hw.bce.tx_quick_cons_trip is also 0 (default 80). +Cannot be set to 0 if hw.bce.tx_quick_cons_trip is also 0 +(default 80). .It Va hw.bce.tx_ticks_int -Time in microsecond ticks to wait in interrupt processing before a status block update is generated due to TX activity +Time in microsecond ticks to wait in interrupt processing +before a status block update is generated due to TX activity Values from 0-100 are valid. A value of 0 disables this status block update (default 80). .It Va hw.bce.tx_cons_trip -How many TX Quick BD Chain entries that must be completed before a status block is generated. +How many TX Quick BD Chain entries that must be completed +before a status block is generated. Values from 0-100 are valid. A value of 0 disables this status block update. Cannot be set to 0 if hw.bce.tx_ticks is also 0 (default 20). .It Va hw.bce.tx_cons_trip_int -How many TX Quick BD Chain entries that must be completed before a status block is generated during an interrupt. +How many TX Quick BD Chain entries that must be completed +before a status block is generated during an interrupt. Values from 0-100 are valid. A value of 0 disables this status block update (default 20). .El -- cgit v1.1 From f907fd010e880ddd020da1ae43f445a5fa613f8d Mon Sep 17 00:00:00 2001 From: obrien Date: Mon, 4 Jun 2012 22:59:06 +0000 Subject: Add a man page for filemon(4) [r236592]. --- share/man/man4/Makefile | 1 + share/man/man4/filemon.4 | 166 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 167 insertions(+) create mode 100644 share/man/man4/filemon.4 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index f556768..89ef310 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -126,6 +126,7 @@ MAN= aac.4 \ fdt.4 \ fdtbus.4 \ ffclock.4 \ + filemon.4 \ firewire.4 \ fpa.4 \ fwe.4 \ diff --git a/share/man/man4/filemon.4 b/share/man/man4/filemon.4 new file mode 100644 index 0000000..e8b24bf --- /dev/null +++ b/share/man/man4/filemon.4 @@ -0,0 +1,166 @@ +.\" Copyright (c) 2012 +.\" David E. O'Brien . All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" 3. All advertising materials mentioning features or use of this software +.\" must display the following acknowledgement: +.\" This product includes software developed by David E. O'Brien and +.\" contributors. +.\" 4. Neither the name of the author nor the names of its contributors +.\" may be used to endorse or promote products derived from this software +.\" without specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd May 30, 2012 +.Dt FILEMON 4 +.Os +.Sh NAME +.Nm filemon +.Nd the filemon device +.Sh SYNOPSIS +.In dev/filemon/filemon.h +.Sh DESCRIPTION +The +.Nm +device allows a process to collect file operations data of its children. +The device +.Pa /dev/filemon +responds to two +.Xr ioctl 2 +calls. +.Pp +System calls are denoted using the following single letters: +.Bl -tag -width indent -compact +.It Dq Li C +.Xr chdir 2 +.It Dq Li D +.Xr unlink 2 +.It Dq Li E +.Xr exec 2 +.It Dq Li F +.Xr fork 2 , +.Xr vfork 2 +.It Dq Li L +.Xr link 2 , +.Xr linkat 2 , +.Xr symlink 2 , +.Xr symlinkat 2 +.It Dq Li M +.Xr rename 2 +.It Dq Li R +.Xr open 2 +for read +.It Dq Li S +.Xr stat 2 +.It Dq Li W +.Xr open 2 +for write +.It Dq Li X +.Xr _exit 2 +.El +.Pp +Note that +.Dq R +following +.Dq W +records can represent a single +.Xr open 2 +for R/W, +or two seperate +.Xr open 2 +calls, one for +R +and one for +W. +.Sh IOCTLS +User mode programs communicate with the filemon driver through a +number of ioctls which are described below. +Each takes a single argument. +.Bl -tag -width FILEMON_SET_PID +.It Dv FILEMON_SET_FD +Write the internal tracing buffer to the supplied open file descriptor. +.It Dv FILEMON_SET_PID . +Child process ID to trace. +.El +.Pp +.Sh RETURN VALUES +The ioctl returns zero on success and non-zero on failure. +.Sh EXAMPLES +.Bd -literal -offset indent +#include +#include +#include +#include +#include +#include +#include + +static void +open_filemon(void) +{ + pid_t child; + int fm_fd, fm_log; + + if ((fm_fd = open("/dev/filemon", O_RDWR)) == -1) + err(1, "open(\"/dev/filemon\", O_RDWR)"); + if ((fm_log = open("filemon.out", + O_CREAT | O_WRONLY | O_TRUNC, DEFFILEMODE)) == -1) + err(1, "open(filemon.out)"); + + if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) < 0) + err(1, "Cannot set filemon log file descriptor"); + /* Set up these two fd's to close on exec. */ + (void)fcntl(fm_fd, F_SETFD, FD_CLOEXEC); + (void)fcntl(fm_log, F_SETFD, FD_CLOEXEC); + + if ((child = fork()) == 0) { + /* Do something here. */ + return 0; + } else { + if (ioctl(fm_fd, FILEMON_SET_PID, &child) < 0) + err(1, "Cannot set filemon PID"); + wait(&child); + close(fm_fd); + } + return 0; +} +.Ed +.Pp +Creates a file named +.Pa filemon.out +and configures the +.Nm +device to write the filemon buffer contents to it. +.Sh FILES +.Bl -tag -width /dev/zero +.It Pa /dev/filemon +.El +.Sh SEE ALSO +.Xr dtrace 1 , +.Xr ktrace 1 , +.Xr truss 1 +.Sh HISTORY +A +.Nm +device appeared in +.Fx 9.1 . -- cgit v1.1 From 2e99fda0848d0a34981332c8bed9d180bdd1c26f Mon Sep 17 00:00:00 2001 From: wblock Date: Tue, 5 Jun 2012 02:18:54 +0000 Subject: More wording corrections and simplifications. Approved by: gjb (mentor) --- share/man/man4/vlan.4 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man4/vlan.4 b/share/man/man4/vlan.4 index dd36ff7..4717d2a 100644 --- a/share/man/man4/vlan.4 +++ b/share/man/man4/vlan.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 25, 2011 +.Dd June 4, 2012 .Dt VLAN 4 .Os .Sh NAME @@ -33,7 +33,7 @@ .Nd "IEEE 802.1Q VLAN network interface" .Sh SYNOPSIS To compile this driver into the kernel, -place the following lines in your +place the following line in your kernel configuration file: .Bd -ragged -offset indent .Cd "device vlan" @@ -119,8 +119,8 @@ It may have either capability enabled permanently without a way to turn it off. The whole issue is very specific to a particular device and its driver. .Pp -At present, physical interfaces capable of full VLAN processing -in the hardware is limited to these devices: +At present, these devices are capable of full VLAN processing +in hardware: .Xr ae 4 , .Xr age 4 , .Xr alc 4 , @@ -196,7 +196,7 @@ for use and calculates the appropriate frame MTU based on the capabilities of the parent interface. Some other interfaces not listed above may handle long frames, -but they do not advertise this ability of theirs. +but they do not advertise this ability. The MTU setting on .Nm can be corrected manually if used in conjunction with such a parent interface. -- cgit v1.1 From d7c9a0e9e945d2b6379a08008fe1154c1f3c4e22 Mon Sep 17 00:00:00 2001 From: eadler Date: Tue, 5 Jun 2012 03:14:39 +0000 Subject: Fix style nit: don't use leading zero for dates in .Dd Prompted by: brueffer Approved by: brueffer MFC after: 3 days --- share/man/man4/io.4 | 2 +- share/man/man4/ng_ksocket.4 | 2 +- share/man/man5/make.conf.5 | 2 +- share/man/man5/rc.conf.5 | 2 +- share/man/man7/development.7 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man4/io.4 b/share/man/man4/io.4 index a3561db..fa1c3f1 100644 --- a/share/man/man4/io.4 +++ b/share/man/man4/io.4 @@ -27,7 +27,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 01, 2010 +.Dd June 1, 2010 .Dt IO 4 .Os .Sh NAME diff --git a/share/man/man4/ng_ksocket.4 b/share/man/man4/ng_ksocket.4 index e74f61a..3a9fcd0 100644 --- a/share/man/man4/ng_ksocket.4 +++ b/share/man/man4/ng_ksocket.4 @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 09, 2012 +.Dd January 9, 2012 .Dt NG_KSOCKET 4 .Os .Sh NAME diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 9723f4c..1f5e390 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 02, 2012 +.Dd May 2, 2012 .Dt MAKE.CONF 5 .Os .Sh NAME diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index f419335..1802fca 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 06, 2012 +.Dd May 6, 2012 .Dt RC.CONF 5 .Os .Sh NAME diff --git a/share/man/man7/development.7 b/share/man/man7/development.7 index a643542..ea7df38 100644 --- a/share/man/man7/development.7 +++ b/share/man/man7/development.7 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 02, 2012 +.Dd May 2, 2012 .Dt DEVELOPMENT 7 .Os .Sh NAME -- cgit v1.1 From 5bfb5484b949f9e2bfff3af3622d69ffb4aab60e Mon Sep 17 00:00:00 2001 From: obrien Date: Tue, 5 Jun 2012 17:36:28 +0000 Subject: Correct examples to the latest version I had. --- share/man/man4/filemon.4 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/filemon.4 b/share/man/man4/filemon.4 index e8b24bf..9105eca 100644 --- a/share/man/man4/filemon.4 +++ b/share/man/man4/filemon.4 @@ -127,18 +127,19 @@ open_filemon(void) O_CREAT | O_WRONLY | O_TRUNC, DEFFILEMODE)) == -1) err(1, "open(filemon.out)"); - if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) < 0) + if (ioctl(fm_fd, FILEMON_SET_FD, &fm_log) == -1) err(1, "Cannot set filemon log file descriptor"); /* Set up these two fd's to close on exec. */ (void)fcntl(fm_fd, F_SETFD, FD_CLOEXEC); (void)fcntl(fm_log, F_SETFD, FD_CLOEXEC); if ((child = fork()) == 0) { + child = getpid(); + if (ioctl(fm_fd, FILEMON_SET_PID, &child) == -1) + err(1, "Cannot set filemon PID"); /* Do something here. */ return 0; } else { - if (ioctl(fm_fd, FILEMON_SET_PID, &child) < 0) - err(1, "Cannot set filemon PID"); wait(&child); close(fm_fd); } -- cgit v1.1 From c6d0736c857bc8e2e8f7657ddaa654f66136ae00 Mon Sep 17 00:00:00 2001 From: joel Date: Tue, 5 Jun 2012 17:46:50 +0000 Subject: Various mdoc fixes. --- share/man/man4/filemon.4 | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'share') diff --git a/share/man/man4/filemon.4 b/share/man/man4/filemon.4 index 9105eca..6821f22 100644 --- a/share/man/man4/filemon.4 +++ b/share/man/man4/filemon.4 @@ -93,20 +93,25 @@ R and one for W. .Sh IOCTLS -User mode programs communicate with the filemon driver through a +User mode programs communicate with the +.Nm filemon +driver through a number of ioctls which are described below. Each takes a single argument. .Bl -tag -width FILEMON_SET_PID .It Dv FILEMON_SET_FD Write the internal tracing buffer to the supplied open file descriptor. -.It Dv FILEMON_SET_PID . +.It Dv FILEMON_SET_PID Child process ID to trace. .El -.Pp .Sh RETURN VALUES The ioctl returns zero on success and non-zero on failure. +.Sh FILES +.Bl -tag -width /dev/zero +.It Pa /dev/filemon +.El .Sh EXAMPLES -.Bd -literal -offset indent +.Bd -literal #include #include #include @@ -152,10 +157,6 @@ Creates a file named and configures the .Nm device to write the filemon buffer contents to it. -.Sh FILES -.Bl -tag -width /dev/zero -.It Pa /dev/filemon -.El .Sh SEE ALSO .Xr dtrace 1 , .Xr ktrace 1 , -- cgit v1.1 From 6258379f2fd986e41963e0c841c6ce0b5c8f14ef Mon Sep 17 00:00:00 2001 From: obrien Date: Tue, 5 Jun 2012 17:49:11 +0000 Subject: RAID is an acronym. --- share/man/man4/mpt.4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/mpt.4 b/share/man/man4/mpt.4 index 4983759..9d62d17 100644 --- a/share/man/man4/mpt.4 +++ b/share/man/man4/mpt.4 @@ -124,15 +124,15 @@ Dell PowerEdge 1750 thru 2850 IBM eServer xSeries 335 .El .Pp -These systems also contain Integrated Raid Mirroring and Integrated -Raid Mirroring Enhanced which this driver also supports. +These systems also contain Integrated RAID Mirroring and Integrated +RAID Mirroring Enhanced which this driver also supports. .Pp The .Tn SAS controller chips are also present on many new AMD/Opteron based systems, like the Sun 4100. Note that this controller can drive both SAS and SATA -drives or a mix of them at the same time. The Integrated Raid Mirroring +drives or a mix of them at the same time. The Integrated RAID Mirroring available for these controllers is poorly supported at best. .Pp The -- cgit v1.1 From f601773fa58f10f5afbef32e29f83af547b14267 Mon Sep 17 00:00:00 2001 From: joel Date: Tue, 5 Jun 2012 17:58:47 +0000 Subject: Remove end of line whitespace. --- share/man/man4/bce.4 | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'share') diff --git a/share/man/man4/bce.4 b/share/man/man4/bce.4 index 869b1da..28fdf6a 100644 --- a/share/man/man4/bce.4 +++ b/share/man/man4/bce.4 @@ -213,57 +213,57 @@ Enable/Disable strict RX frame size checking (default 0). Enable/Disable frame header/payload splitting (default 1). .It Va hw.bce.rx_pages Set the number of memory pages assigned to recieve packets by the driver. -Due to alignment issues, this value can only be of the set +Due to alignment issues, this value can only be of the set 1, 2, 4 or 8 (default 2). .It Va hw.bce.tx_pages -Set the number of memory pages assigned to transmit packets +Set the number of memory pages assigned to transmit packets by the driver. -Due to alignment issues, this value can only be of the set +Due to alignment issues, this value can only be of the set 1, 2, 4 or 8 (default 2). .It Va hw.bce.rx_ticks -Time in microsecond ticks to wait before generating a status +Time in microsecond ticks to wait before generating a status block updates due to RX processing activity. Values from 0-100 are valid. A value of 0 disables this status block update. -Cannot be set to 0 if hw.bce.rx_quick_cons_trip is also 0 +Cannot be set to 0 if hw.bce.rx_quick_cons_trip is also 0 (default 18). .It Va hw.bce.rx_ticks_int -Time in microsecond ticks to wait during RX interrupt +Time in microsecond ticks to wait during RX interrupt processing before generating a status block update. Values from 0-100 are valid. Valid values are in the range from 0-100. A value of 0 disables this status block update (default 18). .It Va hw.bce.rx_quick_cons_trip -Number of RX Quick BD Chain entries that must be completed +Number of RX Quick BD Chain entries that must be completed before a status block is generated. Values from 0-256 are valid. A value of 0 disables this status block update. Cannot be set to 0 if hw.bce.rx_ticks is also 0 (default 6). .It Va hw.bce.rx_quick_cons_trip_int -Number of RX quick BD entries that must be completed before +Number of RX quick BD entries that must be completed before a status block is generated duing interrupt processing. Values from 0-256 are valid. A value of 0 disables this status block update (default 6). .It Va hw.bce.tx_ticks -Time in microsecond ticks to wait before a status block +Time in microsecond ticks to wait before a status block update is generated due to TX activitiy. Values from 0-100 are valid. A value of 0 disables this status block update. -Cannot be set to 0 if hw.bce.tx_quick_cons_trip is also 0 +Cannot be set to 0 if hw.bce.tx_quick_cons_trip is also 0 (default 80). .It Va hw.bce.tx_ticks_int -Time in microsecond ticks to wait in interrupt processing +Time in microsecond ticks to wait in interrupt processing before a status block update is generated due to TX activity Values from 0-100 are valid. A value of 0 disables this status block update (default 80). .It Va hw.bce.tx_cons_trip -How many TX Quick BD Chain entries that must be completed +How many TX Quick BD Chain entries that must be completed before a status block is generated. Values from 0-100 are valid. A value of 0 disables this status block update. Cannot be set to 0 if hw.bce.tx_ticks is also 0 (default 20). .It Va hw.bce.tx_cons_trip_int -How many TX Quick BD Chain entries that must be completed +How many TX Quick BD Chain entries that must be completed before a status block is generated during an interrupt. Values from 0-100 are valid. A value of 0 disables this status block update (default 20). -- cgit v1.1 From a8e30d2658c45d4d595d0a42cf55415acc7e3b6b Mon Sep 17 00:00:00 2001 From: obrien Date: Tue, 5 Jun 2012 20:32:38 +0000 Subject: mdoc police. Submitted by: ru Much thanks to: ru --- share/man/man4/filemon.4 | 52 ++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 22 deletions(-) (limited to 'share') diff --git a/share/man/man4/filemon.4 b/share/man/man4/filemon.4 index 6821f22..801f4df 100644 --- a/share/man/man4/filemon.4 +++ b/share/man/man4/filemon.4 @@ -50,64 +50,70 @@ responds to two calls. .Pp System calls are denoted using the following single letters: +.Pp .Bl -tag -width indent -compact -.It Dq Li C +.It Ql C .Xr chdir 2 -.It Dq Li D +.It Ql D .Xr unlink 2 -.It Dq Li E +.It Ql E .Xr exec 2 -.It Dq Li F +.It Ql F .Xr fork 2 , .Xr vfork 2 -.It Dq Li L +.It Ql L .Xr link 2 , .Xr linkat 2 , .Xr symlink 2 , .Xr symlinkat 2 -.It Dq Li M +.It Ql M .Xr rename 2 -.It Dq Li R +.It Ql R .Xr open 2 for read -.It Dq Li S +.It Ql S .Xr stat 2 -.It Dq Li W +.It Ql W .Xr open 2 for write -.It Dq Li X +.It Ql X .Xr _exit 2 .El .Pp Note that -.Dq R +.Ql R following -.Dq W +.Ql W records can represent a single .Xr open 2 for R/W, or two seperate .Xr open 2 calls, one for -R +.Ql R and one for -W. +.Ql W . .Sh IOCTLS User mode programs communicate with the -.Nm filemon -driver through a -number of ioctls which are described below. +.Nm +driver through a number of ioctls which are described below. Each takes a single argument. -.Bl -tag -width FILEMON_SET_PID +.Bl -tag -width ".Dv FILEMON_SET_PID" .It Dv FILEMON_SET_FD Write the internal tracing buffer to the supplied open file descriptor. .It Dv FILEMON_SET_PID Child process ID to trace. .El .Sh RETURN VALUES -The ioctl returns zero on success and non-zero on failure. +.\" .Rv -std ioctl +The +.Fn ioctl +function returns the value 0 if successful; +otherwise the value \-1 is returned and the global variable +.Va errno +is set to indicate the error. .Sh FILES -.Bl -tag -width /dev/zero +.Bl -tag -width ".Pa /dev/filemon" .It Pa /dev/filemon .El .Sh EXAMPLES @@ -127,7 +133,7 @@ open_filemon(void) int fm_fd, fm_log; if ((fm_fd = open("/dev/filemon", O_RDWR)) == -1) - err(1, "open(\"/dev/filemon\", O_RDWR)"); + err(1, "open(\e"/dev/filemon\e", O_RDWR)"); if ((fm_log = open("filemon.out", O_CREAT | O_WRONLY | O_TRUNC, DEFFILEMODE)) == -1) err(1, "open(filemon.out)"); @@ -156,7 +162,9 @@ Creates a file named .Pa filemon.out and configures the .Nm -device to write the filemon buffer contents to it. +device to write the +.Nm +buffer contents to it. .Sh SEE ALSO .Xr dtrace 1 , .Xr ktrace 1 , -- cgit v1.1 From caa3fadb76d69783ee44e521f46092e2e3f33137 Mon Sep 17 00:00:00 2001 From: tuexen Date: Tue, 5 Jun 2012 20:48:13 +0000 Subject: The cmsg_len field includes the cmsg header. So use CMSG_LEN(). MFC after: 3 days --- share/man/man4/ip.4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4 index 50a11c3..96b17c7 100644 --- a/share/man/man4/ip.4 +++ b/share/man/man4/ip.4 @@ -165,7 +165,7 @@ The .Vt cmsghdr fields have the following values: .Bd -literal -cmsg_len = sizeof(struct in_addr) +cmsg_len = CMSG_LEN(sizeof(struct in_addr)) cmsg_level = IPPROTO_IP cmsg_type = IP_RECVDSTADDR .Ed @@ -184,7 +184,7 @@ structure followed by the address. The cmsghdr fields should have the following values: .Bd -literal -cmsg_len = sizeof(struct in_addr) +cmsg_len = CMSG_LEN(sizeof(struct in_addr)) cmsg_level = IPPROTO_IP cmsg_type = IP_SENDSRCADDR .Ed @@ -279,7 +279,7 @@ that contains a cmsghdr structure followed by the .Tn TTL . The cmsghdr fields have the following values: .Bd -literal -cmsg_len = sizeof(u_char) +cmsg_len = CMSG_LEN(sizeof(u_char)) cmsg_level = IPPROTO_IP cmsg_type = IP_RECVTTL .Ed @@ -307,7 +307,7 @@ The .Vt cmsghdr fields have the following values: .Bd -literal -cmsg_len = sizeof(struct sockaddr_dl) +cmsg_len = CMSG_LEN(sizeof(struct sockaddr_dl)) cmsg_level = IPPROTO_IP cmsg_type = IP_RECVIF .Ed -- cgit v1.1 From b9ed43daa7a54d2ccf8666fa598f37194e9e2725 Mon Sep 17 00:00:00 2001 From: jhb Date: Wed, 6 Jun 2012 13:35:30 +0000 Subject: Use the defined terms "readers" and "writers" to simplify some text. --- share/man/man9/rwlock.9 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'share') diff --git a/share/man/man9/rwlock.9 b/share/man/man9/rwlock.9 index f7da699..45fc3bd 100644 --- a/share/man/man9/rwlock.9 +++ b/share/man/man9/rwlock.9 @@ -114,12 +114,10 @@ cannot be held while sleeping. The .Nm locks have priority propagation like mutexes, but priority -can be propagated only to an exclusive holder. -This limitation comes from the fact that shared owners +can be propagated only to writers. +This limitation comes from the fact that readers are anonymous. -Another important property is that shared holders of -.Nm -can recurse, +Another important property is that readers can always recurse, and exclusive locks can be made recursive selectively. .Ss Macros and Functions .Bl -tag -width indent -- cgit v1.1 From 764f69e52955a8ed18bbd3ee714ee69545bb1451 Mon Sep 17 00:00:00 2001 From: obrien Date: Wed, 6 Jun 2012 16:51:33 +0000 Subject: Add to the description and spell check. --- share/man/man4/filemon.4 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/filemon.4 b/share/man/man4/filemon.4 index 801f4df..0726e5a 100644 --- a/share/man/man4/filemon.4 +++ b/share/man/man4/filemon.4 @@ -10,7 +10,7 @@ .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: +.\" must display the following acknowledgment: .\" This product includes software developed by David E. O'Brien and .\" contributors. .\" 4. Neither the name of the author nor the names of its contributors @@ -19,7 +19,7 @@ .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" IMPLIED WARRANTIES OF MERCHANT ABILITY AND FITNESS FOR A PARTICULAR PURPOSE .\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE .\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL .\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS @@ -87,12 +87,13 @@ following records can represent a single .Xr open 2 for R/W, -or two seperate +or two separate .Xr open 2 calls, one for .Ql R and one for .Ql W . +Note that only successful system calls are captured. .Sh IOCTLS User mode programs communicate with the .Nm @@ -168,7 +169,8 @@ buffer contents to it. .Sh SEE ALSO .Xr dtrace 1 , .Xr ktrace 1 , -.Xr truss 1 +.Xr truss 1 , +.Xr ioctl 2 .Sh HISTORY A .Nm -- cgit v1.1 From 56a5c844a23a1f17eeeaeea291f87ddd18c74914 Mon Sep 17 00:00:00 2001 From: mav Date: Thu, 7 Jun 2012 10:05:51 +0000 Subject: To make CAM debugging easier, compile in some debug flags (CAM_DEBUG_INFO, CAM_DEBUG_CDB, CAM_DEBUG_PERIPH and CAM_DEBUG_PROBE) by default. List of these flags can be modified with CAM_DEBUG_COMPILE kernel option. CAMDEBUG kernel option still enables all possible debug, if not overriden. Additional 50KB of kernel size is a good price for the ability to debug problems without rebuilding the kernel. In case where size is important, debugging can be compiled out by setting CAM_DEBUG_COMPILE option to 0. --- share/man/man4/scsi.4 | 69 ++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) (limited to 'share') diff --git a/share/man/man4/scsi.4 b/share/man/man4/scsi.4 index ad52663..fa5e05d 100644 --- a/share/man/man4/scsi.4 +++ b/share/man/man4/scsi.4 @@ -24,7 +24,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD$ -.Dd March 4, 2010 +.Dd June 7, 2012 .Dt CAM 4 .Os .Sh NAME @@ -43,6 +43,7 @@ .Cd "options CAM_DEBUG_BUS=-1" .Cd "options CAM_DEBUG_TARGET=-1" .Cd "options CAM_DEBUG_LUN=-1" +.Cd "options CAM_DEBUG_COMPILE=CAM_DEBUG_INFO|CAM_DEBUG_CDB|CAM_DEBUG_PROBE" .Cd "options CAM_DEBUG_FLAGS=CAM_DEBUG_INFO|CAM_DEBUG_CDB" .Cd "options CAM_MAX_HIGHPOWER=4" .Cd "options SCSI_NO_SENSE_STRINGS" @@ -72,12 +73,11 @@ There are a number of generic kernel configuration options for the subsystem: .Bl -tag -width SCSI_NO_SENSE_STRINGS .It Dv CAMDEBUG -This option enables the +This option compiles in all the .Nm debugging printf code. This will not actually cause any debugging information to be printed out when included by itself. -Enabling printouts requires additional configuration. See below for details. .It Dv "CAM_MAX_HIGHPOWER=4" This sets the maximum allowable number of concurrent "high power" commands. @@ -248,54 +248,53 @@ see other .Nm device entries. .Sh DIAGNOSTICS -When the kernel is compiled with options CAMDEBUG, an XPT_DEBUG CCB can be -used to enable various amounts of tracing information on any -specific device. -Devices not being traced will not produce trace information. -There are currently four debugging flags that may be turned on: +An XPT_DEBUG CCB can be used to enable various amounts of tracing information +on any specific bus/device from the list of options compiled into the kernel. +There are currently seven debugging flags that may be compiled in and used: .Bl -tag -width CAM_DEBUG_SUBTRACE .It Dv CAM_DEBUG_INFO -This debugging flag enables general informational printfs for the device +This flag enables general informational printfs for the device or devices in question. .It Dv CAM_DEBUG_TRACE -This debugging flag enables function-level command flow tracing. +This flag enables function-level command flow tracing. i.e.\& kernel printfs will happen at the entrance and exit of various functions. .It Dv CAM_DEBUG_SUBTRACE -This debugging flag enables debugging output internal to various functions. +This flag enables debugging output internal to various functions. .It Dv CAM_DEBUG_CDB -This debugging flag will cause the kernel to print out all +This flag will cause the kernel to print out all +.Tn ATA +and .Tn SCSI commands sent to a particular device or devices. +.It Dv CAM_DEBUG_XPT +This flag will enable command scheduler tracing. +.It Dv CAM_DEBUG_PERIPH +This flag will enable peripheral drivers messages. +.It Dv CAM_DEBUG_PROBE +This flag will enable devices probe process tracing. .El .Pp Some of these flags, most notably .Dv CAM_DEBUG_TRACE and -.Dv CAM_DEBUG_SUBTRACE -will produce kernel printfs in EXTREME numbers, -and because of that, they are not especially useful. -There are not many things logged at the -.Dv CAM_DEBUG_INFO -level, so it is not especially useful. -The most useful debugging flag is the -.Dv CAM_DEBUG_CDB -flag. +.Dv CAM_DEBUG_SUBTRACE , +will produce kernel printfs in EXTREME numbers. +.Pp Users can enable debugging from their kernel config file, by using the following kernel config options: -.Bl -tag -width CAM_DEBUG_TARGET +.Bl -tag -width CAM_DEBUG_COMPILE .It Dv CAMDEBUG -This enables +This builds into the kernel all possible .Nm debugging. -Without this option, users will not even be able -to turn on debugging from userland via -.Xr camcontrol 8 . -.It Dv CAM_DEBUG_FLAGS -This allows the user to set the various debugging flags described above -in a kernel config file. +.It Dv CAM_DEBUG_COMPILE +This allows to specify support for which debugging flags described above +should be built into the kernel. Flags may be ORed together if the user wishes to see printfs for multiple debugging levels. +.It Dv CAM_DEBUG_FLAGS +This allows to set the various debugging flags from a kernel config file. .It Dv CAM_DEBUG_BUS Specify a bus to debug. To debug all busses, set this to -1. @@ -307,17 +306,9 @@ Specify a lun to debug. To debug all luns, set this to -1. .El .Pp -When specifying a bus, target or lun to debug, you -.Em MUST -specify all three bus/target/lun options above. -Using wildcards, you -should be able to enable debugging on most anything. -.Pp -Users may also enable debugging printfs on the fly, if the -.Dv CAMDEBUG -option is their config file, by using the +Users may also enable debugging on the fly by using the .Xr camcontrol 8 -utility. +utility, if wanted options built into the kernel. See .Xr camcontrol 8 for details. -- cgit v1.1 From 13c9a1f2f54a22b66746c1773317681d607259fe Mon Sep 17 00:00:00 2001 From: wblock Date: Thu, 7 Jun 2012 14:38:43 +0000 Subject: Add specific supported revision of ASUS USB-N13 ver. A1. http://lists.freebsd.org/pipermail/freebsd-doc/2012-June/019960.html Submitted by: PseudoCylon (AK) Approved by: bcr (mentor) MFC after: 3 days --- share/man/man4/run.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/run.4 b/share/man/man4/run.4 index 469e904..3640dc8 100644 --- a/share/man/man4/run.4 +++ b/share/man/man4/run.4 @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 12, 2011 +.Dd June 7, 2012 .Dt RUN 4 .Os .Sh NAME @@ -112,7 +112,7 @@ driver supports the following wireless adapters: .Bl -tag -width Ds -offset indent -compact .It Airlink101 AWLL6090 .It ASUS USB-N11 -.It ASUS USB-N13 +.It ASUS USB-N13 ver. A1 .It ASUS WL-160N .It Belkin F5D8051 ver 3000 .It Belkin F5D8053 -- cgit v1.1 From be453f58c1eab09996cfd89e3d5932cabb6581a0 Mon Sep 17 00:00:00 2001 From: jhb Date: Fri, 8 Jun 2012 21:30:35 +0000 Subject: Several updates: - Consistently refer to rmlocks as "read-mostly locks". - Relate rmlocks to rwlocks rather than sx locks since they are closer to rwlocks. - Add a separate paragraph on sleepable read-mostly locks contrasting them with "normal" read-mostly locks. - The flag passed to rm_init_flags() to enable recursion for readers is RM_RECURSE, not LO_RECURSABLE. - Fix the description for RM_RECURSE (it allows readers to recurse, not writers). - Explicitly note that rm_try_rlock() honors RM_RECURSE. - Fix some minor grammar nits. --- share/man/man9/rmlock.9 | 121 +++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 59 deletions(-) (limited to 'share') diff --git a/share/man/man9/rmlock.9 b/share/man/man9/rmlock.9 index 893eb25..7808345 100644 --- a/share/man/man9/rmlock.9 +++ b/share/man/man9/rmlock.9 @@ -26,7 +26,7 @@ .\" $FreeBSD$ .\" .\" Based on rwlock.9 man page -.Dd November 16, 2011 +.Dd June 8, 2012 .Dt RMLOCK 9 .Os .Sh NAME @@ -41,7 +41,7 @@ .Nm rm_wunlock , .Nm rm_wowned , .Nm RM_SYSINIT -.Nd kernel reader/writer lock optimized for mostly read access patterns +.Nd kernel reader/writer lock optimized for read-mostly access patterns .Sh SYNOPSIS .In sys/param.h .In sys/lock.h @@ -67,7 +67,7 @@ .In sys/kernel.h .Fn RM_SYSINIT "name" "struct rmlock *rm" "const char *desc" "int opts" .Sh DESCRIPTION -Mostly reader locks allow shared access to protected data by multiple threads, +Read-mostly locks allow shared access to protected data by multiple threads, or exclusive access by a single thread. The threads with shared access are known as .Em readers @@ -76,83 +76,82 @@ A thread with exclusive access is known as a .Em writer since it can modify protected data. .Pp -Read mostly locks are designed to be efficient for locks almost exclusively +Read-mostly locks are designed to be efficient for locks almost exclusively used as reader locks and as such should be used for protecting data that rarely changes. -Acquiring an exclusive lock after the lock had been locked for shared access +Acquiring an exclusive lock after the lock has been locked for shared access is an expensive operation. .Pp -Although reader/writer locks look very similar to -.Xr sx 9 -locks, their usage pattern is different. -Reader/writer locks can be treated as mutexes (see -.Xr mutex 9 ) -with shared/exclusive semantics unless initialized with -.Dv RM_SLEEPABLE . +Normal read-mostly locks are similar to +.Xr rwlock 9 +locks and follow the same lock ordering rules as +.Xr rwlock 9 +locks. +Read-mostly locks have full priority propagation like mutexes. Unlike -.Xr sx 9 , -an -.Nm -can be locked while holding a non-spin mutex, and an -.Nm -cannot be held while sleeping, again unless initialized with -.Dv RM_SLEEPABLE . -The -.Nm -locks have full priority propagation like mutexes. -The +.Xr rwlock 9 , +read-mostly locks propagate priority to both readers and writers. +This is implemented via the .Va rm_priotracker -structure argument supplied in +structure argument supplied to .Fn rm_rlock and -.Fn rm_runlock -is used to keep track of the read owner(s). -Another important property is that shared holders of -.Nm -can recurse if the lock has been initialized with the -.Dv LO_RECURSABLE -option, however exclusive locks are not allowed to recurse. +.Fn rm_runlock . +Readers can recurse if the lock is initialized with the +.Dv RM_RECURSE +option; +however, writers are never allowed to recurse. +.Pp +Sleepable read-mostly locks are created by passing +.Dv RM_SLEEPABLE +to +.Fn rm_init_flags . +Unlike normal read-mostly locks, +sleepable read-mostly locks follow the same lock ordering rules as +.Xr sx 9 +locks. +Sleepable read-mostly locks do not propagate priority to writers, +but they do propagate priority to readers. +Writers are permitted to sleep while holding a read-mostly lock, +but readers are not. +Unlike other sleepable locks such as +.Xr sx 9 +locks, +readers must use try operations on other sleepable locks to avoid sleeping. .Ss Macros and Functions .Bl -tag -width indent .It Fn rm_init "struct rmlock *rm" "const char *name" -Initialize structure located at -.Fa rm -as mostly reader lock, described by -.Fa name . -The name description is used solely for debugging purposes. +Initialize the read-mostly lock +.Fa rm . +The +.Fa name +description is used solely for debugging purposes. This function must be called before any other operations on the lock. .It Fn rm_init_flags "struct rmlock *rm" "const char *name" "int opts" -Initialize the rm lock just like the -.Fn rm_init -function, but specifying a set of optional flags to alter the -behaviour of -.Fa rm , -through the +Similar to +.Fn rm_init , +initialize the read-mostly lock +.Fa rm +with a set of optional flags. +The .Fa opts -argument. -It contains one or more of the following flags: +arguments contains one or more of the following flags: .Bl -tag -width ".Dv RM_NOWITNESS" .It Dv RM_NOWITNESS Instruct .Xr witness 4 to ignore this lock. .It Dv RM_RECURSE -Allow threads to recursively acquire exclusive locks for +Allow threads to recursively acquire shared locks for .Fa rm . .It Dv RM_SLEEPABLE -Allow writers to sleep while holding the lock. -Readers must not sleep while holding the lock and can avoid to sleep on -taking the lock by using -.Fn rm_try_rlock -instead of -.Fn rm_rlock . +Create a sleepable read-mostly lock. .El .It Fn rm_rlock "struct rmlock *rm" "struct rm_priotracker* tracker" Lock .Fa rm -as a reader. -Using +as a reader using .Fa tracker to track read owners of a lock for priority propagation. This data structure is only used internally by @@ -161,28 +160,32 @@ and must persist until .Fn rm_runlock has been called. This data structure can be allocated on the stack since -rmlocks cannot be held while sleeping. +readers cannot sleep. If any thread holds this lock exclusively, the current thread blocks, and its priority is propagated to the exclusive holder. If the lock was initialized with the -.Dv LO_RECURSABLE +.Dv RM_RECURSE option the .Fn rm_rlock -function can be called when the thread has already acquired reader +function can be called when the current thread has already acquired reader access on .Fa rm . -This is called -.Dq "recursing on a lock" . .It Fn rm_try_rlock "struct rmlock *rm" "struct rm_priotracker* tracker" Try to lock .Fa rm as a reader. .Fn rm_try_rlock will return 0 if the lock cannot be acquired immediately; -otherwise the lock will be acquired and a non-zero value will be returned. +otherwise, +the lock will be acquired and a non-zero value will be returned. Note that .Fn rm_try_rlock may fail even while the lock is not currently held by a writer. +If the lock was initialized with the +.Dv RM_RECURSE +option, +.Fn rm_try_rlock +will succeed if the current thread has already acquired reader access. .It Fn rm_wlock "struct rmlock *rm" Lock .Fa rm -- cgit v1.1 From e4151259662d0ae15bd86b975f14f8efe5119418 Mon Sep 17 00:00:00 2001 From: dim Date: Sat, 9 Jun 2012 11:41:29 +0000 Subject: Amend r227797 by also passing ${STATIC_CXXFLAGS} for the other supported C++ file extensions. MFC after: 3 days --- share/mk/bsd.lib.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk index f5fcd48..efaf9dc 100644 --- a/share/mk/bsd.lib.mk +++ b/share/mk/bsd.lib.mk @@ -74,7 +74,7 @@ PO_FLAG=-pg ${CC} ${PICFLAG} -DPIC ${SHARED_CFLAGS} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET} ${CTFCONVERT_CMD} -.cc.o: +.cc.o .C.o .cpp.o .cxx.o: ${CXX} ${STATIC_CXXFLAGS} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET} .cc.po .C.po .cpp.po .cxx.po: -- cgit v1.1 From 9fb63326835a8f0618862abbf85dae4d11de197e Mon Sep 17 00:00:00 2001 From: trhodes Date: Sun, 10 Jun 2012 15:56:49 +0000 Subject: "on the their types." -> "on their types." --- share/man/man4/mac_lomac.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/mac_lomac.4 b/share/man/man4/mac_lomac.4 index 0cf99c9..273a585 100644 --- a/share/man/man4/mac_lomac.4 +++ b/share/man/man4/mac_lomac.4 @@ -63,7 +63,7 @@ which protects the integrity of system objects and subjects by means of an information flow policy coupled with the subject demotion via floating labels. In LOMAC, all system subjects and objects are assigned integrity labels, made -up of one or more hierarchical grades, depending on the their types. +up of one or more hierarchical grades, depending on their types. Together, these label elements permit all labels to be placed in a partial order, with information flow protections and demotion decisions based on a dominance operator -- cgit v1.1 From 32041f44edbadf78cfaf57b4d6a30f5c41b4732d Mon Sep 17 00:00:00 2001 From: tuexen Date: Tue, 12 Jun 2012 14:02:38 +0000 Subject: Add a IP_RECVTOS socket option to receive for received UDP/IPv4 packets a cmsg of type IP_RECVTOS which contains the TOS byte. Much like IP_RECVTTL does for TTL. This allows to implement a protocol on top of UDP and implementing ECN. MFC after: 3 days --- share/man/man4/ip.4 | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4 index 96b17c7..d89b54d 100644 --- a/share/man/man4/ip.4 +++ b/share/man/man4/ip.4 @@ -32,7 +32,7 @@ .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 .\" $FreeBSD$ .\" -.Dd November 14, 2011 +.Dd June 12, 2012 .Dt IP 4 .Os .Sh NAME @@ -286,6 +286,29 @@ cmsg_type = IP_RECVTTL .\" .Pp If the +.Dv IP_RECVTOS +option is enabled on a +.Dv SOCK_DGRAM +socket, the +.Xr recvmsg 2 +call will return the +.Tn IP +.Tn TOS +(type of service) field for a +.Tn UDP +datagram. +The msg_control field in the msghdr structure points to a buffer +that contains a cmsghdr structure followed by the +.Tn TOS . +The cmsghdr fields have the following values: +.Bd -literal +cmsg_len = CMSG_LEN(sizeof(u_char)) +cmsg_level = IPPROTO_IP +cmsg_type = IP_RECVTOS +.Ed +.\" +.Pp +If the .Dv IP_RECVIF option is enabled on a .Dv SOCK_DGRAM -- cgit v1.1 From 24379c8402f6e6edd7e88821a9eb0cc0fb7a1b39 Mon Sep 17 00:00:00 2001 From: des Date: Tue, 12 Jun 2012 17:02:53 +0000 Subject: Finally nuke auth.conf, nine years after it was deprecated. The only thing it was still used for was to set the "global default" password hash. Since the stock auth.conf contained nothing but comments, the global default was actually the first algorithm in crypt(3)'s list, which happens to be DES; I take the fact that nobody noticed as proof that it was not used outside of crypt(3). The only other use in our tree was in the Kerberos support code in in tinyware's passwd(1). I removed that code in an earlier commit; it would not have compiled anyway, as it only supported Kerberos IV. The auth_getval() function is now a stub that always returns NULL, which has the same effect as a functional auth_getval() with an empty auth.conf. MFC after: 3 weeks --- share/examples/etc/README.examples | 1 - 1 file changed, 1 deletion(-) (limited to 'share') diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples index ba2cf00..f7bf4ce 100644 --- a/share/examples/etc/README.examples +++ b/share/examples/etc/README.examples @@ -9,7 +9,6 @@ This directory contains the following files: amd.map - filesystem automounter lookup resolution map (see amd(8)) apmd.conf - configuration file for apmd(8) -auth.conf - authentication capability database (see auth.conf(5)) bsd-style-copyright - copyright style for bsd system crontab - system scheduled command table (see crontab(5)) csh.cshrc - sample .cshrc (see csh(1)) -- cgit v1.1 From 4ff7dff337b85f1e4a1bb9de724d634e71d86771 Mon Sep 17 00:00:00 2001 From: jhb Date: Tue, 12 Jun 2012 20:55:57 +0000 Subject: Add pfg@ as one of my mentees. --- share/misc/committers-src.dot | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/misc/committers-src.dot b/share/misc/committers-src.dot index 66ca9bc..c0e600e 100644 --- a/share/misc/committers-src.dot +++ b/share/misc/committers-src.dot @@ -436,6 +436,7 @@ jhb -> avg jhb -> jeff jhb -> kbyanc jhb -> rnoland +jhb -> pfg jkh -> imp jkh -> jlemon -- cgit v1.1 From b15cbc2807377cb0ea0721766e07f5f168a2c25c Mon Sep 17 00:00:00 2001 From: eadler Date: Wed, 13 Jun 2012 06:46:00 +0000 Subject: Include a warning when using the example code as it may not work in unusual situations. Also slightly optimize the command. Submitted by: Jeremy Chadwick jdc@koitsu.org Approved by: cperciva (implicit) MFC after: 1 week --- share/examples/csh/dot.cshrc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/examples/csh/dot.cshrc b/share/examples/csh/dot.cshrc index 175bfd2..5b30791 100644 --- a/share/examples/csh/dot.cshrc +++ b/share/examples/csh/dot.cshrc @@ -4,8 +4,12 @@ # # Sets SSH_AUTH_SOCK to the user's ssh-agent socket path if running +# +# This has a couple caveats, the most notable being that if a user +# has multiple ssh-agent(1) processes running, this will very likely +# set SSH_AUTH_SOCK to point to the wrong file/domain socket. if (${?SSH_AUTH_SOCK} != "1") then - setenv SSH_AUTH_SOCK `sockstat | grep "^${USER} " | awk '/ssh-agent/ { print $6 }'` + setenv SSH_AUTH_SOCK `sockstat -u | awk '/^${USER}.+ ssh-agent/ { print $6 }' endif # Change only root's prompt -- cgit v1.1 From 58789340208c1a299e7230e33a8b438c23b37e40 Mon Sep 17 00:00:00 2001 From: joel Date: Wed, 13 Jun 2012 19:08:00 +0000 Subject: Sync example file with mdoc changes made in rev 235450. --- share/examples/mdoc/example.4 | 2 -- 1 file changed, 2 deletions(-) (limited to 'share') diff --git a/share/examples/mdoc/example.4 b/share/examples/mdoc/example.4 index a5fa1a6..c39e486 100644 --- a/share/examples/mdoc/example.4 +++ b/share/examples/mdoc/example.4 @@ -34,7 +34,6 @@ .Nd "example device driver manual page" .Sh SYNOPSIS To compile the -.Ns Nm driver into the kernel, place the following lines in the kernel configuration file: @@ -44,7 +43,6 @@ kernel configuration file: .Ed .Pp Alternatively, to load the -.Ns Nm driver as a module at boot time, place the following line in .Xr loader.conf 5 : -- cgit v1.1 From ab30d1b3868ed699e72ae05f06b67565985c27bf Mon Sep 17 00:00:00 2001 From: ru Date: Fri, 15 Jun 2012 09:12:47 +0000 Subject: Fixed an example that set IP_ONESBCAST socket option to actually work, and not return EINVAL. --- share/man/man4/ip.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/ip.4 b/share/man/man4/ip.4 index d89b54d..d921c15f 100644 --- a/share/man/man4/ip.4 +++ b/share/man/man4/ip.4 @@ -32,7 +32,7 @@ .\" @(#)ip.4 8.2 (Berkeley) 11/30/93 .\" $FreeBSD$ .\" -.Dd June 12, 2012 +.Dd June 15, 2012 .Dt IP 4 .Os .Sh NAME @@ -227,7 +227,7 @@ configured with the broadcast address 192.168.2.255: .Bd -literal char msg[512]; struct sockaddr_in sin; -u_char onesbcast = 1; /* 0 = disable (default), 1 = enable */ +int onesbcast = 1; /* 0 = disable (default), 1 = enable */ setsockopt(s, IPPROTO_IP, IP_ONESBCAST, &onesbcast, sizeof(onesbcast)); sin.sin_addr.s_addr = inet_addr("192.168.2.255"); -- cgit v1.1 From ca31dfb2b475f8026e45a8b10673993068ebc000 Mon Sep 17 00:00:00 2001 From: rmh Date: Sat, 16 Jun 2012 16:51:42 +0000 Subject: In CTFCONVERT_CMD initialization, check that ${MAKE_VERSION} is defined before using it. Bootstrap make (as built by usr.bin/make/Makefile.dist) does not define this variable, but it needs to parse bsd.own.mk in order to build a complete make. --- share/mk/bsd.own.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 924e9ce..e825c62 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -639,7 +639,7 @@ MK_${vv:H}:= ${MK_${vv:T}} .if ${MK_CTF} != "no" CTFCONVERT_CMD= ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} -.elif ${MAKE_VERSION} >= 5201111300 +.elif defined(MAKE_VERSION) && ${MAKE_VERSION} >= 5201111300 CTFCONVERT_CMD= .else CTFCONVERT_CMD= @: -- cgit v1.1 From a16d44b93863114bc38e7e42833f1a662d645e08 Mon Sep 17 00:00:00 2001 From: eadler Date: Sun, 17 Jun 2012 02:46:27 +0000 Subject: attach_generic causes missing devices in /dev when the driver interacts with some non-highpoint controollers. Change attach_generic to be off by default. PR: kern/168910 Submitted by: Richard Yao Approved by: cperciva No objections by: -hackers Obtained from: Gentoo FreeBSD MFC after: 2 weeks --- share/man/man4/hptrr.4 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man4/hptrr.4 b/share/man/man4/hptrr.4 index 847d86d..54a6512 100644 --- a/share/man/man4/hptrr.4 +++ b/share/man/man4/hptrr.4 @@ -50,8 +50,8 @@ hptrr_load="YES" The following tunables are settable from the loader: .Bl -ohang .It Va hw.hptrr.attach_generic -set to 0 to deny driver attach to chips with generic Marvell (non-HighPoint) -PCI identification. These chips are also supported by ata(4). +set to 1 to permit driver attach to chips with generic Marvell (non-HighPoint) +PCI identification. These chips are also supported by ata(4) and mvs(4). Some vendors are using same chips, but without providing RAID BIOS. .El .Sh DESCRIPTION @@ -112,7 +112,8 @@ This driver supersedes the older rr232x driver. .Xr ata 4 , .Xr cam 4 , .Xr hptmv 4 , -.Xr loader 8 +.Xr loader 8 , +.Xr mvs 4 .Sh HISTORY The .Nm -- cgit v1.1 From 82c586a58c9eaecc10d85bad25d9c737dcb7f3b2 Mon Sep 17 00:00:00 2001 From: eadler Date: Sun, 17 Jun 2012 03:54:10 +0000 Subject: Fix mdoc style nits PR: kern/168910 Submitted by: gjb Approved by: gjb MFC after: 3 days X-MFC-With: r237178 --- share/man/man4/hptrr.4 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/hptrr.4 b/share/man/man4/hptrr.4 index 54a6512..0cbd2fd 100644 --- a/share/man/man4/hptrr.4 +++ b/share/man/man4/hptrr.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 8, 2009 +.Dd June 6, 2012 .Dt HPTRR 4 .Os .Sh NAME @@ -51,7 +51,10 @@ The following tunables are settable from the loader: .Bl -ohang .It Va hw.hptrr.attach_generic set to 1 to permit driver attach to chips with generic Marvell (non-HighPoint) -PCI identification. These chips are also supported by ata(4) and mvs(4). +PCI identification. These chips are also supported by +.Xr ata 4 +and +.Xr mvs 4 . Some vendors are using same chips, but without providing RAID BIOS. .El .Sh DESCRIPTION @@ -112,8 +115,8 @@ This driver supersedes the older rr232x driver. .Xr ata 4 , .Xr cam 4 , .Xr hptmv 4 , -.Xr loader 8 , -.Xr mvs 4 +.Xr mvs 4 , +.Xr loader 8 .Sh HISTORY The .Nm -- cgit v1.1 From a0b36d5a0f0c40ddf24df49d87f4c3821a55df16 Mon Sep 17 00:00:00 2001 From: melifaro Date: Mon, 18 Jun 2012 13:56:36 +0000 Subject: Make radix lookup on src and dst flow addresses optional and configurable on per-interface basis. Remove __inline__ for several functions being called once per flow (e.g once per 10-20 packets on common traffic flows). Update manual page to simplify search for BPF data link types. Sponsored by Yandex LLC Reviewed by: glebius Approved by: ae(mentor) MFC after: 2 weeks --- share/man/man4/ng_netflow.4 | 47 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 9 deletions(-) (limited to 'share') diff --git a/share/man/man4/ng_netflow.4 b/share/man/man4/ng_netflow.4 index 9431c62..5985c44 100644 --- a/share/man/man4/ng_netflow.4 +++ b/share/man/man4/ng_netflow.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 2, 2011 +.Dd June 16, 2012 .Dt NG_NETFLOW 4 .Os .Sh NAME @@ -112,7 +112,18 @@ The hook number is passed as an argument. Sets data link type on the .Va iface Ns Ar N hook. -Currently, supported types are raw IP datagrams and Ethernet. +Currently, supported types are +.Cm DLT_RAW +(raw IP datagrams) and +.Cm DLT_EN10MB +(Ethernet). +DLT_ definitions can be found in +.In net/bpf.h +header. +Currently used values are 1 for +.Cm DLT_EN10MB +and 12 for +.Cm DLT_RAW . This message type uses .Vt "struct ng_netflow_setdlt" as an argument: @@ -180,18 +191,36 @@ struct ng_netflow_setconfig { #define NG_NETFLOW_CONF_EGRESS 2 #define NG_NETFLOW_CONF_ONCE 4 #define NG_NETFLOW_CONF_THISONCE 8 +#define NG_NETFLOW_CONF_NOSRCLOOKUP 16 +#define NG_NETFLOW_CONF_NODSTLOOKUP 32 }; .Ed .Pp Configuration is a bitmask of several options. Option NG_NETFLOW_CONF_INGRESS enabled by default enables ingress NetFlow generation (for data coming from -ifaceX hook). Option NG_NETFLOW_CONF_EGRESS enables egress NetFlow (for data -coming from outX hook). Option NG_NETFLOW_CONF_ONCE defines that packet should -be accounted only once if it several times passes via netflow node. Option -NG_NETFLOW_CONF_THISONCE defines that packet should be accounted only once -if it several times passes via exactly this netflow node. Last two options are -important to avoid duplicate accounting when both ingress and egress NetFlow -are enabled. +ifaceX hook). +Option +.Va NG_NETFLOW_CONF_EGRESS +enables egress NetFlow (for data coming from outX hook). +Option +.Va NG_NETFLOW_CONF_ONCE +defines that packet should be accounted only once if it several times passes +via netflow node. +Option +.Va NG_NETFLOW_CONF_THISONCE +defines that packet should be accounted only once if it several times passes +via exactly this netflow node. +These two options are important to avoid duplicate accounting when both ingress +and egress NetFlow are enabled. +Option +.Va NG_NETFLOW_CONF_NOSRCLOOKUP +skips radix lookup on flow source address used to fill in network mask. +Option +.Va NG_NETFLOW_CONF_NODSTLOOKUP +skips radix lookup on destination (which fills egress interface id, destination +mask and gateway). +If one doesn't need data provided by lookups, he/she can disable them, to reduce +load on routers. .It Dv NGM_NETFLOW_SETTEMPLATE Sets various timeouts to announce data flow templates (NetFlow v9-specific). This message requires -- cgit v1.1 From 7ece915f85673151aa3f9fb09c7ab7e984cfab8c Mon Sep 17 00:00:00 2001 From: marius Date: Mon, 18 Jun 2012 19:11:07 +0000 Subject: Avoid hard sentence break. MFC after: 3 days --- share/man/man4/ahci.4 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/ahci.4 b/share/man/man4/ahci.4 index 602fc3e..0b1cd13 100644 --- a/share/man/man4/ahci.4 +++ b/share/man/man4/ahci.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 6, 2011 +.Dd June 18, 2012 .Dt AHCI 4 .Os .Sh NAME @@ -101,7 +101,8 @@ setting to nonzero value limits maximum SATA revision (speed). Values 1, 2 and 3 are respectively 1.5, 3 and 6Gbps. .It Va hw.ahci.force setting to nonzero value forces driver attach to some known AHCI-capable -chips even if they are configured for legacy IDE emulation. Default is 1. +chips even if they are configured for legacy IDE emulation. +Default is 1. .El .Sh DESCRIPTION This driver provides the -- cgit v1.1 From 059d6b2a7bdf612d868620f1499fb00aeec739bc Mon Sep 17 00:00:00 2001 From: marius Date: Mon, 18 Jun 2012 19:14:06 +0000 Subject: Document the hw.ahci.force tunable here, too, as it's also used by ataahci(4) and atanvidia(4). MFC after: 3 days --- share/man/man4/ata.4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/ata.4 b/share/man/man4/ata.4 index 4c2f147..939c8b1 100644 --- a/share/man/man4/ata.4 +++ b/share/man/man4/ata.4 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 17, 2011 +.Dd June 18, 2012 .Dt ATA 4 .Os .Sh NAME @@ -89,8 +89,12 @@ subsystem module. The following tunables are settable from the .Xr loader 8 : .Bl -ohang +.It Va hw.ahci.force +set to nonzero value for forcing drivers to attach to some known AHCI-capable +chips even if they are configured for legacy IDE emulation (the default is 1, +force the attach). .It Va hw.ata.ata_dma_check_80pin -set to 0 to disable the 80pin cable check (the default is 1, check the cable) +set to 0 to disable the 80pin cable check (the default is 1, check the cable). .It Va hint.atapci.X.msi set to 1 to allow Message Signalled Interrupts (MSI) to be used by the specified PCI ATA controller, if supported. -- cgit v1.1 From c4e7a163d174f4f8ded33e9d646b0fe686c90555 Mon Sep 17 00:00:00 2001 From: sbruno Date: Mon, 18 Jun 2012 23:18:49 +0000 Subject: Document support for Intel Enhanced Speedstep Tech interface of cpufreq(4) via a new man page est(4) Document the two exposed tuneables of est(4). I'd appreciate more reviews of content if possible. I gleaned the information contained herein from sys/x86/cpufreq/est.c and the Intel reference documentation Reviewed by: wblock hrs gjb MFC after: 2 weeks --- share/man/man4/Makefile | 1 + share/man/man4/est.4 | 100 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 share/man/man4/est.4 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 89ef310..1c5e33d 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -116,6 +116,7 @@ MAN= aac.4 \ enc.4 \ epair.4 \ esp.4 \ + est.4 \ et.4 \ eventtimers.4 \ exca.4 \ diff --git a/share/man/man4/est.4 b/share/man/man4/est.4 new file mode 100644 index 0000000..aed5904 --- /dev/null +++ b/share/man/man4/est.4 @@ -0,0 +1,100 @@ +.\" +.\" Copyright (c) 2012 Sean Bruno +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd June 12, 2012 +.Dt EST 4 +.Os +.Sh NAME +.Nm est +.Nd Enhanced Speedstep Technology +.Sh SYNOPSIS +To compile this capability into your kernel +place the following line in your kernel +configuration file: +.Bd -ragged -offset indent +.Cd "device cpufreq" +.Ed +.Sh DESCRIPTION +The +.Nm +interface provides support for the Intel Enhanced Speedstep Technology. +.Pp +Note that +.Nm +capabilities are automatically loaded by the +.Xr cpufreq 4 +driver. +.Sh LOADER TUNABLES +The +.Nm +interface is intended to allow +.Xr cpufreq 4 +to access and implement Intel Enhanced SpeedStep Technology via +.Xr acpi 4 +and the acpi_perf interface accessors. +If the default settings are not optimal, the following sysctls can be +used to modify or monitor +.Nm +behavior. +.Bl -tag -width indent +.It hw.est.msr_info +Attempt to infer information from direct probing of the msr. +Should only be used in diagnostic cases +.Pq default 0 +.It hw.est.strict +Do not allow different cpus to be set to different frequencies. +It appears that this will only work on i386 systems +.Pq default 0 +.El +.Sh DIAGNOSTICS +.Bl -diag +.It "est%d: on cpu%d" +.Pp +Indicates normal startup of this interface. +.It "est: CPU supports Enhanced Speedstep, but is not recognized." +.It "est: cpu_vendor GenuineIntel, msr 471c471c0600471c" +.It "device_attach: est%d attach returned 6" +.Pp +Indicates all attempts to attach to this interface have failed. +This usually indicates an improper BIOS setting restricting O/S +control of the CPU speeds. +Consult your BIOS documentation for more details. +.El +.Sh COMPATIBILITY +.Nm +is only found on supported Intel CPUs. +.Sh SEE ALSO +.Xr cpufreq 4 +.Sh SUPPORT +For general information and support, +go to the Intel 64 and IA-32 Architectures Software Developer +Manuals site. +.Pa http://www.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html +.Sh AUTHORS +.Pp +This manual page was written by +.An Sean Bruno Aq sbruno@FreeBSD.org . -- cgit v1.1 From a206b29491430b441a8697acc62d9bfd36f8a468 Mon Sep 17 00:00:00 2001 From: joel Date: Tue, 19 Jun 2012 05:53:47 +0000 Subject: Minor mdoc fixes. --- share/man/man4/est.4 | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/man/man4/est.4 b/share/man/man4/est.4 index aed5904..ef91549 100644 --- a/share/man/man4/est.4 +++ b/share/man/man4/est.4 @@ -89,12 +89,10 @@ Consult your BIOS documentation for more details. is only found on supported Intel CPUs. .Sh SEE ALSO .Xr cpufreq 4 -.Sh SUPPORT -For general information and support, -go to the Intel 64 and IA-32 Architectures Software Developer -Manuals site. -.Pa http://www.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html +.Rs +.%T "Intel 64 and IA-32 Architectures Software Developer Manuals" +.%U "http://www.intel.com/content/www/us/en/processors/architectures-software-developer-manuals.html" +.Re .Sh AUTHORS -.Pp This manual page was written by .An Sean Bruno Aq sbruno@FreeBSD.org . -- cgit v1.1 From 3fdf1b6d2b267c1ab5b68cf3434fbe8c29cf5ddf Mon Sep 17 00:00:00 2001 From: joel Date: Tue, 19 Jun 2012 05:55:14 +0000 Subject: Remove end of line whitespace. --- share/man/man4/est.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/est.4 b/share/man/man4/est.4 index ef91549..618e5a5 100644 --- a/share/man/man4/est.4 +++ b/share/man/man4/est.4 @@ -63,11 +63,11 @@ behavior. .Bl -tag -width indent .It hw.est.msr_info Attempt to infer information from direct probing of the msr. -Should only be used in diagnostic cases +Should only be used in diagnostic cases .Pq default 0 .It hw.est.strict Do not allow different cpus to be set to different frequencies. -It appears that this will only work on i386 systems +It appears that this will only work on i386 systems .Pq default 0 .El .Sh DIAGNOSTICS -- cgit v1.1 From e551b0ecfb98653b427343a9dc4e018566a78913 Mon Sep 17 00:00:00 2001 From: sbruno Date: Tue, 19 Jun 2012 17:13:14 +0000 Subject: Correct misunderstanding of hw.est.strict Setting strict causes a validation of the requested value vs the value currently running after a frequency change is requested. Change applicability to be single core not i386. Thanks to mav@ for reviewing and commenting on my lack of understanding. MFC after: 2 weeks --- share/man/man4/est.4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man4/est.4 b/share/man/man4/est.4 index 618e5a5..f1b5832 100644 --- a/share/man/man4/est.4 +++ b/share/man/man4/est.4 @@ -66,8 +66,8 @@ Attempt to infer information from direct probing of the msr. Should only be used in diagnostic cases .Pq default 0 .It hw.est.strict -Do not allow different cpus to be set to different frequencies. -It appears that this will only work on i386 systems +Validate frequency requested is accepted by the cpu when set. +It appears that this will only work on single core cpus. .Pq default 0 .El .Sh DIAGNOSTICS -- cgit v1.1 From 17a6764a6971afd7368676d00b66708be1b6c355 Mon Sep 17 00:00:00 2001 From: sbruno Date: Wed, 20 Jun 2012 17:26:22 +0000 Subject: Now that there is an est(4) man page, reference it here in cpufreq(4). --- share/man/man4/cpufreq.4 | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/man/man4/cpufreq.4 b/share/man/man4/cpufreq.4 index d4a2a3f..850660e 100644 --- a/share/man/man4/cpufreq.4 +++ b/share/man/man4/cpufreq.4 @@ -286,6 +286,7 @@ then it should set all elements to .Dv CPUFREQ_VAL_UNKNOWN . .Sh SEE ALSO .Xr acpi 4 , +.Xr est 4 , .Xr timecounters 4 , .Xr powerd 8 , .Xr sysctl 8 -- cgit v1.1 From 6e98b6435ce074d1e11f6db38d6673d481dfc57d Mon Sep 17 00:00:00 2001 From: iwasaki Date: Sat, 23 Jun 2012 18:45:32 +0000 Subject: Add description about dev.acpi_ibm.0.handlerevents. MFC after: 3 days --- share/man/man4/acpi_ibm.4 | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/acpi_ibm.4 b/share/man/man4/acpi_ibm.4 index 376b64d..cd9993d 100644 --- a/share/man/man4/acpi_ibm.4 +++ b/share/man/man4/acpi_ibm.4 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2010 +.Dd June 24, 2012 .Dt ACPI_IBM 4 .Os .Sh NAME @@ -335,6 +335,17 @@ Built-in battery .It UltraBay battery .El +.It Va dev.acpi_ibm.0.handlerevents +.Xr devd 8 +events handled by +.Nm +when +.Va events +is set to 1. +Events are specified as a whitespace-separated list of event code in +hexadecimal or decimal form. +Note that the event maybe handled twice (eg. Brightness up/down) if ACPI BIOS +already handled the event. .El .Pp Defaults for these sysctls can be set in @@ -436,6 +447,20 @@ then fi exit 0 .Ed +.Pp +The following example specify that event code 0x04 (Suspend to RAM), +0x10 (Brightness up) and 0x11 (Brightness down) are handled by +.Nm . +.Bd -literal -offset indent +sysctl dev.acpi_ibm.0.handlerevents='0x04 0x10 0x11' +.Ed +.Pp +in +.Xr sysctl.conf 5 : +.Bd -literal -offset indent +dev.acpi_ibm.0.handlerevents=0x04\\ 0x10\\ 0x11 +.Ed +.Pp .Sh SEE ALSO .Xr acpi 4 , .Xr led 4 , -- cgit v1.1 From 16ef4a6c306a8e2316fed96dcb32eae3e60b3cd1 Mon Sep 17 00:00:00 2001 From: joel Date: Sat, 23 Jun 2012 20:44:45 +0000 Subject: Remove superfluous paragraph macro. --- share/man/man4/acpi_ibm.4 | 1 - 1 file changed, 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/acpi_ibm.4 b/share/man/man4/acpi_ibm.4 index cd9993d..4aa6d9f 100644 --- a/share/man/man4/acpi_ibm.4 +++ b/share/man/man4/acpi_ibm.4 @@ -460,7 +460,6 @@ in .Bd -literal -offset indent dev.acpi_ibm.0.handlerevents=0x04\\ 0x10\\ 0x11 .Ed -.Pp .Sh SEE ALSO .Xr acpi 4 , .Xr led 4 , -- cgit v1.1 From be54b17782e6e96ea044ccc043eec5661ed7c817 Mon Sep 17 00:00:00 2001 From: ken Date: Sun, 24 Jun 2012 04:29:03 +0000 Subject: Fix a bug which causes a panic in daopen(). The panic is caused by a da(4) instance going away while GEOM is still probing it. In this case, the GEOM disk class instance has been created by disk_create(), and the taste of the disk is queued in the GEOM event queue. While that event is queued, the da(4) instance goes away. When the open call comes into the da(4) driver, it dereferences the freed (but non-NULL) peripheral pointer provided by GEOM, which results in a panic. The solution is to add a callback to the GEOM disk code that is called when all of its resources are cleaned up. This is implemented inside GEOM by adding an optional callback that is called when all consumers have detached from a provider, and the provider is about to be deleted. scsi_cd.c, scsi_da.c: In the register routine for the cd(4) and da(4) routines, acquire a reference to the CAM peripheral instance just before we call disk_create(). Use the new GEOM disk d_gone() callback to register a callback (dadiskgonecb()/cddiskgonecb()) that decrements the peripheral reference count once GEOM has finished cleaning up its resources. In the cd(4) driver, clean up open and close behavior slightly. GEOM makes sure we only get one open() and one close call, so there is no need to set an open flag and decrement the reference count if we are not the first open. In the cd(4) driver, use cam_periph_release_locked() in a couple of error scenarios to avoid extra mutex calls. geom.h: Add a new, optional, providergone callback that is called when a provider is about to be deleted. geom_disk.h: Add a new d_gone() callback to the GEOM disk interface. Bump the DISK_VERSION to version 2. This probably should have been done after a couple of previous changes, especially the addition of the d_getattr() callback. geom_disk.c: Add a providergone callback for the disk class, g_disk_providergone(), that calls the user's d_gone() callback if it exists. Bump the DISK_VERSION to 2. geom_subr.c: In g_destroy_provider(), call the providergone callback if it has been provided. In g_new_geomf(), propagate the class's providergone callback to the new geom instance. blkfront.c: Callers of disk_create() are supposed to pass in DISK_VERSION, not an explicit disk API version number. Update the blkfront driver to do that. disk.9: Update the disk(9) man page to include information on the new d_gone() callback, as well as the previously added d_getattr() callback, d_descr field, and HBA PCI ID fields. MFC after: 5 days --- share/man/man9/disk.9 | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/disk.9 b/share/man/man9/disk.9 index 4643512..d383888 100644 --- a/share/man/man9/disk.9 +++ b/share/man/man9/disk.9 @@ -145,6 +145,16 @@ Optional: if configured with .Xr dumpon 8 , this function is invoked from a very restricted system state after a kernel panic to record a copy of the system RAM to the disk. +.It Vt "disk_getattr_t *" Va d_getattr +Optional: if this method is provided, it gives the disk driver the +opportunity to override the default GEOM response to BIO_GETATTR requests. +This function should return -1 if the attribute is not handled, 0 if the +attribute is handled, or an errno to be passed to g_io_deliver(). +.It Vt "disk_gone_t *" Va d_gone +Optional: if this method is provided, it will be called after disk_gone() +is called, once GEOM has finished its cleanup process. +Once this callback is called, it is safe for the disk driver to free all of +its resources, as it will not be receiving further calls from GEOM. .El .Ss Mandatory Media Properties The following fields identify the size and granularity of the disk device. @@ -180,7 +190,23 @@ Please see .Pa src/sys/geom/notes for details. .It Vt char Va d_ident[DISK_IDENT_SIZE] -This field can and should be used to store disk's serial number. +This field can and should be used to store disk's serial number if the +d_getattr method described above isn't implemented, or if it does not +support the GEOM::ident attribute. +.It Vt char Va d_descr[DISK_IDENT_SIZE] +This field can be used to store the disk vendor and product description. +.It Vt uint16_t Va d_hba_vendor +This field can be used to store the PCI vendor ID for the HBA connected to +the disk. +.It Vt uint16_t Va d_hba_device +This field can be used to store the PCI device ID for the HBA connected to +the disk. +.It Vt uint16_t Va d_hba_subvendor +This field can be used to store the PCI subvendor ID for the HBA connected to +the disk. +.It Vt uint16_t Va d_hba_subdevice +This field can be used to store the PCI subdevice ID for the HBA connected to +the disk. .El .Ss Driver Private Data This field may be used by the device driver to store a pointer to -- cgit v1.1 From 18c656b8addc34061ae22ae4baea59fa147ce9a1 Mon Sep 17 00:00:00 2001 From: trasz Date: Mon, 25 Jun 2012 21:33:45 +0000 Subject: Add missing MLINKS for whatever -> if_whatever. Reviewed by: brueffer MFC after: 1 week --- share/man/man4/Makefile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 1c5e33d..e9099e6 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -547,8 +547,11 @@ MAN= aac.4 \ MLINKS= ae.4 if_ae.4 MLINKS+=age.4 if_age.4 MLINKS+=agp.4 agpgart.4 +MLINKS+=alc.4 if_alc.4 MLINKS+=ale.4 if_ale.4 MLINKS+=altq.4 ALTQ.4 +MLINKS+=ath.4 if_ath.4 +MLINKS+=ath_pci.4 if_ath_pci.4 MLINKS+=an.4 if_an.4 MLINKS+=aue.4 if_aue.4 MLINKS+=axe.4 if_axe.4 @@ -558,9 +561,13 @@ MLINKS+=bge.4 if_bge.4 MLINKS+=bktr.4 brooktree.4 MLINKS+=bridge.4 if_bridge.4 MLINKS+=bwi.4 if_bwi.4 +MLINKS+=bwn.4 if_bwn.4 MLINKS+=cas.4 if_cas.4 +MLINKS+=cdce.4 if_cdce.4 MLINKS+=crypto.4 cryptodev.4 MLINKS+=cue.4 if_cue.4 +MLINKS+=cxgb.4 if_cxgb.4 +MLINKS+=cxgbe.4 if_cxgbe.4 MLINKS+=dc.4 if_dc.4 MLINKS+=de.4 if_de.4 MLINKS+=disc.4 if_disc.4 @@ -606,14 +613,19 @@ MLINKS+=ixgbe.4 if_ixgbe.4 MLINKS+=jme.4 if_jme.4 MLINKS+=kue.4 if_kue.4 MLINKS+=lagg.4 trunk.4 +MLINKS+=lagg.4 if_lagg.4 MLINKS+=le.4 if_le.4 MLINKS+=lge.4 if_lge.4 +MLINKS+=lmc.4 if_lmc.4 MLINKS+=lo.4 loop.4 MLINKS+=lp.4 plip.4 MLINKS+=malo.4 if_malo.4 MLINKS+=md.4 vn.4 MLINKS+=mem.4 kmem.4 MLINKS+=mn.4 if_mn.4 +MLINKS+=mos.4 if_mos.4 +MLINKS+=msk.4 if_msk.4 +MLINKS+=mwl.4 if_mwl.4 MLINKS+=mxge.4 if_mxge.4 MLINKS+=my.4 if_my.4 MLINKS+=${_ndis.4} ${_if_ndis.4} @@ -633,11 +645,13 @@ MLINKS+=re.4 if_re.4 MLINKS+=rl.4 if_rl.4 MLINKS+=rue.4 if_rue.4 MLINKS+=rum.4 if_rum.4 +MLINKS+=run.4 if_run.4 MLINKS+=scsi.4 CAM.4 \ scsi.4 cam.4 \ scsi.4 scbus.4 \ scsi.4 SCSI.4 MLINKS+=sf.4 if_sf.4 +MLINKS+=sge.4 if_sge.4 MLINKS+=sis.4 if_sis.4 MLINKS+=sk.4 if_sk.4 MLINKS+=smp.4 SMP.4 @@ -669,6 +683,7 @@ MLINKS+=vge.4 if_vge.4 MLINKS+=vlan.4 if_vlan.4 MLINKS+=vpo.4 imm.4 MLINKS+=vr.4 if_vr.4 +MLINKS+=vte.4 if_vte.4 MLINKS+=${_vtnet.4} ${_if_vtnet.4} MLINKS+=${_vxge.4} ${_if_vxge.4} MLINKS+=watchdog.4 SW_WATCHDOG.4 @@ -749,6 +764,9 @@ MLINKS+=lindev.4 full.4 .if ${MACHINE_CPUARCH} == "amd64" _qlxgb.4= qlxgb.4 _sfxge.4= sfxge.4 + +MLINKS+=qlxgb.4 if_qlxgb.4 +MLINKS+=sfxge.4 if_sfxge.4 .endif .if ${MACHINE_CPUARCH} == "powerpc" -- cgit v1.1 From e7fd66eb8d4fbe22a9c38b44ab97fef129177e46 Mon Sep 17 00:00:00 2001 From: obrien Date: Mon, 25 Jun 2012 21:56:36 +0000 Subject: Ensure crunchen uses the same make binary as the rest of the build. Submitted by: Simon Gerraty --- share/mk/bsd.crunchgen.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/mk/bsd.crunchgen.mk b/share/mk/bsd.crunchgen.mk index 540c6d2..80d337f 100644 --- a/share/mk/bsd.crunchgen.mk +++ b/share/mk/bsd.crunchgen.mk @@ -105,7 +105,7 @@ $(CONF): Makefile .MAKEFLAGS:= ${.MAKEFLAGS:N-P} .ORDER: $(OUTPUTS) objs $(OUTPUTS): $(CONF) - MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \ + MAKE=${MAKE} MAKEOBJDIRPREFIX=${CRUNCHOBJS} crunchgen -fq -m $(OUTMK) \ -c $(OUTC) $(CONF) $(PROG): $(OUTPUTS) objs -- cgit v1.1 From 8941fec43933f9102097889f15661e0e6832a24f Mon Sep 17 00:00:00 2001 From: bjk Date: Mon, 25 Jun 2012 22:39:37 +0000 Subject: Explicitly mention that setting the change and expiry times to zero is equivalent to leaving the time unset. [1] Wordsmith in the compat support section. Use a full path to nologin(8) in the context of setting it as a user's shell, keeping a separate cross-reference. PR: docs/169354 [1] Approved by: hrs (mentor) MFC after: 3 weeks --- share/man/man5/passwd.5 | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'share') diff --git a/share/man/man5/passwd.5 b/share/man/man5/passwd.5 index 228c4e3..c49b0f7 100644 --- a/share/man/man5/passwd.5 +++ b/share/man/man5/passwd.5 @@ -35,7 +35,7 @@ .\" From: @(#)passwd.5 8.1 (Berkeley) 6/5/93 .\" $FreeBSD$ .\" -.Dd May 8, 2007 +.Dd June 23, 2012 .Dt PASSWD 5 .Os .Sh NAME @@ -203,7 +203,8 @@ field is the number of seconds from the epoch, .Dv UTC , until the password for the account must be changed. -This field may be left empty to turn off the password aging feature. +This field may be left empty to turn off the password aging feature; +a value of zero is equivalent to leaving the field empty. .Pp The .Ar expire @@ -211,7 +212,8 @@ field is the number of seconds from the epoch, .Dv UTC , until the account expires. -This field may be left empty to turn off the account aging feature. +This field may be left empty to turn off the account aging feature; +a value of zero is equivalent to leaving the field empty. .Pp The .Ar gecos @@ -271,7 +273,8 @@ as it is done for system accounts, is to set its .Ar shell to -.Xr nologin 8 . +.Pa /sbin/nologin +.Pq see Xr nologin 8 . .Sh HESIOD SUPPORT If .Sq Li dns @@ -363,7 +366,7 @@ fields, the specified numbers will override the information retrieved from the Hesiod domain or the .Tn NIS maps. -As well, if the +Likewise, if the .Ar gecos , .Ar dir or @@ -399,7 +402,8 @@ The additional fields .Ar change and .Ar expire -are added, but are turned off by default. +are added, but are turned off by default +.Pq setting these fields to zero is equivalent to leaving them blank . Class is currently not implemented, but change and expire are; to set them, use the current day in seconds from the epoch + whatever number of seconds of offset you want. -- cgit v1.1 From 877f7e22dc80676c9ece47bf58c4a6bdc79be4c7 Mon Sep 17 00:00:00 2001 From: ken Date: Tue, 26 Jun 2012 14:51:35 +0000 Subject: Fix an issue that caused the kernel to panic inside CTL when trying to attach to target capable HBAs that implement the old immediate notify (XPT_IMMED_NOTIFY) and notify acknowledge (XPT_NOTIFY_ACK) CCBs. The new API has been in place since SVN change 196008 in 2009. The solution is two-fold: fix CTL to handle the responses from the HBAs, and convert the HBA drivers in question to use the new API. These drivers have not been tested with CTL, so how well they will interoperate with CTL is unknown. scsi_target.c: Update the userland target example code to use the new immediate notify API. scsi_ctl.c: Detect when an immediate notify CCB is returned with CAM_REQ_INVALID or CAM_PROVIDE_FAIL status, and just free it. Fix a duplicate assignment. aic79xx.c, aic79xx_osm.c: Update the aic79xx driver to use the new API. Target mode is not enabled on for this driver, so the changes will have no practical effect. aic7xxx.c, aic7xxx_osm.c: Update the aic7xxx driver to use the new API. sbp_targ.c: Update the firewire target code to work with the new API. mpt_cam.c: Update the mpt(4) driver to work with the new API. Target mode is only enabled for Fibre Channel mpt(4) devices. MFC after: 3 days --- share/examples/scsi_target/scsi_target.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'share') diff --git a/share/examples/scsi_target/scsi_target.c b/share/examples/scsi_target/scsi_target.c index 6f665af..1a7a061 100644 --- a/share/examples/scsi_target/scsi_target.c +++ b/share/examples/scsi_target/scsi_target.c @@ -88,7 +88,7 @@ static void handle_read(void); /* static int work_atio(struct ccb_accept_tio *); */ static void queue_io(struct ccb_scsiio *); static int run_queue(struct ccb_accept_tio *); -static int work_inot(struct ccb_immed_notify *); +static int work_inot(struct ccb_immediate_notify *); static struct ccb_scsiio * get_ctio(void); /* static void free_ccb(union ccb *); */ @@ -387,7 +387,7 @@ init_ccbs() warn("malloc INOT"); return (-1); } - inot->ccb_h.func_code = XPT_IMMED_NOTIFY; + inot->ccb_h.func_code = XPT_IMMEDIATE_NOTIFY; send_ccb((union ccb *)inot, /*priority*/1); } @@ -495,8 +495,8 @@ request_loop() /* Start one more transfer. */ retval = work_atio(&ccb->atio); break; - case XPT_IMMED_NOTIFY: - retval = work_inot(&ccb->cin); + case XPT_IMMEDIATE_NOTIFY: + retval = work_inot(&ccb->cin1); break; default: warnx("Unhandled ccb type %#x on workq", @@ -651,7 +651,7 @@ work_atio(struct ccb_accept_tio *atio) warnx("ATIO with %u bytes sense received", atio->sense_len); } - sense = &atio->sense_data; + sense = (struct scsi_sense_data_fixed *)&atio->sense_data; tcmd_sense(ctio->init_id, ctio, sense->flags, sense->add_sense_code, sense->add_sense_code_qual); send_ccb((union ccb *)ctio, /*priority*/1); @@ -772,16 +772,14 @@ run_queue(struct ccb_accept_tio *atio) } static int -work_inot(struct ccb_immed_notify *inot) +work_inot(struct ccb_immediate_notify *inot) { cam_status status; - int sense; if (debug) warnx("Working on INOT %p", inot); status = inot->ccb_h.status; - sense = (status & CAM_AUTOSNS_VALID) != 0; status &= CAM_STATUS_MASK; switch (status) { @@ -794,7 +792,7 @@ work_inot(struct ccb_immed_notify *inot) abort_all_pending(); break; case CAM_MESSAGE_RECV: - switch (inot->message_args[0]) { + switch (inot->arg) { case MSG_TASK_COMPLETE: case MSG_INITIATOR_DET_ERR: case MSG_ABORT_TASK_SET: @@ -805,7 +803,7 @@ work_inot(struct ccb_immed_notify *inot) case MSG_ABORT_TASK: case MSG_CLEAR_TASK_SET: default: - warnx("INOT message %#x", inot->message_args[0]); + warnx("INOT message %#x", inot->arg); break; } break; @@ -817,17 +815,6 @@ work_inot(struct ccb_immed_notify *inot) break; } - /* If there is sense data, use it */ - if (sense != 0) { - struct scsi_sense_data_fixed *sense; - - sense = (struct scsi_sense_data_fixed *)&inot->sense_data; - tcmd_sense(inot->initiator_id, NULL, sense->flags, - sense->add_sense_code, sense->add_sense_code_qual); - if (debug) - warnx("INOT has sense: %#x", sense->flags); - } - /* Requeue on SIM */ TAILQ_REMOVE(&work_queue, &inot->ccb_h, periph_links.tqe); send_ccb((union ccb *)inot, /*priority*/1); -- cgit v1.1 From bd43c5e6d640101f1bd6cca7e83586ae41e1a065 Mon Sep 17 00:00:00 2001 From: obrien Date: Tue, 26 Jun 2012 23:15:55 +0000 Subject: Add -DWITH_INSTALL_AS_USER to the source build (naming matches the same functionality of The Ports Collection). This sets BINOWN, BINGRP, etc... to match current user. This this allows 'install', as used in 'make install', to succeed (assuming user has write permissions). Submitted by: Simon J Gerraty Discussed on: freebsd-arch --- share/mk/bsd.own.mk | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index e825c62..7d31a39 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -427,6 +427,7 @@ __DEFAULT_NO_OPTIONS = \ HESIOD \ ICONV \ IDEA \ + INSTALL_AS_USER \ LIBCPLUSPLUS \ NAND \ OFED \ @@ -645,6 +646,17 @@ CTFCONVERT_CMD= CTFCONVERT_CMD= @: .endif +.if ${MK_INSTALL_AS_USER} != "no" +_uid!= id -un +.if ${_uid} != 0 +_gid!= id -gn +.for x in BIN CONF DOC INFO KMOD LIB MAN NLS SHARE +$xOWN= ${_uid} +$xGRP= ${_gid} +.endfor +.endif +.endif + .endif # !_WITHOUT_SRCCONF .endif # !target(____) -- cgit v1.1 From 8311d8ae8e149a5fec68b5c3bd2d9929dd2e5f16 Mon Sep 17 00:00:00 2001 From: julian Date: Wed, 27 Jun 2012 01:13:37 +0000 Subject: Try clean up some of my original text and neaten a table. MFC after: 1 week --- share/man/man9/locking.9 | 56 ++++++++++++++++++++++++++++-------------------- 1 file changed, 33 insertions(+), 23 deletions(-) (limited to 'share') diff --git a/share/man/man9/locking.9 b/share/man/man9/locking.9 index f634d34..6ec6592 100644 --- a/share/man/man9/locking.9 +++ b/share/man/man9/locking.9 @@ -37,11 +37,19 @@ kernel is written to run across multiple CPUs and as such requires several different synchronization primitives to allow the developers to safely access and manipulate the many data types required. .Ss Mutexes -Mutexes (also called "sleep mutexes") are the most commonly used +Mutexes (also erroneously called "sleep mutexes") are the most commonly used synchronization primitive in the kernel. -Thread acquires (locks) a mutex before accessing data shared with other +A thread acquires (locks) a mutex before accessing data shared with other threads (including interrupt threads), and releases (unlocks) it afterwards. -If the mutex cannot be acquired, the thread requesting it will sleep. +If the mutex cannot be acquired, the thread requesting it will wait. +Mutexes are by default adaptive, meaning that +if the owner of a contended mutex is currently running on another CPU, +then a thread attempting to acquire the mutex will briefly spin +in the hope that the owner is only briefly holding it, +and might release it shortly. +If the owner does not do so, the waiting thread proceeds to yield the processor, +allowing other threads to run. +If the owner is not currently actually running then the spin step is skipped. Mutexes fully support priority propagation. .Pp See @@ -49,9 +57,10 @@ See for details. .Ss Spin mutexes Spin mutexes are variation of basic mutexes; the main difference between -the two is that spin mutexes never sleep - instead, they spin, waiting -for the thread holding the lock, which runs on another CPU, to release it. -Differently from ordinary mutex, spin mutexes disable interrupts when acquired. +the two is that spin mutexes never yield the processor - instead, they spin, +waiting for the thread holding the lock, +(which must be running on another CPU), to release it. +Spin mutexes disable interrupts while the held so as to not get pre-empted. Since disabling interrupts is expensive, they are also generally slower. Spin mutexes should be used only when necessary, e.g. to protect data shared with interrupt filter code (see @@ -122,7 +131,7 @@ and read-mostly locks. They don't support priority propagation. They should be considered to be closely related to .Xr sleep 9 . -In fact it could in some cases be +They could in some cases be considered a conditional sleep. .Pp See @@ -146,8 +155,8 @@ A thread must hold the mutex before calling the .Fn cv_wait* , functions. When a thread waits on a condition, the mutex -is atomically released before the thread is blocked, then reacquired -before the function call returns. +is atomically released before the thread thread yields the processor, +then reacquired before the function call returns. .Pp See .Xr condvar 9 @@ -255,14 +264,14 @@ Many of these rules are checked using the .Xr witness 4 code. .Ss Bounded vs. unbounded sleep -The following primitives perform bounded sleep: mutexes, pool mutexes, -reader/writer locks and read-mostly locks. +The following primitives perform bounded sleep: + mutexes, pool mutexes, reader/writer locks and read-mostly locks. .Pp -The following primitives block (perform unbounded sleep): shared/exclusive locks, -counting semaphores, condition variables, sleep/wakeup and lockmanager locks. +The following primitives may perform an unbounded sleep: +shared/exclusive locks, counting semaphores, condition variables, sleep/wakeup and lockmanager locks. .Pp -It is an error to do any operation that could result in any kind of sleep while -holding spin mutex. +It is an error to do any operation that could result in yielding the processor +while holding a spin mutex. .Pp As a general rule, it is an error to do any operation that could result in unbounded sleep while holding any primitive from the 'bounded sleep' group. @@ -284,21 +293,22 @@ Because the lock gets dropped during sleep, one must re-test all the assumptions that were made before, all the way up the call graph to the place where the lock was acquired. .Pp -It is an error to do any operation that could result in any kind of sleep when -running inside an interrupt filter. +It is an error to do any operation that could result in yielding of +the processor when running inside an interrupt filter. .Pp It is an error to do any operation that could result in unbounded sleep when running inside an interrupt thread. .Ss Interaction table The following table shows what you can and can not do while holding one of the synchronization primitives discussed: -.Bl -column ".Ic xxxxxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent -.It Em "You have: You want:" Ta spin mtx Ta mutex Ta sx Ta rwlock Ta rmlock Ta sleep +.Bl -column ".Ic xxxxxxxxxxxxxxxx" ".Xr XXXXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXXX" ".Xr XXXXXX" -offset indent +.It Em " You want:" Ta spin-mtx Ta mutex Ta rwlock Ta rmlock Ta sx Ta sleep +.It Em "You have: " Ta ------ Ta ------ Ta ------ Ta ------ Ta ------ Ta ------ .It spin mtx Ta \&ok-1 Ta \&no Ta \&no Ta \&no Ta \&no Ta \&no-3 -.It mutex Ta \&ok Ta \&ok-1 Ta \&no Ta \&ok Ta \&ok Ta \&no-3 -.It sx Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&ok Ta \&ok-4 -.It rwlock Ta \&ok Ta \&ok Ta \&no Ta \&ok-2 Ta \&ok Ta \&no-3 -.It rmlock Ta \&ok Ta \&ok Ta \&no-5 Ta \&ok Ta \&ok-2 Ta \&no-5 +.It mutex Ta \&ok Ta \&ok-1 Ta \&ok Ta \&ok Ta \&no Ta \&no-3 +.It rwlock Ta \&ok Ta \&ok Ta \&ok-2 Ta \&ok Ta \&no Ta \&no-3 +.It rmlock Ta \&ok Ta \&ok Ta \&ok Ta \&ok-2 Ta \&no-5 Ta \&no-5 +.It sx Ta \&ok Ta \&ok Ta \&ok Ta \&ok Ta \&no-2 Ta \&ok-4 .El .Pp .Em *1 -- cgit v1.1 From c7fbb6736286e1c4a125bed52f0daa2b669bf538 Mon Sep 17 00:00:00 2001 From: gabor Date: Wed, 27 Jun 2012 05:59:01 +0000 Subject: - Switch to BSD sort as default sort. GNU sort will still be installed as "gnusort". Most of the BSD sort development work was done by Oleg Moskalenko . - GNU grep can be set to default by setting WITH_GNU_GREP. It will cause BSD sort to be installed as "bsdsort". Portbuild tested by: linimon --- share/mk/bsd.own.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 7d31a39..aadd492 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -415,7 +415,6 @@ __DEFAULT_YES_OPTIONS = \ __DEFAULT_NO_OPTIONS = \ BSD_GREP \ - BSD_SORT \ BIND_IDN \ BIND_LARGE_FILE \ BIND_LIBS \ @@ -424,6 +423,7 @@ __DEFAULT_NO_OPTIONS = \ CLANG_EXTRAS \ CLANG_IS_CC \ CTF \ + GNU_SORT \ HESIOD \ ICONV \ IDEA \ -- cgit v1.1 From f56871189622bd1906594b5eb6e72df85209cb4c Mon Sep 17 00:00:00 2001 From: gabor Date: Wed, 27 Jun 2012 06:00:58 +0000 Subject: - Regen after BSD sort change --- share/man/man5/src.conf.5 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index d40e4cf..46210e0 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb .\" $FreeBSD$ -.Dd May 29, 2012 +.Dd June 27, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -227,9 +227,6 @@ Set to not build the BSD licensed version of cpio based on .It Va WITH_BSD_GREP .\" from FreeBSD: head/tools/build/options/WITH_BSD_GREP 222273 2011-05-25 01:04:12Z obrien Install BSD-licensed grep as '[ef]grep' instead of GNU grep. -.It Va WITH_BSD_SORT -.\" from FreeBSD: head/tools/build/options/WITH_BSD_SORT 235268 2012-05-11 12:47:21Z gabor -Install BSD-licensed sort as 'sort' instead of GNU sort. .It Va WITHOUT_BSNMP .\" from FreeBSD: head/tools/build/options/WITHOUT_BSNMP 183306 2008-09-23 16:15:42Z sam Set to not build or install @@ -440,6 +437,9 @@ When set, it also enforces the following options: .It .Va WITHOUT_GNU_SUPPORT .El +.It Va WITH_GNU_SORT +.\" from FreeBSD: head/tools/build/options/WITH_GNU_SORT 237629 2012-06-27 05:59:01Z gabor +Install GNU-licensed sort as 'sort' instead of BSD sort. .It Va WITHOUT_GNU_SUPPORT .\" from FreeBSD: head/tools/build/options/WITHOUT_GNU_SUPPORT 156932 2006-03-21 07:50:50Z ru Set to build some programs without optional GNU support. -- cgit v1.1 From cc912f41fcecc580e91e772396553daeafc1f6ec Mon Sep 17 00:00:00 2001 From: trasz Date: Wed, 27 Jun 2012 10:07:29 +0000 Subject: Add manual page for bxe(4). Reviewed by: davidch (earlier version) MFC after: 1 week --- share/man/man4/Makefile | 4 ++ share/man/man4/bxe.4 | 138 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 share/man/man4/bxe.4 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e9099e6..e5a2f4c 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -36,6 +36,7 @@ MAN= aac.4 \ ${_amdsbwd.4} \ ${_amdsmb.4} \ ${_amdtemp.4} \ + ${_bxe.4} \ amr.4 \ an.4 \ ${_apic.4} \ @@ -562,6 +563,7 @@ MLINKS+=bktr.4 brooktree.4 MLINKS+=bridge.4 if_bridge.4 MLINKS+=bwi.4 if_bwi.4 MLINKS+=bwn.4 if_bwn.4 +MLINKS+=${_bxe.4} ${_if_bxe.4} MLINKS+=cas.4 if_cas.4 MLINKS+=cdce.4 if_cdce.4 MLINKS+=crypto.4 cryptodev.4 @@ -714,6 +716,7 @@ _amdsmb.4= amdsmb.4 _amdtemp.4= amdtemp.4 _asmc.4= asmc.4 _atp.4= atp.4 +_bxe.4= bxe.4 _coretemp.4= coretemp.4 _cpuctl.4= cpuctl.4 _dpms.4= dpms.4 @@ -723,6 +726,7 @@ _hptmv.4= hptmv.4 _hptrr.4= hptrr.4 _i8254.4= i8254.4 _ichwd.4= ichwd.4 +_if_bxe.4= if_bxe.4 _if_ndis.4= if_ndis.4 _if_nfe.4= if_nfe.4 _if_nve.4= if_nve.4 diff --git a/share/man/man4/bxe.4 b/share/man/man4/bxe.4 new file mode 100644 index 0000000..588900f --- /dev/null +++ b/share/man/man4/bxe.4 @@ -0,0 +1,138 @@ +.\" Copyright (c) 2012 Edward Tomasz Napierala +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd June 25, 2012 +.Dt BXE 4 +.Os +.Sh NAME +.Nm bxe +.Nd "Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet adapter driver" +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device bxe" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_bxe_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for PCIe 10GbE Ethernet adapters based on +BCM5771x chips. +The driver supports Jumbo Frames, VLAN tagging, IP, UDP and TCP checksum +offload, MSI-X, TCP Segmentation Offload (TSO), Large Receive Offload (LRO), +and Receive Side Steering (RSS). +.Pp +For more information on configuring this device, see +.Xr ifconfig 8 . +.Sh HARDWARE +The +.Nm +driver provides support for various NICs based on the Broadcom BCM5771x +family of 10GbE Ethernet controller chips, including the +following: +.Pp +.Bl -bullet -compact +.It +Broadcom NetXtreme II BCM57710 10GbE +.It +Broadcom NetXtreme II BCM57711 10GbE +.It +Broadcom NetXtreme II BCM57711E 10GbE +.El +.Sh SYSCTL VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width indent +.It Va hw.bxe.dcc_enable +Enable HP Flex-10 support. +Allowed values are 0 to disable and 1 to enable. +The default value is 0. +.It Va hw.bxe.tso_enable +Enable TCP Segmentation Offload. +The default value is 1. +.It Va hw.bxe.int_mode +Set interrupt mode. +Allowed values are 0 for IRQ, 1 for MSI/IRQ and 2 for MSI-X/MSI/IRQ. +The default value is 2. +.It Va hw.bxe.queue_count +Specify the number of queues that will be used when a multi-queue +RSS mode is selected using bxe_multi_mode. +Allowed values are 0 for Auto or 1 to 16 for fixed number of queues. +The default value is 0. +.It Va hw.bxe.multi_mode +Enable Receive Side Steering. +Allowed values are 0, which disables all multi-queue/packet sorting +algorithms, and 1, which assigns incoming frames to receive queues +according to RSS. +The default value is 0. +.It Va hw.bxe.rx_ticks +Control interrupt coalescing for received frames. +The first frame always causes an interrupt, but subsequent frames +are coalesced until the RX/TX ticks timer value expires and another +interrupt occurs. +The default value is 25. +.It Va hw.bxe.tx_ticks +Control interrupt coalescing for trasmitted frames. +The first frame always causes an interrupt, but subsequent frames +are coalesced until the RX/TX ticks timer value expires and another +interrupt occurs. +The default value is 50. +.It Va hw.bxe.mrrs +Allows to set the PCIe maximum read request size. +Allowed values are -1 for Auto, 0 for 128B, 1 for 256B, 2 for 512B, +and 3 for 1kB. +The default value is -1. +.El +.Sh SEE ALSO +.Xr altq 4 , +.Xr arp 4 , +.Xr netintro 4 , +.Xr ng_ether 4 , +.Xr vlan 4 , +.Xr ifconfig 8 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 9.0 . +.Sh AUTHORS +The +.Nm +driver was written by +.An Gary Zambrano Aq zambrano@broadcom.com +and +.An David Christensen Aq davidch@broadcom.com . -- cgit v1.1 From 31577c974349e71766902ec165bf02f12c744838 Mon Sep 17 00:00:00 2001 From: wblock Date: Wed, 27 Jun 2012 17:51:09 +0000 Subject: Point out that /usr/src, /usr/doc, and /usr/ports may be empty or not exist until populated with csup(1) or svn(1). PR: 169487 Submitted by: Moritz Wilhelmy MFC after: 1 day --- share/man/man7/build.7 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index f168958..336293f 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 29, 2011 +.Dd June 27, 2012 .Dt BUILD 7 .Os .Sh NAME @@ -39,6 +39,10 @@ normally .Pa /usr/doc , and .Pa /usr/ports . +These directories may be initially empty or non-existent until updated with +.Xr csup 1 +or +.Xr svn 1 . Directory .Pa /usr/src contains the @@ -489,7 +493,7 @@ on built objects. .It Va NO_SHARE If set, the build does not descend into the .Pa /usr/src/share -subdirectory (i.e. manpages, locale data files, timezone data files and +subdirectory (i.e., manpages, locale data files, timezone data files and other .Pa /usr/src/share files will not be rebuild from their sources). @@ -594,8 +598,10 @@ make TARGET=sparc64 DESTDIR=/clients/sparc64 installworld .Ed .Sh SEE ALSO .Xr cc 1 , +.Xr csup 1 , .Xr install 1 , .Xr make 1 , +.Xr svn 1 , .Xr make.conf 5 , .Xr src.conf 5 , .Xr ports 7 , -- cgit v1.1 From 7bc53c92906a53f65f66dc73a0528711c22132ef Mon Sep 17 00:00:00 2001 From: gjb Date: Wed, 27 Jun 2012 23:58:52 +0000 Subject: Add my entry to committers-ports.dot. --- share/misc/committers-ports.dot | 3 +++ 1 file changed, 3 insertions(+) (limited to 'share') diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 1dadc10..15c1cd6 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -93,6 +93,7 @@ gabor [label="Gabor Kovesdan\ngabor@FreeBSD.org\n2006/12/05"] gahr [label="Pietro Cerutti\ngahr@FreeBSD.org\n2008/02/20"] garga [label="Renato Botelho\ngarga@FreeBSD.org\n2005/07/11"] gerald [label="Gerald Pfeifer\ngerald@FreeBSD.org\n2002/04/03"] +gjb [label="Glen Barber\ngjb@FreeBSD.org\n2012/06/19"] glarkin [label="Greg Larkin\nglarkin@FreeBSD.org\n2008/07/17"] glewis [label="Greg Lewis\nglewis@FreeBSD.org\n2002/04/08"] hq [label="Herve Quiroz\nhq@FreeBSD.org\n2004/08/05"] @@ -245,6 +246,7 @@ clement -> lawrance clsung -> lwhsu clsung -> tabthorpe +crees -> gjb crees -> jgh crees -> madpilot @@ -260,6 +262,7 @@ delphij -> rafan demon -> mat eadler -> ak +eadler -> gjb eadler -> tj edwin -> cperciva -- cgit v1.1 From bcd8f83b8d5b6bb00dacd2b07faf79879cc54293 Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 28 Jun 2012 00:03:37 +0000 Subject: Update organization.dot to reflect current doceng@. While here, sort line by last name. --- share/misc/organization.dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/misc/organization.dot b/share/misc/organization.dot index 891097d..91f2a07 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -28,7 +28,7 @@ _misc [label="Miscellaneous Hats"] core [label="Core Team\ncore@FreeBSD.org\nwilko, brooks, keramida, imp,\ngnn, wes, hrs, murray,\nrwatson"] coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\njoel"] doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] -doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\nnik, blackend, hrs,\nkeramida"] +doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor,\nhrs"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nmarcus, kris, erwin,\nlinimon, pav, krion"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nerwin"] -- cgit v1.1 From 4a0ef8746215d1c22d138ea51403a9ebd4283947 Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 28 Jun 2012 00:17:45 +0000 Subject: Remove a '\n' that crept in accidentally. --- share/misc/organization.dot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/misc/organization.dot b/share/misc/organization.dot index 91f2a07..372e78c 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -28,7 +28,7 @@ _misc [label="Miscellaneous Hats"] core [label="Core Team\ncore@FreeBSD.org\nwilko, brooks, keramida, imp,\ngnn, wes, hrs, murray,\nrwatson"] coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\njoel"] doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] -doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor,\nhrs"] +doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nmarcus, kris, erwin,\nlinimon, pav, krion"] portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nerwin"] -- cgit v1.1 From 42cfd3d28dbb736d2aec3a010a9f5caeee3fd03e Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 28 Jun 2012 03:27:35 +0000 Subject: Update entries in organization.dot for the following groups: coresecretary, portmgr, portmgrsecretary, secteam Sort entries by last name. Note: core is left as-is intentionally for now. Submitted by: bcr, rpaulo --- share/misc/organization.dot | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'share') diff --git a/share/misc/organization.dot b/share/misc/organization.dot index 372e78c..7931359 100644 --- a/share/misc/organization.dot +++ b/share/misc/organization.dot @@ -26,12 +26,12 @@ _misc [label="Miscellaneous Hats"] # Development teams go here alphabetically sorted core [label="Core Team\ncore@FreeBSD.org\nwilko, brooks, keramida, imp,\ngnn, wes, hrs, murray,\nrwatson"] -coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\njoel"] +coresecretary [label="Core Team Secretary\ncore-secretary@FreeBSD.org\ngavin"] doccommitters [label="Doc/www Committers\ndoc-committers@FreeBSD.org"] doceng [label="Documentation Engineering Team\ndoceng@FreeBSD.org\ngjb, blackend,\ngabor, hrs"] portscommitters [label="Ports Committers\nports-committers@FreeBSD.org"] -portmgr [label="Port Management Team\nportmgr@FreeBSD.org\nmarcus, kris, erwin,\nlinimon, pav, krion"] -portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\nerwin"] +portmgr [label="Port Management Team\nportmgr@FreeBSD.org\ntabthorpe, marcus, bapt, beat,\nerwin, linimon, pav,\nitetcu, flz, miwi"] +portmgrsecretary [label="Port Management Team Secretary\nportmgr-secretary@FreeBSD.org\ntabthorpe"] re [label="Primary Release Engineering Team\nre@FreeBSD.org\nmux, bmah, hrs, kensmith,\nmurray, rwatson, dwhite"] realpha [label="FreeBSD/alpha Release Engineering Team\nre-alpha@FreeBSD.org\nwilko, murray, rwatson"] reamd64 [label="FreeBSD/amd64 Release Engineering Team\nre-amd64@FreeBSD.org\nobrien"] @@ -40,7 +40,7 @@ reia64 [label="FreeBSD/ia64 Release Engineering Team\nre-ia64@FreeBSD.org\nmarce repc98 [label="FreeBSD/pc98 Release Engineering Team\nre-pc98@FreeBSD.org\nnyan"] reppc [label="FreeBSD/ppc Release Engineering Team\nre-ppc@FreeBSD.org\ngrehan"] resparc64 [label="FreeBSD/sparc64 Release Engineering Team\nre-sparc64@FreeBSD.org\njake, phk, tmm, obrien,\nkensmith, murray, rwatson"] -secteam [label="Security Team\nsecteam@FreeBSD.org\nmnag, remko, gnn, simon, philip,\ncperciva, csjp, des,\nnectar, rwatson"] +secteam [label="Security Team\nsecteam@FreeBSD.org\nsimon, qingli, delphij,\nremko, philip, stas, cperciva,\ncsjp, rwatson, miwi, bz"] secteamsecretary [label="Security Team Secretary\nsecteam-secretary@FreeBSD.org\nremko"] securityofficer [label="Security Officer Team\nsecurity-officer@FreeBSD.org\ncperciva, simon, nectar"] srccommitters [label="Src Committers\nsrc-committers@FreeBSD.org"] -- cgit v1.1 From 9acfdeb85517cbad2f81c3cd563451edfbdd9b24 Mon Sep 17 00:00:00 2001 From: rpaulo Date: Thu, 28 Jun 2012 03:30:17 +0000 Subject: Add the 'inet' keyword after the nat rule to avoid interfering with IPv6. --- share/examples/pf/faq-example1 | 2 +- share/examples/pf/pf.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'share') diff --git a/share/examples/pf/faq-example1 b/share/examples/pf/faq-example1 index 91942f6..e9b240f 100644 --- a/share/examples/pf/faq-example1 +++ b/share/examples/pf/faq-example1 @@ -26,7 +26,7 @@ set skip on lo scrub in # nat/rdr -nat on $ext_if from !($ext_if) -> ($ext_if:0) +nat on $ext_if inet from !($ext_if) -> ($ext_if:0) nat-anchor "ftp-proxy/*" rdr-anchor "ftp-proxy/*" diff --git a/share/examples/pf/pf.conf b/share/examples/pf/pf.conf index 299999d..d97b4ed 100644 --- a/share/examples/pf/pf.conf +++ b/share/examples/pf/pf.conf @@ -16,7 +16,7 @@ #nat-anchor "ftp-proxy/*" #rdr-anchor "ftp-proxy/*" -#nat on $ext_if from !($ext_if) -> ($ext_if:0) +#nat on $ext_if inet from !($ext_if) -> ($ext_if:0) #rdr pass on $int_if proto tcp to port ftp -> 127.0.0.1 port 8021 #no rdr on $ext_if proto tcp from to any port smtp #rdr pass on $ext_if proto tcp from any to any port smtp \ -- cgit v1.1 From 2a917ad8c7866f6ebdc57afc89f99a70fc00e9e2 Mon Sep 17 00:00:00 2001 From: brueffer Date: Sat, 30 Jun 2012 13:17:21 +0000 Subject: mps(4) is endian safe as of r237683. --- share/man/man4/mps.4 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'share') diff --git a/share/man/man4/mps.4 b/share/man/man4/mps.4 index dfae791..2fbb669 100644 --- a/share/man/man4/mps.4 +++ b/share/man/man4/mps.4 @@ -34,7 +34,7 @@ .\" $Id: //depot/SpectraBSD/head/share/man/man4/mps.4#6 $ .\" $FreeBSD$ .\" -.Dd February 7, 2012 +.Dd June 30, 2012 .Dt MPS 4 .Os .Sh NAME @@ -205,9 +205,6 @@ This man page was written by This driver has a couple of known shortcomings: .Bl -bullet -compact .It -Not endian safe. -It only works on little endian machines (e.g. amd64 and i386). -.It No userland utility available (e.g. .Xr mptutil 8 ) . .It -- cgit v1.1 From bb1f9519b8c9bae4f52db506a7e561f16ee3124c Mon Sep 17 00:00:00 2001 From: schweikh Date: Sun, 1 Jul 2012 19:40:51 +0000 Subject: Correct a grammo. --- share/man/man9/cd.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/cd.9 b/share/man/man9/cd.9 index 59f796d..f5b748b 100644 --- a/share/man/man9/cd.9 +++ b/share/man/man9/cd.9 @@ -57,7 +57,7 @@ This can lead to drives requiring special handling in the driver. The following is a list of quirks that the driver recognize. .Bl -tag -width CD_Q_BCD_TRACKS .It Dv CD_Q_NO_TOUCH -This flag tell the driver not to probe the drive at attach time to see if +This flag tells the driver not to probe the drive at attach time to see if there is a disk in the drive and find out what size it is. This flag is currently unimplemented in the CAM .Nm -- cgit v1.1 From 1610fb0c2211a2f50ea9745c7fb9c38e937ce92a Mon Sep 17 00:00:00 2001 From: mav Date: Mon, 2 Jul 2012 08:31:29 +0000 Subject: Add acpi_asus_wmi(4) -- driver for random extras found on WMI-compatible Asus laptops. It is alike to acpi_asus(4), but uses WMI interface instead of separate ACPI device. On Asus EeePC T101MT netbook it allows to handle hotkeys and on/off WLAN, Bluetooth, LCD backlight, camera, cardreader and touchpad. On Asus UX31A ultrabook it allows to handle hotkeys, on/off WLAN, Bluetooth, Wireless LED, control keyboard backlight brightness, monitor temperature and fan speed. LCD brightness control doesn't work now for unknown reason, possibly requiring some video card initialization. Sponsored by: iXsystems, Inc. --- share/man/man4/Makefile | 2 + share/man/man4/acpi_asus.4 | 1 + share/man/man4/acpi_asus_wmi.4 | 90 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+) create mode 100644 share/man/man4/acpi_asus_wmi.4 (limited to 'share') diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index e5a2f4c..972200d 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -4,6 +4,7 @@ MAN= aac.4 \ acpi.4 \ ${_acpi_asus.4} \ + ${_acpi_asus_wmi.4} \ ${_acpi_dock.4} \ ${_acpi_fujitsu.4} \ ${_acpi_hp.4} \ @@ -698,6 +699,7 @@ MLINKS+=zyd.4 if_zyd.4 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" _acpi_asus.4= acpi_asus.4 +_acpi_asus_wmi.4= acpi_asus_wmi.4 _acpi_dock.4= acpi_dock.4 _acpi_fujitsu.4=acpi_fujitsu.4 _acpi_hp.4= acpi_hp.4 diff --git a/share/man/man4/acpi_asus.4 b/share/man/man4/acpi_asus.4 index f3b99da..1921adc 100644 --- a/share/man/man4/acpi_asus.4 +++ b/share/man/man4/acpi_asus.4 @@ -157,6 +157,7 @@ Defaults for these variables can be set in which is parsed at boot-time. .Sh SEE ALSO .Xr acpi 4 , +.Xr acpi_asus_wmi 4 , .Xr acpi_video 4 , .Xr sysctl.conf 5 , .Xr sysctl 8 diff --git a/share/man/man4/acpi_asus_wmi.4 b/share/man/man4/acpi_asus_wmi.4 new file mode 100644 index 0000000..bbc565f --- /dev/null +++ b/share/man/man4/acpi_asus_wmi.4 @@ -0,0 +1,90 @@ +.\" +.\" Copyright (c) 2012 Alexander Motin +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd July 2, 2012 +.Dt ACPI_ASUS_WMI 4 +.Os +.Sh NAME +.Nm acpi_asus_wmi +.Nd Asus Laptop WMI Extras +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device acpi_asus_wmi" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +acpi_asus_wmi_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides support for the extra WMI-controlled gadgets, such as hotkeys +and leds, found on Asus laptops. +It allows one to use the +.Xr sysctl 8 +interface to manipulate the brightness of the LCD panel and keyboard backlight, +power on/off different internal components, such as WiFi, Bluetooth, camera, +cardreader, etc, read some sensors. +Hotkey events are passed to +.Xr devd 8 +for easy handling in userspace with the default configuration in +.Pa /etc/devd/asus.conf . +Some hotkey events, such as keyboard backlight and touchpad control, are +handled inside the driver. +.Sh SYSCTL VARIABLES +The following sysctls are currently implemented: +.Bl -tag -width indent +.It Va dev.acpi_asus_wmi.0.handle_keys +Specifies whether driver should handle some harwdare keys, such as keyboard +backlight, internally. +.El +.Pp +Number of other variables under the same sysctl branch are model-specific. +.Pp +Defaults for these variables can be set in +.Xr sysctl.conf 5 , +which is parsed at boot-time. +.Sh SEE ALSO +.Xr acpi 4 , +.Xr acpi_asus 4 , +.Xr acpi_video 4 , +.Xr sysctl.conf 5 , +.Xr devd 8 , +.Xr sysctl 8 +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 10.0 . +.Sh AUTHORS +.An Alexander Motib Aq mav@FreeBSD.org . -- cgit v1.1 From 3f3c1fe7994be9e120a47e66493321d19d8a8596 Mon Sep 17 00:00:00 2001 From: mav Date: Mon, 2 Jul 2012 08:41:22 +0000 Subject: Fix typo in r237981. --- share/man/man4/acpi_asus_wmi.4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/acpi_asus_wmi.4 b/share/man/man4/acpi_asus_wmi.4 index bbc565f..129894b 100644 --- a/share/man/man4/acpi_asus_wmi.4 +++ b/share/man/man4/acpi_asus_wmi.4 @@ -87,4 +87,4 @@ The driver first appeared in .Fx 10.0 . .Sh AUTHORS -.An Alexander Motib Aq mav@FreeBSD.org . +.An Alexander Motin Aq mav@FreeBSD.org . -- cgit v1.1 From 4903f907c5790f949f6fe7676e68d3ac97943930 Mon Sep 17 00:00:00 2001 From: wblock Date: Mon, 2 Jul 2012 17:52:43 +0000 Subject: Add reference to portsnap(8). Submitted by: Tim Kientzle MFC after: 1 day --- share/man/man7/build.7 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/man/man7/build.7 b/share/man/man7/build.7 index 336293f..7cd8d91 100644 --- a/share/man/man7/build.7 +++ b/share/man/man7/build.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 27, 2012 +.Dd July 2, 2012 .Dt BUILD 7 .Os .Sh NAME @@ -40,9 +40,10 @@ normally and .Pa /usr/ports . These directories may be initially empty or non-existent until updated with -.Xr csup 1 +.Xr csup 1 , +.Xr svn 1 , or -.Xr svn 1 . +.Xr portsnap 8 . Directory .Pa /usr/src contains the @@ -608,6 +609,7 @@ make TARGET=sparc64 DESTDIR=/clients/sparc64 installworld .Xr release 7 , .Xr config 8 , .Xr mergemaster 8 , +.Xr portsnap 8 , .Xr reboot 8 , .Xr shutdown 8 .Sh AUTHORS -- cgit v1.1 From 318570688db0959de1066a50ce33e9893523c078 Mon Sep 17 00:00:00 2001 From: glebius Date: Mon, 2 Jul 2012 18:04:31 +0000 Subject: Fix build after r237997. --- share/mk/bsd.own.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'share') diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index aadd492..ba4a896 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -385,6 +385,7 @@ __DEFAULT_YES_OPTIONS = \ OPENSSL \ PAM \ PF \ + PKGBOOTSTRAP \ PKGTOOLS \ PMC \ PORTSNAP \ -- cgit v1.1 From 5fa1af1fc55a6ca425cafe7ba67da3a9fad646dc Mon Sep 17 00:00:00 2001 From: marcel Date: Mon, 2 Jul 2012 20:28:12 +0000 Subject: Added options: WITH_INSTALL_AS_USER WITHOUT_PKGBOOTSTRAP --- share/man/man5/src.conf.5 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5 index 46210e0..789f6cf 100644 --- a/share/man/man5/src.conf.5 +++ b/share/man/man5/src.conf.5 @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 236279 2012-05-30 02:37:20Z gjb .\" $FreeBSD$ -.Dd June 27, 2012 +.Dd July 2, 2012 .Dt SRC.CONF 5 .Os .Sh NAME @@ -514,6 +514,16 @@ Set this if you do not want to install optional libraries. For example when creating a .Xr nanobsd 8 image. +.It Va WITH_INSTALL_AS_USER +.\" from FreeBSD: head/tools/build/options/WITH_INSTALL_AS_USER 238021 2012-07-02 20:24:01Z marcel +Set to make install targets succeed for non-root users by installing +files with owner and group attributes set to that of the user running +the +.Xr make 1 +command. +The user still has to set the +.Va DESTDIR +variable to point to a directory where the user has write permissions. .It Va WITHOUT_IPFILTER .\" from FreeBSD: head/tools/build/options/WITHOUT_IPFILTER 156932 2006-03-21 07:50:50Z ru Set to not build IP Filter package. @@ -839,6 +849,11 @@ When set, it also enforces the following options: .It .Va WITHOUT_AUTHPF .El +.It Va WITHOUT_PKGBOOTSTRAP +.\" from FreeBSD: head/tools/build/options/WITHOUT_PKGBOOTSTRAP 238023 2012-07-02 20:26:11Z marcel +Set to not build +.Xr pkg 1 +bootstrap tool .It Va WITHOUT_PKGTOOLS .\" from FreeBSD: head/tools/build/options/WITHOUT_PKGTOOLS 183242 2008-09-21 22:02:26Z sam Set to not build -- cgit v1.1 From ebe19c57a10b0f8b20c615743f6cb3f0ffae428e Mon Sep 17 00:00:00 2001 From: zeising Date: Tue, 3 Jul 2012 07:28:57 +0000 Subject: Add myself to commiters-[doc,ports].dot and calendar.freebsd Approved by: joel (doc/www mentor) kwm (ports mentor) --- share/misc/committers-doc.dot | 3 +++ share/misc/committers-ports.dot | 3 +++ 2 files changed, 6 insertions(+) (limited to 'share') diff --git a/share/misc/committers-doc.dot b/share/misc/committers-doc.dot index 5631ed4..f3f43e3 100644 --- a/share/misc/committers-doc.dot +++ b/share/misc/committers-doc.dot @@ -82,6 +82,7 @@ simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2003/07/20"] taras [label="Taras Korenko\ntaras@FreeBSD.org\n2010/06/25"] trhodes [label="Tom Rhodes\ntrhodes@FreeBSD.org\n2002/03/25"] wblock [label="Warren Block\nwblock@FreeBSD.org\n2011/09/12"] +zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03"] # Here are the mentor/mentee relationships. # Group together all the mentees for a particular mentor. @@ -123,6 +124,8 @@ jkois -> bcr jkois -> gavin jkois -> gjb +joel -> zeising + keramida -> blackend keramida -> danger keramida -> gabor diff --git a/share/misc/committers-ports.dot b/share/misc/committers-ports.dot index 15c1cd6..5b4819d 100644 --- a/share/misc/committers-ports.dot +++ b/share/misc/committers-ports.dot @@ -198,6 +198,7 @@ wen [label="Wen Heping\nwen@FreeBSD.org\n2010/12/13"] wxs [label="Wesley Shields\nwxs@FreeBSD.org\n2008/01/03"] xride [label="Soeren Straarup\nxride@FreeBSD.org\n2006/09/27"] yzlin [label="Yi-Jheng Lin\nyzlin@FreeBSD.org\n2009/07/19"] +zeising [label="Niclas Zeising\nzeising@FreeBSD.org\n2012/07/03"] zi [label="Ryan Steinmetz\nzi@FreeBSD.org\n2011/07/14"] znerd [label="Ernst de Haan\nznerd@FreeBSD.org\n2001/11/15"] @@ -345,6 +346,7 @@ krion -> sem krion -> sergei kwm -> jsa +kwm -> zeising lawrance -> itetcu @@ -393,6 +395,7 @@ miwi -> sylvio miwi -> tabthorpe miwi -> trasz miwi -> wen +miwi -> zeising mnag -> jmelo -- cgit v1.1 From e5f970ed4ae0b5e770b2a67c389d8eb77ec82993 Mon Sep 17 00:00:00 2001 From: glebius Date: Wed, 4 Jul 2012 07:42:12 +0000 Subject: Document RO_RTFREE() macro. --- share/man/man9/rtalloc.9 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man9/rtalloc.9 b/share/man/man9/rtalloc.9 index ab5379a..ea22f87 100644 --- a/share/man/man9/rtalloc.9 +++ b/share/man/man9/rtalloc.9 @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 14, 2011 +.Dd July 4, 2012 .Dt RTALLOC 9 .Os .Sh NAME @@ -52,6 +52,7 @@ .Fn RT_UNLOCK "struct rt_entry *rt" .Fn RT_ADDREF "struct rt_entry *rt" .Fn RT_REMREF "struct rt_entry *rt" +.Fn RO_RTFREE "struct route *ro" .Ft void .Fn rtfree "struct rt_entry *rt" .Ft "struct rtentry *" @@ -203,6 +204,14 @@ Its usage is contrary to .Fn RT_ADDREF . .Pp The +.Fn RO_RTFREE +macro is used to free route entry that is referenced by struct route. +At certain circumstances the latter may not hold a reference on rtentry, +and +.Fn RO_RTFREE +treats such routes correctly. +.Pp +The .Fn rtfree function does the actual free of the routing table entry, and shouldn't be called directly by facilities, that just perform routing table lookups. -- cgit v1.1 From bbedc7a050160822ef7ff02f25330c68abcd2a00 Mon Sep 17 00:00:00 2001 From: eadler Date: Sat, 7 Jul 2012 17:35:34 +0000 Subject: Add a description of the Spanish Dvorak keymap added in r235251 PR: conf/160235 Submitted by: gavin Approved by: cperciva MFC after: 3 days --- share/syscons/keymaps/INDEX.keymaps | 2 ++ 1 file changed, 2 insertions(+) (limited to 'share') diff --git a/share/syscons/keymaps/INDEX.keymaps b/share/syscons/keymaps/INDEX.keymaps index 95681f4..04b4fa2 100644 --- a/share/syscons/keymaps/INDEX.keymaps +++ b/share/syscons/keymaps/INDEX.keymaps @@ -378,6 +378,8 @@ ru.koi8-r.win.kbd:pt:Russo koi8-r (winkeys) ru.koi8-r.win.kbd:es:Ruso koi8-r (winkeys) ru.koi8-r.win.kbd:uk:Рос╕йська koi8-r (winkeys) +spanish.dvorak.kbd:en:Spanish Dvorak + spanish.iso.kbd:en:Spanish ISO-8859-1 spanish.iso.kbd:de:Spanisch ISO-8859-1 spanish.iso.kbd:fr:Espagnol ISO-8859-1 -- cgit v1.1 From cb3a689918dad80b6225eea8a48a1586db9baa1a Mon Sep 17 00:00:00 2001 From: hrs Date: Mon, 9 Jul 2012 06:34:15 +0000 Subject: - Add support of the following USB devices to run(4): * Logitec LAN-W150N/U2 * Buffalo WLI-UC-GNM2 - Add device id of Planex GW-USValue-EZ. --- share/man/man4/run.4 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man4/run.4 b/share/man/man4/run.4 index 3640dc8..3aeb3db 100644 --- a/share/man/man4/run.4 +++ b/share/man/man4/run.4 @@ -16,7 +16,7 @@ .\" .\" $FreeBSD$ .\" -.Dd June 7, 2012 +.Dd July 9, 2012 .Dt RUN 4 .Os .Sh NAME @@ -122,6 +122,8 @@ driver supports the following wireless adapters: .It Buffalo WLI-UC-G300N .It Buffalo WLI-UC-G301N .It Buffalo WLI-UC-GN +.It Buffalo WLI-UC-GNM +.It Buffalo WLI-UC-GNM2 .It Corega CG-WLUSB2GNL .It Corega CG-WLUSB2GNR .It Corega CG-WLUSB300AGN @@ -142,6 +144,7 @@ driver supports the following wireless adapters: .It Hercules HWNU-300 .It Linksys WUSB54GC v3 .It Linksys WUSB600N +.It Logitec LAN-W150N/U2 .It Mvix Nubbin MS-811N .It Planex GW-USMicroN .It Planex GW-US300MiniS -- cgit v1.1 From 9a711a67d4aa86f9a25f182702a0f82bc85a7859 Mon Sep 17 00:00:00 2001 From: hrs Date: Mon, 9 Jul 2012 07:16:19 +0000 Subject: Make ipfw0 logging pseudo-interface clonable. It can be created automatically by $firewall_logif rc.conf(5) variable at boot time or manually by ifconfig(8) after a boot. Discussed on: freebsd-ipfw@ --- share/man/man5/rc.conf.5 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 1802fca..02e1cb6 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 6, 2012 +.Dd July 9, 2012 .Dt RC.CONF 5 .Os .Sh NAME @@ -501,6 +501,16 @@ to enable firewall event logging. This is equivalent to the .Dv IPFIREWALL_VERBOSE kernel option. +.It Va firewall_logif +.Pq Vt bool +Set to +.Dq Li YES +to create pseudo interface +.Li ipfw0 +for logging. +For more details, see +.Xr ipfw 8 +manual page. .It Va firewall_flags .Pq Vt str Flags passed to -- cgit v1.1