mirror of
https://github.com/torvalds/linux.git
synced 2025-11-30 23:16:01 +07:00
rust: derive Zeroable for all structs & unions generated by bindgen where possible
Using the `--with-derive-custom-{struct,union}` option of bindgen, add
`#[derive(MaybeZeroable)]` to every struct & union. This makes those
types implement `Zeroable` if all their fields implement it.
Sadly bindgen doesn't add custom derives to the `__BindgenBitfieldUnit`
struct. So manually implement `Zeroable` for that.
Signed-off-by: Benno Lossin <lossin@kernel.org>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
[ Formatted comment. - Miguel ]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
committed by
Miguel Ojeda
parent
3c847e1722
commit
4846300ba8
@@ -35,3 +35,7 @@
|
||||
# recognized, block generation of the non-helper constants.
|
||||
--blocklist-item ARCH_SLAB_MINALIGN
|
||||
--blocklist-item ARCH_KMALLOC_MINALIGN
|
||||
|
||||
# Structs should implement `Zeroable` when all of their fields do.
|
||||
--with-derive-custom-struct .*=MaybeZeroable
|
||||
--with-derive-custom-union .*=MaybeZeroable
|
||||
|
||||
@@ -31,11 +31,19 @@
|
||||
#[allow(clippy::undocumented_unsafe_blocks)]
|
||||
#[cfg_attr(CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES, allow(unnecessary_transmutes))]
|
||||
mod bindings_raw {
|
||||
use pin_init::{MaybeZeroable, Zeroable};
|
||||
|
||||
// Manual definition for blocklisted types.
|
||||
type __kernel_size_t = usize;
|
||||
type __kernel_ssize_t = isize;
|
||||
type __kernel_ptrdiff_t = isize;
|
||||
|
||||
// `bindgen` doesn't automatically do this, see
|
||||
// <https://github.com/rust-lang/rust-bindgen/issues/3196>
|
||||
//
|
||||
// SAFETY: `__BindgenBitfieldUnit<Storage>` is a newtype around `Storage`.
|
||||
unsafe impl<Storage> Zeroable for __BindgenBitfieldUnit<Storage> where Storage: Zeroable {}
|
||||
|
||||
// Use glob import here to expose all helpers.
|
||||
// Symbols defined within the module will take precedence to the glob import.
|
||||
pub use super::bindings_helper::*;
|
||||
|
||||
@@ -34,4 +34,6 @@ type __kernel_size_t = usize;
|
||||
type __kernel_ssize_t = isize;
|
||||
type __kernel_ptrdiff_t = isize;
|
||||
|
||||
use pin_init::MaybeZeroable;
|
||||
|
||||
include!(concat!(env!("OBJTREE"), "/rust/uapi/uapi_generated.rs"));
|
||||
|
||||
Reference in New Issue
Block a user