Balbir Singh
d69b042f3d
memcg: add file-based RSS accounting ...
Add file RSS tracking per memory cgroup
We currently don't track file RSS, the RSS we report is actually anon RSS.
All the file mapped pages, come in through the page cache and get
accounted there. This patch adds support for accounting file RSS pages.
It should
1. Help improve the metrics reported by the memory resource controller
2. Will form the basis for a future shared memory accounting heuristic
that has been proposed by Kamezawa.
Unfortunately, we cannot rename the existing "rss" keyword used in
memory.stat to "anon_rss". We however, add "mapped_file" data and hope to
educate the end user through documentation.
[hugh.dickins@tiscali.co.uk: fix mem_cgroup_update_mapped_file_stat oops]
Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Li Zefan <lizf@cn.fujitsu.cn>
Cc: Paul Menage <menage@google.com>
Cc: Dhaval Giani <dhaval@linux.vnet.ibm.com>
Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
Cc: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-06-18 13:03:47 -07:00
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
2009-06-14 13:42:43 -07:00
pca953x: support GPIOLIB GPIO naming
2009-06-18 13:03:44 -07:00
isdn: rename capi_ctr_reseted() to capi_ctr_down()
2009-06-08 00:45:50 -07:00
mfd: fix tmio related warnings
2009-06-17 19:41:52 +02:00
IB/mlx4: Add strong ordering to local inval and fast reg work requests
2009-06-05 10:36:24 -07:00
V4L/DVB (11239): sdio: add cards ids for sms (Siano Mobile Silicon) MDTV receivers
2009-06-16 19:14:16 -03:00
UBI: add notification API
2009-06-02 13:53:35 +03:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2009-06-11 16:00:49 +02:00
switch rqst_exp_parent()
2009-06-11 21:36:00 -04:00
regulator/max1586: support increased V3 voltage range
2009-06-15 11:18:26 +01:00
spi: move more spi_setup() functionality into core
2009-06-18 13:03:42 -07:00
USB: Change names of SuperSpeed ep companion descriptor structs.
2009-06-15 21:44:50 -07:00
wimax/i2400m: rename misleading I2400M_PL_PAD to I2400M_PL_ALIGN
2009-06-11 03:30:20 -07:00
Cleanup of adfs headers
2009-06-17 00:36:36 -04:00
block: Add bio_list_peek()
2009-06-15 16:47:21 +10:00
block: Introduce helper to reset queue limits to default values
2009-06-16 08:23:52 +02:00
tracing/events: convert block trace points to TRACE_EVENT(), fix !CONFIG_BLOCK
2009-06-10 11:55:06 +02:00
headers: move module_bug_finalize()/module_bug_cleanup() definitions into module.h
2009-06-16 19:47:48 -07:00
c2port: annotate bitfield for kmemcheck
2009-06-15 15:49:34 +02:00
cb710: more cleanup for the DEBUG case.
2009-06-13 22:42:59 +02:00
fs: Remove i_cindex from struct inode
2009-06-11 21:36:09 -04:00
[ARM] 5536/1: Move clk_add_alias() to arch/arm/common/clkdev.c
2009-06-04 17:45:43 +01:00
module_param: add __same_type convenience wrapper for __builtin_types_compatible_p
2009-06-12 21:46:57 +09:30
cpumask: introduce zalloc_cpumask_var
2009-06-09 22:30:26 +09:30
cpuset,mm: update tasks' mems_allowed in time
2009-06-16 19:47:31 -07:00
linux/magic.h: move cramfs magic out of cramfs_fs.h
2009-06-11 21:36:10 -04:00
tty: cyclades, remove typedefs
2009-06-11 08:50:57 -07:00
dcache: extrace and use d_unlinked()
2009-06-11 21:36:06 -04:00
Driver Core: add nodename callbacks
2009-06-15 21:30:25 -07:00
dnotify: reimplement dnotify using fsnotify
2009-06-11 14:57:53 -04:00
[IA64] Convert ia64 to use int-ll64.h
2009-06-17 09:33:49 -07:00
eisa: remove driver_data direct access of struct device
2009-06-15 21:30:26 -07:00
e1000e: Expose MDI-X status via ethtool change
2009-06-09 05:25:36 -07:00
fbdev: blackfin has __raw I/O accessors, so use them in fb.h
2009-06-16 19:48:01 -07:00
firewire: core: use more outbound tlabels
2009-06-14 14:23:42 +02:00
firmware_map: fix hang with x86/32bit
2009-06-16 19:47:28 -07:00
firmware: FIRMWARE_NAME_MAX removal
2009-06-15 21:30:25 -07:00
Merge branch 'akpm'
2009-06-16 19:50:13 -07:00
mpc52xx_psc_spi: convert to cs_control callback
2009-06-18 13:03:42 -07:00
fsnotify: move events should indicate the event was on a child
2009-06-11 14:57:54 -04:00
inotify: reimplement inotify using fsnotify
2009-06-11 14:57:54 -04:00
CUSE: implement CUSE - Character device in Userspace
2009-06-09 11:24:11 +02:00
Driver Core: block: add nodename support for block drivers.
2009-06-15 21:30:25 -07:00
Merge branch 'akpm'
2009-06-16 19:50:13 -07:00
mm: check the argument of kunmap on architectures without highmem
2009-06-16 19:47:41 -07:00
clocksource: prevent selection of low resolution clocksourse also for nohz=on
2009-06-13 12:00:26 +02:00
mm: introduce PageHuge() for testing huge/gigantic pages
2009-06-16 19:47:36 -07:00
i2c-ocores: Can add I2C devices to the bus
2009-06-13 10:39:28 +01:00
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
2009-06-11 10:00:03 -07:00
cfg80211: use key size constants
2009-06-03 14:05:10 -04:00
Add constants for the ieee 802.15.4 stack
2009-06-09 05:25:30 -07:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
fbdev: move logo externs to header file
2009-06-16 19:47:57 -07:00
mm: consolidate init_mm definition
2009-06-16 19:47:28 -07:00
Merge commit 'linus/master' into HEAD
2009-06-15 15:50:49 +02:00
block: prevent possible io_context->refcount overflow
2009-06-10 23:07:15 +02:00
x86: remove some alloc_bootmem_cpumask_var calling
2009-06-11 19:27:07 +03:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
2009-06-16 12:57:37 -07:00
softirq: introduce statistics for softirq
2009-06-18 13:03:40 -07:00
keyboard: advertise KT_DEAD2 extended diacriticals
2009-06-14 13:50:36 -07:00
kmemcheck: introduce bitfield API
2009-06-15 15:49:23 +02:00
kmemleak: Add the base support
2009-06-11 17:03:28 +01:00
KVM: Make kvm header C++ friendly
2009-06-10 11:48:39 +03:00
KVM: protect assigned dev workqueue, int handler and irq acker
2009-06-10 11:48:53 +03:00
KVM: APIC: get rid of deliver_bitmask
2009-06-10 11:48:27 +03:00
lguest: improve interrupt handling, speed up stream networking
2009-06-12 22:27:03 +09:30
lguest: remove obsolete LHREQ_BREAK call
2009-06-12 22:27:11 +09:30
fbdev: move logo externs to header file
2009-06-16 19:47:57 -07:00
lis3: add click function
2009-06-16 19:47:57 -07:00
list_nulls: add hlist_nulls_add_head and hlist_nulls_del
2009-06-13 12:28:57 +02:00
linux/magic.h: move cramfs magic out of cramfs_fs.h
2009-06-11 21:36:10 -04:00
drbd: add major number to major.h
2009-06-16 19:47:48 -07:00
mdio: Expose 10GBASE-T MDI-X status via ethtool
2009-06-11 02:47:10 -07:00
memcg: add file-based RSS accounting
2009-06-18 13:03:47 -07:00
mg_disk: seperate mg_disk.h again
2009-06-16 08:40:20 +02:00
Driver Core: misc: add nodename support for misc devices.
2009-06-15 21:30:25 -07:00
mISDN: cleanup mISDNhw.h
2009-06-11 19:05:32 +02:00
mm cleanup: shmem_file_setup: 'char *' -> 'const char *' for name argument
2009-06-16 19:47:44 -07:00
Merge branch 'akpm'
2009-06-16 19:50:13 -07:00
mm: remove CONFIG_UNEVICTABLE_LRU config option
2009-06-16 19:47:42 -07:00
headers: move module_bug_finalize()/module_bug_cleanup() definitions into module.h
2009-06-16 19:47:48 -07:00
module_param: allow 'bool' module_params to be bool, not just int.
2009-06-12 21:46:58 +09:30
fs: introduce mnt_clone_write
2009-06-11 21:36:02 -04:00
switch follow_down()
2009-06-11 21:36:01 -04:00
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
2009-06-15 03:02:23 -07:00
netdevice.h: Use frag list abstraction interfaces.
2009-06-09 00:17:27 -07:00
net: add NL802154 interface for configuration of 802.15.4 devices
2009-06-09 05:25:33 -07:00
NLS: update handling of Unicode
2009-06-15 21:44:43 -07:00
page allocator: use a pre-calculated value instead of num_online_nodes() in fast paths
2009-06-16 19:47:35 -07:00
net: introduce pre-up netdev notifier
2009-06-03 14:05:12 -04:00
Merge branches 'slab/documentation', 'slab/fixes', 'slob/cleanups' and 'slub/fixes' into for-linus
2009-06-17 08:30:15 +03:00
memcg: fix page_cgroup fatal error in FLATMEM
2009-06-12 11:00:54 +03:00
mm: remove CONFIG_UNEVICTABLE_LRU config option
2009-06-16 19:47:42 -07:00
parport: quickfix the proc registration bug
2009-06-02 09:53:22 -07:00
PCI: add power-state name strings
2009-06-15 21:44:44 -07:00
USB: xhci: BIOS handoff and HW initialization.
2009-06-15 21:44:48 -07:00
kmemleak: Remove some of the kmemleak false positives
2009-06-11 17:04:18 +01:00
perf_counter: Add forward/backward attribute ABI compatibility
2009-06-12 14:28:52 +02:00
driver core: Const-correct platform getbyname functions
2009-06-15 21:30:24 -07:00
PM core: rename suspend and resume functions
2009-06-12 21:32:31 +02:00
pnp: add PNP resource range checking function
2009-06-05 14:37:41 +00:00
poll: avoid extra wakeups in select/poll
2009-06-16 19:47:48 -07:00
Move junk from proc_fs.h to fs/proc/internal.h
2009-06-11 21:36:01 -04:00
fs/qnx4: sanitize includes
2009-06-11 21:36:12 -04:00
quota: Introduce writeout_quota_sb() (version 4)
2009-06-11 21:36:04 -04:00
radix-tree: add radix_tree_prev_hole()
2009-06-16 19:47:30 -07:00
lib: isolate rational fractions helper function
2009-06-11 08:51:08 -07:00
reiserfs: fix warnings with gcc 4.4
2009-06-18 13:03:46 -07:00
reiserfs: allow exposing privroot w/ xattrs enabled
2009-06-11 21:35:58 -04:00
rfkill: don't impose global states on resume (just restore the previous states)
2009-06-10 13:28:37 -04:00
trace: annotate bitfields in struct ring_buffer_event
2009-06-15 15:49:37 +02:00
vmscan: report vm_flags in page_referenced()
2009-06-16 19:47:44 -07:00
Merge branch 'akpm'
2009-06-16 19:50:13 -07:00
sctp: fix error cause codes of ADD-IP extension
2009-06-03 09:14:45 -04:00
security: use mmap_min_addr indepedently of security models
2009-06-04 12:07:48 +10:00
serial: refactor ASYNC_ flags
2009-06-11 08:50:58 -07:00
serial: Added Timberdale UART driver
2009-06-11 08:51:06 -07:00
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck
2009-06-16 13:09:51 -07:00
Merge commit 'linus/master' into HEAD
2009-06-15 15:50:49 +02:00
slab: move struct kmem_cache to headers
2009-06-13 08:58:43 +02:00
slab,slub: don't enable interrupts during early boot
2009-06-12 18:53:33 +03:00
slab,slub: don't enable interrupts during early boot
2009-06-12 18:53:33 +03:00
remove put_cpu_no_resched()
2009-06-16 19:47:48 -07:00
Add constants for the ieee 802.15.4 stack
2009-06-09 05:25:30 -07:00
spinlock: Add missing __raw_spin_lock_flags() stub for UP
2009-06-10 11:48:14 +02:00
stacktrace: add forward-declaration struct task_struct
2009-06-12 23:04:12 +02:00
PM/Hibernate: Move NVS routines into a seperate file (v2).
2009-06-12 21:32:33 +02:00
mm: remove file argument from swap_readpage()
2009-06-16 19:47:44 -07:00
syscalls.h: remove duplicated declarations for sys_pipe2
2009-06-16 19:47:52 -07:00
clocksource: prevent selection of low resolution clocksourse also for nohz=on
2009-06-13 12:00:26 +02:00
time: move PIT_TICK_RATE to linux/timex.h
2009-06-16 19:47:27 -07:00
tracing: add trace_seq_vprint interface
2009-06-09 15:17:32 -04:00
ptrace: tracehook_report_clone: fix false positives
2009-06-04 18:07:40 -07:00
debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
2009-06-15 21:30:28 -07:00
tty: rewrite the ldisc locking
2009-06-11 08:51:01 -07:00
tty: throttling race fix
2009-06-11 08:50:59 -07:00
Trivial: fix typo s/balence/balance/
2009-06-12 18:01:45 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
2009-06-16 13:06:10 -07:00
utsname.h: make new_utsname fields use the proper length constant
2009-06-16 19:47:47 -07:00
V4L/DVB (11970): gspca - ov519: Add support for the ov518 bridge.
2009-06-16 19:07:42 -03:00
virtio: add names to virtqueue struct, mapping from devices to queues.
2009-06-12 22:16:36 +09:30
Add serial number support for virtio_blk, V4a
2009-06-09 14:41:40 +02:00
virtio: teach virtio_has_feature() about transport features
2009-06-12 22:16:38 +09:30
virtio_pci: optional MSI-X support
2009-06-12 22:16:37 +09:30
virtio: indirect ring entries (VIRTIO_RING_F_INDIRECT_DESC)
2009-06-12 22:16:39 +09:30
drivers: add support for the TI VLYNQ bus
2009-06-16 19:47:52 -07:00
vmscan: count the number of times zone_reclaim() scans and fails
2009-06-16 19:47:46 -07:00
vfs: Make sys_sync() use fsync_super() (version 4)
2009-06-11 21:36:03 -04:00
