The patch titled
Subject: selftests/mm: cow: remove unused variables and fix type mismatch errors
has been added to the -mm mm-unstable branch. Its filename is
selftests-mm-cow-remove-unused-variables-and-fix-type-mismatch-errors.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/selftests-mm-cow-remove-unused-variables-and-fix-type-mismatch-errors.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: cow: remove unused variables and fix type mismatch errors
Date: Thu, 9 Jan 2025 22:38:32 +0500
Fix following warnings:
- Remove unused variables
- Use __attribute__(unused) with unused variables which aren't being
used and cannot be removed because of function pointer declaration
- Fix type mismatches
Link: https://lkml.kernel.org/r/20250109173842.1142376-7-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/cow.c | 46 +++++++++++++++++------------
1 file changed, 27 insertions(+), 19 deletions(-)
--- a/tools/testing/selftests/mm/cow.c~selftests-mm-cow-remove-unused-variables-and-fix-type-mismatch-errors
+++ a/tools/testing/selftests/mm/cow.c
@@ -84,7 +84,7 @@ static void detect_huge_zeropage(void)
return;
ret = pread(fd, buf, sizeof(buf), 0);
- if (ret > 0 && ret < sizeof(buf)) {
+ if (ret > 0 && (unsigned int)ret < sizeof(buf)) {
buf[ret] = 0;
enabled = strtoul(buf, NULL, 10);
@@ -263,12 +263,14 @@ close_comm_pipes:
close_comm_pipes(&comm_pipes);
}
-static void test_cow_in_parent(char *mem, size_t size, bool is_hugetlb)
+static void test_cow_in_parent(char *mem, size_t size,
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_cow_in_parent(mem, size, false, child_memcmp_fn, false);
}
-static void test_cow_in_parent_mprotect(char *mem, size_t size, bool is_hugetlb)
+static void test_cow_in_parent_mprotect(char *mem, size_t size,
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_cow_in_parent(mem, size, true, child_memcmp_fn, false);
}
@@ -408,10 +410,11 @@ static void do_test_iouring(char *mem, s
struct io_uring_cqe *cqe;
struct io_uring_sqe *sqe;
struct io_uring ring;
- ssize_t cur, total;
struct iovec iov;
char *buf, *tmp;
+ size_t total;
int ret, fd;
+ ssize_t cur;
FILE *file;
ret = setup_comm_pipes(&comm_pipes);
@@ -515,7 +518,7 @@ static void do_test_iouring(char *mem, s
goto quit_child;
}
- if (cqe->res != size) {
+ if ((unsigned int) cqe->res != size) {
ksft_test_result_fail("write_fixed failed\n");
goto quit_child;
}
@@ -529,7 +532,7 @@ static void do_test_iouring(char *mem, s
ksft_test_result_fail("pread() failed\n");
goto quit_child;
}
- total += cur;
+ total += (size_t)cur;
}
/* Finally, check if we read what we expected. */
@@ -553,12 +556,14 @@ close_comm_pipes:
close_comm_pipes(&comm_pipes);
}
-static void test_iouring_ro(char *mem, size_t size, bool is_hugetlb)
+static void test_iouring_ro(char *mem, size_t size,
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_iouring(mem, size, false);
}
-static void test_iouring_fork(char *mem, size_t size, bool is_hugetlb)
+static void test_iouring_fork(char *mem, size_t size,
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_iouring(mem, size, true);
}
@@ -702,36 +707,38 @@ free_tmp:
free(tmp);
}
-static void test_ro_pin_on_shared(char *mem, size_t size, bool is_hugetlb)
+static void test_ro_pin_on_shared(char *mem, size_t size,
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_ro_pin(mem, size, RO_PIN_TEST_SHARED, false);
}
-static void test_ro_fast_pin_on_shared(char *mem, size_t size, bool is_hugetlb)
+static void test_ro_fast_pin_on_shared(char *mem, size_t size,
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_ro_pin(mem, size, RO_PIN_TEST_SHARED, true);
}
static void test_ro_pin_on_ro_previously_shared(char *mem, size_t size,
- bool is_hugetlb)
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_ro_pin(mem, size, RO_PIN_TEST_PREVIOUSLY_SHARED, false);
}
static void test_ro_fast_pin_on_ro_previously_shared(char *mem, size_t size,
- bool is_hugetlb)
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_ro_pin(mem, size, RO_PIN_TEST_PREVIOUSLY_SHARED, true);
}
static void test_ro_pin_on_ro_exclusive(char *mem, size_t size,
- bool is_hugetlb)
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_ro_pin(mem, size, RO_PIN_TEST_RO_EXCLUSIVE, false);
}
static void test_ro_fast_pin_on_ro_exclusive(char *mem, size_t size,
- bool is_hugetlb)
+ bool __attribute__((unused)) is_hugetlb)
{
do_test_ro_pin(mem, size, RO_PIN_TEST_RO_EXCLUSIVE, true);
}
@@ -1192,7 +1199,7 @@ static void run_anon_test_case(struct te
static void run_anon_test_cases(void)
{
- int i;
+ unsigned int i;
ksft_print_msg("[INFO] Anonymous memory tests in private mappings\n");
@@ -1420,7 +1427,7 @@ static const struct test_case anon_thp_t
static void run_anon_thp_test_cases(void)
{
- int i;
+ unsigned int i;
if (!pmdsize)
return;
@@ -1457,13 +1464,14 @@ static void test_cow(char *mem, const ch
"Other mapping not modified\n");
free(old);
}
+//typedef void (*non_anon_test_fn)(char *mem, const char *smem, size_t size);
-static void test_ro_pin(char *mem, const char *smem, size_t size)
+static void test_ro_pin(char *mem, const char __attribute__((unused)) *smem, size_t size)
{
do_test_ro_pin(mem, size, RO_PIN_TEST, false);
}
-static void test_ro_fast_pin(char *mem, const char *smem, size_t size)
+static void test_ro_fast_pin(char *mem, const char __attribute__((unused)) *smem, size_t size)
{
do_test_ro_pin(mem, size, RO_PIN_TEST, true);
}
@@ -1752,7 +1760,7 @@ static void run_non_anon_test_case(struc
static void run_non_anon_test_cases(void)
{
- int i;
+ unsigned int i;
ksft_print_msg("[RUN] Non-anonymous memory tests in private mappings\n");
_
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
