From: Peter Xu <peterx@redhat.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: Matthew Wilcox <willy@infradead.org>,
Andrea Arcangeli <aarcange@redhat.com>,
John Hubbard <jhubbard@nvidia.com>,
Mike Rapoport <rppt@kernel.org>,
David Hildenbrand <david@redhat.com>,
Vlastimil Babka <vbabka@suse.cz>,
peterx@redhat.com, "Kirill A . Shutemov" <kirill@shutemov.name>,
Andrew Morton <akpm@linux-foundation.org>,
Mike Kravetz <mike.kravetz@oracle.com>,
James Houghton <jthoughton@google.com>,
Hugh Dickins <hughd@google.com>
Subject: [PATCH 2/7] mm/hugetlb: Fix hugetlb_follow_page_mask() on permission checks
Date: Tue, 13 Jun 2023 17:53:41 -0400 [thread overview]
Message-ID: <20230613215346.1022773-3-peterx@redhat.com> (raw)
In-Reply-To: <20230613215346.1022773-1-peterx@redhat.com>
It seems hugetlb_follow_page_mask() was missing permission checks. For
example, one follow_page() can get the hugetlb page with FOLL_WRITE even if
the page is read-only.
And it wasn't there even in the old follow_page_mask(), where we can
reference from before commit 57a196a58421 ("hugetlb: simplify hugetlb
handling in follow_page_mask").
Let's add them, namely, either the need to CoW due to missing write bit, or
proper CoR on !AnonExclusive pages over R/O pins to reject the follow page.
That brings this function closer to follow_hugetlb_page().
I just doubt how many of us care for that, for FOLL_PIN follow_page doesn't
really happen at all. But we'll care, and care more if we switch over
slow-gup to use hugetlb_follow_page_mask(). We'll also care when to return
-EMLINK then, as that's the gup internal api to mean "we should do CoR".
When at it, switching the try_grab_page() to use WARN_ON_ONCE(), to be
clear that it just should never fail.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
mm/hugetlb.c | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 82dfdd96db4c..9c261921b2cf 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -6481,8 +6481,21 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma,
ptl = huge_pte_lock(h, mm, pte);
entry = huge_ptep_get(pte);
if (pte_present(entry)) {
- page = pte_page(entry) +
- ((address & ~huge_page_mask(h)) >> PAGE_SHIFT);
+ page = pte_page(entry);
+
+ if (gup_must_unshare(vma, flags, page)) {
+ /* Tell the caller to do Copy-On-Read */
+ page = ERR_PTR(-EMLINK);
+ goto out;
+ }
+
+ if ((flags & FOLL_WRITE) && !pte_write(entry)) {
+ page = NULL;
+ goto out;
+ }
+
+ page += ((address & ~huge_page_mask(h)) >> PAGE_SHIFT);
+
/*
* Note that page may be a sub-page, and with vmemmap
* optimizations the page struct may be read only.
@@ -6492,10 +6505,7 @@ struct page *hugetlb_follow_page_mask(struct vm_area_struct *vma,
* try_grab_page() should always be able to get the page here,
* because we hold the ptl lock and have verified pte_present().
*/
- if (try_grab_page(page, flags)) {
- page = NULL;
- goto out;
- }
+ WARN_ON_ONCE(try_grab_page(page, flags));
}
out:
spin_unlock(ptl);
--
2.40.1
next prev parent reply other threads:[~2023-06-13 21:56 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-13 21:53 [PATCH 0/7] mm/gup: Unify hugetlb, speed up thp Peter Xu
2023-06-13 21:53 ` [PATCH 1/7] mm/hugetlb: Handle FOLL_DUMP well in follow_page_mask() Peter Xu
2023-06-14 23:24 ` Mike Kravetz
2023-06-16 8:08 ` David Hildenbrand
2023-06-13 21:53 ` Peter Xu [this message]
2023-06-14 15:31 ` [PATCH 2/7] mm/hugetlb: Fix hugetlb_follow_page_mask() on permission checks David Hildenbrand
2023-06-14 15:46 ` Peter Xu
2023-06-14 15:57 ` David Hildenbrand
2023-06-15 0:11 ` Mike Kravetz
2023-06-13 21:53 ` [PATCH 3/7] mm/hugetlb: Add page_mask for hugetlb_follow_page_mask() Peter Xu
2023-06-15 0:17 ` Mike Kravetz
2023-06-16 8:11 ` David Hildenbrand
2023-06-19 21:43 ` Peter Xu
2023-06-20 7:01 ` David Hildenbrand
2023-06-20 14:40 ` Peter Xu
2023-06-13 21:53 ` [PATCH 4/7] mm/hugetlb: Prepare hugetlb_follow_page_mask() for FOLL_PIN Peter Xu
2023-06-14 14:57 ` David Hildenbrand
2023-06-14 15:11 ` Peter Xu
2023-06-14 15:17 ` David Hildenbrand
2023-06-14 15:31 ` Peter Xu
2023-06-14 15:47 ` David Hildenbrand
2023-06-14 15:51 ` Peter Xu
2023-06-15 0:25 ` Mike Kravetz
2023-06-15 19:42 ` Peter Xu
2023-06-13 21:53 ` [PATCH 5/7] mm/gup: Cleanup next_page handling Peter Xu
2023-06-17 19:48 ` Lorenzo Stoakes
2023-06-17 20:00 ` Lorenzo Stoakes
2023-06-19 19:18 ` Peter Xu
2023-06-13 21:53 ` [PATCH 6/7] mm/gup: Accelerate thp gup even for "pages != NULL" Peter Xu
2023-06-14 14:58 ` Matthew Wilcox
2023-06-14 15:19 ` Peter Xu
2023-06-14 15:35 ` Peter Xu
2023-06-17 20:27 ` Lorenzo Stoakes
2023-06-19 19:37 ` Peter Xu
2023-06-19 20:24 ` Peter Xu
2023-06-13 21:53 ` [PATCH 7/7] mm/gup: Retire follow_hugetlb_page() Peter Xu
2023-06-14 14:37 ` Jason Gunthorpe
2023-06-17 20:40 ` Lorenzo Stoakes
2023-06-19 19:41 ` 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=20230613215346.1022773-3-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=jhubbard@nvidia.com \
--cc=jthoughton@google.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=rppt@kernel.org \
--cc=vbabka@suse.cz \
--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;
as well as URLs for NNTP newsgroup(s).