rust: introduce declare_err! autogeneration
cover rust: introduce declare_err! autogeneration
Currently, the error.rs's errno import is done manually by copying the comments from include/linux/errno.h and uses the declare_err! to wrap the constant errno.
However, this reduces the readability and increases difficulty of maintaining the error.rs if the errno list is growing too long or or if errno.h gets updated for new semantics.
This patchset solves this issues by introducing a rule to generate errno_generated.rs by seding the errno.h and
including the generated file in the error.rs.
This patch is based on the rust-next branch.
Yiyang Wu (1):
rust: error: auto-generate error declarations
rust/.gitignore | 1 + rust/Makefile | 14 ++++++++++- rust/kernel/error.rs | 58 +++----------------------------------------- 3 files changed, 18 insertions(+), 55 deletions(-)
Signature · 1 line
2.46.0
PATCH 1/1 rust: error: auto-generate error declarations
This patch adds a new cmd_errno to convert the include/linux/errno.h content into declare_err! macros for better maintainability and readability.
--- rust/.gitignore | 1 + rust/Makefile | 14 ++++++++++- rust/kernel/error.rs | 58 +++----------------------------------------- 3 files changed, 18 insertions(+), 55 deletions(-)
rust/.gitignore +1 -0
@@ -5,6 +5,7 @@ bindings_helpers_generated.rs doctests_kernel_generated.rs doctests_kernel_generated_kunit.c uapi_generated.rs +errno_generated.rs exports_*_generated.h doc/ test/
rust/Makefile +13 -1
@@ -22,6 +22,8 @@ always-$(CONFIG_RUST) += exports_alloc_generated.h exports_helpers_generated.h \ always-$(CONFIG_RUST) += uapi/uapi_generated.rs obj-$(CONFIG_RUST) += uapi.o +always-$(CONFIG_RUST) += kernel/errno_generated.rs + ifdef CONFIG_RUST_BUILD_ASSERT_ALLOW obj-$(CONFIG_RUST) += build_error.o else
@@ -289,6 +291,15 @@ $(obj)/uapi/uapi_generated.rs: $(src)/uapi/uapi_helper.h \ $(src)/bindgen_parameters FORCE $(call if_changed_dep,bindgen) +quiet_cmd_errno = EXPORTS $@ + cmd_errno = \ + $(CC) $(c_flags) -E -CC -dD $< \ + | sed -E 's/\#define\s*([A-Z0-9]+)\s+([0-9]+)\s+\/\*\s*(.*)\s\*\//declare_err!(\1, "\3.");/' \ + | grep -E '^declare_err.*$$' > $@ + +$(obj)/kernel/errno_generated.rs: $(srctree)/include/linux/errno.h FORCE + $(call if_changed,errno) + # See `CFLAGS_REMOVE_helpers.o` above. In addition, Clang on C does not warn # with `-Wmissing-declarations` (unlike GCC), so it is not strictly needed here # given it is `libclang`; but for consistency, future Clang changes and/or
@@ -420,7 +431,8 @@ $(obj)/uapi.o: $(src)/uapi/lib.rs \ $(obj)/kernel.o: private rustc_target_flags = --extern alloc \ --extern build_error --extern macros --extern bindings --extern uapi -$(obj)/kernel.o: $(src)/kernel/lib.rs $(obj)/alloc.o $(obj)/build_error.o \ +$(obj)/kernel.o: $(src)/kernel/lib.rs $(obj)/kernel/errno_generated.rs \ + $(obj)/alloc.o $(obj)/build_error.o \ $(obj)/libmacros.so $(obj)/bindings.o $(obj)/uapi.o FORCE +$(call if_changed_rule,rustc_library)
rust/kernel/error.rs +4 -54
64 lines not on this page · raw message
Signature · 1 line
2.46.0