From: Peter Xu <peterx@redhat.com>
To: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Cc: Alistair Popple <apopple@nvidia.com>,
Tiberiu Georgescu <tiberiu.georgescu@nutanix.com>,
ivan.teterevkov@nutanix.com,
Mike Rapoport <rppt@linux.vnet.ibm.com>,
Hugh Dickins <hughd@google.com>,
peterx@redhat.com, Matthew Wilcox <willy@infradead.org>,
Andrea Arcangeli <aarcange@redhat.com>,
David Hildenbrand <david@redhat.com>,
"Kirill A . Shutemov" <kirill@shutemov.name>,
Andrew Morton <akpm@linux-foundation.org>,
Mike Kravetz <mike.kravetz@oracle.com>
Subject: [PATCH RFC 2/4] mm: Check against orig_pte for finish_fault()
Date: Fri, 6 Aug 2021 23:25:19 -0400 [thread overview]
Message-ID: <20210807032521.7591-3-peterx@redhat.com> (raw)
In-Reply-To: <20210807032521.7591-1-peterx@redhat.com>
We used to check against none pte and in those cases orig_pte should always be
none pte anyway.
This change prepares us to be able to call do_fault() on !none ptes. For
example, we should allow that to happen for pte marker that has PAGEOUT set.
Signed-off-by: Peter Xu <peterx@redhat.com>
---
mm/memory.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/memory.c b/mm/memory.c
index 25fc46e87214..7288f585544a 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -4047,7 +4047,7 @@ vm_fault_t finish_fault(struct vm_fault *vmf)
vmf->address, &vmf->ptl);
ret = 0;
/* Re-check under ptl */
- if (likely(pte_none(*vmf->pte)))
+ if (likely(pte_same(*vmf->pte, vmf->orig_pte)))
do_set_pte(vmf, page, vmf->address);
else
ret = VM_FAULT_NOPAGE;
--
2.32.0
next prev parent reply other threads:[~2021-08-07 3:25 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-07 3:25 [PATCH RFC 0/4] mm: Enable PM_SWAP for shmem with PTE_MARKER Peter Xu
2021-08-07 3:25 ` [PATCH RFC 1/4] mm: Introduce PTE_MARKER swap entry Peter Xu
2021-08-07 3:25 ` Peter Xu [this message]
2021-08-07 3:25 ` [PATCH RFC 3/4] mm: Handle PTE_MARKER page faults Peter Xu
2021-08-07 3:25 ` [PATCH RFC 4/4] mm: Install marker pte when page out for shmem pages Peter Xu
2021-08-13 15:18 ` Tiberiu Georgescu
2021-08-13 16:01 ` Peter Xu
2021-08-18 18:02 ` Tiberiu Georgescu
2021-08-17 9:04 ` [PATCH RFC 0/4] mm: Enable PM_SWAP for shmem with PTE_MARKER David Hildenbrand
2021-08-17 17:09 ` Peter Xu
2021-08-17 18:46 ` David Hildenbrand
2021-08-17 20:24 ` Peter Xu
2021-08-18 8:24 ` David Hildenbrand
2021-08-18 17:52 ` Tiberiu Georgescu
2021-08-18 18:13 ` David Hildenbrand
2021-08-19 14:54 ` Tiberiu Georgescu
2021-08-19 17:26 ` David Hildenbrand
2021-08-20 16:49 ` Tiberiu Georgescu
2021-08-20 19:12 ` Peter Xu
2021-08-25 13:40 ` Tiberiu Georgescu
2021-08-25 14:59 ` Peter Xu
2021-08-26 15:01 ` Tiberiu Georgescu
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=20210807032521.7591-3-peterx@redhat.com \
--to=peterx@redhat.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=apopple@nvidia.com \
--cc=david@redhat.com \
--cc=hughd@google.com \
--cc=ivan.teterevkov@nutanix.com \
--cc=kirill@shutemov.name \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mike.kravetz@oracle.com \
--cc=rppt@linux.vnet.ibm.com \
--cc=tiberiu.georgescu@nutanix.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;
as well as URLs for NNTP newsgroup(s).