From patchwork Tue Jul 23 18:10:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danilo Krummrich X-Patchwork-Id: 13740274 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 30789C3DA49 for ; Tue, 23 Jul 2024 18:13:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BBDEF6B00B7; Tue, 23 Jul 2024 14:13:09 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B6CE16B00B9; Tue, 23 Jul 2024 14:13:09 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A354F6B00BA; Tue, 23 Jul 2024 14:13:09 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 7D1AC6B00B7 for ; Tue, 23 Jul 2024 14:13:09 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 45A6FA1F9A for ; Tue, 23 Jul 2024 18:13:09 +0000 (UTC) X-FDA: 82371814098.17.112DA08 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf26.hostedemail.com (Postfix) with ESMTP id E45FC140021 for ; Tue, 23 Jul 2024 18:13:06 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=GDrEwRtU; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of dakr@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=dakr@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721758335; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5s5GEXrpUgqZMN60+rFjwSSmYaOC2eDMeD9YyF521H0=; b=2jyioTh1I4t5vJdlCObX9YbK42Rh/PovewpNZusP6aSLMSvDg5ns8S3y0wUDLrWQ2nfuih eJunrDvaPGGH4TQBuPlTK9sCBP/54txYlL10+m1yTnDZKk35DWy8QYusOec2wPUuvCGotl IWPN9fK8B7MmUTVyzQhQrbbqTgRp51U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721758335; a=rsa-sha256; cv=none; b=EqpOGMR7fHMbQK7xT5cb9a5TStsyhiosJNvsGHpRJQJ3T/6FpUBQ+saEvrVLyD1RzElAzl 1EkxmYmNv69EGeIiQje4SejZr1D6r/HA6zb+unMEHfrtbeZ2bzVTXdri+y4Zb0xesn+nWI yPv0cZMke9ZVPlk5AfuYCJ80khwHjHU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=GDrEwRtU; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf26.hostedemail.com: domain of dakr@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=dakr@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 383B0CE0E90; Tue, 23 Jul 2024 18:13:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E76F7C4AF0E; Tue, 23 Jul 2024 18:12:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1721758383; bh=HhWO+rhzutQW6+RMZ9ncpHmhaR4fD68LK5Csi2zjXug=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GDrEwRtU2FwzMwAPQUuxnZ8qfEDD+lPzQTCAk85GkkQHagtelzU+hW543pFjAZTWG U8bDqvgxafueyad167YsF8/VUBKrF/B83jgnmVC+LYyZu58G5w5bH3uAIGrVFka3sQ rtaTjf/THkXAqHZbCwGTm4waG9woowf6iW+TFtslGJwd/1N/jM/eh7a2NhV0+zNvmr leS6rELow94lTrR46+nD2cOC+AK2Kjw8LW2lL4wrobTXU5G2vV6n2Shv4BpmYC3rEK b6aPKKoPLuqb2+0PwImS92Cbwa8uy/3ZHe8b0iAJhAf7NANbyxs3ufiPmemUdfdCin 3bDQGBYuBRiiw== From: Danilo Krummrich To: ojeda@kernel.org, alex.gaynor@gmail.com, wedsonaf@gmail.com, boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com, benno.lossin@proton.me, a.hindborg@samsung.com, aliceryhl@google.com, akpm@linux-foundation.org Cc: daniel.almeida@collabora.com, faith.ekstrand@collabora.com, boris.brezillon@collabora.com, lina@asahilina.net, mcanal@igalia.com, zhiw@nvidia.com, acurrid@nvidia.com, cjia@nvidia.com, jhubbard@nvidia.com, airlied@redhat.com, ajanulgu@redhat.com, lyude@redhat.com, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, linux-mm@kvack.org, Danilo Krummrich Subject: [PATCH v2 23/23] kbuild: rust: remove the `alloc` crate Date: Tue, 23 Jul 2024 20:10:12 +0200 Message-ID: <20240723181024.21168-24-dakr@kernel.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723181024.21168-1-dakr@kernel.org> References: <20240723181024.21168-1-dakr@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: E45FC140021 X-Stat-Signature: kkbucytbztgtwfwzbxbuawcp6egaamo3 X-Rspam-User: X-HE-Tag: 1721758386-120211 X-HE-Meta: U2FsdGVkX1+5jOh116xCaCc+F92hFQh1UqOrLxhtUYcA2kmhHjz731tKa96Hdu1LqZjyL44DlWH74II/WBwFlZ38yqu7i49ITdjqD1u46zityMcWU6cqBLdcCqdYbirPytlB3uyTY6EOfCn/9CXtC6Y0NoURt/DSoq+tWeoDSm62kK5GVU0jGVJ1RzhK7hNThUiugh/F83/NyjIPdBVObU11acpT16LFZnXdKQ17rJGanbDRXZjhcJ6FiSQuOB5FqfstMpihcT2kDKxhuB/M9m6jkD7wTEiE29pJNeV6fN2XUJvqtopzRqHk+odJOdrUsXUq7qKz/XttdKyM013C31r9JfA6uVO1HfamBH+st8edaCjI2vPvWzBcYNofk1SladqC1AckCEHP18TjnbXzsYrqyU/7oA1pEw8m1U2SJUjvrfbzlfGpgrxjQyFbCzKB7XwIJmkl82SXXNuLiq2XaxXIdK5l55z2eGW9uH6Y4fJOnJliTS5Vo+QgyG4YmG93mxEcjGk9ZAVS6z/SVHjNx6DcjE14LT6E7RL+zL12LwShOTVtYbdtnTGHbx+2z5f2yPqWz0RzlfNG/WY6eEoQdgjMg5WUaGxorcv0q+DA+E2F4gpDnqYm0YLd9xFk7N5DsTv1DN+1viWsHvPXO7+Syk8KUE4az4/pG9F+GES8/fTVMUQRiWPvz9GhsfKq5Mlrz75aNqNc93Smz61LynQM/WrdzCfRIvOawhmAGqTiZSpFH/f7u2/6Nr0+evDnI7OZfgaUabugMNq6bjApZjjU+jcwCM3i5cM8lkgKNYulh0Uq6s1+jkkwlrogzYTBgjYLJJEY6MXvnZcme4uZFHh9BYasd1MvZARF96kHlkCCzwMHKU69K7hE0tor4qELw92xyfXh73oXOYsH9nBBqedGYh333O11fzPP/4o+owppekDHmCZld9WNu6XihMiWbDwU+s4uBhiNvQlu4CNJf2a tSVSVhBu 8VMN8PsrFmQPj012DckLtmaMA2d7NvoqWh40B83SIuQkvgyPyrKSG19tp01A+IKt+samwPk5Mj8bkEWIKW0HS128tEh8ALx7khFEZ0O1FA1dVPLWG8qhV88Sat/VjrGKm/Dt88oM8BsN2FPJqvT7mNnZdTEgZkLqLGghYBdaTL39r6HzfIM39RnAVGT/Ww90AbTnqD5c6n/nfsSgGkqxLFnMMrmCrMdYdPVdz49hsHb7nfW8vcZwc7EwaX0gTb7pOX4rGAzZM7UosvyZXG8WJFgxevG35J6iGAzqD7Qcd2gJ6QyeAm80O4NY8mg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Now that we have our own `Allocator`, `Box` and `Vec` types we can remove Rust's `alloc` crate and the corresponding unstable features. Signed-off-by: Danilo Krummrich --- rust/Makefile | 44 ++++++++++-------------------------------- rust/exports.c | 1 - scripts/Makefile.build | 7 +------ 3 files changed, 11 insertions(+), 41 deletions(-) diff --git a/rust/Makefile b/rust/Makefile index f70d5e244fee..409be08ad09a 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -15,9 +15,8 @@ always-$(CONFIG_RUST) += libmacros.so no-clean-files += libmacros.so always-$(CONFIG_RUST) += bindings/bindings_generated.rs bindings/bindings_helpers_generated.rs -obj-$(CONFIG_RUST) += alloc.o bindings.o kernel.o -always-$(CONFIG_RUST) += exports_alloc_generated.h exports_bindings_generated.h \ - exports_kernel_generated.h +obj-$(CONFIG_RUST) += bindings.o kernel.o +always-$(CONFIG_RUST) += exports_bindings_generated.h exports_kernel_generated.h always-$(CONFIG_RUST) += uapi/uapi_generated.rs obj-$(CONFIG_RUST) += uapi.o @@ -60,11 +59,6 @@ endif core-cfgs = \ --cfg no_fp_fmt_parse -alloc-cfgs = \ - --cfg no_global_oom_handling \ - --cfg no_rc \ - --cfg no_sync - quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $< cmd_rustdoc = \ OBJTREE=$(abspath $(objtree)) \ @@ -87,7 +81,7 @@ quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $< # command-like flags to solve the issue. Meanwhile, we use the non-custom case # and then retouch the generated files. rustdoc: rustdoc-core rustdoc-macros rustdoc-compiler_builtins \ - rustdoc-alloc rustdoc-kernel + rustdoc-kernel $(Q)cp $(srctree)/Documentation/images/logo.svg $(rustdoc_output)/static.files/ $(Q)cp $(srctree)/Documentation/images/COPYING-logo $(rustdoc_output)/static.files/ $(Q)find $(rustdoc_output) -name '*.html' -type f -print0 | xargs -0 sed -Ei \ @@ -111,20 +105,11 @@ rustdoc-core: $(RUST_LIB_SRC)/core/src/lib.rs FORCE rustdoc-compiler_builtins: $(src)/compiler_builtins.rs rustdoc-core FORCE +$(call if_changed,rustdoc) -# We need to allow `rustdoc::broken_intra_doc_links` because some -# `no_global_oom_handling` functions refer to non-`no_global_oom_handling` -# functions. Ideally `rustdoc` would have a way to distinguish broken links -# due to things that are "configured out" vs. entirely non-existing ones. -rustdoc-alloc: private rustc_target_flags = $(alloc-cfgs) \ - -Arustdoc::broken_intra_doc_links -rustdoc-alloc: $(RUST_LIB_SRC)/alloc/src/lib.rs rustdoc-core rustdoc-compiler_builtins FORCE - +$(call if_changed,rustdoc) - -rustdoc-kernel: private rustc_target_flags = --extern alloc \ +rustdoc-kernel: private rustc_target_flags = \ --extern build_error --extern macros=$(objtree)/$(obj)/libmacros.so \ --extern bindings --extern uapi rustdoc-kernel: $(src)/kernel/lib.rs rustdoc-core rustdoc-macros \ - rustdoc-compiler_builtins rustdoc-alloc $(obj)/libmacros.so \ + rustdoc-compiler_builtins $(obj)/libmacros.so \ $(obj)/bindings.o FORCE +$(call if_changed,rustdoc) @@ -169,7 +154,7 @@ quiet_cmd_rustdoc_test_kernel = RUSTDOC TK $< mkdir -p $(objtree)/$(obj)/test/doctests/kernel; \ OBJTREE=$(abspath $(objtree)) \ $(RUSTDOC) --test $(rust_flags) \ - -L$(objtree)/$(obj) --extern alloc --extern kernel \ + -L$(objtree)/$(obj) --extern kernel \ --extern build_error --extern macros \ --extern bindings --extern uapi \ --no-run --crate-name kernel -Zunstable-options \ @@ -251,7 +236,7 @@ rusttest-macros: $(src)/macros/lib.rs rusttest-prepare FORCE +$(call if_changed,rustc_test) +$(call if_changed,rustdoc_test) -rusttest-kernel: private rustc_target_flags = --extern alloc \ +rusttest-kernel: private rustc_target_flags = \ --extern build_error --extern macros --extern bindings --extern uapi rusttest-kernel: $(src)/kernel/lib.rs rusttest-prepare \ rusttestlib-build_error rusttestlib-macros rusttestlib-bindings \ @@ -364,9 +349,6 @@ quiet_cmd_exports = EXPORTS $@ $(obj)/exports_core_generated.h: $(obj)/core.o FORCE $(call if_changed,exports) -$(obj)/exports_alloc_generated.h: $(obj)/alloc.o FORCE - $(call if_changed,exports) - $(obj)/exports_bindings_generated.h: $(obj)/bindings.o FORCE $(call if_changed,exports) @@ -402,7 +384,7 @@ quiet_cmd_rustc_library = $(if $(skip_clippy),RUSTC,$(RUSTC_OR_CLIPPY_QUIET)) L rust-analyzer: $(Q)$(srctree)/scripts/generate_rust_analyzer.py \ - --cfgs='core=$(core-cfgs)' --cfgs='alloc=$(alloc-cfgs)' \ + --cfgs='core=$(core-cfgs)' \ $(realpath $(srctree)) $(realpath $(objtree)) \ $(RUST_LIB_SRC) $(KBUILD_EXTMOD) > \ $(if $(KBUILD_EXTMOD),$(extmod_prefix),$(objtree))/rust-project.json @@ -434,12 +416,6 @@ $(obj)/compiler_builtins.o: private rustc_objcopy = -w -W '__*' $(obj)/compiler_builtins.o: $(src)/compiler_builtins.rs $(obj)/core.o FORCE +$(call if_changed_dep,rustc_library) -$(obj)/alloc.o: private skip_clippy = 1 -$(obj)/alloc.o: private skip_flags = -Dunreachable_pub -$(obj)/alloc.o: private rustc_target_flags = $(alloc-cfgs) -$(obj)/alloc.o: $(RUST_LIB_SRC)/alloc/src/lib.rs $(obj)/compiler_builtins.o FORCE - +$(call if_changed_dep,rustc_library) - $(obj)/build_error.o: $(src)/build_error.rs $(obj)/compiler_builtins.o FORCE +$(call if_changed_dep,rustc_library) @@ -454,9 +430,9 @@ $(obj)/uapi.o: $(src)/uapi/lib.rs \ $(obj)/uapi/uapi_generated.rs FORCE +$(call if_changed_dep,rustc_library) -$(obj)/kernel.o: private rustc_target_flags = --extern alloc \ +$(obj)/kernel.o: private rustc_target_flags = \ --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)/build_error.o \ $(obj)/libmacros.so $(obj)/bindings.o $(obj)/uapi.o FORCE +$(call if_changed_dep,rustc_library) diff --git a/rust/exports.c b/rust/exports.c index 3803c21d1403..1b870e8e83ea 100644 --- a/rust/exports.c +++ b/rust/exports.c @@ -16,7 +16,6 @@ #define EXPORT_SYMBOL_RUST_GPL(sym) extern int sym; EXPORT_SYMBOL_GPL(sym) #include "exports_core_generated.h" -#include "exports_alloc_generated.h" #include "exports_bindings_generated.h" #include "exports_kernel_generated.h" diff --git a/scripts/Makefile.build b/scripts/Makefile.build index efacca63c897..7e7b6b3d5bb9 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -262,18 +262,13 @@ $(obj)/%.lst: $(obj)/%.c FORCE # Compile Rust sources (.rs) # --------------------------------------------------------------------------- - -rust_allowed_features := new_uninit - # `--out-dir` is required to avoid temporaries being created by `rustc` in the # current working directory, which may be not accessible in the out-of-tree # modules case. rust_common_cmd = \ RUST_MODFILE=$(modfile) $(RUSTC_OR_CLIPPY) $(rust_flags) \ - -Zallow-features=$(rust_allowed_features) \ -Zcrate-attr=no_std \ - -Zcrate-attr='feature($(rust_allowed_features))' \ - -Zunstable-options --extern force:alloc --extern kernel \ + -Zunstable-options --extern kernel \ --crate-type rlib -L $(objtree)/rust/ \ --crate-name $(basename $(notdir $@)) \ --sysroot=/dev/null \