From patchwork Fri Oct 14 14:40:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 13007067 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 378E5C43219 for ; Fri, 14 Oct 2022 14:40:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CB80E6B0075; Fri, 14 Oct 2022 10:40:19 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C41CD8E0001; Fri, 14 Oct 2022 10:40:19 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B07EC6B007B; Fri, 14 Oct 2022 10:40:19 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A003C6B0075 for ; Fri, 14 Oct 2022 10:40:19 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 7F778C0B5A for ; Fri, 14 Oct 2022 14:40:19 +0000 (UTC) X-FDA: 80019815358.11.638DC46 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf10.hostedemail.com (Postfix) with ESMTP id 2AE7FC001F for ; Fri, 14 Oct 2022 14:40:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1665758418; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SLJyHDSa1XQjsFtgHwRksRspzx5xxcL5BS8fvTY+AU0=; b=UsT97ZClr4/SeZvJKlLKREonCleLLyQP4u9p5A5jYtk6zBDjoEbdfyTUmun2c2+3snCZ30 XttAhYrPfjo6VbJvXJFilPWTiLK31cqD0hRWucFRyXXpI0Sljq5mbJ0QcHtRPu9cUjU4H5 cPnoxBadxv7g9P1RV4Ixiyz98R6JUEo= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-518-1QeAd8oONq6XYQv7ZJPTjg-1; Fri, 14 Oct 2022 10:40:17 -0400 X-MC-Unique: 1QeAd8oONq6XYQv7ZJPTjg-1 Received: by mail-qt1-f198.google.com with SMTP id bq21-20020a05622a1c1500b0039cdae506e6so872721qtb.10 for ; Fri, 14 Oct 2022 07:40:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SLJyHDSa1XQjsFtgHwRksRspzx5xxcL5BS8fvTY+AU0=; b=qzJATVneMiEcMnsfzKNj4J911ZfifMWv8skfmgtp81HhK4f12RY9js/I6Ap7TWPxwz jiCxoFGcr81B7XYKc1q2D9WjXfIK8nc6I1KJux0MIcpESNnXsefNI7GbTZ7go5e4xtyA KWzxUKTSAdvLanhU/6APkmKUXuCdPnW6Mkdvp/k1o+rMc1BqXzsZBKTyf+eQJlK+ShKs 4fuiMF+aHDWRLnFwl0gUa9wpwuTv0Gq0UlbF7/Otc2zykW4gw3ai6+Oohn9zVKct4fxZ 90TIddqz0gZiTsHegkCCMFnr7ZbvLsDiSwe9xd5XwFNJq9Hbf1+q5shWJBnSaK1TAWn2 CpNw== X-Gm-Message-State: ACrzQf32MP4zcmTERgwEJHiAzrYCcZfbFJnZ2n0T4wEozS6LfDVkwgbZ 1IHV8W5KUDBC2MNIBgIRGd4usuVlJyg5o9Swn5ClkXJHBu/jDUXM7URG8hOo3+aim46wgZmLYMB BjL2onkYOFTo= X-Received: by 2002:a0c:a98e:0:b0:4ac:929d:216f with SMTP id a14-20020a0ca98e000000b004ac929d216fmr4569044qvb.16.1665758417111; Fri, 14 Oct 2022 07:40:17 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4t7KsjP3Hg9ck1XOwaKdT6cqdt/Zic+OGydxXGKoiUwwJ5ZsQBmo1MvrILCejlsR+qV7KlAg== X-Received: by 2002:a0c:a98e:0:b0:4ac:929d:216f with SMTP id a14-20020a0ca98e000000b004ac929d216fmr4569025qvb.16.1665758416855; Fri, 14 Oct 2022 07:40:16 -0700 (PDT) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-46-70-31-27-79.dsl.bell.ca. [70.31.27.79]) by smtp.gmail.com with ESMTPSA id u6-20020a05620a0c4600b006cec8001bf4sm2414202qki.26.2022.10.14.07.40.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Oct 2022 07:40:16 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: peterx@redhat.com, Axel Rasmussen , Andrew Morton , Mike Kravetz Subject: [PATCH v2 4/4] selftests/vm: Drop mnt point for hugetlb in run_vmtests.sh Date: Fri, 14 Oct 2022 10:40:15 -0400 Message-Id: <20221014144015.94039-1-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221014143921.93887-1-peterx@redhat.com> References: <20221014143921.93887-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1665758419; a=rsa-sha256; cv=none; b=lxRUXiI0PZZuSK1AqpPu2CCZmhnM09Qu4HAKroq07kwrOJaLF9EgFhk72sjyRiRNx493Qf 9u9CVTdU5KM2D759j1cZMukXPsOJAaWk9gHwRTAZ+I5ImbddsNjNr/QxEVByse70gOt6XN 5WSjdhetOyfK4ErYz9sbsQiEv4/kNTA= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UsT97ZCl; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1665758419; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SLJyHDSa1XQjsFtgHwRksRspzx5xxcL5BS8fvTY+AU0=; b=rO+0Gw6kb0L/LkX/KXftgfFFQTY7mktqmtkibmVClSdfn9nOQ2uQGqwAaycA0D+xPObVn4 Q/eh3S+/vmuoUg9Xcb478cxFclqFMcspfeLtdghGbgu7rF4J2evKiA7a93wlwfprreqDg/ FWQ6XQdLOhESCFt/LUu86rr5S/w4kUU= X-Stat-Signature: yrna949bk1gwyqde5kptuj5ykfnpaaua X-Rspamd-Queue-Id: 2AE7FC001F X-Rspam-User: Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=UsT97ZCl; spf=pass (imf10.hostedemail.com: domain of peterx@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam06 X-HE-Tag: 1665758418-691221 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: After converting all the three relevant testcases (uffd, madvise, mremap) to use memfd, no test will need the hugetlb mount point anymore. Drop the code. Reviewed-by: Axel Rasmussen Signed-off-by: Peter Xu --- tools/testing/selftests/vm/run_vmtests.sh | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/vm/run_vmtests.sh b/tools/testing/selftests/vm/run_vmtests.sh index e780e76c26b8..0dc9f545a32d 100755 --- a/tools/testing/selftests/vm/run_vmtests.sh +++ b/tools/testing/selftests/vm/run_vmtests.sh @@ -5,7 +5,6 @@ # Kselftest framework requirement - SKIP code is 4. ksft_skip=4 -mnt=./huge exitcode=0 #get huge pagesize and freepages from /proc/meminfo @@ -84,9 +83,6 @@ run_test() { fi } -mkdir "$mnt" -mount -t hugetlbfs none "$mnt" - run_test ./hugepage-mmap shmmax=$(cat /proc/sys/kernel/shmmax) @@ -98,14 +94,9 @@ echo "$shmmax" > /proc/sys/kernel/shmmax echo "$shmall" > /proc/sys/kernel/shmall run_test ./map_hugetlb - -run_test ./hugepage-mremap "$mnt"/huge_mremap -rm -f "$mnt"/huge_mremap - +run_test ./hugepage-mremap run_test ./hugepage-vmemmap - -run_test ./hugetlb-madvise "$mnt"/madvise-test -rm -f "$mnt"/madvise-test +run_test ./hugetlb-madvise echo "NOTE: The above hugetlb tests provide minimal coverage. Use" echo " https://github.com/libhugetlbfs/libhugetlbfs.git for" @@ -126,14 +117,11 @@ for mod in "${uffd_mods[@]}"; do # Hugetlb tests require source and destination huge pages. Pass in half # the size ($half_ufd_size_MB), which is used for *each*. run_test ./userfaultfd hugetlb${mod} "$half_ufd_size_MB" 32 - run_test ./userfaultfd hugetlb_shared${mod} "$half_ufd_size_MB" 32 "$mnt"/uffd-test - rm -f "$mnt"/uffd-test + run_test ./userfaultfd hugetlb_shared${mod} "$half_ufd_size_MB" 32 run_test ./userfaultfd shmem${mod} 20 16 done #cleanup -umount "$mnt" -rm -rf "$mnt" echo "$nr_hugepgs" > /proc/sys/vm/nr_hugepages run_test ./compaction_test