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 X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D052DC4707F for ; Thu, 27 May 2021 20:19:51 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 777E66054E for ; Thu, 27 May 2021 20:19:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 777E66054E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 7F9156B0072; Thu, 27 May 2021 16:19:50 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 782F48D0001; Thu, 27 May 2021 16:19:50 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1FF636B0074; Thu, 27 May 2021 16:19:50 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0026.hostedemail.com [216.40.44.26]) by kanga.kvack.org (Postfix) with ESMTP id CF6FE6B0072 for ; Thu, 27 May 2021 16:19:49 -0400 (EDT) Received: from smtpin26.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 6E068AF81 for ; Thu, 27 May 2021 20:19:49 +0000 (UTC) X-FDA: 78188126898.26.0642A64 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 24577A0001F4 for ; Thu, 27 May 2021 20:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1622146788; 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=fvvxzxRyoFFa1CRYUKJFbNEb/H/I+lhHBy9dt3/F7KA=; b=FIs1nLRfXi2NmCYjNDxWAvDo0mSZ9yszEfR7Re8oGJrySzUzA9CRAErojabgxqhG05D/Ev IJLJ51zsBRKtePdUNhZpN/5ga79fxriP10mCoeFqjHnSqhadj2Z7YnHmZTK6Hz9WMGxrsI UBZlng04L8pWSo0QNQaOAZ9gudkyagY= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-100-9OoDThRPPOOo4jr1iWrhTw-1; Thu, 27 May 2021 16:19:43 -0400 X-MC-Unique: 9OoDThRPPOOo4jr1iWrhTw-1 Received: by mail-qk1-f200.google.com with SMTP id l6-20020a3770060000b02902fa5329f2b4so1309971qkc.18 for ; Thu, 27 May 2021 13:19:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fvvxzxRyoFFa1CRYUKJFbNEb/H/I+lhHBy9dt3/F7KA=; b=M9Ha1QQ/bQCTyTMVSRuOCagfeucTMD2+fP8+0j20oYd0UQO0IUYKH2jANmeC3RYyZp k48P0gmH1l956wCn3jZkrJlIV+iZwKcEdyUGPm29AZrr3a9SWUfRdDNnTaydgvH6G8eV L+JUwsXtTuCjHTWzMz2sU5cg4s3CH/MnBccR/RWBadVJF77d+bV3R7fJGBRxu5n6hyK9 x5FUG6Ew67Uey7+QxKVdUGwK2qFNwaXrGC7haTjxQ7NUYnlInzUkutWz1XVBEatZJXLh GhNA7ajXZU2nD800CIvf/ptwoROK54604E2Dt4J/6jTvKcAD6FZzShU8lGKPlLGe1kb0 vOHg== X-Gm-Message-State: AOAM533/CL6DMXyYTQMvggCCt/6Ed92ChlXavW5Drlg67yFxBEm7WafW zhukO95xhUD6IdY9U49Ec0EE6rDGFqx0KnrAyW9/T1/izP3i8DqtTXl4mSTHbnxWr1J3m5qgg3a X5+/npRkvnUo= X-Received: by 2002:ad4:4baf:: with SMTP id i15mr312396qvw.61.1622146781820; Thu, 27 May 2021 13:19:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9mMbN6hPTbdFTATmfDi5zfbVFhTvV13COXxAbZrbayo1xXYeoyJUoyvd4oXVYnWHsq6J0Gg== X-Received: by 2002:ad4:4baf:: with SMTP id i15mr312376qvw.61.1622146781565; Thu, 27 May 2021 13:19:41 -0700 (PDT) Received: from localhost.localdomain (bras-base-toroon474qw-grc-72-184-145-4-219.dsl.bell.ca. [184.145.4.219]) by smtp.gmail.com with ESMTPSA id u14sm2089536qkp.80.2021.05.27.13.19.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 May 2021 13:19:40 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Axel Rasmussen , "Kirill A . Shutemov" , Hugh Dickins , Andrew Morton , Miaohe Lin , Mike Rapoport , Jerome Glisse , Andrea Arcangeli , Nadav Amit , Mike Kravetz , peterx@redhat.com, Jason Gunthorpe , Matthew Wilcox Subject: [PATCH v3 04/27] mm/userfaultfd: Introduce special pte for unmapped file-backed mem Date: Thu, 27 May 2021 16:19:04 -0400 Message-Id: <20210527201927.29586-5-peterx@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210527201927.29586-1-peterx@redhat.com> References: <20210527201927.29586-1-peterx@redhat.com> MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="US-ASCII" Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=FIs1nLRf; spf=none (imf24.hostedemail.com: domain of peterx@redhat.com has no SPF policy when checking 170.10.133.124) smtp.mailfrom=peterx@redhat.com; dmarc=pass (policy=none) header.from=redhat.com X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 24577A0001F4 X-Stat-Signature: 7uqxxoh5wsrzub5pmpfnt5uiem7u47q7 X-HE-Tag: 1622146781-479760 Content-Transfer-Encoding: quoted-printable 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 patch introduces a very special swap-like pte for file-backed memori= es. Currently it's only defined for x86_64 only, but as long as any arch that= can properly define the UFFD_WP_SWP_PTE_SPECIAL value as requested, it should conceptually work too. We will use this special pte to arm the ptes that got either unmapped or swapped out for a file-backed region that was previously wr-protected. T= his special pte could trigger a page fault just like swap entries, and as lon= g as the page fault will satisfy pte_none()=3D=3Dfalse && pte_present()=3D=3Df= alse. Then we can revive the special pte into a normal pte backed by the page c= ache. This idea is greatly inspired by Hugh and Andrea in the discussion, which= is referenced in the links below. The other idea (from Hugh) is that we use swp_type=3D=3D1 and swp_offset=3D= 0 as the special pte. The current solution (as pointed out by Andrea) is slightly preferred in that we don't even need swp_entry_t knowledge at all in trap= ping these accesses. Meanwhile, we also reuse _PAGE_SWP_UFFD_WP from the anon= ymous swp entries. This patch only introduces the special pte and its operators. It's not y= et applied to have any functional difference. Link: https://lore.kernel.org/lkml/20201126222359.8120-1-peterx@redhat.co= m/ Link: https://lore.kernel.org/lkml/20201130230603.46187-1-peterx@redhat.c= om/ Suggested-by: Andrea Arcangeli Suggested-by: Hugh Dickins Signed-off-by: Peter Xu --- arch/x86/include/asm/pgtable.h | 28 ++++++++++++++++++++++++++++ include/asm-generic/pgtable_uffd.h | 3 +++ include/linux/userfaultfd_k.h | 21 +++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtabl= e.h index b1099f2d9800..9781ba2da049 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1329,6 +1329,34 @@ static inline pmd_t pmd_swp_clear_soft_dirty(pmd_t= pmd) #endif =20 #ifdef CONFIG_HAVE_ARCH_USERFAULTFD_WP + +/* + * This is a very special swap-like pte that marks this pte as "wr-prote= cted" + * by userfaultfd-wp. It should only exist for file-backed memory where= the + * page (previously got wr-protected) has been unmapped or swapped out. + * + * For anonymous memories, the userfaultfd-wp _PAGE_SWP_UFFD_WP bit is k= ept + * along with a real swp entry instead. + * + * Let's make some rules for this special pte: + * + * (1) pte_none()=3D=3Dfalse, so that it'll not trigger a missing page f= ault. + * + * (2) pte_present()=3D=3Dfalse, so that it's recognized as swap (is_swa= p_pte). + * + * (3) pte_swp_uffd_wp()=3D=3Dtrue, so it can be tested just like a swap= pte that + * contains a valid swap entry, so that we can check a swap pte alwa= ys + * using "is_swap_pte() && pte_swp_uffd_wp()" without caring about w= hether + * there's one swap entry inside of the pte. + * + * (4) It should not be a valid swap pte anywhere, so that when we see t= his pte + * we know it does not contain a swap entry. + * + * For x86, the simplest special pte which satisfies all of above should= be the + * pte with only _PAGE_SWP_UFFD_WP bit set (where swp_type=3D=3Dswp_offs= et=3D=3D0). + */ +#define UFFD_WP_SWP_PTE_SPECIAL __pte(_PAGE_SWP_UFFD_WP) + static inline pte_t pte_swp_mkuffd_wp(pte_t pte) { return pte_set_flags(pte, _PAGE_SWP_UFFD_WP); diff --git a/include/asm-generic/pgtable_uffd.h b/include/asm-generic/pgt= able_uffd.h index 828966d4c281..95e9811ce9d1 100644 --- a/include/asm-generic/pgtable_uffd.h +++ b/include/asm-generic/pgtable_uffd.h @@ -2,6 +2,9 @@ #define _ASM_GENERIC_PGTABLE_UFFD_H =20 #ifndef CONFIG_HAVE_ARCH_USERFAULTFD_WP + +#define UFFD_WP_SWP_PTE_SPECIAL __pte(0) + static __always_inline int pte_uffd_wp(pte_t pte) { return 0; diff --git a/include/linux/userfaultfd_k.h b/include/linux/userfaultfd_k.= h index 331d2ccf0bcc..93f932b53a71 100644 --- a/include/linux/userfaultfd_k.h +++ b/include/linux/userfaultfd_k.h @@ -145,6 +145,17 @@ extern int userfaultfd_unmap_prep(struct vm_area_str= uct *vma, extern void userfaultfd_unmap_complete(struct mm_struct *mm, struct list_head *uf); =20 +static inline pte_t pte_swp_mkuffd_wp_special(struct vm_area_struct *vma= ) +{ + WARN_ON_ONCE(vma_is_anonymous(vma)); + return UFFD_WP_SWP_PTE_SPECIAL; +} + +static inline bool pte_swp_uffd_wp_special(pte_t pte) +{ + return pte_same(pte, UFFD_WP_SWP_PTE_SPECIAL); +} + #else /* CONFIG_USERFAULTFD */ =20 /* mm helpers */ @@ -234,6 +245,16 @@ static inline void userfaultfd_unmap_complete(struct= mm_struct *mm, { } =20 +static inline pte_t pte_swp_mkuffd_wp_special(struct vm_area_struct *vma= ) +{ + return __pte(0); +} + +static inline bool pte_swp_uffd_wp_special(pte_t pte) +{ + return false; +} + #endif /* CONFIG_USERFAULTFD */ =20 #endif /* _LINUX_USERFAULTFD_K_H */ --=20 2.31.1