From patchwork Tue Oct 4 21:43:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 12998725 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 B9E07C433F5 for ; Tue, 4 Oct 2022 21:43:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F8F76B0073; Tue, 4 Oct 2022 17:43:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4A97A6B0074; Tue, 4 Oct 2022 17:43:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 34A6B6B0075; Tue, 4 Oct 2022 17:43:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 22CAB6B0073 for ; Tue, 4 Oct 2022 17:43:10 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E4B491C664C for ; Tue, 4 Oct 2022 21:43:09 +0000 (UTC) X-FDA: 79984592898.22.B4BFE4E Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf20.hostedemail.com (Postfix) with ESMTP id 8D8A31C0026 for ; Tue, 4 Oct 2022 21:43:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1664919789; 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=1leZa+nnl9FNTENOcXSgCnyxuJRrfcW3iiJbWx0HuuA=; b=C121Aoo8tsktwYue02bnSXh2o66cdYdXUND6CF5Iq+5IkMsTW7HPqBHTTedivbIAFk0kxB PDshUsJM5FE1Js3s0Y+/vxnc3QbGjhn9sY3VWgvtrOBj2tTqzWVBbD5opTorhVRmx9Hk28 UfNhPWCBRxyu7rsCLWSipffz/S4NWf8= Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-597-xpOCxh7fMZitvPStXs7ENw-1; Tue, 04 Oct 2022 17:43:08 -0400 X-MC-Unique: xpOCxh7fMZitvPStXs7ENw-1 Received: by mail-qt1-f197.google.com with SMTP id n16-20020ac85b50000000b0035ce9e26eb1so10090055qtw.8 for ; Tue, 04 Oct 2022 14:43:08 -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; bh=1leZa+nnl9FNTENOcXSgCnyxuJRrfcW3iiJbWx0HuuA=; b=vYdxFM29oi1DPSuUALIwMljJIMBOYGWAdKWGa+XC6eFbUsKLLmuIkOSq2hceD3S6aK hNH/OZpKnYpgtMCE7dzHFe88ETY+RIYb9zn93IrL0xHYPNm7BcHKhcPH3Y6KTnv1+HW4 RWNImkB4xUdfsFssQUFPPVO+lEguKrYW9OVviLBh1EajFeqKifLAs8Mp070JVvYolbq0 F+FMh4wRSfyQBT5cv4MC3KT0uwxlnlRF+AaJG95BrOGKZBuK0FVFNMggjCQznlcUCiXs IaPu8Avww8OR74xfmt10Jrt5mgbgYDM9Aa13An4o2vsdqn2jJsPzX5mL1ANaGT3HtzYc aI7Q== X-Gm-Message-State: ACrzQf3TTKw28Esg9+71EWfNjka6n0c8kSswo2QIlvb4+BzCNkHCJp5O fYHomBe/GhEXkhWLKYT5NoHhc0G/2gQtPSNw0VGskTiDus8hmwK44FNQOiflsxVuSS9Usxqmksa Sygbyyzmh3Ks= X-Received: by 2002:a05:622a:1aa8:b0:35c:c831:d601 with SMTP id s40-20020a05622a1aa800b0035cc831d601mr21283891qtc.434.1664919787641; Tue, 04 Oct 2022 14:43:07 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5/aHhdBDx5/pr6lLga5+ZqFgqfZHwQEpATTsLPquYDFCPYwZ1/spc/bamiVaGZogL3kF2qCQ== X-Received: by 2002:a05:622a:1aa8:b0:35c:c831:d601 with SMTP id s40-20020a05622a1aa800b0035cc831d601mr21283879qtc.434.1664919787439; Tue, 04 Oct 2022 14:43:07 -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 l20-20020ac81494000000b0035d27b254f3sm12482275qtj.40.2022.10.04.14.43.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Oct 2022 14:43:07 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: peterx@redhat.com, Axel Rasmussen , Mike Kravetz , Andrew Morton Subject: [PATCH 4/4] selftests/vm: Drop mnt point for hugetlb in run_vmtests.sh Date: Tue, 4 Oct 2022 17:43:05 -0400 Message-Id: <20221004214305.121405-1-peterx@redhat.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221004214125.120993-1-peterx@redhat.com> References: <20221004214125.120993-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-type: text/plain ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1664919789; 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=1leZa+nnl9FNTENOcXSgCnyxuJRrfcW3iiJbWx0HuuA=; b=SXBmegNbaWly60GSk8z3CdooiOSTcinH5HmV9kx+t3/tCTWSqq1+MGjvynFCre7iAWEdTq lfOGDSVV3/DM/4uMVeI3SQypgDZgIBaKXsBtWqSpJmnBi4pSndICaUp+tWfWc4EjeMdN0O 27OuAozJuE/WPTVDKsuzsB9G+fYpg6I= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=C121Aoo8; spf=pass (imf20.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1664919789; a=rsa-sha256; cv=none; b=V/gJ6KzuVcce1NL3vBwhx/WzdAVJz8a+kooKx+WgsjxnfaNhfx4Lk+MEXYvZW0gkuIOtQT zHqVXI8lbnRUOX/og1kzQ5Iy3/ApxZ3l3yzTMSs+gDi70vLM/9lGhESTbBj2B8g5R6bZE7 50/N0R7PYAhSJT02K3r/zj1IgeHf0cw= Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=C121Aoo8; spf=pass (imf20.hostedemail.com: domain of peterx@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: 8D8A31C0026 X-Rspam-User: X-Stat-Signature: qdduq3dtjfk5xb6dh3zcasaz49yon3yp X-HE-Tag: 1664919789-249904 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. Signed-off-by: Peter Xu Reviewed-by: Axel Rasmussen --- 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