Add cgroupstats (846c7bb0) · Commits · 戴 / test

Documentation/accounting/cgroupstats.txt

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		Control Groupstats 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.

		Per cgroup statistics infrastructure re-uses code from the taskstats
		interface. A new set of cgroup operations are registered with commands
		and attributes specific to cgroups. 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 path.
		Statistics about the state of all the tasks in the cgroup is returned to
		user space.

		NOTE: We currently rely on delay accounting for extracting information
		about tasks blocked on I/O. If CONFIG_TASK_DELAY_ACCT is disabled, this
		information will not be available.

		To extract cgroup statistics a utility very similar to getdelays.c
		has been developed, the sample output of the utility is shown below

		~/balbir/cgroupstats # ./getdelays -C "/cgroup/a"
		sleeping 1, blocked 0, running 1, stopped 0, uninterruptible 0
		~/balbir/cgroupstats # ./getdelays -C "/cgroup"
		sleeping 155, blocked 0, running 1, stopped 0, uninterruptible 2

include/linux/Kbuild

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ header-y += coda_psdev.h
		header-y += coff.h
		header-y += comstats.h
		header-y += const.h
		header-y += cgroupstats.h
		header-y += cycx_cfm.h
		header-y += dlm_device.h
		header-y += dlm_netlink.h

include/linux/cgroup.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include <linux/cpumask.h>
		#include <linux/nodemask.h>
		#include <linux/rcupdate.h>
		#include <linux/cgroupstats.h>

		#ifdef CONFIG_CGROUPS

		@@ -29,6 +30,8 @@ extern void cgroup_fork(struct task_struct *p);
		extern void cgroup_fork_callbacks(struct task_struct *p);
		extern void cgroup_post_fork(struct task_struct *p);
		extern void cgroup_exit(struct task_struct *p, int run_callbacks);
		extern int cgroupstats_build(struct cgroupstats *stats,
		struct dentry *dentry);

		extern struct file_operations proc_cgroup_operations;

		@@ -313,6 +316,11 @@ static inline void cgroup_exit(struct task_struct *p, int callbacks) {}

		static inline void cgroup_lock(void) {}
		static inline void cgroup_unlock(void) {}
		static inline int cgroupstats_build(struct cgroupstats *stats,
		struct dentry *dentry)
		{
		return -EINVAL;
		}

		#endif /* !CONFIG_CGROUPS */

include/linux/cgroupstats.h

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		/* cgroupstats.h - exporting per-cgroup statistics
		*
		* Copyright IBM Corporation, 2007
		* Author Balbir Singh <balbir@linux.vnet.ibm.com>
		*
		* This program is free software; you can redistribute it and/or modify it
		* under the terms of version 2.1 of the GNU Lesser General Public License
		* as published by the Free Software Foundation.
		*
		* This program is distributed in the hope that it would be useful, but
		* WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
		*/

		#ifndef _LINUX_CGROUPSTATS_H
		#define _LINUX_CGROUPSTATS_H

		#include <linux/taskstats.h>

		/*
		* Data shared between user space and kernel space on a per cgroup
		* basis. This data is shared using taskstats.
		*
		* Most of these states are derived by looking at the task->state value
		* For the nr_io_wait state, a flag in the delay accounting structure
		* indicates that the task is waiting on IO
		*
		* Each member is aligned to a 8 byte boundary.
		*/
		struct cgroupstats {
		__u64 nr_sleeping; /* Number of tasks sleeping */
		__u64 nr_running; /* Number of tasks running */
		__u64 nr_stopped; /* Number of tasks in stopped state */
		__u64 nr_uninterruptible; /* Number of tasks in uninterruptible */
		/* state */
		__u64 nr_io_wait; /* Number of tasks waiting on IO */
		};

		/*
		* Commands sent from userspace
		* Not versioned. New commands should only be inserted at the enum's end
		* prior to __CGROUPSTATS_CMD_MAX
		*/

		enum {
		CGROUPSTATS_CMD_UNSPEC = __TASKSTATS_CMD_MAX, /* Reserved */
		CGROUPSTATS_CMD_GET, /* user->kernel request/get-response */
		CGROUPSTATS_CMD_NEW, /* kernel->user event */
		__CGROUPSTATS_CMD_MAX,
		};

		#define CGROUPSTATS_CMD_MAX (__CGROUPSTATS_CMD_MAX - 1)

		enum {
		CGROUPSTATS_TYPE_UNSPEC = 0, /* Reserved */
		CGROUPSTATS_TYPE_CGROUP_STATS, /* contains name + stats */
		__CGROUPSTATS_TYPE_MAX,
		};

		#define CGROUPSTATS_TYPE_MAX (__CGROUPSTATS_TYPE_MAX - 1)

		enum {
		CGROUPSTATS_CMD_ATTR_UNSPEC = 0,
		CGROUPSTATS_CMD_ATTR_FD,
		__CGROUPSTATS_CMD_ATTR_MAX,
		};

		#define CGROUPSTATS_CMD_ATTR_MAX (__CGROUPSTATS_CMD_ATTR_MAX - 1)

		#endif /* _LINUX_CGROUPSTATS_H */

include/linux/delayacct.h

+13 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		* Used to set current->delays->flags
		*/
		#define DELAYACCT_PF_SWAPIN 0x00000001 /* I am doing a swapin */
		#define DELAYACCT_PF_BLKIO 0x00000002 /* I am waiting on IO */

		#ifdef CONFIG_TASK_DELAY_ACCT

		@@ -39,6 +40,14 @@ extern void __delayacct_blkio_end(void);
		extern int __delayacct_add_tsk(struct taskstats , struct task_struct );
		extern __u64 __delayacct_blkio_ticks(struct task_struct *);

		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;
		}

		static inline void delayacct_set_flag(int flag)
		{
		if (current->delays)
		@@ -71,6 +80,7 @@ static inline void delayacct_tsk_free(struct task_struct *tsk)

		static inline void delayacct_blkio_start(void)
		{
		delayacct_set_flag(DELAYACCT_PF_BLKIO);
		if (current->delays)
		__delayacct_blkio_start();
		}
		@@ -79,6 +89,7 @@ static inline void delayacct_blkio_end(void)
		{
		if (current->delays)
		__delayacct_blkio_end();
		delayacct_clear_flag(DELAYACCT_PF_BLKIO);
		}

		static inline int delayacct_add_tsk(struct taskstats *d,
		@@ -116,6 +127,8 @@ static inline int delayacct_add_tsk(struct taskstats *d,
		{ return 0; }
		static inline __u64 delayacct_blkio_ticks(struct task_struct *tsk)
		{ return 0; }
		static inline int delayacct_is_task_waiting_on_io(struct task_struct *p)
		{ return 0; }
		#endif /* CONFIG_TASK_DELAY_ACCT */

		#endif

Admin message