Hi, Axel, On Tue, Sep 21, 2021 at 09:33:21AM -0700, Axel Rasmussen wrote: > diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c > index 10ab56c2484a..2366caf90435 100644 > --- a/tools/testing/selftests/vm/userfaultfd.c > +++ b/tools/testing/selftests/vm/userfaultfd.c > @@ -79,10 +79,6 @@ static int test_type; > #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 = false; > -/* Whether to test uffd minor faults */ > -static bool test_uffdio_minor = false; IMHO it's not a fault to have these variables; they're still the fastest way to do branching. It's just that in some cases we should set them to "false" rather than "true", am I right? How about we just set them properly in set_test_type? Say, we can fetch the feature bits in set_test_type rather than assuming it's only related to the type of memory. Thanks, -- Peter Xu