[PATCH 3/3] score: Extend memory dirty/zero actions

Sebastian Huber sebastian.huber at embedded-brains.de
Thu Jul 14 13:13:02 UTC 2022


Dirty or zero also the part of the .noinit section used by RTEMS.
---
 cpukit/include/rtems/score/memory.h     | 14 +++++++-
 cpukit/score/src/memorydirtyfreeareas.c |  9 ++++-
 cpukit/score/src/memorynoinit.c         | 45 +++++++++++++++++++++++++
 cpukit/score/src/memoryzerofreeareas.c  |  9 ++++-
 spec/build/cpukit/librtemscpu.yml       |  1 +
 5 files changed, 75 insertions(+), 3 deletions(-)
 create mode 100644 cpukit/score/src/memorynoinit.c

diff --git a/cpukit/include/rtems/score/memory.h b/cpukit/include/rtems/score/memory.h
index 5761402711..fa17ea164c 100644
--- a/cpukit/include/rtems/score/memory.h
+++ b/cpukit/include/rtems/score/memory.h
@@ -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
diff --git a/cpukit/score/src/memorydirtyfreeareas.c b/cpukit/score/src/memorydirtyfreeareas.c
index fc6c2630bf..8a817c2208 100644
--- a/cpukit/score/src/memorydirtyfreeareas.c
+++ b/cpukit/score/src/memorydirtyfreeareas.c
@@ -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
+  );
 }
diff --git a/cpukit/score/src/memorynoinit.c b/cpukit/score/src/memorynoinit.c
new file mode 100644
index 0000000000..19772356cd
--- /dev/null
+++ b/cpukit/score/src/memorynoinit.c
@@ -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 ];
diff --git a/cpukit/score/src/memoryzerofreeareas.c b/cpukit/score/src/memoryzerofreeareas.c
index 4ea0812426..b1cef47ef9 100644
--- a/cpukit/score/src/memoryzerofreeareas.c
+++ b/cpukit/score/src/memoryzerofreeareas.c
@@ -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
+  );
 }
diff --git a/spec/build/cpukit/librtemscpu.yml b/spec/build/cpukit/librtemscpu.yml
index 31a68cf85a..012a5db141 100644
--- a/spec/build/cpukit/librtemscpu.yml
+++ b/spec/build/cpukit/librtemscpu.yml
@@ -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
-- 
2.35.3



More information about the devel mailing list