Merge branch 'master' into master

Author: alex

.travis.yml

@@ -1,4 +1,7 @@
-sudo: required
+matrix:
+    include:
+        - dist: trusty
+        - dist: xenial
 
 language: rust
 rust:
@@ -21,8 +24,7 @@ install:
       else
           cargo install --force cargo-xbuild
       fi
-    - rustup component add rust-src
-    - rustup component add rustfmt
+    - rustup component add rust-src rustfmt
 
 script:
     - ./tests/run_tests.py

build.rs

@@ -34,13 +34,12 @@ const INCLUDED_VARS: &[&str] = &[
     "KERN_INFO",
     "VERIFY_WRITE",
 ];
-/// These structs must be opaque because they're both packed
-/// and aligned, which is not yet supported by rust. See
-/// https://github.com/rust-lang/rust/issues/59154 and
-/// https://github.com/rust-lang/rust-bindgen/issues/1538
 const OPAQUE_TYPES: &[&str] = &[
-    "^xregs_state$",
-    "^desc_struct$",
+    // 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",
 ];
 
 fn main() {
@@ -58,7 +57,8 @@ fn main() {
             .output()
             .unwrap()
             .stdout,
-    ).unwrap();
+    )
+    .unwrap();
 
     builder = builder.clang_arg("--target=x86_64-linux-kernel-module");
     for arg in shlex::split(&output).unwrap() {

example-sysctl/Makefile

@@ -1,9 +1,10 @@
 obj-m := examplesysctl.o
 examplesysctl-objs := target/x86_64-linux-kernel-module/debug/libexample_sysctl.a
 EXTRA_LDFLAGS += --entry=init_module
+KDIR ?= /lib/modules/$(shell uname -r)/build
 
 all:
-	$(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(CURDIR)
+	$(MAKE) -C $(KDIR) M=$(CURDIR)
 
 clean:
-	$(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) clean
+	$(MAKE) -C $(KDIR) M=$(CURDIR) clean

hello-world/Makefile

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

src/sysctl.rs

@@ -56,6 +56,7 @@ impl SysctlStorage for atomic::AtomicBool {
 
 pub struct Sysctl<T: SysctlStorage> {
     inner: Box<T>,
+    // Responsible for keeping the ctl_table alive.
     _table: Box<[bindings::ctl_table]>,
     header: *mut bindings::ctl_table_header,
 }
@@ -127,7 +128,8 @@ impl<T: SysctlStorage> Sysctl<T> {
                 extra2: ptr::null_mut(),
             },
             unsafe { mem::zeroed() },
-        ].into_boxed_slice();
+        ]
+        .into_boxed_slice();
 
         let result =
             unsafe { bindings::register_sysctl(path.as_ptr() as *const i8, table.as_mut_ptr()) };

static-filesystem/Makefile

@@ -1,9 +1,10 @@
 obj-m := staticfilesystem.o
 staticfilesystem-objs := target/x86_64-linux-kernel-module/debug/libstatic_filesystem.a
 EXTRA_LDFLAGS += --entry=init_module
+KDIR ?= /lib/modules/$(shell uname -r)/build
 
 all:
-	$(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(CURDIR)
+	$(MAKE) -C $(KDIR) M=$(CURDIR)
 
 clean:
-	$(MAKE) -C /lib/modules/$(shell uname -r)/build M=$(CURDIR) clean
+	$(MAKE) -C $(KDIR) M=$(CURDIR) clean

tests/Makefile

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