The patch titled
Create compat_sys_migrate_pages
has been removed from the -mm tree. Its filename was
create-compat_sys_migrate_pages.patch
This patch was dropped because it was nacked by the maintainer
------------------------------------------------------
Subject: Create compat_sys_migrate_pages
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
This is needed on bigendian 64bit architectures. The obvious way to do this
(taking the other compat_ routines in this file as examples) is to use
compat_alloc_user_space and copy the bitmasks back there, however you cannot
call compat_alloc_user_space twice for a single system call and this method
saves two copies of the bitmasks.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Cc: Christoph Lameter <clameter@xxxxxxxxxxxx>
Cc: Paul Jackson <pj@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/mempolicy.c | 111 ++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 95 insertions(+), 16 deletions(-)
diff -puN mm/mempolicy.c~create-compat_sys_migrate_pages mm/mempolicy.c
--- a/mm/mempolicy.c~create-compat_sys_migrate_pages
+++ a/mm/mempolicy.c
@@ -854,6 +854,58 @@ static int get_nodes(nodemask_t *nodes,
return 0;
}
+#ifdef CONFIG_COMPAT
+static int compat_get_nodes(nodemask_t *nodes,
+ const compat_ulong_t __user *nmask, unsigned long maxnode)
+{
+ unsigned long k;
+ unsigned long nlongs;
+ unsigned long nbits = maxnode - 1;
+ compat_ulong_t endmask;
+
+ if (maxnode == 0)
+ return -EINVAL;
+ nodes_clear(*nodes);
+ if (nbits == 0 || !nmask)
+ return 0;
+ if (nbits > PAGE_SIZE * BITS_PER_BYTE)
+ return -EINVAL;
+
+ nlongs = BITS_TO_COMPAT_LONGS(nbits);
+ if ((nbits % BITS_PER_COMPAT_LONG) == 0)
+ endmask = (compat_ulong_t)~0;
+ else
+ endmask = ((compat_ulong_t)1 <<
+ (nbits % BITS_PER_COMPAT_LONG)) - 1;
+
+ /* When the user specified more nodes than supported just check
+ if the non supported part is all zero. */
+ if (nbits > MAX_NUMNODES) {
+ if (nlongs > PAGE_SIZE / sizeof(compat_ulong_t))
+ return -EINVAL;
+ for (k = BITS_TO_COMPAT_LONGS(MAX_NUMNODES); k < nlongs; k++) {
+ compat_ulong_t t;
+
+ if (get_user(t, nmask + k))
+ return -EFAULT;
+ if (k == (nlongs - 1)) {
+ if (t & endmask)
+ return -EINVAL;
+ } else if (t)
+ return -EINVAL;
+ }
+ nbits = MAX_NUMNODES;
+ endmask = ~0;
+ }
+
+ if (compat_get_bitmap(nodes_addr(*nodes), nmask, nbits))
+ return -EFAULT;
+ if (nbits % BITS_PER_COMPAT_LONG)
+ nodes_addr(*nodes)[BITS_TO_COMPAT_LONGS(nbits) - 1] &= endmask;
+ return 0;
+}
+#endif /* CONFIG_COMPAT */
+
/* Copy a kernel node mask to user space */
static int copy_nodes_to_user(unsigned long __user *mask, unsigned long maxnode,
nodemask_t *nodes)
@@ -900,25 +952,13 @@ asmlinkage long sys_set_mempolicy(int mo
return do_set_mempolicy(mode, &nodes);
}
-asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
- const unsigned long __user *old_nodes,
- const unsigned long __user *new_nodes)
+static long internal_migrate_pages(pid_t pid, nodemask_t *old, nodemask_t *new)
{
struct mm_struct *mm;
struct task_struct *task;
- nodemask_t old;
- nodemask_t new;
nodemask_t task_nodes;
int err;
- err = get_nodes(&old, old_nodes, maxnode);
- if (err)
- return err;
-
- err = get_nodes(&new, new_nodes, maxnode);
- if (err)
- return err;
-
/* Find the mm_struct */
read_lock(&tasklist_lock);
task = pid ? find_task_by_pid(pid) : current;
@@ -947,7 +987,7 @@ asmlinkage long sys_migrate_pages(pid_t
task_nodes = cpuset_mems_allowed(task);
/* Is the user allowed to access the target nodes? */
- if (!nodes_subset(new, task_nodes) && !capable(CAP_SYS_NICE)) {
+ if (!nodes_subset(*new, task_nodes) && !capable(CAP_SYS_NICE)) {
err = -EPERM;
goto out;
}
@@ -956,13 +996,32 @@ asmlinkage long sys_migrate_pages(pid_t
if (err)
goto out;
- err = do_migrate_pages(mm, &old, &new,
+ err = do_migrate_pages(mm, old, new,
capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
out:
mmput(mm);
return err;
}
+asmlinkage long sys_migrate_pages(pid_t pid, unsigned long maxnode,
+ const unsigned long __user *old_nodes,
+ const unsigned long __user *new_nodes)
+{
+ nodemask_t old;
+ nodemask_t new;
+ int err;
+
+ err = get_nodes(&old, old_nodes, maxnode);
+ if (err)
+ return err;
+
+ err = get_nodes(&new, new_nodes, maxnode);
+ if (err)
+ return err;
+
+ return internal_migrate_pages(pid, &old, &new);
+}
+
/* Retrieve NUMA policy */
asmlinkage long sys_get_mempolicy(int __user *policy,
@@ -1067,7 +1126,27 @@ asmlinkage long compat_sys_mbind(compat_
return sys_mbind(start, len, mode, nm, nr_bits+1, flags);
}
-#endif
+asmlinkage long compat_sys_migrate_pages(compat_pid_t pid,
+ compat_ulong_t maxnode,
+ const compat_ulong_t __user *old_nodes,
+ const compat_ulong_t __user *new_nodes)
+{
+ nodemask_t old;
+ nodemask_t new;
+ int err;
+
+ err = compat_get_nodes(&old, old_nodes, maxnode);
+ if (err)
+ return err;
+
+ err = compat_get_nodes(&new, new_nodes, maxnode);
+ if (err)
+ return err;
+
+ return internal_migrate_pages(pid, &old, &new);
+}
+
+#endif /* CONFIG_COMPAT */
/* Return effective policy for a VMA */
static struct mempolicy * get_vma_policy(struct task_struct *task,
_
Patches currently in -mm which might be from sfr@xxxxxxxxxxxxxxxx are
origin.patch
constify-compat_get_bitmap-argument.patch
create-compat_sys_migrate_pages.patch
wire-up-sys_migrate_pages.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
