The patch titled
Subject: mm/hugetlb: compute/return the number of regions added by region_add()
has been removed from the -mm tree. Its filename was
mm-hugetlb-compute-return-the-number-of-regions-added-by-region_add.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Subject: mm/hugetlb: compute/return the number of regions added by region_add()
Modify region_add() to keep track of regions(pages) added to the reserve
map and return this value. The return value can be compared to the return
value of region_chg() to determine if the map was modified between calls.
Add documentation to the reserve/region map routines.
Make vma_commit_reservation() also pass along the return value of
region_add(). In the normal case, we want vma_commit_reservation to
return the same value as the preceding call to vma_needs_reservation.
Create a common __vma_reservation_common routine to help keep the special
case return values in sync.
Signed-off-by: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Cc: Davidlohr Bueso <dave@xxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Cc: Luiz Capitulino <lcapitulino@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hugetlb.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff -puN mm/hugetlb.c~mm-hugetlb-compute-return-the-number-of-regions-added-by-region_add mm/hugetlb.c
--- a/mm/hugetlb.c~mm-hugetlb-compute-return-the-number-of-regions-added-by-region_add
+++ a/mm/hugetlb.c
@@ -230,6 +230,7 @@ static long region_add(struct resv_map *
{
struct list_head *head = &resv->regions;
struct file_region *rg, *nrg, *trg;
+ long chg = 0;
spin_lock(&resv->lock);
/* Locate the region we are either in or before. */
@@ -255,14 +256,17 @@ static long region_add(struct resv_map *
if (rg->to > t)
t = rg->to;
if (rg != nrg) {
+ chg -= (rg->to - rg->from);
list_del(&rg->link);
kfree(rg);
}
}
+ chg += (nrg->from - f);
nrg->from = f;
+ chg += t - nrg->to;
nrg->to = t;
spin_unlock(&resv->lock);
- return 0;
+ return chg;
}
static long region_chg(struct resv_map *resv, long f, long t)
@@ -1450,18 +1454,25 @@ static long vma_needs_reservation(struct
else
return chg < 0 ? chg : 0;
}
-static void vma_commit_reservation(struct hstate *h,
+
+static long vma_commit_reservation(struct hstate *h,
struct vm_area_struct *vma, unsigned long addr)
{
struct resv_map *resv;
pgoff_t idx;
+ long add;
resv = vma_resv_map(vma);
if (!resv)
- return;
+ return 1;
idx = vma_hugecache_offset(h, vma, addr);
- region_add(resv, idx, idx + 1);
+ add = region_add(resv, idx, idx + 1);
+
+ if (vma->vm_flags & VM_MAYSHARE)
+ return add;
+ else
+ return 0;
}
static struct page *alloc_huge_page(struct vm_area_struct *vma,
_
Patches currently in -mm which might be from mike.kravetz@xxxxxxxxxx are
hugetlb-do-not-account-hugetlb-pages-as-nr_file_pages.patch
mm-hugetlb-compute-return-the-number-of-regions-added-by-region_add-v2.patch
mm-hugetlb-handle-races-in-alloc_huge_page-and-hugetlb_reserve_pages.patch
mm-hugetlb-handle-races-in-alloc_huge_page-and-hugetlb_reserve_pages-v2.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
