score: Extend memory dirty/zero actions

Dirty or zero also the part of the .noinit section used by RTEMS.

Close #4678.
This commit is contained in:
Sebastian Huber
2022-07-14 15:06:02 +02:00
parent 4b911a7516
commit 1bf878f7ff
6 changed files with 117 additions and 9 deletions

View File

@@ -10,7 +10,7 @@
/*
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2019 embedded brains GmbH
* Copyright (C) 2019, 2022 embedded brains GmbH
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -352,6 +352,18 @@ void _Memory_Zero_free_areas( void );
*/
void _Memory_Dirty_free_areas( void );
/**
* @brief This symbol marks the begin of the non-initialized section used by
* RTEMS.
*/
extern char _Memory_Noinit_begin[];
/**
* @brief This symbol marks the end of the non-initialized section used by
* RTEMS.
*/
extern char _Memory_Noinit_end[];
/** @} */
#ifdef __cplusplus

View File

@@ -10,7 +10,7 @@
/*
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2020 embedded brains GmbH
* Copyright (C) 2020, 2022 embedded brains GmbH
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -40,7 +40,14 @@
#include <rtems/score/memory.h>
#include <string.h>
void _Memory_Dirty_free_areas( void )
{
_Memory_Fill( _Memory_Get(), 0xcf );
memset(
_Memory_Noinit_begin,
0xcf,
(uintptr_t) _Memory_Noinit_end - (uintptr_t) _Memory_Noinit_begin
);
}

View File

@@ -0,0 +1,45 @@
/**
* @file
*
* @ingroup RTEMSScoreMemory
*
* @brief This source file contains the definition of ::_Memory_Noinit_begin
* and ::_Memory_Noinit_end.
*/
/*
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2022 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 <rtems/score/memory.h>
RTEMS_SECTION( ".noinit.rtems.begin" ) char _Memory_Noinit_begin[ 0 ];
RTEMS_SECTION( ".noinit.rtems.end" ) char _Memory_Noinit_end[ 0 ];

View File

@@ -10,7 +10,7 @@
/*
* SPDX-License-Identifier: BSD-2-Clause
*
* Copyright (C) 2020 embedded brains GmbH
* Copyright (C) 2020, 2022 embedded brains GmbH
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -40,7 +40,14 @@
#include <rtems/score/memory.h>
#include <string.h>
void _Memory_Zero_free_areas( void )
{
_Memory_Fill( _Memory_Get(), 0 );
memset(
_Memory_Noinit_begin,
0,
(uintptr_t) _Memory_Noinit_end - (uintptr_t) _Memory_Noinit_begin
);
}

View File

@@ -1435,6 +1435,7 @@ source:
- cpukit/score/src/memoryallocate.c
- cpukit/score/src/memorydirtyfreeareas.c
- cpukit/score/src/memoryfill.c
- cpukit/score/src/memorynoinit.c
- cpukit/score/src/memoryzerobeforeuse.c
- cpukit/score/src/memoryzerofreeareas.c
- cpukit/score/src/mutex.c

View File

@@ -37,6 +37,10 @@
#include "config.h"
#endif
#include <rtems/sysinit.h>
#include <rtems/score/memory.h>
#include <rtems/score/thread.h>
#include <tmacros.h>
const char rtems_test_name[] = "SP 54";
@@ -48,12 +52,6 @@ static void *Init( uintptr_t ignored )
rtems_id id;
const rtems_api_configuration_table *config;
/*
* It is possible that since this thread prints and there is no idle
* task, that the system could fail miserably. :(
*/
TEST_BEGIN();
puts( "Init - use valid id of API class with no objects" );
status = rtems_task_set_priority(
rtems_build_id(0x2,0x1,0x01,0x0001) /* 0xa010001 */,
@@ -80,6 +78,44 @@ static void *Init( uintptr_t ignored )
rtems_test_exit(0);
}
static void check_dirty_memory( void )
{
unsigned char *p;
TEST_BEGIN();
p = _Memory_Allocate( _Memory_Get(), sizeof( *p ), RTEMS_ALIGNOF( *p ) );
rtems_test_assert( p != NULL );
rtems_test_assert( *p == 0xcf );
p = (unsigned char *) _Thread_Information.Objects.local_table;
rtems_test_assert( *p == 0xcf );
}
RTEMS_SYSINIT_ITEM(
check_dirty_memory,
RTEMS_SYSINIT_DIRTY_MEMORY,
RTEMS_SYSINIT_ORDER_LAST
);
static void check_zero_workspace_automatically( void )
{
unsigned char *p;
p = _Memory_Allocate( _Memory_Get(), sizeof( *p ), RTEMS_ALIGNOF( *p ) );
rtems_test_assert( p != NULL );
rtems_test_assert( *p == 0 );
p = (unsigned char *) _Thread_Information.Objects.local_table;
rtems_test_assert( *p == 0 );
}
RTEMS_SYSINIT_ITEM(
check_zero_workspace_automatically,
RTEMS_SYSINIT_ZERO_MEMORY,
RTEMS_SYSINIT_ORDER_LAST
);
/* configuration information */
#define CONFIGURE_APPLICATION_NEEDS_SIMPLE_CONSOLE_DRIVER