Add SMP-specifc SMP_FATAL_MULTITASKING_START_ON_NOT_ONLINE_PROCESSOR fatal error. This fatal error helps to diagnose a broken SMP startup sequence. Without this error a context switch using the NULL pointer for the thread control block happens which may be difficult to debug. --- cpukit/include/rtems/score/smpimpl.h | 3 +- cpukit/score/src/smp.c | 5 + .../fatal-start-on-not-online-processor.yml | 21 +++ spec/build/testsuites/validation/grp.yml | 2 + .../tr-fatal-start-on-not-online-processor.c | 167 ++++++++++++++++++ .../tr-fatal-start-on-not-online-processor.h | 84 +++++++++ .../ts-fatal-start-on-not-online-processor.c | 82 +++++++++ 7 files changed, 363 insertions(+), 1 deletion(-) create mode 100644 spec/build/testsuites/validation/fatal-start-on-not-online-processor.yml create mode 100644 testsuites/validation/tr-fatal-start-on-not-online-processor.c create mode 100644 testsuites/validation/tr-fatal-start-on-not-online-processor.h create mode 100644 testsuites/validation/ts-fatal-start-on-not-online-processor.c
diff --git a/cpukit/include/rtems/score/smpimpl.h b/cpukit/include/rtems/score/smpimpl.h index e67c0953e6..8e965968a1 100644 --- a/cpukit/include/rtems/score/smpimpl.h +++ b/cpukit/include/rtems/score/smpimpl.h @@ -92,7 +92,8 @@ typedef enum { SMP_FATAL_START_OF_MANDATORY_PROCESSOR_FAILED, SMP_FATAL_SCHEDULER_PIN_OR_UNPIN_NOT_SUPPORTED, SMP_FATAL_WRONG_CPU_STATE_TO_PERFORM_JOBS, - SMP_FATAL_SCHEDULER_REQUIRES_EXACTLY_ONE_PROCESSOR + SMP_FATAL_SCHEDULER_REQUIRES_EXACTLY_ONE_PROCESSOR, + SMP_FATAL_MULTITASKING_START_ON_NOT_ONLINE_PROCESSOR } SMP_Fatal_code; /** diff --git a/cpukit/score/src/smp.c b/cpukit/score/src/smp.c index 0dc8830c46..7c068f3c51 100644 --- a/cpukit/score/src/smp.c +++ b/cpukit/score/src/smp.c @@ -269,6 +269,11 @@ void _SMP_Start_multitasking_on_secondary_processor( _Per_CPU_Set_state( cpu_self, PER_CPU_STATE_READY_TO_START_MULTITASKING ); _SMP_Wait_for_start_multitasking( cpu_self ); + + if ( !_Per_CPU_Is_processor_online( cpu_self ) ) { + _SMP_Fatal( SMP_FATAL_MULTITASKING_START_ON_NOT_ONLINE_PROCESSOR ); + } + _Thread_Start_multitasking(); } diff --git a/spec/build/testsuites/validation/fatal-start-on-not-online-processor.yml b/spec/build/testsuites/validation/fatal-start-on-not-online-processor.yml new file mode 100644 index 0000000000..7858041843 --- /dev/null +++ b/spec/build/testsuites/validation/fatal-start-on-not-online-processor.yml @@ -0,0 +1,21 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +build-type: test-program +cflags: [] +copyrights: +- Copyright (C) 2022 embedded brains GmbH (http://www.embedded-brains.de) +cppflags: [] +cxxflags: [] +enabled-by: RTEMS_SMP +features: c cprogram +includes: [] +ldflags: +- -Wl,-wrap=_CPU_SMP_Start_processor +links: [] +source: +- testsuites/validation/tr-fatal-start-on-not-online-processor.c +- testsuites/validation/ts-fatal-start-on-not-online-processor.c +stlib: [] +target: testsuites/validation/ts-fatal-start-on-not-online-processor.exe +type: build +use-after: [] +use-before: [] diff --git a/spec/build/testsuites/validation/grp.yml b/spec/build/testsuites/validation/grp.yml index c26d5ac9e7..c1ccd4c697 100644 --- a/spec/build/testsuites/validation/grp.yml +++ b/spec/build/testsuites/validation/grp.yml @@ -38,6 +38,8 @@ links: uid: fatal-smp - role: build-dependency uid: fatal-start-of-mandatory-processor-failed +- role: build-dependency + uid: fatal-start-on-not-online-processor - role: build-dependency uid: fatal-too-large-tls-size - role: build-dependency diff --git a/testsuites/validation/tr-fatal-start-on-not-online-processor.c b/testsuites/validation/tr-fatal-start-on-not-online-processor.c new file mode 100644 index 0000000000..55081bc25d --- /dev/null +++ b/testsuites/validation/tr-fatal-start-on-not-online-processor.c @@ -0,0 +1,167 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSTestCaseScoreSmpValFatalStartOnNotOnlineProcessor + */ + +/* + * Copyright (C) 2022 embedded brains GmbH (http://www.embedded-brains.de) + * + * 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. + */ + +/* + * This file is part of the RTEMS quality process and was automatically + * generated. If you find something that needs to be fixed or + * worded better please post a report or patch to an RTEMS mailing list + * or raise a bug report: + * + * https://www.rtems.org/bugs.html + * + * For information on updating and regenerating please refer to the How-To + * section in the Software Requirements Engineering chapter of the + * RTEMS Software Engineering manual. The manual is provided as a part of + * a release. For development sources please refer to the online + * documentation at: + * + * https://docs.rtems.org + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <rtems/score/smpimpl.h> + +#include "tr-fatal-start-on-not-online-processor.h" + +#include <rtems/test.h> + +/** + * @defgroup RTEMSTestCaseScoreSmpValFatalStartOnNotOnlineProcessor \ + * spec:/score/smp/val/fatal-start-on-not-online-processor + * + * @ingroup RTEMSTestSuiteTestsuitesFatalStartOnNotOnlineProcessor + * + * @brief Tests a fatal error. + * + * This test case performs the following actions: + * + * - The test action is carried out by the wrapped _CPU_SMP_Start_processor(). + * + * - Check that the expected fatal source is present. + * + * - Check that the expected fatal code is present. + * + * @{ + */ + +/** + * @brief Test context for + * spec:/score/smp/val/fatal-start-on-not-online-processor test case. + */ +typedef struct { + /** + * @brief This member contains a copy of the corresponding + * ScoreSmpValFatalStartOnNotOnlineProcessor_Run() parameter. + */ + rtems_fatal_source source; + + /** + * @brief This member contains a copy of the corresponding + * ScoreSmpValFatalStartOnNotOnlineProcessor_Run() parameter. + */ + rtems_fatal_code code; +} ScoreSmpValFatalStartOnNotOnlineProcessor_Context; + +static ScoreSmpValFatalStartOnNotOnlineProcessor_Context + ScoreSmpValFatalStartOnNotOnlineProcessor_Instance; + +bool __real__CPU_SMP_Start_processor( uint32_t cpu_index ); + +bool __wrap__CPU_SMP_Start_processor( uint32_t cpu_index ); + +bool __wrap__CPU_SMP_Start_processor( uint32_t cpu_index ) +{ + (void) __real__CPU_SMP_Start_processor( cpu_index ); + return false; +} + +static T_fixture ScoreSmpValFatalStartOnNotOnlineProcessor_Fixture = { + .setup = NULL, + .stop = NULL, + .teardown = NULL, + .scope = NULL, + .initial_context = &ScoreSmpValFatalStartOnNotOnlineProcessor_Instance +}; + +/** + * @brief The test action is carried out by the wrapped + * _CPU_SMP_Start_processor(). + */ +static void ScoreSmpValFatalStartOnNotOnlineProcessor_Action_0( + ScoreSmpValFatalStartOnNotOnlineProcessor_Context *ctx +) +{ + /* Nothing to do */ + + /* + * Check that the expected fatal source is present. + */ + T_step_eq_int( 0, ctx->source, RTEMS_FATAL_SOURCE_SMP ); + + /* + * Check that the expected fatal code is present. + */ + T_step_eq_ulong( + 1, + ctx->code, + SMP_FATAL_MULTITASKING_START_ON_NOT_ONLINE_PROCESSOR + ); +} + +void ScoreSmpValFatalStartOnNotOnlineProcessor_Run( + rtems_fatal_source source, + rtems_fatal_code code +) +{ + ScoreSmpValFatalStartOnNotOnlineProcessor_Context *ctx; + + ctx = &ScoreSmpValFatalStartOnNotOnlineProcessor_Instance; + ctx->source = source; + ctx->code = code; + + ctx = T_case_begin( + "ScoreSmpValFatalStartOnNotOnlineProcessor", + &ScoreSmpValFatalStartOnNotOnlineProcessor_Fixture + ); + + T_plan( 2 ); + + ScoreSmpValFatalStartOnNotOnlineProcessor_Action_0( ctx ); + + T_case_end(); +} + +/** @} */ diff --git a/testsuites/validation/tr-fatal-start-on-not-online-processor.h b/testsuites/validation/tr-fatal-start-on-not-online-processor.h new file mode 100644 index 0000000000..65a8a308f7 --- /dev/null +++ b/testsuites/validation/tr-fatal-start-on-not-online-processor.h @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSTestCaseScoreSmpValFatalStartOnNotOnlineProcessor + */ + +/* + * Copyright (C) 2022 embedded brains GmbH (http://www.embedded-brains.de) + * + * 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. + */ + +/* + * This file is part of the RTEMS quality process and was automatically + * generated. If you find something that needs to be fixed or + * worded better please post a report or patch to an RTEMS mailing list + * or raise a bug report: + * + * https://www.rtems.org/bugs.html + * + * For information on updating and regenerating please refer to the How-To + * section in the Software Requirements Engineering chapter of the + * RTEMS Software Engineering manual. The manual is provided as a part of + * a release. For development sources please refer to the online + * documentation at: + * + * https://docs.rtems.org + */ + +#ifndef _TR_FATAL_START_ON_NOT_ONLINE_PROCESSOR_H +#define _TR_FATAL_START_ON_NOT_ONLINE_PROCESSOR_H + +#include <rtems.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @addtogroup RTEMSTestCaseScoreSmpValFatalStartOnNotOnlineProcessor + * + * @{ + */ + +/** + * @brief Runs the parameterized test case. + * + * @param source is fatal source. + * + * @param code is fatal code. + */ +void ScoreSmpValFatalStartOnNotOnlineProcessor_Run( + rtems_fatal_source source, + rtems_fatal_code code +); + +/** @} */ + +#ifdef __cplusplus +} +#endif + +#endif /* _TR_FATAL_START_ON_NOT_ONLINE_PROCESSOR_H */ diff --git a/testsuites/validation/ts-fatal-start-on-not-online-processor.c b/testsuites/validation/ts-fatal-start-on-not-online-processor.c new file mode 100644 index 0000000000..9e046bbde1 --- /dev/null +++ b/testsuites/validation/ts-fatal-start-on-not-online-processor.c @@ -0,0 +1,82 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ + +/** + * @file + * + * @ingroup RTEMSTestSuiteTestsuitesFatalStartOnNotOnlineProcessor + */ + +/* + * Copyright (C) 2022 embedded brains GmbH (http://www.embedded-brains.de) + * + * 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. + */ + +/* + * This file is part of the RTEMS quality process and was automatically + * generated. If you find something that needs to be fixed or + * worded better please post a report or patch to an RTEMS mailing list + * or raise a bug report: + * + * https://www.rtems.org/bugs.html + * + * For information on updating and regenerating please refer to the How-To + * section in the Software Requirements Engineering chapter of the + * RTEMS Software Engineering manual. The manual is provided as a part of + * a release. For development sources please refer to the online + * documentation at: + * + * https://docs.rtems.org + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "tr-fatal-start-on-not-online-processor.h" +#include "ts-config.h" + +#include <rtems/test.h> + +/** + * @defgroup RTEMSTestSuiteTestsuitesFatalStartOnNotOnlineProcessor \ + * spec:/testsuites/fatal-start-on-not-online-processor + * + * @ingroup RTEMSTestSuites + * + * @brief This validation test suite contains a test case which triggers a + * fatal error during system initialization. + * + * @{ + */ + +const char rtems_test_name[] = "FatalStartOnNotOnlineProcessor"; + +#define FATAL_SYSINIT_RUN ScoreSmpValFatalStartOnNotOnlineProcessor_Run + +#define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER + +#define CONFIGURE_MAXIMUM_PROCESSORS 2 + +#include "ts-fatal-sysinit.h" + +/** @} */ -- 2.34.1 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel