diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-10-19 01:35:27 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-10-19 01:35:27 +0000 |
| commit | 4ceda2abba2589b9879eb14763ddd65a15bd1ed8 (patch) | |
| tree | 9ac7dfedc9d653224646351f53eac268e4dbb97f /sys/kern | |
| parent | 69b7977cd26d32facef5953ebe569cc8797483fe (diff) | |
| download | FreeBSD-src-4ceda2abba2589b9879eb14763ddd65a15bd1ed8.zip FreeBSD-src-4ceda2abba2589b9879eb14763ddd65a15bd1ed8.tar.gz | |
- Forward port flush of page table updates on context switch or userret
- Forward port vfork XEN hack
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_fork.c | 9 | ||||
| -rw-r--r-- | sys/kern/kern_synch.c | 9 | ||||
| -rw-r--r-- | sys/kern/subr_trap.c | 9 |
3 files changed, 25 insertions, 2 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index e5a3779..673913b 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -117,10 +117,15 @@ vfork(td, uap) struct thread *td; struct vfork_args *uap; { - int error; + int error, flags; struct proc *p2; - error = fork1(td, RFFDG | RFPROC | RFPPWAIT | RFMEM, 0, &p2); +#ifdef XEN + flags = RFFDG | RFPROC; /* validate that this is still an issue */ +#else + flags = RFFDG | RFPROC | RFPPWAIT | RFMEM; +#endif + error = fork1(td, flags, 0, &p2); if (error == 0) { td->td_retval[0] = p2->p_pid; td->td_retval[1] = 0; diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index 4f1205d..53e3ced 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -65,6 +65,12 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> +#ifdef XEN +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> +#endif + static void synch_setup(void *dummy); SYSINIT(synch_setup, SI_SUB_KICK_SCHEDULER, SI_ORDER_FIRST, synch_setup, NULL); @@ -432,6 +438,9 @@ mi_switch(int flags, struct thread *newtd) td, td->td_name, td->td_priority, td->td_inhibitors, td->td_wmesg, td->td_lockname); #endif +#ifdef XEN + PT_UPDATES_FLUSH(); +#endif sched_switch(td, newtd, flags); CTR3(KTR_SCHED, "mi_switch: running %p(%s) prio %d", td, td->td_name, td->td_priority); diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 3d1948d..e7e8120 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -73,6 +73,12 @@ __FBSDID("$FreeBSD$"); #include <machine/cpu.h> #include <machine/pcb.h> +#ifdef XEN +#include <vm/vm.h> +#include <vm/vm_param.h> +#include <vm/pmap.h> +#endif + #include <security/mac/mac_framework.h> /* @@ -118,6 +124,9 @@ userret(struct thread *td, struct trapframe *frame) sched_userret(td); KASSERT(td->td_locks == 0, ("userret: Returning with %d locks held.", td->td_locks)); +#ifdef XEN + PT_UPDATES_FLUSH(); +#endif } /* |
