Index: abi/include/syscall.h =================================================================== --- abi/include/syscall.h (revision 119043169dd4a7a9e3104178ffd9e967a63b3f06) +++ abi/include/syscall.h (revision 43b8c65003b6569f828165488dec05a6df6be3b2) @@ -55,4 +55,5 @@ SYS_FUTEX_WAKEUP, SYS_SMC_COHERENCE, + SYS_SMP_MEMORY_BARRIER, SYS_AS_AREA_CREATE, Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision 119043169dd4a7a9e3104178ffd9e967a63b3f06) +++ kernel/Makefile (revision 43b8c65003b6569f828165488dec05a6df6be3b2) @@ -253,4 +253,5 @@ generic/src/synch/semaphore.c \ generic/src/synch/smc.c \ + generic/src/synch/smp_memory_barrier.c \ generic/src/synch/waitq.c \ generic/src/synch/futex.c \ Index: kernel/generic/include/synch/smp_memory_barrier.h =================================================================== --- kernel/generic/include/synch/smp_memory_barrier.h (revision 43b8c65003b6569f828165488dec05a6df6be3b2) +++ kernel/generic/include/synch/smp_memory_barrier.h (revision 43b8c65003b6569f828165488dec05a6df6be3b2) @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2012 Adam Hraska + * 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 sync + * @{ + */ +/** @file + */ + +#ifndef KERN_SMP_MEM_BAR_H_ +#define KERN_SMP_MEM_BAR_H_ + +#include + +extern sysarg_t sys_smp_memory_barrier(void); + +#endif + +/** @} + */ Index: kernel/generic/src/synch/smp_memory_barrier.c =================================================================== --- kernel/generic/src/synch/smp_memory_barrier.c (revision 43b8c65003b6569f828165488dec05a6df6be3b2) +++ kernel/generic/src/synch/smp_memory_barrier.c (revision 43b8c65003b6569f828165488dec05a6df6be3b2) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2012 Adam Hraska + * 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 Syscall implementation that issues a memory barrier on all cpus. + */ + +#include +#include +#include + + +static void issue_mem_bar(void *arg) +{ + /* smp_call already issues memory barriers on return from this function */ +} + +/** Issues a memory barrier on each cpu that is running a thread of the current + * task. + * + * @return Irrelevant. + */ +sysarg_t sys_smp_memory_barrier(void) +{ + for (unsigned int cpu_id = 0; cpu_id < config.cpu_active; ++cpu_id) { + smp_call(cpu_id, issue_mem_bar, NULL); + } + + return 0; +} + +/** @} + */ Index: kernel/generic/src/syscall/syscall.c =================================================================== --- kernel/generic/src/syscall/syscall.c (revision 119043169dd4a7a9e3104178ffd9e967a63b3f06) +++ kernel/generic/src/syscall/syscall.c (revision 43b8c65003b6569f828165488dec05a6df6be3b2) @@ -50,4 +50,5 @@ #include #include +#include #include #include @@ -140,4 +141,6 @@ (syshandler_t) sys_futex_wakeup, (syshandler_t) sys_smc_coherence, + (syshandler_t) sys_smp_memory_barrier, + /* Address space related syscalls. */ Index: uspace/lib/c/Makefile =================================================================== --- uspace/lib/c/Makefile (revision 119043169dd4a7a9e3104178ffd9e967a63b3f06) +++ uspace/lib/c/Makefile (revision 43b8c65003b6569f828165488dec05a6df6be3b2) @@ -90,4 +90,5 @@ generic/pcb.c \ generic/smc.c \ + generic/smp_memory_barrier.c \ generic/thread.c \ generic/tls.c \ Index: uspace/lib/c/generic/smp_memory_barrier.c =================================================================== --- uspace/lib/c/generic/smp_memory_barrier.c (revision 43b8c65003b6569f828165488dec05a6df6be3b2) +++ uspace/lib/c/generic/smp_memory_barrier.c (revision 43b8c65003b6569f828165488dec05a6df6be3b2) @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2012 Adam Hraska + * 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 libc + * @{ + */ +/** @file + */ + +#include +#include + +void smp_memory_barrier(void) +{ + __SYSCALL0(SYS_SMP_MEMORY_BARRIER); +} + +/** @} + */ Index: uspace/lib/c/include/smp_memory_barrier.h =================================================================== --- uspace/lib/c/include/smp_memory_barrier.h (revision 43b8c65003b6569f828165488dec05a6df6be3b2) +++ uspace/lib/c/include/smp_memory_barrier.h (revision 43b8c65003b6569f828165488dec05a6df6be3b2) @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2012 Adam Hraska + * 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 libc + * @{ + */ +/** @file + */ + +#ifndef LIBC_SMP_MEM_BAR_H_ +#define LIBC_SMP_MEM_BAR_H_ + +extern void smp_memory_barrier(void); + +#endif + +/** @} + */