mirror of
https://github.com/koverstreet/bcachefs-tools.git
synced 2025-02-02 00:00:03 +03:00
f6b619daad
This updates rust-bindgen to version 0.69.4 which includes the patch 199bee441ad0: "try to avoid #[repr(packed)] when align is needed". With this patch, bindgen generates code that is both ABI-correct and can be compiled by rustc, for 3 bcachefs types: - bkey - bch_extent_crc32 - bch_extent_ptr This allows us to remove the custom treatment for these three types. Signed-off-by: Thomas Bertschinger <tahbertschinger@gmail.com> Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
135 lines
4.7 KiB
Rust
135 lines
4.7 KiB
Rust
#[derive(Debug)]
|
|
pub struct Fix753 {}
|
|
impl bindgen::callbacks::ParseCallbacks for Fix753 {
|
|
fn item_name(&self, original_item_name: &str) -> Option<String> {
|
|
Some(original_item_name.trim_start_matches("Fix753_").to_owned())
|
|
}
|
|
}
|
|
|
|
fn main() {
|
|
use std::path::PathBuf;
|
|
|
|
println!("cargo:rerun-if-changed=src/libbcachefs_wrapper.h");
|
|
|
|
let out_dir: PathBuf = std::env::var_os("OUT_DIR")
|
|
.expect("ENV Var 'OUT_DIR' Expected")
|
|
.into();
|
|
let top_dir: PathBuf = std::env::var_os("CARGO_MANIFEST_DIR")
|
|
.expect("ENV Var 'CARGO_MANIFEST_DIR' Expected")
|
|
.into();
|
|
|
|
let urcu = pkg_config::probe_library("liburcu").expect("Failed to find urcu lib");
|
|
let bindings = bindgen::builder()
|
|
.formatter(bindgen::Formatter::Prettyplease)
|
|
.header(
|
|
top_dir
|
|
.join("src")
|
|
.join("libbcachefs_wrapper.h")
|
|
.display()
|
|
.to_string(),
|
|
)
|
|
.clang_args(
|
|
urcu
|
|
.include_paths
|
|
.iter()
|
|
.map(|p| format!("-I{}", p.display())),
|
|
)
|
|
.clang_arg("-I..")
|
|
.clang_arg("-I../c_src")
|
|
.clang_arg("-I../include")
|
|
.clang_arg("-DZSTD_STATIC_LINKING_ONLY")
|
|
.clang_arg("-DNO_BCACHEFS_FS")
|
|
.clang_arg("-D_GNU_SOURCE")
|
|
.clang_arg("-DRUST_BINDGEN")
|
|
.clang_arg("-fkeep-inline-functions")
|
|
.derive_debug(true)
|
|
.derive_default(true)
|
|
.layout_tests(true)
|
|
.default_enum_style(bindgen::EnumVariation::Rust {
|
|
non_exhaustive: true,
|
|
})
|
|
.allowlist_function("bcachefs_usage")
|
|
.allowlist_function("raid_init")
|
|
.allowlist_function("cmd_.*")
|
|
.allowlist_function(".*_cmds")
|
|
.allowlist_function(".*bch2_.*")
|
|
.allowlist_function("bcache_fs_open")
|
|
.allowlist_function("bcache_fs_close")
|
|
.allowlist_function("bio_.*")
|
|
.allowlist_function("derive_passphrase")
|
|
.allowlist_function("request_key")
|
|
.allowlist_function("add_key")
|
|
.allowlist_function("keyctl_search")
|
|
.allowlist_function("match_string")
|
|
.allowlist_function("printbuf.*")
|
|
.blocklist_type("rhash_lock_head")
|
|
.blocklist_type("srcu_struct")
|
|
.allowlist_var("BCH_.*")
|
|
.allowlist_var("KEY_SPEC_.*")
|
|
.allowlist_var("Fix753_.*")
|
|
.allowlist_var("bch.*")
|
|
.allowlist_var("__bch2.*")
|
|
.allowlist_var("__BTREE_ITER.*")
|
|
.allowlist_var("BTREE_ITER.*")
|
|
.blocklist_item("bch2_bkey_ops")
|
|
.allowlist_type("bch_.*")
|
|
.allowlist_type("fsck_err_opts")
|
|
.rustified_enum("fsck_err_opts")
|
|
.allowlist_type("nonce")
|
|
.no_debug("bch_replicas_padded")
|
|
.newtype_enum("bch_kdf_types")
|
|
.rustified_enum("bch_key_types")
|
|
.opaque_type("gendisk")
|
|
.opaque_type("gc_stripe")
|
|
.opaque_type("open_bucket.*")
|
|
.opaque_type("replicas_delta_list")
|
|
.no_copy("btree_trans")
|
|
.no_copy("printbuf")
|
|
.no_partialeq("bkey")
|
|
.no_partialeq("bpos")
|
|
.generate_inline_functions(true)
|
|
.parse_callbacks(Box::new(Fix753 {}))
|
|
.generate()
|
|
.expect("BindGen Generation Failiure: [libbcachefs_wrapper]");
|
|
|
|
std::fs::write(
|
|
out_dir.join("bcachefs.rs"),
|
|
packed_and_align_fix(bindings.to_string()),
|
|
)
|
|
.expect("Writing to output file failed for: `bcachefs.rs`");
|
|
|
|
let keyutils = pkg_config::probe_library("libkeyutils").expect("Failed to find keyutils lib");
|
|
let bindings = bindgen::builder()
|
|
.header(
|
|
top_dir
|
|
.join("src")
|
|
.join("keyutils_wrapper.h")
|
|
.display()
|
|
.to_string(),
|
|
)
|
|
.clang_args(
|
|
keyutils
|
|
.include_paths
|
|
.iter()
|
|
.map(|p| format!("-I{}", p.display())),
|
|
)
|
|
.generate()
|
|
.expect("BindGen Generation Failiure: [Keyutils]");
|
|
bindings
|
|
.write_to_file(out_dir.join("keyutils.rs"))
|
|
.expect("Writing to output file failed for: `keyutils.rs`");
|
|
}
|
|
|
|
// rustc has a limitation where it does not allow structs with a "packed" attribute to contain a
|
|
// member with an "align(N)" attribute. There is one type in bcachefs with this issue:
|
|
// struct btree_node.
|
|
//
|
|
// Luckily, it happens that this type does not need the "packed(N)" attribute in Rust to have the
|
|
// same ABI as C, so we can strip it off the bindgen output.
|
|
fn packed_and_align_fix(bindings: std::string::String) -> std::string::String {
|
|
bindings.replace(
|
|
"#[repr(C, packed(8))]\npub struct btree_node {",
|
|
"#[repr(C, align(8))]\npub struct btree_node {",
|
|
)
|
|
}
|