Index: contrib/arch/kernel/kernel.adl =================================================================== --- contrib/arch/kernel/kernel.adl (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ contrib/arch/kernel/kernel.adl (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -166,8 +166,20 @@ interface sys_cap { /* Grant capabilities to a task */ - sysarg_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps); +#ifdef __32_BITS__ + sysarg_t sys_cap_grant(sysarg64_t *uspace_taskid, cap_t caps); +#endif + +#ifdef __64_BITS__ + sysarg_t sys_cap_grant(sysarg_t taskid, cap_t caps); +#endif /* Revoke capabilities from a task */ - sysarg_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps); +#ifdef __32_BITS__ + sysarg_t sys_cap_revoke(sysarg64_t *uspace_taskid, cap_t caps); +#endif + +#ifdef __64_BITS__ + sysarg_t sys_cap_revoke(sysarg_t taskid, cap_t caps); +#endif protocol: ( @@ -221,5 +233,11 @@ interface sys_debug { /* Connect to the kernel debugging answerbox of a given task */ - sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg); +#ifdef __32_BITS__ + sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid); +#endif + +#ifdef __64_BITS__ + sysarg_t sys_ipc_connect_kbox(sysarg_t taskid); +#endif protocol: ?sys_ipc_connect_kbox* Index: kernel/generic/include/ipc/sysipc.h =================================================================== --- kernel/generic/include/ipc/sysipc.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ kernel/generic/include/ipc/sysipc.h (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -40,26 +40,34 @@ #include -extern sysarg_t sys_ipc_call_sync_fast(sysarg_t phoneid, sysarg_t method, - sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, ipc_data_t *data); -extern sysarg_t sys_ipc_call_sync_slow(sysarg_t phoneid, ipc_data_t *question, - ipc_data_t *reply); -extern sysarg_t sys_ipc_call_async_fast(sysarg_t phoneid, sysarg_t method, - sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4); -extern sysarg_t sys_ipc_call_async_slow(sysarg_t phoneid, ipc_data_t *data); -extern sysarg_t sys_ipc_answer_fast(sysarg_t callid, sysarg_t retval, - sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4); -extern sysarg_t sys_ipc_answer_slow(sysarg_t callid, ipc_data_t *data); -extern sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec, - unsigned int nonblocking); +extern sysarg_t sys_ipc_call_sync_fast(sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, ipc_data_t *); +extern sysarg_t sys_ipc_call_sync_slow(sysarg_t, ipc_data_t *, ipc_data_t *); +extern sysarg_t sys_ipc_call_async_fast(sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t, sysarg_t); +extern sysarg_t sys_ipc_call_async_slow(sysarg_t, ipc_data_t *); +extern sysarg_t sys_ipc_answer_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, sysarg_t); +extern sysarg_t sys_ipc_answer_slow(sysarg_t, ipc_data_t *); +extern sysarg_t sys_ipc_wait_for_call(ipc_data_t *, uint32_t, unsigned int); extern sysarg_t sys_ipc_poke(void); -extern sysarg_t sys_ipc_forward_fast(sysarg_t callid, sysarg_t phoneid, - sysarg_t method, sysarg_t arg1, sysarg_t arg2, unsigned int mode); -extern sysarg_t sys_ipc_forward_slow(sysarg_t callid, sysarg_t phoneid, - ipc_data_t *data, unsigned int mode); -extern sysarg_t sys_ipc_hangup(sysarg_t phoneid); -extern sysarg_t sys_ipc_register_irq(inr_t inr, devno_t devno, sysarg_t method, - irq_code_t *ucode); -extern sysarg_t sys_ipc_unregister_irq(inr_t inr, devno_t devno); -extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *task_id); +extern sysarg_t sys_ipc_forward_fast(sysarg_t, sysarg_t, sysarg_t, sysarg_t, + sysarg_t, unsigned int); +extern sysarg_t sys_ipc_forward_slow(sysarg_t, sysarg_t, ipc_data_t *, + unsigned int); +extern sysarg_t sys_ipc_hangup(sysarg_t); +extern sysarg_t sys_ipc_register_irq(inr_t, devno_t, sysarg_t, irq_code_t *); +extern sysarg_t sys_ipc_unregister_irq(inr_t, devno_t); + +#ifdef __32_BITS__ + +extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *); + +#endif /* __32_BITS__ */ + +#ifdef __64_BITS__ + +extern sysarg_t sys_ipc_connect_kbox(sysarg_t); + +#endif /* __64_BITS__ */ #endif Index: kernel/generic/include/security/cap.h =================================================================== --- kernel/generic/include/security/cap.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ kernel/generic/include/security/cap.h (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -48,5 +48,4 @@ #define __CAP_H__ -#include #include @@ -55,5 +54,5 @@ * privilege to/from other tasks. */ -#define CAP_CAP (1<<0) +#define CAP_CAP (1 << 0) /** @@ -61,5 +60,5 @@ * to other tasks. */ -#define CAP_MEM_MANAGER (1<<1) +#define CAP_MEM_MANAGER (1 << 1) /** @@ -67,15 +66,26 @@ * to other tasks. */ -#define CAP_IO_MANAGER (1<<2) +#define CAP_IO_MANAGER (1 << 2) /** * CAP_IRQ_REG entitles its holder to register IRQ handlers. */ -#define CAP_IRQ_REG (1<<3) +#define CAP_IRQ_REG (1 << 3) typedef uint32_t cap_t; -extern sysarg_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps); -extern sysarg_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps); +#ifdef __32_BITS__ + +extern sysarg_t sys_cap_grant(sysarg64_t *, cap_t); +extern sysarg_t sys_cap_revoke(sysarg64_t *, cap_t); + +#endif /* __32_BITS__ */ + +#ifdef __64_BITS__ + +extern sysarg_t sys_cap_grant(sysarg_t, cap_t); +extern sysarg_t sys_cap_revoke(sysarg_t, cap_t); + +#endif /* __64_BITS__ */ #endif Index: rnel/generic/include/syscall/sysarg64.h =================================================================== --- kernel/generic/include/syscall/sysarg64.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ (revision ) @@ -1,48 +1,0 @@ -/* - * Copyright (c) 2006 Jakub Jermar - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup generic - * @{ - */ - -/** - * @file - * @brief Wrapper for explicit 64-bit arguments passed to syscalls. - */ - -#ifndef KERN_SYSARG64_H_ -#define KERN_SYSARG64_H_ - -typedef struct { - unsigned long long value; -} sysarg64_t; - -#endif - -/** @} - */ Index: kernel/generic/include/syscall/syscall.h =================================================================== --- kernel/generic/include/syscall/syscall.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ kernel/generic/include/syscall/syscall.h (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -38,5 +38,5 @@ typedef enum { SYS_KLOG = 0, - SYS_TLS_SET = 1, /* Hardcoded in AMD64, IA32 uspace - fibril.S */ + SYS_TLS_SET = 1, /* Hardcoded for AMD64, IA-32 (fibril.S in uspace) */ SYS_THREAD_CREATE, @@ -71,4 +71,5 @@ SYS_IPC_REGISTER_IRQ, SYS_IPC_UNREGISTER_IRQ, + SYS_IPC_CONNECT_KBOX, SYS_EVENT_SUBSCRIBE, @@ -90,5 +91,4 @@ SYS_DEBUG_DISABLE_CONSOLE, - SYS_IPC_CONNECT_KBOX, SYSCALL_END } syscall_t; Index: kernel/generic/include/typedefs.h =================================================================== --- kernel/generic/include/typedefs.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ kernel/generic/include/typedefs.h (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -73,4 +73,11 @@ typedef volatile uint32_t ioport32_t; +#ifdef __32_BITS__ + +/** Explicit 64-bit arguments passed to syscalls. */ +typedef uint64_t sysarg64_t; + +#endif /* __32_BITS__ */ + #endif Index: kernel/generic/src/ipc/sysipc.c =================================================================== --- kernel/generic/src/ipc/sysipc.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ kernel/generic/src/ipc/sysipc.c (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -49,4 +49,5 @@ #include #include +#include #include #include @@ -1128,22 +1129,20 @@ } -#include - -/** Syscall connect to a task by id. +#ifdef __32_BITS__ + +/** Syscall connect to a task by ID (32 bits) * * @return Phone id on success, or negative error code. * */ -sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg) +sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid) { #ifdef CONFIG_UDEBUG - sysarg64_t taskid_arg; - int rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t)); + sysarg64_t taskid; + int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(sysarg64_t)); if (rc != 0) return (sysarg_t) rc; - LOG("sys_ipc_connect_kbox(%" PRIu64 ")", taskid_arg.value); - - return ipc_connect_kbox(taskid_arg.value); + return ipc_connect_kbox((task_id_t) taskid); #else return (sysarg_t) ENOTSUP; @@ -1151,4 +1150,24 @@ } +#endif /* __32_BITS__ */ + +#ifdef __64_BITS__ + +/** Syscall connect to a task by ID (64 bits) + * + * @return Phone id on success, or negative error code. + * + */ +sysarg_t sys_ipc_connect_kbox(sysarg_t taskid) +{ +#ifdef CONFIG_UDEBUG + return ipc_connect_kbox((task_id_t) taskid); +#else + return (sysarg_t) ENOTSUP; +#endif +} + +#endif /* __64_BITS__ */ + /** @} */ Index: kernel/generic/src/security/cap.c =================================================================== --- kernel/generic/src/security/cap.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ kernel/generic/src/security/cap.c (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -41,5 +41,4 @@ #include #include -#include #include #include @@ -79,22 +78,17 @@ * The calling task must have the CAP_CAP capability. * - * @param uspace_taskid_arg Userspace structure holding destination task ID. - * @param caps Capabilities to grant. - * - * @return Zero on success or an error code from @ref errno.h. - * - */ -sysarg_t sys_cap_grant(sysarg64_t *uspace_taskid_arg, cap_t caps) + * @param taskid Destination task ID. + * @param caps Capabilities to grant. + * + * @return Zero on success or an error code from @ref errno.h. + * + */ +static sysarg_t cap_grant(task_id_t taskid, cap_t caps) { if (!(cap_get(TASK) & CAP_CAP)) return (sysarg_t) EPERM; - sysarg64_t taskid_arg; - int rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t)); - if (rc != 0) - return (sysarg_t) rc; - irq_spinlock_lock(&tasks_lock, true); - task_t *task = task_find_by_id((task_id_t) taskid_arg.value); + task_t *task = task_find_by_id(taskid); if ((!task) || (!context_check(CONTEXT, task->context))) { @@ -116,20 +110,15 @@ * attempt to revoke capabilities from itself. * - * @param uspace_taskid_arg Userspace structure holding destination task ID. - * @param caps Capabilities to revoke. - * - * @return Zero on success or an error code from @ref errno.h. - * - */ -sysarg_t sys_cap_revoke(sysarg64_t *uspace_taskid_arg, cap_t caps) -{ - sysarg64_t taskid_arg; - int rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t)); - if (rc != 0) - return (sysarg_t) rc; - + * @param taskid Destination task ID. + * @param caps Capabilities to revoke. + * + * @return Zero on success or an error code from @ref errno.h. + * + */ +static sysarg_t cap_revoke(task_id_t taskid, cap_t caps) +{ irq_spinlock_lock(&tasks_lock, true); - task_t *task = task_find_by_id((task_id_t) taskid_arg.value); + task_t *task = task_find_by_id(taskid); if ((!task) || (!context_check(CONTEXT, task->context))) { irq_spinlock_unlock(&tasks_lock, true); @@ -157,4 +146,84 @@ } +#ifdef __32_BITS__ + +/** Grant capabilities to a task (32 bits) + * + * The calling task must have the CAP_CAP capability. + * + * @param uspace_taskid User-space pointer to destination task ID. + * @param caps Capabilities to grant. + * + * @return Zero on success or an error code from @ref errno.h. + * + */ +sysarg_t sys_cap_grant(sysarg64_t *uspace_taskid, cap_t caps) +{ + sysarg64_t taskid; + int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(sysarg64_t)); + if (rc != 0) + return (sysarg_t) rc; + + return cap_grant((task_id_t) taskid, caps); +} + +/** Revoke capabilities from a task (32 bits) + * + * The calling task must have the CAP_CAP capability or the caller must + * attempt to revoke capabilities from itself. + * + * @param uspace_taskid User-space pointer to destination task ID. + * @param caps Capabilities to revoke. + * + * @return Zero on success or an error code from @ref errno.h. + * + */ +sysarg_t sys_cap_revoke(sysarg64_t *uspace_taskid, cap_t caps) +{ + sysarg64_t taskid; + int rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(sysarg64_t)); + if (rc != 0) + return (sysarg_t) rc; + + return cap_revoke((task_id_t) taskid, caps); +} + +#endif /* __32_BITS__ */ + +#ifdef __64_BITS__ + +/** Grant capabilities to a task (64 bits) + * + * The calling task must have the CAP_CAP capability. + * + * @param taskid Destination task ID. + * @param caps Capabilities to grant. + * + * @return Zero on success or an error code from @ref errno.h. + * + */ +sysarg_t sys_cap_grant(sysarg_t taskid, cap_t caps) +{ + return cap_grant((task_id_t) taskid, caps); +} + +/** Revoke capabilities from a task (64 bits) + * + * The calling task must have the CAP_CAP capability or the caller must + * attempt to revoke capabilities from itself. + * + * @param taskid Destination task ID. + * @param caps Capabilities to revoke. + * + * @return Zero on success or an error code from @ref errno.h. + * + */ +sysarg_t sys_cap_revoke(sysarg_t taskid, cap_t caps) +{ + return cap_revoke((task_id_t) taskid, caps); +} + +#endif /* __64_BITS__ */ + /** @} */ Index: kernel/generic/src/syscall/syscall.c =================================================================== --- kernel/generic/src/syscall/syscall.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ kernel/generic/src/syscall/syscall.c (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -147,4 +147,5 @@ (syshandler_t) sys_ipc_register_irq, (syshandler_t) sys_ipc_unregister_irq, + (syshandler_t) sys_ipc_connect_kbox, /* Event notification syscalls. */ @@ -169,7 +170,5 @@ /* Debug calls */ (syshandler_t) sys_debug_enable_console, - (syshandler_t) sys_debug_disable_console, - - (syshandler_t) sys_ipc_connect_kbox + (syshandler_t) sys_debug_disable_console }; Index: uspace/lib/c/generic/cap.c =================================================================== --- uspace/lib/c/generic/cap.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ uspace/lib/c/generic/cap.c (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -31,6 +31,6 @@ */ /** - * @file cap.c - * @brief Functions to grant/revoke capabilities to/from a task. + * @file cap.c + * @brief Functions to grant/revoke capabilities to/from a task. */ @@ -38,36 +38,43 @@ #include #include -#include /** Grant capabilities to a task. * - * @param id Destination task ID. + * @param id Destination task ID. * @param caps Capabilities to grant. * * @return Zero on success or a value from @ref errno.h on failure. + * */ int cap_grant(task_id_t id, unsigned int caps) { - sysarg64_t arg; +#ifdef __32_BITS__ + sysarg64_t arg = (sysarg64_t) id; + return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) &arg, (sysarg_t) caps); +#endif - arg.value = (unsigned long long) id; - - return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) &arg, (sysarg_t) caps); +#ifdef __64_BITS__ + return __SYSCALL2(SYS_CAP_GRANT, (sysarg_t) id, (sysarg_t) caps); +#endif } /** Revoke capabilities from a task. * - * @param id Destination task ID. + * @param id Destination task ID. * @param caps Capabilities to revoke. * * @return Zero on success or a value from @ref errno.h on failure. + * */ int cap_revoke(task_id_t id, unsigned int caps) { - sysarg64_t arg; +#ifdef __32_BITS__ + sysarg64_t arg = (sysarg64_t) id; + return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) &arg, (sysarg_t) caps); +#endif - arg.value = (unsigned long long) id; - - return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) &arg, (sysarg_t) caps); +#ifdef __64_BITS__ + return __SYSCALL2(SYS_CAP_REVOKE, (sysarg_t) id, (sysarg_t) caps); +#endif } Index: uspace/lib/c/generic/ipc.c =================================================================== --- uspace/lib/c/generic/ipc.c (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ uspace/lib/c/generic/ipc.c (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -38,5 +38,5 @@ */ /** @file - */ + */ #include @@ -845,16 +845,19 @@ } -#include /** Connect to a task specified by id. + * */ int ipc_connect_kbox(task_id_t id) { - sysarg64_t arg; - - arg.value = (unsigned long long) id; - +#ifdef __32_BITS__ + sysarg64_t arg = (sysarg64_t) id; return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) &arg); -} - +#endif + +#ifdef __64_BITS__ + return __SYSCALL1(SYS_IPC_CONNECT_KBOX, (sysarg_t) id); +#endif +} + /** @} */ Index: uspace/lib/c/include/libc.h =================================================================== --- uspace/lib/c/include/libc.h (revision 96b02eb9b2f96f3843b8275c254c43a9cb6c8c88) +++ uspace/lib/c/include/libc.h (revision 6b10dab6510950964fc02ac960103bbaedf76314) @@ -40,4 +40,11 @@ #include +#ifdef __32_BITS__ + +/** Explicit 64-bit arguments passed to syscalls. */ +typedef uint64_t sysarg64_t; + +#endif /* __32_BITS__ */ + #define __SYSCALL0(id) \ __syscall0(0, 0, 0, 0, 0, 0, id) @@ -53,5 +60,5 @@ __syscall5(p1, p2, p3, p4, p5, 0, id) #define __SYSCALL6(id, p1, p2, p3, p4, p5, p6) \ - __syscall6(p1, p2, p3, p4, p5, p6, id) + __syscall6(p1, p2, p3, p4, p5, p6, id) extern void __main(void *pcb_ptr);