* [PATCH] selftests: centralise maybe-unused definition in kselftest.h
@ 2025-08-21 10:11 Bala-Vignesh-Reddy
2025-08-21 14:46 ` Wei Yang
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Bala-Vignesh-Reddy @ 2025-08-21 10:11 UTC (permalink / raw)
To: akpm, shuah
Cc: mic, gnoack, david, lorenzo.stoakes, Liam.Howlett, vbabka, rppt,
surenb, mhocko, davem, edumazet, kuba, pabeni, horms, ming.lei,
skhan, linux-kselftest, linux-kernel, linux-security-module,
linux-mm, netdev, linux-fsdevel, linux-block,
reddybalavignesh9979
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@linux-foundation.org>
Link:https://lore.kernel.org/lkml/20250820143954.33d95635e504e94df01930d0@linux-foundation.org/
Signed-off-by: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com>
---
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
-
/* 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] selftests: centralise maybe-unused definition in kselftest.h
2025-08-21 10:11 [PATCH] selftests: centralise maybe-unused definition in kselftest.h Bala-Vignesh-Reddy
@ 2025-08-21 14:46 ` Wei Yang
2025-08-21 16:56 ` SeongJae Park
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Wei Yang @ 2025-08-21 14:46 UTC (permalink / raw)
To: Bala-Vignesh-Reddy
Cc: akpm, shuah, mic, gnoack, david, lorenzo.stoakes, Liam.Howlett,
vbabka, rppt, surenb, mhocko, davem, edumazet, kuba, pabeni,
horms, ming.lei, skhan, linux-kselftest, linux-kernel,
linux-security-module, linux-mm, netdev, linux-fsdevel,
linux-block
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@linux-foundation.org>
>Link:https://lore.kernel.org/lkml/20250820143954.33d95635e504e94df01930d0@linux-foundation.org/
>
>Signed-off-by: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com>
Looks reasonable.
Reviewed-by: Wei Yang <richard.weiyang@gmail.com>
--
Wei Yang
Help you, Help me
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] selftests: centralise maybe-unused definition in kselftest.h
2025-08-21 10:11 [PATCH] selftests: centralise maybe-unused definition in kselftest.h Bala-Vignesh-Reddy
2025-08-21 14:46 ` Wei Yang
@ 2025-08-21 16:56 ` SeongJae Park
2025-08-22 1:21 ` Ming Lei
2025-08-22 14:51 ` Mickaël Salaün
3 siblings, 0 replies; 5+ messages in thread
From: SeongJae Park @ 2025-08-21 16:56 UTC (permalink / raw)
To: Bala-Vignesh-Reddy
Cc: SeongJae Park, akpm, shuah, mic, gnoack, david, lorenzo.stoakes,
Liam.Howlett, vbabka, rppt, surenb, mhocko, davem, edumazet, kuba,
pabeni, horms, ming.lei, skhan, linux-kselftest, linux-kernel,
linux-security-module, linux-mm, netdev, linux-fsdevel,
linux-block
On Thu, 21 Aug 2025 15:41:59 +0530 Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com> 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@linux-foundation.org>
> Link:https://lore.kernel.org/lkml/20250820143954.33d95635e504e94df01930d0@linux-foundation.org/
>
> Signed-off-by: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com>
Acked-by: SeongJae Park <sj@kernel.org>
Thanks,
SJ
[...]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] selftests: centralise maybe-unused definition in kselftest.h
2025-08-21 10:11 [PATCH] selftests: centralise maybe-unused definition in kselftest.h Bala-Vignesh-Reddy
2025-08-21 14:46 ` Wei Yang
2025-08-21 16:56 ` SeongJae Park
@ 2025-08-22 1:21 ` Ming Lei
2025-08-22 14:51 ` Mickaël Salaün
3 siblings, 0 replies; 5+ messages in thread
From: Ming Lei @ 2025-08-22 1:21 UTC (permalink / raw)
To: Bala-Vignesh-Reddy
Cc: akpm, shuah, mic, gnoack, david, lorenzo.stoakes, Liam.Howlett,
vbabka, rppt, surenb, mhocko, davem, edumazet, kuba, pabeni,
horms, skhan, linux-kselftest, linux-kernel,
linux-security-module, linux-mm, netdev, linux-fsdevel,
linux-block
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@linux-foundation.org>
> Link:https://lore.kernel.org/lkml/20250820143954.33d95635e504e94df01930d0@linux-foundation.org/
>
> Signed-off-by: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Thanks,
Ming
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] selftests: centralise maybe-unused definition in kselftest.h
2025-08-21 10:11 [PATCH] selftests: centralise maybe-unused definition in kselftest.h Bala-Vignesh-Reddy
` (2 preceding siblings ...)
2025-08-22 1:21 ` Ming Lei
@ 2025-08-22 14:51 ` Mickaël Salaün
3 siblings, 0 replies; 5+ messages in thread
From: Mickaël Salaün @ 2025-08-22 14:51 UTC (permalink / raw)
To: Bala-Vignesh-Reddy
Cc: akpm, shuah, gnoack, david, lorenzo.stoakes, Liam.Howlett, vbabka,
rppt, surenb, mhocko, davem, edumazet, kuba, pabeni, horms,
ming.lei, skhan, linux-kselftest, linux-kernel,
linux-security-module, linux-mm, netdev, linux-fsdevel,
linux-block
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@linux-foundation.org>
> Link:https://lore.kernel.org/lkml/20250820143954.33d95635e504e94df01930d0@linux-foundation.org/
>
> Signed-off-by: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com>
Looks good for Landlock:
Acked-by: Mickaël Salaün <mic@digikod.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
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-08-22 15:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-21 10:11 [PATCH] selftests: centralise maybe-unused definition in kselftest.h Bala-Vignesh-Reddy
2025-08-21 14:46 ` Wei Yang
2025-08-21 16:56 ` SeongJae Park
2025-08-22 1:21 ` Ming Lei
2025-08-22 14:51 ` Mickaël Salaün
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).