Re: [PATCH 2.6.17-rc1-mm1 3/9] AutoPage Migration - V0.2 - generic check/notify internode migration

Lee Schermerhorn
2006-04-07T20:37:25Z

AutoPage Migration - V0.2 - 3/9 generic check/notify internode migration

V02: renamed migrate_task_memory() to auto_migrate_task_memory().
renamed auto-migration enable control.

This patch adds the check for internode migration to be called
from scheduler load balancing, and the check for migration pending
to be called when a task returning to user space notices 'NOTIFY_PENDING.

Check for internode migration: if automatic memory migration
is enabled [auto_migrate_enable != 0] and this is a user task and the
destination cpu is on a different node from the task's current cpu,
the task will be marked for migration pending via member added to task
struct. The TIF_NOTIFY_PENDING thread_info flag is set to cause the task
to enter do_notify_resume[_user]() to check for migration pending.

When a task is rescheduled to user space with TIF_NOTIFY_PENDING,
it will check for migration pending, unless SIGKILL is pending.
If the task notices migration pending, it will call
auto_migrate_task_memory() to migrate pages in vma's with default
policy. Only default policy is affected by migration to a new node.

Note that we can't call auto_migrate_task_memory() with interrupts
disabled. Temporarily enable interrupts around the call.

These checks become empty macros when 'MIGRATION' is not configured.

Signed-off-by: Lee Schermerhorn <lee.schermerhorn@hp.com>

Index: linux-2.6.17-rc1-mm1/include/linux/sched.h
===================================================================
--- linux-2.6.17-rc1-mm1.orig/include/linux/sched.h 2006-04-05 10:14:36.000000000 -0400
+++ linux-2.6.17-rc1-mm1/include/linux/sched.h 2006-04-05 10:15:00.000000000 -0400
@@ -908,6 +908,9 @@ struct task_struct {
#ifdef CONFIG_NUMA
struct mempolicy *mempolicy;
short il_next;
+#ifdef CONFIG_MIGRATION
+ int migrate_pending; /* internode mem migration pending */
+#endif
#endif
#ifdef CONFIG_CPUSETS
struct cpuset *cpuset;
Index: linux-2.6.17-rc1-mm1/include/linux/auto-migrate.h
===================================================================
--- linux-2.6.17-rc1-mm1.orig/include/linux/auto-migrate.h 2006-04-05 10:14:58.000000000 -0400
+++ linux-2.6.17-rc1-mm1/include/linux/auto-migrate.h 2006-04-05 10:15:00.000000000 -0400
@@ -15,8 +15,64 @@ extern void auto_migrate_task_memory(voi

extern int auto_migrate_enable;

+#ifdef _LINUX_SCHED_H /* only used where this is defined */
+static inline void check_internode_migration(task_t *task, int dest_cpu)
+{
+ if (auto_migrate_enable &&
+ task->mm && !(task->flags & PF_BORROWED_MM)) {
+ int node = cpu_to_node(task_cpu(task));
+ if ((node != cpu_to_node(dest_cpu))) {
+ /*
+ * migrating a user task to a new node.
+ * mark for memory migration on return to user space.
+ */
+ struct thread_info *info = task->thread_info;
+ task->migrate_pending = 1;
+ set_bit(TIF_NOTIFY_RESUME, &info->flags);
+ }
+ }
+}
+
+static inline void check_migrate_pending(void)
+{
+ if (!auto_migrate_enable)
+ goto out;
+
+ /*
+ * Don't bother with memory migration prep if 'KILL pending
+ */
+ if (test_thread_flag(TIF_SIGPENDING) &&
+ (sigismember(&current->pending.signal, SIGKILL) ||
+ sigismember(&current->signal->shared_pending.signal, SIGKILL)))
+ goto out;
+
+ if (unlikely(current->migrate_pending)) {
+ int disable_irqs = 0;
+
+ if (likely(irqs_disabled())) {
+ disable_irqs = 1;
+ local_irq_enable();
+ }
+
+ auto_migrate_task_memory();
+
+ if (likely(disable_irqs))
+ local_irq_disable();
+ }
+
+out:
+ current->migrate_pending = 0;
+ clear_thread_flag(TIF_NOTIFY_RESUME);
+ return;
+}
+#endif /* _LINUX_SCHED_H */
+
#else /* !CONFIG_MIGRATION */

+#define check_internode_migration(t,c) /* NOTHING */
+
+#define check_migrate_pending() /* NOTHING */
+
#endif /* CONFIG_MIGRATION */

#endif