b423d7b477
o Support for ptrace T_ATTACH/T_DETACH and T_SYSCALL o PM signal handling logic should now work properly, even with debuggers being present o Asynchronous PM/VFS protocol, full IPC support for senda(), and AMF_NOREPLY senda() flag DETAILS Process stop and delay call handling of PM: o Added sys_runctl() kernel call with sys_stop() and sys_resume() aliases, for PM to stop and resume a process o Added exception for sending/syscall-traced processes to sys_runctl(), and matching SIGKREADY pseudo-signal to PM o Fixed PM signal logic to deal with requests from a process after stopping it (so-called "delay calls"), using the SIGKREADY facility o Fixed various PM panics due to race conditions with delay calls versus VFS calls o Removed special PRIO_STOP priority value o Added SYS_LOCK RTS kernel flag, to stop an individual process from running while modifying its process structure Signal and debugger handling in PM: o Fixed debugger signals being dropped if a second signal arrives when the debugger has not retrieved the first one o Fixed debugger signals being sent to the debugger more than once o Fixed debugger signals unpausing process in VFS; removed PM_UNPAUSE_TR protocol message o Detached debugger signals from general signal logic and from being blocked on VFS calls, meaning that even VFS can now be traced o Fixed debugger being unable to receive more than one pending signal in one process stop o Fixed signal delivery being delayed needlessly when multiple signals are pending o Fixed wait test for tracer, which was returning for children that were not waited for o Removed second parallel pending call from PM to VFS for any process o Fixed process becoming runnable between exec() and debugger trap o Added support for notifying the debugger before the parent when a debugged child exits o Fixed debugger death causing child to remain stopped forever o Fixed consistently incorrect use of _NSIG Extensions to ptrace(): o Added T_ATTACH and T_DETACH ptrace request, to attach and detach a debugger to and from a process o Added T_SYSCALL ptrace request, to trace system calls o Added T_SETOPT ptrace request, to set trace options o Added TO_TRACEFORK trace option, to attach automatically to children of a traced process o Added TO_ALTEXEC trace option, to send SIGSTOP instead of SIGTRAP upon a successful exec() of the tracee o Extended T_GETUSER ptrace support to allow retrieving a process's priv structure o Removed T_STOP ptrace request again, as it does not help implementing debuggers properly o Added MINIX3-specific ptrace test (test42) o Added proper manual page for ptrace(2) Asynchronous PM/VFS interface: o Fixed asynchronous messages not being checked when receive() is called with an endpoint other than ANY o Added AMF_NOREPLY senda() flag, preventing such messages from satisfying the receive part of a sendrec() o Added asynsend3() that takes optional flags; asynsend() is now a #define passing in 0 as third parameter o Made PM/VFS protocol asynchronous; reintroduced tell_fs() o Made PM_BASE request/reply number range unique o Hacked in a horrible temporary workaround into RS to deal with newly revealed RS-PM-VFS race condition triangle until VFS is asynchronous System signal handling: o Fixed shutdown logic of device drivers; removed old SIGKSTOP signal o Removed is-superuser check from PM's do_procstat() (aka getsigset()) o Added sigset macros to allow system processes to deal with the full signal set, rather than just the POSIX subset Miscellaneous PM fixes: o Split do_getset into do_get and do_set, merging common code and making structure clearer o Fixed setpriority() being able to put to sleep processes using an invalid parameter, or revive zombie processes o Made find_proc() global; removed obsolete proc_from_pid() o Cleanup here and there Also included: o Fixed false-positive boot order kernel warning o Removed last traces of old NOTIFY_FROM code THINGS OF POSSIBLE INTEREST o It should now be possible to run PM at any priority, even lower than user processes o No assumptions are made about communication speed between PM and VFS, although communication must be FIFO o A debugger will now receive incoming debuggee signals at kill time only; the process may not yet be fully stopped o A first step has been made towards making the SYSTEM task preemptible
475 lines
13 KiB
C
475 lines
13 KiB
C
/* This file contains a driver for:
|
|
* /dev/klog - system log device
|
|
*
|
|
* Changes:
|
|
* 21 July 2005 - Support for diagnostic messages (Jorrit N. Herder)
|
|
* 7 July 2005 - Created (Ben Gras)
|
|
*/
|
|
|
|
#include "log.h"
|
|
#include <sys/time.h>
|
|
#include <sys/select.h>
|
|
#include <minix/endpoint.h>
|
|
|
|
#define LOG_DEBUG 0 /* enable/ disable debugging */
|
|
|
|
#define NR_DEVS 1 /* number of minor devices */
|
|
#define MINOR_KLOG 0 /* /dev/klog */
|
|
|
|
#define LOGINC(n, i) do { (n) = (((n) + (i)) % LOG_SIZE); } while(0)
|
|
|
|
PUBLIC struct logdevice logdevices[NR_DEVS];
|
|
PRIVATE struct device log_geom[NR_DEVS]; /* base and size of devices */
|
|
PRIVATE int log_device = -1; /* current device */
|
|
|
|
FORWARD _PROTOTYPE( char *log_name, (void) );
|
|
FORWARD _PROTOTYPE( struct device *log_prepare, (int device) );
|
|
FORWARD _PROTOTYPE( int log_transfer, (int proc_nr, int opcode, u64_t position,
|
|
iovec_t *iov, unsigned nr_req, int safe) );
|
|
FORWARD _PROTOTYPE( int log_do_open, (struct driver *dp, message *m_ptr) );
|
|
FORWARD _PROTOTYPE( int log_cancel, (struct driver *dp, message *m_ptr) );
|
|
FORWARD _PROTOTYPE( int log_select, (struct driver *dp, message *m_ptr) );
|
|
FORWARD _PROTOTYPE( void log_signal, (struct driver *dp, sigset_t *set) );
|
|
FORWARD _PROTOTYPE( int log_other, (struct driver *dp, message *m_ptr, int) );
|
|
FORWARD _PROTOTYPE( void log_geometry, (struct partition *entry) );
|
|
FORWARD _PROTOTYPE( int subread, (struct logdevice *log, int count, int proc_nr, vir_bytes user_vir, size_t, int safe) );
|
|
|
|
/* Entry points to this driver. */
|
|
PRIVATE struct driver log_dtab = {
|
|
log_name, /* current device's name */
|
|
log_do_open, /* open or mount */
|
|
do_nop, /* nothing on a close */
|
|
nop_ioctl, /* ioctl nop */
|
|
log_prepare, /* prepare for I/O on a given minor device */
|
|
log_transfer, /* do the I/O */
|
|
nop_cleanup, /* no need to clean up */
|
|
log_geometry, /* geometry */
|
|
log_signal, /* handle system signal */
|
|
nop_alarm, /* no alarm */
|
|
log_cancel, /* CANCEL request */
|
|
log_select, /* DEV_SELECT request */
|
|
log_other, /* Unrecognized messages */
|
|
NULL /* HW int */
|
|
};
|
|
|
|
extern int device_caller;
|
|
|
|
/*===========================================================================*
|
|
* main *
|
|
*===========================================================================*/
|
|
PUBLIC int main(void)
|
|
{
|
|
int i;
|
|
for(i = 0; i < NR_DEVS; i++) {
|
|
log_geom[i].dv_size = cvul64(LOG_SIZE);
|
|
log_geom[i].dv_base = cvul64((long)logdevices[i].log_buffer);
|
|
logdevices[i].log_size = logdevices[i].log_read =
|
|
logdevices[i].log_write =
|
|
logdevices[i].log_select_alerted =
|
|
logdevices[i].log_selected =
|
|
logdevices[i].log_select_ready_ops = 0;
|
|
logdevices[i].log_proc_nr = 0;
|
|
logdevices[i].log_revive_alerted = 0;
|
|
}
|
|
driver_task(&log_dtab);
|
|
return(OK);
|
|
}
|
|
|
|
/*===========================================================================*
|
|
* log_name *
|
|
*===========================================================================*/
|
|
PRIVATE char *log_name()
|
|
{
|
|
/* Return a name for the current device. */
|
|
static char name[] = "log";
|
|
return name;
|
|
}
|
|
|
|
/*===========================================================================*
|
|
* log_prepare *
|
|
*===========================================================================*/
|
|
PRIVATE struct device *log_prepare(device)
|
|
int device;
|
|
{
|
|
/* Prepare for I/O on a device: check if the minor device number is ok. */
|
|
|
|
if (device < 0 || device >= NR_DEVS) return(NIL_DEV);
|
|
log_device = device;
|
|
|
|
return(&log_geom[device]);
|
|
}
|
|
|
|
/*===========================================================================*
|
|
* subwrite *
|
|
*===========================================================================*/
|
|
PRIVATE int
|
|
subwrite(struct logdevice *log, int count, int proc_nr,
|
|
vir_bytes user_vir, size_t offset, int safe)
|
|
{
|
|
int d, r;
|
|
char *buf;
|
|
message m;
|
|
|
|
if (log->log_write + count > LOG_SIZE)
|
|
count = LOG_SIZE - log->log_write;
|
|
buf = log->log_buffer + log->log_write;
|
|
|
|
if(proc_nr == SELF) {
|
|
memcpy(buf, (char *) user_vir, count);
|
|
}
|
|
else {
|
|
if(safe) {
|
|
if((r=sys_safecopyfrom(proc_nr, user_vir, offset,
|
|
(vir_bytes)buf, count, D)) != OK)
|
|
return r;
|
|
} else {
|
|
if((r=sys_vircopy(proc_nr, D,
|
|
user_vir + offset, SELF,D,(int)buf, count)) != OK)
|
|
return r;
|
|
}
|
|
}
|
|
|
|
LOGINC(log->log_write, count);
|
|
log->log_size += count;
|
|
|
|
if(log->log_size > LOG_SIZE) {
|
|
int overflow;
|
|
overflow = log->log_size - LOG_SIZE;
|
|
log->log_size -= overflow;
|
|
LOGINC(log->log_read, overflow);
|
|
}
|
|
|
|
if(log->log_size > 0 && log->log_proc_nr && !log->log_revive_alerted) {
|
|
/* Someone who was suspended on read can now
|
|
* be revived.
|
|
*/
|
|
log->log_status = subread(log, log->log_iosize,
|
|
log->log_proc_nr, log->log_user_vir_g,
|
|
log->log_user_vir_offset, log->log_safe);
|
|
|
|
m.m_type = DEV_REVIVE;
|
|
m.REP_ENDPT = log->log_proc_nr;
|
|
m.REP_STATUS = log->log_status;
|
|
m.REP_IO_GRANT = log->log_user_vir_g;
|
|
r= send(log->log_source, &m);
|
|
if (r != OK)
|
|
{
|
|
printf("log`subwrite: send to %d failed: %d\n",
|
|
log->log_source, r);
|
|
}
|
|
log->log_proc_nr = 0;
|
|
}
|
|
|
|
if(log->log_size > 0)
|
|
log->log_select_ready_ops |= SEL_RD;
|
|
|
|
if(log->log_size > 0 && log->log_selected &&
|
|
!(log->log_select_alerted)) {
|
|
/* Someone(s) who was/were select()ing can now
|
|
* be awoken. If there was a blocking read (above),
|
|
* this can only happen if the blocking read didn't
|
|
* swallow all the data (log_size > 0).
|
|
*/
|
|
if(log->log_selected & SEL_RD) {
|
|
d= log-logdevices;
|
|
m.m_type = DEV_SEL_REPL2;
|
|
m.DEV_SEL_OPS = log->log_select_ready_ops;
|
|
m.DEV_MINOR = d;
|
|
#if LOG_DEBUG
|
|
printf("select sending DEV_SEL_REPL2\n");
|
|
#endif
|
|
r= send(log->log_select_proc, &m);
|
|
if (r != OK)
|
|
{
|
|
printf(
|
|
"log`subwrite: send to %d failed: %d\n",
|
|
log->log_select_proc, r);
|
|
}
|
|
log->log_selected &= ~log->log_select_ready_ops;
|
|
}
|
|
}
|
|
|
|
return count;
|
|
}
|
|
|
|
/*===========================================================================*
|
|
* log_append *
|
|
*===========================================================================*/
|
|
PUBLIC void
|
|
log_append(char *buf, int count)
|
|
{
|
|
int w = 0, skip = 0;
|
|
|
|
if(count < 1) return;
|
|
if(count > LOG_SIZE) skip = count - LOG_SIZE;
|
|
count -= skip;
|
|
buf += skip;
|
|
w = subwrite(&logdevices[0], count, SELF, (vir_bytes) buf,0,0);
|
|
|
|
if(w > 0 && w < count)
|
|
subwrite(&logdevices[0], count-w, SELF, (vir_bytes) buf+w,0,0);
|
|
return;
|
|
}
|
|
|
|
/*===========================================================================*
|
|
* subread *
|
|
*===========================================================================*/
|
|
PRIVATE int
|
|
subread(struct logdevice *log, int count, int proc_nr,
|
|
vir_bytes user_vir, size_t offset, int safe)
|
|
{
|
|
char *buf;
|
|
int r;
|
|
if (count > log->log_size)
|
|
count = log->log_size;
|
|
if (log->log_read + count > LOG_SIZE)
|
|
count = LOG_SIZE - log->log_read;
|
|
|
|
buf = log->log_buffer + log->log_read;
|
|
if(safe) {
|
|
if((r=sys_safecopyto(proc_nr, user_vir, offset,
|
|
(vir_bytes)buf, count, D)) != OK)
|
|
return r;
|
|
}
|
|
|
|
LOGINC(log->log_read, count);
|
|
log->log_size -= count;
|
|
|
|
return count;
|
|
}
|
|
|
|
/*===========================================================================*
|
|
* log_transfer *
|
|
*===========================================================================*/
|
|
PRIVATE int log_transfer(proc_nr, opcode, position, iov, nr_req, safe)
|
|
int proc_nr; /* process doing the request */
|
|
int opcode; /* DEV_GATHER_S or DEV_SCATTER_S */
|
|
u64_t position; /* offset on device to read or write */
|
|
iovec_t *iov; /* pointer to read or write request vector */
|
|
unsigned nr_req; /* length of request vector */
|
|
int safe; /* safe copies? */
|
|
{
|
|
/* Read or write one the driver's minor devices. */
|
|
unsigned count;
|
|
vir_bytes user_vir;
|
|
struct device *dv;
|
|
unsigned long dv_size;
|
|
int accumulated_read = 0;
|
|
struct logdevice *log;
|
|
static int f;
|
|
size_t vir_offset = 0;
|
|
|
|
if(log_device < 0 || log_device >= NR_DEVS)
|
|
return EIO;
|
|
|
|
/* Get minor device number and check for /dev/null. */
|
|
dv = &log_geom[log_device];
|
|
dv_size = cv64ul(dv->dv_size);
|
|
log = &logdevices[log_device];
|
|
|
|
while (nr_req > 0) {
|
|
/* How much to transfer and where to / from. */
|
|
count = iov->iov_size;
|
|
user_vir = iov->iov_addr;
|
|
|
|
switch (log_device) {
|
|
|
|
case MINOR_KLOG:
|
|
if (opcode == DEV_GATHER_S) {
|
|
if (log->log_proc_nr || count < 1) {
|
|
/* There's already someone hanging to read, or
|
|
* no real I/O requested.
|
|
*/
|
|
return(OK);
|
|
}
|
|
|
|
if (!log->log_size) {
|
|
if(accumulated_read)
|
|
return OK;
|
|
/* No data available; let caller block. */
|
|
log->log_proc_nr = proc_nr;
|
|
log->log_iosize = count;
|
|
log->log_user_vir_g = user_vir;
|
|
log->log_user_vir_offset = 0;
|
|
log->log_revive_alerted = 0;
|
|
log->log_safe = safe;
|
|
|
|
/* Device_caller is a global in drivers library. */
|
|
log->log_source = device_caller;
|
|
#if LOG_DEBUG
|
|
printf("blocked %d (%d)\n",
|
|
log->log_source, log->log_proc_nr);
|
|
#endif
|
|
return(EDONTREPLY);
|
|
}
|
|
count = subread(log, count, proc_nr, user_vir, vir_offset, safe);
|
|
if(count < 0) {
|
|
return count;
|
|
}
|
|
accumulated_read += count;
|
|
} else {
|
|
count = subwrite(log, count, proc_nr, user_vir, vir_offset, safe);
|
|
if(count < 0)
|
|
return count;
|
|
}
|
|
break;
|
|
/* Unknown (illegal) minor device. */
|
|
default:
|
|
return(EINVAL);
|
|
}
|
|
|
|
/* Book the number of bytes transferred. */
|
|
vir_offset += count;
|
|
if ((iov->iov_size -= count) == 0) { iov++; nr_req--; vir_offset = 0; }
|
|
}
|
|
return(OK);
|
|
}
|
|
|
|
/*============================================================================*
|
|
* log_do_open *
|
|
*============================================================================*/
|
|
PRIVATE int log_do_open(dp, m_ptr)
|
|
struct driver *dp;
|
|
message *m_ptr;
|
|
{
|
|
if (log_prepare(m_ptr->DEVICE) == NIL_DEV) return(ENXIO);
|
|
return(OK);
|
|
}
|
|
|
|
/*============================================================================*
|
|
* log_geometry *
|
|
*============================================================================*/
|
|
PRIVATE void log_geometry(entry)
|
|
struct partition *entry;
|
|
{
|
|
/* take a page from the fake memory device geometry */
|
|
entry->heads = 64;
|
|
entry->sectors = 32;
|
|
entry->cylinders = div64u(log_geom[log_device].dv_size, SECTOR_SIZE) /
|
|
(entry->heads * entry->sectors);
|
|
}
|
|
|
|
/*============================================================================*
|
|
* log_cancel *
|
|
*============================================================================*/
|
|
PRIVATE int log_cancel(dp, m_ptr)
|
|
struct driver *dp;
|
|
message *m_ptr;
|
|
{
|
|
int d;
|
|
d = m_ptr->TTY_LINE;
|
|
if(d < 0 || d >= NR_DEVS)
|
|
return EINVAL;
|
|
logdevices[d].log_proc_nr = 0;
|
|
logdevices[d].log_revive_alerted = 0;
|
|
return(OK);
|
|
}
|
|
|
|
|
|
/*============================================================================*
|
|
* log_signal *
|
|
*============================================================================*/
|
|
PRIVATE void log_signal(dp, set)
|
|
struct driver *dp;
|
|
sigset_t *set;
|
|
{
|
|
if (sigismember(set, SIGKMESS)) {
|
|
do_new_kmess(SYSTEM);
|
|
}
|
|
}
|
|
|
|
|
|
/*============================================================================*
|
|
* log_other *
|
|
*============================================================================*/
|
|
PRIVATE int log_other(dp, m_ptr, safe)
|
|
struct driver *dp;
|
|
message *m_ptr;
|
|
int safe;
|
|
{
|
|
int r;
|
|
|
|
/* This function gets messages that the generic driver doesn't
|
|
* understand.
|
|
*/
|
|
if (is_notify(m_ptr->m_type)) {
|
|
switch (_ENDPOINT_P(m_ptr->m_source)) {
|
|
case TTY_PROC_NR:
|
|
do_new_kmess(m_ptr->m_source);
|
|
r = EDONTREPLY;
|
|
break;
|
|
default:
|
|
r = EINVAL;
|
|
break;
|
|
}
|
|
return r;
|
|
}
|
|
|
|
switch(m_ptr->m_type) {
|
|
case DIAGNOSTICS_OLD: {
|
|
r = do_diagnostics(m_ptr, 0);
|
|
break;
|
|
}
|
|
case ASYN_DIAGNOSTICS_OLD:
|
|
case DIAGNOSTICS_S_OLD:
|
|
r = do_diagnostics(m_ptr, 1);
|
|
break;
|
|
case DEV_STATUS: {
|
|
printf("log_other: unexpected DEV_STATUS request\n");
|
|
r = EDONTREPLY;
|
|
break;
|
|
}
|
|
default:
|
|
r = EINVAL;
|
|
break;
|
|
}
|
|
return r;
|
|
}
|
|
|
|
/*============================================================================*
|
|
* log_select *
|
|
*============================================================================*/
|
|
PRIVATE int log_select(dp, m_ptr)
|
|
struct driver *dp;
|
|
message *m_ptr;
|
|
{
|
|
int d, ready_ops = 0, ops = 0;
|
|
d = m_ptr->TTY_LINE;
|
|
if(d < 0 || d >= NR_DEVS) {
|
|
#if LOG_DEBUG
|
|
printf("line %d? EINVAL\n", d);
|
|
#endif
|
|
return EINVAL;
|
|
}
|
|
|
|
ops = m_ptr->IO_ENDPT & (SEL_RD|SEL_WR|SEL_ERR);
|
|
|
|
/* Read blocks when there is no log. */
|
|
if((m_ptr->IO_ENDPT & SEL_RD) && logdevices[d].log_size > 0) {
|
|
#if LOG_DEBUG
|
|
printf("log can read; size %d\n", logdevices[d].log_size);
|
|
#endif
|
|
ready_ops |= SEL_RD; /* writes never block */
|
|
}
|
|
|
|
/* Write never blocks. */
|
|
if(m_ptr->IO_ENDPT & SEL_WR) ready_ops |= SEL_WR;
|
|
|
|
/* Enable select calback if no operations were
|
|
* ready to go, but operations were requested,
|
|
* and notify was enabled.
|
|
*/
|
|
if((m_ptr->IO_ENDPT & SEL_NOTIFY) && ops && !ready_ops) {
|
|
logdevices[d].log_selected |= ops;
|
|
logdevices[d].log_select_proc = m_ptr->m_source;
|
|
#if LOG_DEBUG
|
|
printf("log setting selector.\n");
|
|
#endif
|
|
}
|
|
|
|
#if LOG_DEBUG
|
|
printf("log returning ops %d\n", ready_ops);
|
|
#endif
|
|
|
|
return(ready_ops);
|
|
}
|