From 7c19e50bdd3b6ae234b171992f2e109d4f804cda Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 18 Dec 2018 08:45:06 +0100 Subject: score: Fix per-CPU data allocation Allocate the per-CPU data for secondary processors directly from the heap areas before heap initialization and not via _Workspace_Allocate_aligned(). This avoids dependency on the workspace allocator. It fixes also a problem on some platforms (e.g. QorIQ) where at this early point in the system initialization the top of the RAM is used by low-level startup code on secondary processors (boot pages). Update #3507. --- testsuites/smptests/Makefile.am | 11 ++++ testsuites/smptests/configure.ac | 1 + testsuites/smptests/smpfatal09/init.c | 87 +++++++++++++++++++++++++++ testsuites/smptests/smpfatal09/smpfatal09.doc | 11 ++++ testsuites/smptests/smpfatal09/smpfatal09.scn | 7 +++ 5 files changed, 117 insertions(+) create mode 100644 testsuites/smptests/smpfatal09/init.c create mode 100644 testsuites/smptests/smpfatal09/smpfatal09.doc create mode 100644 testsuites/smptests/smpfatal09/smpfatal09.scn (limited to 'testsuites/smptests') diff --git a/testsuites/smptests/Makefile.am b/testsuites/smptests/Makefile.am index 2e8e5b1782..b5c2803d02 100644 --- a/testsuites/smptests/Makefile.am +++ b/testsuites/smptests/Makefile.am @@ -237,6 +237,17 @@ smpfatal08_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_smpfatal08) \ endif endif +if HAS_SMP +if TEST_smpfatal09 +smp_tests += smpfatal09 +smp_screens += smpfatal09/smpfatal09.scn +smp_docs += smpfatal09/smpfatal09.doc +smpfatal09_SOURCES = smpfatal09/init.c +smpfatal09_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_FLAGS_smpfatal09) \ + $(support_includes) +endif +endif + if HAS_SMP if TEST_smpipi01 smp_tests += smpipi01 diff --git a/testsuites/smptests/configure.ac b/testsuites/smptests/configure.ac index 9c5b5e0031..b3fca201b2 100644 --- a/testsuites/smptests/configure.ac +++ b/testsuites/smptests/configure.ac @@ -53,6 +53,7 @@ RTEMS_TEST_CHECK([smpfatal04]) RTEMS_TEST_CHECK([smpfatal05]) RTEMS_TEST_CHECK([smpfatal06]) RTEMS_TEST_CHECK([smpfatal08]) +RTEMS_TEST_CHECK([smpfatal09]) RTEMS_TEST_CHECK([smpipi01]) RTEMS_TEST_CHECK([smpload01]) RTEMS_TEST_CHECK([smplock01]) diff --git a/testsuites/smptests/smpfatal09/init.c b/testsuites/smptests/smpfatal09/init.c new file mode 100644 index 0000000000..ecbb54d586 --- /dev/null +++ b/testsuites/smptests/smpfatal09/init.c @@ -0,0 +1,87 @@ +/* + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (C) 2018 embedded brains GmbH + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. 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. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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. + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include +#include +#include + +#include + +static PER_CPU_DATA_ITEM(int, i) = 123; + +const char rtems_test_name[] = "SMPFATAL 9"; + +static void Init( rtems_task_argument arg ) +{ + Heap_Area area = { .begin = NULL, .size = 0 }; + int i; + + TEST_BEGIN(); + i = *PER_CPU_DATA_GET( _Per_CPU_Get_snapshot(), int, i ); + RTEMS_OBFUSCATE_VARIABLE( i ); + rtems_test_assert( i == 123 ); + + _Workspace_Handler_initialization( &area, 1, NULL ); + rtems_test_assert( 0 ); +} + +static void fatal_extension( + rtems_fatal_source source, + bool always_set_to_false, + rtems_fatal_code code +) +{ + if ( + source == INTERNAL_ERROR_CORE + && !always_set_to_false + && code == INTERNAL_ERROR_NO_MEMORY_FOR_PER_CPU_DATA + ) { + TEST_END(); + } +} + +#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER + +#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER + +#define CONFIGURE_INITIAL_EXTENSIONS \ + { .fatal = fatal_extension }, \ + RTEMS_TEST_INITIAL_EXTENSION + +#define CONFIGURE_MAXIMUM_PROCESSORS 2 + +#define CONFIGURE_MAXIMUM_TASKS 1 + +#define CONFIGURE_RTEMS_INIT_TASKS_TABLE + +#define CONFIGURE_INIT + +#include diff --git a/testsuites/smptests/smpfatal09/smpfatal09.doc b/testsuites/smptests/smpfatal09/smpfatal09.doc new file mode 100644 index 0000000000..c154a873b0 --- /dev/null +++ b/testsuites/smptests/smpfatal09/smpfatal09.doc @@ -0,0 +1,11 @@ +This file describes the directives and concepts tested by this test set. + +test set name: smpfatal09 + +directives: + + - _Workspace_Handler_initialization() + +concepts: + + - Provoke the INTERNAL_ERROR_NO_MEMORY_FOR_PER_CPU_DATA fatal error. diff --git a/testsuites/smptests/smpfatal09/smpfatal09.scn b/testsuites/smptests/smpfatal09/smpfatal09.scn new file mode 100644 index 0000000000..9ef7cb38f0 --- /dev/null +++ b/testsuites/smptests/smpfatal09/smpfatal09.scn @@ -0,0 +1,7 @@ +*** BEGIN OF TEST SMPFATAL 9 *** +*** TEST VERSION: 5.0.0.cfa82b34b0c53ab4e3d84dd8ab5225793d48fcd0 +*** TEST STATE: EXPECTED-PASS +*** TEST BUILD: RTEMS_SMP +*** TEST TOOLS: 7.4.0 20181206 (RTEMS 5, RSB ddba5372522da341fa20b2c75dfe966231cb6790, Newlib df6915f029ac9acd2b479ea898388cbd7dda4974) + +*** END OF TEST SMPFATAL 9 *** -- cgit v1.2.3