The patch titled
Mempolicy: make dequeue_huge_page_vma() obey MPOL_BIND nodemask
has been removed from the -mm tree. Its filename was
mm-filter-based-on-a-nodemask-as-well-as-a-gfp_mask-make-dequeue_huge_page_vma-obey-mpol_bind-nodemask.patch
This patch was dropped because it was folded into mm-filter-based-on-a-nodemask-as-well-as-a-gfp_mask.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: Mempolicy: make dequeue_huge_page_vma() obey MPOL_BIND nodemask
From: Lee Schermerhorn <Lee.Schermerhorn@xxxxxx>
dequeue_huge_page_vma() is not obeying the MPOL_BIND nodemask with the
zonelist rework. It needs to search only zones in the mempolicy nodemask for
hugepages.
Use for_each_zone_zonelist_nodemask() instead of for_each_zone_zonelist().
Note: this will bloat mm/hugetlb.o a bit until Mel reworks the inlining of the
for_each_zone... macros and helpers.
Added mempolicy helper function mpol_bind_nodemask() to hide the details of
mempolicy from hugetlb and to avoid #ifdef CONFIG_NUMA in
dequeue_huge_page_vma().
Signed-off-by: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Lee Schermerhorn <lee.schermerhorn@xxxxxx>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx>
Cc: Mel Gorman <mel@xxxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxx>
Cc: Hugh Dickins <hugh@xxxxxxxxxxx>
Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx>
Cc: Nishanth Aravamudan <nacc@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/mempolicy.h | 13 +++++++++++++
mm/hugetlb.c | 4 +++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff -puN include/linux/mempolicy.h~mm-filter-based-on-a-nodemask-as-well-as-a-gfp_mask-make-dequeue_huge_page_vma-obey-mpol_bind-nodemask include/linux/mempolicy.h
--- a/include/linux/mempolicy.h~mm-filter-based-on-a-nodemask-as-well-as-a-gfp_mask-make-dequeue_huge_page_vma-obey-mpol_bind-nodemask
+++ a/include/linux/mempolicy.h
@@ -163,6 +163,14 @@ static inline void check_highest_zone(en
policy_zone = k;
}
+static inline nodemask_t *mpol_bind_nodemask(struct mempolicy *mpol)
+{
+ if (mpol->policy == MPOL_BIND)
+ return &mpol->v.nodes;
+ else
+ return NULL;
+}
+
int do_migrate_pages(struct mm_struct *mm,
const nodemask_t *from_nodes, const nodemask_t *to_nodes, int flags);
@@ -255,6 +263,11 @@ static inline int do_migrate_pages(struc
static inline void check_highest_zone(int k)
{
}
+
+static inline nodemask_t *mpol_bind_nodemask(struct mempolicy *mpol)
+{
+ return NULL;
+}
#endif /* CONFIG_NUMA */
#endif /* __KERNEL__ */
diff -puN mm/hugetlb.c~mm-filter-based-on-a-nodemask-as-well-as-a-gfp_mask-make-dequeue_huge_page_vma-obey-mpol_bind-nodemask mm/hugetlb.c
--- a/mm/hugetlb.c~mm-filter-based-on-a-nodemask-as-well-as-a-gfp_mask-make-dequeue_huge_page_vma-obey-mpol_bind-nodemask
+++ a/mm/hugetlb.c
@@ -99,8 +99,10 @@ static struct page *dequeue_huge_page_vm
htlb_alloc_mask, &mpol);
struct zone *zone;
struct zoneref *z;
+ nodemask_t *nodemask = mpol_bind_nodemask(mpol);
- for_each_zone_zonelist(zone, z, zonelist, MAX_NR_ZONES - 1) {
+ for_each_zone_zonelist_nodemask(zone, z, zonelist,
+ MAX_NR_ZONES - 1, nodemask) {
nid = zone_to_nid(zone);
if (cpuset_zone_allowed_softwall(zone, htlb_alloc_mask) &&
!list_empty(&hugepage_freelists[nid])) {
_
Patches currently in -mm which might be from Lee.Schermerhorn@xxxxxx are
mm-filter-based-on-a-nodemask-as-well-as-a-gfp_mask.patch
mm-filter-based-on-a-nodemask-as-well-as-a-gfp_mask-make-dequeue_huge_page_vma-obey-mpol_bind-nodemask.patch
mm-filter-based-on-a-nodemask-as-well-as-a-gfp_mask-make-dequeue_huge_page_vma-obey-mpol_bind-nodemask-rework.patch
mempolicy-convert-mpol-constants-to-enum.patch
mempolicy-support-optional-mode-flags.patch
mempolicy-support-optional-mode-flags-fix.patch
mempolicy-add-mpol_f_static_nodes-flag.patch
mempolicy-add-mpol_f_relative_nodes-flag.patch
mempolicy-update-numa-memory-policy-documentation.patch
mempolicy-move-rebind-functions.patch
mempolicy-create-mempolicy_operations-structure.patch
mempolicy-create-mempolicy_operations-structure-fix.patch
mempolicy-small-header-file-cleanup.patch
mempolicy-disallow-static-or-relative-flags-for-local-preferred-mode.patch
mempolicy-fix-parsing-of-tmpfs-mpol-mount-option.patch
fix-indentation.patch
mempolicy-use-mpol_f_local-to-indicate-preferred-local-policy-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
