Persistent shared dirs

.github/workflows/release.yml

@@ -144,6 +144,34 @@ jobs:
             git+https://github.com/antmicro/tuttest.git@c44309e0365c54759fb36864fb77bf8b347bd647
           repos: https://github.com/antmicro/pyrav4l2.git pyrav4l2
 
+  riscv64-shared-dirs-test:
+    runs-on: ubuntu-latest
+    needs: send-to-releases
+    if: ${{ !failure() && !github.event.act }}
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: prepare shared dirs
+        run: |
+          mkdir shared_dir shared_dir2
+
+      - name: test
+        uses: ./
+        with:
+          shared-dirs: |
+            shared_dir /home/shared_dir
+            shared_dir2 /home/shared_dir2
+          renode-run: |
+            echo "shared-dirs-test" > shared_dir/f.txt
+            echo "shared-dirs-test2" > shared_dir2/f.txt
+
+      - name: read shared_dirs
+        run: |
+          ls shared_dir
+          cat shared_dir/f.txt
+          ls shared_dir2
+          cat shared_dir2/f.txt
+
   arm32-test:
     runs-on: ubuntu-latest
     needs: send-to-releases

action/device/hifive_unleashed/init.resc

@@ -6,7 +6,10 @@ machine LoadPlatformDescription @action/device/hifive_unleashed/platform.repl
 
 # rootfs
 machine LoadPlatformDescriptionFromString 'virtio: Storage.VirtIOBlockDevice @ sysbus 0x100d0000 { IRQ -> plic@50 }'
-virtio LoadImage @images/rootfs.img
+virtio LoadImage @images/rootfs.img true
+
+# machine LoadPlatformDescriptionFromString 'virtio2: Storage.VirtIOBlockDevice @ sysbus 0x100e0000 { IRQ -> plic@51 }'
+# virtio2 LoadImage @images/persistent.img true
 
 showAnalyzer uart0
 e51 LogFunctionNames true

action/images.py

@@ -196,9 +196,13 @@ def burn_rootfs_image(
         image_size = f'{max(size * 2, 5 * 10**7)}'
     try:
 
-        run(["truncate", "images/rootfs.img", "-s", image_size], check=True)
+        run(["truncate", "images/rootfs.img", "-s", size], check=True)
         run(["mkfs.ext4", "-d", "images/rootfs", "images/rootfs.img"],
             check=True,
             stdout=DEVNULL)
+        # run(["truncate", "images/persistent.img", "-s", "128MB"], check=True)
+        # run(["mkfs.ext4", "images/persistent.img"],
+        #     check=True,
+        #     stdout=DEVNULL)
     except CalledProcessError as e:
         sys.exit(e.returncode)

action/run-in-renode.py

@@ -16,14 +16,17 @@
 from common import get_file, error, archs
 from devices import add_devices
 from dependencies import add_repos, add_packages
-from images import prepare_shared_directories, prepare_kernel_and_initramfs, burn_rootfs_image
+from images import prepare_shared_directories, prepare_kernel_and_initramfs, burn_rootfs_image, shared_directories_actions
 from dispatcher import CommandDispatcher
+from subprocess import run
 
 from datetime import datetime
 
 import sys
 import json
 import yaml
+import shutil
+import os
 
 
 DEFAULT_IMAGE_PATH = "https://github.com/{}/releases/download/{}/image-{}-default.tar.xz"
@@ -146,3 +149,14 @@ def test_task(test_task_str: str):
     dispatcher.add_task(test_task(args.get("renode-run", "")))
 
     dispatcher.evaluate()
+
+    # run(["mkdir", "shared"], check=True)
+    # run(["sudo", "mount", "images/persistent.img", "shared"], check=True)
+    run(["mkdir", "rootfs"], check=True)
+    run(["sudo", "mount", "images/rootfs.img", "rootfs"], check=True)
+
+    for dir in shared_directories_actions:
+        src = f"rootfs/{dir.target}"
+        dst = f"{user_directory}/{dir.host}" if not dir.host.startswith('/') else dir.host
+        if os.path.exists(src):
+            shutil.copytree(src, dst, dirs_exist_ok=True)

action/tasks/save_shared_dirs.yml

@@ -0,0 +1,18 @@
+name: save_shared_dirs
+shell: target
+requires: [action_test]
+echo: true
+timeout: 5
+fail-fast: false
+check-exit-code: false
+commands:
+  # - echo "TEST"
+  # - mkdir -p host_dir
+  # - mount /dev/vdb host_dir
+  # - ls host_dir
+  # - echo "file from Renode" > host_dir/test.txt
+  # - umount host_dir
+  # - pwd
+  # - echo "second file" > test.txt
+  # - ls
+  - umount /dev/vda

kernel/riscv64-hifive_unleashed/patches/linux/0001-linux-dts-patches.patch

@@ -15,7 +15,7 @@ diff --git a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts b/arch/riscv/bo
 index dddabfbbc7a9..15e528335102 100644
 --- a/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
 +++ b/arch/riscv/boot/dts/sifive/hifive-unleashed-a00.dts
-@@ -29,6 +29,12 @@ memory@80000000 {
+@@ -29,6 +29,18 @@ memory@80000000 {
  	};
 
  	soc {
@@ -24,6 +24,12 @@ index dddabfbbc7a9..15e528335102 100644
 +        	reg = <0x00 0x100d0000 0x00 0x150>;
 +        	interrupt-parent = <&plic0>;
 +        	interrupts = <50>;
++    	};
++		virtio@100e0000 {
++        	compatible = "virtio,mmio";
++        	reg = <0x00 0x100e0000 0x00 0x150>;
++        	interrupt-parent = <&plic0>;
++        	interrupts = <51>; 
 +    	};
  	};