Commit 455cdcb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rust-6.7' of https://github.com/Rust-for-Linux/linux 

Pull rust updates from Miguel Ojeda:
 "A small one compared to the previous one in terms of features. In
  terms of lines, as usual, the 'alloc' version upgrade accounts for
  most of them.

  Toolchain and infrastructure:

   - Upgrade to Rust 1.73.0

     This time around, due to how the kernel and Rust schedules have
     aligned, there are two upgrades in fact. They contain the fixes for
     a few issues we reported to the Rust project.

     In addition, a few cleanups indicated by the upgraded compiler or
     possible thanks to it. For instance, the compiler now detects
     redundant explicit links.

   - A couple changes to the Rust 'Makefile' so that it can be used with
     toybox tools, allowing Rust to be used in the Android kernel build.

  x86:

   - Enable IBT if enabled in C

  Documentation:

   - Add "The Rust experiment" section to the Rust index page

  MAINTAINERS:

   - Add Maintainer Entry Profile field ('P:').

   - Update our 'W:' field to point to the webpage we have been building
     this year"

* tag 'rust-6.7' of https://github.com/Rust-for-Linux/linux:
  docs: rust: add "The Rust experiment" section
  x86: Enable IBT in Rust if enabled in C
  rust: Use grep -Ev rather than relying on GNU grep
  rust: Use awk instead of recent xargs
  rust: upgrade to Rust 1.73.0
  rust: print: use explicit link in documentation
  rust: task: remove redundant explicit link
  rust: kernel: remove `#[allow(clippy::new_ret_no_self)]`
  MAINTAINERS: add Maintainer Entry Profile field for Rust
  MAINTAINERS: update Rust webpage
  rust: upgrade to Rust 1.72.1
  rust: arc: add explicit `drop()` around `Box::from_raw()`
parents 2b93c2c3 3857af38

Documentation/process/changes.rst

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ you probably needn't concern yourself with pcmciautils. 
====================== ===============  ========================================

GNU C                  5.1              gcc --version

Clang/LLVM (optional)  11.0.0           clang --version

Rust (optional)        1.71.1           rustc --version

Rust (optional)        1.73.0           rustc --version

bindgen (optional)     0.65.1           bindgen --version

GNU make               3.82             make --version

bash                   4.2              bash --version

Documentation/rust/index.rst

+19 −0
Original line number Diff line number Diff line
@@ -6,6 +6,25 @@ Rust 
Documentation related to Rust within the kernel. To start using Rust

in the kernel, please read the quick-start.rst guide.





The Rust experiment

-------------------



The Rust support was merged in v6.1 into mainline in order to help in

determining whether Rust as a language was suitable for the kernel, i.e. worth

the tradeoffs.



Currently, the Rust support is primarily intended for kernel developers and

maintainers interested in the Rust support, so that they can start working on

abstractions and drivers, as well as helping the development of infrastructure

and tools.



If you are an end user, please note that there are currently no in-tree

drivers/modules suitable or intended for production use, and that the Rust

support is still in development/experimental, especially for certain kernel

configurations.





.. only:: rustdoc and html



	You can also browse `rustdoc documentation <rustdoc/kernel/index.html>`_.

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -18734,9 +18734,10 @@ R: Andreas Hindborg <a.hindborg@samsung.com> 
R:	Alice Ryhl <aliceryhl@google.com>

L:	rust-for-linux@vger.kernel.org

S:	Supported

W:	https://github.com/Rust-for-Linux/linux

W:	https://rust-for-linux.com

B:	https://github.com/Rust-for-Linux/linux/issues

C:	zulip://rust-for-linux.zulipchat.com

P:	https://rust-for-linux.com/contributing

T:	git https://github.com/Rust-for-Linux/linux.git rust-next

F:	Documentation/rust/

F:	rust/

arch/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ ifeq ($(CONFIG_X86_KERNEL_IBT),y) 
#   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104816

#

KBUILD_CFLAGS += $(call cc-option,-fcf-protection=branch -fno-jump-tables)

KBUILD_RUSTFLAGS += -Zcf-protection=branch -Zno-jump-tables

else

KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)

endif

rust/Makefile

+3 −5
Original line number Diff line number Diff line
@@ -336,13 +336,13 @@ quiet_cmd_bindgen = BINDGEN $@ 
		$(bindgen_target_cflags) $(bindgen_target_extra)



$(obj)/bindings/bindings_generated.rs: private bindgen_target_flags = \

    $(shell grep -v '^#\|^$$' $(srctree)/$(src)/bindgen_parameters)

    $(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters)

$(obj)/bindings/bindings_generated.rs: $(src)/bindings/bindings_helper.h \

    $(src)/bindgen_parameters FORCE

	$(call if_changed_dep,bindgen)



$(obj)/uapi/uapi_generated.rs: private bindgen_target_flags = \

    $(shell grep -v '^#\|^$$' $(srctree)/$(src)/bindgen_parameters)

    $(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters)

$(obj)/uapi/uapi_generated.rs: $(src)/uapi/uapi_helper.h \

    $(src)/bindgen_parameters FORCE

	$(call if_changed_dep,bindgen)
@@ -364,9 +364,7 @@ $(obj)/bindings/bindings_helpers_generated.rs: $(src)/helpers.c FORCE 
quiet_cmd_exports = EXPORTS $@

      cmd_exports = \

	$(NM) -p --defined-only $< \

		| grep -E ' (T|R|D) ' | cut -d ' ' -f 3 \

		| xargs -Isymbol \

		echo 'EXPORT_SYMBOL_RUST_GPL(symbol);' > $@

		| awk '/ (T|R|D) / {printf "EXPORT_SYMBOL_RUST_GPL(%s);\n",$$3}' > $@



$(obj)/exports_core_generated.h: $(obj)/core.o FORCE

	$(call if_changed,exports)