From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753459AbdCMPqu (ORCPT ); Mon, 13 Mar 2017 11:46:50 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:36956 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752183AbdCMPqR (ORCPT ); Mon, 13 Mar 2017 11:46:17 -0400 X-ME-Sender: X-Sasl-enc: /PY/PGJFVd7wOOW8lgwbJtuUWSoAQbM/wNh/FP9Beolt 1489419975 From: Zi Yan To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: kirill.shutemov@linux.intel.com, akpm@linux-foundation.org, minchan@kernel.org, vbabka@suse.cz, mgorman@techsingularity.net, mhocko@kernel.org, n-horiguchi@ah.jp.nec.com, khandual@linux.vnet.ibm.com, zi.yan@cs.rutgers.edu, dnellans@nvidia.com Subject: [PATCH v4 02/11] mm: mempolicy: add queue_pages_node_check() Date: Mon, 13 Mar 2017 11:44:58 -0400 Message-Id: <20170313154507.3647-3-zi.yan@sent.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170313154507.3647-1-zi.yan@sent.com> References: <20170313154507.3647-1-zi.yan@sent.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Naoya Horiguchi Introduce a separate check routine related to MPOL_MF_INVERT flag. This patch just does cleanup, no behavioral change. Signed-off-by: Naoya Horiguchi --- mm/mempolicy.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 1e7873e40c9a..aa242da77fda 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -477,6 +477,15 @@ struct queue_pages { struct vm_area_struct *prev; }; +static inline bool queue_pages_node_check(struct page *page, + struct queue_pages *qp) +{ + int nid = page_to_nid(page); + unsigned long flags = qp->flags; + + return node_isset(nid, *qp->nmask) == !!(flags & MPOL_MF_INVERT); +} + /* * Scan through pages checking if pages follow certain conditions, * and move them to the pagelist if they do. @@ -530,8 +539,7 @@ static int queue_pages_pte_range(pmd_t *pmd, unsigned long addr, */ if (PageReserved(page)) continue; - nid = page_to_nid(page); - if (node_isset(nid, *qp->nmask) == !!(flags & MPOL_MF_INVERT)) + if (queue_pages_node_check(page, qp)) continue; if (PageTransCompound(page)) { get_page(page); @@ -563,7 +571,6 @@ static int queue_pages_hugetlb(pte_t *pte, unsigned long hmask, #ifdef CONFIG_HUGETLB_PAGE struct queue_pages *qp = walk->private; unsigned long flags = qp->flags; - int nid; struct page *page; spinlock_t *ptl; pte_t entry; @@ -573,8 +580,7 @@ static int queue_pages_hugetlb(pte_t *pte, unsigned long hmask, if (!pte_present(entry)) goto unlock; page = pte_page(entry); - nid = page_to_nid(page); - if (node_isset(nid, *qp->nmask) == !!(flags & MPOL_MF_INVERT)) + if (queue_pages_node_check(page, qp)) goto unlock; /* With MPOL_MF_MOVE, we migrate only unshared hugepage. */ if (flags & (MPOL_MF_MOVE_ALL) || -- 2.11.0