Skip to content
Snippets Groups Projects
  1. Oct 19, 2023
  2. Oct 15, 2023
  3. Oct 14, 2023
  4. Oct 12, 2023
  5. Oct 05, 2023
  6. Sep 25, 2023
  7. Aug 21, 2023
  8. Aug 20, 2023
  9. Aug 14, 2023
    • Aakash Sen Sharma's avatar
      rust: bindgen: upgrade to 0.65.1 · 08ab7865
      Aakash Sen Sharma authored
      In LLVM 16, anonymous items may return names like `(unnamed union at ..)`
      rather than empty names [1], which breaks Rust-enabled builds because
      bindgen assumed an empty name instead of detecting them via
      `clang_Cursor_isAnonymous` [2]:
      
          $ make rustdoc LLVM=1 CLIPPY=1 -j$(nproc)
            RUSTC L rust/core.o
            BINDGEN rust/bindings/bindings_generated.rs
            BINDGEN rust/bindings/bindings_helpers_generated.rs
            BINDGEN rust/uapi/uapi_generated.rs
          thread 'main' panicked at '"ftrace_branch_data_union_(anonymous_at__/_/include/linux/compiler_types_h_146_2)" is not a valid Ident', .../proc-macro2-1.0.24/src/fallback.rs:693:9
          ...
          thread 'main' panicked at '"ftrace_branch_data_union_(anonymous_at__/_/include/linux/compiler_types_h_146_2)" is not a valid Ident', .../proc-macro2-1.0.24/src/fallback.rs:693:9
          ...
      
      This was fixed in bindgen 0.62.0. Therefore, upgrade bindgen to
      a more recent version, 0.65.1, to support LLVM 16.
      
      Since bindgen 0.58.0 changed the `--{white,black}list-*` flags to
      `--{allow,block}list-*` [3], update them on our side too.
      
      In addition, bindgen 0.61.0 moved its CLI utility into a binary crate
      called `bindgen-cli` [4]. Thus update the installation command in the
      Quick Start guide.
      
      Moreover, bindgen 0.61.0 changed the default functionality to bind
      `size_t` to `usize` [5] and added the `--no-size_t-is-usize` flag
      to not bind `size_t` as `usize`. Then bindgen 0.65.0 removed
      the `--size_t-is-usize` flag [6]. Thus stop passing the flag to bindgen.
      
      Finally, bindgen 0.61.0 added support for the `noreturn` attribute (in
      its different forms) [7]. Thus remove the infinite loop in our Rust
      panic handler after calling `BUG()`, since bindgen now correctly
      generates a `BUG()` binding that returns `!` instead of `()`.
      
      Link: https://github.com/llvm/llvm-project/commit/19e984ef8f49bc3ccced15621989fa9703b2cd5b [1]
      Link: https://github.com/rust-lang/rust-bindgen/pull/2319 [2]
      Link: https://github.com/rust-lang/rust-bindgen/pull/1990 [3]
      Link: https://github.com/rust-lang/rust-bindgen/pull/2284 [4]
      Link: https://github.com/rust-lang/rust-bindgen/commit/cc78b6fdb6e829e5fb8fa1639f2182cb49333569 [5]
      Link: https://github.com/rust-lang/rust-bindgen/pull/2408 [6]
      Link: https://github.com/rust-lang/rust-bindgen/issues/2094
      
       [7]
      Signed-off-by: default avatarAakash Sen Sharma <aakashsensharma@gmail.com>
      Closes: https://github.com/Rust-for-Linux/linux/issues/1013
      
      
      Tested-by: default avatarAriel Miculas <amiculas@cisco.com>
      Reviewed-by: default avatarGary Guo <gary@garyguo.net>
      Link: https://lore.kernel.org/r/20230612194311.24826-1-aakashsensharma@gmail.com
      
      
      [ Reworded commit message. Mentioned the `bindgen-cli` binary crate
        change, linked to it and updated the Quick Start guide. Re-added a
        deleted "as" word in a code comment and reflowed comment to respect
        the maximum length. ]
      Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
      08ab7865
    • Miguel Ojeda's avatar
      rust: upgrade to Rust 1.71.1 · 89eed1ab
      Miguel Ojeda authored
      This is the second upgrade to the Rust toolchain, from 1.68.2 to 1.71.1
      (i.e. the latest).
      
      See the upgrade policy [1] and the comments on the first upgrade in
      commit 3ed03f4d ("rust: upgrade to Rust 1.68.2").
      
      # Unstable features
      
      No unstable features (that we use) were stabilized.
      
      Therefore, the only unstable feature allowed to be used outside
      the `kernel` crate is still `new_uninit`, though other code to be
      upstreamed may increase the list.
      
      Please see [2] for details.
      
      # Required changes
      
      For the upgrade, this patch requires the following changes:
      
        - Removal of the `__rust_*` allocator functions, together with
          the addition of the `__rust_no_alloc_shim_is_unstable` static.
          See [3] for details.
      
        - Some more compiler builtins added due to `<f{32,64}>::midpoint()`
          that got added in Rust 1.71 [4].
      
      # `alloc` upgrade and reviewing
      
      The vast majority of changes are due to our `alloc` fork being upgraded
      at once.
      
      There are two kinds of changes to be aware of: the ones coming from
      upstream, which we should follow as closely as possible, and the updates
      needed in our added fallible APIs to keep them matching the newer
      infallible APIs coming from upstream.
      
      Instead of taking a look at the diff of this patch, an alternative
      approach is reviewing a diff of the changes between upstream `alloc` and
      the kernel's. This allows to easily inspect the kernel additions only,
      especially to check if the fallible methods we already have still match
      the infallible ones in the new version coming from upstream.
      
      Another approach is reviewing the changes introduced in the additions in
      the kernel fork between the two versions. This is useful to spot
      potentially unintended changes to our additions.
      
      To apply these approaches, one may follow steps similar to the following
      to generate a pair of patches that show the differences between upstream
      Rust and the kernel (for the subset of `alloc` we use) before and after
      applying this patch:
      
          # Get the difference with respect to the old version.
          git -C rust checkout $(linux/scripts/min-tool-version.sh rustc)
          git -C linux ls-tree -r --name-only HEAD -- rust/alloc |
              cut -d/ -f3- |
              grep -Fv README.md |
              xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH
          git -C linux diff --patch-with-stat --summary -R > old.patch
          git -C linux restore rust/alloc
      
          # Apply this patch.
          git -C linux am rust-upgrade.patch
      
          # Get the difference with respect to the new version.
          git -C rust checkout $(linux/scripts/min-tool-version.sh rustc)
          git -C linux ls-tree -r --name-only HEAD -- rust/alloc |
              cut -d/ -f3- |
              grep -Fv README.md |
              xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH
          git -C linux diff --patch-with-stat --summary -R > new.patch
          git -C linux restore rust/alloc
      
      Now one may check the `new.patch` to take a look at the additions (first
      approach) or at the difference between those two patches (second
      approach). For the latter, a side-by-side tool is recommended.
      
      Link: https://rust-for-linux.com/rust-version-policy [1]
      Link: https://github.com/Rust-for-Linux/linux/issues/2 [2]
      Link: https://github.com/rust-lang/rust/pull/86844 [3]
      Link: https://github.com/rust-lang/rust/pull/92048 [4]
      Closes: https://github.com/Rust-for-Linux/linux/issues/68
      
      
      Reviewed-by: default avatarMartin Rodriguez Reboredo <yakoyoku@gmail.com>
      Reviewed-by: default avatarTrevor Gross <tmgross@umich.edu>
      Link: https://lore.kernel.org/r/20230729220317.416771-1-ojeda@kernel.org
      
      
      Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
      89eed1ab
  10. Aug 10, 2023
  11. Aug 09, 2023
Loading