diff options
| -rw-r--r-- | extras/mini-os/Makefile | 2 | ||||
| -rw-r--r-- | extras/mini-os/console/console.c | 149 | ||||
| -rw-r--r-- | extras/mini-os/console/xencons_ring.c | 104 | ||||
| -rw-r--r-- | extras/mini-os/events.c | 5 | ||||
| -rw-r--r-- | extras/mini-os/include/lib.h | 5 | ||||
| -rw-r--r-- | extras/mini-os/kernel.c | 10 | ||||
| -rw-r--r-- | extras/mini-os/lib/printf.c | 13 | ||||
| -rw-r--r-- | extras/mini-os/mm.c | 4 | ||||
| -rw-r--r-- | extras/mini-os/sched.c | 4 |
9 files changed, 272 insertions, 24 deletions
diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 044c99c63d..744a4a1e14 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -32,7 +32,7 @@ OBJS := $(TARGET_ARCH).o OBJS += $(patsubst %.c,%.o,$(wildcard *.c)) OBJS += $(patsubst %.c,%.o,$(wildcard lib/*.c)) OBJS += $(patsubst %.c,%.o,$(wildcard xenbus/*.c)) -#OBJS += $(patsubst %.c,%.o,$(wildcard console/*.c)) +OBJS += $(patsubst %.c,%.o,$(wildcard console/*.c)) HDRS := $(wildcard include/*.h) HDRS += $(wildcard include/xen/*.h) diff --git a/extras/mini-os/console/console.c b/extras/mini-os/console/console.c new file mode 100644 index 0000000000..c9ec60af8f --- /dev/null +++ b/extras/mini-os/console/console.c @@ -0,0 +1,149 @@ +/* + **************************************************************************** + * (C) 2006 - Grzegorz Milos - Cambridge University + **************************************************************************** + * + * File: console.h + * Author: Grzegorz Milos + * Changes: + * + * Date: Mar 2006 + * + * Environment: Xen Minimal OS + * Description: Console interface. + * + * Handles console I/O. Defines printk. + * + **************************************************************************** + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#include <types.h> +#include <wait.h> +#include <mm.h> +#include <hypervisor.h> +#include <events.h> +#include <os.h> +#include <lib.h> +#include <xenbus.h> +#include <xen/io/console.h> + + +/* Low level functions defined in xencons_ring.c */ +extern int xencons_ring_init(void); +extern int xencons_ring_send(const char *data, unsigned len); +extern int xencons_ring_send_no_notify(const char *data, unsigned len); + + +/* If console not initialised the printk will be sent to xen serial line + NOTE: you need to enable verbose in xen/Rules.mk for it to work. */ +static int console_initialised = 0; + + +void xencons_rx(char *buf, unsigned len, struct pt_regs *regs) +{ + if(len > 0) + { + /* Just repeat what's written */ + buf[len] = '\0'; + printk("%s", buf); + + if(buf[len-1] == '\r') + printk("\nNo console input handler.\n"); + } +} + +void xencons_tx(void) +{ + /* Do nothing, handled by _rx */ +} + + +void console_print(char *data, int length) +{ + char *curr_char, saved_char; + int part_len; + int (*ring_send_fn)(const char *data, unsigned length); + + if(!console_initialised) + ring_send_fn = xencons_ring_send_no_notify; + else + ring_send_fn = xencons_ring_send; + + for(curr_char = data; curr_char < data+length-1; curr_char++) + { + if(*curr_char == '\n') + { + saved_char = *(curr_char+1); + *(curr_char+1) = '\r'; + part_len = curr_char - data + 2; + ring_send_fn(data, part_len); + *(curr_char+1) = saved_char; + data = curr_char+1; + length -= part_len - 1; + } + } + + ring_send_fn(data, length); + + if(data[length-1] == '\n') + ring_send_fn("\r", 1); +} + +void print(int direct, const char *fmt, va_list args) +{ + static char buf[1024]; + + (void)vsnprintf(buf, sizeof(buf), fmt, args); + + if(direct) + { + (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf); + return; + } + + if(!console_initialised) + (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf); + + console_print(buf, strlen(buf)); +} + +void printk(const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + print(0, fmt, args); + va_end(args); +} + +void xprintk(const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + print(1, fmt, args); + va_end(args); +} +void init_console(void) +{ + printk("Initialising console ... "); + xencons_ring_init(); + console_initialised = 1; + /* This is also required to notify the daemon */ + printk("done.\n"); +} diff --git a/extras/mini-os/console/xencons_ring.c b/extras/mini-os/console/xencons_ring.c new file mode 100644 index 0000000000..da2fbac5bc --- /dev/null +++ b/extras/mini-os/console/xencons_ring.c @@ -0,0 +1,104 @@ +#include <types.h> +#include <wait.h> +#include <mm.h> +#include <hypervisor.h> +#include <events.h> +#include <os.h> +#include <lib.h> +#include <xenbus.h> +#include <xen/io/console.h> + + +/* TODO - need to define BUG_ON for whole mini-os, need crash-dump as well */ +extern void do_exit(void); +#define BUG_ON(_cond) do{if(_cond) do_exit();} while(0); + +static inline struct xencons_interface *xencons_interface(void) +{ + return mfn_to_virt(start_info.console_mfn); +} + +static inline void notify_daemon(void) +{ + /* Use evtchn: this is called early, before irq is set up. */ + notify_remote_via_evtchn(start_info.console_evtchn); +} + +int xencons_ring_send_no_notify(const char *data, unsigned len) +{ + int sent = 0; + struct xencons_interface *intf = xencons_interface(); + XENCONS_RING_IDX cons, prod; + + cons = intf->out_cons; + prod = intf->out_prod; + mb(); + BUG_ON((prod - cons) > sizeof(intf->out)); + + while ((sent < len) && ((prod - cons) < sizeof(intf->out))) + intf->out[MASK_XENCONS_IDX(prod++, intf->out)] = data[sent++]; + + wmb(); + intf->out_prod = prod; + + return sent; +} + +int xencons_ring_send(const char *data, unsigned len) +{ + int sent; + sent = xencons_ring_send_no_notify(data, len); + notify_daemon(); + + return sent; +} + + + +static void handle_input(int port, struct pt_regs *regs) +{ + struct xencons_interface *intf = xencons_interface(); + XENCONS_RING_IDX cons, prod; + + cons = intf->in_cons; + prod = intf->in_prod; + mb(); + BUG_ON((prod - cons) > sizeof(intf->in)); + + while (cons != prod) { + xencons_rx(intf->in+MASK_XENCONS_IDX(cons,intf->in), 1, regs); + cons++; + } + + mb(); + intf->in_cons = cons; + + notify_daemon(); + + xencons_tx(); +} + +int xencons_ring_init(void) +{ + int err; + + if (!start_info.console_evtchn) + return 0; + + err = bind_evtchn(start_info.console_evtchn, handle_input); + if (err <= 0) { + printk("XEN console request chn bind failed %i\n", err); + return err; + } + + /* In case we have in-flight data after save/restore... */ + notify_daemon(); + + return 0; +} + +void xencons_resume(void) +{ + (void)xencons_ring_init(); +} + diff --git a/extras/mini-os/events.c b/extras/mini-os/events.c index 9201128636..3c4b998810 100644 --- a/extras/mini-os/events.c +++ b/extras/mini-os/events.c @@ -22,6 +22,7 @@ #include <events.h> #include <lib.h> + static ev_action_t ev_actions[NR_EVS]; void default_handler(int port, struct pt_regs *regs); @@ -58,7 +59,7 @@ int do_event(u32 port, struct pt_regs *regs) int bind_evtchn( u32 port, void (*handler)(int, struct pt_regs *) ) { - if(ev_actions[port].handler) + if(ev_actions[port].handler != default_handler) printk("WARN: Handler for port %d already registered, replacing\n", port); @@ -73,7 +74,7 @@ int bind_evtchn( u32 port, void (*handler)(int, struct pt_regs *) ) void unbind_evtchn( u32 port ) { - if (!ev_actions[port].handler) + if (ev_actions[port].handler) printk("WARN: No handler for port %d when unbinding\n", port); ev_actions[port].handler = NULL; ev_actions[port].status |= EVS_DISABLED; diff --git a/extras/mini-os/include/lib.h b/extras/mini-os/include/lib.h index 0bf458565c..7631349faf 100644 --- a/extras/mini-os/include/lib.h +++ b/extras/mini-os/include/lib.h @@ -56,13 +56,10 @@ #define _LIB_H_ #include <stdarg.h> - +#include <console.h> /* printing */ -#define printk printf -#define kprintf printf #define _p(_x) ((void *)(unsigned long)(_x)) -void printf(const char *fmt, ...); int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); int vscnprintf(char *buf, size_t size, const char *fmt, va_list args); int snprintf(char * buf, size_t size, const char *fmt, ...); diff --git a/extras/mini-os/kernel.c b/extras/mini-os/kernel.c index d9a58389c2..3bc7809ade 100644 --- a/extras/mini-os/kernel.c +++ b/extras/mini-os/kernel.c @@ -76,6 +76,8 @@ static shared_info_t *map_shared_info(unsigned long pa) } +extern void init_console(void); + /* * INITIAL C ENTRY POINT. */ @@ -127,15 +129,19 @@ void start_kernel(start_info_t *si) /* set up events */ init_events(); + /* init time and timers */ init_time(); - + + /* init the console driver */ + init_console(); + /* init scheduler */ init_sched(); /* init xenbus */ xs_init(); - + /* Everything initialised, start idle thread */ run_idle_thread(); } diff --git a/extras/mini-os/lib/printf.c b/extras/mini-os/lib/printf.c index 09da566af6..bb81c7b028 100644 --- a/extras/mini-os/lib/printf.c +++ b/extras/mini-os/lib/printf.c @@ -556,19 +556,6 @@ int sprintf(char * buf, const char *fmt, ...) return i; } - -void printf(const char *fmt, ...) -{ - static char buf[1024]; - va_list args; - - va_start(args, fmt); - (void)vsnprintf(buf, sizeof(buf), fmt, args); - va_end(args); - - (void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf); -} - /** * vsscanf - Unformat a buffer into a list of arguments * @buf: input buffer diff --git a/extras/mini-os/mm.c b/extras/mini-os/mm.c index c26ae2817a..6facfe04b0 100644 --- a/extras/mini-os/mm.c +++ b/extras/mini-os/mm.c @@ -380,6 +380,10 @@ void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, "prev_l_mfn=%lx, offset=%lx\n", level, *pt_pfn, prev_l_mfn, offset); + /* We need to clear the page, otherwise we might fail to map it + as a page table page */ + memset((unsigned long*)pfn_to_virt(*pt_pfn), 0, PAGE_SIZE); + if (level == L1_FRAME) { prot_e = L1_PROT; diff --git a/extras/mini-os/sched.c b/extras/mini-os/sched.c index 6c1af5930f..9f60e16148 100644 --- a/extras/mini-os/sched.c +++ b/extras/mini-os/sched.c @@ -46,6 +46,7 @@ #include <sched.h> #include <semaphore.h> + #ifdef SCHED_DEBUG #define DEBUG(_f, _a...) \ printk("MINI_OS(file=sched.c, line=%d) " _f "\n", __LINE__, ## _a) @@ -61,7 +62,7 @@ #define clear_runnable(_thread) (_thread->flags &= ~RUNNABLE_FLAG) -struct thread *idle_thread; +struct thread *idle_thread = NULL; LIST_HEAD(exited_threads); void dump_stack(struct thread *thread) @@ -225,7 +226,6 @@ void idle_thread_fn(void *unused) for(;;) { schedule(); - printk("Blocking the domain\n"); block_domain(10000); } } |