Fixed build issues for latest rust nightly.

Author: Jason NI (nixin)

Cargo.toml

@@ -7,6 +7,6 @@ authors = ["Alex Gaynor <[email protected]>"]
 bitflags = "1"
 
 [build-dependencies]
-bindgen = "*"
+bindgen = "0.47.3"
 cc = "1.0"
 shlex = "0.1"

hello-world/Cargo.toml

@@ -2,6 +2,7 @@
 name = "hello-world"
 version = "0.1.0"
 authors = ["Geoffrey Thomas <[email protected]>"]
+edition = "2018"
 
 [lib]
 crate-type = ["staticlib"]

hello-world/src/lib.rs

@@ -3,7 +3,8 @@
 
 extern crate alloc;
 use alloc::borrow::ToOwned;
-use alloc::String;
+//use alloc::String;
+use alloc::string::String;
 
 #[macro_use]
 extern crate linux_kernel_module;

src/allocator.rs

@@ -1,4 +1,4 @@
-use core::alloc::{AllocErr, GlobalAlloc, Layout};
+use core::alloc::{GlobalAlloc, Layout};
 
 use bindings;
 use c_types;
@@ -22,6 +22,6 @@ unsafe impl GlobalAlloc for KernelAllocator {
 }
 
 #[lang = "oom"]
-extern "C" fn oom(_err: AllocErr) -> ! {
-    panic!("Out of memory!");
+extern "C" fn oom(layout: Layout) -> ! {
+    panic!("Out of memory! {}", layout.size());
 }

src/filesystem.rs

@@ -6,6 +6,7 @@ use core::mem;
 use bindings;
 use c_types;
 use error;
+use println;
 
 pub struct FileSystemRegistration<T: FileSystem> {
     _phantom: marker::PhantomData<T>,
@@ -58,6 +59,7 @@ extern "C" fn mount_callback<T: FileSystem>(
     _dev_name: *const c_types::c_char,
     data: *mut c_types::c_void,
 ) -> *mut bindings::dentry {
+    println!("==== {:?} - {:?}", fs_type, flags);
     unsafe { bindings::mount_nodev(fs_type, flags, data, Some(fill_super_callback::<T>)) }
 }
 

src/lib.rs

@@ -1,5 +1,5 @@
 #![no_std]
-#![feature(alloc, allocator_api, const_fn, lang_items, panic_implementation)]
+#![feature(alloc, allocator_api, const_fn, lang_items)]
 
 #[macro_use]
 extern crate alloc;
@@ -66,15 +66,15 @@ macro_rules! kernel_module {
     };
 }
 
-pub trait KernelModule: Sized + Sync {
+pub trait KernelModule: Sized  {
     fn init() -> KernelResult<Self>;
 }
 
 extern "C" {
     fn bug_helper() -> !;
 }
 
-#[panic_implementation]
+#[panic_handler]
 fn panic(_info: &PanicInfo) -> ! {
     unsafe {
         bug_helper();

src/printk.rs

@@ -44,18 +44,22 @@ impl fmt::Write for LogLineWriter {
     }
 }
 
-#[macro_export]
-macro_rules! println {
-    () => ({
-        $crate::printk::printk("\n".as_bytes());
-    });
-    ($fmt:expr) => ({
-        $crate::printk::printk(concat!($fmt, "\n").as_bytes());
-    });
-    ($fmt:expr, $($arg:tt)*) => ({
-        use ::core::fmt;
-        let mut writer = $crate::printk::LogLineWriter::new();
-        let _ = fmt::write(&mut writer, format_args!(concat!($fmt, "\n"), $($arg)*)).unwrap();
-        $crate::printk::printk(writer.as_bytes());
-    });
+#[macro_use]
+mod printk {
+
+    #[macro_export]
+    macro_rules! println {
+        () => ({
+            $crate::printk::printk("\n".as_bytes());
+        });
+        ($fmt:expr) => ({
+            $crate::printk::printk(concat!($fmt, "\n").as_bytes());
+        });
+        ($fmt:expr, $($arg:tt)*) => ({
+            use ::core::fmt;
+            let mut writer = $crate::printk::LogLineWriter::new();
+            let _ = fmt::write(&mut writer, format_args!(concat!($fmt, "\n"), $($arg)*)).unwrap();
+            $crate::printk::printk(writer.as_bytes());
+        });
+    }
 }

x86_64-linux-kernel-module.json

@@ -22,6 +22,7 @@
       "-m64"
     ]
   },
+  "needs-plt": true,
   "relocation-model": "static",
   "relro-level": "full",
   "target-c-int-width": "32",