Index: stable/11/usr.bin/cpuset/cpuset.1
===================================================================
--- stable/11/usr.bin/cpuset/cpuset.1	(revision 332617)
+++ stable/11/usr.bin/cpuset/cpuset.1	(revision 332618)
@@ -1,197 +1,198 @@
 .\" Copyright (c) 2008 Christian Brueffer
 .\" Copyright (c) 2008 Jeffrey Roberson
 .\" 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 August 1, 2016
+.Dd February 26, 2018
 .Dt CPUSET 1
 .Os
 .Sh NAME
 .Nm cpuset
 .Nd "configure processor sets"
 .Sh SYNOPSIS
 .Nm
 .Op Fl l Ar cpu-list
 .Op Fl s Ar setid
 .Ar cmd ...
 .Nm
 .Op Fl l Ar cpu-list
 .Op Fl s Ar setid
 .Fl p Ar pid
 .Nm
 .Op Fl c
 .Op Fl l Ar cpu-list
 .Fl C
 .Fl p Ar pid
 .Nm
 .Op Fl c
 .Op Fl l Ar cpu-list
 .Op Fl j Ar jailid | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq
 .Nm
 .Fl g
 .Op Fl cir
 .Op Fl d Ar domain | Fl j Ar jailid | Fl p Ar pid | Fl t Ar tid | Fl s Ar setid | Fl x Ar irq
 .Sh DESCRIPTION
 The
 .Nm
 command can be used to assign processor sets to processes, run commands
 constrained to a given set or list of processors, and query information
 about processor binding, sets, and available processors in the system.
 .Pp
 .Nm
 requires a target to modify or query.
 The target may be specified as a command, process id, thread id, a
 cpuset id, an irq, a jail id, or a NUMA domain.
 Using
 .Fl g
 the target's set id or mask may be queried.
 Using
 .Fl l
 or
 .Fl s
 the target's CPU mask or set id may be set.
 If no target is specified,
 .Nm
 operates on itself.
 Not all combinations of operations and targets are supported.
 For example,
 you may not set the id of an existing set or query and launch a command
 at the same time.
 .Pp
 There are two sets applicable to each process and one private mask per thread.
 Every process in the system belongs to a cpuset.
 By default processes are started in set 1.
 The mask or id may be queried using
 .Fl c .
 Each thread also has a private mask of CPUs it is allowed to run
 on that must be a subset of the assigned set.
 And finally, there is a root set, numbered 0, that is immutable.
 This last set is the list of all possible CPUs in the system and is
 queried using
 .Fl r .
 .Pp
 When running a command it may join a set specified with
 .Fl s
 otherwise a new set is created.
 In addition, a mask for the command may be specified using
 .Fl l .
 When used in conjunction with
 .Fl c
 the mask modifies the supplied or created set rather than the private mask
 for the thread.
 .Pp
 The options are as follows:
 .Bl -tag -width ".Fl l Ar cpu-list"
 .It Fl C
 Create a new cpuset and assign the target process to that set.
 .It Fl c
 The requested operation should reference the cpuset available via the
 target specifier.
 .It Fl d Ar domain
 Specifies a NUMA domain id as the target of the operation.
 .It Fl g
 Causes
 .Nm
 to print either a list of valid CPUs or, using
 .Fl i ,
 the id of the target.
 .It Fl i
 When used with the
 .Fl g
 option print the id rather than the valid mask of the target.
 .It Fl j Ar jailid
 Specifies a jail id as the target of the operation.
 .It Fl l Ar cpu-list
 Specifies a list of CPUs to apply to a target.
 Specification may include
 numbers separated by '-' for ranges and commas separating individual numbers.
 A special list of
 .Dq all
 may be specified in which case the list includes all CPUs from the root set.
 .It Fl p Ar pid
 Specifies a pid as the target of the operation.
 .It Fl s Ar setid
 Specifies a set id as the target of the operation.
 .It Fl r
 The requested operation should reference the root set available via the
 target specifier.
 .It Fl t Ar tid
 Specifies a thread id as the target of the operation.
 .It Fl x Ar irq
 Specifies an irq as the target of the operation.
 .El
 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
 Create a new group with CPUs 0-4 inclusive and run
 .Pa /bin/sh
 on it:
 .Dl cpuset -c -l 0-4 /bin/sh
 .Pp
 Query the mask of CPUs the
 .Aq sh pid
 is allowed to run on:
 .Dl cpuset -g -p <sh pid>
 .Pp
 Restrict
 .Pa /bin/sh
 to run on CPUs 0 and 2 while its group is still allowed to run on
 CPUs 0-4:
 .Dl cpuset -l 0,2 -p <sh pid>
 .Pp
 Modify the cpuset
 .Pa /bin/sh
 belongs to restricting it to CPUs 0 and 2:
 .Dl cpuset -l 0,2 -c -p <sh pid>
 .Pp
 Modify the cpuset all threads are in by default to contain only
 the first 4 CPUs, leaving the rest idle:
 .Dl cpuset -l 0-3 -s 1
 .Pp
 Print the id of the cpuset
 .Pa /bin/sh
 is in:
 .Dl cpuset -g -i -p <sh pid>
 .Pp
 Move the
 .Ar pid
 into the specified cpuset
 .Ar setid
 so it may be managed with other pids in that set:
 .Dl cpuset -s <setid> -p <pid>
 .Pp
 Create a new cpuset that is restricted to CPUs 0 and 2 and move
 .Ar pid
 into the new set:
 .Dl cpuset -C -c -l 0,2 -p <pid>
 .Sh SEE ALSO
-.Xr cpuset 2
+.Xr cpuset 2 ,
+.Xr rctl 8
 .Sh HISTORY
 The
 .Nm
 command first appeared in
 .Fx 7.1 .
 .Sh AUTHORS
 .An Jeffrey Roberson Aq Mt jeff@FreeBSD.org
Index: stable/11/usr.bin/rctl/rctl.8
===================================================================
--- stable/11/usr.bin/rctl/rctl.8	(revision 332617)
+++ stable/11/usr.bin/rctl/rctl.8	(revision 332618)
@@ -1,300 +1,301 @@
 .\"-
 .\" Copyright (c) 2009 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 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 THE VOICES IN HIS HEAD 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 28, 2017
+.Dd February 26, 2018
 .Dt RCTL 8
 .Os
 .Sh NAME
 .Nm rctl
 .Nd display and update resource limits database
 .Sh SYNOPSIS
 .Nm
 .Op Fl h
 .Op Fl n
 .Op Ar filter Ar ...
 .Nm
 .Fl a
 .Ar rule Ar ...
 .Nm
 .Fl l
 .Op Fl h
 .Op Fl n
 .Ar filter Ar ...
 .Nm
 .Fl r
 .Ar filter Ar ...
 .Nm
 .Fl u
 .Op Fl h
 .Ar filter Ar ...
 .Sh DESCRIPTION
 When called without options, the
 .Nm
 command writes currently defined RCTL rules to standard output.
 .Pp
 If a
 .Ar filter
 argument is specified, only rules matching the filter are displayed.
 The options are as follows:
 .Bl -tag -width indent
 .It Fl a Ar rule
 Add
 .Ar rule
 to the RCTL database.
 .It Fl l Ar filter
 Display rules applicable to the process defined by
 .Ar filter .
 Note that this is different from showing the rules when called without
 any options, as it shows not just the rules with subject equal to that
 of process, but also rules for the user, jail, and login class applicable
 to the process.
 .It Fl r Ar filter
 Remove rules matching
 .Ar filter
 from the RCTL database.
 .It Fl u Ar filter
 Display resource utilization for a subject
 .Po
 .Sy process ,
 .Sy user ,
 .Sy loginclass
 or
 .Sy jail
 .Pc
 matching the
 .Ar filter .
 .It Fl h
 "Human-readable" output.
 Use unit suffixes: Byte, Kilobyte, Megabyte,
 Gigabyte, Terabyte and Petabyte.
 .It Fl n
 Display user IDs numerically rather than converting them to a user name.
 .El
 .Pp
 Modifying rules affects all currently running and future processes matching
 the rule.
 .Sh RULE SYNTAX
 Syntax for a rule is subject:subject-id:resource:action=amount/per.
 .Pp
 .Bl -tag -width "subject-id" -compact -offset indent
 .It subject
 defines the kind of entity the rule applies to.
 It can be either
 .Sy process ,
 .Sy user ,
 .Sy loginclass ,
 or
 .Sy jail .
 .It subject-id
 identifies the
 .Em subject .
 It can be a process ID, user name, numerical user ID, login class name from
 .Xr login.conf 5 ,
 or jail name.
 .It resource
 identifies the resource the rule controls.
 See the
 .Sx RESOURCES
 section below for details.
 .It action
 defines what will happen when a process exceeds the allowed
 .Em amount .
 See the
 .Sx ACTIONS
 section below for details.
 .It amount
 defines how much of the resource a process can use before
 the defined
 .Em action
 triggers.
 Resources which limit bytes may use prefixes from
 .Xr expand_number 3 .
 .It per
 defines what entity the
 .Em amount
 gets accounted for.
 For example, rule "loginclass:users:vmem:deny=100M/process" means
 that each process of any user belonging to login class "users" may allocate
 up to 100MB of virtual memory.
 Rule "loginclass:users:vmem:deny=100M/user" would mean that for each
 user belonging to the login class "users", the sum of virtual memory allocated
 by all the processes of that user will not exceed 100MB.
 Rule "loginclass:users:vmem:deny=100M/loginclass" would mean that the sum of
 virtual memory allocated by all processes of all users belonging to that login
 class will not exceed 100MB.
 .El
 .Pp
 A valid rule has all those fields specified, except for
 .Em per ,
 which defaults
 to the value of
 .Em subject .
 .Pp
 A filter is a rule for which one of more fields other than
 .Em per
 is left empty.
 For example, a filter that matches every rule could be written as ":::=/",
 or, in short, ":".
 A filter that matches all the login classes would be "loginclass:".
 A filter that matches all defined rules for
 .Sy maxproc
 resource would be
 "::maxproc".
 .Sh SUBJECTS
 .Bl -column -offset 3n "pseudoterminals" ".Sy username or numerical User ID"
 .It Sy process Ta numerical Process ID
 .It Sy user Ta user name or numerical User ID
 .It Sy loginclass Ta login class from
 .Xr login.conf 5
 .It Sy jail Ta jail name
 .El
 .Sh RESOURCES
 .Bl -column -offset 3n "pseudoterminals"
 .It Sy cputime Ta "CPU time, in seconds"
 .It Sy datasize Ta "data size, in bytes"
 .It Sy stacksize Ta "stack size, in bytes"
 .It Sy coredumpsize Ta "core dump size, in bytes"
 .It Sy memoryuse Ta "resident set size, in bytes"
 .It Sy memorylocked Ta "locked memory, in bytes"
 .It Sy maxproc Ta "number of processes"
 .It Sy openfiles Ta "file descriptor table size"
 .It Sy vmemoryuse Ta "address space limit, in bytes"
 .It Sy pseudoterminals Ta "number of PTYs"
 .It Sy swapuse Ta "swap space that may be reserved or used, in bytes"
 .It Sy nthr Ta "number of threads"
 .It Sy msgqqueued Ta "number of queued SysV messages"
 .It Sy msgqsize Ta "SysV message queue size, in bytes"
 .It Sy nmsgq Ta "number of SysV message queues"
 .It Sy nsem Ta "number of SysV semaphores"
 .It Sy nsemop Ta "number of SysV semaphores modified in a single semop(2) call"
 .It Sy nshm Ta "number of SysV shared memory segments"
 .It Sy shmsize Ta "SysV shared memory size, in bytes"
 .It Sy wallclock Ta "wallclock time, in seconds"
 .It Sy pcpu Ta "%CPU, in percents of a single CPU core"
 .It Sy readbps Ta "filesystem reads, in bytes per second"
 .It Sy writebps Ta "filesystem writes, in bytes per second"
 .It Sy readiops Ta "filesystem reads, in operations per second"
 .It Sy writeiops Ta "filesystem writes, in operations per second"
 .El
 .Sh ACTIONS
 .Bl -column -offset 3n "pseudoterminals"
 .It Sy deny Ta deny the allocation; not supported for
 .Sy cputime ,
 .Sy wallclock ,
 .Sy readbps ,
 .Sy writebps ,
 .Sy readiops ,
 and
 .Sy writeiops
 .It Sy log Ta "log a warning to the console"
 .It Sy devctl Ta "send notification to"
 .Xr devd 8
 using
 .Sy system
 = "RCTL",
 .Sy subsystem
 = "rule",
 .Sy type
 = "matched"
 .It sig*	e.g.
 .Sy sigterm ;
 send a signal to the offending process.
 See
 .Xr signal 3
 for a list of supported signals
 .It Sy throttle Ta "slow down process execution"; only supported for
 .Sy readbps ,
 .Sy writebps ,
 .Sy readiops ,
 and
 .Sy writeiops .
 .El
 .Pp
 Not all actions are supported for all resources.
 Attempting to add a rule with an action not supported by a given resource will
 result in error.
 .Sh EXIT STATUS
 .Ex -std
 .Sh EXAMPLES
 Prevent user "joe" from allocating more than 1GB of virtual memory:
 .Dl Nm Fl a Ar user:joe:vmemoryuse:deny=1g
 .Pp
 Remove all RCTL rules:
 .Dl Nm Fl r Ar \&:
 .Pp
 Display resource utilization information for jail named "www":
 .Dl Nm Fl hu Ar jail:www
 .Pp
 Display all the rules applicable to process with PID 512:
 .Dl Nm Fl l Ar process:512
 .Pp
 Display all rules:
 .Dl Nm
 .Pp
 Display all rules matching user "joe":
 .Dl Nm Ar user:joe
 .Pp
 Display all rules matching login classes:
 .Dl Nm Ar loginclass:
 .Sh SEE ALSO
+.Xr cpuset 1 ,
 .Xr rctl 4 ,
 .Xr rctl.conf 5
 .Sh HISTORY
 The
 .Nm
 command appeared in
 .Fx 9.0 .
 .Sh AUTHORS
 .An -nosplit
 The
 .Nm
 was developed by
 .An Edward Tomasz Napierala Aq Mt trasz@FreeBSD.org
 under sponsorship from the FreeBSD Foundation.
 .Sh BUGS
 Limiting
 .Sy memoryuse
 may kill the machine due to thrashing.
 .Pp
 The
 .Sy readiops
 and
 .Sy writeiops
 counters are only approximations.
 Like
 .Sy readbps
 and
 .Sy writebps ,
 they are calculated in the filesystem layer, where it is difficult
 or even impossible to observe actual disk device operations.
 .Pp
 The
 .Sy writebps
 and
 .Sy writeiops
 resources generally account for writes to the filesystem cache,
 not to actual devices.
Index: stable/11
===================================================================
--- stable/11	(revision 332617)
+++ stable/11	(revision 332618)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r330024