From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D67CDC433ED for ; Tue, 13 Apr 2021 20:15:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AB7B2613D3 for ; Tue, 13 Apr 2021 20:15:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230308AbhDMUQC (ORCPT ); Tue, 13 Apr 2021 16:16:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24210 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231204AbhDMUQA (ORCPT ); Tue, 13 Apr 2021 16:16:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618344940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=z6jLMxHXDVRiXYyQcd5eAsrnA6ok/2H8Sdo63BFQ8u4=; b=Hu1HFIJU3N6/ztfyD7uoYVioIZNcujtcYKYSeBM4T+A35w0t5cfU+TcPOvh9PvnrOvewbH auQV3KwZUY2Dc5xGEriGzRkWS/XJ63zUiDO0sl28q0fVhK05HFt02KQr0ap/dOqipYo2uv yNHASmCWd6ouZEF3aoNgk67eQJgCf8w= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-199-P88e1gbxMWy7oXKttaXIJA-1; Tue, 13 Apr 2021 16:15:38 -0400 X-MC-Unique: P88e1gbxMWy7oXKttaXIJA-1 Received: by mail-qv1-f69.google.com with SMTP id p5so10736254qvr.4 for ; Tue, 13 Apr 2021 13:15:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=z6jLMxHXDVRiXYyQcd5eAsrnA6ok/2H8Sdo63BFQ8u4=; b=r5J4caTG36WAa2srhqsPHgnza2ZlU99A7Fju89nfxizF5fbpbohlKMhrrlYT0Zll/J UCUnX+qrHwtm5Tn3QlBok7ta5ZfYpITiYB49Jdtg6xJdptb1Qi2eOTV7xztUedUBL1Uw tNQRbXA7d86zmmt9+njQOLM7EpOk3aKz5nW1Gk5wyRICuzVofFaNXUe19fj8LzDcL2DV juEH1OeC8NlQIB9FJB+PhEeF5EQHaMwWMrPSZCRkcVAbn1Oe2uoUIHTJ+Q6KYix/fN9G osvBwivkl0KJpT8sf23k+00VdFfsLpUgBRvVA3j7omo6U54Nx1JxbUsvJ4TforEZT7v5 k+Uw== X-Gm-Message-State: AOAM530Xftk7R7voUls9Q7C59ITIr5gEY6QoRbvA1ad+wVQS46hl/0bQ uCrvcdJHu3u1sjt0wzkp0VPn5T74TR/CDg95/gvjL529zr1GhyW44wwybUwVNxJ6dan8oW/lPCO 2vOeEaAUqWw3/DPrxCCeH X-Received: by 2002:ae9:f503:: with SMTP id o3mr32222743qkg.331.1618344938277; Tue, 13 Apr 2021 13:15:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzk0HNq0oDNyEr5ELMzeUTmw4uMriVRz0Eo5dEdf+xlarAnuXBL2LazN2KzuwaIREXFINZXmw== X-Received: by 2002:ae9:f503:: with SMTP id o3mr32222721qkg.331.1618344937981; Tue, 13 Apr 2021 13:15:37 -0700 (PDT) Received: from xz-x1 (bras-base-toroon474qw-grc-88-174-93-75-154.dsl.bell.ca. [174.93.75.154]) by smtp.gmail.com with ESMTPSA id l16sm11024953qkg.91.2021.04.13.13.15.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Apr 2021 13:15:37 -0700 (PDT) Date: Tue, 13 Apr 2021 16:15:35 -0400 From: Peter Xu To: Axel Rasmussen Cc: Alexander Viro , Andrea Arcangeli , Andrew Morton , Hugh Dickins , Jerome Glisse , Joe Perches , Lokesh Gidra , Mike Kravetz , Mike Rapoport , Shaohua Li , Shuah Khan , Stephen Rothwell , Wang Qing , linux-api@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, Brian Geffon , "Dr . David Alan Gilbert" , Mina Almasry , Oliver Upton Subject: Re: [PATCH v2 7/9] userfaultfd/selftests: reinitialize test context in each test Message-ID: <20210413201535.GD4440@xz-x1> References: <20210413051721.2896915-1-axelrasmussen@google.com> <20210413051721.2896915-8-axelrasmussen@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210413051721.2896915-8-axelrasmussen@google.com> Precedence: bulk List-ID: X-Mailing-List: linux-api@vger.kernel.org On Mon, Apr 12, 2021 at 10:17:19PM -0700, Axel Rasmussen wrote: > Currently, the context (fds, mmap-ed areas, etc.) are global. Each test > mutates this state in some way, in some cases really "clobbering it" > (e.g., the events test mremap-ing area_dst over the top of area_src, or > the minor faults tests overwriting the count_verify values in the test > areas). We run the tests in a particular order, each test is careful to > make the right assumptions about its starting state, etc. > > But, this is fragile. It's better for a test's success or failure to not > depend on what some other prior test case did to the global state. > > To that end, clear and reinitialize the test context at the start of > each test case, so whatever prior test cases did doesn't affect future > tests. > > This is particularly relevant to this series because the events test's > mremap of area_dst screws up assumptions the minor fault test was > relying on. This wasn't a problem for hugetlb, as we don't mremap in > that case. > > Signed-off-by: Axel Rasmussen > --- > tools/testing/selftests/vm/userfaultfd.c | 221 +++++++++++++---------- > 1 file changed, 127 insertions(+), 94 deletions(-) > > diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c > index 1f65c4ab7994..0ff01f437a39 100644 > --- a/tools/testing/selftests/vm/userfaultfd.c > +++ b/tools/testing/selftests/vm/userfaultfd.c > @@ -89,7 +89,8 @@ static int shm_fd; > static int huge_fd; > static char *huge_fd_off0; > static unsigned long long *count_verify; > -static int uffd, uffd_flags, finished, *pipefd; > +static int uffd = -1; > +static int uffd_flags, finished, *pipefd; > static char *area_src, *area_src_alias, *area_dst, *area_dst_alias; > static char *zeropage; > pthread_attr_t attr; > @@ -342,6 +343,121 @@ static struct uffd_test_ops hugetlb_uffd_test_ops = { > > static struct uffd_test_ops *uffd_test_ops; > > +static int userfaultfd_open(uint64_t *features) > +{ > + struct uffdio_api uffdio_api; > + > + uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK); Keep UFFD_USER_MODE_ONLY? [...] > @@ -961,10 +1045,9 @@ static int userfaultfd_zeropage_test(void) > printf("testing UFFDIO_ZEROPAGE: "); > fflush(stdout); > > - uffd_test_ops->release_pages(area_dst); > - > - if (userfaultfd_open(0)) > + if (uffd_test_ctx_clear() || uffd_test_ctx_init(0)) > return 1; Would it look even nicer to init() at the entry of each test, and clear() after finish one test? > + > uffdio_register.range.start = (unsigned long) area_dst; > uffdio_register.range.len = nr_pages * page_size; > uffdio_register.mode = UFFDIO_REGISTER_MODE_MISSING; The rest looks good to me. Thanks, -- Peter Xu