All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Xu <peterx@redhat.com>
To: linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc: peterx@redhat.com, Nadav Amit <nadav.amit@gmail.com>,
	Hugh Dickins <hughd@google.com>,
	David Hildenbrand <david@redhat.com>,
	Axel Rasmussen <axelrasmussen@google.com>,
	Matthew Wilcox <willy@infradead.org>,
	Alistair Popple <apopple@nvidia.com>,
	Mike Rapoport <rppt@linux.vnet.ibm.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Jerome Glisse <jglisse@redhat.com>,
	Mike Kravetz <mike.kravetz@oracle.com>,
	"Kirill A . Shutemov" <kirill@shutemov.name>,
	Andrea Arcangeli <aarcange@redhat.com>
Subject: [PATCH v7 09/23] mm/shmem: Allows file-back mem to be uffd wr-protected on thps
Date: Fri,  4 Mar 2022 13:16:54 +0800	[thread overview]
Message-ID: <20220304051708.86193-10-peterx@redhat.com> (raw)
In-Reply-To: <20220304051708.86193-1-peterx@redhat.com>

We don't have "huge" version of pte markers, instead when necessary we split
the thp.

However split the thp is not enough, because file-backed thp is handled totally
differently comparing to anonymous thps: rather than doing a real split, the
thp pmd will simply got cleared in __split_huge_pmd_locked().

That is not enough if e.g. when there is a thp covers range [0, 2M) but we want
to wr-protect small page resides in [4K, 8K) range, because after
__split_huge_pmd() returns, there will be a none pmd, and change_pmd_range()
will just skip it right after the split.

Here we leverage the previously introduced change_pmd_prepare() macro so that
we'll populate the pmd with a pgtable page after the pmd split (in which
process the pmd will be cleared for cases like shmem).  Then change_pte_range()
will do all the rest for us by installing the uffd-wp pte marker at any none
pte that we'd like to wr-protect.

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 mm/mprotect.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mm/mprotect.c b/mm/mprotect.c
index 4878b6b99df9..95b307d4766d 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -329,8 +329,15 @@ static inline unsigned long change_pmd_range(struct vm_area_struct *vma,
 		}
 
 		if (is_swap_pmd(*pmd) || pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) {
-			if (next - addr != HPAGE_PMD_SIZE) {
+			if ((next - addr != HPAGE_PMD_SIZE) ||
+			    uffd_wp_protect_file(vma, cp_flags)) {
 				__split_huge_pmd(vma, pmd, addr, false, NULL);
+				/*
+				 * For file-backed, the pmd could have been
+				 * cleared; make sure pmd populated if
+				 * necessary, then fall-through to pte level.
+				 */
+				change_pmd_prepare(vma, pmd, cp_flags);
 			} else {
 				int nr_ptes = change_huge_pmd(vma, pmd, addr,
 							      newprot, cp_flags);
-- 
2.32.0


  parent reply	other threads:[~2022-03-04  5:18 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-04  5:16 [PATCH v7 00/23] userfaultfd-wp: Support shmem and hugetlbfs Peter Xu
2022-03-04  5:16 ` [PATCH v7 01/23] mm: Introduce PTE_MARKER swap entry Peter Xu
2022-03-04  5:16 ` [PATCH v7 02/23] mm: Teach core mm about pte markers Peter Xu
2022-03-04  5:16 ` [PATCH v7 03/23] mm: Check against orig_pte for finish_fault() Peter Xu
2022-03-04  5:16 ` [PATCH v7 04/23] mm/uffd: PTE_MARKER_UFFD_WP Peter Xu
2022-03-04  5:16 ` [PATCH v7 05/23] mm/shmem: Take care of UFFDIO_COPY_MODE_WP Peter Xu
2022-03-04  5:16 ` [PATCH v7 06/23] mm/shmem: Handle uffd-wp special pte in page fault handler Peter Xu
2022-03-04  5:16 ` [PATCH v7 07/23] mm/shmem: Persist uffd-wp bit across zapping for file-backed Peter Xu
2022-03-04  5:16 ` [PATCH v7 08/23] mm/shmem: Allow uffd wr-protect none pte for file-backed mem Peter Xu
2022-03-04  5:16 ` Peter Xu [this message]
2022-03-04  5:16 ` [PATCH v7 10/23] mm/shmem: Handle uffd-wp during fork() Peter Xu
2022-03-04  5:16 ` [PATCH v7 11/23] mm/hugetlb: Introduce huge pte version of uffd-wp helpers Peter Xu
2022-03-04  5:16 ` [PATCH v7 12/23] mm/hugetlb: Hook page faults for uffd write protection Peter Xu
2022-03-04  5:16 ` [PATCH v7 13/23] mm/hugetlb: Take care of UFFDIO_COPY_MODE_WP Peter Xu
2022-03-04  5:16 ` [PATCH v7 14/23] mm/hugetlb: Handle UFFDIO_WRITEPROTECT Peter Xu
2022-03-04  5:17 ` [PATCH v7 15/23] mm/hugetlb: Handle pte markers in page faults Peter Xu
2022-03-04  5:17 ` [PATCH v7 16/23] mm/hugetlb: Allow uffd wr-protect none ptes Peter Xu
2022-03-04  5:17 ` [PATCH v7 17/23] mm/hugetlb: Only drop uffd-wp special pte if required Peter Xu
2022-03-04  5:17 ` [PATCH v7 18/23] mm/hugetlb: Handle uffd-wp during fork() Peter Xu
2022-03-04  5:17 ` [PATCH v7 19/23] mm/khugepaged: Don't recycle vma pgtable if uffd-wp registered Peter Xu
2022-03-04  5:17 ` [PATCH v7 20/23] mm/pagemap: Recognize uffd-wp bit for shmem/hugetlbfs Peter Xu
2022-03-04  5:17 ` [PATCH v7 21/23] mm/uffd: Enable write protection for shmem & hugetlbfs Peter Xu
2022-03-04  5:17 ` [PATCH v7 22/23] mm: Enable PTE markers by default Peter Xu
2022-03-04  5:17 ` [PATCH v7 23/23] selftests/uffd: Enable uffd-wp for shmem/hugetlbfs 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=20220304051708.86193-10-peterx@redhat.com \
    --to=peterx@redhat.com \
    --cc=aarcange@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=apopple@nvidia.com \
    --cc=axelrasmussen@google.com \
    --cc=david@redhat.com \
    --cc=hughd@google.com \
    --cc=jglisse@redhat.com \
    --cc=kirill@shutemov.name \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.