From: Greg Kroah-Hartman Date: Mon, 29 Apr 2024 13:29:59 +0000 (+0200) Subject: drop a rust patch from 6.1 and 6.6 X-Git-Tag: v4.19.313~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6e5cc68ad98b55884febbcef64f3868bf88cb034;p=thirdparty%2Fkernel%2Fstable-queue.git drop a rust patch from 6.1 and 6.6 --- diff --git a/queue-6.1/rust-kernel-require-send-for-module-implementations.patch b/queue-6.1/rust-kernel-require-send-for-module-implementations.patch deleted file mode 100644 index 71dc25af31a..00000000000 --- a/queue-6.1/rust-kernel-require-send-for-module-implementations.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 323617f649c0966ad5e741e47e27e06d3a680d8f Mon Sep 17 00:00:00 2001 -From: Wedson Almeida Filho -Date: Thu, 28 Mar 2024 16:54:54 -0300 -Subject: rust: kernel: require `Send` for `Module` implementations - -From: Wedson Almeida Filho - -commit 323617f649c0966ad5e741e47e27e06d3a680d8f upstream. - -The thread that calls the module initialisation code when a module is -loaded is not guaranteed [in fact, it is unlikely] to be the same one -that calls the module cleanup code on module unload, therefore, `Module` -implementations must be `Send` to account for them moving from one -thread to another implicitly. - -Signed-off-by: Wedson Almeida Filho -Reviewed-by: Alice Ryhl -Reviewed-by: Benno Lossin -Cc: stable@vger.kernel.org # 6.8.x: df70d04d5697: rust: phy: implement `Send` for `Registration` -Cc: stable@vger.kernel.org -Fixes: 247b365dc8dc ("rust: add `kernel` crate") -Link: https://lore.kernel.org/r/20240328195457.225001-3-wedsonaf@gmail.com -Signed-off-by: Miguel Ojeda -Signed-off-by: Greg Kroah-Hartman ---- - rust/kernel/lib.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/rust/kernel/lib.rs -+++ b/rust/kernel/lib.rs -@@ -37,7 +37,7 @@ const __LOG_PREFIX: &[u8] = b"rust_kerne - /// The top level entrypoint to implementing a kernel module. - /// - /// For any teardown or cleanup operations, your type may implement [`Drop`]. --pub trait Module: Sized + Sync { -+pub trait Module: Sized + Sync + Send { - /// Called at module initialization time. - /// - /// Use this method to perform whatever setup or registration your module diff --git a/queue-6.1/series b/queue-6.1/series index 820c5e0f0cb..99181ccb7e6 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -61,7 +61,6 @@ revert-crypto-api-disallow-identical-driver-names.patch virtio_net-do-not-send-rss-key-if-it-is-not-supported.patch fork-defer-linking-file-vma-until-vma-is-fully-initialized.patch x86-cpu-fix-check-for-rdpkru-in-__show_regs.patch -rust-kernel-require-send-for-module-implementations.patch rust-don-t-select-constructors.patch rust-make-mutually-exclusive-with-cfi_clang.patch bluetooth-fix-type-of-len-in-l2cap-sco-_sock_getsockopt_old.patch diff --git a/queue-6.6/rust-kernel-require-send-for-module-implementations.patch b/queue-6.6/rust-kernel-require-send-for-module-implementations.patch deleted file mode 100644 index d201d1ac703..00000000000 --- a/queue-6.6/rust-kernel-require-send-for-module-implementations.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 323617f649c0966ad5e741e47e27e06d3a680d8f Mon Sep 17 00:00:00 2001 -From: Wedson Almeida Filho -Date: Thu, 28 Mar 2024 16:54:54 -0300 -Subject: rust: kernel: require `Send` for `Module` implementations - -From: Wedson Almeida Filho - -commit 323617f649c0966ad5e741e47e27e06d3a680d8f upstream. - -The thread that calls the module initialisation code when a module is -loaded is not guaranteed [in fact, it is unlikely] to be the same one -that calls the module cleanup code on module unload, therefore, `Module` -implementations must be `Send` to account for them moving from one -thread to another implicitly. - -Signed-off-by: Wedson Almeida Filho -Reviewed-by: Alice Ryhl -Reviewed-by: Benno Lossin -Cc: stable@vger.kernel.org # 6.8.x: df70d04d5697: rust: phy: implement `Send` for `Registration` -Cc: stable@vger.kernel.org -Fixes: 247b365dc8dc ("rust: add `kernel` crate") -Link: https://lore.kernel.org/r/20240328195457.225001-3-wedsonaf@gmail.com -Signed-off-by: Miguel Ojeda -Signed-off-by: Greg Kroah-Hartman ---- - rust/kernel/lib.rs | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/rust/kernel/lib.rs -+++ b/rust/kernel/lib.rs -@@ -60,7 +60,7 @@ const __LOG_PREFIX: &[u8] = b"rust_kerne - /// The top level entrypoint to implementing a kernel module. - /// - /// For any teardown or cleanup operations, your type may implement [`Drop`]. --pub trait Module: Sized + Sync { -+pub trait Module: Sized + Sync + Send { - /// Called at module initialization time. - /// - /// Use this method to perform whatever setup or registration your module diff --git a/queue-6.6/series b/queue-6.6/series index b45dc2a658a..4a7a68e7ea7 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -109,7 +109,6 @@ selftests-seccomp-change-the-syscall-used-in-kill_thread-test.patch selftests-seccomp-handle-einval-on-unshare-clone_newpid.patch fork-defer-linking-file-vma-until-vma-is-fully-initialized.patch x86-cpu-fix-check-for-rdpkru-in-__show_regs.patch -rust-kernel-require-send-for-module-implementations.patch rust-don-t-select-constructors.patch rust-init-remove-impl-zeroable-for-infallible.patch rust-make-mutually-exclusive-with-cfi_clang.patch