From: Liu Ping Fan <kernelfans@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Cc: Paul Mackerras <paulus@samba.org>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [PATCH 3/3] powerpc: mm: optimize for the correctly placed page
Date: Wed, 4 Dec 2013 14:59:08 +0800 [thread overview]
Message-ID: <1386140348-7854-4-git-send-email-pingfank@linux.vnet.ibm.com> (raw)
In-Reply-To: <1386140348-7854-1-git-send-email-pingfank@linux.vnet.ibm.com>
The period check of _PAGE_NUMA can probably trigger the check on
the correctly placed page. For this case, we can just insert hpte and
do fast exception return.
Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com>
---
arch/powerpc/mm/hash_utils_64.c | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 9bf1195..735678c 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -965,6 +965,10 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
const struct cpumask *tmp;
int rc, user_region = 0, local = 0;
int psize, ssize;
+ pte_t old, new;
+ struct vm_area_struct *vma;
+ int page_nid, target_nid;
+ struct page *test_page;
DBG_LOW("hash_page(ea=%016lx, access=%lx, trap=%lx\n",
ea, access, trap);
@@ -1033,12 +1037,40 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap)
/* Get PTE and page size from page tables */
ptep = find_linux_pte_or_hugepte(pgdir, ea, &hugeshift);
- if (ptep == NULL || !pte_present(*ptep) || pte_numa(*ptep)) {
+ if (ptep == NULL || !pte_present(*ptep)) {
DBG_LOW(" no PTE !\n");
rc = 1;
goto bail;
}
+ old = pte_val(*ptep);
+ if (pte_numa(old)) {
+ /* If fail to lock, let do_page_fault() to handle it */
+ if (down_read_trylock(&mm->mmap_sem)) {
+ vma = find_vma(mm, ea);
+ up_read(&mm->mmap_sem);
+ test_page = pte_page(old);
+ page_nid = page_to_nid(test_page);
+ target_nid = numa_migrate_prep(test_page, vma, ea,
+ page_nid);
+ if (target_nid < 0) {
+ new = pte_mknonnuma(old);
+ /* If ptep is modified under us,
+ * just retry the access
+ */
+ if (unlikely(cmpxchg(ptep, old, new) != old)) {
+ put_page(test_page);
+ return 0;
+ }
+ put_page(test_page);
+ }
+ } else {
+ put_page(test_page);
+ rc = 1;
+ goto bail;
+ }
+ }
+
/* Add _PAGE_PRESENT to the required access perm */
access |= _PAGE_PRESENT;
--
1.8.1.4
next prev parent reply other threads:[~2013-12-04 6:58 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-04 6:59 [PATCH 0/3] optimize for powerpc _PAGE_NUMA Liu Ping Fan
2013-12-04 6:59 ` [PATCH 1/3] powerpc: mm: make _PAGE_NUMA take effect Liu Ping Fan
2013-12-05 10:53 ` Aneesh Kumar K.V
2013-12-09 0:31 ` Benjamin Herrenschmidt
2013-12-09 6:17 ` Liu ping fan
2013-12-09 6:19 ` Benjamin Herrenschmidt
2013-12-11 8:50 ` Liu ping fan
2013-12-11 9:50 ` Benjamin Herrenschmidt
2013-12-12 2:19 ` Liu ping fan
2013-12-04 6:59 ` [PATCH 2/3] mm: export numa_migrate_prep() Liu Ping Fan
2013-12-04 6:59 ` Liu Ping Fan [this message]
2013-12-05 10:58 ` [PATCH 3/3] powerpc: mm: optimize for the correctly placed page Aneesh Kumar K.V
2013-12-05 13:27 ` Liu ping fan
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=1386140348-7854-4-git-send-email-pingfank@linux.vnet.ibm.com \
--to=kernelfans@gmail.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=paulus@samba.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).