From 564b2cc488a7573926b5afc1fcdf71e964c59bfd Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Thu, 18 Apr 2024 14:19:05 -0700 Subject: Only test UFFDIO_MOVE on 6.8 kernels or newer. Bug: 335674702 Test: atest vts_linux_kselftest_x86_64 Change-Id: I3e5ab46747dd32718aad2ef776d89040317472a7 --- tools/testing/selftests/vm/userfaultfd.c | 6 ++++++ 1 file changed, 6 insertions(+) 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; } -- cgit v1.2.3