From patchwork Mon Jul 18 11:47:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nadav Amit X-Patchwork-Id: 12921633 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 E9628C43334 for ; Mon, 18 Jul 2022 19:22:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3FB136B0073; Mon, 18 Jul 2022 15:22:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D1156B0074; Mon, 18 Jul 2022 15:22:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 24B4C8E0001; Mon, 18 Jul 2022 15:22:41 -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 17DB66B0073 for ; Mon, 18 Jul 2022 15:22:41 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id D33DC20AE6 for ; Mon, 18 Jul 2022 19:22:40 +0000 (UTC) X-FDA: 79701192480.19.C3C0E6B Received: from relay5.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by imf11.hostedemail.com (Postfix) with ESMTP id 6C74F4008A for ; Mon, 18 Jul 2022 19:22:40 +0000 (UTC) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 28CF580232 for ; Mon, 18 Jul 2022 19:22:40 +0000 (UTC) X-FDA: 79701192480.21.ACA6138 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by imf13.hostedemail.com (Postfix) with ESMTP id 8FFF320097 for ; Mon, 18 Jul 2022 19:22:39 +0000 (UTC) Received: by mail-pl1-f175.google.com with SMTP id x21so9928630plb.3 for ; Mon, 18 Jul 2022 12:22:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OQnkRYEPKgq5fO0dKH7Bjw+39/XJwiUYDPfNEcN6JO0=; b=M1DzUFc6zLXb04kP4nOe3+o6pUebaSEUk6RzGnlDaqEZEKd5bxpSaVZvKqxGQAOx6F VSBAvPSDLdRMAGlgMHpGIlfzkhTLfucwdOesHgvh8yvqvrKdgmPI3yaZPp0c+EJL+8fO OzjHL3CgOWnSF5oHdu1aHz1/3NMU8uPHT4R9WMAXlfTZ/sHUSJ9SzCmkrK3eAWZIULjs e1eg+wlysgijKTAzL4nMMnauEbbcBJBUv10Axbi8c23+Aad8Cs0isWWBOuRGqsohcy// lyxiz5UCBUZR1Vo5pZBhh6kSwaw47f3i2d3DYoGnBZCTNFmfPOYPiXXBTwkCRJvUytk/ vP6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OQnkRYEPKgq5fO0dKH7Bjw+39/XJwiUYDPfNEcN6JO0=; b=RmNIekLxLJDE5WsIkO3vhKOtV4o8LBVreeUOhz8PS5VtG9j2c43noTEliyhHI2NI0p AEP7d/sBWPcHLYx2GWbzdnmE9Jtartj1nXNHBC4KqiYRCnTrquE0jwOX2eh49t2wl14L 07aXaM+TdpcG3Y3ir9PwQvC7FeqiIZRrfl5dKhKx6wUTRDUU+6yQ0/8Bem8muXwmhUn6 w1j1ea1z1wNiwnhPEsrqslKvz3+a6GBhmVpDSwek03E1HS5wwpP89xFPbe47hn1ud/li geWnv2dIwkLDM97+DKYs5jKYlRqNoXhgWKgrWmT6S9AlJYkiagGddPz45q7LqcgCFLqL JJqg== X-Gm-Message-State: AJIora+TQiHO3xbRNFiZJyipaPMs6LJaqWrsnBQrFSs3Ii9c5Tr8oVPc jVpJtk9wJ/T3UkX6gXBFhfTQLijcPio= X-Google-Smtp-Source: AGRyM1uxuD1e+x/GR+8VUjRTBxiouQOGweL1WbfvLxKcCk30SJb5pqisAW4T/jh8UBjITxFc2oAYZQ== X-Received: by 2002:a17:90b:1c81:b0:1f1:aa6a:82d0 with SMTP id oo1-20020a17090b1c8100b001f1aa6a82d0mr13446935pjb.170.1658172158084; Mon, 18 Jul 2022 12:22:38 -0700 (PDT) Received: from sc2-haas01-esx0118.eng.vmware.com ([66.170.99.1]) by smtp.gmail.com with ESMTPSA id g9-20020a625209000000b0051bc5f4df1csm9613570pfb.154.2022.07.18.12.22.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Jul 2022 12:22:37 -0700 (PDT) From: Nadav Amit X-Google-Original-From: Nadav Amit To: linux-mm@kvack.org Cc: Andrew Morton , Nadav Amit , Mike Kravetz , Hugh Dickins , Axel Rasmussen , Peter Xu , David Hildenbrand , Mike Rapoport Subject: [PATCH v2 2/5] userfaultfd: introduce access-likely mode for common operations Date: Mon, 18 Jul 2022 04:47:45 -0700 Message-Id: <20220718114748.2623-3-namit@vmware.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220718114748.2623-1-namit@vmware.com> References: <20220718114748.2623-1-namit@vmware.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1658172160; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=OQnkRYEPKgq5fO0dKH7Bjw+39/XJwiUYDPfNEcN6JO0=; b=GmHF2CAexoFmEjNlkv64L48rN876Ng5BMxBjO5Nhe+L08Xq6TUEkuFUWHtWPzAm+J8iuk0 TfxV/YpuMMgmMMWb8org4hHWKqHus6UmUeBbrTgGWnww+UsXqKl0H30QmA9tIZoyJiSzON Tq02cJNFbBnYl0x0qhheZRa5NaSDgWE= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=M1DzUFc6; spf=none (imf11.hostedemail.com: domain of MAILER-DAEMON@hostedemail.com has no SPF policy when checking 216.40.44.16) smtp.mailfrom=MAILER-DAEMON@hostedemail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1658172160; a=rsa-sha256; cv=none; b=6YoF1wZ+w3G+w08WMYsVghLyVjV9BAuNv7zPGB/4JuaCsSfroj4Jam0Oep3S0QNkgHVh16 HpB5FE/Cr70Szv6zclZHCnwszntVztYBnBSr4dq9DBo9Y9gZweFRUyeGX1ea0O3WHkbLJW NOIUVvUYEgHJTBbevCu4HrzlCdBKna4= X-Stat-Signature: 3a5urpxpu7pah736dr7u9yghhcaakyyf X-Rspamd-Queue-Id: 6C74F4008A X-HE-Tag-Orig: 1658172159-661772 X-Rspamd-Server: rspam02 X-Rspam-User: Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=M1DzUFc6; spf=none (imf11.hostedemail.com: domain of MAILER-DAEMON@hostedemail.com has no SPF policy when checking 216.40.44.16) smtp.mailfrom=MAILER-DAEMON@hostedemail.com; dmarc=pass (policy=none) header.from=gmail.com X-HE-Tag: 1658172160-772625 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: From: Nadav Amit Introduce access-hints in userfaultfd. The expectation is that userspace would set access-hints when a page-fault occurred on a page and would not provide the access-hint on prefaulted memory. The exact behavior of the kernel in regard to the hints would not be part of userfaultfd api. At this time the use of the access-hint is only in setting access-bit similarly to the way it is done in do_set_pte(). In x86, currently PTEs are always marked as young, including prefetched ones. But on arm64, PTEs would be marked as old (when access bit is supported). If access hints are not enabled, the kernel would behave as if the access-hint was provided for backward compatibility. Cc: Mike Kravetz Cc: Hugh Dickins Cc: Andrew Morton Cc: Axel Rasmussen Cc: Peter Xu Cc: David Hildenbrand Cc: Mike Rapoport Signed-off-by: Nadav Amit --- fs/userfaultfd.c | 39 ++++++++++++++++++++++++++++---- include/linux/userfaultfd_k.h | 1 + include/uapi/linux/userfaultfd.h | 20 +++++++++++++++- mm/internal.h | 13 +++++++++++ mm/memory.c | 12 ---------- mm/userfaultfd.c | 11 +++++++-- 6 files changed, 77 insertions(+), 19 deletions(-) diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 2ae24327beec..8d8792b27c53 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -1708,13 +1708,21 @@ static int userfaultfd_copy(struct userfaultfd_ctx *ctx, ret = -EINVAL; if (uffdio_copy.src + uffdio_copy.len <= uffdio_copy.src) goto out; - if (uffdio_copy.mode & ~(UFFDIO_COPY_MODE_DONTWAKE|UFFDIO_COPY_MODE_WP)) + if (uffdio_copy.mode & ~(UFFDIO_COPY_MODE_DONTWAKE|UFFDIO_COPY_MODE_WP| + UFFDIO_COPY_MODE_ACCESS_LIKELY)) goto out; mode_wp = uffdio_copy.mode & UFFDIO_COPY_MODE_WP; uffd_flags = mode_wp ? UFFD_FLAGS_WP : UFFD_FLAGS_NONE; + if (ctx->features & UFFD_FEATURE_ACCESS_HINTS) { + if (uffdio_copy.mode & UFFDIO_COPY_MODE_ACCESS_LIKELY) + uffd_flags |= UFFD_FLAGS_ACCESS_LIKELY; + } else { + uffd_flags |= UFFD_FLAGS_ACCESS_LIKELY; + } + if (mmget_not_zero(ctx->mm)) { ret = mcopy_atomic(ctx->mm, uffdio_copy.dst, uffdio_copy.src, uffdio_copy.len, &ctx->mmap_changing, @@ -1765,9 +1773,17 @@ static int userfaultfd_zeropage(struct userfaultfd_ctx *ctx, if (ret) goto out; ret = -EINVAL; - if (uffdio_zeropage.mode & ~UFFDIO_ZEROPAGE_MODE_DONTWAKE) + if (uffdio_zeropage.mode & ~(UFFDIO_ZEROPAGE_MODE_DONTWAKE| + UFFDIO_ZEROPAGE_MODE_ACCESS_LIKELY)) goto out; + if (ctx->features & UFFD_FEATURE_ACCESS_HINTS) { + if (uffdio_zeropage.mode & UFFDIO_ZEROPAGE_MODE_ACCESS_LIKELY) + uffd_flags |= UFFD_FLAGS_ACCESS_LIKELY; + } else { + uffd_flags |= UFFD_FLAGS_ACCESS_LIKELY; + } + if (mmget_not_zero(ctx->mm)) { ret = mfill_zeropage(ctx->mm, uffdio_zeropage.range.start, uffdio_zeropage.range.len, @@ -1817,7 +1833,8 @@ static int userfaultfd_writeprotect(struct userfaultfd_ctx *ctx, return ret; if (uffdio_wp.mode & ~(UFFDIO_WRITEPROTECT_MODE_DONTWAKE | - UFFDIO_WRITEPROTECT_MODE_WP)) + UFFDIO_WRITEPROTECT_MODE_WP | + UFFDIO_WRITEPROTECT_MODE_ACCESS_LIKELY)) return -EINVAL; mode_wp = uffdio_wp.mode & UFFDIO_WRITEPROTECT_MODE_WP; @@ -1827,6 +1844,12 @@ static int userfaultfd_writeprotect(struct userfaultfd_ctx *ctx, return -EINVAL; uffd_flags = mode_wp ? UFFD_FLAGS_WP : UFFD_FLAGS_NONE; + if (ctx->features & UFFD_FEATURE_ACCESS_HINTS) { + if (uffdio_wp.mode & UFFDIO_WRITEPROTECT_MODE_ACCESS_LIKELY) + uffd_flags |= UFFD_FLAGS_ACCESS_LIKELY; + } else { + uffd_flags |= UFFD_FLAGS_ACCESS_LIKELY; + } if (mmget_not_zero(ctx->mm)) { ret = mwriteprotect_range(ctx->mm, uffdio_wp.range.start, @@ -1879,9 +1902,17 @@ static int userfaultfd_continue(struct userfaultfd_ctx *ctx, unsigned long arg) uffdio_continue.range.start) { goto out; } - if (uffdio_continue.mode & ~UFFDIO_CONTINUE_MODE_DONTWAKE) + if (uffdio_continue.mode & ~(UFFDIO_CONTINUE_MODE_DONTWAKE| + UFFDIO_CONTINUE_MODE_ACCESS_LIKELY)) goto out; + if (ctx->features & UFFD_FEATURE_ACCESS_HINTS) { + if (uffdio_continue.mode & UFFDIO_CONTINUE_MODE_ACCESS_LIKELY) + uffd_flags |= UFFD_FLAGS_ACCESS_LIKELY; + } else { + uffd_flags |= UFFD_FLAGS_ACCESS_LIKELY; + } + if (mmget_not_zero(ctx->mm)) { ret = mcopy_continue(ctx->mm, uffdio_continue.range.start, uffdio_continue.range.len, diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.h index a63b61823984..b326798b5677 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -59,6 +59,7 @@ typedef unsigned int __bitwise uffd_flags_t; #define UFFD_FLAGS_NONE ((__force uffd_flags_t)0) #define UFFD_FLAGS_WP ((__force uffd_flags_t)BIT(0)) +#define UFFD_FLAGS_ACCESS_LIKELY ((__force uffd_flags_t)BIT(1)) extern int mfill_atomic_install_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, struct vm_area_struct *dst_vma, diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h index 7d32b1e797fb..02e0c1f56939 100644 --- a/include/uapi/linux/userfaultfd.h +++ b/include/uapi/linux/userfaultfd.h @@ -34,7 +34,8 @@ UFFD_FEATURE_MINOR_HUGETLBFS | \ UFFD_FEATURE_MINOR_SHMEM | \ UFFD_FEATURE_EXACT_ADDRESS | \ - UFFD_FEATURE_WP_HUGETLBFS_SHMEM) + UFFD_FEATURE_WP_HUGETLBFS_SHMEM | \ + UFFD_FEATURE_ACCESS_HINTS) #define UFFD_API_IOCTLS \ ((__u64)1 << _UFFDIO_REGISTER | \ (__u64)1 << _UFFDIO_UNREGISTER | \ @@ -199,6 +200,9 @@ struct uffdio_api { * * UFFD_FEATURE_WP_HUGETLBFS_SHMEM indicates that userfaultfd * write-protection mode is supported on both shmem and hugetlbfs. + * + * UFFD_FEATURE_ACCESS_HINTS indicates that the ioctl operations + * support the UFFDIO_*_MODE_ACCESS_LIKELY hints. */ #define UFFD_FEATURE_PAGEFAULT_FLAG_WP (1<<0) #define UFFD_FEATURE_EVENT_FORK (1<<1) @@ -213,6 +217,7 @@ struct uffdio_api { #define UFFD_FEATURE_MINOR_SHMEM (1<<10) #define UFFD_FEATURE_EXACT_ADDRESS (1<<11) #define UFFD_FEATURE_WP_HUGETLBFS_SHMEM (1<<12) +#define UFFD_FEATURE_ACCESS_HINTS (1<<13) __u64 features; __u64 ioctls; @@ -247,8 +252,14 @@ struct uffdio_copy { * the fly. UFFDIO_COPY_MODE_WP is available only if the * write protected ioctl is implemented for the range * according to the uffdio_register.ioctls. + * + * UFFDIO_COPY_MODE_ACCESS_LIKELY provides a hint to the kernel that the + * page is likely to be access in the near future. Providing the hint + * properly can improve performance. + * */ #define UFFDIO_COPY_MODE_WP ((__u64)1<<1) +#define UFFDIO_COPY_MODE_ACCESS_LIKELY ((__u64)1<<2) __u64 mode; /* @@ -261,6 +272,7 @@ struct uffdio_copy { struct uffdio_zeropage { struct uffdio_range range; #define UFFDIO_ZEROPAGE_MODE_DONTWAKE ((__u64)1<<0) +#define UFFDIO_ZEROPAGE_MODE_ACCESS_LIKELY ((__u64)1<<1) __u64 mode; /* @@ -280,6 +292,10 @@ struct uffdio_writeprotect { * UFFDIO_WRITEPROTECT_MODE_DONTWAKE: set the flag to avoid waking up * any wait thread after the operation succeeds. * + * UFFDIO_WRITEPROTECT_MODE_ACCESS_LIKELY provides a hint to the kernel + * that the page is likely to be access in the near future. Providing + * the hint properly can improve performance. + * * NOTE: Write protecting a region (WP=1) is unrelated to page faults, * therefore DONTWAKE flag is meaningless with WP=1. Removing write * protection (WP=0) in response to a page fault wakes the faulting @@ -287,12 +303,14 @@ struct uffdio_writeprotect { */ #define UFFDIO_WRITEPROTECT_MODE_WP ((__u64)1<<0) #define UFFDIO_WRITEPROTECT_MODE_DONTWAKE ((__u64)1<<1) +#define UFFDIO_WRITEPROTECT_MODE_ACCESS_LIKELY ((__u64)1<<2) __u64 mode; }; struct uffdio_continue { struct uffdio_range range; #define UFFDIO_CONTINUE_MODE_DONTWAKE ((__u64)1<<0) +#define UFFDIO_CONTINUE_MODE_ACCESS_LIKELY ((__u64)1<<1) __u64 mode; /* diff --git a/mm/internal.h b/mm/internal.h index c0f8fbe0445b..d035b77b4f2f 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -12,6 +12,7 @@ #include #include #include +#include struct folio_batch; @@ -861,4 +862,16 @@ struct folio *try_grab_folio(struct page *page, int refs, unsigned int flags); DECLARE_PER_CPU(struct per_cpu_nodestat, boot_nodestats); +#ifndef arch_wants_old_prefaulted_pte +static inline bool arch_wants_old_prefaulted_pte(void) +{ + /* + * Transitioning a PTE from 'old' to 'young' can be expensive on + * some architectures, even if it's performed in hardware. By + * default, "false" means prefaulted entries will be 'young'. + */ + return false; +} +#endif + #endif /* __MM_INTERNAL_H */ diff --git a/mm/memory.c b/mm/memory.c index 580c62febe42..31ec3f0071a2 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -137,18 +137,6 @@ static inline bool arch_faults_on_old_pte(void) } #endif -#ifndef arch_wants_old_prefaulted_pte -static inline bool arch_wants_old_prefaulted_pte(void) -{ - /* - * Transitioning a PTE from 'old' to 'young' can be expensive on - * some architectures, even if it's performed in hardware. By - * default, "false" means prefaulted entries will be 'young'. - */ - return false; -} -#endif - static int __init disable_randmaps(char *s) { randomize_va_space = 0; diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 421784d26651..c15679f3eb6a 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c @@ -65,6 +65,7 @@ int mfill_atomic_install_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, bool writable = dst_vma->vm_flags & VM_WRITE; bool vm_shared = dst_vma->vm_flags & VM_SHARED; bool page_in_cache = page->mapping; + bool prefault = !(uffd_flags & UFFD_FLAGS_ACCESS_LIKELY); spinlock_t *ptl; struct inode *inode; pgoff_t offset, max_off; @@ -92,6 +93,11 @@ int mfill_atomic_install_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, */ _dst_pte = pte_wrprotect(_dst_pte); + if (prefault && arch_wants_old_prefaulted_pte()) + _dst_pte = pte_mkold(_dst_pte); + else + _dst_pte = pte_sw_mkyoung(_dst_pte); + dst_pte = pte_offset_map_lock(dst_mm, dst_pmd, dst_addr, &ptl); if (vma_is_shmem(dst_vma)) { @@ -202,7 +208,8 @@ static int mcopy_atomic_pte(struct mm_struct *dst_mm, static int mfill_zeropage_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, struct vm_area_struct *dst_vma, - unsigned long dst_addr) + unsigned long dst_addr, + uffd_flags_t uffd_flags) { pte_t _dst_pte, *dst_pte; spinlock_t *ptl; @@ -495,7 +502,7 @@ static __always_inline ssize_t mfill_atomic_pte(struct mm_struct *dst_mm, uffd_flags); else err = mfill_zeropage_pte(dst_mm, dst_pmd, - dst_vma, dst_addr); + dst_vma, dst_addr, uffd_flags); } else { err = shmem_mfill_atomic_pte(dst_mm, dst_pmd, dst_vma, dst_addr, src_addr,