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.
179 lines
4.9 KiB
C
179 lines
4.9 KiB
C
/*
|
|
* ----------------------------------------------------------------------------
|
|
* "THE BEER-WARE LICENSE" (Revision 42):
|
|
* <phk@FreeBSD.org> wrote this file. As long as you retain this notice you
|
|
* can do whatever you want with this stuff. If we meet some day, and you think
|
|
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
|
|
* ----------------------------------------------------------------------------
|
|
*
|
|
* $Id: smp.h,v 1.39 1998/03/05 21:45:44 tegge Exp $
|
|
*
|
|
*/
|
|
|
|
#ifndef _MACHINE_SMP_H_
|
|
#define _MACHINE_SMP_H_
|
|
|
|
#ifdef KERNEL
|
|
|
|
#if defined(SMP) && !defined(APIC_IO)
|
|
# error APIC_IO required for SMP, add "options APIC_IO" to your config file.
|
|
#endif /* SMP && !APIC_IO */
|
|
|
|
/* Number of CPUs. */
|
|
#if defined(SMP) && !defined(NCPU)
|
|
# define NCPU 2
|
|
#endif /* SMP && NCPU */
|
|
|
|
/* Number of IO APICs. */
|
|
#if defined(APIC_IO) && !defined(NAPIC)
|
|
# define NAPIC 1
|
|
#endif /* SMP && NAPIC */
|
|
|
|
|
|
#if defined(SMP) || defined(APIC_IO)
|
|
|
|
#ifndef LOCORE
|
|
|
|
/*
|
|
* For sending values to POST displays.
|
|
* XXX FIXME: where does this really belong, isa.h/isa.c perhaps?
|
|
*/
|
|
extern int current_postcode; /** XXX currently in mp_machdep.c */
|
|
#define POSTCODE(X) current_postcode = (X), \
|
|
outb(0x80, current_postcode)
|
|
#define POSTCODE_LO(X) current_postcode &= 0xf0, \
|
|
current_postcode |= ((X) & 0x0f), \
|
|
outb(0x80, current_postcode)
|
|
#define POSTCODE_HI(X) current_postcode &= 0x0f, \
|
|
current_postcode |= (((X) << 4) & 0xf0), \
|
|
outb(0x80, current_postcode)
|
|
|
|
|
|
#include <machine/apic.h>
|
|
|
|
/* global data in mpboot.s */
|
|
extern int bootMP_size;
|
|
|
|
/* functions in mpboot.s */
|
|
void bootMP __P((void));
|
|
|
|
/* global data in mplock.s */
|
|
extern u_int mp_lock;
|
|
extern u_int isr_lock;
|
|
#ifdef RECURSIVE_MPINTRLOCK
|
|
extern u_int mpintr_lock;
|
|
#endif /* RECURSIVE_MPINTRLOCK */
|
|
|
|
/* functions in mplock.s */
|
|
void get_mplock __P((void));
|
|
void rel_mplock __P((void));
|
|
int try_mplock __P((void));
|
|
#ifdef RECURSIVE_MPINTRLOCK
|
|
void get_mpintrlock __P((void));
|
|
void rel_mpintrlock __P((void));
|
|
int try_mpintrlock __P((void));
|
|
#endif /* RECURSIVE_MPINTRLOCK */
|
|
|
|
/* global data in apic_vector.s */
|
|
extern volatile u_int stopped_cpus;
|
|
extern volatile u_int started_cpus;
|
|
|
|
extern unsigned int checkstate_probed_cpus;
|
|
extern unsigned int checkstate_need_ast;
|
|
|
|
/* functions in apic_ipl.s */
|
|
void apic_eoi __P((void));
|
|
u_int io_apic_read __P((int, int));
|
|
void io_apic_write __P((int, int, u_int));
|
|
|
|
/* global data in mp_machdep.c */
|
|
extern int bsp_apic_ready;
|
|
extern int mp_ncpus;
|
|
extern int mp_naps;
|
|
extern int mp_nbusses;
|
|
extern int mp_napics;
|
|
extern int mp_picmode;
|
|
extern int boot_cpu_id;
|
|
extern vm_offset_t cpu_apic_address;
|
|
extern vm_offset_t io_apic_address[];
|
|
extern u_int32_t cpu_apic_versions[];
|
|
extern u_int32_t io_apic_versions[];
|
|
extern int cpu_num_to_apic_id[];
|
|
extern int io_num_to_apic_id[];
|
|
extern int apic_id_to_logical[];
|
|
extern u_int all_cpus;
|
|
extern u_char SMP_ioapic[];
|
|
|
|
/* functions in mp_machdep.c */
|
|
u_int mp_bootaddress __P((u_int));
|
|
int mp_probe __P((void));
|
|
void mp_start __P((void));
|
|
void mp_announce __P((void));
|
|
u_int isa_apic_mask __P((u_int));
|
|
int isa_apic_pin __P((int));
|
|
int pci_apic_pin __P((int, int, int));
|
|
int undirect_isa_irq __P((int));
|
|
int undirect_pci_irq __P((int));
|
|
int apic_bus_type __P((int));
|
|
int apic_src_bus_id __P((int, int));
|
|
int apic_src_bus_irq __P((int, int));
|
|
int apic_int_type __P((int, int));
|
|
int apic_trigger __P((int, int));
|
|
int apic_polarity __P((int, int));
|
|
void bsp_apic_configure __P((void));
|
|
void init_secondary __P((void));
|
|
void smp_invltlb __P((void));
|
|
int stop_cpus __P((u_int));
|
|
int restart_cpus __P((u_int));
|
|
#ifdef BETTER_CLOCK
|
|
void forward_statclock __P((int pscnt));
|
|
void forward_hardclock __P((int pscnt));
|
|
#endif /* BETTER_CLOCK */
|
|
void forward_signal __P((struct proc *));
|
|
#ifdef APIC_INTR_REORDER
|
|
void set_lapic_isrloc __P((int, int));
|
|
#endif /* APIC_INTR_REORDER */
|
|
|
|
/* global data in mpapic.c */
|
|
extern volatile lapic_t lapic;
|
|
|
|
#if defined(MULTIPLE_IOAPICS)
|
|
#error MULTIPLE_IOAPICSXXX
|
|
#else
|
|
extern volatile ioapic_t *ioapic[];
|
|
#endif /* MULTIPLE_IOAPICS */
|
|
|
|
/* functions in mpapic.c */
|
|
void apic_dump __P((char*));
|
|
void apic_initialize __P((void));
|
|
void imen_dump __P((void));
|
|
int apic_ipi __P((int, int, int));
|
|
int selected_apic_ipi __P((u_int, int, int));
|
|
int io_apic_setup __P((int));
|
|
int ext_int_setup __P((int, int));
|
|
|
|
#if defined(READY)
|
|
void clr_io_apic_mask24 __P((int, u_int32_t));
|
|
void set_io_apic_mask24 __P((int, u_int32_t));
|
|
#endif /* READY */
|
|
|
|
void set_apic_timer __P((int));
|
|
int read_apic_timer __P((void));
|
|
void u_sleep __P((int));
|
|
|
|
/* global data in init_smp.c */
|
|
extern int invltlb_ok;
|
|
extern int smp_active;
|
|
extern volatile int smp_idle_loops;
|
|
|
|
/* 'private' global data in locore.s */
|
|
extern volatile u_int cpuid;
|
|
extern volatile u_int cpu_lockid;
|
|
extern int inside_intr;
|
|
extern volatile u_int other_cpus;
|
|
|
|
#endif /* !LOCORE */
|
|
#endif /* SMP || APIC_IO */
|
|
#endif /* KERNEL */
|
|
#endif /* _MACHINE_SMP_H_ */
|