Skip to content

Commit 14e87c5

Browse files
committed
ci: Add Rust for Linux
Rust for Linux, so far, has pinned the Rust compiler and `bindgen` versions. The kernel is looking into expanding that support to several versions, i.e. establishing a minimum supported version, so that the kernel can start to be more easily built. In particular, it should be possible to build the kernel using the tools provided directly by Linux distributions. In order to help achieve that goal, the Rust project has added the kernel to its Rust pre-merge CI. This commit does the same for `bindgen`. In particular, it adds a quick, build-only test of the Rust code in the kernel done as an added, last step in the `test` workflow. As it is implemented, it adds about 1-2 minutes of CI time. This is intended to be an end-to-end test that runs what kernel developers/users would do. In particular, it is useful to catch certain issues that go beyond the C header comparisons. For instance, it would have been able to catch an issue like the `--version` option unexpectedly requiring a header in 0.69.0 (fixed in 0.69.1) [1]. It would also have detected another issue present in 0.66.0 and 0.66.1: a panic handling certain C headers with string literals containing an interior NUL [2]. While the kernel is not really a stable test, and such an issue would still require that a proper test is added, it is nevertheless a good test case of non-trivial C headers that may trigger edge cases like that. Of course, `bindgen` may need to disable the test for different reasons, i.e. there is no expectation to block any urgent/important PR, and the kernel can also call `bindgen` differently depending on the version, i.e. we are happy to adjust on our side too. Even if it gets disabled often, we would still be in a better situation than not having the test at all. The Linux version (hash or tag) should ideally be updated from time to time (e.g. every kernel `-rc1`), and each update should only contain that change. Link: rust-lang#2567 [1] Link: rust-lang#2678 [2] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent 4b3cd6c commit 14e87c5

File tree

2 files changed

+71
-0
lines changed

2 files changed

+71
-0
lines changed

.github/workflows/bindgen.yml

+1
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,7 @@ jobs:
227227
BINDGEN_FEATURE_RUNTIME: ${{matrix.feature_runtime}}
228228
BINDGEN_FEATURE_EXTRA_ASSERTS: ${{matrix.feature_extra_asserts}}
229229
BINDGEN_NO_DEFAULT_FEATURES: ${{matrix.no_default_features}}
230+
BINDGEN_RUST_FOR_LINUX_TEST: ${{matrix.llvm_version == '16.0' && 1 || 0}}
230231
run: ./ci/test.sh
231232

232233
check-cfg:

ci/test.sh

+70
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,73 @@ assert_no_diff
118118

119119
# Run the integration tests
120120
(cd bindgen-integration && cargo test $CARGO_ARGS)
121+
122+
if [ "$BINDGEN_RUST_FOR_LINUX_TEST" == "1" ]; then
123+
# Run the Rust for Linux test
124+
125+
# Put LLVM binaries in the path for `LLVM=1`. The LLVM `bin` directory should
126+
# go first since there are others in the Ubuntu image.
127+
export PATH="${LLVM_DIRECTORY}/bin:${PATH}"
128+
129+
# Kernel build dependency: `bindgen-cli`, which is under test.
130+
#
131+
# Using the unstable `--out-dir` so that we can use `cargo build` instead of `cargo install`,
132+
# since we want to reuse the `$CARGO_ARGS`.
133+
(cd bindgen-cli && RUSTC_BOOTSTRAP=1 cargo build -Zunstable-options --out-dir ${HOME}/.bindgen $CARGO_ARGS)
134+
export PATH="${HOME}/.bindgen:${PATH}"
135+
136+
# Kernel build dependency: `libelf-dev`.
137+
sudo apt-get update
138+
sudo apt-get install libelf-dev
139+
140+
# Kernel build dependency: the Rust standard library sources.
141+
#
142+
# `rustup` is used here to install the `rust-src` component (instead of using
143+
# `actions-rs/toolchain`'s `components` option in the workflow step) since we
144+
# only need it for this test, and anyway the action installs `rustup`.
145+
rustup component add rust-src
146+
147+
# Ideally this should be updated from time to time (e.g. every kernel `-rc1`),
148+
# and each update should only contain this change.
149+
#
150+
# Both commit hashes and tags are supported.
151+
LINUX_VERSION=c13320499ba0efd93174ef6462ae8a7a2933f6e7
152+
153+
# Download Linux at a specific commit
154+
mkdir -p linux
155+
git -C linux init
156+
git -C linux remote add origin https://github.com/torvalds/linux.git
157+
git -C linux fetch --depth 1 origin ${LINUX_VERSION}
158+
git -C linux checkout FETCH_HEAD
159+
160+
# Configure Rust for Linux
161+
cat <<EOF > linux/kernel/configs/rfl-for-bindgen-ci.config
162+
# CONFIG_WERROR is not set
163+
164+
CONFIG_RUST=y
165+
166+
CONFIG_SAMPLES=y
167+
CONFIG_SAMPLES_RUST=y
168+
169+
CONFIG_SAMPLE_RUST_MINIMAL=m
170+
CONFIG_SAMPLE_RUST_PRINT=y
171+
172+
CONFIG_RUST_PHYLIB_ABSTRACTIONS=y
173+
CONFIG_AX88796B_PHY=y
174+
CONFIG_AX88796B_RUST_PHY=y
175+
176+
CONFIG_KUNIT=y
177+
CONFIG_RUST_KERNEL_DOCTESTS=y
178+
EOF
179+
180+
make -C linux LLVM=1 -j$(($(nproc) + 1)) \
181+
rustavailable \
182+
defconfig \
183+
rfl-for-bindgen-ci.config
184+
185+
# Build Rust for Linux
186+
make -C linux LLVM=1 -j$(($(nproc) + 1)) \
187+
samples/rust/rust_minimal.o \
188+
samples/rust/rust_print.o \
189+
drivers/net/phy/ax88796b_rust.o
190+
fi

0 commit comments

Comments
 (0)