Index: kernel/arch/arm32/Makefile.inc =================================================================== --- kernel/arch/arm32/Makefile.inc (revision 4702bde4d52e794b38425ced5f1582d02229fe3b) +++ kernel/arch/arm32/Makefile.inc (revision 82a04c6d4cedfa8e557149797bfda87ae5da22d7) @@ -61,5 +61,6 @@ arch/$(KARCH)/src/mm/page.c \ arch/$(KARCH)/src/mm/tlb.c \ - arch/$(KARCH)/src/mm/page_fault.c + arch/$(KARCH)/src/mm/page_fault.c \ + arch/$(KARCH)/src/ras.c ifeq ($(MACHINE),testarm) Index: kernel/arch/arm32/include/ras.h =================================================================== --- kernel/arch/arm32/include/ras.h (revision 82a04c6d4cedfa8e557149797bfda87ae5da22d7) +++ kernel/arch/arm32/include/ras.h (revision 82a04c6d4cedfa8e557149797bfda87ae5da22d7) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2009 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 arm32 + * @{ + */ +/** @file + * @brief Declarations related to Restartable Atomic Sequences. + */ + +#ifndef KERN_arm32_RAS_H_ +#define KERN_arm32_RAS_H_ + +#include +#include + +#define RAS_START 0 +#define RAS_END 1 + +extern uintptr_t *ras_page; + +extern void ras_init(void); +extern void ras_check(int, istate_t *); + +#endif + +/** @} + */ Index: kernel/arch/arm32/src/arm32.c =================================================================== --- kernel/arch/arm32/src/arm32.c (revision 4702bde4d52e794b38425ced5f1582d02229fe3b) +++ kernel/arch/arm32/src/arm32.c (revision 82a04c6d4cedfa8e557149797bfda87ae5da22d7) @@ -48,4 +48,5 @@ #include #include +#include #ifdef MACHINE_testarm @@ -88,4 +89,7 @@ exception_init(); interrupt_init(); + + /* Initialize Restartable Atomic Sequences support. */ + ras_init(); machine_output_init(); Index: kernel/arch/arm32/src/exc_handler.S =================================================================== --- kernel/arch/arm32/src/exc_handler.S (revision 4702bde4d52e794b38425ced5f1582d02229fe3b) +++ kernel/arch/arm32/src/exc_handler.S (revision 82a04c6d4cedfa8e557149797bfda87ae5da22d7) @@ -148,5 +148,5 @@ mov r0, #0 mov r1, r13 - bl exc_dispatch + bl ras_check LOAD_REGS_FROM_STACK @@ -156,5 +156,5 @@ mov r0, #5 mov r1, r13 - bl exc_dispatch + bl ras_check LOAD_REGS_FROM_STACK @@ -164,5 +164,5 @@ mov r0, #6 mov r1, r13 - bl exc_dispatch + bl ras_check LOAD_REGS_FROM_STACK @@ -171,5 +171,5 @@ mov r0, #1 mov r1, r13 - bl exc_dispatch + bl ras_check LOAD_REGS_FROM_STACK @@ -179,5 +179,5 @@ mov r0, #3 mov r1, r13 - bl exc_dispatch + bl ras_check LOAD_REGS_FROM_STACK @@ -187,5 +187,5 @@ mov r0, #4 mov r1, r13 - bl exc_dispatch + bl ras_check LOAD_REGS_FROM_STACK @@ -195,5 +195,5 @@ mov r0, #2 mov r1, r13 - bl exc_dispatch + bl ras_check LOAD_REGS_FROM_STACK Index: kernel/arch/arm32/src/ras.c =================================================================== --- kernel/arch/arm32/src/ras.c (revision 82a04c6d4cedfa8e557149797bfda87ae5da22d7) +++ kernel/arch/arm32/src/ras.c (revision 82a04c6d4cedfa8e557149797bfda87ae5da22d7) @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2009 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 arm32 + * @{ + */ +/** @file + * @brief Kernel part of Restartable Atomic Sequences support. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +uintptr_t *ras_page = NULL; + +void ras_init(void) +{ + ras_page = frame_alloc(ONE_FRAME, FRAME_KA); + memsetb(ras_page, FRAME_SIZE, 0); + ras_page[RAS_START] = 0; + ras_page[RAS_END] = 0xffffffff; + /* + * Userspace needs to be able to write to this page. The page is + * cached in TLB as PAGE_KERNEL. Purge it from TLB and map it + * read/write PAGE_USER. + */ + tlb_invalidate_pages(ASID_KERNEL, (uintptr_t)ras_page, 1); + page_table_lock(AS, true); + page_mapping_insert(AS, (uintptr_t)ras_page, (uintptr_t)KA2PA(ras_page), + PAGE_READ | PAGE_WRITE | PAGE_USER); + page_table_unlock(AS, true); +} + +void ras_check(int n, istate_t *istate) +{ + uintptr_t rewrite_pc = istate->pc; + + if (istate_from_uspace(istate)) { + if (ras_page[RAS_START]) { + if ((ras_page[RAS_START] < istate->pc) && + (ras_page[RAS_END] > istate->pc)) { + rewrite_pc = ras_page[RAS_START]; + } + ras_page[RAS_START] = 0; + ras_page[RAS_END] = 0xffffffff; + } + } + + exc_dispatch(n, istate); + + istate->pc = rewrite_pc; +} + Index: kernel/arch/arm32/src/userspace.c =================================================================== --- kernel/arch/arm32/src/userspace.c (revision 4702bde4d52e794b38425ced5f1582d02229fe3b) +++ kernel/arch/arm32/src/userspace.c (revision 82a04c6d4cedfa8e557149797bfda87ae5da22d7) @@ -35,4 +35,5 @@ #include +#include /** Struct for holding all general purpose registers. @@ -74,8 +75,11 @@ ustate.r1 = 0; + /* pass the RAS page address in %r2 */ + ustate.r2 = (uintptr_t) ras_page; + /* clear other registers */ - ustate.r2 = ustate.r3 = ustate.r4 = ustate.r5 = - ustate.r6 = ustate.r7 = ustate.r8 = ustate.r9 = ustate.r10 = - ustate.r11 = ustate.r12 = ustate.lr = 0; + ustate.r3 = ustate.r4 = ustate.r5 = ustate.r6 = ustate.r7 = + ustate.r8 = ustate.r9 = ustate.r10 = ustate.r11 = ustate.r12 = + ustate.lr = 0; /* set user stack */