From: Peter Xu <peterx@redhat.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
Andrea Arcangeli <aarcange@redhat.com>,
Mike Kravetz <mike.kravetz@oracle.com>,
Nadav Amit <nadav.amit@gmail.com>,
David Hildenbrand <david@redhat.com>,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
Axel Rasmussen <axelrasmussen@google.com>,
Leonardo Bras Soares Passos <lsoaresp@redhat.com>,
peterx@redhat.com, Mike Rapoport <rppt@kernel.org>
Subject: [PATCH v2 11/31] selftests/mm: Drop test_uffdio_zeropage_eexist
Date: Wed, 12 Apr 2023 12:42:38 -0400 [thread overview]
Message-ID: <20230412164238.328238-1-peterx@redhat.com> (raw)
In-Reply-To: <20230412163922.327282-1-peterx@redhat.com>
The idea was trying to flip this var in the alarm handler from time to time
to test -EEXIST of UFFDIO_ZEROPAGE, but firstly it's only used in the
zeropage test so probably only used once, meanwhile we passed
"retry==false" so it'll never got tested anyway.
Drop both sides so we always test UFFDIO_ZEROPAGE retries if has_zeropage
is set (!hugetlb).
One more thing to do is doing UFFDIO_REGISTER for the alias buffer too,
because otherwise the test won't even pass! We were just lucky that this
test never really got ran at all.
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Mike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
tools/testing/selftests/mm/userfaultfd.c | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/tools/testing/selftests/mm/userfaultfd.c b/tools/testing/selftests/mm/userfaultfd.c
index d724f1c78847..3487ec0bfcc8 100644
--- a/tools/testing/selftests/mm/userfaultfd.c
+++ b/tools/testing/selftests/mm/userfaultfd.c
@@ -88,7 +88,6 @@ static bool test_dev_userfaultfd;
/* exercise the test_uffdio_*_eexist every ALARM_INTERVAL_SECS */
#define ALARM_INTERVAL_SECS 10
static volatile bool test_uffdio_copy_eexist = true;
-static volatile bool test_uffdio_zeropage_eexist = true;
/* Whether to test uffd write-protection */
static bool test_uffdio_wp = true;
/* Whether to test uffd minor faults */
@@ -1114,7 +1113,7 @@ static void retry_uffdio_zeropage(int ufd,
}
}
-static int __uffdio_zeropage(int ufd, unsigned long offset, bool retry)
+static int __uffdio_zeropage(int ufd, unsigned long offset)
{
struct uffdio_zeropage uffdio_zeropage;
int ret;
@@ -1138,11 +1137,8 @@ static int __uffdio_zeropage(int ufd, unsigned long offset, bool retry)
if (res != page_size) {
err("UFFDIO_ZEROPAGE unexpected size");
} else {
- if (test_uffdio_zeropage_eexist && retry) {
- test_uffdio_zeropage_eexist = false;
- retry_uffdio_zeropage(ufd, &uffdio_zeropage,
- offset);
- }
+ retry_uffdio_zeropage(ufd, &uffdio_zeropage,
+ offset);
return 1;
}
} else
@@ -1153,7 +1149,7 @@ static int __uffdio_zeropage(int ufd, unsigned long offset, bool retry)
static int uffdio_zeropage(int ufd, unsigned long offset)
{
- return __uffdio_zeropage(ufd, offset, false);
+ return __uffdio_zeropage(ufd, offset);
}
/* exercise UFFDIO_ZEROPAGE */
@@ -1177,6 +1173,13 @@ static int userfaultfd_zeropage_test(void)
assert_expected_ioctls_present(
uffdio_register.mode, uffdio_register.ioctls);
+ if (area_dst_alias) {
+ /* Needed this to test zeropage-retry on shared memory */
+ uffdio_register.range.start = (unsigned long) area_dst_alias;
+ if (ioctl(uffd, UFFDIO_REGISTER, &uffdio_register))
+ err("register failure");
+ }
+
if (uffdio_zeropage(uffd, 0))
if (my_bcmp(area_dst, zeropage, page_size))
err("zeropage is not zero");
@@ -1763,7 +1766,6 @@ static void sigalrm(int sig)
if (sig != SIGALRM)
abort();
test_uffdio_copy_eexist = true;
- test_uffdio_zeropage_eexist = true;
alarm(ALARM_INTERVAL_SECS);
}
--
2.39.1
next prev parent reply other threads:[~2023-04-12 16:42 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-12 16:38 [PATCH v2 00/31] selftests/mm: Split / Refactor userfault test Peter Xu
2023-04-12 16:38 ` [PATCH v2 01/31] Revert "userfaultfd: don't fail on unrecognized features" Peter Xu
2023-04-12 16:41 ` [PATCH v2 02/31] selftests/mm: Update .gitignore with two missing tests Peter Xu
2023-04-12 16:41 ` [PATCH v2 03/31] selftests/mm: Dump a summary in run_vmtests.sh Peter Xu
2023-04-12 16:41 ` [PATCH v2 04/31] selftests/mm: Merge util.h into vm_util.h Peter Xu
2023-04-12 16:42 ` [PATCH v2 05/31] selftests/mm: Use TEST_GEN_PROGS where proper Peter Xu
2023-04-15 15:44 ` Lorenzo Stoakes
2023-04-12 16:42 ` [PATCH v2 06/31] selftests/mm: Link vm_util.c always Peter Xu
2023-04-12 16:42 ` [PATCH v2 07/31] selftests/mm: Merge default_huge_page_size() into one Peter Xu
2023-04-12 16:42 ` [PATCH v2 08/31] selftests/mm: Use PM_* macros in vm_utils.h Peter Xu
2023-04-12 16:42 ` [PATCH v2 09/31] selftests/mm: Reuse pagemap_get_entry() in vm_util.h Peter Xu
2023-04-12 16:42 ` [PATCH v2 10/31] selftests/mm: Test UFFDIO_ZEROPAGE only when !hugetlb Peter Xu
2023-04-12 17:07 ` Axel Rasmussen
2023-04-12 16:42 ` Peter Xu [this message]
2023-04-12 16:42 ` [PATCH v2 12/31] selftests/mm: Create uffd-common.[ch] Peter Xu
2023-04-12 17:59 ` Axel Rasmussen
2023-04-12 16:42 ` [PATCH v2 13/31] selftests/mm: Split uffd tests into uffd-stress and uffd-unit-tests Peter Xu
2023-04-12 18:03 ` Axel Rasmussen
2023-04-12 16:42 ` [PATCH v2 14/31] selftests/mm: uffd_[un]register() Peter Xu
2023-04-12 18:20 ` Axel Rasmussen
2023-04-12 19:33 ` Peter Xu
2023-04-12 16:42 ` [PATCH v2 15/31] selftests/mm: uffd_open_{dev|sys}() Peter Xu
2023-04-12 18:25 ` Axel Rasmussen
2023-04-12 16:42 ` [PATCH v2 16/31] selftests/mm: UFFDIO_API test Peter Xu
2023-04-12 19:47 ` Axel Rasmussen
2023-04-12 20:08 ` Peter Xu
2023-04-20 10:54 ` Mike Rapoport
2023-04-12 16:43 ` [PATCH v2 17/31] selftests/mm: Drop global mem_fd in uffd tests Peter Xu
2023-04-12 16:43 ` [PATCH v2 18/31] selftests/mm: Drop global hpage_size " Peter Xu
2023-04-12 16:43 ` [PATCH v2 19/31] selftests/mm: Rename uffd_stats to uffd_args Peter Xu
2023-04-20 10:55 ` Mike Rapoport
2023-04-12 16:43 ` [PATCH v2 20/31] selftests/mm: Let uffd_handle_page_fault() take wp parameter Peter Xu
2023-04-12 16:43 ` [PATCH v2 21/31] selftests/mm: Allow allocate_area() to fail properly Peter Xu
2023-04-12 16:43 ` [PATCH v2 22/31] selftests/mm: Add framework for uffd-unit-test Peter Xu
2023-04-12 16:43 ` [PATCH v2 23/31] selftests/mm: Move uffd pagemap test to unit test Peter Xu
2023-04-12 16:43 ` [PATCH v2 24/31] selftests/mm: Move uffd minor " Peter Xu
2023-04-12 16:44 ` [PATCH v2 25/31] selftests/mm: Move uffd sig/events tests into uffd unit tests Peter Xu
2023-04-12 16:44 ` [PATCH v2 26/31] selftests/mm: Move zeropage test " Peter Xu
2023-04-12 16:45 ` [PATCH v2 27/31] selftests/mm: Workaround no way to detect uffd-minor + wp Peter Xu
2023-04-12 16:45 ` [PATCH v2 28/31] selftests/mm: Allow uffd test to skip properly with no privilege Peter Xu
2023-04-12 16:45 ` [PATCH v2 29/31] selftests/mm: Drop sys/dev test in uffd-stress test Peter Xu
2023-04-12 16:45 ` [PATCH v2 30/31] selftests/mm: Add shmem-private test to uffd-stress Peter Xu
2023-04-12 16:45 ` [PATCH v2 31/31] selftests/mm: Add uffdio register ioctls test Peter Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230412164238.328238-1-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=axelrasmussen@google.com \
--cc=david@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lsoaresp@redhat.com \
--cc=mike.kravetz@oracle.com \
--cc=nadav.amit@gmail.com \
--cc=rppt@kernel.org \
--cc=rppt@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).