From: Gerald Schaefer <gerald.schaefer@de.ibm.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Andrea Arcangeli <aarcange@redhat.com>,
Andi Kleen <ak@linux.intel.com>, Hugh Dickins <hughd@google.com>,
Hillf Danton <dhillf@gmail.com>
Cc: linux-kernel@vger.kernel.org,
Martin Schwidefsky <schwidefsky@de.ibm.com>,
Heiko Carstens <heiko.carstens@de.ibm.com>,
Gerald Schaefer <gerald.schaefer@de.ibm.com>
Subject: [RFC v2 PATCH 5/7] thp, s390: thp pagetable pre-allocation for s390
Date: Wed, 29 Aug 2012 17:33:02 +0200 [thread overview]
Message-ID: <1346254384-30046-6-git-send-email-gerald.schaefer@de.ibm.com> (raw)
In-Reply-To: <1346254384-30046-1-git-send-email-gerald.schaefer@de.ibm.com>
This patch is part of the architecture backend for thp on s390.
It provides the pagetable pre-allocation functions pgtable_deposit()
and pgtable_withdraw(). Unlike other archs, s390 has no struct page *
as pgtable_t, but rather a pointer to the page table. So instead of
saving the pagetable pre-allocation list info inside the struct page,
it is being saved within the pagetable itself.
Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com>
---
arch/s390/include/asm/pgtable.h | 6 ++++++
arch/s390/mm/pgtable.c | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index c3f0775..353590c 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -1166,6 +1166,12 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
#define pte_unmap(pte) do { } while (0)
#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+#define __HAVE_ARCH_PGTABLE_DEPOSIT
+extern void pgtable_deposit(struct mm_struct *mm, pgtable_t pgtable);
+
+#define __HAVE_ARCH_PGTABLE_WITHDRAW
+extern pgtable_t pgtable_withdraw(struct mm_struct *mm);
+
static inline int pmd_trans_splitting(pmd_t pmd)
{
return pmd_val(pmd) & _SEGMENT_ENTRY_SPLIT;
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 5a73522..3168fbd 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -883,4 +883,42 @@ void pmdp_splitting_flush(struct vm_area_struct *vma, unsigned long address,
smp_call_function(pmdp_splitting_flush_sync, NULL, 1);
}
}
+
+void pgtable_deposit(struct mm_struct *mm, pgtable_t pgtable)
+{
+ struct list_head *lh = (struct list_head *) pgtable;
+
+ assert_spin_locked(&mm->page_table_lock);
+
+ /* FIFO */
+ if (!mm->pmd_huge_pte)
+ INIT_LIST_HEAD(lh);
+ else
+ list_add(lh, (struct list_head *) mm->pmd_huge_pte);
+ mm->pmd_huge_pte = pgtable;
+}
+
+pgtable_t pgtable_withdraw(struct mm_struct *mm)
+{
+ struct list_head *lh;
+ pgtable_t pgtable;
+ pte_t *ptep;
+
+ assert_spin_locked(&mm->page_table_lock);
+
+ /* FIFO */
+ pgtable = mm->pmd_huge_pte;
+ lh = (struct list_head *) pgtable;
+ if (list_empty(lh))
+ mm->pmd_huge_pte = NULL;
+ else {
+ mm->pmd_huge_pte = (pgtable_t) lh->next;
+ list_del(lh);
+ }
+ ptep = (pte_t *) pgtable;
+ pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+ ptep++;
+ pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+ return pgtable;
+}
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
--
1.7.11.5
next prev parent reply other threads:[~2012-08-29 15:35 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-29 15:32 [RFC v2 PATCH 0/7] thp: transparent hugepages on s390 Gerald Schaefer
2012-08-29 15:32 ` [RFC v2 PATCH 1/7] thp: remove assumptions on pgtable_t type Gerald Schaefer
2012-08-31 5:29 ` Aneesh Kumar K.V
2012-08-31 7:10 ` Martin Schwidefsky
2012-09-04 22:56 ` Andrea Arcangeli
2012-09-05 17:12 ` Gerald Schaefer
2012-08-29 15:32 ` [RFC v2 PATCH 2/7] thp: introduce pmdp_invalidate() Gerald Schaefer
2012-08-29 15:33 ` [RFC v2 PATCH 3/7] thp: make MADV_HUGEPAGE check for mm->def_flags Gerald Schaefer
2012-08-29 15:33 ` [RFC v2 PATCH 4/7] thp, s390: thp splitting backend for s390 Gerald Schaefer
2012-08-29 15:33 ` Gerald Schaefer [this message]
2012-08-29 15:33 ` [RFC v2 PATCH 6/7] thp, s390: disable thp for kvm host on s390 Gerald Schaefer
2012-08-29 15:33 ` [RFC v2 PATCH 7/7] thp, s390: architecture backend for thp " Gerald Schaefer
2012-08-30 19:54 ` [RFC v2 PATCH 0/7] thp: transparent hugepages " Andrew Morton
2012-08-31 7:07 ` Martin Schwidefsky
2012-08-31 19:47 ` Andrew Morton
2012-09-04 22:40 ` Andrea Arcangeli
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=1346254384-30046-6-git-send-email-gerald.schaefer@de.ibm.com \
--to=gerald.schaefer@de.ibm.com \
--cc=aarcange@redhat.com \
--cc=ak@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=dhillf@gmail.com \
--cc=heiko.carstens@de.ibm.com \
--cc=hughd@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=schwidefsky@de.ibm.com \
/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).