diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-23 23:05:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-23 23:05:59 +0000 |
| commit | aff2cf4b5c87d9143c7254507d8bd2e5f1cd683c (patch) | |
| tree | 6fa1b8103871a23b308619da8094372a5c9dad2a | |
| parent | f12e09b38ede31ae9a0520aff2715178cab15b10 (diff) | |
| parent | 807a8cbd5b2c688374cad442d6a9574c2aaebdc7 (diff) | |
| download | linux-kselftest-sdk-release.tar.gz | |
Snap for 11754915 from 807a8cbd5b2c688374cad442d6a9574c2aaebdc7 to sdk-releasesdk-release
Change-Id: Ie77f6b4a7086598751deebf20a3567d1938e2cee
| -rw-r--r-- | OWNERS | 1 | ||||
| -rw-r--r-- | tools/testing/selftests/vm/userfaultfd.c | 6 |
2 files changed, 6 insertions, 1 deletions
@@ -3,4 +3,3 @@ drosen@google.com edliaw@google.com willmcvicker@google.com bettyzhou@google.com -joefradley@google.com diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index c22127e72a3c..0899acd62111 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -411,6 +411,8 @@ static inline uint64_t uffd_minor_feature(void) /* b/308714445 * _UFFDIO_POISON unsupported in kernel <6.6 + * b/335674702 + * _UFFDIO_MOVE unupported in kernel <6.8 */ static uint32_t get_kernel_version(void) { @@ -444,6 +446,10 @@ static uint64_t get_expected_ioctls(uint64_t mode) // UFFDIO_POISON not supported until kernel 6.6. ioctls &= ~(1 << _UFFDIO_POISON); } + if (kernel_version < KERNEL_VERSION(6, 8, 0)) { + // UFFDIO_MOVE not supported until kernel 6.8. + ioctls &= ~(1 << _UFFDIO_MOVE); + } return ioctls; } |