The patch titled
Subject: selftests/mm: Fix unused parameter warnings
has been added to the -mm mm-unstable branch. Its filename is
selftests-mm-fix-unused-parameter-warnings.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/selftests-mm-fix-unused-parameter-warnings.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Muhammad Usama Anjum <usama.anjum@xxxxxxxxxxxxx>
Subject: selftests/mm: Fix unused parameter warnings
Date: Thu, 9 Jan 2025 22:38:28 +0500
Fix warnings generated by unused parameters.
Link: https://lkml.kernel.org/r/20250109173842.1142376-3-usama.anjum@xxxxxxxxxxxxx
Signed-off-by: Muhammad Usama Anjum <usama.anjum@xxxxxxxxxxxxx>
Cc: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
Cc: Jérôme Glisse <jglisse@xxxxxxxxxx>
Cc: Kees Cook <kees@xxxxxxxxxx>
Cc: Shuah Khan <shuah@xxxxxxxxxx>
Cc: Will Drewry <wad@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/mm/hugetlb_fault_after_madv.c | 4
tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 6 -
tools/testing/selftests/mm/ksm_tests.c | 17 +--
tools/testing/selftests/mm/memfd_secret.c | 4
tools/testing/selftests/mm/soft-dirty.c | 4
tools/testing/selftests/mm/split_huge_page_test.c | 4
tools/testing/selftests/mm/uffd-common.c | 18 ++-
tools/testing/selftests/mm/uffd-common.h | 2
tools/testing/selftests/mm/uffd-stress.c | 2
tools/testing/selftests/mm/uffd-unit-tests.c | 52 +++++-----
10 files changed, 57 insertions(+), 56 deletions(-)
--- a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c
@@ -28,7 +28,7 @@ static void signal_handler(int signal)
}
/* Touch the memory while it is being madvised() */
-void *touch(void *unused)
+void *touch(void __attribute__((unused)) *unused)
{
char *ptr = (char *)huge_ptr;
@@ -41,7 +41,7 @@ void *touch(void *unused)
return NULL;
}
-void *madv(void *unused)
+void *madv(void __attribute__((unused)) *unused)
{
usleep(rand() % 10);
--- a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c
@@ -33,7 +33,7 @@ size_t mmap_size;
char *huge_ptr;
/* Touch the memory while it is being madvised() */
-void *touch(void *unused)
+void *touch(void __attribute__((unused)) *unused)
{
for (int i = 0; i < INLOOP_ITER; i++)
huge_ptr[0] = '.';
@@ -41,7 +41,7 @@ void *touch(void *unused)
return NULL;
}
-void *madv(void *unused)
+void *madv(void __attribute__((unused)) *unused)
{
for (int i = 0; i < INLOOP_ITER; i++)
madvise(huge_ptr, mmap_size, MADV_DONTNEED);
@@ -54,7 +54,7 @@ void *madv(void *unused)
* The other hugepage should be flipping from used <-> reserved, because
* of madvise(DONTNEED).
*/
-void *map_extra(void *unused)
+void *map_extra(void __attribute__((unused)) *unused)
{
void *ptr;
--- a/tools/testing/selftests/mm/ksm_tests.c~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/ksm_tests.c
@@ -265,8 +265,7 @@ static int ksm_merge_pages(int merge_typ
return 0;
}
-static int ksm_unmerge_pages(void *addr, size_t size,
- struct timespec start_time, int timeout)
+static int ksm_unmerge_pages(void *addr, size_t size)
{
if (madvise(addr, size, MADV_UNMERGEABLE)) {
perror("madvise");
@@ -483,7 +482,7 @@ static int get_first_mem_node(void)
return get_next_mem_node(numa_max_node());
}
-static int check_ksm_numa_merge(int merge_type, int mapping, int prot, int timeout,
+static int check_ksm_numa_merge(int merge_type, int timeout,
bool merge_across_nodes, size_t page_size)
{
void *numa1_map_ptr, *numa2_map_ptr;
@@ -547,8 +546,7 @@ err_out:
return KSFT_FAIL;
}
-static int ksm_merge_hugepages_time(int merge_type, int mapping, int prot,
- int timeout, size_t map_size)
+static int ksm_merge_hugepages_time(int merge_type, int timeout, size_t map_size)
{
void *map_ptr, *map_ptr_orig;
struct timespec start_time, end_time;
@@ -678,7 +676,7 @@ static int ksm_unmerge_time(int merge_ty
perror("clock_gettime");
goto err_out;
}
- if (ksm_unmerge_pages(map_ptr, map_size, start_time, timeout))
+ if (ksm_unmerge_pages(map_ptr, map_size))
goto err_out;
if (clock_gettime(CLOCK_MONOTONIC_RAW, &end_time)) {
perror("clock_gettime");
@@ -906,8 +904,8 @@ int main(int argc, char *argv[])
page_size);
break;
case CHECK_KSM_NUMA_MERGE:
- ret = check_ksm_numa_merge(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot,
- ksm_scan_limit_sec, merge_across_nodes, page_size);
+ ret = check_ksm_numa_merge(merge_type, ksm_scan_limit_sec, merge_across_nodes,
+ page_size);
break;
case KSM_MERGE_TIME:
if (size_MB == 0) {
@@ -922,8 +920,7 @@ int main(int argc, char *argv[])
printf("Option '-s' is required.\n");
return KSFT_FAIL;
}
- ret = ksm_merge_hugepages_time(merge_type, MAP_PRIVATE | MAP_ANONYMOUS, prot,
- ksm_scan_limit_sec, size_MB);
+ ret = ksm_merge_hugepages_time(merge_type, ksm_scan_limit_sec, size_MB);
break;
case KSM_UNMERGE_TIME:
if (size_MB == 0) {
--- a/tools/testing/selftests/mm/memfd_secret.c~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/memfd_secret.c
@@ -121,7 +121,7 @@ close_pipe:
close(pipefd[1]);
}
-static void try_process_vm_read(int fd, int pipefd[2])
+static void try_process_vm_read(int __attribute__((unused)) fd, int pipefd[2])
{
struct iovec liov, riov;
char buf[64];
@@ -145,7 +145,7 @@ static void try_process_vm_read(int fd,
exit(KSFT_FAIL);
}
-static void try_ptrace(int fd, int pipefd[2])
+static void try_ptrace(int __attribute__((unused)) fd, int pipefd[2])
{
pid_t ppid = getppid();
int status;
--- a/tools/testing/selftests/mm/soft-dirty.c~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/soft-dirty.c
@@ -74,7 +74,7 @@ static void test_vma_reuse(int pagemap_f
munmap(map2, pagesize);
}
-static void test_hugepage(int pagemap_fd, int pagesize)
+static void test_hugepage(int pagemap_fd)
{
char *map;
int i, ret;
@@ -203,7 +203,7 @@ int main(void)
test_simple(pagemap_fd, pagesize);
test_vma_reuse(pagemap_fd, pagesize);
- test_hugepage(pagemap_fd, pagesize);
+ test_hugepage(pagemap_fd);
test_mprotect_anon(pagemap_fd, pagesize);
test_mprotect_file(pagemap_fd, pagesize);
--- a/tools/testing/selftests/mm/split_huge_page_test.c~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/split_huge_page_test.c
@@ -103,7 +103,7 @@ static char *allocate_zero_filled_hugepa
return result;
}
-static void verify_rss_anon_split_huge_page_all_zeroes(char *one_page, int nr_hpages, size_t len)
+static void verify_rss_anon_split_huge_page_all_zeroes(char *one_page, size_t len)
{
unsigned long rss_anon_before, rss_anon_after;
size_t i;
@@ -149,7 +149,7 @@ void split_pmd_zero_pages(void)
size_t len = nr_hpages * pmd_pagesize;
one_page = allocate_zero_filled_hugepage(len);
- verify_rss_anon_split_huge_page_all_zeroes(one_page, nr_hpages, len);
+ verify_rss_anon_split_huge_page_all_zeroes(one_page, len);
printf("Split zero filled huge pages successful\n");
free(one_page);
}
--- a/tools/testing/selftests/mm/uffd-common.c~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/uffd-common.c
@@ -46,7 +46,7 @@ static void anon_release_pages(char *rel
err("madvise(MADV_DONTNEED) failed");
}
-static int anon_allocate_area(void **alloc_area, bool is_src)
+static int anon_allocate_area(void **alloc_area, bool __attribute__((unused)) is_src)
{
*alloc_area = mmap(NULL, nr_pages * page_size, PROT_READ | PROT_WRITE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
@@ -57,7 +57,9 @@ static int anon_allocate_area(void **all
return 0;
}
-static void noop_alias_mapping(__u64 *start, size_t len, unsigned long offset)
+static void noop_alias_mapping(__u64 __attribute__((unused)) *start,
+ size_t __attribute__((unused)) len,
+ unsigned long __attribute__((unused)) offset)
{
}
@@ -108,7 +110,8 @@ static int hugetlb_allocate_area(void **
return 0;
}
-static void hugetlb_alias_mapping(__u64 *start, size_t len, unsigned long offset)
+static void hugetlb_alias_mapping(__u64 *start, size_t __attribute__((unused)) len,
+ unsigned long offset)
{
if (!map_shared)
return;
@@ -167,12 +170,13 @@ static int shmem_allocate_area(void **al
return 0;
}
-static void shmem_alias_mapping(__u64 *start, size_t len, unsigned long offset)
+static void shmem_alias_mapping(__u64 *start, size_t __attribute__((unused)) len,
+ unsigned long offset)
{
*start = (unsigned long)area_dst_alias + offset;
}
-static void shmem_check_pmd_mapping(void *p, int expect_nr_hpages)
+static void shmem_check_pmd_mapping(void __attribute__((unused)) *p, int expect_nr_hpages)
{
if (!check_huge_shmem(area_dst_alias, expect_nr_hpages,
read_pmd_pagesize()))
@@ -416,7 +420,7 @@ static void continue_range(int ufd, __u6
ret, (int64_t) req.mapped);
}
-int uffd_read_msg(int ufd, struct uffd_msg *msg)
+int uffd_read_msg(struct uffd_msg *msg)
{
int ret = read(uffd, msg, sizeof(*msg));
@@ -537,7 +541,7 @@ void *uffd_poll_thread(void *arg)
}
if (!(pollfd[0].revents & POLLIN))
err("pollfd[0].revents %d", pollfd[0].revents);
- if (uffd_read_msg(uffd, &msg))
+ if (uffd_read_msg(&msg))
continue;
switch (msg.event) {
default:
--- a/tools/testing/selftests/mm/uffd-common.h~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/uffd-common.h
@@ -117,7 +117,7 @@ void uffd_stats_report(struct uffd_args
int uffd_test_ctx_init(uint64_t features, const char **errmsg);
void uffd_test_ctx_clear(void);
int userfaultfd_open(uint64_t *features);
-int uffd_read_msg(int ufd, struct uffd_msg *msg);
+int uffd_read_msg(struct uffd_msg *msg);
void wp_range(int ufd, __u64 start, __u64 len, bool wp);
void uffd_handle_page_fault(struct uffd_msg *msg, struct uffd_args *args);
int __copy_page(int ufd, unsigned long offset, bool retry, bool wp);
--- a/tools/testing/selftests/mm/uffd-stress.c~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/uffd-stress.c
@@ -136,7 +136,7 @@ static void *uffd_read_thread(void *arg)
/* from here cancellation is ok */
for (;;) {
- if (uffd_read_msg(uffd, &msg))
+ if (uffd_read_msg(&msg))
continue;
uffd_handle_page_fault(&msg, args);
}
--- a/tools/testing/selftests/mm/uffd-unit-tests.c~selftests-mm-fix-unused-parameter-warnings
+++ a/tools/testing/selftests/mm/uffd-unit-tests.c
@@ -244,7 +244,7 @@ static void *fork_event_consumer(void *d
ready_for_fork = true;
/* Read until a full msg received */
- while (uffd_read_msg(args->parent_uffd, &msg));
+ while (uffd_read_msg(&msg));
if (msg.event != UFFD_EVENT_FORK)
err("wrong message: %u\n", msg.event);
@@ -357,7 +357,7 @@ static int pagemap_test_fork(int uffd, b
return result;
}
-static void uffd_wp_unpopulated_test(uffd_test_args_t *args)
+static void uffd_wp_unpopulated_test(uffd_test_args_t __attribute__((unused)) *args)
{
uint64_t value;
int pagemap_fd;
@@ -483,8 +483,7 @@ static void uffd_wp_fork_with_event_test
uffd_wp_fork_test_common(args, true);
}
-static void uffd_wp_fork_pin_test_common(uffd_test_args_t *args,
- bool with_event)
+static void uffd_wp_fork_pin_test_common(bool with_event)
{
int pagemap_fd;
pin_args pin_args = {};
@@ -535,14 +534,14 @@ out:
close(pagemap_fd);
}
-static void uffd_wp_fork_pin_test(uffd_test_args_t *args)
+static void uffd_wp_fork_pin_test(uffd_test_args_t __attribute__((unused)) *args)
{
- uffd_wp_fork_pin_test_common(args, false);
+ uffd_wp_fork_pin_test_common(false);
}
-static void uffd_wp_fork_pin_with_event_test(uffd_test_args_t *args)
+static void uffd_wp_fork_pin_with_event_test(uffd_test_args_t __attribute__((unused)) *args)
{
- uffd_wp_fork_pin_test_common(args, true);
+ uffd_wp_fork_pin_test_common(true);
}
static void check_memory_contents(char *p)
@@ -627,24 +626,25 @@ static void uffd_minor_test_common(bool
uffd_test_pass();
}
-void uffd_minor_test(uffd_test_args_t *args)
+void uffd_minor_test(uffd_test_args_t __attribute__((unused)) *args)
{
uffd_minor_test_common(false, false);
}
-void uffd_minor_wp_test(uffd_test_args_t *args)
+void uffd_minor_wp_test(uffd_test_args_t __attribute__((unused)) *args)
{
uffd_minor_test_common(false, true);
}
-void uffd_minor_collapse_test(uffd_test_args_t *args)
+void uffd_minor_collapse_test(uffd_test_args_t __attribute__((unused)) *args)
{
uffd_minor_test_common(true, false);
}
static sigjmp_buf jbuf, *sigbuf;
-static void sighndl(int sig, siginfo_t *siginfo, void *ptr)
+static void sighndl(int sig, siginfo_t __attribute__((unused)) *siginfo,
+ void __attribute__((unused)) *ptr)
{
if (sig == SIGBUS) {
if (sigbuf)
@@ -820,12 +820,12 @@ static void uffd_sigbus_test_common(bool
uffd_test_pass();
}
-static void uffd_sigbus_test(uffd_test_args_t *args)
+static void uffd_sigbus_test(uffd_test_args_t __attribute__((unused)) *args)
{
uffd_sigbus_test_common(false);
}
-static void uffd_sigbus_wp_test(uffd_test_args_t *args)
+static void uffd_sigbus_wp_test(uffd_test_args_t __attribute__((unused)) *args)
{
uffd_sigbus_test_common(true);
}
@@ -873,12 +873,12 @@ static void uffd_events_test_common(bool
uffd_test_pass();
}
-static void uffd_events_test(uffd_test_args_t *args)
+static void uffd_events_test(uffd_test_args_t __attribute__((unused)) *args)
{
uffd_events_test_common(false);
}
-static void uffd_events_wp_test(uffd_test_args_t *args)
+static void uffd_events_wp_test(uffd_test_args_t __attribute__((unused)) *args)
{
uffd_events_test_common(true);
}
@@ -946,7 +946,7 @@ uffd_register_detect_zeropage(int uffd,
}
/* exercise UFFDIO_ZEROPAGE */
-static void uffd_zeropage_test(uffd_test_args_t *args)
+static void uffd_zeropage_test(uffd_test_args_t __attribute__((unused)) *args)
{
bool has_zeropage;
int i;
@@ -1002,7 +1002,7 @@ static void do_uffdio_poison(int uffd, u
}
static void uffd_poison_handle_fault(
- struct uffd_msg *msg, struct uffd_args *args)
+ struct uffd_msg *msg, struct uffd_args __attribute__((unused)) *args)
{
unsigned long offset;
@@ -1023,7 +1023,7 @@ static void uffd_poison_handle_fault(
do_uffdio_poison(uffd, offset);
}
-static void uffd_poison_test(uffd_test_args_t *targs)
+static void uffd_poison_test(uffd_test_args_t __attribute__((unused)) *targs)
{
pthread_t uffd_mon;
char c;
@@ -1114,7 +1114,7 @@ static void uffd_move_pmd_handle_fault(s
}
static void
-uffd_move_test_common(uffd_test_args_t *targs, unsigned long chunk_size,
+uffd_move_test_common(unsigned long chunk_size,
void (*handle_fault)(struct uffd_msg *msg, struct uffd_args *args))
{
unsigned long nr;
@@ -1206,24 +1206,24 @@ uffd_move_test_common(uffd_test_args_t *
uffd_test_pass();
}
-static void uffd_move_test(uffd_test_args_t *targs)
+static void uffd_move_test(uffd_test_args_t __attribute__((unused)) *targs)
{
- uffd_move_test_common(targs, page_size, uffd_move_handle_fault);
+ uffd_move_test_common(page_size, uffd_move_handle_fault);
}
-static void uffd_move_pmd_test(uffd_test_args_t *targs)
+static void uffd_move_pmd_test(uffd_test_args_t __attribute__((unused)) *targs)
{
if (madvise(area_dst, nr_pages * page_size, MADV_HUGEPAGE))
err("madvise(MADV_HUGEPAGE) failure");
- uffd_move_test_common(targs, read_pmd_pagesize(),
+ uffd_move_test_common(read_pmd_pagesize(),
uffd_move_pmd_handle_fault);
}
-static void uffd_move_pmd_split_test(uffd_test_args_t *targs)
+static void uffd_move_pmd_split_test(uffd_test_args_t __attribute__((unused)) *targs)
{
if (madvise(area_dst, nr_pages * page_size, MADV_NOHUGEPAGE))
err("madvise(MADV_NOHUGEPAGE) failure");
- uffd_move_test_common(targs, read_pmd_pagesize(),
+ uffd_move_test_common(read_pmd_pagesize(),
uffd_move_pmd_handle_fault);
}
_
Patches currently in -mm which might be from usama.anjum@xxxxxxxxxxxxx are
selftests-mm-thp_settings-remove-const-from-return-type.patch
selftests-mm-pagemap_ioctl-fix-types-mismatches-shown-by-compiler-options.patch
selftests-mm-mseal_test-remove-unused-variables.patch
selftests-mm-mremap_test-remove-unused-variable-and-type-mismatches.patch
selftests-mm-remove-argc-and-argv-unused-parameters.patch
selftests-mm-fix-unused-parameter-warnings.patch
selftests-mm-fix-type-mismatch-warnings.patch
selftests-mm-kselftest_harness-fix-warnings.patch
selftests-mm-cow-remove-unused-variables-and-fix-type-mismatch-errors.patch
selftests-mm-hmm-tests-remove-always-false-expressions.patch
selftests-mm-guard-pages-fix-type-mismatch-warnings.patch
selftests-mm-hugetlb-madvise-fix-type-mismatch-issues.patch
selftests-mm-hugepage-vmemmap-fix-type-mismatch-warnings.patch
selftests-mm-hugetlb-read-hwpoison-fix-type-mismatch-warnings.patch
selftests-mm-khugepaged-fix-type-mismatch-warnings.patch
selftests-mm-protection_keys-fix-variables-types-mismatch-warnings.patch
selftests-mm-thuge-gen-fix-type-mismatch-warnings.patch
selftests-mm-uffd-fix-all-type-mismatch-warnings.patch
selftests-mm-makefile-add-the-compiler-flags.patch
