commit 96edd188f2d900a045561e4af484535180b91f38
author Nils Wistoff <nwistoff@iis.ee.ethz.ch> Fri Oct 09 17:55:25 2020 +0200
committer Kent McLeod <kent-mcleod@users.noreply.github.com> Fri May 14 21:10:40 2021 +1000
tree 2b7b8f588d2b2f63dd431474d002b5682ba4f32b
parent 5bb4d746f05d11521c830d5d9849b5a1903855d9

libsel4utils: Instruction fence after bootstrap

On RISC-V platforms, perform an instruction fence after copying the text
segment into a new vspace. We need to make sure the text segment is
written back from the L1D$ to main memory and visible to the I$.

Signed-off-by: Nils Wistoff <nwistoff@iis.ee.ethz.ch>

libsel4utils/src/vspace/bootstrap.c

diff --git a/libsel4utils/src/vspace/bootstrap.c b/libsel4utils/src/vspace/bootstrap.c
index 07ef5ff..6d9d80b 100644
--- a/libsel4utils/src/vspace/bootstrap.c
+++ b/libsel4utils/src/vspace/bootstrap.c
@@ -459,7 +459,10 @@
 #ifdef CONFIG_ARCH_ARM
         seL4_ARM_Page_Unify_Instruction(dest.capPtr, 0, PAGE_SIZE_4K);
         seL4_ARM_Page_Unify_Instruction(cap, 0, PAGE_SIZE_4K);
-#endif /* CONFIG_ARCH_ARM */
+#elif CONFIG_ARCH_RISCV
+        /* Ensure that the writes to memory that may be executed become visible */
+        asm volatile("fence.i" ::: "memory");
+#endif
 
         /* unmap our copy */
         vspace_unmap_pages(current, dest_addr, 1, seL4_PageBits, VSPACE_PRESERVE);