From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Andrea Arcangeli <aarcange@redhat.com>,
Hugh Dickins <hughd@google.com>
Cc: Dave Hansen <dave.hansen@intel.com>, Mel Gorman <mgorman@suse.de>,
Rik van Riel <riel@redhat.com>, Vlastimil Babka <vbabka@suse.cz>,
Christoph Lameter <cl@gentwo.org>,
Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>,
Steve Capper <steve.capper@linaro.org>,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@suse.cz>,
Jerome Marchand <jmarchan@redhat.com>,
Sasha Levin <sasha.levin@oracle.com>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH 19/36] mips, thp: remove infrastructure for handling splitting PMDs
Date: Fri, 10 Jul 2015 20:41:53 +0300 [thread overview]
Message-ID: <1436550130-112636-20-git-send-email-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <1436550130-112636-1-git-send-email-kirill.shutemov@linux.intel.com>
With new refcounting we don't need to mark PMDs splitting. Let's drop
code to handle this.
pmdp_splitting_flush() is not needed too: on splitting PMD we will do
pmdp_clear_flush() + set_pte_at(). pmdp_clear_flush() will do IPI as
needed for fast_gup.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
arch/mips/include/asm/pgtable-bits.h | 6 ++----
arch/mips/include/asm/pgtable.h | 18 ------------------
arch/mips/mm/gup.c | 13 +------------
arch/mips/mm/pgtable-64.c | 14 --------------
arch/mips/mm/tlbex.c | 1 -
5 files changed, 3 insertions(+), 49 deletions(-)
diff --git a/arch/mips/include/asm/pgtable-bits.h b/arch/mips/include/asm/pgtable-bits.h
index c28a8499aec7..9bf8b2b87364 100644
--- a/arch/mips/include/asm/pgtable-bits.h
+++ b/arch/mips/include/asm/pgtable-bits.h
@@ -131,14 +131,12 @@
/* Huge TLB page */
#define _PAGE_HUGE_SHIFT (_PAGE_MODIFIED_SHIFT + 1)
#define _PAGE_HUGE (1 << _PAGE_HUGE_SHIFT)
-#define _PAGE_SPLITTING_SHIFT (_PAGE_HUGE_SHIFT + 1)
-#define _PAGE_SPLITTING (1 << _PAGE_SPLITTING_SHIFT)
/* Only R2 or newer cores have the XI bit */
#if defined(CONFIG_CPU_MIPSR2) || defined(CONFIG_CPU_MIPSR6)
-#define _PAGE_NO_EXEC_SHIFT (_PAGE_SPLITTING_SHIFT + 1)
+#define _PAGE_NO_EXEC_SHIFT (_PAGE_HUGE_SHIFT + 1)
#else
-#define _PAGE_GLOBAL_SHIFT (_PAGE_SPLITTING_SHIFT + 1)
+#define _PAGE_GLOBAL_SHIFT (_PAGE_HUGE_SHIFT + 1)
#define _PAGE_GLOBAL (1 << _PAGE_GLOBAL_SHIFT)
#endif /* CONFIG_CPU_MIPSR2 || CONFIG_CPU_MIPSR6 */
diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
index 9d8106758142..556c02a0706a 100644
--- a/arch/mips/include/asm/pgtable.h
+++ b/arch/mips/include/asm/pgtable.h
@@ -449,27 +449,9 @@ static inline pmd_t pmd_mkhuge(pmd_t pmd)
return pmd;
}
-static inline int pmd_trans_splitting(pmd_t pmd)
-{
- return !!(pmd_val(pmd) & _PAGE_SPLITTING);
-}
-
-static inline pmd_t pmd_mksplitting(pmd_t pmd)
-{
- pmd_val(pmd) |= _PAGE_SPLITTING;
-
- return pmd;
-}
-
extern void set_pmd_at(struct mm_struct *mm, unsigned long addr,
pmd_t *pmdp, pmd_t pmd);
-#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH
-/* Extern to avoid header file madness */
-extern void pmdp_splitting_flush(struct vm_area_struct *vma,
- unsigned long address,
- pmd_t *pmdp);
-
#define __HAVE_ARCH_PMD_WRITE
static inline int pmd_write(pmd_t pmd)
{
diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c
index 36a35115dc2e..1afd87c999b0 100644
--- a/arch/mips/mm/gup.c
+++ b/arch/mips/mm/gup.c
@@ -107,18 +107,7 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end,
pmd_t pmd = *pmdp;
next = pmd_addr_end(addr, end);
- /*
- * The pmd_trans_splitting() check below explains why
- * pmdp_splitting_flush has to flush the tlb, to stop
- * this gup-fast code from running while we set the
- * splitting bit in the pmd. Returning zero will take
- * the slow path that will call wait_split_huge_page()
- * if the pmd is still in splitting state. gup-fast
- * can't because it has irq disabled and
- * wait_split_huge_page() would never return as the
- * tlb flush IPI wouldn't run.
- */
- if (pmd_none(pmd) || pmd_trans_splitting(pmd))
+ if (pmd_none(pmd))
return 0;
if (unlikely(pmd_huge(pmd))) {
if (!gup_huge_pmd(pmd, addr, next, write, pages,nr))
diff --git a/arch/mips/mm/pgtable-64.c b/arch/mips/mm/pgtable-64.c
index e8adc0069d66..ce4473e7c0d2 100644
--- a/arch/mips/mm/pgtable-64.c
+++ b/arch/mips/mm/pgtable-64.c
@@ -62,20 +62,6 @@ void pmd_init(unsigned long addr, unsigned long pagetable)
}
#endif
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
-
-void pmdp_splitting_flush(struct vm_area_struct *vma,
- unsigned long address,
- pmd_t *pmdp)
-{
- if (!pmd_trans_splitting(*pmdp)) {
- pmd_t pmd = pmd_mksplitting(*pmdp);
- set_pmd_at(vma->vm_mm, address, pmdp, pmd);
- }
-}
-
-#endif
-
pmd_t mk_pmd(struct page *page, pgprot_t prot)
{
pmd_t pmd;
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 97c87027c17f..02b53ce7fc2e 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -240,7 +240,6 @@ static void output_pgtable_bits_defines(void)
pr_define("_PAGE_MODIFIED_SHIFT %d\n", _PAGE_MODIFIED_SHIFT);
#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
pr_define("_PAGE_HUGE_SHIFT %d\n", _PAGE_HUGE_SHIFT);
- pr_define("_PAGE_SPLITTING_SHIFT %d\n", _PAGE_SPLITTING_SHIFT);
#endif
#ifdef CONFIG_CPU_MIPSR2
if (cpu_has_rixi) {
--
2.1.4
next prev parent reply other threads:[~2015-07-10 17:45 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-10 17:41 [PATCH 00/36] THP refcounting redesign Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 01/36] mm, proc: adjust PSS calculation Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 02/36] rmap: add argument to charge compound page Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 03/36] memcg: adjust to support new THP refcounting Kirill A. Shutemov
2015-07-14 13:58 ` Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 04/36] mm, thp: adjust conditions when we can reuse the page on WP fault Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 05/36] mm: adjust FOLL_SPLIT for new refcounting Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 06/36] mm: handle PTE-mapped tail pages in gerneric fast gup implementaiton Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 07/36] thp, mlock: do not allow huge pages in mlocked area Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 08/36] khugepaged: ignore pmd tables with THP mapped with ptes Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 09/36] thp: rename split_huge_page_pmd() to split_huge_pmd() Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 10/36] mm, vmstats: new THP splitting event Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 11/36] mm: temporally mark THP broken Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 12/36] thp: drop all split_huge_page()-related code Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 13/36] mm: drop tail page refcounting Kirill A. Shutemov
2015-07-14 14:01 ` Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 14/36] futex, thp: remove special case for THP in get_futex_key Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 15/36] ksm: prepare to new THP semantics Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 16/36] mm, thp: remove compound_lock Kirill A. Shutemov
2015-07-14 14:02 ` Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 17/36] arm64, thp: remove infrastructure for handling splitting PMDs Kirill A. Shutemov
2015-07-15 15:23 ` Suzuki K. Poulose
2015-07-10 17:41 ` [PATCH 18/36] arm, " Kirill A. Shutemov
2015-07-10 17:41 ` Kirill A. Shutemov [this message]
2015-07-10 17:41 ` [PATCH 20/36] powerpc, " Kirill A. Shutemov
2015-07-15 11:31 ` Aneesh Kumar K.V
2015-07-10 17:41 ` [PATCH 21/36] s390, " Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 22/36] sparc, " Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 23/36] tile, " Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 24/36] x86, " Kirill A. Shutemov
2015-07-10 17:41 ` [PATCH 25/36] mm, " Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 26/36] mm: rework mapcount accounting to enable 4k mapping of THPs Kirill A. Shutemov
2015-07-12 19:13 ` Kirill A. Shutemov
2015-07-14 14:04 ` Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 27/36] mm: differentiate page_mapped() from page_mapcount() for compound pages Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 28/36] mm, numa: skip PTE-mapped THP on numa fault Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 29/36] thp: implement split_huge_pmd() Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 30/36] thp: add option to setup migration entiries during PMD split Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 31/36] thp, mm: split_huge_page(): caller need to lock page Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 32/36] thp: reintroduce split_huge_page() Kirill A. Shutemov
2015-07-14 14:04 ` Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 33/36] migrate_pages: try to split pages on qeueuing Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 34/36] thp: introduce deferred_split_huge_page() Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 35/36] mm: re-enable THP Kirill A. Shutemov
2015-07-10 17:42 ` [PATCH 36/36] thp: update documentation Kirill A. Shutemov
2015-07-14 14:05 ` Kirill A. Shutemov
2015-07-14 9:06 ` [PATCH 00/36] THP refcounting redesign Jerome Marchand
2015-07-14 15:29 ` Kirill A. Shutemov
2015-07-15 11:30 ` Aneesh Kumar K.V
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=1436550130-112636-20-git-send-email-kirill.shutemov@linux.intel.com \
--to=kirill.shutemov@linux.intel.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=cl@gentwo.org \
--cc=dave.hansen@intel.com \
--cc=hannes@cmpxchg.org \
--cc=hughd@google.com \
--cc=jmarchan@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@suse.de \
--cc=mhocko@suse.cz \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=riel@redhat.com \
--cc=sasha.levin@oracle.com \
--cc=steve.capper@linaro.org \
--cc=vbabka@suse.cz \
/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).