From owner-p4-projects@FreeBSD.ORG Sun Mar 13 08:33:02 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF290106566C; Sun, 13 Mar 2011 08:33:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71E05106564A for ; Sun, 13 Mar 2011 08:33:02 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 5C98A8FC0C for ; Sun, 13 Mar 2011 08:33:02 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2D8X2Ev066059 for ; Sun, 13 Mar 2011 08:33:02 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2D8X23o066056 for perforce@freebsd.org; Sun, 13 Mar 2011 08:33:02 GMT (envelope-from lz@FreeBSD.org) Date: Sun, 13 Mar 2011 08:33:02 GMT Message-Id: <201103130833.p2D8X23o066056@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 189957 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Mar 2011 08:33:03 -0000 http://p4web.freebsd.org/@@189957?ac=10 Change 189957 by lz@freebsd-dev on 2011/03/13 08:32:49 Cleanups in ext2_clusteralloc() and ext2_clusteracct(). Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#40 edit .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_subr.c#4 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#40 (text+ko) ==== @@ -1308,8 +1308,8 @@ struct ext2mount *ump; struct buf *bp; char *bbp; - int error, i, bit, loc, end, start; - daddr_t bno = 0, runstart, runlen; + int error, i, bit, got, loc, run; + daddr_t bno; int32_t *lp; fs = ip->i_e2fs; @@ -1354,62 +1354,39 @@ EXT2_UNLOCK(ump); /* Search the cluster map to find a big enough cluster like ffs. */ - if (bpref) - start = dtogd(fs, bpref) / NBBY; - else - start = 0; - end = howmany(fs->e2fs->e2fs_fpg, NBBY) - start; - runlen = 0; - runstart = 0; - for (loc = start; loc < end; loc++) { - if (bbp[loc] == (char)0xff) { - runlen = 0; - continue; - } - - if (runlen == 0) { - bit = ffs(bbp[loc]) - 1; - runlen += bit; - if (runlen >= len) { - bno = loc * NBBY; - goto gotit; - } - - bit = fls(bbp[loc]); - runlen = NBBY - bit; - runstart = loc * NBBY + bit; - } else if (bbp[loc] == 0) { - runlen += NBBY; + if (dtog(fs, bpref) != cg) + bpref = 0; + if (bpref != 0) + bpref = dtogd(fs, bpref); + loc = bpref / NBBY; + bit = 1 << (bpref % NBBY); + for (run = 0, got = bpref; got < fs->e2fs->e2fs_fpg; got++) { + if ((bbp[loc] & bit) != 0) { + run = 0; } else { - bit = ffs(bbp[loc]) - 1; - runlen += bit; - if (runlen >= len) { - bno = runstart; - goto gotit; - } - - bit = fls(bbp[loc]); - runlen = NBBY - bit; - runstart = loc * NBBY + bit; + run++; + if (run == len) + break; } - - if (runlen >= len) { - bno = runstart; - goto gotit; + if ((got & (NBBY - 1)) != (NBBY - 1)) + bit <<= 1; + else { + loc++; + bit = 1; } } -gotit: - if (bno == 0 || bno + len >= fs->e2fs->e2fs_fpg) + if (got >= fs->e2fs->e2fs_fpg) goto fail_lock; /* * Allocate the cluster that we have found. */ - for (i = 0; i < len; i++) - if (!isclr(bbp, bno + i)) + for (i = 1; i < len; i++) + if (!isclr(bbp, got - run + i)) panic("ext2_clusteralloc: map mismatch"); + bno = got - run + 1; if (bno >= fs->e2fs->e2fs_fpg) panic("ext2_clusteralloc: allocated out of group"); ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_subr.c#4 (text+ko) ==== @@ -131,20 +131,16 @@ { int32_t *sump = fs->e2fs_clustersum[cg].cs_sum; int32_t *lp; - int i, forw, back, start, end, map = 0, bit, loc; - int fpgn = howmany(fs->e2fs->e2fs_fpg, NBBY); + int i, forw, back, start, end, bit, loc; /* Initialize the cluster summary array. */ if (fs->e2fs_clustersum[cg].cs_init == 0) { int run = 0; - - end = fpgn; bit = 1; loc = 0; - map = bbp[loc++]; - for (i = 0; i < fs->e2fs->e2fs_fpg && loc < end; i++) { - if ((map & bit) == 0) + for (i = 0; i < fs->e2fs->e2fs_fpg; i++) { + if ((bbp[loc] & bit) == 0) run++; else if (run != 0) { if (run > fs->e2fs_contigsumsize) @@ -152,10 +148,10 @@ sump[run]++; run = 0; } - if ((i & (NBBY - 1)) != (NBBY - 1)) + if ((i & (NBBY - 1)) != (NBBY - 1)) { bit <<= 1; - else { - map = bbp[loc++]; + } else { + loc++; bit = 1; } } @@ -172,26 +168,18 @@ /* Find the size of the cluster going forward. */ start = bno + 1; - loc = start / NBBY; end = start + fs->e2fs_contigsumsize; if (end > fs->e2fs->e2fs_fpg) end = fs->e2fs->e2fs_fpg; - if (loc < fpgn) - map = bbp[loc++]; + loc = start / NBBY; bit = 1 << (start % NBBY); for (i = start; i < end; i++) { - if ((map & bit) != 0) + if ((bbp[loc] & bit) != 0) break; if ((i & (NBBY - 1)) != (NBBY - 1)) { bit <<= 1; } else { - /* - * XXX: off-by-one. - * when loc == howmany(fs->e2fs->e2fs_fpg, NBBY), - * bbp[loc++] will cause kernel crash. - */ - if (loc < fpgn) - map = bbp[loc++]; + loc++; bit = 1; } } @@ -199,19 +187,18 @@ /* Find the size of the cluster going backward. */ start = bno - 1; - loc = start / NBBY; end = start - fs->e2fs_contigsumsize; if (end < 0) end = -1; - map = bbp[loc--]; + loc = start / NBBY; bit = 1 << (start % NBBY); for (i = start; i > end; i--) { - if ((map & bit) != 0) + if ((bbp[loc] & bit) != 0) break; if ((i & (NBBY - 1)) != 0) { bit >>= 1; } else { - map = bbp[loc--]; + loc--; bit = 1 << (NBBY - 1); } } From owner-p4-projects@FreeBSD.ORG Sun Mar 13 21:22:58 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C2D961065673; Sun, 13 Mar 2011 21:22:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84676106566B for ; Sun, 13 Mar 2011 21:22:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 700658FC08 for ; Sun, 13 Mar 2011 21:22:57 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2DLMvuw010524 for ; Sun, 13 Mar 2011 21:22:57 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2DLMvEO010521 for perforce@freebsd.org; Sun, 13 Mar 2011 21:22:57 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 13 Mar 2011 21:22:57 GMT Message-Id: <201103132122.p2DLMvEO010521@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 189992 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Mar 2011 21:22:58 -0000 http://p4web.freebsd.org/@@189992?ac=10 Change 189992 by rene@rene_acer on 2011/03/13 21:22:22 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#36 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#88 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#59 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/freebsd-update-server/article.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#32 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#33 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#19 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#12 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#37 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#16 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#102 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2006/mckusick-kernelinternals/mckusick-kernelinternals-1.sbv#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/asiabsdcon/allman-internetmail.sbv#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/asiabsdcon/rao-kernellocking-1.sbv#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/mckusick-historyofbsd.sbv#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#53 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd-html.dsl#6 integrate .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#21 integrate .. //depot/projects/docproj_nl/www/en/administration.sgml#18 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#52 integrate .. //depot/projects/docproj_nl/www/en/platforms/alpha.sgml#2 integrate .. //depot/projects/docproj_nl/www/en/platforms/ppc.sgml#6 integrate .. //depot/projects/docproj_nl/www/en/ports/categories#4 integrate .. //depot/projects/docproj_nl/www/en/support/webresources.sgml#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.software.xml#11 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#104 integrate .. //depot/projects/docproj_nl/www/share/sgml/press.xml#22 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#36 (text+ko) ==== @@ -9,7 +9,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.293 2011/02/22 10:27:25 ryusuke Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.296 2011/03/12 18:11:05 gjb Exp $ 1999 @@ -1762,7 +1762,7 @@ A short guide about fixes which are committed to the &os; source tree after being detected by &coverity.prevent; and - analyzed by an &os; developer. + analyzed by a &os; developer. @@ -2803,11 +2803,42 @@ - How long is a ports freeze? + What is a ports slush or + feature freeze? + + + + During a release cycle the ports tree may be in a + slush state instead of in a hard freeze. + The goal during a slush is to reach a stable ports tree + to avoid rebuilding large sets of packages for the + release and to tag the tree. During this time + sweeping changes are prohibited unless + specifically permitted by portmgr. Complete details + about what qualifies as a sweeping change can be found + on the Portmgr + Implementation page. + + The benefit of a slush as opposed to a complete + freeze is that it allows maintainers to continue adding + new ports, making routine version updates, and bug fixes + to most existing ports, as long as the number of + affected ports is minimal. For example, updating the + shared library version on a port that many other ports + depend on. + + + + + + How long is a ports freeze or slush? - Usually a week or two. + A freeze only lasts long enough to tag the tree. + A slush usually lasts a week or two, but may last + longer. @@ -2817,7 +2848,7 @@ - During the ports freeze, you are not allowed to + During a ports freeze, you are not allowed to commit anything to the tree without explicit approval from the Ports Management Team. Explicit approval here means that you send a patch to @@ -2834,43 +2865,48 @@ Note that you do not have implicit permission to fix a port during the freeze just because it is broken. + + During a ports slush, you are still allowed to + commit but you must exercise more caution in what you + commit. Furthermore a special note (typically Feature + Safe: yes) must be added to the commit message. - How do I know when the ports freeze starts? + How do I know when the ports slush starts? - The ports management team will send out warning + The Ports Management Team will send out warning messages to the &a.ports; and &a.committers; announcing the start of the impending release, usually two or three weeks in advance. The exact starting time will not be determined until a few days before the - actual release. This is because the ports freeze has to + actual release. This is because the ports slush has to be synchronized with the release, and it is usually not known until then when exactly the release will be rolled. - When the freeze starts, there will be another + When the slush starts, there will be another announcement to the &a.ports; and &a.committers;, of course. - How do I know when the ports freeze ends? + How do I know when the freeze or slush ends? - A few hours after the release, the ports management team - will send out a mail to the &a.ports; and &a.committers; - announcing the end of the ports freeze. Note that the - release being cut does not automatically end the freeze. - We have to make sure there will not be any last minute - snafus that result in an immediate re-rolling of the - release. + A few hours after the release, the Ports Management + Team will send out a mail to the &a.ports; and &a.committers; + announcing the end of the ports freeze or slush. Note + that the release being cut does not automatically indicate + the end of the freeze. We have to make sure there will + be no last minute snafus that result in an immediate + re-rolling of the release. @@ -3190,7 +3226,7 @@ any file under a subdirectory that starts with an uppercase letter (Mk/, Tools/, etc.). In particular, the - ports management team is very protective of + Ports Management Team is very protective of ports/Mk/bsd.port*.mk so do not commit changes to those files unless you want to face his wra(i)th. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#88 (text+ko) ==== @@ -1,4 +1,4 @@ - + + - + In order for &fbus.ap; to work properly, updates for both the current release and the release one wants to upgrade to need to be built. This is necessary for determining the differences of files between releases. For example, when upgrading a &os; - system from version 7.1 to 7.2, updates will need to be built - for 7.1-RELEASE as well as for 7.2-RELEASE. - + system from 7.1-RELEASE to 7.2-RELEASE, updates will need to be built + and uploaded to your distribution server for both versions. + For reference, the entire run of init.sh is ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/portbuild/article.sgml#32 (text+ko) ==== @@ -11,7 +11,7 @@ The &os; Ports Management Team - $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.68 2011/02/26 00:58:15 linimon Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.69 2011/03/08 04:07:59 linimon Exp $ 2003 @@ -1573,8 +1573,8 @@ different, machines, you will need to put those in the override directories.) - Recommended entries: -hostname="${hostname} + Recommended entries for physical nodes: +hostname="${hostname}" inetd_enable="YES" linux_enable="YES" nfs_client_enable="YES" @@ -1591,6 +1591,43 @@ squid_pidfile="/usr2/squid/logs/squid.pid" + + Required entries for VMWare-based nodes: +vmware_guest_vmmemctl_enable="YES" +vmware_guest_guestd_enable="YES" + + + + Recommended entries for VMWare-based nodes: +hostname="" +ifconfig_em0="DHCP" +fsck_y_enable="YES" + +inetd_enable="YES" +linux_enable="YES" +nfs_client_enable="YES" +sendmail_enable="NONE" +sshd_enable="YES" +sshd_program="/usr/local/sbin/sshd" + +gmond_enable="YES" +squid_enable="YES" +squid_chdir="/usr2/squid/logs" +squid_pidfile="/usr2/squid/logs/squid.pid" + + + + &man.ntpd.8; should not + be enabled for VMWare instances. + + Also, it may be possible to leave + squid disabled by default + so as to not have + /usr2 + persistent (which should save instantiation time.) + Work is still ongoing. + + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/faq/book.sgml#33 (text+ko) ==== @@ -12,7 +12,7 @@ The &os; Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1132 2011/01/15 12:51:40 jkois Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/faq/book.sgml,v 1.1133 2011/03/08 09:42:08 danger Exp $ 1995 @@ -31,6 +31,7 @@ 2008 2009 2010 + 2011 The &os; Documentation Project @@ -6319,7 +6320,7 @@ Single User mode, it means that the console has been marked as insecure in /etc/ttys. In this case it will be - required to boot from an &os; installation disk, choose + required to boot from a &os; installation disk, choose the Fixit shell from &man.sysinstall.8; and issue the commands mentioned above. @@ -6329,7 +6330,7 @@ If you cannot mount your root partition from Single User mode, it is possible that the partitions are encrypted and it is impossible to mount them without the - access keys. Your chances are depending on the chosen + access keys. Your chances depend on the chosen implementation. For more information see the section about encrypted disks in the &os; Handbook. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/disks/chapter.sgml#19 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -4065,7 +4065,7 @@ How to integrate CARP and - &man.devd.8;; to build a robust storage system. + &man.devd.8; to build a robust storage system. @@ -4297,11 +4297,11 @@ resource test { on hasta { local /dev/ad6 - remote 172.16.0.1 + remote 172.16.0.2 } on hastb { local /dev/ad6 - remote 172.16.0.2 + remote 172.16.0.1 } } @@ -4540,7 +4540,7 @@ # Switch roles for the HAST resources for disk in ${resources}; do - if ! mount | grep -q "^${disk} on " + if ! mount | grep -q "^/dev/hast/${disk} on " then else umount -f /hast/${disk} ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/jails/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -119,7 +119,7 @@ hosted (system, process, user, etc.) A process, user or other entity, whose access to resources is - restricted by an &os; jail. + restricted by a &os; jail. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#12 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -266,6 +266,11 @@ building / installing + + It is required to have the full &os; source tree installed + to build the kernel. + + First, let us take a quick tour of the kernel build directory. All directories mentioned will be relative to the main /usr/src/sys directory, which is also @@ -287,35 +292,26 @@ directory structure, with each supported device, file system, and option in its own subdirectory. - This chapter assumes that you are using the i386 architecture - in the examples. If this is not the case for your situation, - make appropriate adjustments to the path names for your system's - architecture. + The examples in this chapter assume that you are using the i386 + architecture. If your system has a different architecture you need + to change the path names accordingly. - If there is not a - /usr/src/sys directory on your system, - then the kernel source has not been installed. The easiest - way to do this is by running - sysinstall as - root, choosing + If the directory /usr/src/ does not + exist on your system (or if it is empty), then the sources have + not been installed. The easiest way to install the full source + tree is is to run sysinstall as + root, and then choosing Configure, then Distributions, then - src, then - base and - sys. If you have an aversion to - sysinstall and you have access to - an official &os; CDROM, then you can also - install the source from the command line: + src, and finally + All. If it does not exist, you should + also create a symlink to /usr/src/sys/: - &prompt.root; mount /cdrom -&prompt.root; mkdir -p /usr/src/sys -&prompt.root; ln -s /usr/src/sys /sys -&prompt.root; cat /cdrom/src/ssys.[a-d]* | tar -xzvf - -&prompt.root; cat /cdrom/src/sbase.[a-d]* | tar -xzvf - + &prompt.root; ln -s /usr/src/sys/ /sys/ - Next, move to the + Next, change to the arch/conf directory and copy the GENERIC configuration file to the name you want to give your kernel. For example: @@ -392,6 +388,11 @@ Building a Kernel + + It is required to have the full &os; source tree installed + to build the kernel. + + Change to the /usr/src directory: @@ -412,11 +413,6 @@ - - It is required to have full &os; source tree to build the - kernel. - - By default, when you build a custom kernel, all kernel modules will be rebuilt as well. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#37 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -1748,15 +1748,6 @@ - ports-mbone - release=cvs - - - MBone applications. - - - - ports-misc release=cvs @@ -2754,6 +2745,14 @@ + RELENG_8_2_0_RELEASE + + + &os; 8.2 + + + + RELENG_8_1_0_RELEASE @@ -2770,6 +2769,14 @@ + RELENG_7_4_0_RELEASE + + + &os; 7.4 + + + + RELENG_7_3_0_RELEASE ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/security/chapter.sgml#16 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -608,7 +608,7 @@ and the value of the kern_securelevel variable to the desired secure level. - The default secure level of an &os; system right after the startup + The default secure level of a &os; system right after the startup scripts are done is -1. This is called insecure mode because immutable file flags may be turned off, all devices may be read from or written to, and so on. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#102 (text+ko) ==== @@ -1,7 +1,7 @@ - mbone + mbone* MBone applications. @@ -2027,7 +2027,7 @@ editors, not the other way around. Also, you should not list net when the port belongs to any of irc, mail, - mbone, news, + news, security, or www, as net is included implicitly. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2006/mckusick-kernelinternals/mckusick-kernelinternals-1.sbv#2 (text+ko) ==== @@ -1445,7 +1445,7 @@ rather than just a straight 0:21:19.440,0:21:22.440 -iteration of what the the actual protocols +iteration of what the actual protocols are 0:21:22.440,0:21:24.940 @@ -2727,7 +2727,7 @@ 0:38:54.940,0:38:59.579 was you'd have to break into these steps. well -I need to run the the preprocessor +I need to run the preprocessor 0:38:59.579,0:39:04.670 and so clean out whatever gump that was left ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/asiabsdcon/allman-internetmail.sbv#3 (text+ko) ==== @@ -323,7 +323,7 @@ 0:05:22.849,0:05:27.929 they're interacting doing screen sharing -over the the internet, they're showing off the mouse for +over the internet, they're showing off the mouse for 0:05:27.929,0:05:30.380 the first time that nobody's ever seen @@ -1105,7 +1105,7 @@ Norway 0:16:51.030,0:16:54.589 -and so the the network had gone international +and so the network had gone international 0:16:54.589,0:16:55.450 sort of @@ -1538,7 +1538,7 @@ pretty much 0:23:16.870,0:23:20.880 -toward the end of the the Arpanet era +toward the end of the Arpanet era 0:23:20.880,0:23:22.520 the Arpanet @@ -2121,7 +2121,7 @@ that effectively said 0:32:18.670,0:32:23.830 -you can't use the the internet for commercial +you can't use the internet for commercial purposes at all 0:32:23.830,0:32:24.649 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/asiabsdcon/rao-kernellocking-1.sbv#2 (text+ko) ==== @@ -431,7 +431,7 @@ a very huge step forward in this direction 0:07:12.319,0:07:18.599 -really the the SMPng has been considered closed around the end of +really the SMPng has been considered closed around the end of 0:07:18.599,0:07:20.600 2007 @@ -1847,7 +1847,7 @@ Msleep should be dropped off but they have avery nice feature which 0:30:56.220,0:31:02.669 -is the the possibility to specify a wake up priority on the sleeping threads +is the possibility to specify a wake up priority on the sleeping threads 0:31:02.669,0:31:04.740 once they are asleep ==== //depot/projects/docproj_nl/en_US.ISO8859-1/captions/2009/dcbsdcon/mckusick-historyofbsd.sbv#2 (text+ko) ==== @@ -40,7 +40,7 @@ 0:00:43.819,0:00:47.210 I'll just do quickly and then I'll concentrate -on the the one +on the one 0:00:47.210,0:00:48.010 piece that @@ -1875,7 +1875,7 @@ 0:25:44.420,0:25:49.500 Uh and he took 4.1c with him to get it -ported on to the the SUN hardware. +ported on to the SUN hardware. 0:25:49.500,0:25:51.300 and @@ -1884,7 +1884,7 @@ with this sort uh of hit 0:25:54.240,0:25:55.910 -on the the main developer +on the main developer 0:25:55.910,0:26:00.510 uh we decided that rather than trying up to get @@ -2695,7 +2695,7 @@ uh that had 0:36:56.150,0:36:59.809 -well the the class ABC type of subnets +well the class ABC type of subnets not 0:36:59.809,0:37:01.319 @@ -3450,7 +3450,7 @@ At any rate 0:47:18.679,0:47:21.629 -we eventually win the the lawsuit +we eventually win the lawsuit 0:47:21.629,0:47:26.089 And uh and we don't win it we settle the @@ -3654,7 +3654,7 @@ was 0:50:01.689,0:50:04.759 -uh the the stuff that SUN had done +uh the stuff that SUN had done 0:50:04.759,0:50:10.109 and the other was the stuff that had been done at @@ -3707,7 +3707,7 @@ 0:50:47.140,0:50:51.549 so it really got to the point where it -is needed to be signed off by the the SUN +is needed to be signed off by the SUN 0:50:51.549,0:50:52.429 lawyers @@ -3832,7 +3832,7 @@ and so got that put in and of course we 0:52:34.359,0:52:40.019 -did it onto the the Berkeley MMAP Interface +did it onto the Berkeley MMAP Interface rather than what they did 0:52:40.019,0:52:42.700 ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#53 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.534 2011/03/05 23:06:43 kargl Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.535 2011/03/13 16:42:37 pawel Exp $ --> aaron@FreeBSD.org"> @@ -904,6 +904,8 @@ pav@FreeBSD.org"> +pawel@FreeBSD.org"> + pb@FreeBSD.org"> pdeuskar@FreeBSD.org"> ==== //depot/projects/docproj_nl/share/sgml/freebsd-html.dsl#6 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -201,9 +201,9 @@ (("current") (string-append u "&" "amp;" "manpath=FreeBSD+9-current")) (("xfree86") (string-append u "&" "amp;" "manpath=XFree86+4.7.0")) (("xorg") (string-append u "&" "amp;" "manpath=X11R7.4")) - (("netbsd") (string-append u "&" "amp;" "manpath=NetBSD+5.0")) + (("netbsd") (string-append u "&" "amp;" "manpath=NetBSD+5.1")) (("openbsd") (string-append u "&" "amp;" "manpath=OpenBSD+4.7")) - (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+8.1-RELEASE+and+Ports")) + (("ports") (string-append u "&" "amp;" "manpath=FreeBSD+8.2-RELEASE+and+Ports")) (else u)))) (element application ($bold-seq$)) ==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#21 (text+ko) ==== @@ -1,7 +1,7 @@ - + @@ -66,7 +66,7 @@ - + ==== //depot/projects/docproj_nl/www/en/administration.sgml#18 (text+ko) ==== @@ -1,5 +1,5 @@ + %developers; @@ -131,13 +131,14 @@ Team in greater detail.

==== //depot/projects/docproj_nl/www/en/developers.sgml#52 (text+ko) ==== @@ -6,7 +6,7 @@ us to update author names, or the representation of those names (such as adding email addresses), by just editing a single file. -$FreeBSD: www/en/developers.sgml,v 1.276 2011/03/05 23:08:13 kargl Exp $ +$FreeBSD: www/en/developers.sgml,v 1.277 2011/03/13 16:47:13 pawel Exp $ --> @@ -451,6 +451,7 @@ + ==== //depot/projects/docproj_nl/www/en/platforms/alpha.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -10,9 +10,7 @@ &header;

This page contains information about porting FreeBSD to HP/Compaq Alpha - systems. Discussion of the Alpha port takes place on the freebsd-alpha - mailing list.

+ systems.

Status

@@ -21,15 +19,17 @@ the hardware vendor; this combined with the widespread deployment of more mainstream 64-bit platforms, such as the AMD64 and Intel EM64T architectures, has resulted in significantly reduced user and developer - community interest. FreeBSD/alpha support will continue in maintenance - mode for future FreeBSD 6.x releases.

+ community interest.

-

FreeBSD/alpha mailing list

+

FreeBSD/alpha mailing list

-

To subscribe to this list, send an email to - or visit the mailman interface.

+

Because of the dropped support for the Alpha plattform the mailing list + freebsd-alpha has been closed. Although it is no + longer possible to send messages to this mailing list, the archives can + still be searched + or browsed.

Other Links of Interest

==== //depot/projects/docproj_nl/www/en/platforms/ppc.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -70,7 +70,7 @@

How to use ports on FreeBSD/ppc?

-

The easy way to use ports on FreeBSD since 6.0-RELEASE is to use portsnap. +

The easy way to use ports on FreeBSD is to use portsnap. Refer to the Handbook if you need assistance to use the Ports Collection.

==== //depot/projects/docproj_nl/www/en/ports/categories#4 (text+ko) ==== @@ -1,5 +1,5 @@ #Originally from src/release/sysinstall/index.c,v 1.57 1998/10/15 -#$FreeBSD: www/en/ports/categories,v 1.40 2010/09/29 20:54:50 pav Exp $ +#$FreeBSD: www/en/ports/categories,v 1.41 2011/03/06 22:43:05 pav Exp $ # See categories.descriptions for the meaning of the abbrevations at the # end of each category. @@ -50,7 +50,7 @@ lisp,"Things related to pure lisp.",VC mail,"Electronic mail packages and utilities.",CCATI math,"Mathematical computation software.",SAE -mbone,"Applications and utilities for the MBONE.",CCATI +mbone,"Applications and utilities for the MBONE.",VC misc,"Miscellaneous utilities.",AOP multimedia,"Multimedia software.",EU net,"Networking utilities.",CCATI ==== //depot/projects/docproj_nl/www/en/support/webresources.sgml#2 (text+ko) ==== @@ -1,6 +1,6 @@ - + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Mar 14 09:56:47 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53BF01065673; Mon, 14 Mar 2011 09:56:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 15ADF1065670 for ; Mon, 14 Mar 2011 09:56:47 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DCBF48FC13 for ; Mon, 14 Mar 2011 09:56:46 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2E9ukGD051615 for ; Mon, 14 Mar 2011 09:56:46 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2E9ukeQ051612 for perforce@freebsd.org; Mon, 14 Mar 2011 09:56:46 GMT (envelope-from lz@FreeBSD.org) Date: Mon, 14 Mar 2011 09:56:46 GMT Message-Id: <201103140956.p2E9ukeQ051612@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Mar 2011 09:56:47 -0000 http://p4web.freebsd.org/@@190013?ac=10 Change 190013 by lz@freebsd-dev on 2011/03/14 09:56:33 Invalidate cluster summary information in ext2_reload(). Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#13 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_vfsops.c#13 (text+ko) ==== @@ -407,7 +407,7 @@ * Things to do to update the mount: * 1) invalidate all cached meta-data. * 2) re-read superblock from disk. - * 3) re-read summary information from disk. + * 3) invalidate all cluster summary information. * 4) invalidate all inactive vnodes. * 5) invalidate all cached file data. * 6) re-read inode data for all active vnodes. @@ -421,6 +421,7 @@ struct buf *bp; struct ext2fs *es; struct m_ext2fs *fs; + struct csum *sump; int error; int i; int32_t *lp; @@ -455,20 +456,24 @@ return (error); } - /* - * FIXME: It seems that we don't need to do something - * for reallocblk. +#ifdef UNKLAR + if (fs->fs_sbsize < SBSIZE) + bp->b_flags |= B_INVAL; +#endif + brelse(bp); + + /* + * Step 3: invalidate all cluster summary information. */ if (fs->e2fs_contigsumsize > 0) { lp = fs->e2fs_maxcluster; - for (i = 0; i < fs->e2fs_gcount; i++) + sump = fs->e2fs_clustersum; + for (i = 0; i < fs->e2fs_gcount; i++, sump++) { *lp++ = fs->e2fs_contigsumsize; + sump->cs_init = 0; + bzero(sump->cs_sum, fs->e2fs_contigsumsize + 1); + } } -#ifdef UNKLAR - if (fs->fs_sbsize < SBSIZE) - bp->b_flags |= B_INVAL; -#endif - brelse(bp); loop: MNT_ILOCK(mp); @@ -525,11 +530,11 @@ struct cdev *dev = devvp->v_rdev; struct g_consumer *cp; struct bufobj *bo; + struct csum *sump; int error; int ronly; int i, size; int32_t *lp; - struct csum *sump; ronly = vfs_flagopt(mp->mnt_optnew, "ro", NULL, 0); /* XXX: use VOP_ACESS to check FS perms */ From owner-p4-projects@FreeBSD.ORG Tue Mar 15 16:10:14 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 90BA11065672; Tue, 15 Mar 2011 16:10:14 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 52B66106567E for ; Tue, 15 Mar 2011 16:10:14 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3D0798FC13 for ; Tue, 15 Mar 2011 16:10:14 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2FGAEW3004062 for ; Tue, 15 Mar 2011 16:10:14 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2FGAEus004054 for perforce@freebsd.org; Tue, 15 Mar 2011 16:10:14 GMT (envelope-from gpf@FreeBSD.org) Date: Tue, 15 Mar 2011 16:10:14 GMT Message-Id: <201103151610.p2FGAEus004054@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190062 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Mar 2011 16:10:14 -0000 http://p4web.freebsd.org/@@190062?ac=10 Change 190062 by gpf@gpf_desktop on 2011/03/15 16:09:32 - add new audit class 'nfs' and map new nfs rpc events to it. On a different sidenote, I noticed that most of those events have values that step on space reserved for solaris kernel events. Although I don't expect 1700 of those events to suddently pop up, this will be fixed. Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/etc/audit_class#2 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/etc/audit_event#9 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/etc/audit_class#2 (text) ==== @@ -18,6 +18,7 @@ 0x00001000:lo:login_logout 0x00002000:aa:authentication and authorization 0x00004000:ap:application +0x00008000:nfs:nfs server 0x20000000:io:ioctl 0x40000000:ex:exec 0x80000000:ot:miscellaneous ==== //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/etc/audit_event#9 (text) ==== @@ -362,68 +362,68 @@ # # NFS-specific kernel events # -2000:AUE_NFS_NULL:nfsrv_null():ot -2001:AUE_NFS_GETATTR:nfsrv_getattr():fa -2002:AUE_NFS_SETATTR:nfsrv_setattr():fm -2003:AUE_NFS_LOOKUP:nfsrv_lookup():fa,ad -2004:AUE_NFS_ACCESS:nfsrv_access():fa -2005:AUE_NFS_READLINK:nfsrv_readlink():fr -2006:AUE_NFS_READ:nfsrv_read():fr -2007:AUE_NFS_WRITE:nfsrv_write():fw -2008:AUE_NFS_CREATE:nfsrv_create():fc,ad -2009:AUE_NFS_MKDIR:nfsrv_mkdir():fc,ad -2010:AUE_NFS_SYMLINK:nfsrv_symlink():fc,ad -2011:AUE_NFS_MKNOD:nfsrv_mknod():fc,ad -2012:AUE_NFS_REMOVE:nfsrv_remove():fd -2013:AUE_NFS_RMDIR:nfsrv_rmdir():fd -2014:AUE_NFS_RENAME:nfsrv_rename():fc,fd -2015:AUE_NFS_LINK:nfsrv_link():fc -2016:AUE_NFS_READDIR:nfsrv_readdir():fr -2017:AUE_NFS_READDIR_PLUS:nfsrv_readdirplus():fr,ad -2018:AUE_NFS_STATFS:nfsrv_statfs():fa -2019:AUE_NFS_FSINFO:nfsrv_fsinfo():ot -2020:AUE_NFS_PATHCONF:nfsrv_pathconf():fa -2021:AUE_NFS_COMMIT:nfsrv_commit():fw -2022:AUE_NFS_NOOP:nfsrv_noop():no +2000:AUE_NFS_NULL:nfsrv_null():nfs,ot +2001:AUE_NFS_GETATTR:nfsrv_getattr():nfs,fa +2002:AUE_NFS_SETATTR:nfsrv_setattr():nfs,fm +2003:AUE_NFS_LOOKUP:nfsrv_lookup():nfs,fa,ad +2004:AUE_NFS_ACCESS:nfsrv_access():nfs,fa +2005:AUE_NFS_READLINK:nfsrv_readlink():nfs,fr +2006:AUE_NFS_READ:nfsrv_read():nfs,fr +2007:AUE_NFS_WRITE:nfsrv_write():nfs,fw +2008:AUE_NFS_CREATE:nfsrv_create():nfs,fc,ad +2009:AUE_NFS_MKDIR:nfsrv_mkdir():nfs,fc,ad +2010:AUE_NFS_SYMLINK:nfsrv_symlink():nfs,fc,ad +2011:AUE_NFS_MKNOD:nfsrv_mknod():nfs,fc,ad +2012:AUE_NFS_REMOVE:nfsrv_remove():nfs,fd +2013:AUE_NFS_RMDIR:nfsrv_rmdir():nfs,fd +2014:AUE_NFS_RENAME:nfsrv_rename():nfs,fc,fd +2015:AUE_NFS_LINK:nfsrv_link():nfs,fc +2016:AUE_NFS_READDIR:nfsrv_readdir():nfs,fr +2017:AUE_NFS_READDIR_PLUS:nfsrv_readdirplus():nfs,fr,ad +2018:AUE_NFS_STATFS:nfsrv_statfs():nfs,fa +2019:AUE_NFS_FSINFO:nfsrv_fsinfo():nfs,ot +2020:AUE_NFS_PATHCONF:nfsrv_pathconf():nfs,fa +2021:AUE_NFS_COMMIT:nfsrv_commit():nfs,fw +2022:AUE_NFS_NOOP:nfsrv_noop():nfs,no # # NFSv4 specific RPC events # -2023:AUE_NFS_CLOSE:nfsrv_close():cl -2024:AUE_NFS_DELEGPURGE:nfsrv_delegpurge():ad -2025:AUE_NFS_DELEGRETURN:nfsrv_delegreturn():ad -2026:AUE_NFSv4_GETFH:nfsrv4_getfh():ad -2027:AUE_NFS_LOCK:nfsrv_lock():fm -2028:AUE_NFS_LOCKT:nfsrv_lockt():fm -2029:AUE_NFS_LOCKU:nfsrv_locku():fm -2030:AUE_NFS_LOOKUPP:nfsrv_lookupp():fa,ad -2031:AUE_NFS_NVERIFY:nfsrv_nverify():fa -2032:AUE_NFS_OPEN:nfsrv_open():fa -2033:AUE_NFS_OPENATTR:nfsrv_openattr():fa -2034:AUE_NFS_OPENCONFIRM:nfsrv_openconfirm():fa -2035:AUE_NFS_OPENDOWNGRADE:nfsrv_opendowngrade():fm -2036:AUE_NFS_PUTFH:nfsrv_putfh():ad -2037:AUE_NFS_PUTPUBFH:nfsrv_putpubfh():ad -2038:AUE_NFS_PUTROOTFH:nfsrv_putrootfh():ad -2039:AUE_NFS_RENEW:nfsrv_renew():ad -2040:AUE_NFS_RESTOREFH:nfsrv_restorefh():ad -2041:AUE_NFS_SAVEFH:nfsrv_savefh():ad -2042:AUE_NFS_SECINFO:nfsrv_secinfo():ot -2043:AUE_NFS_SETCLIENTID:nfsrv_setclientid():aa -2044:AUE_NFS_SETCLIENTIDCFRM:nfsrv_setclientidcfrm():aa -2045:AUE_NFS_VERIFY:nfsrv_verify():fa -2046:AUE_NFS_RELEASELCKOWN:nfsrv_releaselckown():ad -2047:AUE_NFS_OPEN_R:nfsrv_open() - read:fr -2048:AUE_NFS_OPEN_RC:nfsrv_open() - read, creat:fr,fc,fa,fm -2049:AUE_NFS_OPEN_RTC:nfsrv_open() - read, trunc, creat:fr,fd,fc,fa,fm -2050:AUE_NFS_OPEN_RT:nfsrv_open() - read, trunc:fr,fd,fa,fm -2051:AUE_NFS_OPEN_RW:nfsrv_open() - read, write:fr,fw -2052:AUE_NFS_OPEN_RWC:nfsrv_open() - read, write, creat:fr,fw,fc,fa,fm -2053:AUE_NFS_OPEN_RWTC:nfsrv_open() - read, write, trunc, creat:fr,fw,fd,fc,fa,fm -2054:AUE_NFS_OPEN_RWT:nfsrv_open() - read, write, trunc:fr,fw,fd,fa,fm -2055:AUE_NFS_OPEN_W:nfsrv_open() - write:fw -2056:AUE_NFS_OPEN_WC:nfsrv_open() - write, creat:fw,fc,fa,fm -2057:AUE_NFS_OPEN_WTC:nfsrv_open() - write, trunc, creat:fw,fd,fc,fa,fm -2058:AUE_NFS_OPEN_WT:nfsrv_open() - write, trunc:fw,fd,fa,fm +2023:AUE_NFS_CLOSE:nfsrv_close():nfs,cl +2024:AUE_NFS_DELEGPURGE:nfsrv_delegpurge():nfs,ad +2025:AUE_NFS_DELEGRETURN:nfsrv_delegreturn():nfs,ad +2026:AUE_NFSv4_GETFH:nfsrv4_getfh():nfs,ad +2027:AUE_NFS_LOCK:nfsrv_lock():nfs,fm +2028:AUE_NFS_LOCKT:nfsrv_lockt():nfs,fm +2029:AUE_NFS_LOCKU:nfsrv_locku():nfs,fm +2030:AUE_NFS_LOOKUPP:nfsrv_lookupp():nfs,fa,ad +2031:AUE_NFS_NVERIFY:nfsrv_nverify():nfs,fa +2032:AUE_NFS_OPEN:nfsrv_open():nfs,fa +2033:AUE_NFS_OPENATTR:nfsrv_openattr():nfs,fa +2034:AUE_NFS_OPENCONFIRM:nfsrv_openconfirm():nfs,fa +2035:AUE_NFS_OPENDOWNGRADE:nfsrv_opendowngrade():nfs,fm +2036:AUE_NFS_PUTFH:nfsrv_putfh():nfs,ad +2037:AUE_NFS_PUTPUBFH:nfsrv_putpubfh():nfs,ad +2038:AUE_NFS_PUTROOTFH:nfsrv_putrootfh():nfs,ad +2039:AUE_NFS_RENEW:nfsrv_renew():nfs,ad +2040:AUE_NFS_RESTOREFH:nfsrv_restorefh():nfs,ad +2041:AUE_NFS_SAVEFH:nfsrv_savefh():nfs,ad +2042:AUE_NFS_SECINFO:nfsrv_secinfo():nfs,ot +2043:AUE_NFS_SETCLIENTID:nfsrv_setclientid():nfs,aa +2044:AUE_NFS_SETCLIENTIDCFRM:nfsrv_setclientidcfrm():nfs,aa +2045:AUE_NFS_VERIFY:nfsrv_verify():nfs,fa +2046:AUE_NFS_RELEASELCKOWN:nfsrv_releaselckown():nfs,ad +2047:AUE_NFS_OPEN_R:nfsrv_open() - read:nfs,fr +2048:AUE_NFS_OPEN_RC:nfsrv_open() - read, creat:nfs,fr,fc,fa,fm +2049:AUE_NFS_OPEN_RTC:nfsrv_open() - read, trunc, creat:nfs,fr,fd,fc,fa,fm +2050:AUE_NFS_OPEN_RT:nfsrv_open() - read, trunc:nfs,fr,fd,fa,fm +2051:AUE_NFS_OPEN_RW:nfsrv_open() - read, write:nfs,fr,fw +2052:AUE_NFS_OPEN_RWC:nfsrv_open() - read, write, creat:nfs,fr,fw,fc,fa,fm +2053:AUE_NFS_OPEN_RWTC:nfsrv_open() - read, write, trunc, creat:nfs,fr,fw,fd,fc,fa,fm +2054:AUE_NFS_OPEN_RWT:nfsrv_open() - read, write, trunc:nfs,fr,fw,fd,fa,fm +2055:AUE_NFS_OPEN_W:nfsrv_open() - write:nfs,fw +2056:AUE_NFS_OPEN_WC:nfsrv_open() - write, creat:nfs,fw,fc,fa,fm +2057:AUE_NFS_OPEN_WTC:nfsrv_open() - write, trunc, creat:nfs,fw,fd,fc,fa,fm +2058:AUE_NFS_OPEN_WT:nfsrv_open() - write, trunc:nfs,fw,fd,fa,fm # # Firewall Events # note: class 'aa' is only temporarily used From owner-p4-projects@FreeBSD.ORG Tue Mar 15 17:30:23 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 012961065675; Tue, 15 Mar 2011 17:30:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B764A1065670 for ; Tue, 15 Mar 2011 17:30:22 +0000 (UTC) (envelope-from gpf@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A1E738FC0A for ; Tue, 15 Mar 2011 17:30:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2FHUM03019117 for ; Tue, 15 Mar 2011 17:30:22 GMT (envelope-from gpf@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2FHUM6K019112 for perforce@freebsd.org; Tue, 15 Mar 2011 17:30:22 GMT (envelope-from gpf@FreeBSD.org) Date: Tue, 15 Mar 2011 17:30:22 GMT Message-Id: <201103151730.p2FHUM6K019112@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to gpf@FreeBSD.org using -f From: Efstratios Karatzas To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190065 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Mar 2011 17:30:23 -0000 http://p4web.freebsd.org/@@190065?ac=10 Change 190065 by gpf@gpf_desktop on 2011/03/15 17:29:45 - update values for new events Affected files ... .. //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/etc/audit_event#10 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/sys/bsm/audit_kevents.h#2 edit .. //depot/projects/soc2010/gpf_audit/freebsd/src/sys/bsm/audit_kevents.h#7 edit Differences ... ==== //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/etc/audit_event#10 (text) ==== @@ -12,7 +12,10 @@ # # 0 Reserved and invalid # 1 - 2047 Reserved for Solaris kernel events -# 2048 - 5999 Reserved and unallocated +# 2048 - 2999 Reserved and unallocated +# 3000 - 3999 Reserved for NFS specific kernel events +# 4000 - 4999 Reserved for firewall kernel events +# 5000 - 5999 Reserved and unallocated # 6000 - 9999 Reserved for Solaris user events # 10000 - 32767 Reserved and unallocated # 32768 - 65535 Available for third party applications @@ -362,74 +365,74 @@ # # NFS-specific kernel events # -2000:AUE_NFS_NULL:nfsrv_null():nfs,ot -2001:AUE_NFS_GETATTR:nfsrv_getattr():nfs,fa -2002:AUE_NFS_SETATTR:nfsrv_setattr():nfs,fm -2003:AUE_NFS_LOOKUP:nfsrv_lookup():nfs,fa,ad -2004:AUE_NFS_ACCESS:nfsrv_access():nfs,fa -2005:AUE_NFS_READLINK:nfsrv_readlink():nfs,fr -2006:AUE_NFS_READ:nfsrv_read():nfs,fr -2007:AUE_NFS_WRITE:nfsrv_write():nfs,fw -2008:AUE_NFS_CREATE:nfsrv_create():nfs,fc,ad -2009:AUE_NFS_MKDIR:nfsrv_mkdir():nfs,fc,ad -2010:AUE_NFS_SYMLINK:nfsrv_symlink():nfs,fc,ad -2011:AUE_NFS_MKNOD:nfsrv_mknod():nfs,fc,ad -2012:AUE_NFS_REMOVE:nfsrv_remove():nfs,fd -2013:AUE_NFS_RMDIR:nfsrv_rmdir():nfs,fd -2014:AUE_NFS_RENAME:nfsrv_rename():nfs,fc,fd -2015:AUE_NFS_LINK:nfsrv_link():nfs,fc -2016:AUE_NFS_READDIR:nfsrv_readdir():nfs,fr -2017:AUE_NFS_READDIR_PLUS:nfsrv_readdirplus():nfs,fr,ad -2018:AUE_NFS_STATFS:nfsrv_statfs():nfs,fa -2019:AUE_NFS_FSINFO:nfsrv_fsinfo():nfs,ot -2020:AUE_NFS_PATHCONF:nfsrv_pathconf():nfs,fa -2021:AUE_NFS_COMMIT:nfsrv_commit():nfs,fw -2022:AUE_NFS_NOOP:nfsrv_noop():nfs,no +3000:AUE_NFS_NULL:nfsrv_null():nfs,ot +3001:AUE_NFS_GETATTR:nfsrv_getattr():nfs,fa +3002:AUE_NFS_SETATTR:nfsrv_setattr():nfs,fm +3003:AUE_NFS_LOOKUP:nfsrv_lookup():nfs,fa,ad +3004:AUE_NFS_ACCESS:nfsrv_access():nfs,fa +3005:AUE_NFS_READLINK:nfsrv_readlink():nfs,fr +3006:AUE_NFS_READ:nfsrv_read():nfs,fr +3007:AUE_NFS_WRITE:nfsrv_write():nfs,fw +3008:AUE_NFS_CREATE:nfsrv_create():nfs,fc,ad +3009:AUE_NFS_MKDIR:nfsrv_mkdir():nfs,fc,ad +3010:AUE_NFS_SYMLINK:nfsrv_symlink():nfs,fc,ad +3011:AUE_NFS_MKNOD:nfsrv_mknod():nfs,fc,ad +3012:AUE_NFS_REMOVE:nfsrv_remove():nfs,fd +3013:AUE_NFS_RMDIR:nfsrv_rmdir():nfs,fd +3014:AUE_NFS_RENAME:nfsrv_rename():nfs,fc,fd +3015:AUE_NFS_LINK:nfsrv_link():nfs,fc +3016:AUE_NFS_READDIR:nfsrv_readdir():nfs,fr +3017:AUE_NFS_READDIR_PLUS:nfsrv_readdirplus():nfs,fr,ad +3018:AUE_NFS_STATFS:nfsrv_statfs():nfs,fa +3019:AUE_NFS_FSINFO:nfsrv_fsinfo():nfs,ot +3020:AUE_NFS_PATHCONF:nfsrv_pathconf():nfs,fa +3021:AUE_NFS_COMMIT:nfsrv_commit():nfs,fw +3022:AUE_NFS_NOOP:nfsrv_noop():nfs,no # # NFSv4 specific RPC events # -2023:AUE_NFS_CLOSE:nfsrv_close():nfs,cl -2024:AUE_NFS_DELEGPURGE:nfsrv_delegpurge():nfs,ad -2025:AUE_NFS_DELEGRETURN:nfsrv_delegreturn():nfs,ad -2026:AUE_NFSv4_GETFH:nfsrv4_getfh():nfs,ad -2027:AUE_NFS_LOCK:nfsrv_lock():nfs,fm -2028:AUE_NFS_LOCKT:nfsrv_lockt():nfs,fm -2029:AUE_NFS_LOCKU:nfsrv_locku():nfs,fm -2030:AUE_NFS_LOOKUPP:nfsrv_lookupp():nfs,fa,ad -2031:AUE_NFS_NVERIFY:nfsrv_nverify():nfs,fa -2032:AUE_NFS_OPEN:nfsrv_open():nfs,fa -2033:AUE_NFS_OPENATTR:nfsrv_openattr():nfs,fa -2034:AUE_NFS_OPENCONFIRM:nfsrv_openconfirm():nfs,fa -2035:AUE_NFS_OPENDOWNGRADE:nfsrv_opendowngrade():nfs,fm -2036:AUE_NFS_PUTFH:nfsrv_putfh():nfs,ad -2037:AUE_NFS_PUTPUBFH:nfsrv_putpubfh():nfs,ad -2038:AUE_NFS_PUTROOTFH:nfsrv_putrootfh():nfs,ad -2039:AUE_NFS_RENEW:nfsrv_renew():nfs,ad -2040:AUE_NFS_RESTOREFH:nfsrv_restorefh():nfs,ad -2041:AUE_NFS_SAVEFH:nfsrv_savefh():nfs,ad -2042:AUE_NFS_SECINFO:nfsrv_secinfo():nfs,ot -2043:AUE_NFS_SETCLIENTID:nfsrv_setclientid():nfs,aa -2044:AUE_NFS_SETCLIENTIDCFRM:nfsrv_setclientidcfrm():nfs,aa -2045:AUE_NFS_VERIFY:nfsrv_verify():nfs,fa -2046:AUE_NFS_RELEASELCKOWN:nfsrv_releaselckown():nfs,ad -2047:AUE_NFS_OPEN_R:nfsrv_open() - read:nfs,fr -2048:AUE_NFS_OPEN_RC:nfsrv_open() - read, creat:nfs,fr,fc,fa,fm -2049:AUE_NFS_OPEN_RTC:nfsrv_open() - read, trunc, creat:nfs,fr,fd,fc,fa,fm -2050:AUE_NFS_OPEN_RT:nfsrv_open() - read, trunc:nfs,fr,fd,fa,fm -2051:AUE_NFS_OPEN_RW:nfsrv_open() - read, write:nfs,fr,fw -2052:AUE_NFS_OPEN_RWC:nfsrv_open() - read, write, creat:nfs,fr,fw,fc,fa,fm -2053:AUE_NFS_OPEN_RWTC:nfsrv_open() - read, write, trunc, creat:nfs,fr,fw,fd,fc,fa,fm -2054:AUE_NFS_OPEN_RWT:nfsrv_open() - read, write, trunc:nfs,fr,fw,fd,fa,fm -2055:AUE_NFS_OPEN_W:nfsrv_open() - write:nfs,fw -2056:AUE_NFS_OPEN_WC:nfsrv_open() - write, creat:nfs,fw,fc,fa,fm -2057:AUE_NFS_OPEN_WTC:nfsrv_open() - write, trunc, creat:nfs,fw,fd,fc,fa,fm -2058:AUE_NFS_OPEN_WT:nfsrv_open() - write, trunc:nfs,fw,fd,fa,fm +3023:AUE_NFS_CLOSE:nfsrv_close():nfs,cl +3024:AUE_NFS_DELEGPURGE:nfsrv_delegpurge():nfs,ad +3025:AUE_NFS_DELEGRETURN:nfsrv_delegreturn():nfs,ad +3026:AUE_NFSv4_GETFH:nfsrv4_getfh():nfs,ad +3027:AUE_NFS_LOCK:nfsrv_lock():nfs,fm +3028:AUE_NFS_LOCKT:nfsrv_lockt():nfs,fm +3029:AUE_NFS_LOCKU:nfsrv_locku():nfs,fm +3030:AUE_NFS_LOOKUPP:nfsrv_lookupp():nfs,fa,ad +3031:AUE_NFS_NVERIFY:nfsrv_nverify():nfs,fa +3032:AUE_NFS_OPEN:nfsrv_open():nfs,fa +3033:AUE_NFS_OPENATTR:nfsrv_openattr():nfs,fa +3034:AUE_NFS_OPENCONFIRM:nfsrv_openconfirm():nfs,fa +3035:AUE_NFS_OPENDOWNGRADE:nfsrv_opendowngrade():nfs,fm +3036:AUE_NFS_PUTFH:nfsrv_putfh():nfs,ad +3037:AUE_NFS_PUTPUBFH:nfsrv_putpubfh():nfs,ad +3038:AUE_NFS_PUTROOTFH:nfsrv_putrootfh():nfs,ad +3039:AUE_NFS_RENEW:nfsrv_renew():nfs,ad +3040:AUE_NFS_RESTOREFH:nfsrv_restorefh():nfs,ad +3041:AUE_NFS_SAVEFH:nfsrv_savefh():nfs,ad +3042:AUE_NFS_SECINFO:nfsrv_secinfo():nfs,ot +3043:AUE_NFS_SETCLIENTID:nfsrv_setclientid():nfs,aa +3044:AUE_NFS_SETCLIENTIDCFRM:nfsrv_setclientidcfrm():nfs,aa +3045:AUE_NFS_VERIFY:nfsrv_verify():nfs,fa +3046:AUE_NFS_RELEASELCKOWN:nfsrv_releaselckown():nfs,ad +3047:AUE_NFS_OPEN_R:nfsrv_open() - read:nfs,fr +3048:AUE_NFS_OPEN_RC:nfsrv_open() - read, creat:nfs,fr,fc,fa,fm +3049:AUE_NFS_OPEN_RTC:nfsrv_open() - read, trunc, creat:nfs,fr,fd,fc,fa,fm +3050:AUE_NFS_OPEN_RT:nfsrv_open() - read, trunc:nfs,fr,fd,fa,fm +3051:AUE_NFS_OPEN_RW:nfsrv_open() - read, write:nfs,fr,fw +3052:AUE_NFS_OPEN_RWC:nfsrv_open() - read, write, creat:nfs,fr,fw,fc,fa,fm +3053:AUE_NFS_OPEN_RWTC:nfsrv_open() - read, write, trunc, creat:nfs,fr,fw,fd,fc,fa,fm +3054:AUE_NFS_OPEN_RWT:nfsrv_open() - read, write, trunc:nfs,fr,fw,fd,fa,fm +3055:AUE_NFS_OPEN_W:nfsrv_open() - write:nfs,fw +3056:AUE_NFS_OPEN_WC:nfsrv_open() - write, creat:nfs,fw,fc,fa,fm +3057:AUE_NFS_OPEN_WTC:nfsrv_open() - write, trunc, creat:nfs,fw,fd,fc,fa,fm +3058:AUE_NFS_OPEN_WT:nfsrv_open() - write, trunc:nfs,fw,fd,fa,fm # # Firewall Events # note: class 'aa' is only temporarily used # -3000:AUE_PFIL_ENABLE:enable packet filtering:aa -3001:AUE_PFIL_DISABLE:disable packet filtering:aa +4000:AUE_PFIL_ENABLE:enable packet filtering:aa +4001:AUE_PFIL_DISABLE:disable packet filtering:aa # # OpenBSM-specific kernel events. # ==== //depot/projects/soc2010/gpf_audit/freebsd/src/contrib/openbsm/sys/bsm/audit_kevents.h#2 (text) ==== @@ -33,9 +33,10 @@ #define _BSM_AUDIT_KEVENTS_H_ /* - * The reserved event numbers for kernel events are 1...2047 and 43001..44900. + * The reserved event numbers for kernel events are 1...2047, 3000...4999 and 43001..44900. */ #define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \ + ((e) > 2999 && (e) < 5000) || \ ((e) > 43000 && (e) < 45000)) /* @@ -384,6 +385,75 @@ #define AUE_DARWIN_COPYFILE 361 /* Darwin-specific. */ /* + * NFS RPC events + */ +#define AUE_NFS_NULL 3000 +#define AUE_NFS_GETATTR 3001 +#define AUE_NFS_SETATTR 3002 +#define AUE_NFS_LOOKUP 3003 +#define AUE_NFS_ACCESS 3004 +#define AUE_NFS_READLINK 3005 +#define AUE_NFS_READ 3006 +#define AUE_NFS_WRITE 3007 +#define AUE_NFS_CREATE 3008 +#define AUE_NFS_MKDIR 3009 +#define AUE_NFS_SYMLINK 3010 +#define AUE_NFS_MKNOD 3011 +#define AUE_NFS_REMOVE 3012 +#define AUE_NFS_RMDIR 3013 +#define AUE_NFS_RENAME 3014 +#define AUE_NFS_LINK 3015 +#define AUE_NFS_READDIR 3016 +#define AUE_NFS_READDIR_PLUS 3017 +#define AUE_NFS_STATFS 3018 +#define AUE_NFS_FSINFO 3019 +#define AUE_NFS_PATHCONF 3020 +#define AUE_NFS_COMMIT 3021 +#define AUE_NFS_NOOP 3022 +/* NFSv4 specific RPC events */ +#define AUE_NFS_CLOSE 3023 +#define AUE_NFS_DELEGPURGE 3024 +#define AUE_NFS_DELEGRETURN 3025 +#define AUE_NFSv4_GETFH 3026 +#define AUE_NFS_LOCK 3027 +#define AUE_NFS_LOCKT 3028 +#define AUE_NFS_LOCKU 3029 +#define AUE_NFS_LOOKUPP 3030 +#define AUE_NFS_NVERIFY 3031 +#define AUE_NFS_OPEN 3032 +#define AUE_NFS_OPENATTR 3033 +#define AUE_NFS_OPENCONFIRM 3034 +#define AUE_NFS_OPENDOWNGRADE 3035 +#define AUE_NFS_PUTFH 3036 +#define AUE_NFS_PUTPUBFH 3037 +#define AUE_NFS_PUTROOTFH 3038 +#define AUE_NFS_RENEW 3039 +#define AUE_NFS_RESTOREFH 3040 +#define AUE_NFS_SAVEFH 3041 +#define AUE_NFS_SECINFO 3042 +#define AUE_NFS_SETCLIENTID 3043 +#define AUE_NFS_SETCLIENTIDCFRM 3044 +#define AUE_NFS_VERIFY 3045 +#define AUE_NFS_RELEASELCKOWN 3046 +#define AUE_NFS_OPEN_R 3047 +#define AUE_NFS_OPEN_RC 3048 +#define AUE_NFS_OPEN_RTC 3049 +#define AUE_NFS_OPEN_RT 3050 +#define AUE_NFS_OPEN_RW 3051 +#define AUE_NFS_OPEN_RWC 3052 +#define AUE_NFS_OPEN_RWTC 3053 +#define AUE_NFS_OPEN_RWT 3054 +#define AUE_NFS_OPEN_W 3055 +#define AUE_NFS_OPEN_WC 3056 +#define AUE_NFS_OPEN_WTC 3057 +#define AUE_NFS_OPEN_WT 3058 +/* + * Firewall Events + */ +#define AUE_PFIL_ENABLE 4000 +#define AUE_PFIL_DISABLE 4001 + +/* * Audit event identifiers added as part of OpenBSM, generally corresponding * to events in FreeBSD, Darwin, and Linux that were not present in Solaris. * These often duplicate events added to the Solaris set by Darwin, but use ==== //depot/projects/soc2010/gpf_audit/freebsd/src/sys/bsm/audit_kevents.h#7 (text) ==== @@ -34,9 +34,10 @@ #define _BSM_AUDIT_KEVENTS_H_ /* - * The reserved event numbers for kernel events are 1...2047 and 43001..44900. + * The reserved event numbers for kernel events are 1...2047, 3000...4999 and 43001..44900. */ #define AUE_IS_A_KEVENT(e) (((e) > 0 && (e) < 2048) || \ + ((e) > 2999 && (e) < 5000) || \ ((e) > 43000 && (e) < 45000)) /* @@ -387,71 +388,71 @@ /* * NFS RPC events */ -#define AUE_NFS_NULL 2000 -#define AUE_NFS_GETATTR 2001 -#define AUE_NFS_SETATTR 2002 -#define AUE_NFS_LOOKUP 2003 -#define AUE_NFS_ACCESS 2004 -#define AUE_NFS_READLINK 2005 -#define AUE_NFS_READ 2006 -#define AUE_NFS_WRITE 2007 -#define AUE_NFS_CREATE 2008 -#define AUE_NFS_MKDIR 2009 -#define AUE_NFS_SYMLINK 2010 -#define AUE_NFS_MKNOD 2011 -#define AUE_NFS_REMOVE 2012 -#define AUE_NFS_RMDIR 2013 -#define AUE_NFS_RENAME 2014 -#define AUE_NFS_LINK 2015 -#define AUE_NFS_READDIR 2016 -#define AUE_NFS_READDIR_PLUS 2017 -#define AUE_NFS_STATFS 2018 -#define AUE_NFS_FSINFO 2019 -#define AUE_NFS_PATHCONF 2020 -#define AUE_NFS_COMMIT 2021 -#define AUE_NFS_NOOP 2022 +#define AUE_NFS_NULL 3000 +#define AUE_NFS_GETATTR 3001 +#define AUE_NFS_SETATTR 3002 +#define AUE_NFS_LOOKUP 3003 +#define AUE_NFS_ACCESS 3004 +#define AUE_NFS_READLINK 3005 +#define AUE_NFS_READ 3006 +#define AUE_NFS_WRITE 3007 +#define AUE_NFS_CREATE 3008 +#define AUE_NFS_MKDIR 3009 +#define AUE_NFS_SYMLINK 3010 +#define AUE_NFS_MKNOD 3011 +#define AUE_NFS_REMOVE 3012 +#define AUE_NFS_RMDIR 3013 +#define AUE_NFS_RENAME 3014 +#define AUE_NFS_LINK 3015 +#define AUE_NFS_READDIR 3016 +#define AUE_NFS_READDIR_PLUS 3017 +#define AUE_NFS_STATFS 3018 +#define AUE_NFS_FSINFO 3019 +#define AUE_NFS_PATHCONF 3020 +#define AUE_NFS_COMMIT 3021 +#define AUE_NFS_NOOP 3022 /* NFSv4 specific RPC events */ -#define AUE_NFS_CLOSE 2023 -#define AUE_NFS_DELEGPURGE 2024 -#define AUE_NFS_DELEGRETURN 2025 -#define AUE_NFSv4_GETFH 2026 -#define AUE_NFS_LOCK 2027 -#define AUE_NFS_LOCKT 2028 -#define AUE_NFS_LOCKU 2029 -#define AUE_NFS_LOOKUPP 2030 -#define AUE_NFS_NVERIFY 2031 -#define AUE_NFS_OPEN 2032 -#define AUE_NFS_OPENATTR 2033 -#define AUE_NFS_OPENCONFIRM 2034 -#define AUE_NFS_OPENDOWNGRADE 2035 -#define AUE_NFS_PUTFH 2036 -#define AUE_NFS_PUTPUBFH 2037 -#define AUE_NFS_PUTROOTFH 2038 -#define AUE_NFS_RENEW 2039 -#define AUE_NFS_RESTOREFH 2040 -#define AUE_NFS_SAVEFH 2041 -#define AUE_NFS_SECINFO 2042 -#define AUE_NFS_SETCLIENTID 2043 -#define AUE_NFS_SETCLIENTIDCFRM 2044 -#define AUE_NFS_VERIFY 2045 -#define AUE_NFS_RELEASELCKOWN 2046 -#define AUE_NFS_OPEN_R 2047 -#define AUE_NFS_OPEN_RC 2048 -#define AUE_NFS_OPEN_RTC 2049 -#define AUE_NFS_OPEN_RT 2050 -#define AUE_NFS_OPEN_RW 2051 -#define AUE_NFS_OPEN_RWC 2052 -#define AUE_NFS_OPEN_RWTC 2053 -#define AUE_NFS_OPEN_RWT 2054 -#define AUE_NFS_OPEN_W 2055 -#define AUE_NFS_OPEN_WC 2056 -#define AUE_NFS_OPEN_WTC 2057 -#define AUE_NFS_OPEN_WT 2058 +#define AUE_NFS_CLOSE 3023 +#define AUE_NFS_DELEGPURGE 3024 +#define AUE_NFS_DELEGRETURN 3025 +#define AUE_NFSv4_GETFH 3026 +#define AUE_NFS_LOCK 3027 +#define AUE_NFS_LOCKT 3028 +#define AUE_NFS_LOCKU 3029 +#define AUE_NFS_LOOKUPP 3030 +#define AUE_NFS_NVERIFY 3031 +#define AUE_NFS_OPEN 3032 +#define AUE_NFS_OPENATTR 3033 +#define AUE_NFS_OPENCONFIRM 3034 +#define AUE_NFS_OPENDOWNGRADE 3035 +#define AUE_NFS_PUTFH 3036 +#define AUE_NFS_PUTPUBFH 3037 +#define AUE_NFS_PUTROOTFH 3038 +#define AUE_NFS_RENEW 3039 +#define AUE_NFS_RESTOREFH 3040 +#define AUE_NFS_SAVEFH 3041 +#define AUE_NFS_SECINFO 3042 +#define AUE_NFS_SETCLIENTID 3043 +#define AUE_NFS_SETCLIENTIDCFRM 3044 +#define AUE_NFS_VERIFY 3045 +#define AUE_NFS_RELEASELCKOWN 3046 +#define AUE_NFS_OPEN_R 3047 +#define AUE_NFS_OPEN_RC 3048 +#define AUE_NFS_OPEN_RTC 3049 +#define AUE_NFS_OPEN_RT 3050 +#define AUE_NFS_OPEN_RW 3051 +#define AUE_NFS_OPEN_RWC 3052 +#define AUE_NFS_OPEN_RWTC 3053 +#define AUE_NFS_OPEN_RWT 3054 +#define AUE_NFS_OPEN_W 3055 +#define AUE_NFS_OPEN_WC 3056 +#define AUE_NFS_OPEN_WTC 3057 +#define AUE_NFS_OPEN_WT 3058 /* * Firewall Events */ -#define AUE_PFIL_ENABLE 3000 -#define AUE_PFIL_DISABLE 3001 +#define AUE_PFIL_ENABLE 4000 +#define AUE_PFIL_DISABLE 4001 /* * Audit event identifiers added as part of OpenBSM, generally corresponding From owner-p4-projects@FreeBSD.ORG Sat Mar 19 11:04:23 2011 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D876106568C; Sat, 19 Mar 2011 11:04:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C44271065678 for ; Sat, 19 Mar 2011 11:04:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B47E48FC14 for ; Sat, 19 Mar 2011 11:04:22 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p2JB4MpB071962 for ; Sat, 19 Mar 2011 11:04:22 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p2JB4M9h071959 for perforce@freebsd.org; Sat, 19 Mar 2011 11:04:22 GMT (envelope-from trasz@freebsd.org) Date: Sat, 19 Mar 2011 11:04:22 GMT Message-Id: <201103191104.p2JB4M9h071959@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 190232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Mar 2011 11:04:23 -0000 http://p4web.freebsd.org/@@190232?ac=10 Change 190232 by trasz@trasz_victim on 2011/03/19 11:04:10 Remove pctcpu; not finished and doesn't quite work. Will get back to it after RCTL gets integrated into 9-CURRENT. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#76 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#39 edit .. //depot/projects/soc2009/trasz_limits/sys/sys/container.h#27 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_container.c#76 (text+ko) ==== @@ -110,8 +110,7 @@ [RUSAGE_NSEMOP] = RUSAGE_RECLAIMABLE | RUSAGE_INHERITABLE | RUSAGE_DENIABLE, [RUSAGE_NSHM] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, [RUSAGE_SHMSIZE] = RUSAGE_RECLAIMABLE | RUSAGE_DENIABLE | RUSAGE_SLOPPY, - [RUSAGE_WALLCLOCK] = RUSAGE_IN_THOUSANDS, - [RUSAGE_PCTCPU] = RUSAGE_IN_THOUSANDS | RUSAGE_RECLAIMABLE | RUSAGE_DAMPENED }; + [RUSAGE_WALLCLOCK] = RUSAGE_IN_THOUSANDS }; static void container_add(struct container *dest, const struct container *src) @@ -588,7 +587,7 @@ void container_proc_exit(struct proc *p) { - uint64_t runtime, pctcpu; + uint64_t runtime; PROC_LOCK(p); /* @@ -601,9 +600,7 @@ if (runtime < p->p_prev_runtime) runtime = p->p_prev_runtime; #endif - pctcpu = (runtime - p->p_prev_runtime) / 10; rusage_set(p, RUSAGE_CPU, runtime); - rusage_add(p, RUSAGE_PCTCPU, pctcpu); /* * XXX: Free this some other way. @@ -664,75 +661,15 @@ } static void -rusage_throttle(struct proc *p, int throttle) -{ - struct thread *td; - u_char oldpri; - u_char newpri; - int type; - - PROC_LOCK_ASSERT(p, MA_OWNED); - - if (throttle) { - p->p_throttle++; - newpri = PRI_MIN_IDLE; - type = RTP_PRIO_IDLE; - } else if (p->p_throttle > 0) { - p->p_throttle--; - newpri = PRI_MIN_TIMESHARE; - type = RTP_PRIO_NORMAL; - } else - return; - - FOREACH_THREAD_IN_PROC(p, td) { - thread_lock(td); - /* Mostly copied from rtp_to_pri(). */ - sched_class(td, type); /* XXX fix */ - oldpri = td->td_user_pri; - sched_user_prio(td, newpri); - if (TD_IS_RUNNING(td) || TD_CAN_RUN(td)) - sched_prio(td, td->td_user_pri); /* XXX dubious */ - if (TD_ON_UPILOCK(td) && oldpri != newpri) - umtx_pi_adjust(td, oldpri); - thread_unlock(td); - } -} - -/* - * %CPU is special. Each second we zero out RUSAGE_PCTCPU for all - * the processes and other containers before calculating %CPU. Reason - * for this is that we also to update %CPU when process exits, - * and that would cause the %CPU for per-user or per-jail containers - * to grow indefinitely. - */ -static void -container_dampen_callback(struct container *container, void *arg2, void *arg3) -{ - - mtx_lock(&container_lock); - container->c_resources[RUSAGE_PCTCPU] = 0; - mtx_unlock(&container_lock); -} - -static void containerd(void) { struct thread *td; struct proc *p; struct timeval wallclock; - uint64_t pctcpu, pctcpu_limit, runtime; + uint64_t runtime; for (;;) { sx_slock(&allproc_lock); - /* - * XXX: There is a window between zeroing the stats and setting - * them to a proper value. - */ - loginclass_container_foreach(container_dampen_callback, NULL, - NULL); - ui_container_foreach(container_dampen_callback, NULL, NULL); - prison_container_foreach(container_dampen_callback, NULL, - NULL); FOREACH_PROC_IN_SYSTEM(p) { if (p->p_state != PRS_NORMAL) @@ -742,7 +679,6 @@ microuptime(&wallclock); timevalsub(&wallclock, &p->p_stats->p_start); - pctcpu_limit = rusage_get_available(p, RUSAGE_PCTCPU); PROC_LOCK(p); PROC_SLOCK(p); FOREACH_THREAD_IN_PROC(p, td) { @@ -759,16 +695,9 @@ if (runtime < p->p_prev_runtime) runtime = p->p_prev_runtime; #endif - pctcpu = (runtime - p->p_prev_runtime) / 10; p->p_prev_runtime = runtime; - if (pctcpu > pctcpu_limit) - rusage_throttle(p, 1); - else - rusage_throttle(p, 0); mtx_lock(&container_lock); rusage_set_locked(p, RUSAGE_CPU, runtime); - p->p_container->c_resources[RUSAGE_PCTCPU] = 0; - rusage_set_locked(p, RUSAGE_PCTCPU, pctcpu); rusage_set_locked(p, RUSAGE_WALLCLOCK, wallclock.tv_sec * 1000000 + wallclock.tv_usec); mtx_unlock(&container_lock); @@ -787,28 +716,11 @@ SYSINIT(containerd, SI_SUB_CONTAINERD, SI_ORDER_FIRST, kproc_start, &containerd_kp); static void -container_proc_fork_sched(void *arg __unused, struct proc *p1, - struct proc *newproc, int flags) -{ - uint64_t pctcpu_limit; - - /* - * Newly created process may already be over the %CPU limit. Throttle - * it immediately after fork instead of waiting for containerd. - */ - pctcpu_limit = rusage_get_limit(newproc, RUSAGE_PCTCPU); - if (pctcpu_limit <= 0) - rusage_throttle(newproc, 1); -} - -static void container_init(void) { container_zone = uma_zcreate("container", sizeof(struct container), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); - EVENTHANDLER_REGISTER(process_fork, container_proc_fork_sched, NULL, - EVENTHANDLER_PRI_ANY); /* * XXX: Move this somewhere. */ ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_rctl.c#39 (text+ko) ==== @@ -121,7 +121,6 @@ { "nshm", RUSAGE_NSHM }, { "shmsize", RUSAGE_SHMSIZE }, { "wallclock", RUSAGE_WALLCLOCK }, - { "pctcpu", RUSAGE_PCTCPU }, { NULL, -1 }}; static struct dict actionnames[] = { ==== //depot/projects/soc2009/trasz_limits/sys/sys/container.h#27 (text+ko) ==== @@ -67,8 +67,7 @@ #define RUSAGE_NSHM 19 #define RUSAGE_SHMSIZE 20 #define RUSAGE_WALLCLOCK 21 -#define RUSAGE_PCTCPU 22 -#define RUSAGE_MAX RUSAGE_PCTCPU +#define RUSAGE_MAX RUSAGE_WALLCLOCK /* * Resource types.