History log of /src/sys/ufs/lfs/lfs_subr.c |
Revision | | Date | Author | Comments |
1.104 |
| 04-Sep-2025 |
perseant | Copy the flags from a full partial segment to its continuation, if a continuation is necessary, so that partial-segment collections marked with SS_DIROP|SS_CONT are properly completed wiht a partial-segment marked SS_DIROP (without SS_CONT). Necessary for roll-forward.
|
1.103 |
| 05-Sep-2020 |
riastradh | Round of uvm.h cleanup.
The poorly named uvm.h is generally supposed to be for uvm-internal users only.
- Narrow it to files that actually need it -- mostly files that need to query whether curlwp is the pagedaemon, which should maybe be exposed by an external header.
- Use uvm_extern.h where feasible and uvm_*.h for things not exposed by it. We should split up uvm_extern.h but this will serve for now to reduce the uvm.h dependencies.
- Use uvm_stat.h and #ifdef UVMHIST uvm.h for files that use UVMHIST(ubchist), since ubchist is declared in uvm.h but the reference evaporates if UVMHIST is not defined, so we reduce header file dependencies.
- Make uvm_device.h and uvm_swap.h independently includable while here.
ok chs@
|
1.102 |
| 23-Feb-2020 |
riastradh | Fix missing <sys/evcnt.h> by removing the evcnts instead.
Just wanted to confirm that a race might happen, and indeed it did. These serve little diagnostic value otherwise.
|
1.101 |
| 23-Feb-2020 |
ad | Fix !DIAGNOSTIC compile
|
1.100 |
| 23-Feb-2020 |
riastradh | lfs_writer_enter can't fail; keep it simple and don't pretend it can.
Assert that mtsleep can't fail either -- it doesn't catch signals and there's no timeout.
|
1.99 |
| 23-Feb-2020 |
riastradh | Break deadlock in PR kern/52301.
The lock order is lfs_writer -> lfs_seglock. The problem in 52301 is that lfs_segwrite violates this lock order by sometimes doing lfs_seglock -> lfs_writer, either (a) when doing a checkpoint or (b), opportunistically, when there are no dirops pending. Both cases can deadlock, because dirops sometimes take the seglock (lfs_truncate, lfs_valloc, lfs_vfree):
(a) There may be dirops pending, and they may be waiting for the seglock, so we can't wait for them to complete while holding the seglock.
(b) The test for fs->lfs_dirops == 0 happens unlocked, and the state may change by the time lfs_writer_enter acquires lfs_lock.
To resolve this in each case:
(a) Do lfs_writer_enter before lfs_seglock, since we will need it unconditionally anyway. The worst performance impact of this should be that some dirops get delayed a little bit.
(b) Create a new lfs_writer_tryenter to use at this point so that the test for fs->lfs_dirops == 0 and the acquisition of lfs_writer happen atomically under lfs_lock.
|
1.98 |
| 23-Feb-2020 |
riastradh | Use a marker node to iterate lfs_dchainhd / i_lfs_dchain.
I believe elements can be removed while the lock is dropped, including the next node we're hanging on to.
|
1.97 |
| 26-Jul-2017 |
maya | branches: 1.97.4; 1.97.8; 1.97.10; change lfs_nextsegsleep and lfs_allclean_wakeup to use condvar
XXX had to use lfs_lock in lfs_segwait, removed kernel_lock, is this appropriate?
|
1.96 |
| 26-Jul-2017 |
maya | Deduplicate sanity check that seglock is held on segunlock
|
1.95 |
| 19-Jun-2017 |
maya | Ifdef out KDASSERT which fires on my machine.
|
1.94 |
| 10-Jun-2017 |
maya | Rename i_flag to i_state.
The similarity to i_flags has previously caused errors.
|
1.93 |
| 08-Jun-2017 |
chs | move some buffer cache internals declarations from buf.h to vfs_bio.c. this is needed to avoid name conflicts with ZFS and also makes it clearer that other code shouldn't be messing with these. remove the LFS debug code that poked around in bufqueues and remove the BQ_EMPTY bufqueue since nothing uses it anymore. provide a function to let LFS and wapbl read the value of nbuf for now.
|
1.92 |
| 06-Apr-2017 |
maya | branches: 1.92.6; don't guard lfs_sbactive or lfs_log with splbio, lfs_lock is plenty.
|
1.91 |
| 06-Apr-2017 |
maya | don't guard lfs_reshash with splbio, lfs_lock is plenty
|
1.90 |
| 06-Apr-2017 |
maya | if DEBUG panic => KDASSERT. reduces ifdefs. NFC
|
1.89 |
| 06-Apr-2017 |
maya | Provide a LFS_ENTER_LOG (__nothing) in the !DEBUG case. so I can drop lots of #ifdef DEBUG around this macro. NFCI
|
1.88 |
| 01-Apr-2017 |
maya | Keep on holding lfs_lock when calling cv_broadcast
pointed out by skrll, thanks.
|
1.87 |
| 01-Apr-2017 |
maya | switch lfs_dirops to condvar (from mtsleep)
|
1.86 |
| 03-Oct-2015 |
dholland | branches: 1.86.2; 1.86.4; Use IINFO in lfs_writeinode(). (both the kernel and the userland copies)
|
1.85 |
| 12-Aug-2015 |
dholland | Make 32-bit and 64-bit versions of CLEANERINFO.
XXX: while this is written to disk, it seems like much of it would XXX: be better set up as a commpage shared with the cleaner.
|
1.84 |
| 28-Jul-2015 |
dholland | Add a new lfs header file: lfs_accessors.h.
This contains all the accessor functions and macros out of lfs.h. Add an include of lfs_accessors.h after all uses of lfs.h... except for code that wants to define its own struct lfs-alike that the accessors are supposed to play along with. For these, set STRUCT_LFS and include lfs_accessors.h after the necessary structure has been defined, so that lfs_accessors.h can emit functions in terms of it.
|
1.83 |
| 24-Jul-2015 |
dholland | More lfs superblock accessors. (This changes the rest of the code over; all the accessors were already added.)
The difference between this commit and the previous one is arbitrary, but the previous one passed the regression tests on its own so I'm keeping it separate to help with any bisections that might be needed in the future.
|
1.82 |
| 24-Jul-2015 |
dholland | Switch to accessor functions for elements of the LFS on-disk superblock. This will allow switching between 32/64 bit forms on the fly; it will also allow handling LFS_EI reasonably tidily. (That currently doesn't work on the superblock.)
It also gets rid of cpp abuse in the form of fake structure member macros.
Also, instead of doing sleep/wakeup on &lfs_avail and &lfs_nextseg inside the on-disk superblock, add extra elements to the in-memory struct lfs for this. (XXX: these should be changed to condvars, but not right now)
XXX: this migrates a structure needed by the lfs code in libsa (struct salfs) into lfs.h, where it doesn't belong, but for the time being this is necessary in order to allow the accessors (and the various lfs macros and other goop that relies on them) to compile.
|
1.81 |
| 16-Jul-2015 |
dholland | Don't cast the return value of malloc.
|
1.80 |
| 28-Jul-2013 |
dholland | branches: 1.80.6; Add lfs_kernel.h for declarations that don't need to be exposed to userland.
lfs currently has the following headers: lfs.h - on-disk structures and stuff needed for userlevel tools lfs_inode.h - additional restricted materials for userlevel tools that operate the fs (newfs_lfs, fsck_lfs, lfs_cleanerd) lfs_kernel.h - stuff needed only in the kernel
and the following legacy headers that are expected to be mopped up and folded into one of the above: lfs_extern.h - function prototypes ulfs_bswap.h - endian-independent support ulfs_dinode.h - now contains very little ulfs_dirhash.h - dirhash support ulfs_extattr.h - extattr support ulfs_extern.h - more function prototypes ulfs_inode.h - assorted kernel-only declarations ulfs_quota.h - quota support ulfs_quota1.h - more quota support ulfs_quota2.h - more quota support ulfs_quotacommon.h - more quota support ulfsmount.h - legacy copy of ufsmount material
|
1.79 |
| 18-Jun-2013 |
christos | branches: 1.79.2; Prefix most of the cpp macros with lfs_ and LFS_ to avoid conflicts with ffs. This was done so that boot blocks that want to compile both FFS and LFS in the same file work.
|
1.78 |
| 06-Jun-2013 |
dholland | Split lfs from ufs, part 2:
Change all <ufs/ufs/foo.h> includes to <ufs/lfs/ulfs_foo.h>.
|
1.77 |
| 02-Jan-2012 |
perseant | branches: 1.77.6;
* Remove PGO_RECLAIM during lfs_putpages()' call to genfs_putpages(), to avoid a live lock in the latter when reclaiming a vnode with dirty pages.
* Add a new segment flag, SEGM_RECLAIM, to note when a segment is being written for vnode reclamation, and record which inode is being reclaimed, to aid in forensic debugging.
* Add a new segment flag, SEGM_SINGLE, so that opportunistic writes can write a single segment's worth of blocks and then stop, rather than writing all the way up to the cleaner's reserved number of segments.
* Add assert statements to check mutex ownership is the way it ought to be, mostly in lfs_putpages; fix problems uncovered by this.
* Don't clear VU_DIROP until the inode actually makes its way to disk, avoiding a problem where dirop inodes could become separated (uncovered by a modified version of the "ckckp" forensic regression test).
* Move the vfs_getopsbyname() call into lfs_writerd. Prepare code to make lfs_writerd notice when there are no more LFSs, and exit losing the reference, so that, in theory, the module can be unloaded. This code is not enabled, since it causes a crash on exit.
* Set IN_MODIFIED on inodes flushed by lfs_flush_dirops. Really we only need to set IN_MODIFIED if we are going to write them again (e.g., to write pages); need to think about this more.
Finally, several changes to help avoid "no clean segments" panics:
* In lfs_bmapv, note when a vnode is loaded only to discover whether its blocks are live, so it can immediately be recycled. Since the cleaner will try to choose ~empty segments over full ones, this prevents the cleaner from (1) filling the vnode cache with junk, and (2) squeezing any unwritten writes to disk and running the fs out of segments.
* Overestimate by half the amount of metadata that will be required to fill the clean segments. This will make the disk appear smaller, but should help avoid a "no clean segments" panic.
* Rearrange lfs_writerd. In particular, lfs_writerd now pays attention to the number of clean segments available, and holds off writing until there is room.
|
1.76 |
| 25-Jun-2010 |
hannken | branches: 1.76.8; 1.76.12; Undo last commit and don't try to lock vnodes in lfs_unmark_dirop() as we may deadlock trying to write the superblock.
Should fix PR #43503 Can't create device nodes on LFS.
|
1.75 |
| 24-Jun-2010 |
hannken | Clean up vnode lock operations:
- VOP_LOCK(vp, flags): Limit the set of allowed flags to LK_EXCLUSIVE, LK_SHARED and LK_NOWAIT. LK_INTERLOCK is no longer allowed as it makes no sense here.
- VOP_ISLOCKED(vp): Remove the for some time unused return value LK_EXCLOTHER. Mark this operation as "diagnostic only". Making a lock decision based on this operation is no longer allowed.
Discussed on tech-kern.
|
1.74 |
| 16-Feb-2010 |
mlelstv | branches: 1.74.2; Three changes in a single commit.
- drop the notion of frags (LFS fragments) vs fsb (FFS fragments) The code uses a complicated unity function that just makes the code difficult to understand.
- support larger sector sizes. Fix disk address computations to use DEV_BSIZE in the kernel as required by device drivers and to use sector sizes in userland.
- Fix several locking bugs in lfs_bio.c and lfs_subr.c.
|
1.73 |
| 28-Apr-2008 |
martin | branches: 1.73.20; Remove clause 3 and 4 from TNF licenses
|
1.72 |
| 02-Jan-2008 |
ad | branches: 1.72.6; 1.72.8; 1.72.10; Merge vmlocking2 to head.
|
1.71 |
| 10-Oct-2007 |
ad | branches: 1.71.4; 1.71.6; 1.71.10; Merge from vmlocking:
- Split vnode::v_flag into three fields, depending on field locking. - simple_lock -> kmutex in a few places. - Fix some simple locking problems.
|
1.70 |
| 15-May-2007 |
tnn | branches: 1.70.6; 1.70.8; 1.70.10; Add missing underscore to wchan name.
|
1.69 |
| 18-Apr-2007 |
perseant | Add/change a couple of comments about locking restrictions.
|
1.68 |
| 12-Mar-2007 |
ad | branches: 1.68.2; Pass an ipl argument to pool_init/POOL_INIT to be used when initializing the pool's lock.
|
1.67 |
| 21-Feb-2007 |
thorpej | branches: 1.67.4; Replace the Mach-derived boolean_t type with the C99 bool type. A future commit will replace use of TRUE and FALSE with true and false.
|
1.66 |
| 15-Feb-2007 |
ad | branches: 1.66.2; Replace some uses of lockmgr() / simplelocks.
|
1.65 |
| 16-Nov-2006 |
christos | branches: 1.65.2; 1.65.4; __unused removal on arguments; approved by core.
|
1.64 |
| 12-Oct-2006 |
christos | - sprinkle __unused on function decls. - fix a couple of unused bugs - no more -Wno-unused for i386
|
1.63 |
| 04-Oct-2006 |
christos | fix empty if
|
1.62 |
| 15-Sep-2006 |
perseant | branches: 1.62.2; Don't remark a locked inode with IN_MODIFIED after writing it to disk, if we ourselves hold the lock. This prevents e.g. mknod from hanging indefinitely.
Also, always use the return value from VOP_ISLOCKED to determine whether we hold the lock or someone else does, rather than looking into the lock structure ourselves.
|
1.61 |
| 01-Sep-2006 |
perseant | branches: 1.61.2; Changes to help the roll-forward agent, to wit:
* Mark being-deleted files in the Ifile so we can finish deleting them at fs mount time. * Flag the Ifile with "cleaner must clean" when writers are waiting for the cleaner, rather than relying solely on the cleaner's estimation of whether it should clean or not. * Note partial segments written by a user agent (in particular, fsck_lfs) so that repeated rolls forward don't interfere with one another. * Add a new fcntl, LFCNPASS, that allows the log to wrap exactly once, for better testing of the validity of checkpoints. * Keep track of the on-disk nlink count when cleaning, so that we don't partially complete directory operations while cleaning. * Ensure that every single Ifile inode write represents a consistent view of the filesystem. In particular, the accounting for the segment we are writing the inode into must be correct, and the accounting for the segment that inode used to reside in must be correct. Rather than just rewriting the inode if we wrote it wrong, rewrite the necessary ifile blocks before writing the inode so we never write it wrong. * Don't unmark any VDIROP vnodes if we haven't written them to disk, avoiding yet another problem with the "wait for the cleaner" error return from lfs_putpages().
Also, move the last callback to an aiodone call, so we no longer do any memory management from interrupt context.
|
1.60 |
| 29-Jun-2006 |
perseant | Don't wake up the cleaner if the filesystem is unwrappable, and fix the compatibility fcntls.
Also includes one-line fixes for an MP locking bug and a zero-length FINFO problem that manifested during testing.
|
1.59 |
| 04-May-2006 |
perseant | branches: 1.59.4; Introduce another per-filesystem parameter, lfs_resvseg, to separate the notion of "how many segments are reserved for the cleaner" from that of "how many segments are not counted in lfs_bfree". The default value used for existing filesystems is the same as the previous implicit value of (lfs_minfreeseg / 2 + 1), modulo some sanity checking.
Count pending dirops on a per-filesystem basis, since once we start writing them we can't stop until we're done. This seems to help stave off the "no clean segments" panic in the case of filling the filesystem with directories and small files (e.g. simultaneously unpacking more copies of pkgsrc than will fit).
|
1.58 |
| 07-Apr-2006 |
perseant | Make the segment lock aware of LWPs. Fixes a (somewhat confusing) "lockmgr: pid 3997, not exclusive lockholder 3997, unlocking" panic I encountered while running blogbench on an LFS.
|
1.57 |
| 24-Mar-2006 |
perseant | Improvements to LFS's paging mechanism, to wit:
* Acknowledge that sometimes there are more dirty pages to be written to disk than clean segments. When we reach the danger line, lfs_gop_write() now returns EAGAIN. The caller of VOP_PUTPAGES(), if it holds the segment lock, drops it and waits for the cleaner to make room before continuing.
* Note and avoid a three-way deadlock in lfs_putpages (a writer holding a page busy blocks on the cleaner while the cleaner blocks on the segment lock while lfs_putpages blocks on the page).
|
1.56 |
| 14-Jan-2006 |
yamt | branches: 1.56.2; 1.56.4; 1.56.6; 1.56.8; 1.56.10; - unify ffs_blkatoff and lfs_blkatoff. - remove ufs_ops::uo_blkatoff. - add directory read-ahead code. (disabled for now.)
|
1.55 |
| 11-Dec-2005 |
christos | branches: 1.55.2; merge ktrace-lwp.
|
1.54 |
| 02-Nov-2005 |
yamt | merge yamt-vop branch. remove following VOPs.
VOP_BLKATOFF VOP_VALLOC VOP_BALLOC VOP_REALLOCBLKS VOP_VFREE VOP_TRUNCATE VOP_UPDATE
|
1.53 |
| 29-May-2005 |
christos | branches: 1.53.2; 1.53.4; - sprinkle const - avoid shadow variables.
|
1.52 |
| 16-Apr-2005 |
perseant | Use lfs_malloc() to manage the blkiov arrays that the cleaner functions use, since the cleaner is likely to operate in a low-memory condition.
|
1.51 |
| 01-Apr-2005 |
perseant | Protect various per-fs structures with fs->lfs_interlock simple_lock, to improve behavior in the multiprocessor case. Add debugging segment-lock assertion statements.
|
1.50 |
| 08-Mar-2005 |
perseant | branches: 1.50.2; Straighten out the maze of ifdefs. Instead, consolidate all the debugging stuff under '#ifdef DEBUG', and use sysctl knobs to turn on/off particular parts of the debugging reporting (if DEBUG is enabled). Re-enable the LFS statistics in sysctl, while I'm there. A bit of a rototill.
|
1.49 |
| 26-Feb-2005 |
perry | nuke trailing whitespace
|
1.48 |
| 26-Feb-2005 |
perseant | Various minor LFS improvements:
* Note when lfs_putpages(9) thinks it is not going to be writing any pages before calling genfs_putpages(9). This prevents a situation in which blocks can be queued for writing without a segment header. * Correct computation of NRESERVE(), though it is still a gross overestimate in most cases. Note that if NRESERVE() is too high, it may be impossible to create files on the filesystem. We catch this case on filesystem mount and refuse to mount r/w. * Allow filesystems to be mounted whose block size is == MAXBSIZE. * Somewhere along the line, ufs_bmaparray(9) started mangling UNWRITTEN entries in indirect blocks again, triggering a failed assertion "daddr <= LFS_MAX_DADDR". Explicitly convert to and from int32_t to correct this. * Add a high-water mark for the number of dirty pages any given LFS can hold before triggering a flush. This is settable by sysctl, but off (zero) by default. * Be more careful about the MAX_BYTES and MAX_BUFS computations so we shouldn't see "please increase to at least zero" messages. * Note that VBLK and VCHR vnodes can have nonzero values in di_db[0] even though their v_size == 0. Don't panic when we see this. * Change lfs_bfree to a signed quantity. The manner in which it is processed before being passed to the cleaner means that sometimes it may drop below zero, and the cleaner must be aware of this. * Never report bfree < 0 (or higher than lfs_dsize) through lfs_statvfs(9). This prevents df(1) from ever telling us that our full filesystems have 16TB free. * Account space allocated through lfs_balloc(9) that does not have associated buffer headers, so that the pagedaemon doesn't run us out of segments. * Return ENOSPC from lfs_balloc(9) when bfree drops to zero. * Address a deadlock in lfs_bmapv/lfs_markv when the filesystem is being unmounted. Because vfs_busy() is a shared lock, and lfs_bmapv/lfs_markv mark the filesystem vfs_busy(), the cleaner can be holding the lock that umount() is blocking on, then try to vfs_busy() again in getnewvnode().
|
1.47 |
| 09-Mar-2004 |
yamt | branches: 1.47.6; 1.47.8; 1.47.10; use correct segment size. this fixes memory corruption when using lfsv1.
|
1.46 |
| 21-Dec-2003 |
simonb | Fix usage of fifth argument to pool_init().
|
1.45 |
| 14-Oct-2003 |
dbj | add mnt_iflag field to struct mount for internal flags mv MNT_GONE, MNT_UNMOUNT and MNT_WANTRDWR to this field additonally add mnt_writeopcountupper and mnt_writeopcountlower fields in preparation for pending write suspension support work bump kernel version to 1.6ZD
|
1.44 |
| 07-Sep-2003 |
yamt | use LFS_DEBUG_COUNTLOCKED macro.
|
1.43 |
| 07-Aug-2003 |
agc | Move UCB-licensed code from 4-clause to 3-clause licence.
Patches provided by Joel Baker in PR 22364, verified by myself.
|
1.42 |
| 12-Jul-2003 |
yamt | - protect global resource counts with lfs_subsys_lock. - clean up scattered externs a little.
|
1.41 |
| 02-Jul-2003 |
yamt | - add a new functions, lfs_writer_enter/leave, and use them instead of duplicated code fragments. - add an assertion.
|
1.40 |
| 23-Apr-2003 |
perseant | branches: 1.40.2; Make LFS work better (though still not "well") as an NFS-exported filesystem (and other things that needed to be fixed before the tests would complete), to wit:
* Include the fs ident in the filehandle; improve stale filehandle checks.
* Change definition of blksize() to use the on-dinode size instead of the inode's i_size, so that fsck_lfs will work properly again.
* Use b_interlock in lfs_vtruncbuf.
* Postpone dirop reclamation until after the seglock has been released, so that lfs_truncate is not called with the segment lock held.
* Don't loop in lfs_fsync(), just write everything and wait.
* Be more careful about the interlock/uobjlock in lfs_putpages: when we lose this lock, we have to resynchronize dirtiness of pages in each block.
* Be sure to always write indirect blocks and update metadata in lfs_putpages; fixes a bug that caused blocks to be accounted to the wrong segment.
|
1.39 |
| 21-Mar-2003 |
perseant | KNF (space after keywords).
|
1.38 |
| 15-Mar-2003 |
perseant | Add simple_lock protection for lfs_seglock and lfs_subsys_pages; these will be expanded to cover other per-fs and subsystem-wide data as well.
Fix a case of IN_MODIFIED being set without updating lfs_uinodes, resulting in a "lfs_uinodes < 0" panic.
Fix a deadlock in lfs_putpages arising from the need to busy all pages in a block; unbusy any that had already been busied before starting over.
|
1.37 |
| 11-Mar-2003 |
perseant | - Get rid of unused #ifdefs LFS_NO_PAGEMOVE and LFS_MALLOC_SUMMARY (both always true) and accompanying dead code.
- When constructing write clusters in lfs_writeseg, if the block we are about to add is itself a cluster from GOP_WRITE, don't put a cluster in a cluster, just write the GOP_WRITE cluster on its own. This seems to represent a slight performance gain on my test machine.
- Charge someone's rusage for writes on LFSes. It's difficult to tell who the "right" process to charge is; just charge whoever triggered the write.
|
1.36 |
| 08-Mar-2003 |
perseant | Add an lfs_strategy() that checks to make sure we're not trying to read where the cleaner is trying to write, instead of tying up the "live" buffers (or pages).
Fix a bug in the LFS_UBC case where oversized buffers would not be checksummed correctly, causing uncleanable segments.
Make sure that wakeup(fs->lfs_iocount) is done if fs->lfs_iocount is 1 as well as 0, since we wait in some places for it to drop to 1.
Activate all pages that make it into lfs_gop_write without the segment lock held, since they must have been dirtied very recently, even if PG_DELWRI is not set.
|
1.35 |
| 04-Mar-2003 |
perseant | Don't add dirty blocks to the ifile in lfs_segunlock, if we're trying to unmount the filesystem. This avoids a "dirty blocks" panic.
|
1.34 |
| 23-Feb-2003 |
perseant | Fix a buffer overflow bug in the LFS_UBC case that manifested itself either as a mysterious UVM error or as "panic: dirty bufs". Verify maximum size in lfs_malloc.
Teach lfs_updatemeta and lfs_shellsort about oversized cluster blocks from lfs_gop_write.
When unwiring pages in lfs_gop_write, deactivate them, under the theory that the pagedaemon wanted to free them last we knew.
|
1.33 |
| 20-Feb-2003 |
perseant | Tabify, and fix some comment alignment problems.
|
1.32 |
| 19-Feb-2003 |
yamt | add debug code to lfs_free.
|
1.31 |
| 17-Feb-2003 |
perseant | Add code to UBCify LFS. This is still behind "#ifdef LFS_UBC" for now (there are still some details to work out) but expect that to go away soon. To support these basic changes (creation of lfs_putpages, lfs_gop_write, mods to lfs_balloc) several other changes were made, to wit:
* Create a writer daemon kernel thread whose purpose is to handle page writes for the pagedaemon, but which also takes over some of the functions of lfs_check(). This thread is started the first time an LFS is mounted.
* Add a "flags" parameter to GOP_SIZE. Current values are GOP_SIZE_READ, meaning that the call should return the size of the in-core version of the file, and GOP_SIZE_WRITE, meaning that it should return the on-disk size. One of GOP_SIZE_READ or GOP_SIZE_WRITE must be specified.
* Instead of using malloc(...M_WAITOK) for everything, reserve enough resources to get by and use malloc(...M_NOWAIT), using the reserves if necessary. Use the pool subsystem for structures small enough that this is feasible. This also obsoletes LFS_THROTTLE.
And a few that are not strictly necessary:
* Moves the LFS inode extensions off onto a separately allocated structure; getting closer to LFS as an LKM. "Welcome to 1.6O."
* Unified GOP_ALLOC between FFS and LFS.
* Update LFS copyright headers to correct values.
* Actually cast to unsigned in lfs_shellsort, like the comment says.
* Keep track of which segments were empty before the previous checkpoint; any segments that pass two checkpoints both dirty and empty can be summarily cleaned. Do this. Right now lfs_segclean still works, but this should be turned into an effectless compatibility syscall.
|
1.30 |
| 29-Jan-2003 |
yamt | don't use daddr_t for segment summary since it's an on-disk structure.
|
1.29 |
| 24-Jan-2003 |
fvdl | Bump daddr_t to 64 bits. Replace it with int32_t in all places where it was used on-disk, so that on-disk formats remain the same. Remove ufs_daddr_t and ufs_lbn_t for the time being.
|
1.28 |
| 11-Jul-2002 |
perseant | Remove lying comment on SEGM_PROT seglock.
|
1.27 |
| 06-Jul-2002 |
perseant | Deal with fragment size changes better. For each fragment that can exist on an on-disk inode, we keep a record of its size in struct inode, which is updated when we write the block to disk. The cleaner routines thus have ready access to what size is the correct size for this block, on disk.
Fixed a related bug: if a file with fragments is being cleaned (fragments being cleaned) at the same time it is being extended beyond NDADDR blocks, we could write a bogus FINFO record that has a frag in the middle; when it was cleaned this would give back bogus file data. Don't write the indirect blocks in this case, since there is no need.
lfs_fragextend and lfs_truncate no longer require the seglock, but instead take a shared lock, which the seglock locks exclusively.
|
1.26 |
| 16-Jun-2002 |
perseant | For synchronous writes, keep separate i/o counters for each write, so processes don't have to wait for one another to finish (e.g., nfsd seems to be a little happier now, though I haven't measured the difference). Synchronous checkpoints, however, must always wait for all i/o to finish.
Take the contents of the callback functions and have them run in thread context instead (aiodoned thread). lfs_iocount no longer has to be protected in splbio(), and quite a bit less of the segment construction loop needs to be in splbio() as well.
If lfs_markv is handed a block that is not the correct size according to the inode, refuse to process it. (Formerly it was extended to the "correct" size.) This is possibly more prone to deadlock, but less prone to corruption.
lfs_segclean now outright refuses to clean segments that appear to have live bytes in them. Again this may be more prone to deadlock but avoids corruption.
Replace ufsspec_close and ufsfifo_close with LFS equivalents; this means that no UFS functions need to know about LFS_ITIMES any more. Remove the reference from ufs/inode.h.
Tested on i386, test-compiled on alpha.
|
1.25 |
| 24-May-2002 |
perseant | Fix a couple of instances where reassignbuf() was not done at splbio.
Tested on i386.
|
1.24 |
| 23-May-2002 |
perseant | Back out rev 1.174 of vfs_subr.c, because the splbio() wasn't protecting enough to be useful, and broadening it so that it did would have meant that operations possibly requiring synchronous disk activity would have to be done in splbio(). This clearly was not going to work.
Worked around this in the LFS case by having lfs_cluster_callback put an extra hold on the vnode before calling biodone(), and taking the hold off without HOLDRELE's problematic list swapping. lfs_vunref() will take care of that---in thread context---on the next write if need be.
Also, ensure that the list walking in lfs_{writevnodes,segunlock,gather} takes into account the possibility that the list may change underneath it (possibly because it itself deleted an element).
Tested on i386, test-compiled on alpha.
|
1.23 |
| 17-May-2002 |
perseant | branches: 1.23.2; use macros from <sys/queue.h>
|
1.22 |
| 14-May-2002 |
perseant | branches: 1.22.2; Phase one of my three-phase plan to make LFS play nice with UBC, and bug-fixes I found while making sure there weren't any new ones.
* Make the write clusters keep track of the buffers whose blocks they contain. This should make it possible to (1) write clusters using a page mapping instead of malloc, if desired, and (2) schedule blocks for rewriting (somewhere else) if a write error occurs. Code is present to use pagemove() to construct the clusters but that is untested and will go away anyway in favor of page mapping. * DEBUG now keeps a log of Ifile writes, so that any lingering instances of the "dirty bufs" problem can be properly debugged. * Keep track of whether the Ifile has been dirtied by various routines that can be called by lfs_segwrite, and loop on that until it is clean, for a checkpoint. Checkpoints need to be squeaky clean. * Warn the user (once) if the Ifile grows larger than is reasonable for their buffer cache. Both lfs_mountfs and lfs_unmount check since the Ifile can grow. * If an inode is not found in a disk block, try rereading the block, under the assumption that the block was copied to a cluster and then freed. * Protect WRITEINPROG() with splbio() to fix a hang in lfs_update.
|
1.21 |
| 23-Nov-2001 |
chs | add spaces for KNF. confirmed to produce identical objects.
|
1.20 |
| 08-Nov-2001 |
lukem | add RCSID
|
1.19 |
| 26-Oct-2001 |
lukem | remove #include <ufs/ufs/quota.h> where it was just to appease <ufs/ufs/inode.h>, since the latter now includes the former. leave the former in source that obviously uses specific bits of it (for completeness.)
|
1.18 |
| 13-Jul-2001 |
perseant | branches: 1.18.4; Merge the short-lived perseant-lfsv2 branch into the trunk.
Kernels and tools understand both v1 and v2 filesystems; newfs_lfs generates v2 by default. Changes for the v2 layout include:
- Segments of non-PO2 size and arbitrary block offset, so these can be matched to convenient physical characteristics of the partition (e.g., stripe or track size and offset).
- Address by fragment instead of by disk sector, paving the way for non-512-byte-sector devices. In theory fragments can be as large as you like, though in reality they must be smaller than MAXBSIZE in size.
- Use serial number and filesystem identifier to ensure that roll-forward doesn't get old data and think it's new. Roll-forward is enabled for v2 filesystems, though not for v1 filesystems by default.
- The inode free list is now a tailq, paving the way for undelete (undelete is not yet implemented, but can be without further non-backwards-compatible changes to disk structures).
- Inode atime information is kept in the Ifile, instead of on the inode; that is, the inode is never written *just* because atime was changed. Because of this the inodes remain near the file data on the disk, rather than wandering all over as the disk is read repeatedly. This speeds up repeated reads by a small but noticeable amount.
Other changes of note include:
- The ifile written by newfs_lfs can now be of arbitrary length, it is no longer restricted to a single indirect block.
- Fixed an old bug where ctime was changed every time a vnode was created. I need to look more closely to make sure that the times are only updated during write(2) and friends, not after-the-fact during a segment write, and certainly not by the cleaner.
|
1.17 |
| 09-Sep-2000 |
perseant | branches: 1.17.2; 1.17.4; 1.17.6; Various bug-fixes to LFS, to wit:
Kernel:
* Add runtime quantity lfs_ravail, the number of disk-blocks reserved for writing. Writes to the filesystem first reserve a maximum amount of blocks before their write is allowed to proceed; after the blocks are allocated the reserved total is reduced by a corresponding amount.
If the lfs_reserve function cannot immediately reserve the requested number of blocks, the inode is unlocked, and the thread sleeps until the cleaner has made enough space available for the blocks to be reserved. In this way large files can be written to the filesystem (or, smaller files can be written to a nearly-full but thoroughly clean filesystem) and the cleaner can still function properly.
* Remove explicit switching on dlfs_minfreeseg from the kernel code; it is now merely a fs-creation parameter used to compute dlfs_avail and dlfs_bfree (and used by fsck_lfs(8) to check their accuracy). Its former role is better assumed by a properly computed dlfs_avail.
* Bounds-check inode numbers submitted through lfs_bmapv and lfs_markv. This prevents a panic, but, if the cleaner is feeding the filesystem the wrong data, you are still in a world of hurt.
* Cleanup: remove explicit references of DEV_BSIZE in favor of btodb()/dbtob().
lfs_cleanerd:
* Make -n mean "send N segments' blocks through a single call to lfs_markv". Previously it had meant "clean N segments though N calls to lfs_markv, before looking again to see if more need to be cleaned". The new behavior gives better packing of direct data on disk with as little metadata as possible, largely alleviating the problem that the cleaner can consume more disk through inefficient use of metadata than it frees by moving dirty data away from clean "holes" to produce entirely clean segments.
* Make -b mean "read as many segments as necessary to write N segments of dirty data back to disk", rather than its former meaning of "read as many segments as necessary to free N segments worth of space". The new meaning, combined with the new -n behavior described above, further aids in cleaning storage efficiency as entire segments can be written at once, using as few blocks as possible for segment summaries and inode blocks.
* Make the cleaner take note of segments which could not be cleaned due to error, and not attempt to clean them until they are entirely free of dirty blocks. This prevents the case in which a cleanerd running with -n 1 and without -b (formerly the default) would spin trying repeatedly to clean a corrupt segment, while the remaining space filled and deadlocked the filesystem.
* Update the lfs_cleanerd manual page to describe all the options, including the changes mentioned here (in particular, the -b and -n flags were previously undocumented).
fsck_lfs:
* Check, and optionally fix, lfs_avail (to an exact figure) and lfs_bfree (within a margin of error) in pass 5.
newfs_lfs:
* Reduce the default dlfs_minfreeseg to 1/20 of the total segments.
* Add a warning if the sgs disklabel field is 16 (the default for FFS' cpg, but not usually desirable for LFS' sgs: 5--8 is a better range).
* Change the calculation of lfs_avail and lfs_bfree, corresponding to the kernel changes mentioned above.
mount_lfs:
* Add -N and -b options to pass corresponding -n and -b options to lfs_cleanerd.
* Default to calling lfs_cleanerd with "-b -n 4".
[All of these changes were largely tested in the 1.5 branch, with the idea that they (along with previous un-pulled-up work) could be applied to the branch while it was still in ALPHA2; however my test system has experienced corruption on another filesystem (/dev/console has gone missing :^), and, while I believe this unrelated to the LFS changes, I cannot with good conscience request that the changes be pulled up.]
|
1.16 |
| 27-Jun-2000 |
perseant | Fixes associated with filling an LFS:
Change the space computation to appear to change the size of the *disk* rather than the *bytes used* when more segment summaries and inode blocks are written. Try to estimate the amount of space that these will take up when more files are written, so the disk size doesn't change too much.
Regularize error returns from lfs_valloc, lfs_balloc, lfs_truncate: they now fail entirely, rather than succeeding half-way and leaving the fs in an inconsistent state.
Rewrite lfs_truncate, mostly stealing from ffs_truncate. The old lfs_truncate had difficulty truncating a large file to a non-zero size (indirect blocks were not handled appropriately).
Unmark VDIROP on fvp after ufs_remove, ufs_rmdir, so these can be reclaimed immediately: this vnode would not be written to disk again anyway if the removal succeeded, and if it failed, no directory operation occurred.
ufs_makeinode and ufs_mkdir now remove IN_ADIROP on error.
|
1.15 |
| 06-Jun-2000 |
perseant | branches: 1.15.2; Don't try to inactivate dirop vnodes that are still in the middle of their dirop.
|
1.14 |
| 05-May-2000 |
perseant | branches: 1.14.2; Change the way LFS does block accounting, from trying to infer from the buffer cache flags, to marking the inode and/or indirect blocks with a special disk address UNWRITTEN==-2 when a block is accounted for. (This address is never written to disk, but only used in-core. This is essentially the same method of block accounting as on the UBC branch, where the buffer headers don't exist.) Make sure that truncation is handled properly, especially in the case of holey files.
Fixes PR#9994.
|
1.13 |
| 30-Mar-2000 |
augustss | Remove register declarations.
|
1.12 |
| 19-Jan-2000 |
perseant | Changes to stabilize LFS. The first two of these should also apply to the 1.4 branch.
* Use a separate per-fs lock, instead of ufs_hashlock, to protect the Inode free list. This seems to prevent the "lockmgr: %d, not exclusive lock holder %d, unlocking" message I was mis-attributing last night to an unlocked vnode being passed to vrele.
* Change calling semantics of lfs_ifind, to give better error reporting: If fed a struct buf, it can report the block number of the offending inode block as well as the inode number.
* Back out rev 1.10 of lfs_subr.c, since the replacement code was slightly uglier while being functionally identical.
* Make lfs_vunref use the same free list convention as vrele/vput, so that vget does not remove vnodes from a hash list they are not on.
|
1.11 |
| 16-Jan-2000 |
perseant | Make sure that vnodes are locked when inactivated (e.g. by the cleaner)
|
1.10 |
| 16-Jan-2000 |
perseant | Fix a problem in my changes of Dec 14th, that prevents removed vnodes from being inactivated under some conditions. Removed vnodes are now inactivated when the VDIROP flag is cleared, and to prevent block accounting problems this clearing has been postponed until lfs_segunlock.
|
1.9 |
| 25-Mar-1999 |
perseant | branches: 1.9.2; 1.9.8; 1.9.14; clean up unused/required #ifdefs
|
1.8 |
| 10-Mar-1999 |
perseant | New sources should leave the LFS in a more-or-less working state. Changes include:
- DIROP segregation is enabled, and greater care is taken to make sure that a checkpoint completes. Fsck is not needed to remount the filesystem. - Several checks to make sure that the LFS subsystem does not overuse various resources (memory, in particular). - The cleaner routines, lfs_markv in particular, are completely rewritten. A buffer overflow is removed. Greater care is taken to ensure that inodes come from where lfs_cleanerd say they come from (so we know nothing has changed since lfs_bmapv was called). - Fragment allocation is fixed, so that writes beyond end-of-file do the right thing.
|
1.7 |
| 25-Aug-1998 |
thorpej | Add some braces to make egcs happy.
|
1.6 |
| 01-Mar-1998 |
fvdl | Merge with Lite2 + local changes
|
1.5 |
| 12-Oct-1996 |
christos | revert previous kprintf changes
|
1.4 |
| 10-Oct-1996 |
christos | printf -> kprintf, sprintf -> ksprintf
|
1.3 |
| 09-Feb-1996 |
christos | lfs prototypes
|
1.2 |
| 29-Jun-1994 |
cgd | New RCS ID's, take two. they're more aesthecially pleasant, and use 'NetBSD'
|
1.1 |
| 08-Jun-1994 |
mycroft | branches: 1.1.1; Update to 4.4-Lite fs code, with local changes.
|
1.1.1.2 |
| 01-Mar-1998 |
fvdl | Import 4.4BSD-Lite2
|
1.1.1.1 |
| 01-Mar-1998 |
fvdl | Import 4.4BSD-Lite for reference
|
1.9.14.1 |
| 21-Dec-1999 |
wrstuden | Initial commit of recent changes to make DEV_BSIZE go away.
Runs on i386, needs work on other arch's. Main kernel routines should be fine, but a number of the stand programs need help.
cd, fd, ccd, wd, and sd have been updated. sd has been tested with non-512 byte block devices. vnd, raidframe, and lfs need work.
Non 2**n block support is automatic for LKM's and conditional for kernels on "options NON_PO2_BLOCKS".
|
1.9.8.1 |
| 20-Nov-2000 |
bouyer | Update thorpej_scsipi to -current as of a month ago
|
1.9.2.1 |
| 20-Jan-2000 |
he | Pull up revision 1.10 (requested by perseant): Files removed (through unlink, rmdir) are now really removed, though the removal is postponed until the dirop is complete to ensure validity of the filesystem through a crash. Use a separate per-fs lock, instead of ufs_hashlock, to protect the inode free list. Change calling semantics of lfs_ifind, to give better error reporting: If fed a struct buf, it can report the block number of the offending inode block as well as the inode number.
|
1.14.2.1 |
| 22-Jun-2000 |
minoura | Sync w/ netbsd-1-5-base.
|
1.15.2.1 |
| 14-Sep-2000 |
perseant | Pull up recent LFS kernel changes (approved by thorpej):
ufs/ufs/inode.h, 1.20--1.22 (add i_lfs_effnblks extension ; make ITIMES aware of LFS_ITIMES; _LKM protection so userland progs compile) ufs/ufs/ufs_vnops.c, 1.69, 1.71 (remove IN_ADIROP; use ITIMES instead of FFS_ITIMES) ufs/ufs/ufs_readwrite.c, 1.27 (use lfs_reserve in lfs_write) ufs/lfs/lfs.h, 1.26--1.32 (define LFS_EST_* macros ; change MIN_FREE_SEGS to lfs_minfreesegs ; add avail and bfree to CLEANERINFO ; change lfs_uinodes to signed ; change lfs_dmeta to signed ; add whitespace to line up structure members ; explicit cast to int32_t in LFS_EST_* macros) ufs/lfs/lfs_alloc.c, back out 1.34.2.3 (pullups of 1.39, 1.40); then pull up 1.38 (clean up on error) 1.39--1.43 (restore fvdl's ufs_hashlock fix ; restore fvdl's ufs_hashlock fix ; set i_lfs_effnblks ; use UINO macros ; add comments and fix long lines) ufs/lfs/lfs_balloc.c, 1.19 (don't succeed halfway) 1.21--1.25 (use i_lfs_effnblks ; fix i_lfs_effnblks computation and quieten ; fix i_ffs_blocks in unwritten fragment ; remove useless debugging check ; add comments and (c) 2000) ufs/lfs/lfs_bio.c, 1.24--1.30 (cleanup and make lfs_flush_fs take "struct lfs *" instead of "struct mount *" ; use lfs_minfreeseg instead of MIN_FREE_SEGS ; use UINO macros, and copy bfree/avail to CLEANERINFO ; add lfs_reserve function ; 1.28--1.30 fix printf formatting) ufs/lfs/lfs_cksum.c, 1.13 (add (c) 2000) ufs/lfs/lfs_debug.c, 1.11 (use btodb instead of DEV_BSIZE) ufs/lfs/lfs_extern.h, 1.18, 1.20--1.21 (function prototype changes) ufs/lfs/lfs_inode.c, 1.38 (rewrite lfs_truncate from ffs_truncate) 1.40--1.44 (count written and unwritten blocks seperately ; use disk block units instead of bytes ; remove unnecessary "mod" variable ; correct B_DELWRI to avoid bawrite panic ; use lfs_reserve) ufs/lfs/lfs_segment.c, 1.52-1.59 (use lfs_dmeta to note used summaries ; check for UNWRITTEN in indirect blocks ; more debugging stuff inside #ifdef DEBUG_LFS ; use LK_CANRECURSE ; don't drop dirty indirect blocks ; use UINO macros ; don't hose the free list ; use btodb() instead of DEV_BSIZE ; make it compile again (oops)) ufs/lfs/lfs_subr.c, 1.16--1.17 (check for locked inodes before changing ; use btodb() instead of DEV_BSIZE, (c) 2000) ufs/lfs/lfs_syscalls.c, back out 1.41.4.2 (fvdl's ufs_hashlock fix); then pull up 1.43 (use lfs_dmeta) 1.44--1.45 (restore fvdl's ufs_hashlock fix) 1.46--1.47 (fix lfs_avail leakage from sblock segments ; use UINO macros) 1.49 (bounds-check inode numbers in lfs_markv) ufs/lfs/lfs_vfsops.c, 1.53 (use LFS_EST_* macros in lfs_statfs) 1.56--1.58 (initialize lfs_minfreeseg, lfs_effnblk ; initialize lfs_uinodes ; initialize lfs_ravail) ufs/lfs/lfs_vnops.c, 1.40 (remove VDIROP from removed files) 1.42--1.44 (move SET_ENDOP below the removal of VDIROP ; use UINO macros and add lfs_itimes function ; use lfs_reserve in dirops)
|
1.17.6.4 |
| 06-Sep-2002 |
jdolecek | sync kqueue branch with HEAD
|
1.17.6.3 |
| 23-Jun-2002 |
jdolecek | catch up with -current on kqueue branch
|
1.17.6.2 |
| 10-Jan-2002 |
thorpej | Sync kqueue branch with -current.
|
1.17.6.1 |
| 03-Aug-2001 |
lukem | update to -current
|
1.17.4.3 |
| 02-Jul-2001 |
perseant | Change disk addressing unit to be the fragment, instead of the disk sector. All quantities in the superblock, inodes, indirect blocks, etc. refer now to this abstract unit (called "fsb" as it is in FFS) instead of disk sectors; as a consequence segment summary blocks have to be multiples of a fragment in size. In v1 filesystems, compatibility code ensures that 1 fsb == 1 sector, regardless of fragment size.
Fragments can now range in size between 512 and 32k; in the event that LFS_LABELPAD (8k) is smaller than the disk address unit size, an extra proto-superblock is kept at 8k from the beginning of the disk, to be used *only* to locate the real superblocks. (Not all of the userland knows about this yet.)
Almost all of this was done not by me, but by joff.
|
1.17.4.2 |
| 29-Jun-2001 |
perseant | Get rid of __P(), protoizing where it had not already been done
|
1.17.4.1 |
| 27-Jun-2001 |
perseant | Import of what I've been calling "LFSv2", that is, LFS with some features added that require changes to the on-disk data structures. These include:
- 64-bit time in everything but inodes - User-specified segment offset, and segment size no longer restricted to PO2. - Serial number on segment summaries in addition to timestamp, and a new volume identifier, to make roll-forward feasible without fear of finding old data and thinking it was new.
Although I think this version works at least as well as what's on the trunk, we're not done yet; hence this commit is going in on a branch and not on the trunk. Enhancements that are not here yet include fragment addressing, like FFS does, instead of block addressing.
|
1.17.2.7 |
| 01-Aug-2002 |
nathanw | Catch up to -current.
|
1.17.2.6 |
| 24-Jun-2002 |
nathanw | Curproc->curlwp renaming.
Change uses of "curproc->l_proc" back to "curproc", which is more like the original use. Bare uses of "curproc" are now "curlwp".
"curproc" is now #defined in proc.h as ((curlwp) ? (curlwp)->l_proc) : NULL) so that it is always safe to reference curproc (*de*referencing curproc is another story, but that's always been true).
|
1.17.2.5 |
| 20-Jun-2002 |
nathanw | Catch up to -current.
|
1.17.2.4 |
| 08-Jan-2002 |
nathanw | Catch up to -current.
|
1.17.2.3 |
| 14-Nov-2001 |
nathanw | Catch up to -current.
|
1.17.2.2 |
| 24-Aug-2001 |
nathanw | Catch up with -current.
|
1.17.2.1 |
| 05-Mar-2001 |
nathanw | Initial commit of scheduler activations and lightweight process support.
|
1.18.4.1 |
| 12-Nov-2001 |
thorpej | Sync the thorpej-mips-cache branch with -current.
|
1.22.2.3 |
| 15-Jul-2002 |
gehenna | catch up with -current.
|
1.22.2.2 |
| 20-Jun-2002 |
gehenna | catch up with -current.
|
1.22.2.1 |
| 30-May-2002 |
gehenna | Catch up with -current.
|
1.23.2.3 |
| 20-Jun-2002 |
lukem | Pull up revision 1.26 (requested by perseant in ticket #325): For synchronous writes, keep separate i/o counters for each write, so processes don't have to wait for one another to finish (e.g., nfsd seems to be a little happier now, though I haven't measured the difference). Synchronous checkpoints, however, must always wait for all i/o to finish. Take the contents of the callback functions and have them run in thread context instead (aiodoned thread). lfs_iocount no longer has to be protected in splbio(), and quite a bit less of the segment construction loop needs to be in splbio() as well. If lfs_markv is handed a block that is not the correct size according to the inode, refuse to process it. (Formerly it was extended to the "correct" size.) This is possibly more prone to deadlock, but less prone to corruption. lfs_segclean now outright refuses to clean segments that appear to have live bytes in them. Again this may be more prone to deadlock but avoids corruption. Replace ufsspec_close and ufsfifo_close with LFS equivalents; this means that no UFS functions need to know about LFS_ITIMES any more. Remove the reference from ufs/inode.h. Tested on i386, test-compiled on alpha.
|
1.23.2.2 |
| 02-Jun-2002 |
tv | Pull up revision 1.25 (requested by perseant in ticket #135): Fix a couple of instances where reassignbuf() was not done at splbio. Tested on i386.
|
1.23.2.1 |
| 02-Jun-2002 |
tv | Pull up revision 1.24 (requested by perseant in ticket #132): Back out rev 1.174 of vfs_subr.c, because the splbio() wasn't protecting enough to be useful, and broadening it so that it did would have meant that operations possibly requiring synchronous disk activity would have to be done in splbio(). This clearly was not going to work. Worked around this in the LFS case by having lfs_cluster_callback put an extra hold on the vnode before calling biodone(), and taking the hold off without HOLDRELE's problematic list swapping. lfs_vunref() will take care of that---in thread context---on the next write if need be. Also, ensure that the list walking in lfs_{writevnodes,segunlock,gather} takes into account the possibility that the list may change underneath it (possibly because it itself deleted an element). Tested on i386, test-compiled on alpha.
|
1.40.2.6 |
| 10-Nov-2005 |
skrll | Sync with HEAD. Here we go again...
|
1.40.2.5 |
| 08-Mar-2005 |
skrll | Sync with HEAD.
|
1.40.2.4 |
| 04-Mar-2005 |
skrll | Sync with HEAD.
Hi Perry!
|
1.40.2.3 |
| 21-Sep-2004 |
skrll | Fix the sync with head I botched.
|
1.40.2.2 |
| 18-Sep-2004 |
skrll | Sync with HEAD.
|
1.40.2.1 |
| 03-Aug-2004 |
skrll | Sync with HEAD
|
1.47.10.1 |
| 19-Mar-2005 |
yamt | sync with head. xen and whitespace. xen part is not finished.
|
1.47.8.1 |
| 29-Apr-2005 |
kent | sync with -current
|
1.47.6.1 |
| 10-May-2005 |
riz | Pull up the following revisions (requested by perseant in ticket #1281):
1.8 sys/ufs/lfs/TODO 1.75 sys/ufs/lfs/lfs.h (via patch) 1.74 sys/ufs/lfs/lfs_alloc.c (via patch) 1.49, 1.51 sys/ufs/lfs/lfs_balloc.c (1.51 via patch) 1.78 sys/ufs/lfs/lfs_bio.c 1.62 sys/ufs/lfs/lfs_extern.h (via patch) 1.156 sys/ufs/lfs/lfs_segment.c (via patch) 1.48 sys/ufs/lfs/lfs_subr.c 1.101 sys/ufs/lfs/lfs_syscalls.c 1.163 sys/ufs/lfs/lfs_vfsops.c (via patch) 1.134 sys/ufs/lfs/lfs_vnops.c (via patch) 1.61 sys/ufs/ufs/ufs_readwrite.c (via patch)
1.20 libexec/lfs_cleanerd/clean.h (via patch) 1.52 libexec/lfs_cleanerd/cleanerd.c (via patch) 1.41 libexec/lfs_cleanerd/library.c (via patch)
1.4 regress/sys/fs/lfs/newfs_fsck/Makefile 1.2 regress/sys/fs/lfs/newfs_fsck/mkfs_mount 1.2 regress/sys/fs/lfs/newfs_fsck/smallfiles 1.3 sbin/fsck_lfs/bufcache.c 1.3 sbin/fsck_lfs/bufcache.h 1.3 sbin/fsck_lfs/lfs.h 1.8 sbin/fsck_lfs/lfs.c (via patch) 1.8 sbin/fsck_lfs/pass3.c (via patch) 1.18 sbin/fsck_lfs/pass0.c (via patch) 1.18 sbin/fsck_lfs/utilities.c (via patch) 1.7 sbin/fsck_lfs/segwrite.c 1.19 sbin/fsck_lfs/setup.c (via patch) 1.3 sbin/newfs_lfs/Makefile 0 sbin/newfs_lfs/lfs.c (yes, remove it) 1.1 sbin/newfs_lfs/make_lfs.c 1.15 sbin/newfs_lfs/newfs.c (via patch)
Various minor LFS improvements.
Kernel:
* Note when lfs_putpages(9) thinks it is not going to be writing any pages before calling genfs_putpages(9). This prevents a situation in which blocks can be queued for writing without a segment header. * Correct computation of NRESERVE(), though it is still a gross overestimate in most cases. Note that if NRESERVE() is too high, it may be impossible to create files on the filesystem. We catch this case on filesystem mount and refuse to mount r/w. * Allow filesystems to be mounted whose block size is == MAXBSIZE. * Somewhere along the line, ufs_bmaparray(9) started mangling UNWRITTEN entries in indirect blocks again, triggering a failed assertion "daddr <= LFS_MAX_DADDR". Explicitly convert to and from int32_t to correct this. Should fix PR #29045. * Add a high-water mark for the number of dirty pages any given LFS can hold before triggering a flush. This is settable by sysctl, but off (zero) by default. * Be more careful about the MAX_BYTES and MAX_BUFS computations so we shouldn't see "please increase to at least zero" messages. * Note that VBLK and VCHR vnodes can have nonzero values in di_db[0] even though their v_size == 0. Don't panic when we see this. Fixes PR #26680. * Change lfs_bfree to a signed quantity. The manner in which it is processed before being passed to the cleaner means that sometimes it may drop below zero, and the cleaner must be aware of this. * Never report bfree < 0 (or higher than lfs_dsize) through lfs_statfs(9). This prevents df(1) from ever telling us that our full filesystems have 16TB free. * Account space allocated through lfs_balloc(9) that does not have associated buffer headers, so that the pagedaemon doesn't run us out of segments. * Return ENOSPC from lfs_balloc(9) when bfree drops to zero. * Address a deadlock in lfs_bmapv/lfs_markv when the filesystem is being unmounted. Because vfs_busy() is a shared lock, and lfs_bmapv/lfs_markv mark the filesystem vfs_busy(), the cleaner can be holding the lock that umount() is blocking on, then try to vfs_busy() again in getnewvnode().
cleaner:
* Adapt lfs_cleanerd to use the fcntl call to get the Ifile filehandle, so it need not be in the namespace. * Make lfs_cleanerd be more careful when there are very few available segments. * Make lfs_cleanerd less verbose when the filesystem is unmounted.
newfs_lfs, fsck_lfs, and regression:
* Extend the lfs library from fsck_lfs(8) so that it can be used with a not-yet-existent LFS. Make newfs_lfs(8) use this library, so it can create LFSs whose Ifile is larger than one segment. Addresses PR #11110. * Make newfs_lfs(8) use strsuftoi64() for its arguments, a la newfs(8). * Make fsck_lfs(8) respect the "file system is clean" flag. * Don't let fsck_lfs(8) think it has dirty blocks when invoked with the -n flag. * Remove the Ifile from the filesystem namespace. The cleaner now uses a fcntl call on the root inode to find the Ifile filehandle. (As a side-effect, addresses PR #29144.)
|
1.50.2.6 |
| 10-Aug-2006 |
tron | Apply patch (requested by fair in perseant #1457): Bring LFS up to current, including a patch (1.95 lfs_alloc.c) that should prevent the inode free list errors seen on the STABLE branch subsequent to pullup ticket #1327.
|
1.50.2.5 |
| 20-May-2006 |
riz | Pull up following revision(s) (requested by perseant in ticket #1327): sys/ufs/lfs/lfs_alloc.c: revision 1.92 sys/ufs/lfs/lfs.h: revision 1.105 sys/ufs/lfs/lfs_vfsops.c: revision 1.207 sys/ufs/lfs/lfs_subr.c: revision 1.59 sys/ufs/lfs/lfs_vnops.c: revision 1.173 sys/ufs/lfs/lfs_bio.c: revision 1.92 Introduce another per-filesystem parameter, lfs_resvseg, to separate the notion of "how many segments are reserved for the cleaner" from that of "how many segments are not counted in lfs_bfree". The default value used for existing filesystems is the same as the previous implicit value of (lfs_minfreeseg / 2 + 1), modulo some sanity checking. Count pending dirops on a per-filesystem basis, since once we start writing them we can't stop until we're done. This seems to help stave off the "no clean segments" panic in the case of filling the filesystem with directories and small files (e.g. simultaneously unpacking more copies of pkgsrc than will fit).
|
1.50.2.4 |
| 20-May-2006 |
riz | Pull up following revision(s) (requested by perseant in ticket #1327): sys/ufs/lfs/lfs_subr.c: revision 1.58 sys/ufs/lfs/lfs.h: revision 1.98 Make the segment lock aware of LWPs. Fixes a (somewhat confusing) "lockmgr: pid 3997, not exclusive lockholder 3997, unlocking" panic I encountered while running blogbench on an LFS.
|
1.50.2.3 |
| 20-May-2006 |
riz | Pull up following revision(s) (requested by perseant in ticket #1327): sys/ufs/lfs/lfs_vnops.c: revision 1.158 sys/ufs/lfs/lfs_subr.c: revision 1.57 sys/ufs/lfs/lfs_segment.c: revision 1.171 sys/ufs/lfs/lfs.h: revision 1.97 sys/ufs/lfs/lfs_vfsops.c: revision 1.195 sys/ufs/lfs/lfs_extern.h: revision 1.76 Improvements to LFS's paging mechanism, to wit: * Acknowledge that sometimes there are more dirty pages to be written to disk than clean segments. When we reach the danger line, lfs_gop_write() now returns EAGAIN. The caller of VOP_PUTPAGES(), if it holds the segment lock, drops it and waits for the cleaner to make room before continuing. * Note and avoid a three-way deadlock in lfs_putpages (a writer holding a page busy blocks on the cleaner while the cleaner blocks on the segment lock while lfs_putpages blocks on the page).
|
1.50.2.2 |
| 20-May-2006 |
riz | Pull up following revision(s) (requested by perseant in ticket #1327): sys/ufs/lfs/lfs_vnops.c: revision 1.152 sys/ufs/lfs/lfs_debug.c: revision 1.31 sys/ufs/lfs/lfs_subr.c: revision 1.53 sys/ufs/lfs/lfs_extern.h: revision 1.68 sys/ufs/lfs/lfs_inode.c: revision 1.96 sys/ufs/lfs/lfs_bio.c: revision 1.86 sys/ufs/lfs/lfs_alloc.c: revision 1.83 sys/ufs/lfs/lfs_vfsops.c: revision 1.181 sys/ufs/lfs/lfs.h: revision 1.88 sys/ufs/lfs/lfs_segment.c: revision 1.164 - sprinkle const - avoid shadow variables.
|
1.50.2.1 |
| 07-May-2005 |
tron | Apply patch (requested by perseant in ticket #242): * fsck_lfs buffer cache fixes, including PR #29151 * Change fsck_lfs phase 0 message to reflect reality * fsck_lfs: check phase 5 (cleanerinfo accounting) even on roll-forward * Keep better track of the free list during roll-forward, avoiding a core dump * Improve hash table use for fsck_lfs buffer and vnode cache * Document fsck_lfs flag -f, and implement -q * Add resize_lfs, including kernel support * Add LFS to mountd's list of exportable filesystem types * Make the LFS lkm work again [christos@] * Add MP locking to the LFS kernel subsystem * Fix pager_map deadlock in lfs_putpages() * Avoid incomplete file extension that looks like "partial truncation" to fsck * Use lfs_malloc for cleaner malloc, since the cleaner often runs in low-memory conditions. * Use splay trees, not hash table, to track page allocation for write. * Fix mkdir panic on full fs * Fix page accounting leak by counting differently. * Use rightly named structure for lfs_getattr [skrll@] * Cosmetic changes for readability.
|
1.53.4.1 |
| 20-Oct-2005 |
yamt | adapt ufs.
|
1.53.2.6 |
| 21-Jan-2008 |
yamt | sync with head
|
1.53.2.5 |
| 27-Oct-2007 |
yamt | sync with head.
|
1.53.2.4 |
| 03-Sep-2007 |
yamt | sync with head.
|
1.53.2.3 |
| 26-Feb-2007 |
yamt | sync with head.
|
1.53.2.2 |
| 30-Dec-2006 |
yamt | sync with head.
|
1.53.2.1 |
| 21-Jun-2006 |
yamt | sync with head.
|
1.55.2.1 |
| 15-Jan-2006 |
yamt | sync with head.
|
1.56.10.2 |
| 24-May-2006 |
tron | Merge 2006-05-24 NetBSD-current into the "peter-altq" branch.
|
1.56.10.1 |
| 28-Mar-2006 |
tron | Merge 2006-03-28 NetBSD-current into the "peter-altq" branch.
|
1.56.8.2 |
| 11-May-2006 |
elad | sync with head
|
1.56.8.1 |
| 19-Apr-2006 |
elad | sync with head.
|
1.56.6.5 |
| 03-Sep-2006 |
yamt | sync with head.
|
1.56.6.4 |
| 11-Aug-2006 |
yamt | sync with head
|
1.56.6.3 |
| 24-May-2006 |
yamt | sync with head.
|
1.56.6.2 |
| 11-Apr-2006 |
yamt | sync with head
|
1.56.6.1 |
| 01-Apr-2006 |
yamt | sync with head.
|
1.56.4.2 |
| 01-Jun-2006 |
kardel | Sync with head.
|
1.56.4.1 |
| 22-Apr-2006 |
simonb | Sync with head.
|
1.56.2.1 |
| 09-Sep-2006 |
rpaulo | sync with head
|
1.59.4.1 |
| 13-Jul-2006 |
gdamore | Merge from HEAD.
|
1.61.2.1 |
| 18-Nov-2006 |
ad | Sync with head.
|
1.62.2.2 |
| 10-Dec-2006 |
yamt | sync with head.
|
1.62.2.1 |
| 22-Oct-2006 |
yamt | sync with head
|
1.65.4.1 |
| 03-Sep-2007 |
wrstuden | Sync w/ NetBSD-4-RC_1
|
1.65.2.1 |
| 05-Jun-2007 |
bouyer | Pull up following revision(s) (requested by perseant in ticket #703): sys/miscfs/genfs/genfs.h 1.21 sys/miscfs/genfs/genfs_vnops.c 1.151 sys/ufs/lfs/lfs.h 1.119, 1.120 sys/ufs/lfs/lfs_bio.c 1.99-101 sys/ufs/lfs/lfs_extern.h 1.89 sys/ufs/lfs/lfs_inode.c 1.108, 1.109 sys/ufs/lfs/lfs_segment.c 1.197, 1.199, 1.200 sys/ufs/lfs/lfs_subr.c 1.69, 1.70 sys/ufs/lfs/lfs_syscalls.c 1.119 sys/ufs/lfs/lfs_vfsops.c 1.234, 1.235 sys/ufs/lfs/lfs_vnops.c 1.195, 1.196, 1.200, 1.202-206
Reduce busy waiting in lfs_putpages(), and other LFS improvements.
|
1.66.2.4 |
| 17-May-2007 |
yamt | sync with head.
|
1.66.2.3 |
| 07-May-2007 |
yamt | sync with head.
|
1.66.2.2 |
| 24-Mar-2007 |
yamt | sync with head.
|
1.66.2.1 |
| 27-Feb-2007 |
yamt | - sync with head. - move sched_changepri back to kern_synch.c as it doesn't know PPQ anymore.
|
1.67.4.5 |
| 17-Jun-2007 |
ad | - Increase the number of thread priorities from 128 to 256. How the space is set up is to be revisited. - Implement soft interrupts as kernel threads. A generic implementation is provided, with hooks for fast-path MD code that can run the interrupt threads over the top of other threads executing in the kernel. - Split vnode::v_flag into three fields, depending on how the flag is locked (by the interlock, by the vnode lock, by the file system). - Miscellaneous locking fixes and improvements.
|
1.67.4.4 |
| 08-Jun-2007 |
ad | Sync with head.
|
1.67.4.3 |
| 21-Mar-2007 |
ad | GC the simplelock/spinlock debugging stuff.
|
1.67.4.2 |
| 13-Mar-2007 |
ad | Pull in the initial set of changes for the vmlocking branch.
|
1.67.4.1 |
| 13-Mar-2007 |
ad | Sync with head.
|
1.68.2.1 |
| 11-Jul-2007 |
mjf | Sync with head.
|
1.70.10.1 |
| 14-Oct-2007 |
yamt | sync with head.
|
1.70.8.2 |
| 09-Jan-2008 |
matt | sync with HEAD
|
1.70.8.1 |
| 06-Nov-2007 |
matt | sync with HEAD
|
1.70.6.1 |
| 26-Oct-2007 |
joerg | Sync with HEAD.
Follow the merge of pmap.c on i386 and amd64 and move pmap_init_tmp_pgtbl into arch/x86/x86/pmap.c. Modify the ACPI wakeup code to restore CR4 before jumping back into kernel space as the large page option might cover that.
|
1.71.10.1 |
| 02-Jan-2008 |
bouyer | Sync with HEAD
|
1.71.6.2 |
| 19-Dec-2007 |
ad | Use a global lfs_lock.
|
1.71.6.1 |
| 04-Dec-2007 |
ad | Pull the vmlocking changes into a new branch.
|
1.71.4.1 |
| 18-Feb-2008 |
mjf | Sync with HEAD.
|
1.72.10.3 |
| 11-Aug-2010 |
yamt | sync with head.
|
1.72.10.2 |
| 11-Mar-2010 |
yamt | sync with head
|
1.72.10.1 |
| 16-May-2008 |
yamt | sync with head.
|
1.72.8.1 |
| 18-May-2008 |
yamt | sync with head.
|
1.72.6.1 |
| 02-Jun-2008 |
mjf | Sync with HEAD.
|
1.73.20.2 |
| 17-Aug-2010 |
uebayasi | Sync with HEAD.
|
1.73.20.1 |
| 30-Apr-2010 |
uebayasi | Sync with HEAD.
|
1.74.2.1 |
| 03-Jul-2010 |
rmind | sync with head
|
1.76.12.1 |
| 18-Feb-2012 |
mrg | merge to -current.
|
1.76.8.2 |
| 22-May-2014 |
yamt | sync with head.
for a reference, the tree before this commit was tagged as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments")
|
1.76.8.1 |
| 17-Apr-2012 |
yamt | sync with head
|
1.77.6.3 |
| 03-Dec-2017 |
jdolecek | update from HEAD
|
1.77.6.2 |
| 20-Aug-2014 |
tls | Rebase to HEAD as of a few days ago.
|
1.77.6.1 |
| 23-Jun-2013 |
tls | resync from head
|
1.79.2.1 |
| 28-Aug-2013 |
rmind | sync with head
|
1.80.6.3 |
| 28-Aug-2017 |
skrll | Sync with HEAD
|
1.80.6.2 |
| 27-Dec-2015 |
skrll | Sync with HEAD (as of 26th Dec)
|
1.80.6.1 |
| 22-Sep-2015 |
skrll | Sync with HEAD
|
1.86.4.1 |
| 21-Apr-2017 |
bouyer | Sync with HEAD
|
1.86.2.1 |
| 26-Apr-2017 |
pgoyette | Sync with HEAD
|
1.92.6.1 |
| 30-Oct-2017 |
snj | Pull up following revision(s) (requested by maya in ticket #330): sbin/fsck_lfs/inode.c: 1.69 sbin/fsck_lfs/lfs.c: 1.73 sbin/fsck_lfs/pass6.c: 1.50 sbin/fsck_lfs/segwrite.c: 1.46 sys/ufs/lfs/lfs.h: 1.202-1.203 sys/ufs/lfs/lfs_accessors.h: 1.48 sys/ufs/lfs/lfs_alloc.c: 1.136-1.137 sys/ufs/lfs/lfs_balloc.c: 1.94 sys/ufs/lfs/lfs_bio.c: 1.141 sys/ufs/lfs/lfs_extern.h: 1.113 sys/ufs/lfs/lfs_inode.c: 1.156-1.157 sys/ufs/lfs/lfs_inode.h: 1.20, 1.21, 1.23 sys/ufs/lfs/lfs_itimes.c: 1.20 sys/ufs/lfs/lfs_pages.c: 1.13-1.15 sys/ufs/lfs/lfs_rename.c: 1.22 sys/ufs/lfs/lfs_segment.c: 1.270-1.275 sys/ufs/lfs/lfs_subr.c: 1.94-1.97 sys/ufs/lfs/lfs_syscalls.c: 1.175 sys/ufs/lfs/lfs_vfsops.c: 1.360 sys/ufs/lfs/lfs_vnops.c: 1.316-1.321 sys/ufs/lfs/ulfs_inode.c: 1.20 sys/ufs/lfs/ulfs_inode.h: 1.24 sys/ufs/lfs/ulfs_lookup.c: 1.41 sys/ufs/lfs/ulfs_quota2.c: 1.31 sys/ufs/lfs/ulfs_readwrite.c: 1.24 sys/ufs/lfs/ulfs_vnops.c: 1.49-1.50 Update inode member i_flag --> i_state to keep up with kernel changes Move definition of IN_ALLMOD near the flag it's a mask for. Now we can see that it doesn't match all the flags, but changing that will require more careful thought. Correct confusion between i_flag and i_flags These will have to be renamed. Spotted by Riastradh, thanks! Add an XXX about the missing flags so it's not buried in a commit message. now the XXX count for LFS is 260 Rename i_flag to i_state. The similarity to i_flags has previously caused errors. Use continue to denote the no-op loop to match netbsd style newline for extra clarity. It isn't safe to drain dirops with seglock held, it'll deadlock if there are any dirops. drain before grabbing seglock. lfs_dirops == 0 is always true (as we already drained dirops), so omit that part of the comparison. Fixes a lot of LFS deadlocks. PR kern/52301 Many thanks to dholland for help analyzing coredumps Ifdef out KDASSERT which fires on my machine. Deduplicate sanity check that seglock is held on segunlock Revert r1.272 fix to PR kern/52301, the performance hit is making things unusable. change lfs_nextsegsleep and lfs_allclean_wakeup to use condvar XXX had to use lfs_lock in lfs_segwait, removed kernel_lock, is this appropriate? fix buffer overflow/KASSERT when cookies are supplied lfs no longer uses the ffs-style struct direct, use the correct minimum size from dholland XXX more wrong Consistently use {,UN}MARK_VNODE macros rather than function calls. Not much point doing anything after a panic call Ask some question about the code in a XXX comment XXX question our double-flushing of dirops Fix typo in comment
|
1.97.10.1 |
| 29-Feb-2020 |
ad | Sync with head.
|
1.97.8.1 |
| 17-Aug-2020 |
martin | Pull up following revision(s) (requested by riastradh in ticket #1050):
sys/ufs/lfs/lfs_subr.c: revision 1.101 sys/ufs/lfs/lfs_subr.c: revision 1.102 sys/ufs/lfs/lfs_inode.c: revision 1.158 sys/ufs/lfs/lfs_inode.h: revision 1.25 sys/ufs/lfs/lfs_balloc.c: revision 1.95 sys/ufs/lfs/lfs_pages.c: revision 1.21 sys/ufs/lfs/lfs_vnops.c: revision 1.330 sys/ufs/lfs/lfs_alloc.c: revision 1.140 (patch) sys/ufs/lfs/lfs_alloc.c: revision 1.141 (patch) lib/libp2k/p2k.c: revision 1.72 sys/ufs/lfs/lfs.h: revision 1.205 sys/ufs/lfs/lfs.h: revision 1.206 sys/ufs/lfs/lfs_segment.c: revision 1.284 sys/ufs/lfs/lfs.h: revision 1.207 sys/ufs/lfs/lfs_segment.c: revision 1.285 sys/ufs/lfs/lfs_debug.c: revision 1.55 sys/ufs/lfs/lfs_rename.c: revision 1.23 usr.sbin/dumplfs/dumplfs.c: revision 1.65 sys/ufs/lfs/lfs_vfsops.c: revision 1.371 sys/arch/i386/stand/efiboot/bootx64/Makefile: revision 1.3 sys/ufs/lfs/lfs_vfsops.c: revision 1.372 sys/ufs/lfs/lfs_vfsops.c: revision 1.373 sbin/fsck_lfs/pass1.c: revision 1.46 sys/ufs/lfs/lfs_vnops.c: revision 1.326 sys/ufs/lfs/lfs_vnops.c: revision 1.327 sys/ufs/lfs/lfs_vfsops.c: revision 1.375 (patch) sys/ufs/lfs/lfs_vnops.c: revision 1.328 sys/ufs/lfs/lfs_subr.c: revision 1.98 sys/ufs/lfs/lfs_extern.h: revision 1.116 sys/ufs/lfs/lfs_vnops.c: revision 1.329 sys/ufs/lfs/lfs_subr.c: revision 1.99 sys/ufs/lfs/lfs_extern.h: revision 1.117 sys/ufs/lfs/lfs_accessors.h: revision 1.49 sys/ufs/lfs/lfs_extern.h: revision 1.118 sys/rump/fs/lib/liblfs/Makefile: revision 1.15 sys/ufs/lfs/lfs_bio.c: revision 1.146 (patch) sys/ufs/lfs/lfs_bio.c: revision 1.147 sys/ufs/lfs/lfs_subr.c: revision 1.100
Fix kassert in lfs by initializing vp first.
Use a marker node to iterate lfs_dchainhd / i_lfs_dchain.
I believe elements can be removed while the lock is dropped, including the next node we're hanging on to.
Just use VOP_BWRITE for lfs_bwrite_log. Hope this doesn't cause trouble with vfs_suspend.
Teach lfs to transition ro<->rw.
Prevent new dirops while we issue lfs_flush_dirops.
lfs_flush_dirops assumes (by KASSERT((ip->i_state & IN_ADIROP) == 0)) that vnodes on the dchain will not become involved in active dirops even while holding no other locks (lfs_lock, v_interlock), so we must set lfs_writer here. All other callers already set lfs_writer.
We set fs->lfs_writer++ without explicitly doing lfs_writer_enter because (a) we already waited for the dirops to drain, and (b) we hold lfs_lock and cannot drop it before setting lfs_writer.
Assert lfs_writer where I think we can now prove it.
Serialize access to the splay tree with lfs_lock.
Change some cheap KDASSERT into KASSERT.
Take a reference and fix assertions in lfs_flush_dirops. Fixes panic: KASSERT((ip->i_state & IN_ADIROP) == 0) at lfs_vnops.c:1670 lfs_flush_dirops lfs_check lfs_setattr VOP_SETATTR change_mode sys_fchmod syscall
This assertion -- and the assertion that vp->v_uflag has VU_DIROP set -- is valid only until we release lfs_lock, because we may race with lfs_unmark_dirop which will remove the nodes and change the flags.
Further, vp itself is valid only as long as it is referenced, which it is as long as it's on the dchain, but lfs_unmark_dirop drops the dchain's reference.
Don't lfs_writer_enter while holding v_interlock.
There's no need to lfs_writer_enter at all here, as far as I can see. lfs_flush_fs will do it for us.
Break deadlock in PR kern/52301.
The lock order is lfs_writer -> lfs_seglock. The problem in 52301 is that lfs_segwrite violates this lock order by sometimes doing lfs_seglock -> lfs_writer, either (a) when doing a checkpoint or (b), opportunistically, when there are no dirops pending. Both cases can deadlock, because dirops sometimes take the seglock (lfs_truncate, lfs_valloc, lfs_vfree): (a) There may be dirops pending, and they may be waiting for the seglock, so we can't wait for them to complete while holding the seglock. (b) The test for fs->lfs_dirops == 0 happens unlocked, and the state may change by the time lfs_writer_enter acquires lfs_lock.
To resolve this in each case: (a) Do lfs_writer_enter before lfs_seglock, since we will need it unconditionally anyway. The worst performance impact of this should be that some dirops get delayed a little bit. (b) Create a new lfs_writer_tryenter to use at this point so that the test for fs->lfs_dirops == 0 and the acquisition of lfs_writer happen atomically under lfs_lock.
Initialize/destroy lfs_allclean_wakeup in modcmd, not lfs_mountfs.
Fixes reloading lfs.kmod.
In lfs_update, hold lfs_writer around lfs_vflush.
Otherwise, we might do lfs_vflush -> lfs_seglock -> lfs_segwait(SEGM_CKP) -> lfs_writer_enter which is the reverse of the lfs_writer -> lfs_seglock ordering.
Call lfs_orphan in lfs_rename while we're still in the dirop. lfs_writer_enter can't fail; keep it simple and don't pretend it can.
Assert that mtsleep can't fail either -- it doesn't catch signals and there's no timeout.
Teach LFS_ORPHAN_NEXTFREE about lfs64.
Dust off the orphan detection code and try to make it work.
Fix !DIAGNOSTIC compile
Fix userland references to LFS_ORPHAN_NEXTFREE.
Forgot to grep for these or do a full distribution build, oops!
Fix missing <sys/evcnt.h> by removing the evcnts instead.
Just wanted to confirm that a race might happen, and indeed it did. These serve little diagnostic value otherwise.
OR into bp->b_cflags; don't overwrite.
CTASSERT lfs on-disk structure sizes.
Avoid misaligned access to lfs64 on-disk records in memory. lfs64 directory entries are only 32-bit aligned in order to conserve space in directory blocks, and we had a hack to stuff a 64-bit inode in them. This replaces the hack by __aligned(4) __packed, and goes further:
1. It's not clear that all the other lfs64 data structures are 64-bit aligned on disk to begin with. We can go through these later and upgrade them from struct foo64 { ... } __aligned(4) __packed; union foo { struct foo64 f64; ... }; to struct foo64 { ... }; union foo { struct foo64 f64 __aligned(8); ... } __aligned(4) __packed; if we really want to take advantage of 64-bit memory accesses. However, the __aligned(4) __packed must remain on the union because: 2. We access even the lfs32 data structures via a union that has lfs64 members, and it turns out that compilers will assume access through a union with 64-bit aligned members implies the whole union has 64-bit alignment, even if we're only accessing a 32-bit aligned member.
Fix clang build after packed lfs64 accessor change.
Suppress spurious address-of-packed error in rump lfs too.
|
1.97.4.1 |
| 08-Apr-2020 |
martin | Merge changes from current as of 20200406
|