linux-kernel - Re: [PATCH v2 04/11] rust: helpers: Remove kunit helper

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <900683ff-568e-4f63-a8c7-31271bd83988@de.bosch.com>
Date: Fri, 8 Nov 2024 07:00:32 +0100
From: Dirk Behme <dirk.behme@...bosch.com>
To: Alistair Francis <alistair23@...il.com>, <a.hindborg@...nel.org>,
	<boqun.feng@...il.com>, <bjorn3_gh@...tonmail.com>,
	<alistair.francis@....com>, <rust-for-linux@...r.kernel.org>,
	<me@...enk.dev>, <benno.lossin@...ton.me>, <aliceryhl@...gle.com>,
	<tmgross@...ch.edu>, <linux-kernel@...r.kernel.org>, <alex.gaynor@...il.com>,
	<ojeda@...nel.org>, <gary@...yguo.net>
Subject: Re: [PATCH v2 04/11] rust: helpers: Remove kunit helper

Hi Alistair,

On 08.11.2024 04:10, Alistair Francis wrote:
> Now that we support wrap-static-fns we no longer need the custom helper.
> 
> Signed-off-by: Alistair Francis <alistair.francis@....com>
> ---
>   rust/bindgen_static_functions | 2 ++
>   rust/helpers/helpers.c        | 1 -
>   rust/helpers/kunit.c          | 8 --------
>   3 files changed, 2 insertions(+), 9 deletions(-)
>   delete mode 100644 rust/helpers/kunit.c
> 
> diff --git a/rust/bindgen_static_functions b/rust/bindgen_static_functions
> index 0269efa83c61..b4032d277e72 100644
> --- a/rust/bindgen_static_functions
> +++ b/rust/bindgen_static_functions
> @@ -9,3 +9,5 @@
>   --allowlist-function ERR_PTR
>   --allowlist-function IS_ERR
>   --allowlist-function PTR_ERR
> +
> +--allowlist-function kunit_get_current_test
> diff --git a/rust/helpers/helpers.c b/rust/helpers/helpers.c
> index e089ecdf091f..60b3fdc5c2de 100644
> --- a/rust/helpers/helpers.c
> +++ b/rust/helpers/helpers.c
> @@ -10,7 +10,6 @@
>   #include "bug.c"
>   #include "build_assert.c"
>   #include "build_bug.c"
> -#include "kunit.c"
>   #include "mutex.c"
>   #include "page.c"
>   #include "rbtree.c"
> diff --git a/rust/helpers/kunit.c b/rust/helpers/kunit.c
> deleted file mode 100644
> index b85a4d394c11..000000000000
> --- a/rust/helpers/kunit.c
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -
> -#include <kunit/test-bug.h>
> -
> -struct kunit *rust_helper_kunit_get_current_test(void)
> -{
> -	return kunit_get_current_test();
> -}

Could you check this? I don't get kunit_get_current_test() in the 
resulting bindings/bindings_generated_static.rs and 
exports_bindings_static_generated.h. So with CONFIG_KUNIT and 
CONFIG_RUST_KERNEL_DOCTESTS being enabled (not sure if both are required 
;) ) I get dozens of errors due to that missing:

error[E0425]: cannot find function `kunit_get_current_test` in crate 
`$crate::bindings`

Reverting only this 4/11 and keeping all other patches of this series 
makes my kernel build fine, though :)


Btw, do we want/need an update of the documentation?

https://docs.kernel.org/rust/general-information.html#bindings

Thanks

Dirk

P.S.: Many thanks for rebasing against rust-next!