From: Anshuman Khandual <khandual@linux.vnet.ibm.com>
To: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>, linux-mm@kvack.org
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Hugh Dickins <hughd@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Dave Hansen <dave.hansen@intel.com>,
Andrea Arcangeli <aarcange@redhat.com>,
Mel Gorman <mgorman@techsingularity.net>,
Michal Hocko <mhocko@kernel.org>,
Vlastimil Babka <vbabka@suse.cz>,
Pavel Emelyanov <xemul@parallels.com>,
Zi Yan <zi.yan@cs.rutgers.edu>,
Balbir Singh <bsingharora@gmail.com>,
linux-kernel@vger.kernel.org,
Naoya Horiguchi <nao.horiguchi@gmail.com>
Subject: Re: [PATCH v2 10/12] mm: mempolicy: mbind and migrate_pages support thp migration
Date: Fri, 25 Nov 2016 17:57:20 +0530 [thread overview]
Message-ID: <58382E28.9060706@linux.vnet.ibm.com> (raw)
In-Reply-To: <1478561517-4317-11-git-send-email-n-horiguchi@ah.jp.nec.com>
On 11/08/2016 05:01 AM, Naoya Horiguchi wrote:
> This patch enables thp migration for mbind(2) and migrate_pages(2).
>
> Signed-off-by: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
> ---
> ChangeLog v1 -> v2:
> - support pte-mapped and doubly-mapped thp
> ---
> mm/mempolicy.c | 108 +++++++++++++++++++++++++++++++++++++++++----------------
> 1 file changed, 79 insertions(+), 29 deletions(-)
>
> diff --git v4.9-rc2-mmotm-2016-10-27-18-27/mm/mempolicy.c v4.9-rc2-mmotm-2016-10-27-18-27_patched/mm/mempolicy.c
> index 77d0668..96507ee 100644
> --- v4.9-rc2-mmotm-2016-10-27-18-27/mm/mempolicy.c
> +++ v4.9-rc2-mmotm-2016-10-27-18-27_patched/mm/mempolicy.c
> @@ -94,6 +94,7 @@
> #include <linux/mm_inline.h>
> #include <linux/mmu_notifier.h>
> #include <linux/printk.h>
> +#include <linux/swapops.h>
>
> #include <asm/tlbflush.h>
> #include <asm/uaccess.h>
> @@ -486,6 +487,49 @@ static inline bool queue_pages_node_check(struct page *page,
> return node_isset(nid, *qp->nmask) == !!(flags & MPOL_MF_INVERT);
> }
>
> +static int queue_pages_pmd(pmd_t *pmd, spinlock_t *ptl, unsigned long addr,
> + unsigned long end, struct mm_walk *walk)
> +{
> + int ret = 0;
> + struct page *page;
> + struct queue_pages *qp = walk->private;
> + unsigned long flags;
> +
> + if (unlikely(is_pmd_migration_entry(*pmd))) {
> + ret = 1;
> + goto unlock;
> + }
> + page = pmd_page(*pmd);
> + if (is_huge_zero_page(page)) {
> + spin_unlock(ptl);
> + __split_huge_pmd(walk->vma, pmd, addr, false, NULL);
> + goto out;
> + }
> + if (!thp_migration_supported()) {
> + get_page(page);
> + spin_unlock(ptl);
> + lock_page(page);
> + ret = split_huge_page(page);
> + unlock_page(page);
> + put_page(page);
> + goto out;
> + }
> + if (queue_pages_node_check(page, qp)) {
> + ret = 1;
> + goto unlock;
> + }
> +
> + ret = 1;
> + flags = qp->flags;
> + /* go to thp migration */
> + if (flags & (MPOL_MF_MOVE | MPOL_MF_MOVE_ALL))
> + migrate_page_add(page, qp->pagelist, flags);
> +unlock:
> + spin_unlock(ptl);
> +out:
> + return ret;
> +}
> +
> /*
> * Scan through pages checking if pages follow certain conditions,
> * and move them to the pagelist if they do.
> @@ -497,30 +541,15 @@ 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, ret;
> + int ret;
> pte_t *pte;
> spinlock_t *ptl;
>
> - 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, false, NULL);
> - } 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;
> - }
> - } else {
> - spin_unlock(ptl);
> - }
> + ptl = pmd_trans_huge_lock(pmd, vma);
> + if (ptl) {
> + ret = queue_pages_pmd(pmd, ptl, addr, end, walk);
> + if (ret)
> + return 0;
> }
I wonder if we should introduce pte_entry function along with pmd_entry
function as we are first looking for trans huge PMDs either for direct
addition into the migration list or splitting it before looking for PTEs.
next prev parent reply other threads:[~2016-11-25 12:27 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-07 23:31 [PATCH v2 00/12] mm: page migration enhancement for thp Naoya Horiguchi
2016-11-07 23:31 ` [PATCH v2 01/12] mm: x86: move _PAGE_SWP_SOFT_DIRTY from bit 7 to bit 6 Naoya Horiguchi
2016-11-10 23:29 ` Dave Hansen
2016-11-11 1:08 ` Naoya Horiguchi
2016-11-11 11:12 ` Kirill A. Shutemov
2016-11-07 23:31 ` [PATCH v2 02/12] mm: mempolicy: add queue_pages_node_check() Naoya Horiguchi
2016-11-07 23:31 ` [PATCH v2 03/12] mm: thp: introduce separate TTU flag for thp freezing Naoya Horiguchi
2016-11-10 8:31 ` Anshuman Khandual
2016-11-10 9:09 ` Naoya Horiguchi
2016-11-11 3:18 ` Anshuman Khandual
2016-11-11 11:16 ` Kirill A. Shutemov
2016-11-07 23:31 ` [PATCH v2 04/12] mm: thp: introduce CONFIG_ARCH_ENABLE_THP_MIGRATION Naoya Horiguchi
2016-11-11 11:18 ` Kirill A. Shutemov
2016-11-15 2:05 ` Naoya Horiguchi
2016-11-28 14:21 ` Michal Hocko
2016-11-29 7:50 ` Naoya Horiguchi
2016-11-29 8:45 ` Michal Hocko
2016-11-07 23:31 ` [PATCH v2 05/12] mm: thp: add core routines for thp/pmd migration Naoya Horiguchi
2016-11-08 3:05 ` kbuild test robot
2016-11-08 6:46 ` Naoya Horiguchi
2016-11-08 8:13 ` Anshuman Khandual
2016-11-08 8:16 ` Naoya Horiguchi
2016-11-10 8:29 ` Anshuman Khandual
2016-11-10 9:43 ` Naoya Horiguchi
2016-11-14 11:45 ` Kirill A. Shutemov
2016-11-15 4:57 ` Naoya Horiguchi
2016-11-28 14:31 ` Michal Hocko
2016-11-29 7:57 ` Naoya Horiguchi
2016-11-07 23:31 ` [PATCH v2 06/12] mm: thp: enable thp migration in generic path Naoya Horiguchi
2016-11-28 14:33 ` Michal Hocko
2016-11-29 8:16 ` Naoya Horiguchi
2016-11-07 23:31 ` [PATCH v2 07/12] mm: thp: check pmd migration entry in common path Naoya Horiguchi
2016-11-08 0:23 ` kbuild test robot
2016-11-08 1:22 ` Naoya Horiguchi
2016-11-10 8:36 ` Anshuman Khandual
2016-11-10 9:12 ` Naoya Horiguchi
2016-11-10 9:08 ` Hillf Danton
2016-11-10 9:21 ` Naoya Horiguchi
2016-11-10 9:28 ` Hillf Danton
2016-11-10 9:34 ` Naoya Horiguchi
2016-11-17 23:56 ` Kirill A. Shutemov
2016-11-29 6:46 ` Naoya Horiguchi
2016-11-28 14:35 ` Michal Hocko
2016-11-07 23:31 ` [PATCH v2 08/12] mm: soft-dirty: keep soft-dirty bits over thp migration Naoya Horiguchi
2016-11-10 8:38 ` Anshuman Khandual
2016-11-10 9:13 ` Naoya Horiguchi
2016-11-07 23:31 ` [PATCH v2 09/12] mm: hwpoison: soft offline supports " Naoya Horiguchi
2016-11-10 10:31 ` Balbir Singh
2016-11-10 23:58 ` Naoya Horiguchi
2016-11-14 23:22 ` Balbir Singh
2016-11-07 23:31 ` [PATCH v2 10/12] mm: mempolicy: mbind and migrate_pages support " Naoya Horiguchi
2016-11-25 12:27 ` Anshuman Khandual [this message]
2016-11-29 7:07 ` Naoya Horiguchi
2016-11-07 23:31 ` [PATCH v2 11/12] mm: migrate: move_pages() supports " Naoya Horiguchi
2016-11-18 0:01 ` Kirill A. Shutemov
2016-11-07 23:31 ` [PATCH v2 12/12] mm: memory_hotplug: memory hotremove " Naoya Horiguchi
2016-11-08 0:29 ` kbuild test robot
2016-11-08 0:30 ` kbuild test robot
2016-11-08 1:36 ` Naoya Horiguchi
2016-11-08 1:41 ` [PATCH] mm: fix unused variable warning Naoya Horiguchi
2016-11-09 2:32 ` [PATCH v2 00/12] mm: page migration enhancement for thp Balbir Singh
2016-11-09 4:59 ` Naoya Horiguchi
2016-11-09 21:28 ` Balbir Singh
2016-11-09 10:33 ` Anshuman Khandual
2016-11-09 23:52 ` Naoya Horiguchi
2016-11-10 14:01 ` Zi Yan
2016-11-11 3:48 ` Anshuman Khandual
2017-01-30 10:47 ` Anshuman Khandual
2017-01-31 19:54 ` Zi Yan
2017-02-03 3:12 ` Hillf Danton
2017-02-03 3:24 ` Zi Yan
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=58382E28.9060706@linux.vnet.ibm.com \
--to=khandual@linux.vnet.ibm.com \
--cc=aarcange@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=bsingharora@gmail.com \
--cc=dave.hansen@intel.com \
--cc=hughd@google.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mgorman@techsingularity.net \
--cc=mhocko@kernel.org \
--cc=n-horiguchi@ah.jp.nec.com \
--cc=nao.horiguchi@gmail.com \
--cc=vbabka@suse.cz \
--cc=xemul@parallels.com \
--cc=zi.yan@cs.rutgers.edu \
/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).