public inbox for linux-mm@kvack.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 12/23] mm/hugetlb: Hook page faults for uffd write protection
Date: Fri,  4 Mar 2022 13:16:57 +0800	[thread overview]
Message-ID: <20220304051708.86193-13-peterx@redhat.com> (raw)
In-Reply-To: <20220304051708.86193-1-peterx@redhat.com>

Hook up hugetlbfs_fault() with the capability to handle userfaultfd-wp faults.

We do this slightly earlier than hugetlb_cow() so that we can avoid taking some
extra locks that we definitely don't need.

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

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index b34f50156f7e..d2539e2fe066 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -5680,6 +5680,26 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
 	if (unlikely(!pte_same(entry, huge_ptep_get(ptep))))
 		goto out_ptl;
 
+	/* Handle userfault-wp first, before trying to lock more pages */
+	if (userfaultfd_wp(vma) && huge_pte_uffd_wp(huge_ptep_get(ptep)) &&
+	    (flags & FAULT_FLAG_WRITE) && !huge_pte_write(entry)) {
+		struct vm_fault vmf = {
+			.vma = vma,
+			.address = haddr,
+			.real_address = address,
+			.flags = flags,
+		};
+
+		spin_unlock(ptl);
+		if (pagecache_page) {
+			unlock_page(pagecache_page);
+			put_page(pagecache_page);
+		}
+		mutex_unlock(&hugetlb_fault_mutex_table[hash]);
+		i_mmap_unlock_read(mapping);
+		return handle_userfault(&vmf, VM_UFFD_WP);
+	}
+
 	/*
 	 * hugetlb_cow() requires page locks of pte_page(entry) and
 	 * pagecache_page, so here we need take the former one
-- 
2.32.0



  parent reply	other threads:[~2022-03-04  5:19 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 ` [PATCH v7 09/23] mm/shmem: Allows file-back mem to be uffd wr-protected on thps Peter Xu
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 ` Peter Xu [this message]
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-13-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox