#include <linux/seq_file.h>
#include <linux/proc_fs.h>
#include <linux/migrate.h>
-#include <linux/rmap.h>
-#include <linux/security.h>
+#include <linux/vs_cvirt.h>
#include <asm/tlbflush.h>
#include <asm/uaccess.h>
isolate_lru_page(page, pagelist);
}
-static struct page *new_node_page(struct page *page, unsigned long node, int **x)
-{
- return alloc_pages_node(node, GFP_HIGHUSER, 0);
-}
-
/*
* Migrate pages from one node to a target node.
* Returns error or the number of pages not migrated.
check_range(mm, mm->mmap->vm_start, TASK_SIZE, &nmask,
flags | MPOL_MF_DISCONTIG_OK, &pagelist);
- if (!list_empty(&pagelist))
- err = migrate_pages(&pagelist, new_node_page, dest);
-
+ if (!list_empty(&pagelist)) {
+ err = migrate_pages_to(&pagelist, NULL, dest);
+ if (!list_empty(&pagelist))
+ putback_lru_pages(&pagelist);
+ }
return err;
}
down_read(&mm->mmap_sem);
- err = migrate_vmas(mm, from_nodes, to_nodes, flags);
- if (err)
- goto out;
-
/*
* Find a 'source' bit set in 'tmp' whose corresponding 'dest'
* bit in 'to' is not also set in 'tmp'. Clear the found 'source'
if (err < 0)
break;
}
-out:
+
up_read(&mm->mmap_sem);
if (err < 0)
return err;
}
-static struct page *new_vma_page(struct page *page, unsigned long private, int **x)
-{
- struct vm_area_struct *vma = (struct vm_area_struct *)private;
-
- return alloc_page_vma(GFP_HIGHUSER, vma, page_address_in_vma(page, vma));
-}
#else
static void migrate_page_add(struct page *page, struct list_head *pagelist,
{
return -ENOSYS;
}
-
-static struct page *new_vma_page(struct page *page, unsigned long private)
-{
- return NULL;
-}
#endif
long do_mbind(unsigned long start, unsigned long len,
err = mbind_range(vma, start, end, new);
if (!list_empty(&pagelist))
- nr_failed = migrate_pages(&pagelist, new_vma_page,
- (unsigned long)vma);
+ nr_failed = migrate_pages_to(&pagelist, vma, -1);
if (!err && nr_failed && (flags & MPOL_MF_STRICT))
err = -EIO;
}
+ if (!list_empty(&pagelist))
+ putback_lru_pages(&pagelist);
+
up_write(&mm->mmap_sem);
mpol_free(new);
return err;
goto out;
}
- err = security_task_movememory(task);
- if (err)
- goto out;
-
err = do_migrate_pages(mm, &old, &new,
capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
out:
if (vma) {
unsigned long off;
- /*
- * for small pages, there is no difference between
- * shift and PAGE_SHIFT, so the bit-shift is safe.
- * for huge pages, since vm_pgoff is in units of small
- * pages, we need to shift off the always 0 bits to get
- * a useful offset.
- */
- BUG_ON(shift < PAGE_SHIFT);
- off = vma->vm_pgoff >> (shift - PAGE_SHIFT);
+ off = vma->vm_pgoff;
off += (addr - vma->vm_start) >> shift;
return offset_il_node(pol, vma, off);
} else
zl = NODE_DATA(nid)->node_zonelists + gfp_zone(gfp);
page = __alloc_pages(gfp, order, zl);
- if (page && page_zone(page) == zl->zones[0])
- inc_zone_page_state(page, NUMA_INTERLEAVE_HIT);
+ if (page && page_zone(page) == zl->zones[0]) {
+ zone_pcp(zl->zones[0],get_cpu())->interleave_hit++;
+ put_cpu();
+ }
return page;
}
int show_numa_map(struct seq_file *m, void *v)
{
- struct proc_maps_private *priv = m->private;
+ struct task_struct *task = m->private;
struct vm_area_struct *vma = v;
struct numa_maps *md;
struct file *file = vma->vm_file;
return 0;
mpol_to_str(buffer, sizeof(buffer),
- get_vma_policy(priv->task, vma, vma->vm_start));
+ get_vma_policy(task, vma, vma->vm_start));
seq_printf(m, "%08lx %s", vma->vm_start, buffer);
kfree(md);
if (m->count < m->size)
- m->version = (vma != priv->tail_vma) ? vma->vm_start : 0;
+ m->version = (vma != get_gate_vma(task)) ? vma->vm_start : 0;
return 0;
}