linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: Nadav Amit <nadav.amit@gmail.com>,
	Miaohe Lin <linmiaohe@huawei.com>,
	Mike Rapoport <rppt@linux.vnet.ibm.com>,
	Andrea Arcangeli <aarcange@redhat.com>,
	Hugh Dickins <hughd@google.com>,
	peterx@redhat.com, Jerome Glisse <jglisse@redhat.com>,
	Mike Kravetz <mike.kravetz@oracle.com>,
	Jason Gunthorpe <jgg@ziepe.ca>,
	Matthew Wilcox <willy@infradead.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Axel Rasmussen <axelrasmussen@google.com>,
	"Kirill A . Shutemov" <kirill@shutemov.name>
Subject: [PATCH v2 19/24] mm/hugetlb: Introduce huge version of special swap pte helpers
Date: Tue, 27 Apr 2021 12:13:12 -0400	[thread overview]
Message-ID: <20210427161317.50682-20-peterx@redhat.com> (raw)
In-Reply-To: <20210427161317.50682-1-peterx@redhat.com>

This is to let hugetlbfs be prepared to also recognize swap special ptes just
like uffd-wp special swap ptes.

Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
---
 mm/hugetlb.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 3cad5d7726614..071a8429ea190 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -93,6 +93,26 @@ static inline bool subpool_is_free(struct hugepage_subpool *spool)
 	return true;
 }
 
+/*
+ * These are sister versions of is_swap_pte() and pte_has_swap_entry().  We
+ * need standalone ones because huge_pte_none() is handled differently from
+ * pte_none().  For more information, please refer to comments above
+ * is_swap_pte() and pte_has_swap_entry().
+ *
+ * Here we directly reuse the pte level of swap special ptes, for example, the
+ * pte_swp_uffd_wp_special().  It just stands for a huge page rather than a
+ * small page for hugetlbfs pages.
+ */
+static inline bool is_huge_swap_pte(pte_t pte)
+{
+	return !huge_pte_none(pte) && !pte_present(pte);
+}
+
+static inline bool huge_pte_has_swap_entry(pte_t pte)
+{
+	return is_huge_swap_pte(pte) && !is_swap_special_pte(pte);
+}
+
 static inline void unlock_or_release_subpool(struct hugepage_subpool *spool,
 						unsigned long irq_flags)
 {
@@ -3885,7 +3905,7 @@ bool is_hugetlb_entry_migration(pte_t pte)
 {
 	swp_entry_t swp;
 
-	if (huge_pte_none(pte) || pte_present(pte))
+	if (!huge_pte_has_swap_entry(pte))
 		return false;
 	swp = pte_to_swp_entry(pte);
 	if (is_migration_entry(swp))
@@ -3898,7 +3918,7 @@ static bool is_hugetlb_entry_hwpoisoned(pte_t pte)
 {
 	swp_entry_t swp;
 
-	if (huge_pte_none(pte) || pte_present(pte))
+	if (!huge_pte_has_swap_entry(pte))
 		return false;
 	swp = pte_to_swp_entry(pte);
 	if (is_hwpoison_entry(swp))
-- 
2.26.2



  parent reply	other threads:[~2021-04-27 16:14 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-27 16:12 [PATCH v2 00/24] userfaultfd-wp: Support shmem and hugetlbfs Peter Xu
2021-04-27 16:12 ` [PATCH v2 01/24] shmem/userfaultfd: Take care of UFFDIO_COPY_MODE_WP Peter Xu
2021-04-27 16:12 ` [PATCH v2 02/24] mm: Clear vmf->pte after pte_unmap_same() returns Peter Xu
2021-04-27 16:12 ` [PATCH v2 03/24] mm/userfaultfd: Introduce special pte for unmapped file-backed mem Peter Xu
2021-04-27 16:12 ` [PATCH v2 04/24] mm/swap: Introduce the idea of special swap ptes Peter Xu
2021-04-27 16:12 ` [PATCH v2 05/24] shmem/userfaultfd: Handle uffd-wp special pte in page fault handler Peter Xu
2021-04-27 18:54   ` Peter Xu
2021-04-27 16:12 ` [PATCH v2 06/24] mm: Drop first_index/last_index in zap_details Peter Xu
2021-04-27 16:13 ` [PATCH v2 07/24] mm: Introduce zap_details.zap_flags Peter Xu
2021-04-27 16:13 ` [PATCH v2 08/24] mm: Introduce ZAP_FLAG_SKIP_SWAP Peter Xu
2021-04-27 16:13 ` [PATCH v2 09/24] mm: Pass zap_flags into unmap_mapping_pages() Peter Xu
2021-04-27 16:13 ` [PATCH v2 10/24] shmem/userfaultfd: Persist uffd-wp bit across zapping for file-backed Peter Xu
2021-04-27 16:13 ` [PATCH v2 11/24] shmem/userfaultfd: Allow wr-protect none pte for file-backed mem Peter Xu
2021-04-27 16:13 ` [PATCH v2 12/24] shmem/userfaultfd: Allows file-back mem to be uffd wr-protected on thps Peter Xu
2021-04-27 16:13 ` [PATCH v2 13/24] shmem/userfaultfd: Handle the left-overed special swap ptes Peter Xu
2021-04-27 16:13 ` [PATCH v2 14/24] shmem/userfaultfd: Pass over uffd-wp special swap pte when fork() Peter Xu
2021-04-27 16:13 ` [PATCH v2 15/24] mm/hugetlb: Drop __unmap_hugepage_range definition from hugetlb.h Peter Xu
2021-04-27 16:13 ` [PATCH v2 16/24] hugetlb/userfaultfd: Hook page faults for uffd write protection Peter Xu
2021-04-28  0:07   ` Peter Xu
2021-04-27 16:13 ` [PATCH v2 17/24] hugetlb/userfaultfd: Take care of UFFDIO_COPY_MODE_WP Peter Xu
2021-04-27 16:13 ` [PATCH v2 18/24] hugetlb/userfaultfd: Handle UFFDIO_WRITEPROTECT Peter Xu
2021-04-27 16:13 ` Peter Xu [this message]
2021-04-27 16:13 ` [PATCH v2 20/24] hugetlb/userfaultfd: Handle uffd-wp special pte in hugetlb pf handler Peter Xu
2021-04-27 16:13 ` [PATCH v2 21/24] hugetlb/userfaultfd: Allow wr-protect none ptes Peter Xu
2021-04-27 16:13 ` [PATCH v2 22/24] hugetlb/userfaultfd: Only drop uffd-wp special pte if required Peter Xu
2021-04-27 16:13 ` [PATCH v2 23/24] mm/userfaultfd: Enable write protection for shmem & hugetlbfs Peter Xu
2021-04-27 16:13 ` [PATCH v2 24/24] userfaultfd/selftests: Enable uffd-wp for shmem/hugetlbfs Peter Xu
2021-05-12 19:00 ` [PATCH v2 00/24] userfaultfd-wp: Support shmem and hugetlbfs Peter Xu
2021-05-14  7:07   ` Hugh Dickins
2021-05-14 13:18     ` Peter Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210427161317.50682-20-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=axelrasmussen@google.com \
    --cc=hughd@google.com \
    --cc=jgg@ziepe.ca \
    --cc=jglisse@redhat.com \
    --cc=kirill@shutemov.name \
    --cc=linmiaohe@huawei.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mike.kravetz@oracle.com \
    --cc=nadav.amit@gmail.com \
    --cc=rppt@linux.vnet.ibm.com \
    --cc=willy@infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox