Commit Graph

571 Commits

Author SHA1 Message Date
Michael Kerrisk cb42fb5682 proc.5: Add field numbers for /proc/[pid]/statm
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553413

Reported-by: Samuel Thibault <sthibault@debian.org>
Reported-by: Simon Paillard <spaillard@debian.org>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-26 23:47:50 +01:00
Justin Lebar 04dcb3c8f8 proc.5: statm's "shared" field refers to pages backed by files
I noticed that statm's "shared" field doesn't match the sum of
all the "shared" entries in smaps [1].

The kernel docs explain that statm's "shared" field is "number of
pages that are shared (i.e. backed by a file)" [2].  smaps appears
to call a page shared if it's mapped by at least two processes,
which explains this discrepancy.

I'm not a kernel hacker, but it appears to me they do mean "i.e."
and not "e.g." in the statm description: In
fs/proc/task_mmu.c::task_statm, I see

    *shared = get_mm_counter(mm, MM_FILEPAGES);

Here's a patch which updates the man page to match the (hopefully
correct) kernel docs.

[1] https://bugzilla.mozilla.org/show_bug.cgi?id=807181
[2] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux.git;a=blob;f=Documentation/filesystems/proc.txt;h=a1793d670cd01bd374eddf54ffdfc768504291ff;hb=HEAD

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-26 23:47:50 +01:00
Michael Kerrisk 4cb1deb76f proc.5: Minor wording fix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-26 23:47:50 +01:00
Michael Kerrisk e04a1f931d proc.5: srcfix: Update FIXME
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-26 23:47:50 +01:00
Michael Kerrisk d4fd412082 proc.5: Document /proc/stat "cpu" "nice_guest" field
Info taken from commit ce0e7b28fb75cb003cfc8d0238613aaf1c55e797

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-26 23:47:50 +01:00
Michael Kerrisk ea0841f6c2 proc.5: Add numbering to /proc/stat "cpu" fields
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553413

Reported-by: Samuel Thibault <sthibault@debian.org>
Reported-by: Simon Paillard <spaillard@debian.org>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-26 23:47:43 +01:00
Michael Kerrisk ae3b804737 proc.5: Reorganize text describing /proc/stat "cpu" fields
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-26 20:36:20 +01:00
Michael Kerrisk aa610245c8 proc.5: Add field numbers for /proc/PID/stat
See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553413

Reported-by: Samuel Thibault <sthibault@debian.org>
Reported-by: Simon Paillard <spaillard@debian.org>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-26 20:16:08 +01:00
David Prévot 1f6aa3ea7b proc.5: wfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-23 18:51:43 +01:00
Michael Kerrisk f2c8b197ae proc.5: Document /prod/[pid]/oom_score_adj
Text taken directly from Documentation/filesystems/proc.txt,
with some light editing.

See https://bugzilla.kernel.org/show_bug.cgi?id=50421

Reported-by: Peter Lekeynstein <lekensteyn@gmail.com>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-22 02:40:06 +01:00
Michael Kerrisk de8e9cc1a0 proc.5: ffix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-22 02:40:06 +01:00
Felipe Pena cab67c641a elf.5: tfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-12-19 00:49:48 +01:00
Michael Kerrisk e1282f176c proc.5: Note change of /proc/[pid]/limits file permissions in 2.6.36
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-11-24 09:14:31 +01:00
Michael Kerrisk c16d4f25c7 proc.5: Correct description of SwapFree in /proc/meminfo
Reported-by: Jim Paris <jim@jtan.com>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-11-16 07:58:27 +01:00
Michael Kerrisk 46fbfc072b proc.5: tfix
Reported-by: Jim Paris <jim@jtan.com>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-11-16 07:28:27 +01:00
Simon Paillard b1171e214e resolv.conf.5: Document IPv6 format for nameserver
See: http://bugs.debian.org/610036
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-11-11 12:08:29 +01:00
Michael Kerrisk fa1d274987 Removed trailing white space at end of lines 2012-11-07 14:24:27 +01:00
Simon Paillard aa8a6b4fbf proc.5: tfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-11-05 17:17:27 +01:00
David Prévot 99e9158609 proc.5: Minor fixes
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-11-05 17:14:57 +01:00
David Prévot 7bccb7d474 proc.5: ffix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-11-05 17:02:55 +01:00
Michael Kerrisk f9313d015c proc.5: Default for /proc/sys/fs/protected_{hardlinks,symlinks} is now 0
The default setting of 1 in/proc/sys/fs/protected_hardlinks
and /proc/sys/fs/protected_symlinks caused one too many
breakages for Linus's taste, so commit 561ec64ae67e changed
the default for both files to 0.

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-28 07:23:28 +01:00
David Prévot 075963263e proc.5: tfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-24 14:53:48 +02:00
Michael Kerrisk f68512e9fe intro.1, add_key.2, get_mempolicy.2, get_thread_area.2, intro.2, keyctl.2, mbind.2, request_key.2, set_thread_area.2, clock.3, cmsg.3, getcwd.3, getpw.3, intro.3, malloc.3, posix_memalign.3, shm_open.3, sleep.3, sysconf.3, intro.4, sd.4, intro.5, locale.5, slabinfo.5, intro.6, boot.7, bootparam.7, futex.7, glob.7, hier.7, intro.7, libc.7, locale.7, mq_overview.7, netlink.7, sem_overview.7, shm_overview.7, unix.7, intro.8: Global fix: Use consistent capitalization in NAME section
The line(s) in the NAME section should only use capitals
where English usage dictates that. Otherwise, use
lowercase throughout.

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-24 14:53:48 +02:00
Michael Kerrisk 7fac88a949 eventfd.2, futex.2, mmap2.2, open.2, pciconfig_read.2, ptrace.2, reboot.2, request_key.2, sched_rr_get_interval.2, splice.2, stat.2, sync_file_range.2, syscalls.2, timer_create.2, vm86.2, pthread_attr_setscope.3, core.5, proc.5, aio.7, futex.7, netlink.7, time.7: Global fix: "userspace" ==> "user space" or "user-space"
Existing pages variously use "userspace or "user space".
But, "userspace" is not quite an English word.
So change "userspace" to "user space" or, when used
attributively, "user-space".

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-24 14:53:33 +02:00
Michael Kerrisk 17b657f4d3 proc.5: Since Linux 2.6.27, /proc/sys/kernel/modprobe depends on CONFIG_MODULES
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-18 15:05:25 +02:00
Michael Kerrisk 1eeb999522 proc.5: Fix merge conflict
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-18 15:04:50 +02:00
Michael Kerrisk 3ba3d5b1b7 proc.5: Document /proc/meminfo
Info mosly taken from Documentation/filesystems/proc.txt
and Documentation/vm/hugetlbpage.txt.

Also added info on the CONFIG_* options that govern various
parameters, and also version information for fields
introduced since 2.6.0. This information is current up to
Linux 3.6.

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-18 14:46:21 +02:00
Michael Kerrisk 8306193887 proc.5: ffix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-18 09:22:40 +02:00
Michael Kerrisk 2f249f3bd6 proc.5: Note system call error yeilded by /proc/sys/fs/protected_symlinks
Note that violating 'protected_symlinks' restrictions
causes system calls to fail with the error EACCES.

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-15 13:28:47 +02:00
Michael Kerrisk 2da52bf6b8 proc.5: wfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-15 12:15:13 +02:00
Michael Kerrisk 4eaa04c556 Removed trailing white space at end of lines 2012-10-15 11:13:31 +02:00
Michael Kerrisk 19f9d5935d proc.5: Document /proc/sys/fs/protected_symlinks
Based on text in Documentation/sysctl/fs.txt by Kees Cook

Cowritten-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-15 11:11:21 +02:00
Michael Kerrisk c2b035115c proc.5: Document /proc/sys/fs/protected_hardlinks
Based on text in Documentation/sysctl/fs.txt by Kees Cook

Cowritten-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>

Conflicts:
	man5/proc.5
2012-10-15 11:09:02 +02:00
Michael Kerrisk 4129825b52 proc.5: Document /proc/sys/kernel/kptr_restrict
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-10-15 08:56:36 +02:00
Michael Kerrisk 31a6818e3c time.1, atexit.3, bsearch.3, dlopen.3, envz_add.3, errno.3, fmtmsg.3, getgrent_r.3, getline.3, getmntent.3, getnameinfo.3, getpass.3, getpwent_r.3, gets.3, isalpha.3, printf.3, puts.3, recno.3, scandir.3, stdarg.3, sysconf.3, termios.3, wordexp.3, null.4, core.5, dir_colors.5, issue.5, proc.5, termcap.5, utmp.5, ascii.7, cpuset.7, glob.7, man-pages.7, man.7, mdoc.7, mdoc.samples.7, regex.7: Revert 9f8e673e62 (whose global s%\\e%\\\\% caused problems)
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-09-26 23:56:54 +02:00
Michael Kerrisk 9f8e673e62 time.1, atexit.3, bsearch.3, dlopen.3, envz_add.3, errno.3, fmtmsg.3, getgrent_r.3, getline.3, getmntent.3, getnameinfo.3, getpass.3, getpwent_r.3, gets.3, isalpha.3, printf.3, puts.3, recno.3, scandir.3, stdarg.3, sysconf.3, termios.3, wordexp.3, null.4, core.5, dir_colors.5, issue.5, proc.5, termcap.5, utmp.5, ascii.7, cpuset.7, glob.7, man-pages.7, man.7, mdoc.7, mdoc.samples.7, regex.7: Global fix: use \\ rather than \e for literal backslash
Reported-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-09-24 10:23:07 +02:00
Michael Kerrisk 66a9882e46 bdflush.2, get_robust_list.2, kexec_load.2, madvise.2, mmap.2, mount.2, prctl.2, query_module.2, rt_sigqueueinfo.2, shmget.2, sigaction.2, syscalls.2, umount.2, malloc.3, hpsa.4, initrd.4, proc.5, bootparam.7, icmp.7, netlink.7, signal.7: Global fix: use "Linux kernel source" consistently
Rather than "kernel source".

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-09-24 10:02:34 +02:00
Michael Kerrisk f428b73e5f nscd.conf.5: spfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-09-24 10:00:15 +02:00
David Prévot 173fe7e792 arch_prctl.2, fcntl.2, flock.2, get_robust_list.2, getpriority.2, ioprio_set.2, migrate_pages.2, mmap.2, mremap.2, msync.2, sched_get_priority_max.2, sched_rr_get_interval.2, sched_setparam.2, sched_setscheduler.2, sched_yield.2, select.2, socket.2, subpage_prot.2, unshare.2, btree.3, dbopen.3, dl_iterate_phdr.3, dlopen.3, getnameinfo.3, hash.3, lockf.3, netlink.3, recno.3, rpc.3, xdr.3, cciss.4, console_ioctl.4, hpsa.4, initrd.4, msr.4, rtc.4, st.4, hosts.5, services.5, tzfile.5, aio.7, arp.7, capabilities.7, cpuset.7, feature_test_macros.7, futex.7, inotify.7, ip.7, ipv6.7, iso_8859-16.7, iso_8859-2.7, koi8-r.7, math_error.7, netlink.7, packet.7, pthreads.7, raw.7, spufs.7, udplite.7, uri.7, x25.7: Global fix: Various consistency fixes for SEE ALSO
Coauthored-by: Michael Kerrisk <mtk.manpages@gmail.com>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-09-24 09:53:22 +02:00
Michael Kerrisk 67914165b3 proc.5: tfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-08-22 15:28:19 +02:00
Michael Kerrisk 055024ed2e proc.5: Update description of 'starttime' field of /proc/PID/stat
The unit of measurement changed from jiffies to clock ticks in
Linux 2.6.

See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=675891

Reported-by: Frédéric Brière <fbriere@fbriere.net>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-08-22 15:27:31 +02:00
Michael Kerrisk de54b4ec24 slabinfo.5: srcfix: Added FIXME
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-08-16 10:48:24 +02:00
Michael Kerrisk 00702accc4 proc.5: Clarify header file referred related to 'flags' field of /proc/PID/stat
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-08-14 21:10:51 +02:00
Sami Kerola 608bf95023 capget.2, futex.2, sched_setscheduler.2, spu_create.2, spu_run.2, vfork.2, getnameinfo.3, netlink.3, cciss.4, console_codes.4, dsp56k.4, hpsa.4, sk98lin.4, filesystems.5, protocols.5, aio.7, capabilities.7, charsets.7, feature_test_macros.7, futex.7, hier.7, iso_8859-16.7, iso_8859-2.7, koi8-r.7, libc.7, man.7, netlink.7, numa.7, standards.7, unicode.7, units.7, uri.7, x25.7: Global fix: use UR macro where applicable
The syntax .UR http://example.com paired with .UE will create
links which one can interact, if the pager allows that.  One
way to see the effect is ask the man(1) command to use browser
display, e.g.:

    man -H man7/uri.7

("\:" is optional groff syntax to permit hyphenless line breaks.)

Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-08-13 10:02:36 +02:00
Tolga Dalman 2b5407af0c proc.5: wfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-08-13 09:30:21 +02:00
Michael Kerrisk 0ac3f06fc9 core.5: Note effect of madvise(2) MADV_DONTDUMP flag
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-07-19 12:51:28 +02:00
Michael Kerrisk 38c6b6401d path_resolution.2, epoll.4, fifo.4, futex.4, complex.5, environ.5: Remove outdated links
Remove links >= 5 years old that were created after historical
moves of pages to new sections.

Reported-by: Bjarni Ingi Gislason <bjarniig@rhi.hi.is>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-07-19 12:51:28 +02:00
Michael Kerrisk 931cbe83c5 nsswitch.conf.5: srcfix: Remove excess .RE tag
Reported-by: Sam Varshavchik <mrsam@courier-mta.com>
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-06-08 03:10:25 +12:00
David Prévot efa400c784 resolv.conf.5: wfix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-05-11 06:27:47 +12:00
David Prévot 8d708d6bf6 proc.5: ffix
Signed-off-by: Michael Kerrisk <mtk.manpages@gmail.com>
2012-05-11 06:24:37 +12:00