Fixed invalid module format & recent nightly support

.travis.yml

@@ -1,6 +1,5 @@
 matrix:
     include:
-        - dist: trusty
         - dist: xenial
 
 language: rust
@@ -34,3 +33,4 @@ after_failure:
 
 notifications:
     email: false
+

build.rs

@@ -38,6 +38,7 @@ const OPAQUE_TYPES: &[&str] = &[
     // This needs to be opaque because it's both packed and aligned, which rustc
     // doesn't support yet. See https://github.com/rust-lang/rust/issues/59154
     // and https://github.com/rust-lang/rust-bindgen/issues/1538
+    "desc_struct",
     "xregs_state",
 ];
 
@@ -59,6 +60,7 @@ fn main() {
     )
     .unwrap();
 
+    builder = builder.clang_arg("--target=x86_64-linux-kernel-module");
     for arg in shlex::split(&output).unwrap() {
         builder = builder.clang_arg(arg.to_string());
     }
@@ -88,6 +90,7 @@ fn main() {
     let mut builder = cc::Build::new();
     println!("cargo:rerun-if-env-changed=CLANG");
     builder.compiler(env::var("CLANG").unwrap_or("clang".to_string()));
+    builder.target("x86_64-linux-kernel-module");
     builder.warnings(false);
     builder.file("src/helpers.c");
     for arg in shlex::split(&output).unwrap() {

hello-world/Makefile

@@ -1,10 +1,16 @@
+ifneq ($(KERNELRELEASE),)
 obj-m := helloworld.o
-helloworld-objs := target/x86_64-linux-kernel-module/debug/libhello_world.a
+helloworld-objs := libhello_world.o
 EXTRA_LDFLAGS += --entry=init_module
+
+$(M)/libhello_world.o: target/x86_64-linux-kernel-module/debug/libhello_world.a
+	$(LD) -r -o $@ --whole-archive $^
+else
 KDIR ?= /lib/modules/$(shell uname -r)/build
 
 all:
 	$(MAKE) -C $(KDIR) M=$(CURDIR)
 
 clean:
 	$(MAKE) -C $(KDIR) M=$(CURDIR) clean
+endif

hello-world/src/lib.rs

@@ -1,9 +1,9 @@
 #![no_std]
-#![feature(alloc)]
+#![feature(alloc, const_str_as_bytes)]
 
 extern crate alloc;
 use alloc::borrow::ToOwned;
-use alloc::String;
+use alloc::string::String;
 
 #[macro_use]
 extern crate linux_kernel_module;
@@ -27,6 +27,7 @@ impl Drop for HelloWorldModule {
         println!("Goodbye kernel module!");
     }
 }
+
 kernel_module!(
     HelloWorldModule,
     author: "Alex Gaynor and Geoffrey Thomas",

src/allocator.rs

@@ -22,6 +22,6 @@ unsafe impl GlobalAlloc for KernelAllocator {
 }
 
 #[alloc_error_handler]
-extern "C" fn oom(_layout: Layout) -> ! {
+fn oom(_layout: Layout) -> ! {
     panic!("Out of memory!");
 }

src/lib.rs

@@ -60,9 +60,9 @@ macro_rules! kernel_module {
         #[link_section = ".modinfo"]
         #[allow(non_upper_case_globals)]
         // TODO: Generate a name the same way the kernel's `__MODULE_INFO` does.
-        // TODO: This needs to be a `&'static [u8]`, since the kernel defines this as a
-        // `const char []`.
-        pub static $name: &'static str = concat!(stringify!($name), "=", $value);
+        // TODO: This needs to be a `[u8; _]`, since the kernel defines this as a  `const char []`.
+        // See https://github.com/rust-lang/rfcs/pull/2545
+        pub static $name: &'static [u8] = concat!(stringify!($name), "=", $value, '\0').as_bytes();
     };
 }
 

tests/Makefile

@@ -1,10 +1,16 @@
+ifneq ($(KERNELRELEASE),)
 obj-m := testmodule.o
-testmodule-objs := $(TEST_LIBRARY)
+testmodule-objs := $(TEST_LIBRARY_OBJECT)
 EXTRA_LDFLAGS += --entry=init_module
+
+$(M)/$(TEST_LIBRARY_OBJECT): target/x86_64-linux-kernel-module/debug/$(TEST_LIBRARY_ARCHIVE)
+	$(LD) -r -o $@ --whole-archive $^
+else
 KDIR ?= /lib/modules/$(shell uname -r)/build
 
 all:
 	$(MAKE) -C $(KDIR) M=$(CURDIR)
 
 clean:
 	$(MAKE) -C $(KDIR) M=$(CURDIR) clean
+endif

tests/printk/src/lib.rs

@@ -1,4 +1,5 @@
 #![no_std]
+#![feature(const_str_as_bytes)]
 
 #[macro_use]
 extern crate linux_kernel_module;

tests/run_tests.py

@@ -46,14 +46,13 @@ def main():
                 path
             )
         )
+        library_path, _ = os.path.splitext(os.path.basename(module))
+        library_object = library_path + ".o"
+        library_archive = library_path + ".a"
         run(
             "make", "-C", BASE_DIR,
-            "TEST_LIBRARY={}".format(
-                os.path.join(
-                    "target/x86_64-linux-kernel-module/debug/",
-                    os.path.basename(module)
-                )
-            ),
+            "TEST_LIBRARY_OBJECT={}".format(library_object),
+            "TEST_LIBRARY_ARCHIVE={}".format(library_archive),
         )
         run(
             "rustc",

tests/sysctl/src/lib.rs

@@ -1,4 +1,5 @@
 #![no_std]
+#![feature(const_str_as_bytes)]
 
 use core::sync::atomic::AtomicBool;
 

x86_64-linux-kernel-module.json

@@ -24,6 +24,7 @@
   },
   "relocation-model": "static",
   "relro-level": "full",
+  "needs-plt": true,
   "target-c-int-width": "32",
   "target-endian": "little",
   "target-family": "unix",