Index: kernel/arch/abs32le/include/arch/stack.h =================================================================== --- kernel/arch/abs32le/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) +++ kernel/arch/abs32le/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2013 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 abs32le + * @{ + */ +/** @file + */ + +#ifndef KERN_abs32le_STACK_H_ +#define KERN_abs32le_STACK_H_ + +#include + +#define MEM_STACK_SIZE STACK_SIZE + +#endif + +/** @} + */ Index: kernel/arch/amd64/include/arch/stack.h =================================================================== --- kernel/arch/amd64/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) +++ kernel/arch/amd64/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2013 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 amd64 + * @{ + */ +/** @file + */ + +#ifndef KERN_amd64_STACK_H_ +#define KERN_amd64_STACK_H_ + +#include + +#define MEM_STACK_SIZE STACK_SIZE + +#endif + +/** @} + */ Index: kernel/arch/arm32/include/arch/stack.h =================================================================== --- kernel/arch/arm32/include/arch/stack.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ kernel/arch/arm32/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -37,4 +37,8 @@ #define KERN_arm32_STACK_H_ +#include + +#define MEM_STACK_SIZE STACK_SIZE + #define STACK_ITEM_SIZE 4 Index: kernel/arch/ia32/include/arch/stack.h =================================================================== --- kernel/arch/ia32/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) +++ kernel/arch/ia32/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2013 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 ia32 + * @{ + */ +/** @file + */ + +#ifndef KERN_ia32_STACK_H_ +#define KERN_ia32_STACK_H_ + +#include + +#define MEM_STACK_SIZE STACK_SIZE + +#endif + +/** @} + */ Index: kernel/arch/ia64/include/arch/stack.h =================================================================== --- kernel/arch/ia64/include/arch/stack.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ kernel/arch/ia64/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -36,4 +36,8 @@ #define KERN_ia64_STACK_H_ +#include + +#define MEM_STACK_SIZE (STACK_SIZE / 2) + #define STACK_ITEM_SIZE 8 #define STACK_ALIGNMENT 16 Index: kernel/arch/mips32/include/arch/stack.h =================================================================== --- kernel/arch/mips32/include/arch/stack.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ kernel/arch/mips32/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -36,4 +36,8 @@ #define KERN_mips32_STACK_H_ +#include + +#define MEM_STACK_SIZE STACK_SIZE + #define STACK_ITEM_SIZE 4 #define STACK_ALIGNMENT 8 Index: kernel/arch/mips64/include/arch/stack.h =================================================================== --- kernel/arch/mips64/include/arch/stack.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ kernel/arch/mips64/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -36,4 +36,8 @@ #define KERN_mips64_STACK_H_ +#include + +#define MEM_STACK_SIZE STACK_SIZE + #define STACK_ITEM_SIZE 8 #define STACK_ALIGNMENT 8 Index: kernel/arch/ppc32/include/arch/stack.h =================================================================== --- kernel/arch/ppc32/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) +++ kernel/arch/ppc32/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2013 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 ppc32 + * @{ + */ +/** @file + */ + +#ifndef KERN_ppc32_STACK_H_ +#define KERN_ppc32_STACK_H_ + +#include + +#define MEM_STACK_SIZE STACK_SIZE + +#endif + +/** @} + */ Index: kernel/arch/sparc64/include/arch/stack.h =================================================================== --- kernel/arch/sparc64/include/arch/stack.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ kernel/arch/sparc64/include/arch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -36,4 +36,8 @@ #define KERN_sparc64_STACK_H_ +#include + +#define MEM_STACK_SIZE STACK_SIZE + #define STACK_ITEM_SIZE 8 Index: kernel/generic/src/interrupt/interrupt.c =================================================================== --- kernel/generic/src/interrupt/interrupt.c (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ kernel/generic/src/interrupt/interrupt.c (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -54,4 +54,5 @@ #include #include +#include #include #include @@ -222,8 +223,7 @@ /* * The istate structure should be right at the bottom of the kernel - * stack. + * memory stack. */ - return (istate_t *) ((uint8_t *) - thread->kstack + STACK_SIZE - sizeof(istate_t)); + return (istate_t *) &thread->kstack[MEM_STACK_SIZE - sizeof(istate_t)]; } Index: uspace/drv/char/i8042/main.c =================================================================== --- uspace/drv/char/i8042/main.c (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ uspace/drv/char/i8042/main.c (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -36,4 +36,5 @@ #include +#include #include #include @@ -42,4 +43,5 @@ #include #include +#include #include "i8042.h" @@ -152,4 +154,11 @@ printf("%s: HelenOS PS/2 driver.\n", NAME); ddf_log_init(NAME); + + /* + * Alleviate the virtual memory / page table pressure caused by + * interrupt storms when the default large stacks are used. + */ + async_set_interrupt_handler_stack_size(PAGE_SIZE); + return ddf_driver_main(&i8042_driver); } Index: uspace/lib/c/arch/mips32/include/libarch/stack.h =================================================================== --- uspace/lib/c/arch/mips32/include/libarch/stack.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ uspace/lib/c/arch/mips32/include/libarch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -1,1 +1,45 @@ -../../../../../../../kernel/arch/mips32/include/arch/stack.h +/* + * Copyright (c) 2006 Josef Cejka + * 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 libcmips32 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips32_STACK_H_ +#define LIBC_mips32_STACK_H_ + +#define STACK_ITEM_SIZE 4 +#define STACK_ALIGNMENT 8 +#define ABI_STACK_FRAME 32 + +#endif + +/** @} + */ Index: uspace/lib/c/arch/mips64/include/libarch/stack.h =================================================================== --- uspace/lib/c/arch/mips64/include/libarch/stack.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ uspace/lib/c/arch/mips64/include/libarch/stack.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -1,1 +1,45 @@ -../../../../../../../kernel/arch/mips64/include/arch/stack.h +/* + * Copyright (c) 2006 Josef Cejka + * 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 libcmips64 + * @{ + */ +/** @file + */ + +#ifndef LIBC_mips64_STACK_H_ +#define LIBC_mips64_STACK_H_ + +#define STACK_ITEM_SIZE 8 +#define STACK_ALIGNMENT 8 +#define ABI_STACK_FRAME 64 + +#endif + +/** @} + */ Index: uspace/lib/c/generic/async.c =================================================================== --- uspace/lib/c/generic/async.c (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ uspace/lib/c/generic/async.c (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -350,4 +350,5 @@ static async_client_conn_t client_connection = default_client_connection; static async_interrupt_handler_t interrupt_received = default_interrupt_received; +static size_t interrupt_handler_stksz = (size_t) -1; /** Setter for client_connection function pointer. @@ -370,4 +371,13 @@ { interrupt_received = intr; +} + +/** Set the stack size for the interrupt handler notification fibrils. + * + * @param size Stack size. Use -1 to use the system default stack size. + */ +void async_set_interrupt_handler_stack_size(size_t size) +{ + interrupt_handler_stksz = size; } @@ -587,5 +597,6 @@ msg->call = *call; - fid_t fid = fibril_create(notification_fibril, msg); + fid_t fid = fibril_create_generic(notification_fibril, msg, + interrupt_handler_stksz); if (fid == 0) { free(msg); Index: uspace/lib/c/generic/fibril.c =================================================================== --- uspace/lib/c/generic/fibril.c (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ uspace/lib/c/generic/fibril.c (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -256,9 +256,10 @@ * @param func Implementing function of the new fibril. * @param arg Argument to pass to func. + * @param stksz Stack size, -1 for the system default stack size. * * @return 0 on failure or TLS of the new fibril. * */ -fid_t fibril_create(int (*func)(void *), void *arg) +fid_t fibril_create_generic(int (*func)(void *), void *arg, size_t stksz) { fibril_t *fibril; @@ -268,5 +269,5 @@ return 0; - size_t stack_size = stack_size_get(); + size_t stack_size = (stksz == (size_t) -1) ? stack_size_get() : stksz; fibril->stack = as_area_create((void *) -1, stack_size, AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD | Index: uspace/lib/c/include/async.h =================================================================== --- uspace/lib/c/include/async.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ uspace/lib/c/include/async.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -156,4 +156,5 @@ extern void async_set_client_connection(async_client_conn_t); extern void async_set_interrupt_received(async_interrupt_handler_t); +extern void async_set_interrupt_handler_stack_size(size_t); /* Index: uspace/lib/c/include/fibril.h =================================================================== --- uspace/lib/c/include/fibril.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ uspace/lib/c/include/fibril.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -86,5 +86,7 @@ extern void context_restore(context_t *ctx) __attribute__((noreturn)); -extern fid_t fibril_create(int (*func)(void *), void *arg); +#define fibril_create(func, arg) \ + fibril_create_generic((func), (arg), (size_t) -1) +extern fid_t fibril_create_generic(int (*func)(void *), void *arg, size_t); extern void fibril_destroy(fid_t fid); extern fibril_t *fibril_setup(void); Index: uspace/lib/c/include/macros.h =================================================================== --- uspace/lib/c/include/macros.h (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ uspace/lib/c/include/macros.h (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -38,5 +38,5 @@ #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) > (b) ? (a) : (b)) -#define abs(a) ((a) >= 0 ? (a) : (-a)) +#define abs(a) ((a) >= 0 ? (a) : -(a)) Index: version =================================================================== --- version (revision 7f25c4e9da012f7d3387d095172d979087ec8173) +++ version (revision 878e181f6eb85107ea0e068160f61ef02ad468d4) @@ -46,4 +46,4 @@ NAME = Fajtl -COPYRIGHT = Copyright (c) 2001-2012 HelenOS project +COPYRIGHT = Copyright (c) 2001-2013 HelenOS project