Add usize param to examples

Author: adamrk

.github/workflows/ci.yaml

@@ -153,7 +153,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.my_invbool=y 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' | tee qemu-stdout.log
 
       # Check
       - run: grep -F     '] Rust Example (init)' qemu-stdout.log
@@ -166,6 +166,11 @@ jobs:
       - run: "grep -F '] [3]   my_i32:     345543' qemu-stdout.log"
       - run: "grep -F '] [4]   my_i32:     456654' qemu-stdout.log"
 
+      - run: "grep -F     ']   my_usize:   42' qemu-stdout.log"
+      - run: "grep -F '] [2]   my_usize:   42' qemu-stdout.log"
+      - run: "grep -F '] [3]   my_usize:   42' qemu-stdout.log"
+      - run: "grep -F '] [4]   my_usize:   84' qemu-stdout.log"
+
       - run: "grep            '\\]   my_str:     🦀mod\\s*$'           qemu-stdout.log"
       - run: "grep    '\\] \\[2\\]   my_str:     default str val\\s*$' qemu-stdout.log"
       - run: "grep    '\\] \\[3\\]   my_str:     🦀mod\\s*$'           qemu-stdout.log"

.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
+busybox insmod rust_example_4.ko my_i32=456654 my_usize=84
 busybox  rmmod rust_example_3.ko
 busybox  rmmod rust_example_4.ko
 

drivers/char/rust_example.rs

@@ -31,6 +31,11 @@ module! {
             permissions: 0o644,
             description: b"Example of a string param",
         },
+        my_usize: usize {
+            default: 42,
+            permissions: 0o644,
+            description: b"Example of usize",
+        },
     },
 }
 
@@ -63,6 +68,7 @@ impl KernelModule for RustExample {
                 "  my_str:     {}",
                 core::str::from_utf8(my_str.read(&lock))?
             );
+            println!("  my_usize:   {}", my_usize.read(&lock));
         }
 
         // Including this large variable on the stack will trigger

drivers/char/rust_example_2.rs

@@ -28,6 +28,11 @@ module! {
             permissions: 0o644,
             description: b"Example of a string param",
         },
+        my_usize: usize {
+            default: 42,
+            permissions: 0o644,
+            description: b"Example of usize",
+        },
     },
 }
 
@@ -48,6 +53,7 @@ impl KernelModule for RustExample2 {
                 "[2]   my_str:     {}",
                 core::str::from_utf8(my_str.read(&lock))?
             );
+            println!("[2]   my_usize:   {}", my_usize.read(&lock));
         }
 
         // Including this large variable on the stack will trigger

drivers/char/rust_example_3.rs

@@ -28,6 +28,11 @@ module! {
             permissions: 0o644,
             description: b"Example of a string param",
         },
+        my_usize: usize {
+            default: 42,
+            permissions: 0o644,
+            description: b"Example of usize",
+        },
     },
 }
 
@@ -48,6 +53,7 @@ impl KernelModule for RustExample3 {
                 "[3]   my_str:     {}",
                 core::str::from_utf8(my_str.read(&lock))?
             );
+            println!("[3]   my_usize:   {}", my_usize.read(&lock));
         }
 
         // Including this large variable on the stack will trigger

drivers/char/rust_example_4.rs

@@ -28,6 +28,11 @@ module! {
             permissions: 0o644,
             description: b"Example of a string param",
         },
+        my_usize: usize {
+            default: 42,
+            permissions: 0o644,
+            description: b"Example of usize",
+        },
     },
 }
 
@@ -48,6 +53,7 @@ impl KernelModule for RustExample4 {
                 "[4]   my_str:     {}",
                 core::str::from_utf8(my_str.read(&lock))?
             );
+            println!("[4]   my_usize:   {}", my_usize.read(&lock));
         }
 
         // Including this large variable on the stack will trigger