[patch 7/8] cpusets v3 - The few, small kernel hooks needed

From: Paul Jackson (pj_at_sgi.com)
Date: 06/29/04

Next message: Paul Jackson: "[patch 3/8] cpusets v3 - cpumask_t - additional const qualifiers"

Previous message: Paul Jackson: "[patch 5/8] cpusets v3 - New bitmap lists format"
In reply to: Paul Jackson: "[patch 1/8] cpusets v3 - Table of Contents"
Next in thread: Paul Jackson: "[patch 3/8] cpusets v3 - cpumask_t - additional const qualifiers"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Date:	Tue, 29 Jun 2004 04:22:33 -0700 (PDT)
To: linux-kernel@vger.kernel.org

cpuset kernel hooks in init, exit, fork, sched_setaffinity,
Kconfig and sched.h.

These hooks establish and propogate cpusets, and enforce
their CPU placement limitations on sched_setaffinity, and
Memory Node placement limitations on mbind, sys_set_mempolicy.

Index: 2.6.7-mm4/include/linux/sched.h
===================================================================
--- 2.6.7-mm4.orig/include/linux/sched.h 2004-06-29 03:54:46.000000000 -0700
+++ 2.6.7-mm4/include/linux/sched.h 2004-06-29 03:55:38.000000000 -0700
@@ -366,6 +366,7 @@ struct k_itimer {

struct io_context; /* See blkdev.h */
void exit_io_context(void);
+struct cpuset;

#define NGROUPS_SMALL 32
#define NGROUPS_PER_BLOCK ((int)(PAGE_SIZE / sizeof(gid_t)))
@@ -535,6 +536,10 @@ struct task_struct {
           struct mempolicy *mempolicy;
           short il_next; /* could be shared with used_math */
#endif
+
+#ifdef CONFIG_CPUSETS
+ struct cpuset *cpuset;
+#endif
};

static inline pid_t process_group(struct task_struct *tsk)
Index: 2.6.7-mm4/init/Kconfig
===================================================================
--- 2.6.7-mm4.orig/init/Kconfig 2004-06-29 03:54:39.000000000 -0700
+++ 2.6.7-mm4/init/Kconfig 2004-06-29 03:55:38.000000000 -0700
@@ -279,6 +279,16 @@ config EPOLL
           Disabling this option will cause the kernel to be built without
           support for epoll family of system calls.

+config CPUSETS
+ bool "Cpuset support"
+ help
+ This options will let you create and manage CPUSET's which
+ allow dynamically partitioning a system into sets of CPUs and
+ Memory Nodes and assigning tasks to run only within those sets.
+ This is primarily useful on large SMP or NUMA systems.
+
+ Say N if unsure.
+
source "drivers/block/Kconfig.iosched"

config CC_OPTIMIZE_FOR_SIZE
Index: 2.6.7-mm4/init/main.c
===================================================================
--- 2.6.7-mm4.orig/init/main.c 2004-06-29 03:54:43.000000000 -0700
+++ 2.6.7-mm4/init/main.c 2004-06-29 03:55:38.000000000 -0700
@@ -41,6 +41,7 @@
#include <linux/writeback.h>
#include <linux/cpu.h>
#include <linux/efi.h>
+#include <linux/cpuset.h>
#include <linux/unistd.h>
#include <linux/rmap.h>
#include <linux/mempolicy.h>
@@ -536,6 +537,8 @@ asmlinkage void __init start_kernel(void
#ifdef CONFIG_PROC_FS
         proc_root_init();
#endif
+ cpuset_init();
+
         check_bugs();

         /* Do the rest non-__init'ed, we're now alive */
Index: 2.6.7-mm4/kernel/exit.c
===================================================================
--- 2.6.7-mm4.orig/kernel/exit.c 2004-06-29 03:54:39.000000000 -0700
+++ 2.6.7-mm4/kernel/exit.c 2004-06-29 03:55:38.000000000 -0700
@@ -28,6 +28,7 @@
#include <asm/unistd.h>
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
+#include <linux/cpuset.h>

extern void sem_exit (void);
extern struct task_struct *child_reaper;
@@ -800,6 +801,7 @@ asmlinkage NORET_TYPE void do_exit(long
         __exit_fs(tsk);
         exit_namespace(tsk);
         exit_thread();
+ cpuset_exit(tsk);
#ifdef CONFIG_NUMA
         mpol_free(tsk->mempolicy);
#endif
Index: 2.6.7-mm4/kernel/fork.c
===================================================================
--- 2.6.7-mm4.orig/kernel/fork.c 2004-06-29 03:54:43.000000000 -0700
+++ 2.6.7-mm4/kernel/fork.c 2004-06-29 03:55:38.000000000 -0700
@@ -36,6 +36,7 @@
#include <linux/mount.h>
#include <linux/audit.h>
#include <linux/rmap.h>
+#include <linux/cpuset.h>

#include <asm/pgtable.h>
#include <asm/pgalloc.h>
@@ -1093,6 +1094,8 @@ struct task_struct *copy_process(unsigne
         if (p->ptrace & PT_PTRACED)
                 __ptrace_link(p, current->parent);

+ cpuset_fork(p);
+
         attach_pid(p, PIDTYPE_PID, p->pid);
         if (thread_group_leader(p)) {
                 attach_pid(p, PIDTYPE_TGID, p->tgid);
Index: 2.6.7-mm4/kernel/sched.c
===================================================================
--- 2.6.7-mm4.orig/kernel/sched.c 2004-06-29 03:54:43.000000000 -0700
+++ 2.6.7-mm4/kernel/sched.c 2004-06-29 03:55:38.000000000 -0700
@@ -41,6 +41,7 @@
#include <linux/percpu.h>
#include <linux/perfctr.h>
#include <linux/kthread.h>
+#include <linux/cpuset.h>
#include <asm/tlb.h>

#include <asm/unistd.h>
@@ -2908,7 +2909,7 @@ out_unlock:
asmlinkage long sys_sched_setaffinity(pid_t pid, unsigned int len,
                                       unsigned long __user *user_mask_ptr)
{
- cpumask_t new_mask;
+ cpumask_t new_mask, cpus_allowed;
         int retval;
         task_t *p;

@@ -2941,6 +2942,8 @@ asmlinkage long sys_sched_setaffinity(pi
                         !capable(CAP_SYS_NICE))
                 goto out_unlock;

+ cpus_allowed = cpuset_cpus_allowed(p);
+ cpus_and(new_mask, new_mask, cpus_allowed);
         retval = set_cpus_allowed(p, new_mask);

out_unlock:
@@ -3520,7 +3523,9 @@ static void migrate_all_tasks(int src_cp
                 if (dest_cpu == NR_CPUS)
                         dest_cpu = any_online_cpu(tsk->cpus_allowed);
                 if (dest_cpu == NR_CPUS) {
- cpus_setall(tsk->cpus_allowed);
+ tsk->cpus_allowed = cpuset_cpus_allowed(tsk);
+ if (!cpus_intersects(tsk->cpus_allowed, cpu_online_map))
+ cpus_setall(tsk->cpus_allowed);
                         dest_cpu = any_online_cpu(tsk->cpus_allowed);

                         /* Don't tell them about moving exiting tasks
Index: 2.6.7-mm4/mm/mempolicy.c
===================================================================
--- 2.6.7-mm4.orig/mm/mempolicy.c 2004-06-29 03:55:33.000000000 -0700
+++ 2.6.7-mm4/mm/mempolicy.c 2004-06-29 03:55:38.000000000 -0700
@@ -67,6 +67,7 @@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/nodemask.h>
+#include <linux/cpuset.h>
#include <linux/gfp.h>
#include <linux/slab.h>
#include <linux/string.h>
@@ -132,6 +133,7 @@ static int get_nodes(unsigned long *node
         unsigned long k;
         unsigned long nlongs;
         unsigned long endmask;
+ nodemask_t mems_allowed;

         --maxnode;
         bitmap_zero(nodes, MAX_NUMNODES);
@@ -164,6 +166,9 @@ static int get_nodes(unsigned long *node
         if (copy_from_user(nodes, nmask, nlongs*sizeof(unsigned long)))
                 return -EFAULT;
         nodes[nlongs-1] &= endmask;
+ /* Ignore nodes not allowed in current cpuset */
+ mems_allowed = cpuset_mems_allowed(current);
+ bitmap_and(nodes, nodes, nodes_addr(mems_allowed), MAX_NUMNODES);
         return mpol_check_policy(mode, nodes);
}

-- 
                          I won't rest till it's the best ...
                          Programmer, Linux Scalability
                          Paul Jackson <pj@sgi.com> 1.650.933.1373
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Next message: Paul Jackson: "[patch 3/8] cpusets v3 - cpumask_t - additional const qualifiers"

Previous message: Paul Jackson: "[patch 5/8] cpusets v3 - New bitmap lists format"
In reply to: Paul Jackson: "[patch 1/8] cpusets v3 - Table of Contents"
Next in thread: Paul Jackson: "[patch 3/8] cpusets v3 - cpumask_t - additional const qualifiers"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Relevant Pages

[patch 7/8] cpusets v4 - The few, small kernel hooks needed
... cpuset kernel hooks in init, exit, fork, sched_setaffinity, ... Memory Node placement limitations on mbind, ...
(Linux-Kernel)
[PATCH 2.6.16-mm1 2/2] sched_domains: Allocate sched_groups dynamically
... I hit a kernel lockup problem while making a CPUset exclusive. ... Patch below, against 2.6.16-mm1, fixes the problem for both SCHED_SMT and ... +#ifdef CONFIG_SCHED_MC ...
(Linux-Kernel)
re: [PATCH] build sched domains tracking cpusets
... load-balancing attempted by a CPU not in this busiest CPU's cpuset. ... This patch introduces the notion of dynamic sched domains (and sched ...
(Linux-Kernel)
[RFC][PATCH 2/4] Cpusets hooked into containers
... +#ifdef CONFIG_CPUSETS ... /* struct cftype: ... * When there is only one cpuset we can ...
(Linux-Kernel)
[RFC][PATCH 2/4] Cpusets hooked into containers
... +#ifdef CONFIG_CPUSETS ... /* struct cftype: ... When there is only one cpuset we can ...
(Linux-Kernel)