forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request torvalds#89 from sched-ext/misc-updates
scx: Common include files relocated and more build updates
- Loading branch information
Showing
35 changed files
with
170 additions
and
350 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /* | ||
| * Dummy gnu/stubs.h. clang can end up including /usr/include/gnu/stubs.h when | ||
| * compiling BPF files although its content doesn't play any role. The file in | ||
| * turn includes stubs-64.h or stubs-32.h depending on whether __x86_64__ is | ||
| * defined. When compiling a BPF source, __x86_64__ isn't set and thus | ||
| * stubs-32.h is selected. However, the file is not there if the system doesn't | ||
| * have 32bit glibc devel package installed leading to a build failure. | ||
| * | ||
| * The problem is worked around by making this file available in the include | ||
| * search paths before the system one when building BPF. | ||
| */ |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,77 +1,13 @@ | ||
| // Copyright (c) Meta Platforms, Inc. and affiliates. | ||
|
|
||
| // | ||
| // This software may be used and distributed according to the terms of the | ||
| // GNU General Public License version 2. | ||
| extern crate bindgen; | ||
|
|
||
| use std::env; | ||
| use std::fs::create_dir_all; | ||
| use std::path::Path; | ||
| use std::path::PathBuf; | ||
|
|
||
| use glob::glob; | ||
| use libbpf_cargo::SkeletonBuilder; | ||
|
|
||
| const HEADER_PATH: &str = "src/bpf/layered.h"; | ||
|
|
||
| fn bindgen_layered() { | ||
| // Tell cargo to invalidate the built crate whenever the wrapper changes | ||
| println!("cargo:rerun-if-changed={}", HEADER_PATH); | ||
|
|
||
| // The bindgen::Builder is the main entry point | ||
| // to bindgen, and lets you build up options for | ||
| // the resulting bindings. | ||
| let bindings = bindgen::Builder::default() | ||
| // The input header we would like to generate | ||
| // bindings for. | ||
| .header(HEADER_PATH) | ||
| // Tell cargo to invalidate the built crate whenever any of the | ||
| // included header files changed. | ||
| .parse_callbacks(Box::new(bindgen::CargoCallbacks)) | ||
| // Finish the builder and generate the bindings. | ||
| .generate() | ||
| // Unwrap the Result and panic on failure. | ||
| .expect("Unable to generate bindings"); | ||
|
|
||
| // Write the bindings to the $OUT_DIR/bindings.rs file. | ||
| let out_path = PathBuf::from(env::var("OUT_DIR").unwrap()); | ||
| bindings | ||
| .write_to_file(out_path.join("layered_sys.rs")) | ||
| .expect("Couldn't write bindings!"); | ||
| } | ||
|
|
||
| fn gen_bpf_sched(name: &str) { | ||
| let bpf_cflags = env::var("SCX_RUST_BPF_CFLAGS").unwrap(); | ||
| let clang = env::var("SCX_RUST_CLANG").unwrap(); | ||
| eprintln!("{}", clang); | ||
| let outpath = format!("./src/bpf/.output/{}.skel.rs", name); | ||
| let skel = Path::new(&outpath); | ||
| let src = format!("./src/bpf/{}.bpf.c", name); | ||
| let obj = format!("./src/bpf/.output/{}.bpf.o", name); | ||
| SkeletonBuilder::new() | ||
| .source(src.clone()) | ||
| .obj(obj) | ||
| .clang(clang) | ||
| .clang_args(bpf_cflags) | ||
| .build_and_generate(skel) | ||
| .unwrap(); | ||
|
|
||
| // Trigger rebuild if any .[hc] files are changed in the directory. | ||
| for path in glob("./src/bpf/*.[hc]").unwrap().filter_map(Result::ok) { | ||
| println!("cargo:rerun-if-changed={}", path.to_str().unwrap()); | ||
| } | ||
| } | ||
|
|
||
| fn main() { | ||
| bindgen_layered(); | ||
| // It's unfortunate we cannot use `OUT_DIR` to store the generated skeleton. | ||
| // Reasons are because the generated skeleton contains compiler attributes | ||
| // that cannot be `include!()`ed via macro. And we cannot use the `#[path = "..."]` | ||
| // trick either because you cannot yet `concat!(env!("OUT_DIR"), "/skel.rs")` inside | ||
| // the path attribute either (see https://github.com/rust-lang/rust/pull/83366). | ||
| // | ||
| // However, there is hope! When the above feature stabilizes we can clean this | ||
| // all up. | ||
| create_dir_all("./src/bpf/.output").unwrap(); | ||
| gen_bpf_sched("layered"); | ||
| scx_utils::BpfBuilder::new() | ||
| .unwrap() | ||
| .enable_intf("src/bpf/intf.h", "bpf_intf.rs") | ||
| .enable_skel("src/bpf/main.bpf.c", "bpf") | ||
| .build() | ||
| .unwrap(); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| // Copyright (c) Meta Platforms, Inc. and affiliates. | ||
|
|
||
| // This software may be used and distributed according to the terms of the | ||
| // GNU General Public License version 2. | ||
|
|
||
| // We can't directly include the generated skeleton in main.rs as it may | ||
| // contain compiler attributes that can't be `include!()`ed via macro and we | ||
| // can't use the `#[path = "..."]` because `concat!(env!("OUT_DIR"), | ||
| // "/bpf.skel.rs")` does not work inside the path attribute yet (see | ||
| // https://github.com/rust-lang/rust/pull/83366). | ||
|
|
||
| include!(concat!(env!("OUT_DIR"), "/bpf_skel.rs")); |
Oops, something went wrong.