2006-05-11 16:58:33 +02:00
|
|
|
#include "inc.h"
|
|
|
|
#include <a.out.h>
|
2010-12-10 10:27:56 +01:00
|
|
|
#include <assert.h>
|
|
|
|
#include <libexec.h>
|
2012-05-30 19:34:07 +02:00
|
|
|
#include <machine/vmparam.h>
|
2006-05-11 16:58:33 +02:00
|
|
|
|
2009-11-28 14:23:45 +01:00
|
|
|
static int do_exec(int proc_e, char *exec, size_t exec_len, char *progname,
|
2006-05-11 16:58:33 +02:00
|
|
|
char *frame, int frame_len);
|
2010-12-10 10:27:56 +01:00
|
|
|
static int exec_restart(int proc_e, int result, vir_bytes pc);
|
|
|
|
static int read_seg(struct exec_info *execi, off_t off,
|
2012-05-30 19:34:07 +02:00
|
|
|
off_t seg_addr, size_t seg_bytes);
|
2010-12-10 10:27:56 +01:00
|
|
|
|
|
|
|
/* Array of loaders for different object formats */
|
2011-12-05 10:51:30 +01:00
|
|
|
static struct exec_loaders {
|
2012-05-30 19:34:07 +02:00
|
|
|
libexec_exec_loadfunc_t load_object;
|
2011-12-05 10:51:30 +01:00
|
|
|
} const exec_loaders[] = {
|
2012-05-30 19:34:07 +02:00
|
|
|
{ libexec_load_elf },
|
2010-12-10 10:27:56 +01:00
|
|
|
{ NULL }
|
|
|
|
};
|
2006-05-11 16:58:33 +02:00
|
|
|
|
New RS and new signal handling for system processes.
UPDATING INFO:
20100317:
/usr/src/etc/system.conf updated to ignore default kernel calls: copy
it (or merge it) to /etc/system.conf.
The hello driver (/dev/hello) added to the distribution:
# cd /usr/src/commands/scripts && make clean install
# cd /dev && MAKEDEV hello
KERNEL CHANGES:
- Generic signal handling support. The kernel no longer assumes PM as a signal
manager for every process. The signal manager of a given process can now be
specified in its privilege slot. When a signal has to be delivered, the kernel
performs the lookup and forwards the signal to the appropriate signal manager.
PM is the default signal manager for user processes, RS is the default signal
manager for system processes. To enable ptrace()ing for system processes, it
is sufficient to change the default signal manager to PM. This will temporarily
disable crash recovery, though.
- sys_exit() is now split into sys_exit() (i.e. exit() for system processes,
which generates a self-termination signal), and sys_clear() (i.e. used by PM
to ask the kernel to clear a process slot when a process exits).
- Added a new kernel call (i.e. sys_update()) to swap two process slots and
implement live update.
PM CHANGES:
- Posix signal handling is no longer allowed for system processes. System
signals are split into two fixed categories: termination and non-termination
signals. When a non-termination signaled is processed, PM transforms the signal
into an IPC message and delivers the message to the system process. When a
termination signal is processed, PM terminates the process.
- PM no longer assumes itself as the signal manager for system processes. It now
makes sure that every system signal goes through the kernel before being
actually processes. The kernel will then dispatch the signal to the appropriate
signal manager which may or may not be PM.
SYSLIB CHANGES:
- Simplified SEF init and LU callbacks.
- Added additional predefined SEF callbacks to debug crash recovery and
live update.
- Fixed a temporary ack in the SEF init protocol. SEF init reply is now
completely synchronous.
- Added SEF signal event type to provide a uniform interface for system
processes to deal with signals. A sef_cb_signal_handler() callback is
available for system processes to handle every received signal. A
sef_cb_signal_manager() callback is used by signal managers to process
system signals on behalf of the kernel.
- Fixed a few bugs with memory mapping and DS.
VM CHANGES:
- Page faults and memory requests coming from the kernel are now implemented
using signals.
- Added a new VM call to swap two process slots and implement live update.
- The call is used by RS at update time and in turn invokes the kernel call
sys_update().
RS CHANGES:
- RS has been reworked with a better functional decomposition.
- Better kernel call masks. com.h now defines the set of very basic kernel calls
every system service is allowed to use. This makes system.conf simpler and
easier to maintain. In addition, this guarantees a higher level of isolation
for system libraries that use one or more kernel calls internally (e.g. printf).
- RS is the default signal manager for system processes. By default, RS
intercepts every signal delivered to every system process. This makes crash
recovery possible before bringing PM and friends in the loop.
- RS now supports fast rollback when something goes wrong while initializing
the new version during a live update.
- Live update is now implemented by keeping the two versions side-by-side and
swapping the process slots when the old version is ready to update.
- Crash recovery is now implemented by keeping the two versions side-by-side
and cleaning up the old version only when the recovery process is complete.
DS CHANGES:
- Fixed a bug when the process doing ds_publish() or ds_delete() is not known
by DS.
- Fixed the completely broken support for strings. String publishing is now
implemented in the system library and simply wraps publishing of memory ranges.
Ideally, we should adopt a similar approach for other data types as well.
- Test suite fixed.
DRIVER CHANGES:
- The hello driver has been added to the Minix distribution to demonstrate basic
live update and crash recovery functionalities.
- Other drivers have been adapted to conform the new SEF interface.
2010-03-17 02:15:29 +01:00
|
|
|
int srv_execve(int proc_e, char *exec, size_t exec_len, char **argv,
|
2011-12-05 10:51:30 +01:00
|
|
|
char **UNUSED(Xenvp))
|
2006-05-11 16:58:33 +02:00
|
|
|
{
|
|
|
|
char * const *ap;
|
|
|
|
char * const *ep;
|
|
|
|
char *frame;
|
|
|
|
char **vp;
|
|
|
|
char *sp, *progname;
|
|
|
|
size_t argc;
|
|
|
|
size_t frame_size;
|
|
|
|
size_t string_off;
|
|
|
|
size_t n;
|
|
|
|
int ov;
|
2009-11-28 14:23:45 +01:00
|
|
|
int r;
|
2006-05-11 16:58:33 +02:00
|
|
|
|
|
|
|
/* Assumptions: size_t and char *, it's all the same thing. */
|
|
|
|
|
|
|
|
/* Create a stack image that only needs to be patched up slightly
|
|
|
|
* by the kernel to be used for the process to be executed.
|
|
|
|
*/
|
|
|
|
|
|
|
|
ov= 0; /* No overflow yet. */
|
|
|
|
frame_size= 0; /* Size of the new initial stack. */
|
|
|
|
string_off= 0; /* Offset to start of the strings. */
|
|
|
|
argc= 0; /* Argument count. */
|
|
|
|
|
|
|
|
for (ap= argv; *ap != NULL; ap++) {
|
|
|
|
n = sizeof(*ap) + strlen(*ap) + 1;
|
|
|
|
frame_size+= n;
|
|
|
|
if (frame_size < n) ov= 1;
|
|
|
|
string_off+= sizeof(*ap);
|
|
|
|
argc++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Add an argument count and two terminating nulls. */
|
|
|
|
frame_size+= sizeof(argc) + sizeof(*ap) + sizeof(*ep);
|
|
|
|
string_off+= sizeof(argc) + sizeof(*ap) + sizeof(*ep);
|
|
|
|
|
|
|
|
/* Align. */
|
|
|
|
frame_size= (frame_size + sizeof(char *) - 1) & ~(sizeof(char *) - 1);
|
|
|
|
|
|
|
|
/* The party is off if there is an overflow. */
|
|
|
|
if (ov || frame_size < 3 * sizeof(char *)) {
|
|
|
|
errno= E2BIG;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate space for the stack frame. */
|
2010-04-28 10:35:54 +02:00
|
|
|
frame = (char *) malloc(frame_size);
|
|
|
|
if (!frame) {
|
2006-05-11 16:58:33 +02:00
|
|
|
errno = E2BIG;
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set arg count, init pointers to vector and string tables. */
|
|
|
|
* (size_t *) frame = argc;
|
|
|
|
vp = (char **) (frame + sizeof(argc));
|
|
|
|
sp = frame + string_off;
|
|
|
|
|
|
|
|
/* Load the argument vector and strings. */
|
|
|
|
for (ap= argv; *ap != NULL; ap++) {
|
|
|
|
*vp++= (char *) (sp - frame);
|
|
|
|
n= strlen(*ap) + 1;
|
|
|
|
memcpy(sp, *ap, n);
|
|
|
|
sp+= n;
|
|
|
|
}
|
|
|
|
*vp++= NULL;
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* Load the environment vector and strings. */
|
|
|
|
for (ep= envp; *ep != NULL; ep++) {
|
|
|
|
*vp++= (char *) (sp - frame);
|
|
|
|
n= strlen(*ep) + 1;
|
|
|
|
memcpy(sp, *ep, n);
|
|
|
|
sp+= n;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
*vp++= NULL;
|
|
|
|
|
|
|
|
/* Padding. */
|
|
|
|
while (sp < frame + frame_size) *sp++= 0;
|
|
|
|
|
|
|
|
(progname=strrchr(argv[0], '/')) ? progname++ : (progname=argv[0]);
|
2009-11-28 14:23:45 +01:00
|
|
|
r = do_exec(proc_e, exec, exec_len, progname, frame, frame_size);
|
2006-05-11 16:58:33 +02:00
|
|
|
|
2009-11-28 14:23:45 +01:00
|
|
|
/* Return the memory used for the frame and exit. */
|
2010-04-28 10:35:54 +02:00
|
|
|
free(frame);
|
2009-11-28 14:23:45 +01:00
|
|
|
return r;
|
2006-05-11 16:58:33 +02:00
|
|
|
}
|
|
|
|
|
2010-12-10 10:27:56 +01:00
|
|
|
|
2009-11-28 14:23:45 +01:00
|
|
|
static int do_exec(int proc_e, char *exec, size_t exec_len, char *progname,
|
2006-05-11 16:58:33 +02:00
|
|
|
char *frame, int frame_len)
|
2010-12-10 10:27:56 +01:00
|
|
|
{
|
|
|
|
int r;
|
|
|
|
vir_bytes vsp;
|
|
|
|
struct exec_info execi;
|
|
|
|
int i;
|
|
|
|
|
2012-05-30 19:34:07 +02:00
|
|
|
memset(&execi, 0, sizeof(execi));
|
|
|
|
|
|
|
|
execi.stack_size = DEFAULT_STACK_LIMIT;
|
2010-12-10 10:27:56 +01:00
|
|
|
execi.proc_e = proc_e;
|
2012-05-30 19:34:07 +02:00
|
|
|
execi.hdr = exec;
|
|
|
|
execi.hdr_len = exec_len;
|
2010-12-10 10:27:56 +01:00
|
|
|
strncpy(execi.progname, progname, PROC_NAME_LEN-1);
|
|
|
|
execi.progname[PROC_NAME_LEN-1] = '\0';
|
|
|
|
execi.frame_len = frame_len;
|
2012-06-06 19:05:28 +02:00
|
|
|
|
|
|
|
/* callback functions and data */
|
|
|
|
execi.copymem = read_seg;
|
|
|
|
execi.clearproc = libexec_clearproc_vm_procctl;
|
|
|
|
execi.clearmem = libexec_clear_sys_memset;
|
|
|
|
execi.allocmem_prealloc = libexec_alloc_mmap_prealloc;
|
|
|
|
execi.allocmem_ondemand = libexec_alloc_mmap_ondemand;
|
2010-12-10 10:27:56 +01:00
|
|
|
|
|
|
|
for(i = 0; exec_loaders[i].load_object != NULL; i++) {
|
|
|
|
r = (*exec_loaders[i].load_object)(&execi);
|
|
|
|
/* Loaded successfully, so no need to try other loaders */
|
|
|
|
if (r == OK) break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* No exec loader could load the object */
|
|
|
|
if (r != OK) {
|
|
|
|
printf("RS: do_exec: loading error %d\n", r);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2012-06-06 19:05:28 +02:00
|
|
|
/* Inform PM */
|
|
|
|
if((r = libexec_pm_newexec(execi.proc_e, &execi)) != OK)
|
|
|
|
return r;
|
|
|
|
|
2010-12-10 10:27:56 +01:00
|
|
|
/* Patch up stack and copy it from RS to new core image. */
|
2012-05-30 19:34:07 +02:00
|
|
|
vsp = execi.stack_high;
|
2010-12-10 10:27:56 +01:00
|
|
|
vsp -= frame_len;
|
2012-05-30 19:34:07 +02:00
|
|
|
libexec_patch_ptr(frame, vsp);
|
2010-12-10 10:27:56 +01:00
|
|
|
r = sys_datacopy(SELF, (vir_bytes) frame,
|
|
|
|
proc_e, (vir_bytes) vsp, (phys_bytes)frame_len);
|
|
|
|
if (r != OK) {
|
|
|
|
printf("do_exec: copying out new stack failed: %d\n", r);
|
|
|
|
exec_restart(proc_e, r, execi.pc);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
return exec_restart(proc_e, OK, execi.pc);
|
|
|
|
}
|
|
|
|
|
2006-05-11 16:58:33 +02:00
|
|
|
/*===========================================================================*
|
|
|
|
* exec_restart *
|
|
|
|
*===========================================================================*/
|
2010-12-10 10:27:56 +01:00
|
|
|
static int exec_restart(int proc_e, int result, vir_bytes pc)
|
2006-05-11 16:58:33 +02:00
|
|
|
{
|
|
|
|
int r;
|
|
|
|
message m;
|
|
|
|
|
|
|
|
m.m_type= EXEC_RESTART;
|
|
|
|
m.EXC_RS_PROC= proc_e;
|
|
|
|
m.EXC_RS_RESULT= result;
|
2010-06-10 16:59:10 +02:00
|
|
|
m.EXC_RS_PC= (void*)pc;
|
2006-05-11 16:58:33 +02:00
|
|
|
r= sendrec(PM_PROC_NR, &m);
|
|
|
|
if (r != OK)
|
|
|
|
return r;
|
|
|
|
return m.m_type;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*===========================================================================*
|
2012-05-30 19:34:07 +02:00
|
|
|
* read_seg *
|
2006-05-11 16:58:33 +02:00
|
|
|
*===========================================================================*/
|
2010-12-10 10:27:56 +01:00
|
|
|
static int read_seg(
|
2012-05-30 19:34:07 +02:00
|
|
|
struct exec_info *execi, /* various data needed for exec */
|
|
|
|
off_t off, /* offset in file */
|
|
|
|
off_t seg_addr, /* address to load segment */
|
|
|
|
size_t seg_bytes /* how much is to be transferred? */
|
2010-12-10 10:27:56 +01:00
|
|
|
)
|
2006-05-11 16:58:33 +02:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* The byte count on read is usually smaller than the segment count, because
|
|
|
|
* a segment is padded out to a click multiple, and the data segment is only
|
|
|
|
* partially initialized.
|
|
|
|
*/
|
|
|
|
|
|
|
|
int r;
|
|
|
|
|
2012-05-30 19:34:07 +02:00
|
|
|
if (off+seg_bytes > execi->hdr_len) return ENOEXEC;
|
2012-06-16 19:29:37 +02:00
|
|
|
if((r= sys_vircopy(SELF, ((vir_bytes)execi->hdr)+off,
|
|
|
|
execi->proc_e, seg_addr, seg_bytes)) != OK) {
|
2012-06-06 19:05:28 +02:00
|
|
|
printf("RS: exec read_seg: copy 0x%x bytes into %d at 0x%lx failed: %d\n",
|
2012-05-30 19:34:07 +02:00
|
|
|
seg_bytes, execi->proc_e, seg_addr, r);
|
|
|
|
}
|
2006-05-11 16:58:33 +02:00
|
|
|
return r;
|
|
|
|
}
|