2006-07-14 14:24:36 +07:00
|
|
|
/* delayacct.h - per-task delay accounting
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) Shailabh Nagar, IBM Corp. 2006
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
|
|
|
|
|
* the GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef _LINUX_DELAYACCT_H
|
|
|
|
|
#define _LINUX_DELAYACCT_H
|
|
|
|
|
|
|
|
|
|
#include <linux/sched.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 15:04:11 +07:00
|
|
|
#include <linux/slab.h>
|
2006-07-14 14:24:36 +07:00
|
|
|
|
2006-07-14 14:24:37 +07:00
|
|
|
/*
|
|
|
|
|
* Per-task flags relevant to delay accounting
|
|
|
|
|
* maintained privately to avoid exhausting similar flags in sched.h:PF_*
|
|
|
|
|
* Used to set current->delays->flags
|
|
|
|
|
*/
|
|
|
|
|
#define DELAYACCT_PF_SWAPIN 0x00000001 /* I am doing a swapin */
|
Add cgroupstats
This patch is inspired by the discussion at
http://lkml.org/lkml/2007/4/11/187 and implements per cgroup statistics
as suggested by Andrew Morton in http://lkml.org/lkml/2007/4/11/263. The
patch is on top of 2.6.21-mm1 with Paul's cgroups v9 patches (forward
ported)
This patch implements per cgroup statistics infrastructure and re-uses
code from the taskstats interface. A new set of cgroup operations are
registered with commands and attributes. It should be very easy to
*extend* per cgroup statistics, by adding members to the cgroupstats
structure.
The current model for cgroupstats is a pull, a push model (to post
statistics on interesting events), should be very easy to add. Currently
user space requests for statistics by passing the cgroup file
descriptor. Statistics about the state of all the tasks in the cgroup
is returned to user space.
TODO's/NOTE:
This patch provides an infrastructure for implementing cgroup statistics.
Based on the needs of each controller, we can incrementally add more statistics,
event based support for notification of statistics, accumulation of taskstats
into cgroup statistics in the future.
Sample output
# ./cgroupstats -C /cgroup/a
sleeping 2, blocked 0, running 1, stopped 0, uninterruptible 0
# ./cgroupstats -C /cgroup/
sleeping 154, blocked 0, running 0, stopped 0, uninterruptible 0
If the approach looks good, I'll enhance and post the user space utility for
the same
Feedback, comments, test results are always welcome!
[akpm@linux-foundation.org: build fix]
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: Jay Lan <jlan@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 13:39:44 +07:00
|
|
|
#define DELAYACCT_PF_BLKIO 0x00000002 /* I am waiting on IO */
|
2006-07-14 14:24:37 +07:00
|
|
|
|
2006-07-14 14:24:36 +07:00
|
|
|
#ifdef CONFIG_TASK_DELAY_ACCT
|
|
|
|
|
|
|
|
|
|
extern int delayacct_on; /* Delay accounting turned on/off */
|
2006-12-07 11:33:20 +07:00
|
|
|
extern struct kmem_cache *delayacct_cache;
|
2006-07-14 14:24:36 +07:00
|
|
|
extern void delayacct_init(void);
|
|
|
|
|
extern void __delayacct_tsk_init(struct task_struct *);
|
|
|
|
|
extern void __delayacct_tsk_exit(struct task_struct *);
|
2006-07-14 14:24:37 +07:00
|
|
|
extern void __delayacct_blkio_start(void);
|
|
|
|
|
extern void __delayacct_blkio_end(void);
|
2006-07-14 14:24:41 +07:00
|
|
|
extern int __delayacct_add_tsk(struct taskstats *, struct task_struct *);
|
2006-07-14 14:24:43 +07:00
|
|
|
extern __u64 __delayacct_blkio_ticks(struct task_struct *);
|
2008-07-25 15:48:52 +07:00
|
|
|
extern void __delayacct_freepages_start(void);
|
|
|
|
|
extern void __delayacct_freepages_end(void);
|
2006-07-14 14:24:36 +07:00
|
|
|
|
Add cgroupstats
This patch is inspired by the discussion at
http://lkml.org/lkml/2007/4/11/187 and implements per cgroup statistics
as suggested by Andrew Morton in http://lkml.org/lkml/2007/4/11/263. The
patch is on top of 2.6.21-mm1 with Paul's cgroups v9 patches (forward
ported)
This patch implements per cgroup statistics infrastructure and re-uses
code from the taskstats interface. A new set of cgroup operations are
registered with commands and attributes. It should be very easy to
*extend* per cgroup statistics, by adding members to the cgroupstats
structure.
The current model for cgroupstats is a pull, a push model (to post
statistics on interesting events), should be very easy to add. Currently
user space requests for statistics by passing the cgroup file
descriptor. Statistics about the state of all the tasks in the cgroup
is returned to user space.
TODO's/NOTE:
This patch provides an infrastructure for implementing cgroup statistics.
Based on the needs of each controller, we can incrementally add more statistics,
event based support for notification of statistics, accumulation of taskstats
into cgroup statistics in the future.
Sample output
# ./cgroupstats -C /cgroup/a
sleeping 2, blocked 0, running 1, stopped 0, uninterruptible 0
# ./cgroupstats -C /cgroup/
sleeping 154, blocked 0, running 0, stopped 0, uninterruptible 0
If the approach looks good, I'll enhance and post the user space utility for
the same
Feedback, comments, test results are always welcome!
[akpm@linux-foundation.org: build fix]
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: Jay Lan <jlan@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 13:39:44 +07:00
|
|
|
static inline int delayacct_is_task_waiting_on_io(struct task_struct *p)
|
|
|
|
|
{
|
|
|
|
|
if (p->delays)
|
|
|
|
|
return (p->delays->flags & DELAYACCT_PF_BLKIO);
|
|
|
|
|
else
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-14 14:24:36 +07:00
|
|
|
static inline void delayacct_set_flag(int flag)
|
|
|
|
|
{
|
|
|
|
|
if (current->delays)
|
|
|
|
|
current->delays->flags |= flag;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void delayacct_clear_flag(int flag)
|
|
|
|
|
{
|
|
|
|
|
if (current->delays)
|
|
|
|
|
current->delays->flags &= ~flag;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void delayacct_tsk_init(struct task_struct *tsk)
|
|
|
|
|
{
|
|
|
|
|
/* reinitialize in case parent's non-null pointer was dup'ed*/
|
|
|
|
|
tsk->delays = NULL;
|
2006-07-30 17:03:11 +07:00
|
|
|
if (delayacct_on)
|
2006-07-14 14:24:36 +07:00
|
|
|
__delayacct_tsk_init(tsk);
|
|
|
|
|
}
|
|
|
|
|
|
2006-09-01 11:27:38 +07:00
|
|
|
/* Free tsk->delays. Called from bad fork and __put_task_struct
|
|
|
|
|
* where there's no risk of tsk->delays being accessed elsewhere
|
|
|
|
|
*/
|
|
|
|
|
static inline void delayacct_tsk_free(struct task_struct *tsk)
|
2006-07-14 14:24:36 +07:00
|
|
|
{
|
|
|
|
|
if (tsk->delays)
|
2006-09-01 11:27:38 +07:00
|
|
|
kmem_cache_free(delayacct_cache, tsk->delays);
|
|
|
|
|
tsk->delays = NULL;
|
2006-07-14 14:24:36 +07:00
|
|
|
}
|
|
|
|
|
|
2006-07-14 14:24:37 +07:00
|
|
|
static inline void delayacct_blkio_start(void)
|
|
|
|
|
{
|
Add cgroupstats
This patch is inspired by the discussion at
http://lkml.org/lkml/2007/4/11/187 and implements per cgroup statistics
as suggested by Andrew Morton in http://lkml.org/lkml/2007/4/11/263. The
patch is on top of 2.6.21-mm1 with Paul's cgroups v9 patches (forward
ported)
This patch implements per cgroup statistics infrastructure and re-uses
code from the taskstats interface. A new set of cgroup operations are
registered with commands and attributes. It should be very easy to
*extend* per cgroup statistics, by adding members to the cgroupstats
structure.
The current model for cgroupstats is a pull, a push model (to post
statistics on interesting events), should be very easy to add. Currently
user space requests for statistics by passing the cgroup file
descriptor. Statistics about the state of all the tasks in the cgroup
is returned to user space.
TODO's/NOTE:
This patch provides an infrastructure for implementing cgroup statistics.
Based on the needs of each controller, we can incrementally add more statistics,
event based support for notification of statistics, accumulation of taskstats
into cgroup statistics in the future.
Sample output
# ./cgroupstats -C /cgroup/a
sleeping 2, blocked 0, running 1, stopped 0, uninterruptible 0
# ./cgroupstats -C /cgroup/
sleeping 154, blocked 0, running 0, stopped 0, uninterruptible 0
If the approach looks good, I'll enhance and post the user space utility for
the same
Feedback, comments, test results are always welcome!
[akpm@linux-foundation.org: build fix]
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: Jay Lan <jlan@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 13:39:44 +07:00
|
|
|
delayacct_set_flag(DELAYACCT_PF_BLKIO);
|
2006-07-14 14:24:37 +07:00
|
|
|
if (current->delays)
|
|
|
|
|
__delayacct_blkio_start();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void delayacct_blkio_end(void)
|
|
|
|
|
{
|
|
|
|
|
if (current->delays)
|
|
|
|
|
__delayacct_blkio_end();
|
Add cgroupstats
This patch is inspired by the discussion at
http://lkml.org/lkml/2007/4/11/187 and implements per cgroup statistics
as suggested by Andrew Morton in http://lkml.org/lkml/2007/4/11/263. The
patch is on top of 2.6.21-mm1 with Paul's cgroups v9 patches (forward
ported)
This patch implements per cgroup statistics infrastructure and re-uses
code from the taskstats interface. A new set of cgroup operations are
registered with commands and attributes. It should be very easy to
*extend* per cgroup statistics, by adding members to the cgroupstats
structure.
The current model for cgroupstats is a pull, a push model (to post
statistics on interesting events), should be very easy to add. Currently
user space requests for statistics by passing the cgroup file
descriptor. Statistics about the state of all the tasks in the cgroup
is returned to user space.
TODO's/NOTE:
This patch provides an infrastructure for implementing cgroup statistics.
Based on the needs of each controller, we can incrementally add more statistics,
event based support for notification of statistics, accumulation of taskstats
into cgroup statistics in the future.
Sample output
# ./cgroupstats -C /cgroup/a
sleeping 2, blocked 0, running 1, stopped 0, uninterruptible 0
# ./cgroupstats -C /cgroup/
sleeping 154, blocked 0, running 0, stopped 0, uninterruptible 0
If the approach looks good, I'll enhance and post the user space utility for
the same
Feedback, comments, test results are always welcome!
[akpm@linux-foundation.org: build fix]
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: Jay Lan <jlan@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 13:39:44 +07:00
|
|
|
delayacct_clear_flag(DELAYACCT_PF_BLKIO);
|
2006-07-14 14:24:37 +07:00
|
|
|
}
|
|
|
|
|
|
2006-07-14 14:24:41 +07:00
|
|
|
static inline int delayacct_add_tsk(struct taskstats *d,
|
|
|
|
|
struct task_struct *tsk)
|
|
|
|
|
{
|
2006-07-30 17:03:11 +07:00
|
|
|
if (!delayacct_on || !tsk->delays)
|
2006-07-14 14:24:41 +07:00
|
|
|
return 0;
|
|
|
|
|
return __delayacct_add_tsk(d, tsk);
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-14 14:24:43 +07:00
|
|
|
static inline __u64 delayacct_blkio_ticks(struct task_struct *tsk)
|
|
|
|
|
{
|
|
|
|
|
if (tsk->delays)
|
|
|
|
|
return __delayacct_blkio_ticks(tsk);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-25 15:48:52 +07:00
|
|
|
static inline void delayacct_freepages_start(void)
|
|
|
|
|
{
|
|
|
|
|
if (current->delays)
|
|
|
|
|
__delayacct_freepages_start();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline void delayacct_freepages_end(void)
|
|
|
|
|
{
|
|
|
|
|
if (current->delays)
|
|
|
|
|
__delayacct_freepages_end();
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-14 14:24:36 +07:00
|
|
|
#else
|
|
|
|
|
static inline void delayacct_set_flag(int flag)
|
|
|
|
|
{}
|
|
|
|
|
static inline void delayacct_clear_flag(int flag)
|
|
|
|
|
{}
|
|
|
|
|
static inline void delayacct_init(void)
|
|
|
|
|
{}
|
|
|
|
|
static inline void delayacct_tsk_init(struct task_struct *tsk)
|
|
|
|
|
{}
|
2006-09-01 11:27:38 +07:00
|
|
|
static inline void delayacct_tsk_free(struct task_struct *tsk)
|
2006-07-14 14:24:36 +07:00
|
|
|
{}
|
2006-07-14 14:24:37 +07:00
|
|
|
static inline void delayacct_blkio_start(void)
|
|
|
|
|
{}
|
|
|
|
|
static inline void delayacct_blkio_end(void)
|
|
|
|
|
{}
|
2006-07-14 14:24:41 +07:00
|
|
|
static inline int delayacct_add_tsk(struct taskstats *d,
|
|
|
|
|
struct task_struct *tsk)
|
|
|
|
|
{ return 0; }
|
2006-07-14 14:24:43 +07:00
|
|
|
static inline __u64 delayacct_blkio_ticks(struct task_struct *tsk)
|
|
|
|
|
{ return 0; }
|
Add cgroupstats
This patch is inspired by the discussion at
http://lkml.org/lkml/2007/4/11/187 and implements per cgroup statistics
as suggested by Andrew Morton in http://lkml.org/lkml/2007/4/11/263. The
patch is on top of 2.6.21-mm1 with Paul's cgroups v9 patches (forward
ported)
This patch implements per cgroup statistics infrastructure and re-uses
code from the taskstats interface. A new set of cgroup operations are
registered with commands and attributes. It should be very easy to
*extend* per cgroup statistics, by adding members to the cgroupstats
structure.
The current model for cgroupstats is a pull, a push model (to post
statistics on interesting events), should be very easy to add. Currently
user space requests for statistics by passing the cgroup file
descriptor. Statistics about the state of all the tasks in the cgroup
is returned to user space.
TODO's/NOTE:
This patch provides an infrastructure for implementing cgroup statistics.
Based on the needs of each controller, we can incrementally add more statistics,
event based support for notification of statistics, accumulation of taskstats
into cgroup statistics in the future.
Sample output
# ./cgroupstats -C /cgroup/a
sleeping 2, blocked 0, running 1, stopped 0, uninterruptible 0
# ./cgroupstats -C /cgroup/
sleeping 154, blocked 0, running 0, stopped 0, uninterruptible 0
If the approach looks good, I'll enhance and post the user space utility for
the same
Feedback, comments, test results are always welcome!
[akpm@linux-foundation.org: build fix]
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Cc: Paul Menage <menage@google.com>
Cc: Jay Lan <jlan@engr.sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-19 13:39:44 +07:00
|
|
|
static inline int delayacct_is_task_waiting_on_io(struct task_struct *p)
|
|
|
|
|
{ return 0; }
|
2008-07-25 15:48:52 +07:00
|
|
|
static inline void delayacct_freepages_start(void)
|
|
|
|
|
{}
|
|
|
|
|
static inline void delayacct_freepages_end(void)
|
|
|
|
|
{}
|
|
|
|
|
|
2006-07-14 14:24:36 +07:00
|
|
|
#endif /* CONFIG_TASK_DELAY_ACCT */
|
|
|
|
|
|
|
|
|
|
#endif
|