mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-29 12:03:03 +00:00
0d94caffca
much higher filesystem I/O performance, and much better paging performance. It represents the culmination of over 6 months of R&D. The majority of the merged VM/cache work is by John Dyson. The following highlights the most significant changes. Additionally, there are (mostly minor) changes to the various filesystem modules (nfs, msdosfs, etc) to support the new VM/buffer scheme. vfs_bio.c: Significant rewrite of most of vfs_bio to support the merged VM buffer cache scheme. The scheme is almost fully compatible with the old filesystem interface. Significant improvement in the number of opportunities for write clustering. vfs_cluster.c, vfs_subr.c Upgrade and performance enhancements in vfs layer code to support merged VM/buffer cache. Fixup of vfs_cluster to eliminate the bogus pagemove stuff. vm_object.c: Yet more improvements in the collapse code. Elimination of some windows that can cause list corruption. vm_pageout.c: Fixed it, it really works better now. Somehow in 2.0, some "enhancements" broke the code. This code has been reworked from the ground-up. vm_fault.c, vm_page.c, pmap.c, vm_object.c Support for small-block filesystems with merged VM/buffer cache scheme. pmap.c vm_map.c Dynamic kernel VM size, now we dont have to pre-allocate excessive numbers of kernel PTs. vm_glue.c Much simpler and more effective swapping code. No more gratuitous swapping. proc.h Fixed the problem that the p_lock flag was not being cleared on a fork. swap_pager.c, vnode_pager.c Removal of old vfs_bio cruft to support the past pseudo-coherency. Now the code doesn't need it anymore. machdep.c Changes to better support the parameter values for the merged VM/buffer cache scheme. machdep.c, kern_exec.c, vm_glue.c Implemented a seperate submap for temporary exec string space and another one to contain process upages. This eliminates all map fragmentation problems that previously existed. ffs_inode.c, ufs_inode.c, ufs_readwrite.c Changes for merged VM/buffer cache. Add "bypass" support for sneaking in on busy buffers. Submitted by: John Dyson and David Greenman
170 lines
5.8 KiB
C
170 lines
5.8 KiB
C
/*
|
|
* Copyright (c) 1991, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* The Mach Operating System project at Carnegie-Mellon University.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* from: @(#)lock.h 8.1 (Berkeley) 6/11/93
|
|
*
|
|
*
|
|
* Copyright (c) 1987, 1990 Carnegie-Mellon University.
|
|
* All rights reserved.
|
|
*
|
|
* Authors: Avadis Tevanian, Jr., Michael Wayne Young
|
|
*
|
|
* Permission to use, copy, modify and distribute this software and
|
|
* its documentation is hereby granted, provided that both the copyright
|
|
* notice and this permission notice appear in all copies of the
|
|
* software, derivative works or modified versions, and any portions
|
|
* thereof, and that both notices appear in supporting documentation.
|
|
*
|
|
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
|
|
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
|
|
* FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
|
|
*
|
|
* Carnegie Mellon requests users of this software to return to
|
|
*
|
|
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
|
|
* School of Computer Science
|
|
* Carnegie Mellon University
|
|
* Pittsburgh PA 15213-3890
|
|
*
|
|
* any improvements or extensions that they make and grant Carnegie the
|
|
* rights to redistribute these changes.
|
|
*
|
|
* $Id: lock.h,v 1.2 1994/08/02 07:55:11 davidg Exp $
|
|
*/
|
|
|
|
/*
|
|
* Locking primitives definitions
|
|
*/
|
|
|
|
#ifndef _LOCK_H_
|
|
#define _LOCK_H_
|
|
|
|
#define NCPUS 1 /* XXX */
|
|
|
|
/*
|
|
* A simple spin lock.
|
|
*/
|
|
|
|
struct slock {
|
|
int lock_data; /* in general 1 bit is sufficient */
|
|
};
|
|
|
|
typedef struct slock simple_lock_data_t;
|
|
typedef struct slock *simple_lock_t;
|
|
|
|
/*
|
|
* The general lock structure. Provides for multiple readers,
|
|
* upgrading from read to write, and sleeping until the lock
|
|
* can be gained.
|
|
*/
|
|
|
|
struct lock {
|
|
#ifdef vax
|
|
/*
|
|
* Efficient VAX implementation -- see field description below.
|
|
*/
|
|
unsigned int read_count:16, want_upgrade:1, want_write:1, waiting:1, can_sleep:1,:0;
|
|
|
|
simple_lock_data_t interlock;
|
|
#else /* vax */
|
|
#ifdef ns32000
|
|
/*
|
|
* Efficient ns32000 implementation -- see field description below.
|
|
*/
|
|
simple_lock_data_t interlock;
|
|
unsigned int read_count:16, want_upgrade:1, want_write:1, waiting:1, can_sleep:1,:0;
|
|
|
|
#else /* ns32000 */
|
|
/*
|
|
* Only the "interlock" field is used for hardware exclusion; other
|
|
* fields are modified with normal instructions after acquiring the
|
|
* interlock bit.
|
|
*/
|
|
simple_lock_data_t
|
|
interlock; /* Interlock for remaining fields */
|
|
boolean_t want_write; /* Writer is waiting, or locked for write */
|
|
boolean_t want_upgrade; /* Read-to-write upgrade waiting */
|
|
boolean_t waiting; /* Someone is sleeping on lock */
|
|
boolean_t can_sleep; /* Can attempts to lock go to sleep */
|
|
int read_count; /* Number of accepted readers */
|
|
#endif /* ns32000 */
|
|
#endif /* vax */
|
|
char *thread; /* Thread that has lock, if recursive locking
|
|
* allowed */
|
|
/*
|
|
* (should be thread_t, but but we then have mutually recursive
|
|
* definitions)
|
|
*/
|
|
int recursion_depth; /* Depth of recursion */
|
|
};
|
|
|
|
typedef struct lock lock_data_t;
|
|
typedef struct lock *lock_t;
|
|
|
|
#if NCPUS > 1
|
|
__BEGIN_DECLS
|
|
void simple_lock __P((simple_lock_t));
|
|
void simple_lock_init __P((simple_lock_t));
|
|
boolean_t simple_lock_try __P((simple_lock_t));
|
|
void simple_unlock __P((simple_lock_t));
|
|
|
|
__END_DECLS
|
|
#else /* No multiprocessor locking is necessary. */
|
|
#define simple_lock(l)
|
|
#define simple_lock_init(l)
|
|
#define simple_lock_try(l) (1) /* Always succeeds. */
|
|
#define simple_unlock(l)
|
|
#endif
|
|
|
|
/* Sleep locks must work even if no multiprocessing. */
|
|
|
|
#define lock_read_done(l) lock_done(l)
|
|
#define lock_write_done(l) lock_done(l)
|
|
|
|
void lock_clear_recursive __P((lock_t));
|
|
void lock_done __P((lock_t));
|
|
void lock_init __P((lock_t, boolean_t));
|
|
void lock_read __P((lock_t));
|
|
boolean_t lock_read_to_write __P((lock_t));
|
|
void lock_set_recursive __P((lock_t));
|
|
void lock_sleepable __P((lock_t, boolean_t));
|
|
boolean_t lock_try_read __P((lock_t));
|
|
boolean_t lock_try_read_to_write __P((lock_t));
|
|
boolean_t lock_try_write __P((lock_t));
|
|
void lock_write __P((lock_t));
|
|
void lock_write_to_read __P((lock_t));
|
|
|
|
#endif /* !_LOCK_H_ */
|