From patchwork Wed Oct 13 19:58:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 12556851 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0AC6C433F5 for ; Wed, 13 Oct 2021 19:58:36 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 888B161168 for ; Wed, 13 Oct 2021 19:58:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 888B161168 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 2AFAD6B0072; Wed, 13 Oct 2021 15:58:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 25FE26B0073; Wed, 13 Oct 2021 15:58:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 14E6F900002; Wed, 13 Oct 2021 15:58:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0234.hostedemail.com [216.40.44.234]) by kanga.kvack.org (Postfix) with ESMTP id 089596B0072 for ; Wed, 13 Oct 2021 15:58:36 -0400 (EDT) Received: from smtpin33.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id BA9DC180295A3 for ; Wed, 13 Oct 2021 19:58:35 +0000 (UTC) X-FDA: 78692476590.33.67FFD8C Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) by imf22.hostedemail.com (Postfix) with ESMTP id CB1C11901 for ; Wed, 13 Oct 2021 19:58:34 +0000 (UTC) Received: by mail-yb1-f202.google.com with SMTP id b126-20020a251b84000000b005bd8aca71a2so4434001ybb.4 for ; Wed, 13 Oct 2021 12:58:35 -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:cc; bh=r8ggS6kE7hiwMXlOxoEpS37drz0U1ooi4VjFJlqzmYg=; b=dH8cneN8llnIsoo/wcx1GeFOBdRgkMlo2Z6frqRCQWsB0suLgWv41LsdsLATepH5VI 1uPdj7aA+ZGMgRJ10NY1JH1v0tWKUG/3YJCw+msj+Er1SM8MjwzF089KRvAiE3k1lrLg LyIE5IjroS5VPvFZ8XyTXGl2luL826FsyYfU1IybkUgqiPpCsO9W8Fs0iCz/bA+U0ivy Dy3vfcSiiEICK2p0XiaDyI1IWNclcodOaI1mFDhrz2SNSQ9SAMOfYa4t3I4eTM6crbYu 1kLvRRC/Giv0iUWi3bwU510RoLMCjKmy7YqlUMckbii2QPsi46elED49KG0MF2IcZUVd QG0g== 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:cc; bh=r8ggS6kE7hiwMXlOxoEpS37drz0U1ooi4VjFJlqzmYg=; b=L0i8J60iQuG93J/Iu8zBpL7tSsXszWBivxYwdqdcctetCgjnTxGv3Uf+Xw5BLJWqd7 aFchgEHYQ7VPjB4CPYj5rzsyuMMzAtCfgxjAqS/VzZ7N9aq61M5w379KBLlfKw1hvgNi oOaJdy/2jWR8X5C0XSlyGftmcpF4Qpwnqu9G9k1lJJO8T2TgVpkoTJnGI/sRiYgGKorl 1+IXXUfUyVeg2mxquYkGMnJMELTzTp0g1OMYorhHmOJQQVdAyI7+HBzTiSR/eSSzF0ov +2zK7S6hP8r5v2Wn2ShNTp44RqKLNDudL5yAIc9Lgg7IjSpXPFzi5rilqqkixdy5l6Zf WxWA== X-Gm-Message-State: AOAM533CfptUPUvcvyBjLhDSsZu3cPVSROM3zeMViISGielnkI8LFH0H XZyAWUbyafDSPWGjRJ9YIJEau8G84iTpNYe+Hw== X-Google-Smtp-Source: ABdhPJx9cCchBMgfHHsObNzgkArLgdXTyq1Ou1oC7F59VOdxZpISoMTloEOmaO2bFrGaz+AUhN5AtwzbK/JAYW0cuA== X-Received: from almasrymina.svl.corp.google.com ([2620:15c:2cd:202:cb5d:d61e:f106:3c70]) (user=almasrymina job=sendgmr) by 2002:a25:7e46:: with SMTP id z67mr1443397ybc.92.1634155114722; Wed, 13 Oct 2021 12:58:34 -0700 (PDT) Date: Wed, 13 Oct 2021 12:58:24 -0700 In-Reply-To: <20211013195825.3058275-1-almasrymina@google.com> Message-Id: <20211013195825.3058275-2-almasrymina@google.com> Mime-Version: 1.0 References: <20211013195825.3058275-1-almasrymina@google.com> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH v7 2/2] mm, hugepages: Add hugetlb vma mremap() test From: Mina Almasry Cc: Mina Almasry , Mike Kravetz , Andrew Morton , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Ken Chen , Chris Kennelly , Michal Hocko , Vlastimil Babka , Kirill Shutemov X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: CB1C11901 X-Stat-Signature: yzom54d13sg47aggn8x78dzowkx7npqg Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=dH8cneN8; spf=pass (imf22.hostedemail.com: domain of 3ajpnYQsKCI0r23r98F3z4rx55x2v.t532z4BE-331Crt1.58x@flex--almasrymina.bounces.google.com designates 209.85.219.202 as permitted sender) smtp.mailfrom=3ajpnYQsKCI0r23r98F3z4rx55x2v.t532z4BE-331Crt1.58x@flex--almasrymina.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-HE-Tag: 1634155114-889105 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: Signed-off-by: Mina Almasry Cc: Mike Kravetz Cc: Andrew Morton Cc: linux-mm@kvack.org Cc: linux-kernel@vger.kernel.org Cc: Ken Chen Cc: Chris Kennelly Cc: Michal Hocko Cc: Vlastimil Babka Cc: Kirill Shutemov Acked-by: Mike Kravetz --- Changes in v6: - Reverted change in v4: test case now passes huge page aligned addrs to mmap/mremap. Changes in v4: - Added comments to make test output clearer. - Modified test case slightly to test hugepage alignment of new_addr. --- tools/testing/selftests/vm/.gitignore | 1 + tools/testing/selftests/vm/Makefile | 1 + tools/testing/selftests/vm/hugepage-mremap.c | 165 +++++++++++++++++++ 3 files changed, 167 insertions(+) create mode 100644 tools/testing/selftests/vm/hugepage-mremap.c -- 2.33.0.882.g93a45727a2-goog diff --git a/tools/testing/selftests/vm/.gitignore b/tools/testing/selftests/vm/.gitignore index b02eac613fdda..2e7e86e852828 100644 --- a/tools/testing/selftests/vm/.gitignore +++ b/tools/testing/selftests/vm/.gitignore @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only hugepage-mmap +hugepage-mremap hugepage-shm khugepaged map_hugetlb diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index d9605bd10f2de..1607322a112c9 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -29,6 +29,7 @@ TEST_GEN_FILES = compaction_test TEST_GEN_FILES += gup_test TEST_GEN_FILES += hmm-tests TEST_GEN_FILES += hugepage-mmap +TEST_GEN_FILES += hugepage-mremap TEST_GEN_FILES += hugepage-shm TEST_GEN_FILES += khugepaged TEST_GEN_FILES += madv_populate diff --git a/tools/testing/selftests/vm/hugepage-mremap.c b/tools/testing/selftests/vm/hugepage-mremap.c new file mode 100644 index 0000000000000..e84b79922fe6e --- /dev/null +++ b/tools/testing/selftests/vm/hugepage-mremap.c @@ -0,0 +1,165 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * hugepage-mremap: + * + * Example of remapping huge page memory in a user application using the + * mremap system call. Before running this application, make sure that the + * administrator has mounted the hugetlbfs filesystem (on some directory + * like /mnt) using the command mount -t hugetlbfs nodev /mnt. In this + * example, the app is requesting memory of size 10MB that is backed by + * huge pages. + * + */ + +#define _GNU_SOURCE +#include +#include +#include +#include +#include +#include +#include /* Definition of O_* constants */ +#include /* Definition of SYS_* constants */ +#include +#include +#include + +#define LENGTH (1UL * 1024 * 1024 * 1024) + +#define PROTECTION (PROT_READ | PROT_WRITE | PROT_EXEC) +#define FLAGS (MAP_SHARED | MAP_ANONYMOUS) + +static void check_bytes(char *addr) +{ + printf("First hex is %x\n", *((unsigned int *)addr)); +} + +static void write_bytes(char *addr) +{ + unsigned long i; + + for (i = 0; i < LENGTH; i++) + *(addr + i) = (char)i; +} + +static int read_bytes(char *addr) +{ + unsigned long i; + + check_bytes(addr); + for (i = 0; i < LENGTH; i++) + if (*(addr + i) != (char)i) { + printf("Mismatch at %lu\n", i); + return 1; + } + return 0; +} + +static void register_region_with_uffd(char *addr, size_t len) +{ + long uffd; /* userfaultfd file descriptor */ + struct uffdio_api uffdio_api; + struct uffdio_register uffdio_register; + + /* Create and enable userfaultfd object. */ + + uffd = syscall(__NR_userfaultfd, O_CLOEXEC | O_NONBLOCK); + if (uffd == -1) { + perror("userfaultfd"); + exit(1); + } + + uffdio_api.api = UFFD_API; + uffdio_api.features = 0; + if (ioctl(uffd, UFFDIO_API, &uffdio_api) == -1) { + perror("ioctl-UFFDIO_API"); + exit(1); + } + + /* Create a private anonymous mapping. The memory will be + * demand-zero paged--that is, not yet allocated. When we + * actually touch the memory, it will be allocated via + * the userfaultfd. + */ + + addr = mmap(NULL, len, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (addr == MAP_FAILED) { + perror("mmap"); + exit(1); + } + + printf("Address returned by mmap() = %p\n", addr); + + /* Register the memory range of the mapping we just created for + * handling by the userfaultfd object. In mode, we request to track + * missing pages (i.e., pages that have not yet been faulted in). + */ + + uffdio_register.range.start = (unsigned long)addr; + uffdio_register.range.len = len; + uffdio_register.mode = UFFDIO_REGISTER_MODE_MISSING; + if (ioctl(uffd, UFFDIO_REGISTER, &uffdio_register) == -1) { + perror("ioctl-UFFDIO_REGISTER"); + exit(1); + } +} + +int main(void) +{ + int ret = 0; + + int fd = open("/mnt/huge/test", O_CREAT | O_RDWR, 0755); + + if (fd < 0) { + perror("Open failed"); + exit(1); + } + + /* mmap to a PUD aligned address to hopefully trigger pmd sharing. */ + unsigned long suggested_addr = 0x7eaa40000000; + void *haddr = mmap((void *)suggested_addr, LENGTH, PROTECTION, + MAP_HUGETLB | MAP_SHARED | MAP_POPULATE, fd, 0); + printf("Map haddr: Returned address is %p\n", haddr); + if (haddr == MAP_FAILED) { + perror("mmap1"); + exit(1); + } + + /* mmap again to a dummy address to hopefully trigger pmd sharing. */ + suggested_addr = 0x7daa40000000; + void *daddr = mmap((void *)suggested_addr, LENGTH, PROTECTION, + MAP_HUGETLB | MAP_SHARED | MAP_POPULATE, fd, 0); + printf("Map daddr: Returned address is %p\n", daddr); + if (daddr == MAP_FAILED) { + perror("mmap3"); + exit(1); + } + + suggested_addr = 0x7faa40000000; + void *vaddr = + mmap((void *)suggested_addr, LENGTH, PROTECTION, FLAGS, -1, 0); + printf("Map vaddr: Returned address is %p\n", vaddr); + if (vaddr == MAP_FAILED) { + perror("mmap2"); + exit(1); + } + + register_region_with_uffd(haddr, LENGTH); + + void *addr = mremap(haddr, LENGTH, LENGTH, + MREMAP_MAYMOVE | MREMAP_FIXED, vaddr); + if (addr == MAP_FAILED) { + perror("mremap"); + exit(1); + } + + printf("Mremap: Returned address is %p\n", addr); + check_bytes(addr); + write_bytes(addr); + ret = read_bytes(addr); + + munmap(addr, LENGTH); + + return ret; +}