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: [PATCHv7 33/36] migrate_pages: try to split pages on qeueuing Date: Tue, 23 Jun 2015 16:46:43 +0300 [thread overview] Message-ID: <1435067206-92901-34-git-send-email-kirill.shutemov@linux.intel.com> (raw) In-Reply-To: <1435067206-92901-1-git-send-email-kirill.shutemov@linux.intel.com> We are not able to migrate THPs. It means it's not enough to split only PMD on migration -- we need to split compound page under it too. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> --- mm/mempolicy.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 528f6c467cf1..0b1499c2f890 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -489,14 +489,31 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr, struct page *page; struct queue_pages *qp = walk->private; unsigned long flags = qp->flags; - int nid; + int nid, ret; pte_t *pte; spinlock_t *ptl; - split_huge_pmd(vma, pmd, addr); - if (pmd_trans_unstable(pmd)) - return 0; + if (pmd_trans_huge(*pmd)) { + ptl = pmd_lock(walk->mm, pmd); + if (pmd_trans_huge(*pmd)) { + page = pmd_page(*pmd); + if (is_huge_zero_page(page)) { + spin_unlock(ptl); + split_huge_pmd(vma, pmd, addr); + } else { + get_page(page); + spin_unlock(ptl); + lock_page(page); + ret = split_huge_page(page); + unlock_page(page); + put_page(page); + if (ret) + return 0; + } + } + } +retry: pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl); for (; addr != end; pte++, addr += PAGE_SIZE) { if (!pte_present(*pte)) @@ -513,6 +530,18 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr, nid = page_to_nid(page); if (node_isset(nid, *qp->nmask) == !!(flags & MPOL_MF_INVERT)) continue; + if (PageTail(page) && PageAnon(page)) { + get_page(page); + pte_unmap_unlock(pte - 1, ptl); + lock_page(page); + ret = split_huge_page(page); + unlock_page(page); + put_page(page); + /* Failed to split -- skip. */ + if (ret) + continue; + goto retry; + } if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) migrate_page_add(page, qp->pagelist, flags); -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
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: [PATCHv7 33/36] migrate_pages: try to split pages on qeueuing Date: Tue, 23 Jun 2015 16:46:43 +0300 [thread overview] Message-ID: <1435067206-92901-34-git-send-email-kirill.shutemov@linux.intel.com> (raw) In-Reply-To: <1435067206-92901-1-git-send-email-kirill.shutemov@linux.intel.com> We are not able to migrate THPs. It means it's not enough to split only PMD on migration -- we need to split compound page under it too. Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> --- mm/mempolicy.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 528f6c467cf1..0b1499c2f890 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -489,14 +489,31 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr, struct page *page; struct queue_pages *qp = walk->private; unsigned long flags = qp->flags; - int nid; + int nid, ret; pte_t *pte; spinlock_t *ptl; - split_huge_pmd(vma, pmd, addr); - if (pmd_trans_unstable(pmd)) - return 0; + if (pmd_trans_huge(*pmd)) { + ptl = pmd_lock(walk->mm, pmd); + if (pmd_trans_huge(*pmd)) { + page = pmd_page(*pmd); + if (is_huge_zero_page(page)) { + spin_unlock(ptl); + split_huge_pmd(vma, pmd, addr); + } else { + get_page(page); + spin_unlock(ptl); + lock_page(page); + ret = split_huge_page(page); + unlock_page(page); + put_page(page); + if (ret) + return 0; + } + } + } +retry: pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl); for (; addr != end; pte++, addr += PAGE_SIZE) { if (!pte_present(*pte)) @@ -513,6 +530,18 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr, nid = page_to_nid(page); if (node_isset(nid, *qp->nmask) == !!(flags & MPOL_MF_INVERT)) continue; + if (PageTail(page) && PageAnon(page)) { + get_page(page); + pte_unmap_unlock(pte - 1, ptl); + lock_page(page); + ret = split_huge_page(page); + unlock_page(page); + put_page(page); + /* Failed to split -- skip. */ + if (ret) + continue; + goto retry; + } if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL)) migrate_page_add(page, qp->pagelist, flags); -- 2.1.4 -- 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-06-23 13:51 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-23 13:46 [PATCHv7 00/36] THP refcounting redesign Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 01/36] mm, proc: adjust PSS calculation Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 02/36] rmap: add argument to charge compound page Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 03/36] memcg: adjust to support new THP refcounting Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 04/36] mm, thp: adjust conditions when we can reuse the page on WP fault Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 05/36] mm: adjust FOLL_SPLIT for new refcounting Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 06/36] mm: handle PTE-mapped tail pages in gerneric fast gup implementaiton Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 07/36] thp, mlock: do not allow huge pages in mlocked area Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 08/36] khugepaged: ignore pmd tables with THP mapped with ptes Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 09/36] thp: rename split_huge_page_pmd() to split_huge_pmd() Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 10/36] mm, vmstats: new THP splitting event Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 11/36] mm: temporally mark THP broken Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 12/36] thp: drop all split_huge_page()-related code Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 13/36] mm: drop tail page refcounting Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 14/36] futex, thp: remove special case for THP in get_futex_key Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 15/36] ksm: prepare to new THP semantics Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 16/36] mm, thp: remove compound_lock Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 17/36] arm64, thp: remove infrastructure for handling splitting PMDs Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 18/36] arm, " Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 19/36] mips, " Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 20/36] powerpc, " Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 21/36] s390, " Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 22/36] sparc, " Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 23/36] tile, " Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 24/36] x86, " Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 25/36] mm, " Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 26/36] mm: rework mapcount accounting to enable 4k mapping of THPs Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 27/36] mm: differentiate page_mapped() from page_mapcount() for compound pages Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 28/36] mm, numa: skip PTE-mapped THP on numa fault Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 29/36] thp: implement split_huge_pmd() Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 30/36] thp: add option to setup migration entiries during PMD split Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 31/36] thp, mm: split_huge_page(): caller need to lock page Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 32/36] thp: reintroduce split_huge_page() Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov [this message] 2015-06-23 13:46 ` [PATCHv7 33/36] migrate_pages: try to split pages on qeueuing Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 34/36] thp: introduce deferred_split_huge_page() Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 35/36] mm: re-enable THP Kirill A. Shutemov 2015-06-23 13:46 ` Kirill A. Shutemov 2015-06-23 13:46 ` [PATCHv7 36/36] thp: update documentation Kirill A. Shutemov 2015-06-23 13:46 ` 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=1435067206-92901-34-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.