mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-19 10:53:58 +00:00
78c85e8dfc
the raw values including for child process statistics and only compute the system and user timevals on demand. - Fix the various kern_wait() syscall wrappers to only pass in a rusage pointer if they are going to use the result. - Add a kern_getrusage() function for the ABI syscalls to use so that they don't have to play stackgap games to call getrusage(). - Fix the svr4_sys_times() syscall to just call calcru() to calculate the times it needs rather than calling getrusage() twice with associated stackgap, etc. - Add a new rusage_ext structure to store raw time stats such as tick counts for user, system, and interrupt time as well as a bintime of the total runtime. A new p_rux field in struct proc replaces the same inline fields from struct proc (i.e. p_[isu]ticks, p_[isu]u, and p_runtime). A new p_crux field in struct proc contains the "raw" child time usage statistics. ruadd() has been changed to handle adding the associated rusage_ext structures as well as the values in rusage. Effectively, the values in rusage_ext replace the ru_utime and ru_stime values in struct rusage. These two fields in struct rusage are no longer used in the kernel. - calcru() has been split into a static worker function calcru1() that calculates appropriate timevals for user and system time as well as updating the rux_[isu]u fields of a passed in rusage_ext structure. calcru() uses a copy of the process' p_rux structure to compute the timevals after updating the runtime appropriately if any of the threads in that process are currently executing. It also now only locks sched_lock internally while doing the rux_runtime fixup. calcru() now only requires the caller to hold the proc lock and calcru1() only requires the proc lock internally. calcru() also no longer allows callers to ask for an interrupt timeval since none of them actually did. - calcru() now correctly handles threads executing on other CPUs. - A new calccru() function computes the child system and user timevals by calling calcru1() on p_crux. Note that this means that any code that wants child times must now call this function rather than reading from p_cru directly. This function also requires the proc lock. - This finishes the locking for rusage and friends so some of the Giant locks in exit1() and kern_wait() are now gone. - The locking in ttyinfo() has been tweaked so that a shared lock of the proctree lock is used to protect the process group rather than the process group lock. By holding this lock until the end of the function we now ensure that the process/thread that we pick to dump info about will no longer vanish while we are trying to output its info to the console. Submitted by: bde (mostly) MFC after: 1 month
265 lines
7.2 KiB
C
265 lines
7.2 KiB
C
/*-
|
|
* Copyright (C) 1994, David Greenman
|
|
* Copyright (c) 1990, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* This code is derived from software contributed to Berkeley by
|
|
* the University of Utah, and William Jolitz.
|
|
*
|
|
* 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: @(#)trap.c 7.4 (Berkeley) 5/13/91
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include "opt_ktrace.h"
|
|
#include "opt_mac.h"
|
|
#ifdef __i386__
|
|
#include "opt_npx.h"
|
|
#endif
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/bus.h>
|
|
#include <sys/kernel.h>
|
|
#include <sys/lock.h>
|
|
#include <sys/mac.h>
|
|
#include <sys/mutex.h>
|
|
#include <sys/proc.h>
|
|
#include <sys/ktr.h>
|
|
#include <sys/resourcevar.h>
|
|
#include <sys/sched.h>
|
|
#include <sys/signalvar.h>
|
|
#include <sys/systm.h>
|
|
#include <sys/vmmeter.h>
|
|
#ifdef KTRACE
|
|
#include <sys/uio.h>
|
|
#include <sys/ktrace.h>
|
|
#endif
|
|
|
|
#include <machine/cpu.h>
|
|
#include <machine/pcb.h>
|
|
|
|
/*
|
|
* Define the code needed before returning to user mode, for
|
|
* trap and syscall.
|
|
*
|
|
* MPSAFE
|
|
*/
|
|
void
|
|
userret(td, frame, oticks)
|
|
struct thread *td;
|
|
struct trapframe *frame;
|
|
u_int oticks;
|
|
{
|
|
struct proc *p = td->td_proc;
|
|
|
|
CTR3(KTR_SYSC, "userret: thread %p (pid %d, %s)", td, p->p_pid,
|
|
p->p_comm);
|
|
#ifdef DIAGNOSTIC
|
|
/* Check that we called signotify() enough. */
|
|
PROC_LOCK(p);
|
|
mtx_lock_spin(&sched_lock);
|
|
if (SIGPENDING(td) && ((td->td_flags & TDF_NEEDSIGCHK) == 0 ||
|
|
(td->td_flags & TDF_ASTPENDING) == 0))
|
|
printf("failed to set signal flags properly for ast()\n");
|
|
mtx_unlock_spin(&sched_lock);
|
|
PROC_UNLOCK(p);
|
|
#endif
|
|
|
|
/*
|
|
* Let the scheduler adjust our priority etc.
|
|
*/
|
|
sched_userret(td);
|
|
|
|
/*
|
|
* We need to check to see if we have to exit or wait due to a
|
|
* single threading requirement or some other STOP condition.
|
|
* Don't bother doing all the work if the stop bits are not set
|
|
* at this time.. If we miss it, we miss it.. no big deal.
|
|
*/
|
|
if (P_SHOULDSTOP(p)) {
|
|
PROC_LOCK(p);
|
|
thread_suspend_check(0); /* Can suspend or kill */
|
|
PROC_UNLOCK(p);
|
|
}
|
|
|
|
/*
|
|
* Do special thread processing, e.g. upcall tweaking and such.
|
|
*/
|
|
if (p->p_flag & P_SA)
|
|
thread_userret(td, frame);
|
|
|
|
/*
|
|
* Charge system time if profiling.
|
|
*/
|
|
if (p->p_flag & P_PROFIL) {
|
|
quad_t ticks;
|
|
|
|
ticks = td->td_sticks - oticks;
|
|
addupc_task(td, TRAPF_PC(frame), (u_int)ticks * psratio);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* Process an asynchronous software trap.
|
|
* This is relatively easy.
|
|
* This function will return with preemption disabled.
|
|
*/
|
|
void
|
|
ast(struct trapframe *framep)
|
|
{
|
|
struct thread *td;
|
|
struct proc *p;
|
|
struct ksegrp *kg;
|
|
struct rlimit rlim;
|
|
u_int sticks;
|
|
int sflag;
|
|
int flags;
|
|
int sig;
|
|
#if defined(DEV_NPX) && !defined(SMP)
|
|
int ucode;
|
|
#endif
|
|
|
|
td = curthread;
|
|
p = td->td_proc;
|
|
kg = td->td_ksegrp;
|
|
|
|
CTR3(KTR_SYSC, "ast: thread %p (pid %d, %s)", td, p->p_pid,
|
|
p->p_comm);
|
|
KASSERT(TRAPF_USERMODE(framep), ("ast in kernel mode"));
|
|
WITNESS_WARN(WARN_PANIC, NULL, "Returning to user mode");
|
|
mtx_assert(&Giant, MA_NOTOWNED);
|
|
mtx_assert(&sched_lock, MA_NOTOWNED);
|
|
td->td_frame = framep;
|
|
sticks = td->td_sticks;
|
|
|
|
if ((p->p_flag & P_SA) && (td->td_mailbox == NULL))
|
|
thread_user_enter(td);
|
|
|
|
/*
|
|
* This updates the p_sflag's for the checks below in one
|
|
* "atomic" operation with turning off the astpending flag.
|
|
* If another AST is triggered while we are handling the
|
|
* AST's saved in sflag, the astpending flag will be set and
|
|
* ast() will be called again.
|
|
*/
|
|
mtx_lock_spin(&sched_lock);
|
|
flags = td->td_flags;
|
|
sflag = p->p_sflag;
|
|
p->p_sflag &= ~(PS_ALRMPEND | PS_PROFPEND | PS_XCPU);
|
|
#ifdef MAC
|
|
p->p_sflag &= ~PS_MACPEND;
|
|
#endif
|
|
td->td_flags &= ~(TDF_ASTPENDING | TDF_NEEDSIGCHK |
|
|
TDF_NEEDRESCHED | TDF_INTERRUPT);
|
|
cnt.v_soft++;
|
|
mtx_unlock_spin(&sched_lock);
|
|
|
|
/*
|
|
* XXXKSE While the fact that we owe a user profiling
|
|
* tick is stored per KSE in this code, the statistics
|
|
* themselves are still stored per process.
|
|
* This should probably change, by which I mean that
|
|
* possibly the location of both might change.
|
|
*/
|
|
if (td->td_ucred != p->p_ucred)
|
|
cred_update_thread(td);
|
|
if (td->td_pflags & TDP_OWEUPC && p->p_flag & P_PROFIL) {
|
|
addupc_task(td, td->td_profil_addr, td->td_profil_ticks);
|
|
td->td_profil_ticks = 0;
|
|
td->td_pflags &= ~TDP_OWEUPC;
|
|
}
|
|
if (sflag & PS_ALRMPEND) {
|
|
PROC_LOCK(p);
|
|
psignal(p, SIGVTALRM);
|
|
PROC_UNLOCK(p);
|
|
}
|
|
#if defined(DEV_NPX) && !defined(SMP)
|
|
if (PCPU_GET(curpcb)->pcb_flags & PCB_NPXTRAP) {
|
|
atomic_clear_int(&PCPU_GET(curpcb)->pcb_flags,
|
|
PCB_NPXTRAP);
|
|
ucode = npxtrap();
|
|
if (ucode != -1) {
|
|
trapsignal(td, SIGFPE, ucode);
|
|
}
|
|
}
|
|
#endif
|
|
if (sflag & PS_PROFPEND) {
|
|
PROC_LOCK(p);
|
|
psignal(p, SIGPROF);
|
|
PROC_UNLOCK(p);
|
|
}
|
|
if (sflag & PS_XCPU) {
|
|
PROC_LOCK(p);
|
|
lim_rlimit(p, RLIMIT_CPU, &rlim);
|
|
mtx_lock_spin(&sched_lock);
|
|
if (p->p_rux.rux_runtime.sec >= rlim.rlim_max) {
|
|
mtx_unlock_spin(&sched_lock);
|
|
killproc(p, "exceeded maximum CPU limit");
|
|
} else {
|
|
if (p->p_cpulimit < rlim.rlim_max)
|
|
p->p_cpulimit += 5;
|
|
mtx_unlock_spin(&sched_lock);
|
|
psignal(p, SIGXCPU);
|
|
}
|
|
PROC_UNLOCK(p);
|
|
}
|
|
#ifdef MAC
|
|
if (sflag & PS_MACPEND)
|
|
mac_thread_userret(td);
|
|
#endif
|
|
if (flags & TDF_NEEDRESCHED) {
|
|
#ifdef KTRACE
|
|
if (KTRPOINT(td, KTR_CSW))
|
|
ktrcsw(1, 1);
|
|
#endif
|
|
mtx_lock_spin(&sched_lock);
|
|
sched_prio(td, kg->kg_user_pri);
|
|
mi_switch(SW_INVOL, NULL);
|
|
mtx_unlock_spin(&sched_lock);
|
|
#ifdef KTRACE
|
|
if (KTRPOINT(td, KTR_CSW))
|
|
ktrcsw(0, 1);
|
|
#endif
|
|
}
|
|
if (flags & TDF_NEEDSIGCHK) {
|
|
PROC_LOCK(p);
|
|
mtx_lock(&p->p_sigacts->ps_mtx);
|
|
while ((sig = cursig(td)) != 0)
|
|
postsig(sig);
|
|
mtx_unlock(&p->p_sigacts->ps_mtx);
|
|
PROC_UNLOCK(p);
|
|
}
|
|
|
|
userret(td, framep, sticks);
|
|
mtx_assert(&Giant, MA_NOTOWNED);
|
|
}
|