From nobody Fri Feb 13 11:13:29 2026 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 12DA57FBC6 for ; Tue, 16 Apr 2024 07:46:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713253586; cv=none; b=ce8CMVopVGuuYqklyGtZRiZ4hi67W5fgzF8O0fcZoGMp9vLOIHw3Rqbktih1228v+YoZSHAOjEZND72+l/dgdooEgs6bVKCYXJQ+V68ejqI2kjhQN0m7kRX4mWba/BNMaeeAO+n8boBdGHah2u2oSjLE00/7H43UKTj8tQ2K3n8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713253586; c=relaxed/simple; bh=vEE9zQdvFphsch9Os3Yi0rFynFHWqdT7q3HKAAjZtCk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=UKMVcG1GjE7OvLwZX8B4JHYsZA/skN1/NqTL9QX+YFsgFTXaCLswLOkoAy2G9XGn7/zZUu0rCkMgjtD1wo32NzsnFkL8Dbxp/FCes74WMAwlzcW5a/qjCkm+B5gF5ooZsF9GrZWMV8DkpqFW7FlPiXETNt5/396pM14H7GGoBJ8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=metaspace.dk; spf=none smtp.mailfrom=metaspace.dk; dkim=pass (2048-bit key) header.d=metaspace-dk.20230601.gappssmtp.com header.i=@metaspace-dk.20230601.gappssmtp.com header.b=cFkYqtWN; arc=none smtp.client-ip=209.85.208.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=metaspace.dk Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=metaspace.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=metaspace-dk.20230601.gappssmtp.com header.i=@metaspace-dk.20230601.gappssmtp.com header.b="cFkYqtWN" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-565c6cf4819so8428959a12.1 for ; Tue, 16 Apr 2024 00:46:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=metaspace-dk.20230601.gappssmtp.com; s=20230601; t=1713253580; x=1713858380; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3a7rIFWig1jCREC4GVwjkwTEwAe6laU0+Whm5ZNBK60=; b=cFkYqtWN5d/UTfSRj4wbT4r5YLV4pmnheWF7AMOSlFSr9VUCLrF2dUGr5rEpd0kI57 8FXbQIz3JiWNk2wJqEFJkFDxe4KDUq6k/gQyFuLJz2cO/A/zOGu2ijvKTVPJtXpNe3MG CI0rg+jNBbqDO5tl/seN65Ms0tksFhN1e5OnayzgB9Lsdu9h0Iguh/9EmRpX+1zKjd2X wKCGcUQSsJdWQ3U6rvKsvNd23Fmb2SzuQO0uIubIbD+D7btdidj6oIAc42LmjhjriDym ieAHuPrFwC//xs4COY7vGoVMpvNoERGxwAjySjd8P0Dl9BLrzrGLJzy167XWw+fYcwpe diDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713253580; x=1713858380; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=3a7rIFWig1jCREC4GVwjkwTEwAe6laU0+Whm5ZNBK60=; b=IMqY1yE9IkpiK+PoRJHs+X2zYCeu12kNm/xo63S6BIMxtJ52R4xgxsJD6Yfwg8WZjF ICBT68eXMTS/uav0lpiQDH949EKsha3LqmmZqI1iVK2zCtey6/sDZctLBDhMYCXfvH9S G6Yu+S2yMFuOQ7Lm6IlROPTBusj4e0VK664/wtjxPO1Anm6woJmlWUzZzrEMDEzhY+lB LXtOxcGCf5mRQYs9milTGy4y3v8cucLg76HODD8wSBslnoY/5xSBBDgxnVLPVNcoJrp0 XI8iURKYCB071j+9ive2m31sBi2ddEgfo/jHZIiqOsOVciJt9/54ahKHBgLPqCsnTYoF kGng== X-Forwarded-Encrypted: i=1; AJvYcCXBH0p7EKzO+OfbMlsX0zrteBNTKS623GmmcV03/rgObck3nbtcTcD2WNuVGDEn3gppE4vEptA6mKQgiIYTmLRQLjG03zyPy/JiWQUh X-Gm-Message-State: AOJu0YzIs3LIgY7qeHq6Jx49pfy2QVaW3Ea5L3WmSNK5af/hmbFYSNA5 gh7d9JnR/xEDwEqNiJxuJrJe0rcfFMy2Ho+G6ZIYiNp/W03+hAj1ZkHJjRA7CDY= X-Google-Smtp-Source: AGHT+IG6YjeYFlAuBShBR00BFXZ8nWRsA29wVdl6zVz+hYa3nYlKitVyTvR8/wy4LRtHh6hSIyiR5w== X-Received: by 2002:a17:906:b30f:b0:a52:42b:4d59 with SMTP id n15-20020a170906b30f00b00a52042b4d59mr1063958ejz.26.1713253579625; Tue, 16 Apr 2024 00:46:19 -0700 (PDT) Received: from localhost ([79.142.230.34]) by smtp.gmail.com with ESMTPSA id og40-20020a1709071de800b00a46ab3adea5sm6515562ejc.113.2024.04.16.00.46.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Apr 2024 00:46:19 -0700 (PDT) From: Andreas Hindborg To: Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho Cc: Andreas Hindborg , Boqun Feng , Gary Guo , =?UTF-8?q?Bj=C3=B6rn=20Roy=20Baron?= , Benno Lossin , Alice Ryhl , rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: rust: split up helpers.c Date: Tue, 16 Apr 2024 09:46:07 +0200 Message-ID: <20240416074607.1395481-1-nmi@metaspace.dk> X-Mailer: git-send-email 2.44.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Andreas Hindborg This patch splits up the rust helpers C file. When rebasing patch sets on upstream linux, merge conflicts in helpers.c is common and time consuming [1]. Thus, split the file so that each kernel component can live in a separate file. This patch lists helper files explicitly and thus conflicts in the file list is still likely. However, they should be more simple to resolve than the conflicts usually seen in helpers.c. Link: https://rust-for-linux.zulipchat.com/#narrow/stream/288089-General/topic/Sp= litting.20up.20helpers.2Ec/near/426694012 [1] Signed-off-by: Andreas Hindborg Reviewed-by: Sergio Gonz=C3=A1lez Collado Tested-by: Sergio Gonz=C3=A1lez Collado --- rust/Makefile | 36 ++++++-- rust/helpers.c | 180 ------------------------------------ rust/helpers/Makefile | 7 ++ rust/helpers/README.md | 18 ++++ rust/helpers/bug.c | 9 ++ rust/helpers/build_assert.c | 25 +++++ rust/helpers/build_bug.c | 10 ++ rust/helpers/err.c | 22 +++++ rust/helpers/kunit.c | 10 ++ rust/helpers/mutex.c | 10 ++ rust/helpers/refcount.c | 22 +++++ rust/helpers/signal.c | 10 ++ rust/helpers/spinlock.c | 27 ++++++ rust/helpers/task.c | 22 +++++ rust/helpers/wait.c | 10 ++ rust/helpers/workqueue.c | 16 ++++ 16 files changed, 246 insertions(+), 188 deletions(-) delete mode 100644 rust/helpers.c create mode 100644 rust/helpers/Makefile create mode 100644 rust/helpers/README.md create mode 100644 rust/helpers/bug.c create mode 100644 rust/helpers/build_assert.c create mode 100644 rust/helpers/build_bug.c create mode 100644 rust/helpers/err.c create mode 100644 rust/helpers/kunit.c create mode 100644 rust/helpers/mutex.c create mode 100644 rust/helpers/refcount.c create mode 100644 rust/helpers/signal.c create mode 100644 rust/helpers/spinlock.c create mode 100644 rust/helpers/task.c create mode 100644 rust/helpers/wait.c create mode 100644 rust/helpers/workqueue.c diff --git a/rust/Makefile b/rust/Makefile index 846e6ab9d5a9..ef76dcd5aa7a 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -6,10 +6,22 @@ rustdoc_output :=3D $(objtree)/Documentation/output/rust/= rustdoc obj-$(CONFIG_RUST) +=3D core.o compiler_builtins.o always-$(CONFIG_RUST) +=3D exports_core_generated.h =20 -# Missing prototypes are expected in the helpers since these are exported -# for Rust only, thus there is no header nor prototypes. -obj-$(CONFIG_RUST) +=3D helpers.o -CFLAGS_REMOVE_helpers.o =3D -Wmissing-prototypes -Wmissing-declarations +RUST_HELPERS :=3D \ + bug \ + build_assert \ + build_bug \ + err \ + kunit \ + mutex \ + refcount \ + signal \ + spinlock\ + task \ + wait \ + workqueue + +export RUST_HELPERS +obj-y +=3D helpers/ =20 always-$(CONFIG_RUST) +=3D libmacros.so no-clean-files +=3D libmacros.so @@ -339,6 +351,10 @@ quiet_cmd_bindgen =3D BINDGEN $@ -o $@ -- $(bindgen_c_flags_final) -DMODULE \ $(bindgen_target_cflags) $(bindgen_target_extra) =20 +quiet_cmd_cat =3D CAT $@ + cmd_cat =3D \ + cat $(patsubst %,$(srctree)/$(src)/helpers/%.c, $(RUST_HELPERS)) > $@ + $(obj)/bindings/bindings_generated.rs: private bindgen_target_flags =3D \ $(shell grep -Ev '^#|^$$' $(srctree)/$(src)/bindgen_parameters) $(obj)/bindings/bindings_generated.rs: private bindgen_target_extra =3D ; \ @@ -353,9 +369,9 @@ $(obj)/uapi/uapi_generated.rs: $(src)/uapi/uapi_helper.= h \ $(src)/bindgen_parameters FORCE $(call if_changed_dep,bindgen) =20 -# See `CFLAGS_REMOVE_helpers.o` above. In addition, Clang on C does not wa= rn -# with `-Wmissing-declarations` (unlike GCC), so it is not strictly needed= here -# given it is `libclang`; but for consistency, future Clang changes and/or +# See `ccflags-remove-y` in helpers/Makefile . In addition, Clang on C doe= s not +# warn with `-Wmissing-declarations` (unlike GCC), so it is not strictly n= eeded +# here given it is `libclang`; but for consistency, future Clang changes a= nd/or # a potential future GCC backend for `bindgen`, we disable it too. $(obj)/bindings/bindings_helpers_generated.rs: private bindgen_target_flag= s =3D \ --blocklist-type '.*' --allowlist-var '' \ @@ -364,9 +380,13 @@ $(obj)/bindings/bindings_helpers_generated.rs: private= bindgen_target_cflags =3D \ -I$(objtree)/$(obj) -Wno-missing-prototypes -Wno-missing-declarations $(obj)/bindings/bindings_helpers_generated.rs: private bindgen_target_extr= a =3D ; \ sed -Ei 's/pub fn rust_helper_([a-zA-Z0-9_]*)/#[link_name=3D"rust_help= er_\1"]\n pub fn \1/g' $@ -$(obj)/bindings/bindings_helpers_generated.rs: $(src)/helpers.c FORCE +$(obj)/bindings/bindings_helpers_generated.rs: $(obj)/helpers/helpers_comb= ined.c FORCE $(call if_changed_dep,bindgen) =20 +targets +=3D helpers/helpers_combined.c +$(obj)/helpers/helpers_combined.c: $(patsubst %,$(src)/helpers/%.c, $(RUST= _HELPERS)) FORCE + $(call if_changed,cat) + quiet_cmd_exports =3D EXPORTS $@ cmd_exports =3D \ $(NM) -p --defined-only $< \ diff --git a/rust/helpers.c b/rust/helpers.c deleted file mode 100644 index 70e59efd92bc..000000000000 --- a/rust/helpers.c +++ /dev/null @@ -1,180 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Non-trivial C macros cannot be used in Rust. Similarly, inlined C funct= ions - * cannot be called either. This file explicitly creates functions ("helpe= rs") - * that wrap those so that they can be called from Rust. - * - * Even though Rust kernel modules should never use directly the bindings,= some - * of these helpers need to be exported because Rust generics and inlined - * functions may not get their code generated in the crate where they are - * defined. Other helpers, called from non-inline functions, may not be - * exported, in principle. However, in general, the Rust compiler does not - * guarantee codegen will be performed for a non-inline function either. - * Therefore, this file exports all the helpers. In the future, this may be - * revisited to reduce the number of exports after the compiler is informed - * about the places codegen is required. - * - * All symbols are exported as GPL-only to guarantee no GPL-only feature is - * accidentally exposed. - * - * Sorted alphabetically. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -__noreturn void rust_helper_BUG(void) -{ - BUG(); -} -EXPORT_SYMBOL_GPL(rust_helper_BUG); - -void rust_helper_mutex_lock(struct mutex *lock) -{ - mutex_lock(lock); -} -EXPORT_SYMBOL_GPL(rust_helper_mutex_lock); - -void rust_helper___spin_lock_init(spinlock_t *lock, const char *name, - struct lock_class_key *key) -{ -#ifdef CONFIG_DEBUG_SPINLOCK - __raw_spin_lock_init(spinlock_check(lock), name, key, LD_WAIT_CONFIG); -#else - spin_lock_init(lock); -#endif -} -EXPORT_SYMBOL_GPL(rust_helper___spin_lock_init); - -void rust_helper_spin_lock(spinlock_t *lock) -{ - spin_lock(lock); -} -EXPORT_SYMBOL_GPL(rust_helper_spin_lock); - -void rust_helper_spin_unlock(spinlock_t *lock) -{ - spin_unlock(lock); -} -EXPORT_SYMBOL_GPL(rust_helper_spin_unlock); - -void rust_helper_init_wait(struct wait_queue_entry *wq_entry) -{ - init_wait(wq_entry); -} -EXPORT_SYMBOL_GPL(rust_helper_init_wait); - -int rust_helper_signal_pending(struct task_struct *t) -{ - return signal_pending(t); -} -EXPORT_SYMBOL_GPL(rust_helper_signal_pending); - -refcount_t rust_helper_REFCOUNT_INIT(int n) -{ - return (refcount_t)REFCOUNT_INIT(n); -} -EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); - -void rust_helper_refcount_inc(refcount_t *r) -{ - refcount_inc(r); -} -EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); - -bool rust_helper_refcount_dec_and_test(refcount_t *r) -{ - return refcount_dec_and_test(r); -} -EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); - -__force void *rust_helper_ERR_PTR(long err) -{ - return ERR_PTR(err); -} -EXPORT_SYMBOL_GPL(rust_helper_ERR_PTR); - -bool rust_helper_IS_ERR(__force const void *ptr) -{ - return IS_ERR(ptr); -} -EXPORT_SYMBOL_GPL(rust_helper_IS_ERR); - -long rust_helper_PTR_ERR(__force const void *ptr) -{ - return PTR_ERR(ptr); -} -EXPORT_SYMBOL_GPL(rust_helper_PTR_ERR); - -const char *rust_helper_errname(int err) -{ - return errname(err); -} -EXPORT_SYMBOL_GPL(rust_helper_errname); - -struct task_struct *rust_helper_get_current(void) -{ - return current; -} -EXPORT_SYMBOL_GPL(rust_helper_get_current); - -void rust_helper_get_task_struct(struct task_struct *t) -{ - get_task_struct(t); -} -EXPORT_SYMBOL_GPL(rust_helper_get_task_struct); - -void rust_helper_put_task_struct(struct task_struct *t) -{ - put_task_struct(t); -} -EXPORT_SYMBOL_GPL(rust_helper_put_task_struct); - -struct kunit *rust_helper_kunit_get_current_test(void) -{ - return kunit_get_current_test(); -} -EXPORT_SYMBOL_GPL(rust_helper_kunit_get_current_test); - -void rust_helper_init_work_with_key(struct work_struct *work, work_func_t = func, - bool onstack, const char *name, - struct lock_class_key *key) -{ - __init_work(work, onstack); - work->data =3D (atomic_long_t)WORK_DATA_INIT(); - lockdep_init_map(&work->lockdep_map, name, key, 0); - INIT_LIST_HEAD(&work->entry); - work->func =3D func; -} -EXPORT_SYMBOL_GPL(rust_helper_init_work_with_key); - -/* - * `bindgen` binds the C `size_t` type as the Rust `usize` type, so we can - * use it in contexts where Rust expects a `usize` like slice (array) indi= ces. - * `usize` is defined to be the same as C's `uintptr_t` type (can hold any - * pointer) but not necessarily the same as `size_t` (can hold the size of= any - * single object). Most modern platforms use the same concrete integer typ= e for - * both of them, but in case we find ourselves on a platform where - * that's not true, fail early instead of risking ABI or - * integer-overflow issues. - * - * If your platform fails this assertion, it means that you are in - * danger of integer-overflow bugs (even if you attempt to add - * `--no-size_t-is-usize`). It may be easiest to change the kernel ABI on - * your platform such that `size_t` matches `uintptr_t` (i.e., to increase - * `size_t`, because `uintptr_t` has to be at least as big as `size_t`). - */ -static_assert( - sizeof(size_t) =3D=3D sizeof(uintptr_t) && - __alignof__(size_t) =3D=3D __alignof__(uintptr_t), - "Rust code expects C `size_t` to match Rust `usize`" -); diff --git a/rust/helpers/Makefile b/rust/helpers/Makefile new file mode 100644 index 000000000000..f0236099f209 --- /dev/null +++ b/rust/helpers/Makefile @@ -0,0 +1,7 @@ + +# Note: `RUST_HELPERS` is defined in `../Makefile` + +# Missing prototypes are expected in the helpers since these are exported +# for Rust only, thus there is no header nor prototypes. +obj-$(CONFIG_RUST) +=3D $(patsubst %,%.o, $(RUST_HELPERS)) +ccflags-remove-y +=3D -Wmissing-prototypes -Wmissing-declarations diff --git a/rust/helpers/README.md b/rust/helpers/README.md new file mode 100644 index 000000000000..7b94ac69878f --- /dev/null +++ b/rust/helpers/README.md @@ -0,0 +1,18 @@ +# Rust Helpers + +Non-trivial C macros cannot be used in Rust. Similarly, inlined C functions +cannot be called either. The files in this directory explicitly create fun= ctions +("helpers") that wrap those so that they can be called from Rust. + +Even though Rust kernel modules should never use directly the bindings, so= me +of these helpers need to be exported because Rust generics and inlined +functions may not get their code generated in the crate where they are +defined. Other helpers, called from non-inline functions, may not be +exported, in principle. However, in general, the Rust compiler does not +guarantee codegen will be performed for a non-inline function either. +Therefore, this file exports all the helpers. In the future, this may be +revisited to reduce the number of exports after the compiler is informed +about the places codegen is required. + +All symbols are exported as GPL-only to guarantee no GPL-only feature is +accidentally exposed. diff --git a/rust/helpers/bug.c b/rust/helpers/bug.c new file mode 100644 index 000000000000..e2afbad23dcd --- /dev/null +++ b/rust/helpers/bug.c @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include + +__noreturn void rust_helper_BUG(void) +{ + BUG(); +} +EXPORT_SYMBOL_GPL(rust_helper_BUG); diff --git a/rust/helpers/build_assert.c b/rust/helpers/build_assert.c new file mode 100644 index 000000000000..6a54b2680b14 --- /dev/null +++ b/rust/helpers/build_assert.c @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include + +/* + * `bindgen` binds the C `size_t` type as the Rust `usize` type, so we can + * use it in contexts where Rust expects a `usize` like slice (array) indi= ces. + * `usize` is defined to be the same as C's `uintptr_t` type (can hold any + * pointer) but not necessarily the same as `size_t` (can hold the size of= any + * single object). Most modern platforms use the same concrete integer typ= e for + * both of them, but in case we find ourselves on a platform where + * that's not true, fail early instead of risking ABI or + * integer-overflow issues. + * + * If your platform fails this assertion, it means that you are in + * danger of integer-overflow bugs (even if you attempt to add + * `--no-size_t-is-usize`). It may be easiest to change the kernel ABI on + * your platform such that `size_t` matches `uintptr_t` (i.e., to increase + * `size_t`, because `uintptr_t` has to be at least as big as `size_t`). + */ +static_assert( + sizeof(size_t) =3D=3D sizeof(uintptr_t) && + __alignof__(size_t) =3D=3D __alignof__(uintptr_t), + "Rust code expects C `size_t` to match Rust `usize`" +); diff --git a/rust/helpers/build_bug.c b/rust/helpers/build_bug.c new file mode 100644 index 000000000000..f3106f248485 --- /dev/null +++ b/rust/helpers/build_bug.c @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +const char *rust_helper_errname(int err) +{ + return errname(err); +} +EXPORT_SYMBOL_GPL(rust_helper_errname); diff --git a/rust/helpers/err.c b/rust/helpers/err.c new file mode 100644 index 000000000000..fba4e0be64f5 --- /dev/null +++ b/rust/helpers/err.c @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +__force void *rust_helper_ERR_PTR(long err) +{ + return ERR_PTR(err); +} +EXPORT_SYMBOL_GPL(rust_helper_ERR_PTR); + +bool rust_helper_IS_ERR(__force const void *ptr) +{ + return IS_ERR(ptr); +} +EXPORT_SYMBOL_GPL(rust_helper_IS_ERR); + +long rust_helper_PTR_ERR(__force const void *ptr) +{ + return PTR_ERR(ptr); +} +EXPORT_SYMBOL_GPL(rust_helper_PTR_ERR); diff --git a/rust/helpers/kunit.c b/rust/helpers/kunit.c new file mode 100644 index 000000000000..905e4ff4424a --- /dev/null +++ b/rust/helpers/kunit.c @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +struct kunit *rust_helper_kunit_get_current_test(void) +{ + return kunit_get_current_test(); +} +EXPORT_SYMBOL_GPL(rust_helper_kunit_get_current_test); diff --git a/rust/helpers/mutex.c b/rust/helpers/mutex.c new file mode 100644 index 000000000000..29fd141c387d --- /dev/null +++ b/rust/helpers/mutex.c @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +void rust_helper_mutex_lock(struct mutex *lock) +{ + mutex_lock(lock); +} +EXPORT_SYMBOL_GPL(rust_helper_mutex_lock); diff --git a/rust/helpers/refcount.c b/rust/helpers/refcount.c new file mode 100644 index 000000000000..13ab64805f77 --- /dev/null +++ b/rust/helpers/refcount.c @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +refcount_t rust_helper_REFCOUNT_INIT(int n) +{ + return (refcount_t)REFCOUNT_INIT(n); +} +EXPORT_SYMBOL_GPL(rust_helper_REFCOUNT_INIT); + +void rust_helper_refcount_inc(refcount_t *r) +{ + refcount_inc(r); +} +EXPORT_SYMBOL_GPL(rust_helper_refcount_inc); + +bool rust_helper_refcount_dec_and_test(refcount_t *r) +{ + return refcount_dec_and_test(r); +} +EXPORT_SYMBOL_GPL(rust_helper_refcount_dec_and_test); diff --git a/rust/helpers/signal.c b/rust/helpers/signal.c new file mode 100644 index 000000000000..d44e8096b8a9 --- /dev/null +++ b/rust/helpers/signal.c @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +int rust_helper_signal_pending(struct task_struct *t) +{ + return signal_pending(t); +} +EXPORT_SYMBOL_GPL(rust_helper_signal_pending); diff --git a/rust/helpers/spinlock.c b/rust/helpers/spinlock.c new file mode 100644 index 000000000000..04fd8ddb4986 --- /dev/null +++ b/rust/helpers/spinlock.c @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +void rust_helper___spin_lock_init(spinlock_t *lock, const char *name, + struct lock_class_key *key) +{ +#ifdef CONFIG_DEBUG_SPINLOCK + __raw_spin_lock_init(spinlock_check(lock), name, key, LD_WAIT_CONFIG); +#else + spin_lock_init(lock); +#endif +} +EXPORT_SYMBOL_GPL(rust_helper___spin_lock_init); + +void rust_helper_spin_lock(spinlock_t *lock) +{ + spin_lock(lock); +} +EXPORT_SYMBOL_GPL(rust_helper_spin_lock); + +void rust_helper_spin_unlock(spinlock_t *lock) +{ + spin_unlock(lock); +} +EXPORT_SYMBOL_GPL(rust_helper_spin_unlock); diff --git a/rust/helpers/task.c b/rust/helpers/task.c new file mode 100644 index 000000000000..b176c347f0d4 --- /dev/null +++ b/rust/helpers/task.c @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +struct task_struct *rust_helper_get_current(void) +{ + return current; +} +EXPORT_SYMBOL_GPL(rust_helper_get_current); + +void rust_helper_get_task_struct(struct task_struct *t) +{ + get_task_struct(t); +} +EXPORT_SYMBOL_GPL(rust_helper_get_task_struct); + +void rust_helper_put_task_struct(struct task_struct *t) +{ + put_task_struct(t); +} +EXPORT_SYMBOL_GPL(rust_helper_put_task_struct); diff --git a/rust/helpers/wait.c b/rust/helpers/wait.c new file mode 100644 index 000000000000..bf361f40c7cb --- /dev/null +++ b/rust/helpers/wait.c @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +void rust_helper_init_wait(struct wait_queue_entry *wq_entry) +{ + init_wait(wq_entry); +} +EXPORT_SYMBOL_GPL(rust_helper_init_wait); diff --git a/rust/helpers/workqueue.c b/rust/helpers/workqueue.c new file mode 100644 index 000000000000..12e2ee66aa4f --- /dev/null +++ b/rust/helpers/workqueue.c @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 + +#include +#include + +void rust_helper_init_work_with_key(struct work_struct *work, work_func_t = func, + bool onstack, const char *name, + struct lock_class_key *key) +{ + __init_work(work, onstack); + work->data =3D (atomic_long_t)WORK_DATA_INIT(); + lockdep_init_map(&work->lockdep_map, name, key, 0); + INIT_LIST_HEAD(&work->entry); + work->func =3D func; +} +EXPORT_SYMBOL_GPL(rust_helper_init_work_with_key); base-commit: 8db31d3f3bd5dbc8cf3a22bba04b4b4add7f984e --=20 2.44.0