UML - Move libc-dependent irq code to os-Linux
PATCH 4/16 UML - Move libc-dependent irq code to os-Linux
The serial UML OS-abstraction layer patch (um/kernel dir).
This moves all systemcalls from irq_user.c file under os-Linux dir
arch/um/include/irq_user.h +12 -3
@@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2001, 2002 Jeff Dike ([email protected]) * Licensed under the GPL */
@@ -6,6 +6,17 @@#ifndef __IRQ_USER_H__#define __IRQ_USER_H__ +struct irq_fd { +struct irq_fd *next; +void *id; +int fd; +int type; +int irq; +int pid; +int events; +int current_events; +}; +enum {IRQ_READ ,IRQ_WRITE };extern void sigio_handler (int sig,union uml_pt_regs *regs);
@@ -16,8 +27,6 @@ extern void reactivate_fd(int fd, int irextern void deactivate_fd (int fd,int irqnum);extern int deactivate_all_fds (void );extern void forward_interrupts (int pid); -extern void init_irq_signals (int on_sigstack); -extern void forward_ipi (int fd,int pid);extern int activate_ipi (int fd,int pid);extern unsigned long irq_lock (void );extern void irq_unlock (unsigned long flags);
arch/um/include/misc_constants.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef __MISC_CONSTANT_H_ +#define __MISC_CONSTANT_H_ + +#include <user_constants.h> + +#endif
arch/um/include/os.h +16 -0
@@ -12,6 +12,7 @@#include "sysdep/ptrace.h" #include "kern_util.h" #include "skas/mm_id.h" +#include "irq_user.h" #define OS_TYPE_FILE 1#define OS_TYPE_DIR 2
@@ -198,6 +199,8 @@ extern void os_flush_stdout(void);/* tt.c * for tt mode only (will be deleted in future...) */ +extern void forward_ipi (int fd,int pid); +extern void kill_child_dead (int pid);extern void stop (void );extern int wait_for_stop (int pid,int sig,int cont_type,void *relay); extern int protect_memory(unsigned long addr, unsigned long len,
@@ -294,4 +297,17 @@ extern void initial_thread_cb_skas(voidextern void halt_skas (void );extern void reboot_skas (void ); +/* irq.c */ +extern int os_waiting_for_events (struct irq_fd *active_fds); +extern int os_isatty (int fd); +extern int os_create_pollfd (int fd,int events,void *tmp_pfd,int size_tmpfds); +extern void os_free_irq_by_cb (int (*test)(struct irq_fd *,void *),void *arg, +struct irq_fd *active_fds,struct irq_fd ***last_irq_ptr2); +extern void os_free_irq_later (struct irq_fd *active_fds, +int irq,void *dev_id); +extern int os_get_pollfd (int i); +extern void os_set_pollfd (int i,int fd); +extern void os_set_ioignore (void ); +extern void init_irq_signals (int on_sigstack); +#endif
arch/um/kernel/irq_user.c +58 -146
325 lines not on this page · raw message
arch/um/kernel/smp.c +7 -7
@@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2000 - 2003 Jeff Dike ([email protected]) * Licensed under the GPL */
@@ -77,9 +77,9 @@ static int idle_proc(void *cpup)if (err <0 )panic ("CPU#%d failed to create IPI pipe, err = %d" , cpu, -err); -activate_ipi (cpu_data[cpu].ipi_pipe[0 ], +os_set_fd_async (cpu_data[cpu].ipi_pipe[0 ], current->thread.mode.tt.extern_pid); - +wmb ();if (cpu_test_and_set (cpu, cpu_callin_map)) {printk ("huh, CPU#%d already present??\n" , cpu);
@@ -106,7 +106,7 @@ static struct task_struct *idle_thread(ipanic ("copy_process failed in idle_thread, error = %ld" ,PTR_ERR (new_task)); - cpu_tasks[cpu] = ((struct cpu_task ) + cpu_tasks[cpu] = ((struct cpu_task ) { .pid = new_task->thread.mode.tt.extern_pid, .task = new_task } ); idle_threads[cpu] = new_task;
@@ -134,12 +134,12 @@ void smp_prepare_cpus(unsigned int maxcpif (err <0 )panic ("CPU#0 failed to create IPI pipe, errno = %d" , -err); -activate_ipi (cpu_data[me].ipi_pipe[0 ], +os_set_fd_async (cpu_data[me].ipi_pipe[0 ], current->thread.mode.tt.extern_pid);for (cpu =1 ; cpu < ncpus; cpu++){printk ("Booting processor %d...\n" , cpu); - + idle =idle_thread (cpu);init_idle (idle, cpu);
@@ -223,7 +223,7 @@ void smp_call_function_slave(int cpu)atomic_inc (&scf_finished); } -int smp_call_function (void (*_func)(void *info),void *_info,int nonatomic, +int smp_call_function (void (*_func)(void *info),void *_info,int nonatomic,int wait) {int cpus =num_online_cpus () -1 ;
arch/um/os-Linux/Makefile +3 -3
@@ -3,14 +3,14 @@ # Licensed under the GPL # -obj-y = aio.o elf_aux.o file.o helper.o main.o mem.o process.o signal.o \ +obj-y = aio.o elf_aux.o file.o helper.o irq.o main.o mem.o process.o signal.o \ start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o user_syms.o \ util.o drivers/ sys-$(SUBARCH)/ obj-$(CONFIG_MODE_SKAS) += skas/ -USER_OBJS := aio.o elf_aux.o file.o helper.o main.o mem.o process.o signal.o \ - start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o util.o +USER_OBJS := aio.o elf_aux.o file.o helper.o irq.o main.o mem.o process.o \ + signal.o start_up.o time.o trap.o tt.o tty.o uaccess.o umid.o util.o elf_aux.o: $(ARCH_DIR)/kernel-offsets.h CFLAGS_elf_aux.o += -I$(objtree)/arch/um
arch/um/os-Linux/irq.c new file +162 -0
162 lines not on this page · raw message
arch/um/os-Linux/tt.c +10 -0
@@ -110,6 +110,16 @@ int wait_for_stop(int pid, int sig, int } } +void forward_ipi (int fd,int pid) +{ +int err; + + err =os_set_owner (fd, pid); +if (err <0 ) +printk ("forward_ipi: set_owner failed, fd = %d, me = %d, " +"target = %d, err = %d\n" , fd,os_getpid (), pid, -err); +} +/* *------------------------- * only for tt mode (will be deleted in future...)
arch/um/sys-i386/user-offsets.c +8 -2
@@ -3,12 +3,13 @@#include <asm/ptrace.h> #include <asm/user.h> #include <linux/stddef.h> +#include <sys/poll.h> #define DEFINE (sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val)) + asm volatile("\n->" #sym " %0 " #val : : "i" (val))#define DEFINE_LONGS (sym, val) \ - asm volatile("\n->" #sym " %0 " #val : : "i" (val/sizeof(unsigned long))) + asm volatile("\n->" #sym " %0 " #val : : "i" (val/sizeof(unsigned long)))#define OFFSET (sym, str, mem) \ DEFINE(sym, offsetof(struct str, mem));
@@ -67,4 +68,9 @@ void foo(void)DEFINE (HOST_ES ,ES );DEFINE (HOST_GS ,GS );DEFINE (UM_FRAME_SIZE ,sizeof (struct user_regs_struct )); + +/* XXX Duplicated between i386 and x86_64 */ +DEFINE (UM_POLLIN ,POLLIN ); +DEFINE (UM_POLLPRI ,POLLPRI ); +DEFINE (UM_POLLOUT ,POLLOUT ); }
arch/um/sys-x86_64/user-offsets.c +6 -0
@@ -1,6 +1,7 @@#include <stdio.h> #include <stddef.h> #include <signal.h> +#include <sys/poll.h> #define __FRAME_OFFSETS#include <asm/ptrace.h> #include <asm/types.h>
@@ -88,4 +89,9 @@ void foo(void)DEFINE_LONGS (HOST_IP ,RIP );DEFINE_LONGS (HOST_SP ,RSP );DEFINE (UM_FRAME_SIZE ,sizeof (struct user_regs_struct )); + +/* XXX Duplicated between i386 and x86_64 */ +DEFINE (UM_POLLIN ,POLLIN ); +DEFINE (UM_POLLPRI ,POLLPRI ); +DEFINE (UM_POLLOUT ,POLLOUT ); }
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel