- Containers: Generic Linux kernel changes
Subsystems (10)
This patch contains changes to generic part of kernel code. These changes tracks events like new task creating, task's exit, new page allocation (both file and anonymous) etc.
Signed-off-by Rohit Seth <[email protected]>
fs/inode.c | 3 +++ include/linux/fs.h | 5 +++++ include/linux/mm_inline.h | 4 ++++ include/linux/mm_types.h | 4 ++++ include/linux/sched.h | 6 ++++++ kernel/Makefile | 1 + kernel/exit.c | 2 ++ kernel/fork.c | 8 ++++++++ mm/Kconfig | 8 ++++++++ mm/Makefile | 2 ++ mm/filemap.c | 4 ++++ mm/page_alloc.c | 3 +++ mm/rmap.c | 8 +++++++- mm/swap.c | 1 + mm/vmscan.c | 1 + 15 files changed, 59 insertions(+), 1 deletion(-)
include/linux/mm_inline.h +4 -0
@@ -1,9 +1,11 @@ +#include <linux/container.h> static inline void add_page_to_active_list (struct zone *zone,struct page *page) {list_add (&page->lru, &zone->active_list); zone->nr_active++; +container_inc_activepage_count (page); } static inline void
@@ -23,6 +25,7 @@static inline void del_page_from_active_list (struct zone *zone,struct page *page) { +container_dec_activepage_count (page);list_del (&page->lru); zone->nr_active--; }
@@ -41,6 +44,7 @@if (PageActive (page)) {__ClearPageActive (page); zone->nr_active--; +container_dec_activepage_count (page); }else { zone->nr_inactive--; }
include/linux/fs.h +5 -0
@@ -449,6 +449,7 @@ };struct backing_dev_info ; +struct container_struct ;struct address_space {struct inode *host;/* owner: inode, block_device */ struct radix_tree_root page_tree;/* radix tree of all pages */
@@ -465,6 +466,10 @@struct backing_dev_info *backing_dev_info;/* device readahead, etc */ spinlock_t private_lock;/* for use by the address_space */ struct list_head private_list;/* ditto */ +#ifdef CONFIG_CONTAINERS +struct container_struct *ctn;/* Pointer to container */ +struct list_head ctn_mapping_list;/* List of files belonging to same container*/ +#endif struct address_space *assoc_mapping;/* ditto */ } __attribute__((aligned(sizeof(long))));/*
include/linux/sched.h +6 -0
@@ -298,6 +298,8 @@ (mm)->hiwater_vm = (mm)->total_vm; \ }while (0 ) +struct container_struct; +struct mm_struct {struct vm_area_struct * mmap;/* list of VMAs */ struct rb_root mm_rb;
@@ -1046,6 +1048,10 @@#ifdef CONFIG_TASK_DELAY_ACCT struct task_delay_info *delays;#endif +#ifdef CONFIG_CONTAINERS +struct container_struct *ctn; +struct list_head ctn_task_list;/*List of processes belonging to container */ +#endif };static inline pid_t process_group (struct task_struct *tsk)
include/linux/mm_types.h +4 -0
@@ -6,6 +6,7 @@#include <linux/list.h> #include <linux/spinlock.h> +struct container_struct ;struct address_space ;/*
@@ -48,6 +49,9 @@struct list_head lru;/* Pageout list, eg. active_list * protected by zone->lru_lock ! */ +#ifdef CONFIG_CONTAINERS +struct container_struct *ctn;/* Pointer to container, may be NULL */ +#endif /* * On machines where all RAM is mapped into kernel address space, * we can simply calculate the virtual address. On machines with
mm/filemap.c +4 -0
@@ -30,6 +30,7 @@#include <linux/security.h> #include <linux/syscalls.h> #include <linux/cpuset.h> +#include <linux/container.h> #include "filemap.h" #include "internal.h"
@@ -126,6 +127,7 @@ page->mapping =NULL ; mapping->nrpages--;__dec_zone_page_state (page,NR_FILE_PAGES ); +container_dec_filepage_count (page); }EXPORT_SYMBOL (__remove_from_page_cache);
@@ -461,6 +463,8 @@ }write_unlock_irq (&mapping->tree_lock);radix_tree_preload_end (); +if (!error) +container_inc_filepage_count (mapping, page); }return error; }
mm/Kconfig +8 -0
@@ -242,3 +242,11 @@ - have the danger of readahead thrashing(i.e. memory tight) This feature is only available on non-NUMA systems. + +config CONTAINERS + bool "Containers" + def_bool y + depends on CONFIGFS_FS + help + This option allows grouping of resources like memory and tasks. It + depends on CONFIGFS_FS support in psuedo filesystem.
mm/Makefile +2 -0
@@ -29,3 +29,5 @@ obj-$(CONFIG_FS_XIP) += filemap_xip.o obj-$(CONFIG_MIGRATION) += migrate.o obj-$(CONFIG_SMP) += allocpercpu.o +obj-$(CONFIG_CONTAINERS) += container.o container_mm.o +
mm/page_alloc.c +3 -0
@@ -39,6 +39,7 @@#include <linux/stop_machine.h> #include <linux/sort.h> #include <linux/pfn.h> +#include <linux/container.h> #include <asm/tlbflush.h> #include <asm/div64.h>
@@ -502,6 +503,7 @@ zone->pages_scanned =0 ;__free_one_page (page, zone ,order);spin_unlock (&zone->lock); +container_init_page_ptr (page,NULL ); }static void __free_pages_ok (struct page *page,unsigned int order)
@@ -798,6 +800,7 @@arch_free_page (page,0 ); +container_init_page_ptr (page,NULL );if (PageAnon (page)) page->mapping =NULL ;if (free_pages_check (page))
mm/rmap.c +7 -1
@@ -53,6 +53,7 @@#include <linux/rmap.h> #include <linux/rcupdate.h> #include <linux/module.h> +#include <linux/container.h> #include <asm/tlbflush.h>
@@ -521,6 +522,7 @@* interrupts because it is not modified via interrupt. */ __inc_zone_page_state (page,NR_ANON_PAGES ); +container_inc_page_count (page); }/**
@@ -563,8 +565,10 @@*/ void page_add_file_rmap (struct page *page) { -if (atomic_inc_and_test (&page->_mapcount)) +if (atomic_inc_and_test (&page->_mapcount)) {__inc_zone_page_state (page,NR_FILE_MAPPED ); +container_inc_page_count (page); + } }/**
@@ -598,6 +602,8 @@set_page_dirty (page);__dec_zone_page_state (page,PageAnon (page) ?NR_ANON_PAGES :NR_FILE_MAPPED ); +container_dec_page_count (page); + } }
mm/swap.c +1 -0
@@ -196,6 +196,7 @@struct pagevec *pvec = &get_cpu_var (lru_add_active_pvecs);page_cache_get (page); +container_init_page_ptr (page, current);if (!pagevec_add (pvec, page))__pagevec_lru_add_active (pvec);put_cpu_var (lru_add_active_pvecs);
mm/vmscan.c +1 -0
@@ -818,6 +818,7 @@SetPageLRU (page);VM_BUG_ON (!PageActive (page));ClearPageActive (page); +container_dec_activepage_count (page);list_move (&page->lru, &zone->inactive_list); pgmoved++;
kernel/exit.c +2 -0
@@ -41,6 +41,7 @@#include <linux/audit.h> /* for audit_free() */ #include <linux/resource.h> #include <linux/blkdev.h> +#include <linux/container.h> #include <asm/uaccess.h> #include <asm/unistd.h>
@@ -957,6 +958,7 @@if (tsk->splice_pipe)__free_pipe_info (tsk->splice_pipe); +container_remove_task (tsk,NULL );preempt_disable ();/* causes final put_task_struct in finish_task_switch(). */
kernel/fork.c +8 -0
@@ -47,6 +47,7 @@#include <linux/cn_proc.h> #include <linux/delayacct.h> #include <linux/taskstats_kern.h> +#include <linux/container.h> #include <linux/random.h> #include <asm/pgtable.h>
@@ -175,6 +176,13 @@ } *tsk = *orig; + +container_init_task_ptr (tsk); +if (container_add_task (tsk, orig, orig->ctn) == -ENOSPC ) { +free_task_struct (tsk); +free_thread_info (ti); +return NULL ; + } tsk->thread_info = ti;setup_thread_stack (tsk, orig);
kernel/Makefile +1 -0
@@ -52,6 +52,7 @@ obj-$(CONFIG_UTS_NS) += utsname.o obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o +obj-$(CONFIG_CONTAINERS) += container_configfs.o ifneq ($(CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER),y) # According to Alan Modra <[email protected]>, the -fno-omit-frame-pointer is
fs/inode.c +3 -0
@@ -22,6 +22,7 @@#include <linux/bootmem.h> #include <linux/inotify.h> #include <linux/mount.h> +#include <linux/container.h> /* * This is needed for the following functions:
@@ -164,6 +165,7 @@ } inode->i_private =0 ; inode->i_mapping = mapping; +container_add_file (mapping,NULL ); }return inode; }
@@ -172,6 +174,7 @@ {BUG_ON (inode_has_buffers (inode));security_inode_free (inode); +container_remove_file (inode->i_mapping);if (inode->i_sb->s_op->destroy_inode) inode->i_sb->s_op->destroy_inode (inode);else