I just got time to have a closer look on the uffd-wp triggering of the warning here: https://lore.kernel.org/all/YzeR+R6b4bwBlBHh@x1n/T/#u It turns out to be a wrong check on vma, and with the fix attached we should be able to remove the ugly macro checks. Sorry for the bothersome. Please have a look, thanks. Peter Xu (2): mm/uffd: Fix vma check on userfault for wp Revert "mm/uffd: fix warning without PTE_MARKER_UFFD_WP compiled in" include/linux/userfaultfd_k.h | 6 +++--- mm/hugetlb.c | 4 ---- mm/memory.c | 2 -- mm/mprotect.c | 2 -- 4 files changed, 3 insertions(+), 11 deletions(-) -- 2.37.3