Update examples and ci

Rust-for-Linux · Mar 16, 2021 · 17ed16f · 17ed16f
1 parent 0e198e7
commit 17ed16f
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -156,7 +156,7 @@ jobs:
       # Run
       - run: ${{ env.BUILD_DIR }}usr/gen_init_cpio .github/workflows/qemu-initramfs.desc > qemu-initramfs.img
 
-      - run: qemu-system-${{ env.QEMU_ARCH }} -kernel ${{ env.BUILD_DIR }}${{ env.IMAGE_PATH }} -initrd qemu-initramfs.img -M ${{ env.QEMU_MACHINE }} -cpu ${{ env.QEMU_CPU }} -smp 2 -nographic -no-reboot -append '${{ env.QEMU_APPEND }} rust_example.my_i32=123321 rust_example.my_str=🦀mod rust_example_2.my_i32=234432' | tee qemu-stdout.log
+      - run: qemu-system-${{ env.QEMU_ARCH }} -kernel ${{ env.BUILD_DIR }}${{ env.IMAGE_PATH }} -initrd qemu-initramfs.img -M ${{ env.QEMU_MACHINE }} -cpu ${{ env.QEMU_CPU }} -smp 2 -nographic -no-reboot -append '${{ env.QEMU_APPEND }} rust_example.my_i32=123321 rust_example.my_str=🦀mod rust_example_2.my_i32=234432 rust_example_2.my_array=1,2,3' | tee qemu-stdout.log
 
       # Check
       - run: grep -F     '] Rust Example (init)' qemu-stdout.log
@@ -179,6 +179,11 @@ jobs:
       - run: "grep    '\\] \\[3\\]   my_str:     🦀mod\\s*$'           qemu-stdout.log"
       - run: "grep    '\\] \\[4\\]   my_str:     default str val\\s*$' qemu-stdout.log"
 
+      - run: "grep -F     ']   my_array:   [0, 1]'    qemu-stdout.log"
+      - run: "grep -F '] [2]   my_array:   [1, 2, 3]' qemu-stdout.log"
+      - run: "grep -F '] [3]   my_array:   [0, 1]'    qemu-stdout.log"
+      - run: "grep -F '] [4]   my_array:   [1, 2, 3]' qemu-stdout.log"
+
       - run: grep -F '] [3] Rust Example (exit)' qemu-stdout.log
       - run: grep -F '] [4] Rust Example (exit)' qemu-stdout.log
 

diff --git a/.github/workflows/qemu-init.sh b/.github/workflows/qemu-init.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 busybox insmod rust_example_3.ko my_i32=345543 my_str=🦀mod
-busybox insmod rust_example_4.ko my_i32=456654 my_usize=84
+busybox insmod rust_example_4.ko my_i32=456654 my_usize=84 my_array=1,2,3
 busybox  rmmod rust_example_3.ko
 busybox  rmmod rust_example_4.ko
 

diff --git a/drivers/char/rust_example.rs b/drivers/char/rust_example.rs
@@ -43,6 +43,11 @@ module! {
             permissions: 0o644,
             description: b"Example of usize",
         },
+        my_array: ArrayParam<i32, 3> {
+            default: [0, 1],
+            permissions: 0,
+            description: b"Example of array",
+        },
     },
 }
 
@@ -77,6 +82,7 @@ impl KernelModule for RustExample {
                 core::str::from_utf8(my_str.read(&lock))?
             );
             println!("  my_usize:   {}", my_usize.read(&lock));
+            println!("  my_array:   {:?}", my_array.read());
         }
 
         // Test mutexes.

diff --git a/drivers/char/rust_example_2.rs b/drivers/char/rust_example_2.rs
@@ -33,6 +33,11 @@ module! {
             permissions: 0o644,
             description: b"Example of usize",
         },
+        my_array: ArrayParam<i32, 3> {
+            default: [0, 1],
+            permissions: 0,
+            description: b"Example of array",
+        },
     },
 }
 
@@ -54,6 +59,7 @@ impl KernelModule for RustExample2 {
                 core::str::from_utf8(my_str.read(&lock))?
             );
             println!("[2]   my_usize:   {}", my_usize.read(&lock));
+            println!("[2]   my_array:   {:?}", my_array.read());
         }
 
         // Including this large variable on the stack will trigger

diff --git a/drivers/char/rust_example_3.rs b/drivers/char/rust_example_3.rs
@@ -33,6 +33,11 @@ module! {
             permissions: 0o644,
             description: b"Example of usize",
         },
+        my_array: ArrayParam<i32, 3> {
+            default: [0, 1],
+            permissions: 0,
+            description: b"Example of array",
+        },
     },
 }
 
@@ -54,6 +59,7 @@ impl KernelModule for RustExample3 {
                 core::str::from_utf8(my_str.read(&lock))?
             );
             println!("[3]   my_usize:   {}", my_usize.read(&lock));
+            println!("[3]   my_array:   {:?}", my_array.read());
         }
 
         // Including this large variable on the stack will trigger

diff --git a/drivers/char/rust_example_4.rs b/drivers/char/rust_example_4.rs
@@ -33,6 +33,11 @@ module! {
             permissions: 0o644,
             description: b"Example of usize",
         },
+        my_array: ArrayParam<i32, 3> {
+            default: [0, 1],
+            permissions: 0,
+            description: b"Example of array",
+        },
     },
 }
 
@@ -54,6 +59,7 @@ impl KernelModule for RustExample4 {
                 core::str::from_utf8(my_str.read(&lock))?
             );
             println!("[4]   my_usize:   {}", my_usize.read(&lock));
+            println!("[4]   my_array:   {:?}", my_array.read());
         }
 
         // Including this large variable on the stack will trigger