| /kernel/trunk/generic/include/ddi/ddi.h |
|---|
| 39,8 → 39,6 |
| /* |
| * Interface to be implemented by all architectures. |
| */ |
| extern __native ddi_int_control_arch(__native enable, __native *flags); |
| extern __native ddi_int_control(__native enable, __native *flags); |
| extern int ddi_iospace_enable_arch(task_t *task, __address ioaddr, size_t size); |
| #endif |
| /kernel/trunk/generic/include/security/cap.h |
|---|
| 63,9 → 63,9 |
| #define CAP_IO_MANAGER (1<<2) |
| /** |
| * CAP_INT_CONTROL allows its holder to disable interrupts |
| * CAP_PREEMPT_CONTROL allows its holder to disable interrupts |
| */ |
| #define CAP_INT_CONTROL (1<<3) |
| #define CAP_PREEMPT_CONTROL (1<<3) |
| typedef __u32 cap_t; |
| /kernel/trunk/generic/include/syscall/syscall.h |
|---|
| 32,7 → 32,7 |
| typedef enum { |
| SYS_IO = 0, |
| SYS_TLS_SET = 1, /* Hardcoded in AMD64,IA32 uspace - psthread.S */ |
| SYS_INT_CONTROL = 2, /* Hardcoded in all SYSCALL handlers */ |
| SYS_PREEMPT_CONTROL, |
| SYS_THREAD_CREATE, |
| SYS_THREAD_EXIT, |
| SYS_TASK_GET_ID, |
| /kernel/trunk/generic/src/ddi/ddi.c |
|---|
| 203,10 → 203,3 |
| copy_from_uspace(&arg, uspace_io_arg, sizeof(ddi_ioarg_t)); |
| return (__native) ddi_iospace_enable((task_id_t) arg.task_id, (__address) arg.ioaddr, (size_t) arg.size); |
| } |
| __native ddi_int_control(__native enable, __native *flags) |
| { |
| if (! cap_get(TASK) & CAP_INT_CONTROL) |
| return EPERM; |
| return ddi_int_control_arch(enable, flags); |
| } |
| /kernel/trunk/generic/src/syscall/syscall.c |
|---|
| 56,9 → 56,15 |
| return count; |
| } |
| static __native sys_int_control(int enable) |
| static __native sys_preempt_control(int enable) |
| { |
| panic("Not implemented."); |
| if (! cap_get(TASK) & CAP_PREEMPT_CONTROL) |
| return EPERM; |
| if (enable) |
| preemption_enable(); |
| else |
| preemption_disable(); |
| return 0; |
| } |
| /** Dispatch system call */ |
| 74,7 → 80,7 |
| syshandler_t syscall_table[SYSCALL_END] = { |
| sys_io, |
| sys_tls_set, |
| sys_int_control, |
| sys_preempt_control, |
| /* Thread and task related syscalls. */ |
| sys_thread_create, |
| /kernel/trunk/arch/amd64/src/ddi/ddi.c |
|---|
| 100,20 → 100,6 |
| return 0; |
| } |
| /** Enable/disable interrupts form syscall |
| * |
| * @param enable If non-zero, interrupts are enabled, otherwise disabled |
| * @param flags RFLAGS register |
| */ |
| __native ddi_int_control_arch(__native enable, __native *flags) |
| { |
| if (enable) |
| *flags |= RFLAGS_IF; |
| else |
| *flags &= ~RFLAGS_IF; |
| return 0; |
| } |
| /** Install I/O Permission bitmap. |
| * |
| * Current task's I/O permission bitmap, if any, is installed |
| /kernel/trunk/arch/amd64/src/asm_utils.S |
|---|
| 244,11 → 244,7 |
| sti |
| movq %r9, %rcx # Exchange last parameter as a third |
| cmp $2, %r8 # Is this SYS_INT_CONTROL |
| je sys_int_ctrl |
| call syscall_handler |
| sys_end: |
| cli # We will be touching stack pointer |
| popq %r11 |
| 255,13 → 251,8 |
| popq %rcx |
| movq 0(%rsp), %rsp |
| sysretq |
| sys_int_ctrl: |
| mov %rsp, %rsi # Pointer to flags |
| call ddi_int_control |
| jmp sys_end |
| .data |
| .global interrupt_handler_size |
| /kernel/trunk/arch/mips32/src/start.S |
|---|
| 253,15 → 253,10 |
| sw $t2,SS_STATUS($sp) |
| mtc0 $t0, $status |
| li $t4, 2 # SYS_INT_CONTROL |
| beq $t4, $v0, sysc_int_control |
| nop |
| # CALL Syscall handler |
| jal syscall_handler |
| sw $v0, SS_ARG4($sp) # save v0 - arg4 to stack |
| sysc_exit: |
| # restore status |
| mfc0 $t0, $status |
| lw $t1,SS_STATUS($sp) |
| 281,14 → 276,7 |
| lw $sp,SS_SP($sp) # restore sp |
| eret |
| sysc_int_control: |
| jal ddi_int_control |
| addi $a1, $sp, SS_STATUS |
| j sysc_exit |
| nop |
| tlb_refill_handler: |
| KERNEL_STACK_TO_K0 |
| sub $k0, REGISTER_SPACE |
| /kernel/trunk/arch/mips32/src/ddi/ddi.c |
|---|
| 48,17 → 48,3 |
| { |
| return 0; |
| } |
| /** Enable/disable interrupts for syscall |
| * |
| * @param enable If non-zero, interrupts are enabled, otherwise disabled |
| * @param flags CP0 status register |
| */ |
| __native ddi_int_control_arch(__native enable, __native *flags) |
| { |
| if (enable) |
| *flags |= cp0_status_ie_enabled_bit; |
| else |
| *flags &= ~cp0_status_ie_enabled_bit; |
| return 0; |
| } |
| /kernel/trunk/arch/ia32/src/asm.S |
|---|
| 86,7 → 86,7 |
| # The handlers setup data segment registers |
| # and call exc_dispatch(). |
| # |
| #define INTERRUPT_ALIGN 128 |
| #define INTERRUPT_ALIGN 64 |
| .macro handler i n |
| .ifeq \i-0x30 # Syscall handler |
| 108,11 → 108,8 |
| movw %ax,%es |
| sti |
| cmp $2, %edi # Is this SYS_INT_CONTROL? |
| je sys_int_ctrl |
| call syscall_handler # syscall_handler(ax,cx,dx,si,di) |
| sysc_end: |
| cli |
| addl $20, %esp # clean-up of parameters |
| 123,12 → 120,6 |
| CLEAR_NT_FLAG |
| iret |
| sys_int_ctrl: # Interrupt control |
| mov %esp, %eax |
| add $44, %eax |
| mov %eax, 4(%esp) # Pointer to flags - 2nd argument |
| call ddi_int_control |
| jmp sysc_end |
| .else |
| /* |
| * This macro distinguishes between two versions of ia32 exceptions. |
| /kernel/trunk/arch/ia32/src/ddi/ddi.c |
|---|
| 101,20 → 101,6 |
| return 0; |
| } |
| /** Enable/disable interrupts for syscall |
| * |
| * @param enable If non-zero, interrupts are enabled, otherwise disabled |
| * @param flags EFLAGS flags register |
| */ |
| __native ddi_int_control_arch(__native enable, __native *flags) |
| { |
| if (enable) |
| *flags |= EFLAGS_IF; |
| else |
| *flags &= ~EFLAGS_IF; |
| return 0; |
| } |
| /** Install I/O Permission bitmap. |
| * |
| * Current task's I/O permission bitmap, if any, is installed |