diff options
| author | Christopher Ferris <cferris@google.com> | 2023-11-02 02:31:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-02 02:31:53 +0000 |
| commit | 90d65fe4b1c1594a63f4f4a73f7436432d2d3244 (patch) | |
| tree | 7624a7d745ee68f14ba99c9147ad81195a15320a | |
| parent | 21fb5ad5cd37f0d7b2b7746473482ae6e59426e9 (diff) | |
| parent | 6f52d50ac97322b7e75a9dfc1fcae9f48ecab581 (diff) | |
| download | linux-kselftest-90d65fe4b1c1594a63f4f4a73f7436432d2d3244.tar.gz | |
Allow ioctls not to include UFFD_POISON. am: 6f52d50ac9
Original change: https://android-review.googlesource.com/c/platform/external/linux-kselftest/+/2815013
Change-Id: If2350ffc61fcdbec2e7fa70767a751259acbd575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | tools/testing/selftests/vm/userfaultfd.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index 20f0e1ff4635..a3c0bf6af646 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -429,6 +429,14 @@ static void assert_expected_ioctls_present(uint64_t mode, uint64_t ioctls) uint64_t actual = ioctls & expected; if (actual != expected) { + /* b/308714445 + * _UFFDIO_POISON unsupported in kernel <6.6 + */ +#ifdef __ANDROID__ + if ((expected & ~(1 << _UFFDIO_POISON)) == actual) { + return; + } +#endif err("missing ioctl(s): expected %"PRIx64" actual: %"PRIx64, expected, actual); } |