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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B449C4332F for ; Thu, 17 Nov 2022 21:35:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239622AbiKQVfn (ORCPT ); Thu, 17 Nov 2022 16:35:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234988AbiKQVfO (ORCPT ); Thu, 17 Nov 2022 16:35:14 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B17B474A92 for ; Thu, 17 Nov 2022 13:33:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1668720786; 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=uDQssBDra2LgVmFEmn0r+1NHqlAxiYwGBKpxHeKgv/A=; b=F0EnqNajws0uQxeH1Dq668JQn98s/GcNYgikjQdwLUfjRSFJ7tcXRRe3d5JuKAd3aqOPjz eR4S+5DzcQY0aVOJnSV/OtIKb4HZw81sFqE+MGJ99r7Bccr8ulL72+DWs7olKPJgLn19Yo aYcyC6fiT0+aN/UIv30WxQh2t0emY6I= Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-610-4KPRJqUgN_i7Z_DgMdl4TQ-1; Thu, 17 Nov 2022 16:33:03 -0500 X-MC-Unique: 4KPRJqUgN_i7Z_DgMdl4TQ-1 Received: by mail-qv1-f69.google.com with SMTP id on28-20020a056214449c00b004bbf12d7976so2755850qvb.18 for ; Thu, 17 Nov 2022 13:33:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=uDQssBDra2LgVmFEmn0r+1NHqlAxiYwGBKpxHeKgv/A=; b=vTNWeI/wywNlGYJut9M+qzaF99wVEdO3PhYA0CQ9AeFVOGzDEw/LtniziividA4rzq 50ljs5eaOXM1JriN5OOKLJagYqOZcK2jN3nqx28NdP/TXss8i923hYsc2Hl41xPbLhSc 3iZ9uvofaKEh6Zw5g9eIz6FVJ0NdbYYxJwV2DHmqSYVm2g4AO6q8G9tTgA9/ZrISRNkd YznjXdjpNzjhUcwXVwjibWN62A8eUjXmWl89G2c1ct74g/FDTTU5XTcBedtbQD+uzTeM thl75HopRfVOkxF8G2mede8bDuG9znmsn0aSZyk1tP+PIzg2pdsHOIjW/Mpe+JSTj+0x p02g== X-Gm-Message-State: ANoB5pm2ijE1EIk8MjjK+EQo53F+nAnMa82LwfLuyFwAAIuUzXtHHLct gQpzjGpy3pWJjFoHUtlEHDOvdFstdglR3XDg2cgWsNnF8/3zVETyac2ocj4dgcBXVK5TR3EXguw 0nRfNPborEZ5FGSxdn9BVjocN X-Received: by 2002:a05:6214:1e2:b0:4b8:fbc8:594c with SMTP id c2-20020a05621401e200b004b8fbc8594cmr4180100qvu.61.1668720783579; Thu, 17 Nov 2022 13:33:03 -0800 (PST) X-Google-Smtp-Source: AA0mqf7GUQGzSuRb8meXTFVPjjz0QZ1OIpM/M/Y+skPofDCEJfsYqDG59yxNKsN4fDPGQ0ZyKA7lMw== X-Received: by 2002:a05:6214:1e2:b0:4b8:fbc8:594c with SMTP id c2-20020a05621401e200b004b8fbc8594cmr4180070qvu.61.1668720783259; Thu, 17 Nov 2022 13:33:03 -0800 (PST) Received: from x1n (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id bs42-20020a05620a472a00b006b61b2cb1d2sm1184021qkb.46.2022.11.17.13.33.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 13:33:02 -0800 (PST) Date: Thu, 17 Nov 2022 16:33:01 -0500 From: Peter Xu To: Joel Savitz Cc: Andrew Morton , linux-kernel@vger.kernel.org, Shuah Khan , David Hildenbrand , Nico Pache , linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: Re: [PATCH linux-next] selftests/vm: calculate variables in correct order Message-ID: References: <20221028132640.2791026-1-jsavitz@redhat.com> <20221108163124.a54f932f8f79f9c1d6e63903@linux-foundation.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="+DsSjgx0E9gBsQRT" Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --+DsSjgx0E9gBsQRT Content-Type: text/plain; charset=utf-8 Content-Disposition: inline On Wed, Nov 16, 2022 at 08:09:11PM -0400, Joel Savitz wrote: > However, I noticed that on the mm-everything branch, the hugepage-mmap test > fails: > > # ./run_vmtests.sh -t "hugetlb" > running: ./hugepage-mmap > ----------------------- > running ./hugepage-mmap > ----------------------- > Open failed: No such file or directory > [FAIL] > ... > > It appears this is due to commit 0796c7b8be84 ("selftests/vm: drop mnt > point for hugetlb in run_vmtests.sh") > as the test still replies on the ./huge mountpoint removed in that commit. > The test passes before that patchset is applied. Oops, sorry I totally overlooked this hard-coded test case using the mntpoint. Fix is simple though, which is attached. -- Peter Xu --+DsSjgx0E9gBsQRT Content-Type: text/plain; charset=utf-8 Content-Disposition: attachment; filename="0001-selftests-vm-use-memfd-for-hugepage-mmap-test.patch" >From 71da2480d4bac0fc598e4d1f05f71aba8b980bc4 Mon Sep 17 00:00:00 2001 From: Peter Xu Date: Thu, 17 Nov 2022 16:29:15 -0500 Subject: [PATCH] selftests/vm: use memfd for hugepage-mmap test Content-type: text/plain This test was overlooked with a hard-coded mntpoint path in test when we're removing the hugetlb mntpoint in commit 0796c7b8be84. Fix it up so the test can keep running. Reported-by: Joel Savitz Signed-off-by: Peter Xu --- tools/testing/selftests/vm/hugepage-mmap.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/vm/hugepage-mmap.c b/tools/testing/selftests/vm/hugepage-mmap.c index 93f9e7b81331..955ef87f382c 100644 --- a/tools/testing/selftests/vm/hugepage-mmap.c +++ b/tools/testing/selftests/vm/hugepage-mmap.c @@ -16,14 +16,13 @@ * range. * Other architectures, such as ppc64, i386 or x86_64 are not so constrained. */ - +#define _GNU_SOURCE #include #include #include #include #include -#define FILE_NAME "huge/hugepagefile" #define LENGTH (256UL*1024*1024) #define PROTECTION (PROT_READ | PROT_WRITE) @@ -67,16 +66,16 @@ int main(void) void *addr; int fd, ret; - fd = open(FILE_NAME, O_CREAT | O_RDWR, 0755); + fd = memfd_create("hugepage-mmap", MFD_HUGETLB); if (fd < 0) { - perror("Open failed"); + perror("memfd_create() failed"); exit(1); } addr = mmap(ADDR, LENGTH, PROTECTION, FLAGS, fd, 0); if (addr == MAP_FAILED) { perror("mmap"); - unlink(FILE_NAME); + close(fd); exit(1); } @@ -87,7 +86,6 @@ int main(void) munmap(addr, LENGTH); close(fd); - unlink(FILE_NAME); return ret; } -- 2.37.3 --+DsSjgx0E9gBsQRT--