From patchwork Sat Feb 18 00:28:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Houghton X-Patchwork-Id: 13145408 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 99EFFC636D6 for ; Sat, 18 Feb 2023 00:30:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2AD7F280027; Fri, 17 Feb 2023 19:29:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 25C3D280026; Fri, 17 Feb 2023 19:29:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 06179280027; Fri, 17 Feb 2023 19:29:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id EC571280026 for ; Fri, 17 Feb 2023 19:29:28 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D2BA1C0271 for ; Sat, 18 Feb 2023 00:29:28 +0000 (UTC) X-FDA: 80478528816.22.EF1DC44 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf09.hostedemail.com (Postfix) with ESMTP id 2A04114000B for ; Sat, 18 Feb 2023 00:29:26 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=FTUzD2si; spf=pass (imf09.hostedemail.com: domain of 35hvwYwoKCAUoymtzlmytslttlqj.htrqnsz2-rrp0fhp.twl@flex--jthoughton.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=35hvwYwoKCAUoymtzlmytslttlqj.htrqnsz2-rrp0fhp.twl@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676680167; 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=+gBzjJ9Vs83x35smR0BnSI5ARmUioiACF/H5X92ziQg=; b=njADco7SkapaNxNRfSgmiLexqpQ8QpypjhlIoruvSZYh7s8QGYaMsQHWiAZzjAlFBUNXUu VqTuKVZD23MYOyYt1N6nBZx6Zp7UGMcMC99llAIDdKLyYmL0pUywhNaf66ZC322dGJixfw qzaJsOw/MeQxzDEK4lPHS1zTyAEi9Y4= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=FTUzD2si; spf=pass (imf09.hostedemail.com: domain of 35hvwYwoKCAUoymtzlmytslttlqj.htrqnsz2-rrp0fhp.twl@flex--jthoughton.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=35hvwYwoKCAUoymtzlmytslttlqj.htrqnsz2-rrp0fhp.twl@flex--jthoughton.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676680167; a=rsa-sha256; cv=none; b=qgxhIxerdIkgdOacihA/pauMoJLWcRqm5vAbJhIog2BgHcfJ2UtPbN5DkGU1+esqT8oGjb 3R8MIKFvczVwDmK2HdlDxMx11xp7EI5N9p1K2Mnucar9ZXyzU7hTN/U2QBD6hqf0fUJaH4 AEK9yf88rXFViMgmkTQMdsXZL8FQ1PQ= Received: by mail-yb1-f201.google.com with SMTP id w6-20020a25c706000000b0098592b9ff86so2698842ybe.9 for ; Fri, 17 Feb 2023 16:29:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=+gBzjJ9Vs83x35smR0BnSI5ARmUioiACF/H5X92ziQg=; b=FTUzD2siWOamshg6dDNFdmcX2aYM0u3nvjpwU9uc75sLtLAKVBJAHVwAMjybOOM6aS VCEL8peUI2WwLbzU6ATlSC6+Wvz1/sc5w5zoKT+HEYVEE6xJEDLkP6KrFxiX5oVihBDo s3dn54TE92bh/yI06SLWHvNp5s6gfTErs9rDsWAFHd6g5rwlUEwUOvW2OPB06dtmQD1G M0MjN8FlEcXs2Za2RbC+His2Zwd7Jw8oRFe61lIYiwkcZmU3IZmQOKMZVZ3pE48rUE+w Jbg305rP5BtXo+lCwZaFP+1TrtMNjBmig60ExoWFI/t+qWpnbo+4TveqyihYwoX+lHie dTlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+gBzjJ9Vs83x35smR0BnSI5ARmUioiACF/H5X92ziQg=; b=wkOI4c3fBDmewieLRNmsK3y/R08u5wjbg7Gz48hCV1Ai78nqG9GO7At4rBuPo0f79A SfmlnJL1ViuUlpfkcwKF70TS543SdeNp8eH+KZhOXUjT4N8YO8fKMyZURX6f4+fZFHqX QN3cdButZ3bZcvd2aWQwc6ewfuGKY+saeiVGBjRZRtfN3EV7E/xwGZLSavuBDLhRQdxM 19iXHk2iTaWbzgNtQcirXYDLXWWu9iHfXB2b3bzMpk6W89KEvDfrQoy6qH+SLf4461go xtcs5Kb2Gel0EjFDWkqUOdlObk+fPnuiLgsEy7k7S1Y/XLSWohJW7r68+ggkXlahO7qv CL0g== X-Gm-Message-State: AO0yUKWLB95Hl+5DRegSmvjShWLAlOEMagN1a2c3ivou7eo+1RuLfjb0 SpYoqmnzdHaretZWPWW5JkrpOdKFo3i4KJXZ X-Google-Smtp-Source: AK7set8hCmHkXvdJYET09bfYSTtiB1w0qW6BeHXJttgQrcwICFN7nXKvhHomAteDlPagr6evNf+A5cHI9ctrKXl9 X-Received: from jthoughton.c.googlers.com ([fda3:e722:ac3:cc00:14:4d90:c0a8:2a4f]) (user=jthoughton job=sendgmr) by 2002:a81:8706:0:b0:50b:429e:a9ef with SMTP id x6-20020a818706000000b0050b429ea9efmr1329552ywf.434.1676680166676; Fri, 17 Feb 2023 16:29:26 -0800 (PST) Date: Sat, 18 Feb 2023 00:28:15 +0000 In-Reply-To: <20230218002819.1486479-1-jthoughton@google.com> Mime-Version: 1.0 References: <20230218002819.1486479-1-jthoughton@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Message-ID: <20230218002819.1486479-43-jthoughton@google.com> Subject: [PATCH v2 42/46] selftests/mm: add HugeTLB HGM to userfaultfd selftest From: James Houghton To: Mike Kravetz , Muchun Song , Peter Xu , Andrew Morton Cc: David Hildenbrand , David Rientjes , Axel Rasmussen , Mina Almasry , "Zach O'Keefe" , Manish Mishra , Naoya Horiguchi , "Dr . David Alan Gilbert" , "Matthew Wilcox (Oracle)" , Vlastimil Babka , Baolin Wang , Miaohe Lin , Yang Shi , Frank van der Linden , Jiaqi Yan , linux-mm@kvack.org, linux-kernel@vger.kernel.org, James Houghton X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 2A04114000B X-Stat-Signature: ui36xett8356nymqqirbhspoeo8moeao X-Rspam-User: X-HE-Tag: 1676680166-934503 X-HE-Meta: U2FsdGVkX1/XWdwhwNOqIK1tgL7iS1VyOPQDkSnGEoSSjLar4pEAN+Og6tRJcXThc8dSdgI434/Xy3RFDovFbu51BwKOTvAKZpdseFGrIVXOcskFNFFYw/E5rbSkXWMZ7cugtfiakkqsoMPhuFt7ihMBIHd8mYpxPec67qr5zgnn9saUvtaZbxzgtiyU1Xe8LsF8ias5X7CuqCsbO9ujfDAWh8bruwGt/hR+/rLPs5boXif3FvNCVCARvTwRvB2iZtAZdGZZDZYMa1xowJGXTHtk5qKenMtgWvbqISz58SwvuRvvVk/gO+aZZDw7sy/5CuAz+tzJPKllodC3b5O5jKjg8Jkt4GnDdSftz+1uO8jaZhGbRUidJlgBGWOM7S9Cy+Hz9eXS0mz0wJUvLbIGdqqyYg8wHO9ZJWEJ/rOJ70qFqnGaHUYtk2Z0wNyWd+4bU9Ye8CQF+880eUJJn6OhdT+EDDG2CPPbf+Uc3QQ48AxviotJyHvcHbOGCIdPwKnkbGmuhBvSiEhLSyifRFOgjqxYIy9GC69jj1eIMYbjPqK5jCNW8KbS3O3MQI2d+jJFhPIclQhCgUq5i0opshJD8XkeYAKniMGdshW7hz4IE4r6CxKHNBZWZHstEj/r3VBtkl7+vDp3H9dScyK+tkksCU24SbXpPtTCF3FRUUCHq2Ol8GjcEJe2a8pkvTVdTas4+iODd1Aoy9cXko6kjMr1QGt16nd1WYXG/34Qyg+KjsUOSISrjUgZgRA3WrnMlarFfoXPDYfgCTNf6M7u9y2VkncY3WQQc6NZm+dnBNMPTY6+t1bUXnK9ckSrPtfsd5KewwDa9iCw07EMxFGiE/SRO5Wa4eHDPSoVYQRP2gw9U4Z+Y4CZi7wRHEM4fpkX0uj4CiiTfLakE4EaJeMJm3ZCuGWebCButmwBLc2Q0G6IY2XiwHdHKcCf+OipI4yvJUJ60m2frsjhibC8pkWofgO BpcYBTpR Ln1W2wJOcUSXgVZeg9bzlIehyvGYVJNQBGPClouReLHxD5rQhgY53ebqCDUg1NP+HqGnfrEIjamF44JoIlNCVK1cxQoAoWVf7J0+g4k0AIxLcsB2Lqan4BtB4NGdRd/jlTZoYvBhGYHUBIzDF5zCrcVXqeRZo6EhFqsTlc8Q/Wq6UVp1ppDKcrTRw5C7LDj0h/8fzGBaAWNUiMgURKioSZcjzA2mxmk+6HJC+AELjkj47Wjnvq48kii4zBaAzVq4rqdSi25eV2pIx/H+zDDFFMiRpl2xCKDZHFLl9vhFbwCbee8j5q7mwx2rYarfRKE9jmUkqhYYmXEh1Die6vwQS+//4cuwB4TXpWH+gR2jlBOEJ/cI1kZsYgQIVB9C97Vg1suUC5s6ik995jIaoMgXPGlO/9Fuc9jMXkbDvmYR+AfHiZfvUb3bNPOyPLH0XImFI5tc+FnOtBv4enGTmQpyYzz0UlImn+IunRtXSP12O+mT9iMRLIu3LxDfc9pOMQsBRg+Tzthz6FtjGksE315epdzEa6uRTtnrdpTCIv83jHBhVs7CU/OE9z/EfqSBuqw1rtEnh 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: This test case behaves similarly to the regular shared HugeTLB configuration, except that it uses 4K instead of hugepages, and that we ignore the UFFDIO_COPY tests, as UFFDIO_CONTINUE is the only ioctl that supports PAGE_SIZE-aligned regions. This doesn't test MADV_COLLAPSE. Other tests are added later to exercise MADV_COLLAPSE. Signed-off-by: James Houghton diff --git a/tools/testing/selftests/mm/userfaultfd.c b/tools/testing/selftests/mm/userfaultfd.c index 7f22844ed704..681c5c5f863b 100644 --- a/tools/testing/selftests/mm/userfaultfd.c +++ b/tools/testing/selftests/mm/userfaultfd.c @@ -73,9 +73,10 @@ static unsigned long nr_cpus, nr_pages, nr_pages_per_cpu, page_size, hpage_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; #define UFFD_FLAGS (O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY) @@ -93,6 +94,8 @@ 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 mem_fd; static unsigned long long *count_verify; @@ -151,7 +154,7 @@ 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, "'Test mods' can be joined to the test type string with a ':'. " "Supported mods:\n"); fprintf(stderr, "\tsyscall - Use userfaultfd(2) (default)\n"); @@ -167,6 +170,11 @@ static void usage(void) 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; \ @@ -381,7 +389,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; @@ -393,7 +401,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)) @@ -500,13 +508,16 @@ static void uffd_test_ctx_clear(void) static void uffd_test_ctx_init(uint64_t features) { unsigned long nr, cpu; + uint64_t enabled_features = features; uffd_test_ctx_clear(); uffd_test_ops->allocate_area((void **)&area_src, true); uffd_test_ops->allocate_area((void **)&area_dst, false); - userfaultfd_open(&features); + userfaultfd_open(&enabled_features); + if ((enabled_features & features) != features) + err("couldn't enable all features"); count_verify = malloc(nr_pages * sizeof(unsigned long long)); if (!count_verify) @@ -726,13 +737,16 @@ static void uffd_handle_page_fault(struct uffd_msg *msg, struct uffd_stats *stats) { unsigned long offset; + unsigned long address; if (msg->event != UFFD_EVENT_PAGEFAULT) err("unexpected msg event %u", msg->event); + address = msg->arg.pagefault.address; + if (msg->arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_WP) { /* Write protect page faults */ - wp_range(uffd, msg->arg.pagefault.address, page_size, false); + wp_range(uffd, address, page_size, false); stats->wp_faults++; } else if (msg->arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_MINOR) { uint8_t *area; @@ -751,11 +765,10 @@ static void uffd_handle_page_fault(struct uffd_msg *msg, */ area = (uint8_t *)(area_dst + - ((char *)msg->arg.pagefault.address - - area_dst_alias)); + ((char *)address - area_dst_alias)); for (b = 0; b < page_size; ++b) area[b] = ~area[b]; - continue_range(uffd, msg->arg.pagefault.address, page_size); + continue_range(uffd, address, page_size); stats->minor_faults++; } else { /* @@ -782,7 +795,7 @@ static void uffd_handle_page_fault(struct uffd_msg *msg, if (msg->arg.pagefault.flags & UFFD_PAGEFAULT_FLAG_WRITE) err("unexpected write fault"); - offset = (char *)(unsigned long)msg->arg.pagefault.address - area_dst; + offset = (char *)address - area_dst; offset &= ~(page_size-1); if (copy_page(uffd, offset)) @@ -1192,6 +1205,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); @@ -1245,6 +1264,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); @@ -1329,6 +1354,11 @@ static int userfaultfd_minor_test(void) uffd_test_ctx_init(uffd_minor_feature()); + if (test_type == TEST_HUGETLB_HGM) + /* Enable high-granularity userfaultfd ioctls for HugeTLB */ + if (madvise(area_dst_alias, nr_pages * page_size, MADV_SPLIT)) + err("MADV_SPLIT failed"); + uffdio_register.range.start = (unsigned long)area_dst_alias; uffdio_register.range.len = nr_pages * page_size; uffdio_register.mode = UFFDIO_REGISTER_MODE_MINOR; @@ -1538,6 +1568,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) @@ -1696,6 +1732,16 @@ 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; + /* + * HugeTLB HGM only changes UFFDIO_CONTINUE, so don't test + * UFFDIO_COPY. + */ + test_uffdio_minor = true; + test_uffdio_copy = false; } else if (!strcmp(type, "shmem")) { map_shared = true; test_type = TEST_SHMEM; @@ -1731,6 +1777,7 @@ static void parse_test_type_arg(const char *raw_type) err("Unsupported test: %s", raw_type); if (test_type == TEST_HUGETLB) + /* TEST_HUGETLB_HGM gets small pages. */ page_size = hpage_size; else page_size = sysconf(_SC_PAGE_SIZE); @@ -1813,22 +1860,29 @@ int main(int argc, char **argv) nr_cpus = x < y ? x : y; } nr_pages_per_cpu = bytes / 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_SHMEM || test_type == TEST_HUGETLB) { + if (test_type == TEST_SHMEM || test_is_hugetlb()) { unsigned int memfd_flags = 0; - if (test_type == TEST_HUGETLB) + if (test_is_hugetlb()) memfd_flags = MFD_HUGETLB; mem_fd = memfd_create(argv[0], memfd_flags); if (mem_fd < 0)