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: [PATCHv12 30/37] thp: add option to setup migration entries during PMD split
Date: Tue, 6 Oct 2015 18:23:57 +0300 [thread overview]
Message-ID: <1444145044-72349-31-git-send-email-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <1444145044-72349-1-git-send-email-kirill.shutemov@linux.intel.com>
We are going to use migration PTE entries to stabilize page counts.
If the page is mapped with PMDs we need to split the PMD and setup
migration entries. It's reasonable to combine these operations to avoid
double-scanning over the page table.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Tested-by: Sasha Levin <sasha.levin@oracle.com>
Tested-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Acked-by: Jerome Marchand <jmarchan@redhat.com>
---
mm/huge_memory.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index d2a86df4dd00..4a2a263790b2 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2806,7 +2806,7 @@ static void __split_huge_zero_page_pmd(struct vm_area_struct *vma,
}
static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
- unsigned long haddr)
+ unsigned long haddr, bool freeze)
{
struct mm_struct *mm = vma->vm_mm;
struct page *page;
@@ -2850,12 +2850,18 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd,
* transferred to avoid any possibility of altering
* permissions across VMAs.
*/
- entry = mk_pte(page + i, vma->vm_page_prot);
- entry = maybe_mkwrite(pte_mkdirty(entry), vma);
- if (!write)
- entry = pte_wrprotect(entry);
- if (!young)
- entry = pte_mkold(entry);
+ if (freeze) {
+ swp_entry_t swp_entry;
+ swp_entry = make_migration_entry(page + i, write);
+ entry = swp_entry_to_pte(swp_entry);
+ } else {
+ entry = mk_pte(page + i, vma->vm_page_prot);
+ entry = maybe_mkwrite(pte_mkdirty(entry), vma);
+ if (!write)
+ entry = pte_wrprotect(entry);
+ if (!young)
+ entry = pte_mkold(entry);
+ }
pte = pte_offset_map(&_pmd, haddr);
BUG_ON(!pte_none(*pte));
set_pte_at(mm, haddr, pte, entry);
@@ -2896,7 +2902,7 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
mmu_notifier_invalidate_range_start(mm, haddr, haddr + HPAGE_PMD_SIZE);
ptl = pmd_lock(mm, pmd);
if (likely(pmd_trans_huge(*pmd)))
- __split_huge_pmd_locked(vma, pmd, haddr);
+ __split_huge_pmd_locked(vma, pmd, haddr, false);
spin_unlock(ptl);
mmu_notifier_invalidate_range_end(mm, haddr, haddr + HPAGE_PMD_SIZE);
}
--
2.5.3
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-10-06 15:24 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-06 15:23 [PATCHv12 00/37] THP refcounting redesign Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 01/37] mm, proc: adjust PSS calculation Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 02/37] rmap: add argument to charge compound page Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 03/37] memcg: adjust to support new THP refcounting Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 04/37] mm, thp: adjust conditions when we can reuse the page on WP fault Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 05/37] mm: adjust FOLL_SPLIT for new refcounting Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 06/37] mm: handle PTE-mapped tail pages in gerneric fast gup implementaiton Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 07/37] thp, mlock: do not allow huge pages in mlocked area Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 08/37] khugepaged: ignore pmd tables with THP mapped with ptes Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 09/37] thp: rename split_huge_page_pmd() to split_huge_pmd() Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 10/37] mm, vmstats: new THP splitting event Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 11/37] mm: temporally mark THP broken Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 12/37] thp: drop all split_huge_page()-related code Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 13/37] mm: drop tail page refcounting Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 14/37] futex, thp: remove special case for THP in get_futex_key Kirill A. Shutemov
2015-10-22 8:24 ` Artem Savkov
2015-10-22 9:49 ` Kirill A. Shutemov
2015-10-22 10:33 ` Artem Savkov
2015-10-06 15:23 ` [PATCHv12 15/37] ksm: prepare to new THP semantics Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 16/37] mm, thp: remove compound_lock Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 17/37] arm64, thp: remove infrastructure for handling splitting PMDs Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 18/37] arm, " Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 19/37] mips, " Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 20/37] powerpc, " Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 21/37] s390, " Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 22/37] sparc, " Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 23/37] tile, " Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 24/37] x86, " Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 25/37] mm, " Kirill A. Shutemov
2015-10-08 8:52 ` Vineet Gupta
2015-10-09 9:25 ` Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 26/37] mm: rework mapcount accounting to enable 4k mapping of THPs Kirill A. Shutemov
2015-10-27 6:18 ` Naoya Horiguchi
2015-10-27 9:30 ` Kirill A. Shutemov
2015-10-27 23:24 ` Naoya Horiguchi
2015-10-29 21:50 ` Kirill A. Shutemov
2015-10-30 8:33 ` Naoya Horiguchi
2015-10-29 8:19 ` Naoya Horiguchi
2015-10-29 21:20 ` Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 27/37] mm: differentiate page_mapped() from page_mapcount() for compound pages Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 28/37] mm, numa: skip PTE-mapped THP on numa fault Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 29/37] thp: implement split_huge_pmd() Kirill A. Shutemov
2015-10-06 15:23 ` Kirill A. Shutemov [this message]
2015-10-06 15:23 ` [PATCHv12 31/37] thp, mm: split_huge_page(): caller need to lock page Kirill A. Shutemov
2015-10-06 15:23 ` [PATCHv12 32/37] thp: reintroduce split_huge_page() Kirill A. Shutemov
2015-11-18 16:24 ` Sasha Levin
2015-11-18 19:05 ` Kirill A. Shutemov
2015-11-27 4:26 ` Sasha Levin
2015-10-06 15:24 ` [PATCHv12 33/37] migrate_pages: try to split pages on qeueuing Kirill A. Shutemov
2015-10-06 15:24 ` [PATCHv12 34/37] thp: introduce deferred_split_huge_page() Kirill A. Shutemov
2016-01-21 1:22 ` Andrea Arcangeli
2016-01-21 12:09 ` [PATCH 0/3] Couple of fixes for deferred_split_huge_page() Kirill A. Shutemov
2016-01-21 12:09 ` [PATCH 1/3] thp: make split_queue per-node Kirill A. Shutemov
2016-01-21 12:09 ` [PATCH 2/3] thp: change deferred_split_count() to return number of THP in queue Kirill A. Shutemov
2016-01-22 14:31 ` Andrea Arcangeli
2016-01-22 15:20 ` Kirill A. Shutemov
2016-01-21 12:09 ` [PATCH 3/3] thp: limit number of object to scan on deferred_split_scan() Kirill A. Shutemov
2016-02-04 13:11 ` Kirill A. Shutemov
2016-01-21 22:52 ` [PATCH 0/3] Couple of fixes for deferred_split_huge_page() Andrea Arcangeli
2015-10-06 15:24 ` [PATCHv12 35/37] mm: re-enable THP Kirill A. Shutemov
2015-10-06 15:24 ` [PATCHv12 36/37] thp: update documentation Kirill A. Shutemov
2015-10-06 15:24 ` [PATCHv12 37/37] thp: allow mlocked THP again Kirill A. Shutemov
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=1444145044-72349-31-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).