| 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
| ||
|
Message-ID: <20250822.Ahno5pong1Ai@digikod.net>
Date: Fri, 22 Aug 2025 16:51:09 +0200
From: Mickaël Salaün <mic@...ikod.net>
To: Bala-Vignesh-Reddy <reddybalavignesh9979@...il.com>
Cc: akpm@...ux-foundation.org, shuah@...nel.org, gnoack@...gle.com,
david@...hat.com, lorenzo.stoakes@...cle.com, Liam.Howlett@...cle.com,
vbabka@...e.cz, rppt@...nel.org, surenb@...gle.com, mhocko@...e.com,
davem@...emloft.net, edumazet@...gle.com, kuba@...nel.org, pabeni@...hat.com,
horms@...nel.org, ming.lei@...hat.com, skhan@...uxfoundation.org,
linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-security-module@...r.kernel.org, linux-mm@...ck.org, netdev@...r.kernel.org,
linux-fsdevel@...r.kernel.org, linux-block@...r.kernel.org
Subject: Re: [PATCH] selftests: centralise maybe-unused definition in
kselftest.h
On Thu, Aug 21, 2025 at 03:41:59PM +0530, Bala-Vignesh-Reddy wrote:
> Several selftests subdirectories duplicated the define __maybe_unused,
> leading to redundant code. Moved to kselftest.h header and removed
> other definition.
>
> This addresses the duplication noted in the proc-pid-vm warning fix
>
> Suggested-by: Andrew Morton <akpm@...ux-foundation.org>
> Link:https://lore.kernel.org/lkml/20250820143954.33d95635e504e94df01930d0@linux-foundation.org/
>
> Signed-off-by: Bala-Vignesh-Reddy <reddybalavignesh9979@...il.com>
Looks good for Landlock:
Acked-by: Mickaël Salaün <mic@...ikod.net>
> ---
> tools/testing/selftests/kselftest.h | 4 ++++
> tools/testing/selftests/landlock/audit.h | 6 ++----
> tools/testing/selftests/landlock/common.h | 4 ----
> tools/testing/selftests/mm/pkey-helpers.h | 3 ---
> tools/testing/selftests/net/psock_lib.h | 4 ----
> tools/testing/selftests/perf_events/watermark_signal.c | 2 --
> tools/testing/selftests/proc/proc-pid-vm.c | 4 ----
> tools/testing/selftests/ublk/utils.h | 2 --
> 8 files changed, 6 insertions(+), 23 deletions(-)
>
> diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h
> index c3b6d2604b1e..661d31c4b558 100644
> --- a/tools/testing/selftests/kselftest.h
> +++ b/tools/testing/selftests/kselftest.h
> @@ -92,6 +92,10 @@
> #endif
> #define __printf(a, b) __attribute__((format(printf, a, b)))
>
> +#ifndef __maybe_unused
> +#define __maybe_unused __attribute__((__unused__))
> +#endif
> +
> /* counters */
> struct ksft_count {
> unsigned int ksft_pass;
> diff --git a/tools/testing/selftests/landlock/audit.h b/tools/testing/selftests/landlock/audit.h
> index b16986aa6442..02fd1393947a 100644
> --- a/tools/testing/selftests/landlock/audit.h
> +++ b/tools/testing/selftests/landlock/audit.h
> @@ -20,14 +20,12 @@
> #include <sys/time.h>
> #include <unistd.h>
>
> +#include "../kselftest.h"
> +
> #ifndef ARRAY_SIZE
> #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
> #endif
>
> -#ifndef __maybe_unused
> -#define __maybe_unused __attribute__((__unused__))
> -#endif
> -
> #define REGEX_LANDLOCK_PREFIX "^audit([0-9.:]\\+): domain=\\([0-9a-f]\\+\\)"
>
> struct audit_filter {
> diff --git a/tools/testing/selftests/landlock/common.h b/tools/testing/selftests/landlock/common.h
> index 88a3c78f5d98..9acecae36f51 100644
> --- a/tools/testing/selftests/landlock/common.h
> +++ b/tools/testing/selftests/landlock/common.h
> @@ -22,10 +22,6 @@
>
> #define TMP_DIR "tmp"
>
> -#ifndef __maybe_unused
> -#define __maybe_unused __attribute__((__unused__))
> -#endif
> -
We could explicitly include kselftest.h in this file, but it's already
included by kselftest_harness.h, so that's OK.
> /* TEST_F_FORK() should not be used for new tests. */
> #define TEST_F_FORK(fixture_name, test_name) TEST_F(fixture_name, test_name)
>
> diff --git a/tools/testing/selftests/mm/pkey-helpers.h b/tools/testing/selftests/mm/pkey-helpers.h
> index ea404f80e6cb..fa15f006fa68 100644
> --- a/tools/testing/selftests/mm/pkey-helpers.h
> +++ b/tools/testing/selftests/mm/pkey-helpers.h
> @@ -84,9 +84,6 @@ extern void abort_hooks(void);
> #ifndef noinline
> # define noinline __attribute__((noinline))
> #endif
> -#ifndef __maybe_unused
> -# define __maybe_unused __attribute__((__unused__))
> -#endif
>
> int sys_pkey_alloc(unsigned long flags, unsigned long init_val);
> int sys_pkey_free(unsigned long pkey);
> diff --git a/tools/testing/selftests/net/psock_lib.h b/tools/testing/selftests/net/psock_lib.h
> index 6e4fef560873..067265b0a554 100644
> --- a/tools/testing/selftests/net/psock_lib.h
> +++ b/tools/testing/selftests/net/psock_lib.h
> @@ -22,10 +22,6 @@
>
> #define PORT_BASE 8000
>
> -#ifndef __maybe_unused
> -# define __maybe_unused __attribute__ ((__unused__))
> -#endif
> -
> static __maybe_unused void pair_udp_setfilter(int fd)
> {
> /* the filter below checks for all of the following conditions that
> diff --git a/tools/testing/selftests/perf_events/watermark_signal.c b/tools/testing/selftests/perf_events/watermark_signal.c
> index e03fe1b9bba2..b3a72f0ac522 100644
> --- a/tools/testing/selftests/perf_events/watermark_signal.c
> +++ b/tools/testing/selftests/perf_events/watermark_signal.c
> @@ -17,8 +17,6 @@
>
> #include "../kselftest_harness.h"
>
> -#define __maybe_unused __attribute__((__unused__))
> -
> static int sigio_count;
>
> static void handle_sigio(int signum __maybe_unused,
> diff --git a/tools/testing/selftests/proc/proc-pid-vm.c b/tools/testing/selftests/proc/proc-pid-vm.c
> index 978cbcb3eb11..2a72d37ad008 100644
> --- a/tools/testing/selftests/proc/proc-pid-vm.c
> +++ b/tools/testing/selftests/proc/proc-pid-vm.c
> @@ -47,10 +47,6 @@
> #include <sys/resource.h>
> #include <linux/fs.h>
>
> -#ifndef __maybe_unused
> -#define __maybe_unused __attribute__((__unused__))
> -#endif
> -
> #include "../kselftest.h"
>
> static inline long sys_execveat(int dirfd, const char *pathname, char **argv, char **envp, int flags)
> diff --git a/tools/testing/selftests/ublk/utils.h b/tools/testing/selftests/ublk/utils.h
> index 36545d1567f1..a852e0b7153e 100644
> --- a/tools/testing/selftests/ublk/utils.h
> +++ b/tools/testing/selftests/ublk/utils.h
> @@ -2,8 +2,6 @@
> #ifndef KUBLK_UTILS_H
> #define KUBLK_UTILS_H
>
> -#define __maybe_unused __attribute__((unused))
> -
> #ifndef min
> #define min(a, b) ((a) < (b) ? (a) : (b))
> #endif
> --
> 2.43.0
>
>
Powered by blists - more mailing lists