subject:"\[PATCH 4\/5\] Add fair\-user scheduler"

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Srivatsa Vaddagiri

On Tue, Sep 25, 2007 at 01:39:39AM +0200, roel wrote:
> > +static int
> > +root_user_share_read_proc(char *page, char **start, off_t off, int count,
> > +int *eof, void *data)
> > +{
> > +   int len;
> > +
> > +   len = sprintf(page, "%d\n", init_task_grp_load);
> > +
> > +   return len;
> > +}
> 
> or use this oneliner:
> 
>   return sprintf(page, "%d\n", init_task_grp_load);

Looks good. Will fix this in a follow-on.patch.

Thanks!

-- 
Regards,
vatsa
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread roel

Srivatsa Vaddagiri wrote:
> Enable user-id based fair group scheduling. This is usefull for anyone
> who wants to test the group scheduler w/o having to enable
> CONFIG_CGROUPS.
> 
> A separate scheduling group (i.e struct task_grp) is automatically created 
> for 
> every new user added to the system. Upon uid change for a task, it is made to 
> move to the corresponding scheduling group.
> 
> A /proc tunable (/proc/root_user_share) is also provided to tune root
> user's quota of cpu bandwidth.
> 
> Signed-off-by : Srivatsa Vaddagiri <[EMAIL PROTECTED]>
> Signed-off-by : Dhaval Giani <[EMAIL PROTECTED]>
> 
> 
> ---
>  include/linux/sched.h |4 +++
>  init/Kconfig  |   13 
>  kernel/sched.c|9 
>  kernel/sched_debug.c  |   52 
> ++
>  kernel/user.c |   43 +
>  5 files changed, 121 insertions(+)
> 
> Index: linux-2.6.23-rc6/include/linux/sched.h
> ===
> --- linux-2.6.23-rc6.orig/include/linux/sched.h
> +++ linux-2.6.23-rc6/include/linux/sched.h
> @@ -596,6 +596,10 @@ struct user_struct {
>   /* Hash table maintenance information */
>   struct hlist_node uidhash_node;
>   uid_t uid;
> +
> +#ifdef CONFIG_FAIR_USER_SCHED
> + struct task_grp *tg;
> +#endif
>  };
>  
>  extern struct user_struct *find_user(uid_t);
> Index: linux-2.6.23-rc6/init/Kconfig
> ===
> --- linux-2.6.23-rc6.orig/init/Kconfig
> +++ linux-2.6.23-rc6/init/Kconfig
> @@ -289,6 +289,19 @@ config FAIR_GROUP_SCHED
> This feature lets cpu scheduler recognize task groups and control cpu
> bandwidth allocation to such task groups.
>  
> +choice
> + depends on FAIR_GROUP_SCHED
> + prompt "Basis for grouping tasks"
> + default FAIR_USER_SCHED
> +
> + config FAIR_USER_SCHED
> + bool "user id"
> + help
> +   This option will choose userid as the basis for grouping
> +   tasks, thus providing equal cpu bandwidth to each user.
> +
> +endchoice
> +
>  config SYSFS_DEPRECATED
>   bool "Create deprecated sysfs files"
>   default y
> Index: linux-2.6.23-rc6/kernel/sched.c
> ===
> --- linux-2.6.23-rc6.orig/kernel/sched.c
> +++ linux-2.6.23-rc6/kernel/sched.c
> @@ -199,7 +199,12 @@ struct task_grp init_task_grp =  {
>   .cfs_rq = init_cfs_rq_p,
>};
>  
> +#ifdef CONFIG_FAIR_USER_SCHED
> +#define INIT_TASK_GRP_LOAD   2*NICE_0_LOAD
> +#else
>  #define INIT_TASK_GRP_LOAD   NICE_0_LOAD
> +#endif
> +
>  static int init_task_grp_load = INIT_TASK_GRP_LOAD;
>  
>  /* return group to which a task belongs */
> @@ -207,7 +212,11 @@ static inline struct task_grp *task_grp(
>  {
>   struct task_grp *tg;
>  
> +#ifdef CONFIG_FAIR_USER_SCHED
> + tg = p->user->tg;
> +#else
>   tg  = _task_grp;
> +#endif
>  
>   return tg;
>  }
> Index: linux-2.6.23-rc6/kernel/sched_debug.c
> ===
> --- linux-2.6.23-rc6.orig/kernel/sched_debug.c
> +++ linux-2.6.23-rc6/kernel/sched_debug.c
> @@ -214,6 +214,49 @@ static void sysrq_sched_debug_show(void)
>   sched_debug_show(NULL, NULL);
>  }
>  
> +#ifdef CONFIG_FAIR_USER_SCHED
> +
> +static DEFINE_MUTEX(root_user_share_mutex);
> +
> +static int
> +root_user_share_read_proc(char *page, char **start, off_t off, int count,
> +  int *eof, void *data)
> +{
> + int len;
> +
> + len = sprintf(page, "%d\n", init_task_grp_load);
> +
> + return len;
> +}

or use this oneliner:

return sprintf(page, "%d\n", init_task_grp_load);

> +
> +static int
> +root_user_share_write_proc(struct file *file, const char __user *buffer,
> +  unsigned long count, void *data)
> +{
> + unsigned long shares;
> + char kbuf[sizeof(unsigned long)+1];
> + int rc = 0;
> +
> + if (copy_from_user(kbuf, buffer, sizeof(kbuf)))
> + return -EFAULT;
> +
> + shares = simple_strtoul(kbuf, NULL, 0);
> +
> + if (!shares)
> + shares = NICE_0_LOAD;
> +
> + mutex_lock(_user_share_mutex);
> +
> + init_task_grp_load = shares;
> + rc = sched_group_set_shares(_task_grp, shares);
> +
> + mutex_unlock(_user_share_mutex);
> +
> + return (rc < 0 ? rc : count);
> +}
> +
> +#endif   /* CONFIG_FAIR_USER_SCHED */
> +
>  static int sched_debug_open(struct inode *inode, struct file *filp)
>  {
>   return single_open(filp, sched_debug_show, NULL);
> @@ -236,6 +279,15 @@ static int __init init_sched_debug_procf
>  
>   pe->proc_fops = _debug_fops;
>  
> +#ifdef CONFIG_FAIR_USER_SCHED
> + pe = create_proc_entry("root_user_share", 0644, NULL);
> + if (!pe)
> + return

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Ingo Molnar


* Srivatsa Vaddagiri <[EMAIL PROTECTED]> wrote:

> Enable user-id based fair group scheduling. This is usefull for anyone 
> who wants to test the group scheduler w/o having to enable 
> CONFIG_CGROUPS.

excellent! I'll make this default-enabled.

Ingo
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Srivatsa Vaddagiri

On Mon, Sep 24, 2007 at 09:56:41AM -0700, Randy Dunlap wrote:
> > +choice
> > +   depends on FAIR_GROUP_SCHED
> > +   prompt "Basis for grouping tasks"
> > +   default FAIR_USER_SCHED
> > +
> > +   config FAIR_USER_SCHED
> > +   bool "user id"
> > +   help
> > + This option will choose userid as the basis for grouping
> > + tasks, thus providing equal cpu bandwidth to each user.
> 
> s/cpu/CPU/g please.

ok, sure.

> and the "bool", "help" and help text are indented by one tab too much.

will take care.

-- 
Regards,
vatsa
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Randy Dunlap

On Mon, 24 Sep 2007 22:10:59 +0530 Srivatsa Vaddagiri wrote:

> ---
>  include/linux/sched.h |4 +++
>  init/Kconfig  |   13 
>  kernel/sched.c|9 
>  kernel/sched_debug.c  |   52 
> ++
>  kernel/user.c |   43 +
>  5 files changed, 121 insertions(+)
> 
> Index: linux-2.6.23-rc6/init/Kconfig
> ===
> --- linux-2.6.23-rc6.orig/init/Kconfig
> +++ linux-2.6.23-rc6/init/Kconfig
> @@ -289,6 +289,19 @@ config FAIR_GROUP_SCHED
> This feature lets cpu scheduler recognize task groups and control cpu
> bandwidth allocation to such task groups.
>  
> +choice
> + depends on FAIR_GROUP_SCHED
> + prompt "Basis for grouping tasks"
> + default FAIR_USER_SCHED
> +
> + config FAIR_USER_SCHED
> + bool "user id"
> + help
> +   This option will choose userid as the basis for grouping
> +   tasks, thus providing equal cpu bandwidth to each user.

s/cpu/CPU/g please.

and the "bool", "help" and help text are indented by one tab too much.


> +
> +endchoice
> +
>  config SYSFS_DEPRECATED
>   bool "Create deprecated sysfs files"
>   default y

---
~Randy
Phaedrus says that Quality is about caring.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Srivatsa Vaddagiri


Enable user-id based fair group scheduling. This is usefull for anyone
who wants to test the group scheduler w/o having to enable
CONFIG_CGROUPS.

A separate scheduling group (i.e struct task_grp) is automatically created for 
every new user added to the system. Upon uid change for a task, it is made to 
move to the corresponding scheduling group.

A /proc tunable (/proc/root_user_share) is also provided to tune root
user's quota of cpu bandwidth.

Signed-off-by : Srivatsa Vaddagiri <[EMAIL PROTECTED]>
Signed-off-by : Dhaval Giani <[EMAIL PROTECTED]>


---
 include/linux/sched.h |4 +++
 init/Kconfig  |   13 
 kernel/sched.c|9 
 kernel/sched_debug.c  |   52 ++
 kernel/user.c |   43 +
 5 files changed, 121 insertions(+)

Index: linux-2.6.23-rc6/include/linux/sched.h
===
--- linux-2.6.23-rc6.orig/include/linux/sched.h
+++ linux-2.6.23-rc6/include/linux/sched.h
@@ -596,6 +596,10 @@ struct user_struct {
/* Hash table maintenance information */
struct hlist_node uidhash_node;
uid_t uid;
+
+#ifdef CONFIG_FAIR_USER_SCHED
+   struct task_grp *tg;
+#endif
 };
 
 extern struct user_struct *find_user(uid_t);
Index: linux-2.6.23-rc6/init/Kconfig
===
--- linux-2.6.23-rc6.orig/init/Kconfig
+++ linux-2.6.23-rc6/init/Kconfig
@@ -289,6 +289,19 @@ config FAIR_GROUP_SCHED
  This feature lets cpu scheduler recognize task groups and control cpu
  bandwidth allocation to such task groups.
 
+choice
+   depends on FAIR_GROUP_SCHED
+   prompt "Basis for grouping tasks"
+   default FAIR_USER_SCHED
+
+   config FAIR_USER_SCHED
+   bool "user id"
+   help
+ This option will choose userid as the basis for grouping
+ tasks, thus providing equal cpu bandwidth to each user.
+
+endchoice
+
 config SYSFS_DEPRECATED
bool "Create deprecated sysfs files"
default y
Index: linux-2.6.23-rc6/kernel/sched.c
===
--- linux-2.6.23-rc6.orig/kernel/sched.c
+++ linux-2.6.23-rc6/kernel/sched.c
@@ -199,7 +199,12 @@ struct task_grp init_task_grp =  {
.cfs_rq = init_cfs_rq_p,
 };
 
+#ifdef CONFIG_FAIR_USER_SCHED
+#define INIT_TASK_GRP_LOAD 2*NICE_0_LOAD
+#else
 #define INIT_TASK_GRP_LOAD NICE_0_LOAD
+#endif
+
 static int init_task_grp_load = INIT_TASK_GRP_LOAD;
 
 /* return group to which a task belongs */
@@ -207,7 +212,11 @@ static inline struct task_grp *task_grp(
 {
struct task_grp *tg;
 
+#ifdef CONFIG_FAIR_USER_SCHED
+   tg = p->user->tg;
+#else
tg  = _task_grp;
+#endif
 
return tg;
 }
Index: linux-2.6.23-rc6/kernel/sched_debug.c
===
--- linux-2.6.23-rc6.orig/kernel/sched_debug.c
+++ linux-2.6.23-rc6/kernel/sched_debug.c
@@ -214,6 +214,49 @@ static void sysrq_sched_debug_show(void)
sched_debug_show(NULL, NULL);
 }
 
+#ifdef CONFIG_FAIR_USER_SCHED
+
+static DEFINE_MUTEX(root_user_share_mutex);
+
+static int
+root_user_share_read_proc(char *page, char **start, off_t off, int count,
+int *eof, void *data)
+{
+   int len;
+
+   len = sprintf(page, "%d\n", init_task_grp_load);
+
+   return len;
+}
+
+static int
+root_user_share_write_proc(struct file *file, const char __user *buffer,
+unsigned long count, void *data)
+{
+   unsigned long shares;
+   char kbuf[sizeof(unsigned long)+1];
+   int rc = 0;
+
+   if (copy_from_user(kbuf, buffer, sizeof(kbuf)))
+   return -EFAULT;
+
+   shares = simple_strtoul(kbuf, NULL, 0);
+
+   if (!shares)
+   shares = NICE_0_LOAD;
+
+   mutex_lock(_user_share_mutex);
+
+   init_task_grp_load = shares;
+   rc = sched_group_set_shares(_task_grp, shares);
+
+   mutex_unlock(_user_share_mutex);
+
+   return (rc < 0 ? rc : count);
+}
+
+#endif /* CONFIG_FAIR_USER_SCHED */
+
 static int sched_debug_open(struct inode *inode, struct file *filp)
 {
return single_open(filp, sched_debug_show, NULL);
@@ -236,6 +279,15 @@ static int __init init_sched_debug_procf
 
pe->proc_fops = _debug_fops;
 
+#ifdef CONFIG_FAIR_USER_SCHED
+   pe = create_proc_entry("root_user_share", 0644, NULL);
+   if (!pe)
+   return -ENOMEM;
+
+   pe->read_proc = root_user_share_read_proc;
+   pe->write_proc = root_user_share_write_proc;
+#endif
+
return 0;
 }
 
Index: linux-2.6.23-rc6/kernel/user.c
===
--- linux-2.6.23-rc6.orig/kernel/user.c
+++ linux-2.6.23-rc6/kernel/user.c
@@

[PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Srivatsa Vaddagiri


Enable user-id based fair group scheduling. This is usefull for anyone
who wants to test the group scheduler w/o having to enable
CONFIG_CGROUPS.

A separate scheduling group (i.e struct task_grp) is automatically created for 
every new user added to the system. Upon uid change for a task, it is made to 
move to the corresponding scheduling group.

A /proc tunable (/proc/root_user_share) is also provided to tune root
user's quota of cpu bandwidth.

Signed-off-by : Srivatsa Vaddagiri [EMAIL PROTECTED]
Signed-off-by : Dhaval Giani [EMAIL PROTECTED]


---
 include/linux/sched.h |4 +++
 init/Kconfig  |   13 
 kernel/sched.c|9 
 kernel/sched_debug.c  |   52 ++
 kernel/user.c |   43 +
 5 files changed, 121 insertions(+)

Index: linux-2.6.23-rc6/include/linux/sched.h
===
--- linux-2.6.23-rc6.orig/include/linux/sched.h
+++ linux-2.6.23-rc6/include/linux/sched.h
@@ -596,6 +596,10 @@ struct user_struct {
/* Hash table maintenance information */
struct hlist_node uidhash_node;
uid_t uid;
+
+#ifdef CONFIG_FAIR_USER_SCHED
+   struct task_grp *tg;
+#endif
 };
 
 extern struct user_struct *find_user(uid_t);
Index: linux-2.6.23-rc6/init/Kconfig
===
--- linux-2.6.23-rc6.orig/init/Kconfig
+++ linux-2.6.23-rc6/init/Kconfig
@@ -289,6 +289,19 @@ config FAIR_GROUP_SCHED
  This feature lets cpu scheduler recognize task groups and control cpu
  bandwidth allocation to such task groups.
 
+choice
+   depends on FAIR_GROUP_SCHED
+   prompt Basis for grouping tasks
+   default FAIR_USER_SCHED
+
+   config FAIR_USER_SCHED
+   bool user id
+   help
+ This option will choose userid as the basis for grouping
+ tasks, thus providing equal cpu bandwidth to each user.
+
+endchoice
+
 config SYSFS_DEPRECATED
bool Create deprecated sysfs files
default y
Index: linux-2.6.23-rc6/kernel/sched.c
===
--- linux-2.6.23-rc6.orig/kernel/sched.c
+++ linux-2.6.23-rc6/kernel/sched.c
@@ -199,7 +199,12 @@ struct task_grp init_task_grp =  {
.cfs_rq = init_cfs_rq_p,
 };
 
+#ifdef CONFIG_FAIR_USER_SCHED
+#define INIT_TASK_GRP_LOAD 2*NICE_0_LOAD
+#else
 #define INIT_TASK_GRP_LOAD NICE_0_LOAD
+#endif
+
 static int init_task_grp_load = INIT_TASK_GRP_LOAD;
 
 /* return group to which a task belongs */
@@ -207,7 +212,11 @@ static inline struct task_grp *task_grp(
 {
struct task_grp *tg;
 
+#ifdef CONFIG_FAIR_USER_SCHED
+   tg = p-user-tg;
+#else
tg  = init_task_grp;
+#endif
 
return tg;
 }
Index: linux-2.6.23-rc6/kernel/sched_debug.c
===
--- linux-2.6.23-rc6.orig/kernel/sched_debug.c
+++ linux-2.6.23-rc6/kernel/sched_debug.c
@@ -214,6 +214,49 @@ static void sysrq_sched_debug_show(void)
sched_debug_show(NULL, NULL);
 }
 
+#ifdef CONFIG_FAIR_USER_SCHED
+
+static DEFINE_MUTEX(root_user_share_mutex);
+
+static int
+root_user_share_read_proc(char *page, char **start, off_t off, int count,
+int *eof, void *data)
+{
+   int len;
+
+   len = sprintf(page, %d\n, init_task_grp_load);
+
+   return len;
+}
+
+static int
+root_user_share_write_proc(struct file *file, const char __user *buffer,
+unsigned long count, void *data)
+{
+   unsigned long shares;
+   char kbuf[sizeof(unsigned long)+1];
+   int rc = 0;
+
+   if (copy_from_user(kbuf, buffer, sizeof(kbuf)))
+   return -EFAULT;
+
+   shares = simple_strtoul(kbuf, NULL, 0);
+
+   if (!shares)
+   shares = NICE_0_LOAD;
+
+   mutex_lock(root_user_share_mutex);
+
+   init_task_grp_load = shares;
+   rc = sched_group_set_shares(init_task_grp, shares);
+
+   mutex_unlock(root_user_share_mutex);
+
+   return (rc  0 ? rc : count);
+}
+
+#endif /* CONFIG_FAIR_USER_SCHED */
+
 static int sched_debug_open(struct inode *inode, struct file *filp)
 {
return single_open(filp, sched_debug_show, NULL);
@@ -236,6 +279,15 @@ static int __init init_sched_debug_procf
 
pe-proc_fops = sched_debug_fops;
 
+#ifdef CONFIG_FAIR_USER_SCHED
+   pe = create_proc_entry(root_user_share, 0644, NULL);
+   if (!pe)
+   return -ENOMEM;
+
+   pe-read_proc = root_user_share_read_proc;
+   pe-write_proc = root_user_share_write_proc;
+#endif
+
return 0;
 }
 
Index: linux-2.6.23-rc6/kernel/user.c
===
--- linux-2.6.23-rc6.orig/kernel/user.c
+++ linux-2.6.23-rc6/kernel/user.c
@@

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Randy Dunlap

On Mon, 24 Sep 2007 22:10:59 +0530 Srivatsa Vaddagiri wrote:

 ---
  include/linux/sched.h |4 +++
  init/Kconfig  |   13 
  kernel/sched.c|9 
  kernel/sched_debug.c  |   52 
 ++
  kernel/user.c |   43 +
  5 files changed, 121 insertions(+)
 
 Index: linux-2.6.23-rc6/init/Kconfig
 ===
 --- linux-2.6.23-rc6.orig/init/Kconfig
 +++ linux-2.6.23-rc6/init/Kconfig
 @@ -289,6 +289,19 @@ config FAIR_GROUP_SCHED
 This feature lets cpu scheduler recognize task groups and control cpu
 bandwidth allocation to such task groups.
  
 +choice
 + depends on FAIR_GROUP_SCHED
 + prompt Basis for grouping tasks
 + default FAIR_USER_SCHED
 +
 + config FAIR_USER_SCHED
 + bool user id
 + help
 +   This option will choose userid as the basis for grouping
 +   tasks, thus providing equal cpu bandwidth to each user.

s/cpu/CPU/g please.

and the bool, help and help text are indented by one tab too much.


 +
 +endchoice
 +
  config SYSFS_DEPRECATED
   bool Create deprecated sysfs files
   default y

---
~Randy
Phaedrus says that Quality is about caring.
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Srivatsa Vaddagiri

On Mon, Sep 24, 2007 at 09:56:41AM -0700, Randy Dunlap wrote:
  +choice
  +   depends on FAIR_GROUP_SCHED
  +   prompt Basis for grouping tasks
  +   default FAIR_USER_SCHED
  +
  +   config FAIR_USER_SCHED
  +   bool user id
  +   help
  + This option will choose userid as the basis for grouping
  + tasks, thus providing equal cpu bandwidth to each user.
 
 s/cpu/CPU/g please.

ok, sure.

 and the bool, help and help text are indented by one tab too much.

will take care.

-- 
Regards,
vatsa
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Ingo Molnar


* Srivatsa Vaddagiri [EMAIL PROTECTED] wrote:

 Enable user-id based fair group scheduling. This is usefull for anyone 
 who wants to test the group scheduler w/o having to enable 
 CONFIG_CGROUPS.

excellent! I'll make this default-enabled.

Ingo
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread roel

Srivatsa Vaddagiri wrote:
 Enable user-id based fair group scheduling. This is usefull for anyone
 who wants to test the group scheduler w/o having to enable
 CONFIG_CGROUPS.
 
 A separate scheduling group (i.e struct task_grp) is automatically created 
 for 
 every new user added to the system. Upon uid change for a task, it is made to 
 move to the corresponding scheduling group.
 
 A /proc tunable (/proc/root_user_share) is also provided to tune root
 user's quota of cpu bandwidth.
 
 Signed-off-by : Srivatsa Vaddagiri [EMAIL PROTECTED]
 Signed-off-by : Dhaval Giani [EMAIL PROTECTED]
 
 
 ---
  include/linux/sched.h |4 +++
  init/Kconfig  |   13 
  kernel/sched.c|9 
  kernel/sched_debug.c  |   52 
 ++
  kernel/user.c |   43 +
  5 files changed, 121 insertions(+)
 
 Index: linux-2.6.23-rc6/include/linux/sched.h
 ===
 --- linux-2.6.23-rc6.orig/include/linux/sched.h
 +++ linux-2.6.23-rc6/include/linux/sched.h
 @@ -596,6 +596,10 @@ struct user_struct {
   /* Hash table maintenance information */
   struct hlist_node uidhash_node;
   uid_t uid;
 +
 +#ifdef CONFIG_FAIR_USER_SCHED
 + struct task_grp *tg;
 +#endif
  };
  
  extern struct user_struct *find_user(uid_t);
 Index: linux-2.6.23-rc6/init/Kconfig
 ===
 --- linux-2.6.23-rc6.orig/init/Kconfig
 +++ linux-2.6.23-rc6/init/Kconfig
 @@ -289,6 +289,19 @@ config FAIR_GROUP_SCHED
 This feature lets cpu scheduler recognize task groups and control cpu
 bandwidth allocation to such task groups.
  
 +choice
 + depends on FAIR_GROUP_SCHED
 + prompt Basis for grouping tasks
 + default FAIR_USER_SCHED
 +
 + config FAIR_USER_SCHED
 + bool user id
 + help
 +   This option will choose userid as the basis for grouping
 +   tasks, thus providing equal cpu bandwidth to each user.
 +
 +endchoice
 +
  config SYSFS_DEPRECATED
   bool Create deprecated sysfs files
   default y
 Index: linux-2.6.23-rc6/kernel/sched.c
 ===
 --- linux-2.6.23-rc6.orig/kernel/sched.c
 +++ linux-2.6.23-rc6/kernel/sched.c
 @@ -199,7 +199,12 @@ struct task_grp init_task_grp =  {
   .cfs_rq = init_cfs_rq_p,
};
  
 +#ifdef CONFIG_FAIR_USER_SCHED
 +#define INIT_TASK_GRP_LOAD   2*NICE_0_LOAD
 +#else
  #define INIT_TASK_GRP_LOAD   NICE_0_LOAD
 +#endif
 +
  static int init_task_grp_load = INIT_TASK_GRP_LOAD;
  
  /* return group to which a task belongs */
 @@ -207,7 +212,11 @@ static inline struct task_grp *task_grp(
  {
   struct task_grp *tg;
  
 +#ifdef CONFIG_FAIR_USER_SCHED
 + tg = p-user-tg;
 +#else
   tg  = init_task_grp;
 +#endif
  
   return tg;
  }
 Index: linux-2.6.23-rc6/kernel/sched_debug.c
 ===
 --- linux-2.6.23-rc6.orig/kernel/sched_debug.c
 +++ linux-2.6.23-rc6/kernel/sched_debug.c
 @@ -214,6 +214,49 @@ static void sysrq_sched_debug_show(void)
   sched_debug_show(NULL, NULL);
  }
  
 +#ifdef CONFIG_FAIR_USER_SCHED
 +
 +static DEFINE_MUTEX(root_user_share_mutex);
 +
 +static int
 +root_user_share_read_proc(char *page, char **start, off_t off, int count,
 +  int *eof, void *data)
 +{
 + int len;
 +
 + len = sprintf(page, %d\n, init_task_grp_load);
 +
 + return len;
 +}

or use this oneliner:

return sprintf(page, %d\n, init_task_grp_load);

 +
 +static int
 +root_user_share_write_proc(struct file *file, const char __user *buffer,
 +  unsigned long count, void *data)
 +{
 + unsigned long shares;
 + char kbuf[sizeof(unsigned long)+1];
 + int rc = 0;
 +
 + if (copy_from_user(kbuf, buffer, sizeof(kbuf)))
 + return -EFAULT;
 +
 + shares = simple_strtoul(kbuf, NULL, 0);
 +
 + if (!shares)
 + shares = NICE_0_LOAD;
 +
 + mutex_lock(root_user_share_mutex);
 +
 + init_task_grp_load = shares;
 + rc = sched_group_set_shares(init_task_grp, shares);
 +
 + mutex_unlock(root_user_share_mutex);
 +
 + return (rc  0 ? rc : count);
 +}
 +
 +#endif   /* CONFIG_FAIR_USER_SCHED */
 +
  static int sched_debug_open(struct inode *inode, struct file *filp)
  {
   return single_open(filp, sched_debug_show, NULL);
 @@ -236,6 +279,15 @@ static int __init init_sched_debug_procf
  
   pe-proc_fops = sched_debug_fops;
  
 +#ifdef CONFIG_FAIR_USER_SCHED
 + pe = create_proc_entry(root_user_share, 0644, NULL);
 + if (!pe)
 + return -ENOMEM;
 +
 + pe-read_proc = root_user_share_read_proc;
 + pe-write_proc = root_user_share_write_proc;
 +#endif
 +
   return 0;
  }
  
 Index:

Re: [PATCH 4/5] Add fair-user scheduler

2007-09-24 Thread Srivatsa Vaddagiri

On Tue, Sep 25, 2007 at 01:39:39AM +0200, roel wrote:
  +static int
  +root_user_share_read_proc(char *page, char **start, off_t off, int count,
  +int *eof, void *data)
  +{
  +   int len;
  +
  +   len = sprintf(page, %d\n, init_task_grp_load);
  +
  +   return len;
  +}
 
 or use this oneliner:
 
   return sprintf(page, %d\n, init_task_grp_load);

Looks good. Will fix this in a follow-on.patch.

Thanks!

-- 
Regards,
vatsa
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 4/5] Add fair-user scheduler

Re: [PATCH 4/5] Add fair-user scheduler

Re: [PATCH 4/5] Add fair-user scheduler

Re: [PATCH 4/5] Add fair-user scheduler

Re: [PATCH 4/5] Add fair-user scheduler

[PATCH 4/5] Add fair-user scheduler

[PATCH 4/5] Add fair-user scheduler

Re: [PATCH 4/5] Add fair-user scheduler

Re: [PATCH 4/5] Add fair-user scheduler

Re: [PATCH 4/5] Add fair-user scheduler

Re: [PATCH 4/5] Add fair-user scheduler

Re: [PATCH 4/5] Add fair-user scheduler

12 matches

Site Navigation

Mail list logo

Footer information