tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

memcgroup: fix and update documentation

- remove trailing " Bytes"s in the demonstration
- remove section 4.4 (feature control_type has been removed)
- fix reference section

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Acked-by: Balbir Singh <balbir@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Li Zefan and committed by Linus Torvalds 2324c5dd bc231d2a

+9 -15
unified split
+9 -15
Documentation/controllers/memory.txt
··· 170 170 mega or gigabytes. 171 171 172 172 # cat /cgroups/0/memory.limit_in_bytes 173 - 4194304 Bytes 173 + 4194304 174 174 175 175 NOTE: The interface has now changed to display the usage in bytes 176 176 instead of pages 177 177 178 178 We can check the usage: 179 179 # cat /cgroups/0/memory.usage_in_bytes 180 - 1216512 Bytes 180 + 1216512 181 181 182 182 A successful write to this file does not guarantee a successful set of 183 183 this limit to the value written into the file. This can be due to a ··· 187 187 188 188 # echo -n 1 > memory.limit_in_bytes 189 189 # cat memory.limit_in_bytes 190 - 4096 Bytes 190 + 4096 191 191 192 192 The memory.failcnt field gives the number of times that the cgroup limit was 193 193 exceeded. ··· 233 233 tasks have migrated away from it. Such charges are automatically dropped at 234 234 rmdir() if there are no tasks. 235 235 236 - 4.4 Choosing what to account -- Page Cache (unmapped) vs RSS (mapped)? 237 - 238 - The type of memory accounted by the cgroup can be limited to just 239 - mapped pages by writing "1" to memory.control_type field 240 - 241 - echo -n 1 > memory.control_type 242 - 243 236 5. TODO 244 237 245 238 1. Add support for accounting huge pages (as a separate controller) ··· 255 262 3. Emelianov, Pavel. Resource controllers based on process cgroups 256 263 http://lkml.org/lkml/2007/3/6/198 257 264 4. Emelianov, Pavel. RSS controller based on process cgroups (v2) 258 - http://lkml.org/lkml/2007/4/9/74 265 + http://lkml.org/lkml/2007/4/9/78 259 266 5. Emelianov, Pavel. RSS controller based on process cgroups (v3) 260 267 http://lkml.org/lkml/2007/5/30/244 261 268 6. Menage, Paul. Control Groups v10, http://lwn.net/Articles/236032/ 262 269 7. Vaidyanathan, Srinivasan, Control Groups: Pagecache accounting and control 263 270 subsystem (v3), http://lwn.net/Articles/235534/ 264 - 8. Singh, Balbir. RSS controller V2 test results (lmbench), 271 + 8. Singh, Balbir. RSS controller v2 test results (lmbench), 265 272 http://lkml.org/lkml/2007/5/17/232 266 - 9. Singh, Balbir. RSS controller V2 AIM9 results 273 + 9. Singh, Balbir. RSS controller v2 AIM9 results 267 274 http://lkml.org/lkml/2007/5/18/1 268 - 10. Singh, Balbir. Memory controller v6 results, 275 + 10. Singh, Balbir. Memory controller v6 test results, 269 276 http://lkml.org/lkml/2007/8/19/36 270 - 11. Singh, Balbir. Memory controller v6, http://lkml.org/lkml/2007/8/17/69 277 + 11. Singh, Balbir. Memory controller introduction (v6), 278 + http://lkml.org/lkml/2007/8/17/69 271 279 12. Corbet, Jonathan, Controlling memory use in cgroups, 272 280 http://lwn.net/Articles/243795/