mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-12-23 10:06:25 +01:00
8f9110f6a1
has been some bitrot and incorrect assumptions in the vfs_bio code. These problems have manifest themselves worse on NFS type filesystems, but can still affect local filesystems under certain circumstances. Most of the problems have involved mmap consistancy, and as a side-effect broke the vfs.ioopt code. This code might have been committed seperately, but almost everything is interrelated. 1) Allow (pmap_object_init_pt) prefaulting of buffer-busy pages that are fully valid. 2) Rather than deactivating erroneously read initial (header) pages in kern_exec, we now free them. 3) Fix the rundown of non-VMIO buffers that are in an inconsistent (missing vp) state. 4) Fix the disassociation of pages from buffers in brelse. The previous code had rotted and was faulty in a couple of important circumstances. 5) Remove a gratuitious buffer wakeup in vfs_vmio_release. 6) Remove a crufty and currently unused cluster mechanism for VBLK files in vfs_bio_awrite. When the code is functional, I'll add back a cleaner version. 7) The page busy count wakeups assocated with the buffer cache usage were incorrectly cleaned up in a previous commit by me. Revert to the original, correct version, but with a cleaner implementation. 8) The cluster read code now tries to keep data associated with buffers more aggressively (without breaking the heuristics) when it is presumed that the read data (buffers) will be soon needed. 9) Change to filesystem lockmgr locks so that they use LK_NOPAUSE. The delay loop waiting is not useful for filesystem locks, due to the length of the time intervals. 10) Correct and clean-up spec_getpages. 11) Implement a fully functional nfs_getpages, nfs_putpages. 12) Fix nfs_write so that modifications are coherent with the NFS data on the server disk (at least as well as NFS seems to allow.) 13) Properly support MS_INVALIDATE on NFS. 14) Properly pass down MS_INVALIDATE to lower levels of the VM code from vm_map_clean. 15) Better support the notion of pages being busy but valid, so that fewer in-transit waits occur. (use p->busy more for pageouts instead of PG_BUSY.) Since the page is fully valid, it is still usable for reads. 16) It is possible (in error) for cached pages to be busy. Make the page allocation code handle that case correctly. (It should probably be a printf or panic, but I want the system to handle coding errors robustly. I'll probably add a printf.) 17) Correct the design and usage of vm_page_sleep. It didn't handle consistancy problems very well, so make the design a little less lofty. After vm_page_sleep, if it ever blocked, it is still important to relookup the page (if the object generation count changed), and verify it's status (always.) 18) In vm_pageout.c, vm_pageout_clean had rotted, so clean that up. 19) Push the page busy for writes and VM_PROT_READ into vm_pageout_flush. 20) Fix vm_pager_put_pages and it's descendents to support an int flag instead of a boolean, so that we can pass down the invalidate bit.
107 lines
4.2 KiB
C
107 lines
4.2 KiB
C
/*
|
|
* Copyright (c) 1990 University of Utah.
|
|
* 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 Systems Programming Group of the University of Utah Computer
|
|
* Science Department.
|
|
*
|
|
* 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.
|
|
*
|
|
* @(#)vm_pager.h 8.4 (Berkeley) 1/12/94
|
|
* $Id: vm_pager.h,v 1.15 1998/02/03 22:19:35 bde Exp $
|
|
*/
|
|
|
|
/*
|
|
* Pager routine interface definition.
|
|
*/
|
|
|
|
#ifndef _VM_PAGER_
|
|
#define _VM_PAGER_
|
|
|
|
#include <sys/queue.h>
|
|
|
|
TAILQ_HEAD(pagerlst, vm_object);
|
|
|
|
struct pagerops {
|
|
void (*pgo_init) __P((void)); /* Initialize pager. */
|
|
vm_object_t (*pgo_alloc) __P((void *, vm_size_t, vm_prot_t, vm_ooffset_t)); /* Allocate pager. */
|
|
void (*pgo_dealloc) __P((vm_object_t)); /* Disassociate. */
|
|
int (*pgo_getpages) __P((vm_object_t, vm_page_t *, int, int)); /* Get (read) page. */
|
|
int (*pgo_putpages) __P((vm_object_t, vm_page_t *, int, int, int *)); /* Put (write) page. */
|
|
boolean_t (*pgo_haspage) __P((vm_object_t, vm_pindex_t, int *, int *)); /* Does pager have page? */
|
|
void (*pgo_sync) __P((void));
|
|
};
|
|
|
|
/*
|
|
* get/put return values
|
|
* OK operation was successful
|
|
* BAD specified data was out of the accepted range
|
|
* FAIL specified data was in range, but doesn't exist
|
|
* PEND operations was initiated but not completed
|
|
* ERROR error while accessing data that is in range and exists
|
|
* AGAIN temporary resource shortage prevented operation from happening
|
|
*/
|
|
#define VM_PAGER_OK 0
|
|
#define VM_PAGER_BAD 1
|
|
#define VM_PAGER_FAIL 2
|
|
#define VM_PAGER_PEND 3
|
|
#define VM_PAGER_ERROR 4
|
|
#define VM_PAGER_AGAIN 5
|
|
|
|
#define VM_PAGER_PUT_SYNC 0x1
|
|
#define VM_PAGER_PUT_INVAL 0x2
|
|
|
|
#ifdef KERNEL
|
|
|
|
#ifdef MALLOC_DECLARE
|
|
MALLOC_DECLARE(M_VMPGDATA);
|
|
#endif
|
|
|
|
extern vm_map_t pager_map;
|
|
extern int pager_map_size;
|
|
|
|
vm_object_t vm_pager_allocate __P((objtype_t, void *, vm_size_t, vm_prot_t, vm_ooffset_t));
|
|
void vm_pager_bufferinit __P((void));
|
|
void vm_pager_deallocate __P((vm_object_t));
|
|
int vm_pager_get_pages __P((vm_object_t, vm_page_t *, int, int));
|
|
boolean_t vm_pager_has_page __P((vm_object_t, vm_pindex_t, int *, int *));
|
|
void vm_pager_init __P((void));
|
|
vm_object_t vm_pager_object_lookup __P((struct pagerlst *, void *));
|
|
vm_offset_t vm_pager_map_pages __P((vm_page_t *, int, boolean_t));
|
|
vm_offset_t vm_pager_map_page __P((vm_page_t));
|
|
int vm_pager_put_pages __P((vm_object_t, vm_page_t *, int, boolean_t, int *));
|
|
void vm_pager_sync __P((void));
|
|
void vm_pager_unmap_pages __P((vm_offset_t, int));
|
|
void vm_pager_unmap_page __P((vm_offset_t));
|
|
#endif
|
|
|
|
#endif /* _VM_PAGER_ */
|