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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A0CEC43334 for ; Fri, 24 Jun 2022 17:37:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 232458E0257; Fri, 24 Jun 2022 13:37:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0D1618E0244; Fri, 24 Jun 2022 13:37:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E15718E0257; Fri, 24 Jun 2022 13:37:45 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id C314D8E0244 for ; Fri, 24 Jun 2022 13:37:45 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A43BA33596 for ; Fri, 24 Jun 2022 17:37:45 +0000 (UTC) X-FDA: 79613836890.12.429CE4D Received: from mail-vk1-f202.google.com (mail-vk1-f202.google.com [209.85.221.202]) by imf01.hostedemail.com (Postfix) with ESMTP id 5622A40030 for ; Fri, 24 Jun 2022 17:37:45 +0000 (UTC) Received: by mail-vk1-f202.google.com with SMTP id g136-20020a1f208e000000b0036c645241f1so925196vkg.5 for ; Fri, 24 Jun 2022 10:37:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=SIBOH6opXUz/XwGM5Y6ya4CpHP7LmoYYYTh8F0m81no=; b=Pbkkfo9sSsWByEA3MDQOtz+Q2704OLexkMuoEPgStT8U3UpSblQ3IEPUJoumDhRsCS KF3OzIl1hpNYAOnJFSoAUINBxdMD3KyitvNSBwfbQwAIVinkxf2E5fS++Nptgx5omNHK MhGNV51KMhOAPw8/F/4bz6597P0y0Tjf0Quez0cg4ldgJsyCR4bIHrUcoZUbXkNnkJTy Y9FpzlIt/V/d7jDwUfIW+aYewo3REz+w4TXtV8Ubu/W8DxnbGVsCZKID9paL3I07nVHN ibi7C91OOK5NPVkKxk8pfTxCZhen97wIWN591SFKIs0pk37m97cZ299uot1663T0JWat EJYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=SIBOH6opXUz/XwGM5Y6ya4CpHP7LmoYYYTh8F0m81no=; b=vhAXQF7nXdIgRZaMaBYrMrWqt2rL7pHPJKB6RCC1g7Z+VMtlVtdm++4InM18isTWww nzWT5oN+7SaHd1Oi0LI+2u1BGoUaK3022a21MVoQY+2qA9Y/tVXKSNnhknY+Qkiot9uM yPOk837hxmVbSLMz11082FH52PX9k6piAXhHBs6FeN5p69UXMZkiiC4C+KlssfzfTusx WabT2vjbotX6liTV8RZ2rM+ScWVEa/M+tA5l0PRnt52F77GvfTzfCC6AgTJQ+Dm4mUvu s2XLjCP9pO5F1+hd6UkhpAt/CtjaV887JovG4lG08bdQBjYGsCxHKmrTPstYkRH+2YN5 2VCA== X-Gm-Message-State: AJIora/sqM0XSbYjOEJ8BdZX9SA68HgqrkbjsZC4PDZtT81t8VsrAbqu vRTwxabYvhCSIanQSnxAWFykNGgzcfNZJpAB X-Google-Smtp-Source: AGRyM1vSDDKOe0+ex+JDy0gPJ7CNOXQ1Vy1CORyh/oXQDqJ/7aNJp/5naeafubXWqtHGG6rbV8KIUOgKlN+dxbOo X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a05:6102:d4:b0:356:1e42:b3d8 with SMTP id u20-20020a05610200d400b003561e42b3d8mr1691552vsp.82.1656092264711; Fri, 24 Jun 2022 10:37:44 -0700 (PDT) Date: Fri, 24 Jun 2022 17:36:55 +0000 In-Reply-To: <20220624173656.2033256-1-jthoughton@google.com> Message-Id: <20220624173656.2033256-26-jthoughton@google.com> Mime-Version: 1.0 References: <20220624173656.2033256-1-jthoughton@google.com> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog Subject: [RFC PATCH 25/26] selftests: add HugeTLB HGM to userfaultfd selftest From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu Cc: David Hildenbrand , David Rientjes , Axel Rasmussen , Mina Almasry , Jue Wang , Manish Mishra , "Dr . David Alan Gilbert" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton Content-Type: text/plain; charset="UTF-8" ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1656092265; a=rsa-sha256; cv=none; b=QM4/eKRn6XzX0scZjWxy8WtXJnJkRc8ZJSYXPCm8YlxJKhERB4qqGvB8Rae5prqOuO1+Nv ahkwS4lg4MTE39ZULFqOO3C11GNnElQLt3OROYs0o6BdHhDmrrv3YdN4zUHvzdzeYgoWtR 7eqlqxGMzscnpHmyy9NP2gq3P8QNDX4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1656092265; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=SIBOH6opXUz/XwGM5Y6ya4CpHP7LmoYYYTh8F0m81no=; b=ZylB6DL2z2sstTcY+gk5m1PR75bHmgxnxkJe2ieXOtA8MFljjYpf/LXJGapoxN9Ibq0NJb 2EtKTFT1WC6C8qYCdz4h0SOpXn0/3rDtAy0asNevrTgJCJpkOP2UPaUmclEZs8Gr5C6u/K xY3gmCkTYojMIKGxSTl6ayQM7TX8nbc= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Pbkkfo9s; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3aPa1YgoKCEku4sz5rs4zyrzzrwp.nzxwty58-xxv6lnv.z2r@flex--jthoughton.bounces.google.com designates 209.85.221.202 as permitted sender) smtp.mailfrom=3aPa1YgoKCEku4sz5rs4zyrzzrwp.nzxwty58-xxv6lnv.z2r@flex--jthoughton.bounces.google.com X-Stat-Signature: go4eztq4cc8bbbrgkkqsdkjknjcq5y1k X-Rspamd-Queue-Id: 5622A40030 Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=Pbkkfo9s; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf01.hostedemail.com: domain of 3aPa1YgoKCEku4sz5rs4zyrzzrwp.nzxwty58-xxv6lnv.z2r@flex--jthoughton.bounces.google.com designates 209.85.221.202 as permitted sender) smtp.mailfrom=3aPa1YgoKCEku4sz5rs4zyrzzrwp.nzxwty58-xxv6lnv.z2r@flex--jthoughton.bounces.google.com X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1656092265-801347 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: It behaves just like the regular shared HugeTLB configuration, except that it uses 4K instead of hugepages. This doesn't test collapsing yet. I'll add a test for that for v1. Signed-off-by: James Houghton --- tools/testing/selftests/vm/userfaultfd.c | 61 ++++++++++++++++++++---- 1 file changed, 51 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/vm/userfaultfd.c b/tools/testing/selftests/vm/userfaultfd.c index 0bdfc1955229..9cbb959519a6 100644 --- a/tools/testing/selftests/vm/userfaultfd.c +++ b/tools/testing/selftests/vm/userfaultfd.c @@ -64,7 +64,7 @@ #ifdef __NR_userfaultfd -static unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size; +static unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size, hpage_size; #define BOUNCE_RANDOM (1<<0) #define BOUNCE_RACINGFAULTS (1<<1) @@ -72,9 +72,10 @@ static unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size; #define BOUNCE_POLL (1<<3) static int bounces; -#define TEST_ANON 1 -#define TEST_HUGETLB 2 -#define TEST_SHMEM 3 +#define TEST_ANON 1 +#define TEST_HUGETLB 2 +#define TEST_HUGETLB_HGM 3 +#define TEST_SHMEM 4 static int test_type; /* exercise the test_uffdio_*_eexist every ALARM_INTERVAL_SECS */ @@ -85,6 +86,7 @@ static volatile bool test_uffdio_zeropage_eexist = true; static bool test_uffdio_wp = true; /* Whether to test uffd minor faults */ static bool test_uffdio_minor = false; +static bool test_uffdio_copy = true; static bool map_shared; static int shm_fd; @@ -140,12 +142,17 @@ static void usage(void) fprintf(stderr, "\nUsage: ./userfaultfd " "[hugetlbfs_file]\n\n"); fprintf(stderr, "Supported : anon, hugetlb, " - "hugetlb_shared, shmem\n\n"); + "hugetlb_shared, hugetlb_shared_hgm, shmem\n\n"); fprintf(stderr, "Examples:\n\n"); fprintf(stderr, "%s", examples); exit(1); } +static bool test_is_hugetlb(void) +{ + return test_type == TEST_HUGETLB || test_type == TEST_HUGETLB_HGM; +} + #define _err(fmt, ...) \ do { \ int ret = errno; \ @@ -348,7 +355,7 @@ static struct uffd_test_ops *uffd_test_ops; static inline uint64_t uffd_minor_feature(void) { - if (test_type == TEST_HUGETLB && map_shared) + if (test_is_hugetlb() && map_shared) return UFFD_FEATURE_MINOR_HUGETLBFS; else if (test_type == TEST_SHMEM) return UFFD_FEATURE_MINOR_SHMEM; @@ -360,7 +367,7 @@ static uint64_t get_expected_ioctls(uint64_t mode) { uint64_t ioctls = UFFD_API_RANGE_IOCTLS; - if (test_type == TEST_HUGETLB) + if (test_is_hugetlb()) ioctls &= ~(1 << _UFFDIO_ZEROPAGE); if (!((mode & UFFDIO_REGISTER_MODE_WP) && test_uffdio_wp)) @@ -1116,6 +1123,12 @@ static int userfaultfd_events_test(void) char c; struct uffd_stats stats = { 0 }; + if (!test_uffdio_copy) { + printf("Skipping userfaultfd events test " + "(test_uffdio_copy=false)\n"); + return 0; + } + printf("testing events (fork, remap, remove): "); fflush(stdout); @@ -1169,6 +1182,12 @@ static int userfaultfd_sig_test(void) char c; struct uffd_stats stats = { 0 }; + if (!test_uffdio_copy) { + printf("Skipping userfaultfd signal test " + "(test_uffdio_copy=false)\n"); + return 0; + } + printf("testing signal delivery: "); fflush(stdout); @@ -1438,6 +1457,12 @@ static int userfaultfd_stress(void) pthread_attr_init(&attr); pthread_attr_setstacksize(&attr, 16*1024*1024); + if (!test_uffdio_copy) { + printf("Skipping userfaultfd stress test " + "(test_uffdio_copy=false)\n"); + bounces = 0; + } + while (bounces--) { printf("bounces: %d, mode:", bounces); if (bounces & BOUNCE_RANDOM) @@ -1598,6 +1623,13 @@ static void set_test_type(const char *type) uffd_test_ops = &hugetlb_uffd_test_ops; /* Minor faults require shared hugetlb; only enable here. */ test_uffdio_minor = true; + } else if (!strcmp(type, "hugetlb_shared_hgm")) { + map_shared = true; + test_type = TEST_HUGETLB_HGM; + uffd_test_ops = &hugetlb_uffd_test_ops; + /* Minor faults require shared hugetlb; only enable here. */ + test_uffdio_minor = true; + test_uffdio_copy = false; } else if (!strcmp(type, "shmem")) { map_shared = true; test_type = TEST_SHMEM; @@ -1607,8 +1639,10 @@ static void set_test_type(const char *type) err("Unknown test type: %s", type); } + hpage_size = default_huge_page_size(); if (test_type == TEST_HUGETLB) - page_size = default_huge_page_size(); + // TEST_HUGETLB_HGM gets small pages. + page_size = hpage_size; else page_size = sysconf(_SC_PAGE_SIZE); @@ -1658,19 +1692,26 @@ int main(int argc, char **argv) nr_cpus = sysconf(_SC_NPROCESSORS_ONLN); nr_pages_per_cpu = atol(argv[2]) * 1024*1024 / page_size / nr_cpus; + if (test_type == TEST_HUGETLB_HGM) + /* + * `page_size` refers to the page_size we can use in + * UFFDIO_CONTINUE. We still need nr_pages to be appropriately + * aligned, so align it here. + */ + nr_pages_per_cpu -= nr_pages_per_cpu % (hpage_size / page_size); if (!nr_pages_per_cpu) { _err("invalid MiB"); usage(); } + nr_pages = nr_pages_per_cpu * nr_cpus; bounces = atoi(argv[3]); if (bounces <= 0) { _err("invalid bounces"); usage(); } - nr_pages = nr_pages_per_cpu * nr_cpus; - if (test_type == TEST_HUGETLB && map_shared) { + if (test_is_hugetlb() && map_shared) { if (argc < 5) usage(); huge_fd = open(argv[4], O_CREAT | O_RDWR, 0755); -- 2.37.0.rc0.161.g10f37bed90-goog