NetBSD/usr.sbin
lukem 5c2ee5861d Incorporate the enhanced ffs_dirpref() by Grigoriy Orlov, as found in
FreeBSD (three commits; the initial work, man page updates, and a fix
to ffs_reload()), with the following differences:
- Be consistent between newfs(8) and tunefs(8) as to the options which
  set and control the tuning parameters for this work (avgfilesize & avgfpdir)
- Use u_int16_t instead of u_int8_t to keep track of the number of
  contiguous directories (suggested by Chuck Silvers)
- Work within our FFS_EI framework
- Ensure that fs->fs_maxclusters and fs->fs_contigdirs don't point to
  the same area of memory

The new algorithm has a marked performance increase, especially when
performing tasks such as untarring pkgsrc.tar.gz, etc.

The original FreeBSD commit messages are attached:

=====
mckusick    2001/04/10 01:39:00 PDT
  Directory layout preference improvements from Grigoriy Orlov <gluk@ptci.ru>.
  His description of the problem and solution follow. My own tests show
  speedups on typical filesystem intensive workloads of 5% to 12% which
  is very impressive considering the small amount of code change involved.

  ------

    One day I noticed that some file operations run much faster on
  small file systems then on big ones. I've looked at the ffs
  algorithms, thought about them, and redesigned the dirpref algorithm.

    First I want to describe the results of my tests. These results are old
  and I have improved the algorithm after these tests were done. Nevertheless
  they show how big the perfomance speedup may be. I have done two file/directory
  intensive tests on a two OpenBSD systems with old and new dirpref algorithm.
  The first test is "tar -xzf ports.tar.gz", the second is "rm -rf ports".
  The ports.tar.gz file is the ports collection from the OpenBSD 2.8 release.
  It contains 6596 directories and 13868 files. The test systems are:

  1. Celeron-450, 128Mb, two IDE drives, the system at wd0, file system for
     test is at wd1. Size of test file system is 8 Gb, number of cg=991,
     size of cg is 8m, block size = 8k, fragment size = 1k OpenBSD-current
     from Dec 2000 with BUFCACHEPERCENT=35

  2. PIII-600, 128Mb, two IBM DTLA-307045 IDE drives at i815e, the system
     at wd0, file system for test is at wd1. Size of test file system is 40 Gb,
     number of cg=5324, size of cg is 8m, block size = 8k, fragment size = 1k
     OpenBSD-current from Dec 2000 with BUFCACHEPERCENT=50

  You can get more info about the test systems and methods at:
  http://www.ptci.ru/gluk/dirpref/old/dirpref.html

                                Test Results

               tar -xzf ports.tar.gz               rm -rf ports
    mode  old dirpref new dirpref speedup old dirprefnew dirpref speedup
                               First system
   normal     667         472      1.41       477        331       1.44
   async      285         144      1.98       130         14       9.29
   sync       768         616      1.25       477        334       1.43
   softdep    413         252      1.64       241         38       6.34
                               Second system
   normal     329         81       4.06       263.5       93.5     2.81
   async      302         25.7    11.75       112          2.26   49.56
   sync       281         57.0     4.93       263         90.5     2.9
   softdep    341         40.6     8.4        284          4.76   59.66

  "old dirpref" and "new dirpref" columns give a test time in seconds.
  speedup - speed increasement in times, ie. old dirpref / new dirpref.

  ------

  Algorithm description

  The old dirpref algorithm is described in comments:

  /*
   * Find a cylinder to place a directory.
   *
   * The policy implemented by this algorithm is to select from
   * among those cylinder groups with above the average number of
   * free inodes, the one with the smallest number of directories.
   */

  A new directory is allocated in a different cylinder groups than its
  parent directory resulting in a directory tree that is spreaded across
  all the cylinder groups. This spreading out results in a non-optimal
  access to the directories and files. When we have a small filesystem
  it is not a problem but when the filesystem is big then perfomance
  degradation becomes very apparent.

  What I mean by a big file system ?

    1. A big filesystem is a filesystem which occupy 20-30 or more percent
       of total drive space, i.e. first and last cylinder are physically
       located relatively far from each other.
    2. It has a relatively large number of cylinder groups, for example
       more cylinder groups than 50% of the buffers in the buffer cache.

  The first results in long access times, while the second results in
  many buffers being used by metadata operations. Such operations use
  cylinder group blocks and on-disk inode blocks. The cylinder group
  block (fs->fs_cblkno) contains struct cg, inode and block bit maps.
  It is 2k in size for the default filesystem parameters. If new and
  parent directories are located in different cylinder groups then the
  system performs more input/output operations and uses more buffers.
  On filesystems with many cylinder groups, lots of cache buffers are
  used for metadata operations.

  My solution for this problem is very simple. I allocate many directories
  in one cylinder group. I also do some things, so that the new allocation
  method does not cause excessive fragmentation and all directory inodes
  will not be located at a location far from its file's inodes and data.
  The algorithm is:
  /*
   * Find a cylinder group to place a directory.
   *
   * The policy implemented by this algorithm is to allocate a
   * directory inode in the same cylinder group as its parent
   * directory, but also to reserve space for its files inodes
   * and data. Restrict the number of directories which may be
   * allocated one after another in the same cylinder group
   * without intervening allocation of files.
   *
   * If we allocate a first level directory then force allocation
   * in another cylinder group.
   */

    My early versions of dirpref give me a good results for a wide range of
  file operations and different filesystem capacities except one case:
  those applications that create their entire directory structure first
  and only later fill this structure with files.

    My solution for such and similar cases is to limit a number of
  directories which may be created one after another in the same cylinder
  group without intervening file creations. For this purpose, I allocate
  an array of counters at mount time. This array is linked to the superblock
  fs->fs_contigdirs[cg]. Each time a directory is created the counter
  increases and each time a file is created the counter decreases. A 60Gb
  filesystem with 8mb/cg requires 10kb of memory for the counters array.

    The maxcontigdirs is a maximum number of directories which may be created
  without an intervening file creation. I found in my tests that the best
  performance occurs when I restrict the number of directories in one cylinder
  group such that all its files may be located in the same cylinder group.
  There may be some deterioration in performance if all the file inodes
  are in the same cylinder group as its containing directory, but their
  data partially resides in a different cylinder group. The maxcontigdirs
  value is calculated to try to prevent this condition. Since there is
  no way to know how many files and directories will be allocated later
  I added two optimization parameters in superblock/tunefs. They are:

          int32_t  fs_avgfilesize;   /* expected average file size */
          int32_t  fs_avgfpdir;      /* expected # of files per directory */

  These parameters have reasonable defaults but may be tweeked for special
  uses of a filesystem. They are only necessary in rare cases like better
  tuning a filesystem being used to store a squid cache.

  I have been using this algorithm for about 3 months. I have done
  a lot of testing on filesystems with different capacities, average
  filesize, average number of files per directory, and so on. I think
  this algorithm has no negative impact on filesystem perfomance. It
  works better than the default one in all cases. The new dirpref
  will greatly improve untarring/removing/coping of big directories,
  decrease load on cvs servers and much more. The new dirpref doesn't
  speedup a compilation process, but also doesn't slow it down.

  Obtained from:	Grigoriy Orlov <gluk@ptci.ru>
=====

=====
iedowse     2001/04/23 17:37:17 PDT
  Pre-dirpref versions of fsck may zero out the new superblock fields
  fs_contigdirs, fs_avgfilesize and fs_avgfpdir. This could cause
  panics if these fields were zeroed while a filesystem was mounted
  read-only, and then remounted read-write.

  Add code to ffs_reload() which copies the fs_contigdirs pointer
  from the previous superblock, and reinitialises fs_avgf* if necessary.

  Reviewed by:	mckusick
=====

=====
nik         2001/04/10 03:36:44 PDT
  Add information about the new options to newfs and tunefs which set the
  expected average file size and number of files per directory.  Could do
  with some fleshing out.
=====
2001-09-06 02:16:00 +00:00
..
ac Xref login 1, not 8. 2001-04-03 11:23:35 +00:00
accton convert to use getprogname() 2001-02-19 23:22:40 +00:00
altq sync with latest kame tree. snprintf() return value audit, log() cleanup, 2001-08-22 08:52:35 +00:00
amd Regenerated for am-utils 6.0.6. 2001-05-13 18:11:56 +00:00
apm support multiple batteries (currently only # of batteris is visible - 2001-07-22 16:05:17 +00:00
apmd Negative exit code cleanup: Replace exit(-x) with exit(x). 2001-04-06 11:13:45 +00:00
arp remove spurious newline in an error message. 2001-07-29 21:24:57 +00:00
bad144 * Make it a tiny bit clearer that this also works for IDE disks (by 2000-10-02 21:14:05 +00:00
bind disable DNSSEC build, for two reasons. (1) restrictive license 2001-05-27 04:39:40 +00:00
bootp precede, not preceed. 2001-08-20 12:00:46 +00:00
catman Don't discard all the hard work of setdefentries() and uniquepath(). 2001-05-20 22:05:30 +00:00
chown Correct display of invalid username error and cache duplicate password 2000-12-17 22:47:14 +00:00
chroot strtol -> strtoul because we use an unsigned type (uid_t/gid_t) 2001-07-14 21:56:45 +00:00
chrtbl use fparseln() 2001-03-17 20:43:55 +00:00
cnwctl getopt() returns -1 on error, not EOF. 2001-08-18 17:10:04 +00:00
config Add hooks to allow toolchain bits to be reachover-built at the top level. 2001-08-14 10:18:26 +00:00
cron make consistent escape sequence handling 2001-08-13 06:54:58 +00:00
dbsym Fix date. 2001-04-11 19:35:31 +00:00
dev_mkdb Removed two debug messages commited by mistake. Sorry about this. 2001-07-15 17:27:32 +00:00
dhcp dhcpd no longer needs the OS_VERSION define. 2001-08-16 18:29:20 +00:00
diskpart More and more .Os cleanups. .Os is defined in the tmac.doc-common file, 1999-03-22 18:43:46 +00:00
dumpfs Incorporate the enhanced ffs_dirpref() by Grigoriy Orlov, as found in 2001-09-06 02:16:00 +00:00
dumplfs Merge the short-lived perseant-lfsv2 branch into the trunk. 2001-07-13 20:30:18 +00:00
edquota Don't declare 'extern opt*' getopt variables. 2000-04-14 06:26:52 +00:00
eeprom convert to use getprogname() 2001-02-19 23:22:40 +00:00
envstat convert to use getprogname() 2001-02-19 23:22:40 +00:00
eshconfig use %ll_ instead of the less standard %q_ 2001-01-05 03:27:26 +00:00
faithd sync with the latest kame. 2001-09-05 01:22:24 +00:00
greconfig Fix date, xrefs and whitespace. 2001-04-11 19:36:59 +00:00
grfconfig This should fix PR 11865 by Petri Koistinen: modelines too short by more 2001-01-22 21:11:23 +00:00
grfinfo Minor fixes. 2001-06-05 11:40:04 +00:00
gspa withough -> without 2001-06-13 10:45:57 +00:00
hilinfo convert to use getprogname() 2001-02-19 23:22:40 +00:00
hprop Use PRINTOBJDIR. 2001-01-11 13:15:06 +00:00
ifmcstat drop setgid. suggested by deraadt 2001-06-26 17:10:33 +00:00
inetd Negative exit code cleanup: Replace exit(-x) with exit(x). 2001-04-06 11:13:45 +00:00
iopctl Better argument checking. 2001-08-04 16:55:46 +00:00
iostat Uppercase cpu. 2001-07-08 18:19:16 +00:00
ipf add -lcurses 2001-03-13 16:30:13 +00:00
isdn Don't mention /usr/local/lib/isdn, since it's not used (anymore?). 2001-09-03 01:22:54 +00:00
iteconfig sweep of my licenses (userland files w/o only my copyright) for 2000-06-14 17:24:02 +00:00
kadmin only link against -lkadm5srv 2001-02-07 14:07:47 +00:00
kdc Use PRINTOBJDIR. 2001-01-11 13:15:06 +00:00
kgmon fix up various .Nm abuses: 2000-11-07 06:43:24 +00:00
kstash Use PRINTOBJDIR. 2001-01-11 13:15:06 +00:00
ktutil update make infrastructure and shlib versions numbers for heimdal 0.3e 2001-02-11 18:02:04 +00:00
kvm_mkdb seperate -> separate 2001-07-22 13:33:58 +00:00
lastlogin convert to use getprogname() 2001-02-19 23:22:40 +00:00
link For commands and utilities, use EXIT STATUS rather than RETURN VALUES or 2000-09-04 07:35:15 +00:00
lpr use strlcpy. from openbsd 2001-08-30 00:53:53 +00:00
mailwrapper Remove trailing dot from .Nd, and a bogus comment line (probably left 2001-06-08 23:57:43 +00:00
map-mbone updated copyright notice from Xerox. via openbsd 2001-08-01 16:45:28 +00:00
mdconfig remove extra period in SEE ALL section 2000-07-05 15:45:28 +00:00
mdsetimage Fix typo in previous. (damn vi.) 2001-06-21 22:58:36 +00:00
memswitch Accept INSCSI0, EXSCSI3, etc. as the boot.device setting. 2001-02-21 13:09:18 +00:00
mld6query getopt(3): EOF -> -1. 2001-05-07 14:00:22 +00:00
mlxctl Nits. 2001-04-17 13:32:39 +00:00
mopd moptrace(1), not (8). Whitespace fixes. 2001-04-05 11:50:06 +00:00
mountd Don't allow -mask for v6 addresses, otherwise there could be confusion 2001-04-24 15:04:27 +00:00
mrinfo updated copyright notice from Xerox. via openbsd 2001-08-01 16:45:28 +00:00
mrouted copyright clarification. via openbsd 2001-08-02 03:41:42 +00:00
mtrace Negative exit code cleanup: Replace exit(-x) with exit(x). 2001-04-06 11:13:45 +00:00
mtrace6 Fix date and whitespace nits. 2001-04-26 23:19:50 +00:00
mtree - add parsetype() (a la parsekey()) to parse the "type=xxx" arg. this improves 2001-07-18 04:51:54 +00:00
ndbootd Merge in ndbootd-0.5. 2001-06-13 21:38:30 +00:00
ndp sync with latest kame code. ndp -i won't print info for yet-to-be-initialized 2001-07-23 14:47:43 +00:00
netgroup_mkdb convert to use getprogname() 2001-02-19 23:22:40 +00:00
nfsd comment or delete text after CPP directives. 2001-01-16 02:50:27 +00:00
ntp Fix various misspellings of compatible/compatibility. 2001-06-11 01:50:48 +00:00
pkg_install disable unnecessary warning when PKG_PATH isn't set. 2001-08-21 18:38:40 +00:00
pppd follow kame p2p interface management rule. use /128 when we specify 2001-07-21 02:28:06 +00:00
pstat Couple of nits. 2001-07-09 17:46:39 +00:00
pvcsif getopt(3): EOF -> -1. 2001-05-07 14:00:22 +00:00
pvctxctl getopt(3): EOF -> -1. 2001-05-07 14:00:22 +00:00
pwd_mkdb Clean up previous. 2001-08-19 09:01:47 +00:00
quot Xref getbsize(3). 2001-07-08 15:34:13 +00:00
quotacheck remove third argument (`int ns') from ffs_sb_swap(), and let ffs_sb_swap() 2001-08-17 02:18:46 +00:00
quotaon convert to use getprogname() 2001-02-19 23:22:40 +00:00
racoon upgrade to KAME 2001/8/31. 2001-08-31 10:36:08 +00:00
rarpd Kill no longer used variable decl. 2001-01-11 13:06:28 +00:00
rbootd convert to use getprogname() 2001-02-19 23:22:40 +00:00
rdate convert to use getprogname() 2001-02-19 23:22:40 +00:00
repquota Enlarge inode fields (for quotas with more than 99999 inodes). 2001-03-20 13:38:26 +00:00
rip6query getopt(3): EOF -> -1. 2001-05-07 14:00:22 +00:00
rmt Improve usage of `comprise' according to Webster and misc/10893 2001-05-06 12:29:18 +00:00
route6d sync with the latest KAME tree. 2001-09-05 01:17:31 +00:00
rpc.bootparamd Improve error messages; instead of "getfile failed", now: 2001-04-11 06:21:49 +00:00
rpc.lockd receive, not recieve 2001-06-12 15:17:10 +00:00
rpc.pcnfsd No need to invoke extra shell. 2001-02-16 01:05:32 +00:00
rpc.statd convert to use getprogname() 2001-02-19 23:22:40 +00:00
rpc.yppasswdd Update for pw_mkdb() change: restrict updates to one user's records and/or 2001-08-18 19:35:32 +00:00
rpcbind For the local case, return serv_uaddr in addrmerge, not the address 2001-04-30 00:36:07 +00:00
rtadvd prevent overflow of lifetime value. sync with kame 2001-06-03 09:26:04 +00:00
rtsold sync with kame better. snprintf return value audit. 2001-08-22 05:24:37 +00:00
rwhod More format string cleanups by sommerfeld. 2000-10-11 20:23:46 +00:00
sa seperate -> separate 2001-07-22 13:33:58 +00:00
screenblank convert to use getprogname() 2001-02-19 23:22:40 +00:00
sendmail Remove obsolete version 8.8.8 of "sendmail". 8.9.3 is in the main tree 2000-02-13 00:34:15 +00:00
sesd don't use LOG_CONS 2001-01-11 02:44:03 +00:00
sliplogin Add section to a .Xr. 2001-04-03 11:28:44 +00:00
slstats convert to use getprogname() 2001-02-19 23:22:40 +00:00
spray More and more .Os cleanups. .Os is defined in the tmac.doc-common file, 1999-03-22 18:43:46 +00:00
sup `accessible' only has one `a'. 2001-06-19 12:52:20 +00:00
sushi heirarchy -> hierarchy 2001-08-24 10:24:45 +00:00
syslogd Put pidfile after daemonize. This would fix newsyslog(8) error. 2001-07-19 00:15:32 +00:00
tadpolectl Add arch to Dt. 2001-04-21 14:45:12 +00:00
tcpdchk have sshd listed in use_libwrap[]. 2001-06-30 00:56:28 +00:00
tcpdmatch Comment out reference to tlid.conf in the SEE ALSO section. 2001-04-03 12:05:12 +00:00
tcpdump switch to use src/dist/tcpdump. source code has been checked and the new 2001-06-25 19:41:19 +00:00
timed Code cleanup; remove all `#ifdef sgi' from the code... this clobbered the 2001-09-02 00:13:05 +00:00
traceroute Symmetric has one s and two m's. 2001-06-18 11:23:00 +00:00
traceroute6 getopt(3): EOF -> -1. 2001-05-07 14:00:22 +00:00
trpt copy necessary variables from sys/netinet/tcp_debug.c. 2001-07-09 07:54:59 +00:00
trsp convert to use getprogname() 2001-02-19 23:22:40 +00:00
unlink For commands and utilities, use EXIT STATUS rather than RETURN VALUES or 2000-09-04 07:35:15 +00:00
usbdevs convert to use getprogname() 2001-02-19 23:22:40 +00:00
user PR/13874: Hubert Feyrer: Add -L class to useradd 2001-09-05 21:37:32 +00:00
videomode convert from NOxxx= to MKxxx=no. 1999-02-13 02:54:17 +00:00
vipw Update for pw_mkdb() change: restrict updates to one user's records and/or 2001-08-18 19:35:32 +00:00
vnconfig Put sections in the canonical order (from mdoc.samples(7)). 2000-10-02 16:21:27 +00:00
wiconfig Big-endian support. 2001-05-16 10:45:36 +00:00
wsconscfg Missing space in usage(); from OpenBSD. 2001-06-25 08:47:29 +00:00
wsfontload -fix uninitialized "verbose" flag 2001-09-04 17:59:04 +00:00
ypbind convert to use getprogname() 2001-02-19 23:22:40 +00:00
yppoll convert to use getprogname() 2001-02-19 23:22:40 +00:00
ypserv getopt() returns -1 on error, not EOF. 2001-08-18 17:10:04 +00:00
ypset convert to use getprogname() 2001-02-19 23:22:40 +00:00
zdump
zic add -Dunix to CPPFLAGS to suppress cpp warning. 1998-09-01 03:16:48 +00:00
Makefile do not visit mtrace6 2001-06-03 06:09:10 +00:00
Makefile.inc