X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvs_memory.h;h=e80b5334cf7cafd6d1c2878c556fac37e8d5697c;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=35e8d3442c03362bd0acdbbf9d7800df522378ec;hpb=76828883507a47dae78837ab5dec5a5b4513c667;p=linux-2.6.git

diff --git a/include/linux/vs_memory.h b/include/linux/vs_memory.h
index 35e8d3442..e80b5334c 100644
--- a/include/linux/vs_memory.h
+++ b/include/linux/vs_memory.h
@@ -1,52 +1,55 @@
-#ifndef _VX_VS_MEMORY_H
-#define _VX_VS_MEMORY_H
+#ifndef _VS_MEMORY_H
+#define _VS_MEMORY_H
 
 #include "vserver/limit.h"
+#include "vserver/base.h"
+#include "vserver/context.h"
 #include "vserver/debug.h"
+#include "vserver/context.h"
 #include "vserver/limit_int.h"
 
 
-#define __vx_add_long(a,v)	(*(v) += (a))
-#define __vx_inc_long(v)	(++*(v))
-#define __vx_dec_long(v)	(--*(v))
+#define __acc_add_long(a,v)	(*(v) += (a))
+#define __acc_inc_long(v)	(++*(v))
+#define __acc_dec_long(v)	(--*(v))
 
 #if	NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS
-#define __vx_add_value(a,v)	atomic_long_add(a,v)
-#define __vx_inc_value(v)	atomic_long_inc(v)
-#define __vx_dec_value(v)	atomic_long_dec(v)
+#define __acc_add_atomic(a,v)	atomic_long_add(a,v)
+#define __acc_inc_atomic(v)	atomic_long_inc(v)
+#define __acc_dec_atomic(v)	atomic_long_dec(v)
 #else  /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
-#define __vx_add_value(a,v)	__vx_add_long(a,v)
-#define __vx_inc_value(v)	__vx_inc_long(v)
-#define __vx_dec_value(v)	__vx_dec_long(v)
+#define __acc_add_atomic(a,v)	__acc_add_long(a,v)
+#define __acc_inc_atomic(v)	__acc_inc_long(v)
+#define __acc_dec_atomic(v)	__acc_dec_long(v)
 #endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
 
 
 #define vx_acc_page(m,d,v,r) do {					\
 	if ((d) > 0)							\
-		__vx_inc_long(&(m->v));					\
+		__acc_inc_long(&(m->v));				\
 	else								\
-		__vx_dec_long(&(m->v));					\
+		__acc_dec_long(&(m->v));				\
 	__vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__);	\
 } while (0)
 
 #define vx_acc_page_atomic(m,d,v,r) do {				\
 	if ((d) > 0)							\
-		__vx_inc_value(&(m->v));				\
+		__acc_inc_atomic(&(m->v));				\
 	else								\
-		__vx_dec_value(&(m->v));				\
+		__acc_dec_atomic(&(m->v));				\
 	__vx_acc_cres(m->mm_vx_info, r, d, m, __FILE__, __LINE__);	\
 } while (0)
 
 
 #define vx_acc_pages(m,p,v,r) do {					\
 	unsigned long __p = (p);					\
-	__vx_add_long(__p, &(m->v));					\
+	__acc_add_long(__p, &(m->v));					\
 	__vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__);	\
 } while (0)
 
 #define vx_acc_pages_atomic(m,p,v,r) do {				\
 	unsigned long __p = (p);					\
-	__vx_add_value(__p, &(m->v));					\
+	__acc_add_atomic(__p, &(m->v));					\
 	__vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__);	\
 } while (0)
 
@@ -57,7 +60,7 @@
 #define vx_acc_vmlpage(m,d) \
 	vx_acc_page(m, d, locked_vm, RLIMIT_MEMLOCK)
 #define vx_acc_file_rsspage(m,d) \
-	vx_acc_page_atomic(m, d, _file_rss, RLIMIT_RSS)
+	vx_acc_page_atomic(m, d, _file_rss, VLIMIT_MAPPED)
 #define vx_acc_anon_rsspage(m,d) \
 	vx_acc_page_atomic(m, d, _anon_rss, VLIMIT_ANON)
 
@@ -66,7 +69,7 @@
 #define vx_acc_vmlpages(m,p) \
 	vx_acc_pages(m, p, locked_vm, RLIMIT_MEMLOCK)
 #define vx_acc_file_rsspages(m,p) \
-	vx_acc_pages_atomic(m, p, _file_rss, RLIMIT_RSS)
+	vx_acc_pages_atomic(m, p, _file_rss, VLIMIT_MAPPED)
 #define vx_acc_anon_rsspages(m,p) \
 	vx_acc_pages_atomic(m, p, _anon_rss, VLIMIT_ANON)
 
@@ -99,8 +102,57 @@
 
 #define vx_vmpages_avail(m,p)	vx_pages_avail(m, p, RLIMIT_AS)
 #define vx_vmlocked_avail(m,p)	vx_pages_avail(m, p, RLIMIT_MEMLOCK)
-#define vx_rsspages_avail(m,p)	vx_pages_avail(m, p, RLIMIT_RSS)
-#define vx_anonpages_avail(m,p)	vx_pages_avail(m, p, VLIMIT_ANON)
+#define vx_anon_avail(m,p)	vx_pages_avail(m, p, VLIMIT_ANON)
+#define vx_mapped_avail(m,p)	vx_pages_avail(m, p, VLIMIT_MAPPED)
+
+#define vx_rss_avail(m,p) \
+	__vx_cres_array_avail((m)->mm_vx_info, VLA_RSS, p, __FILE__, __LINE__)
+
+
+enum {
+	VXPT_UNKNOWN = 0,
+	VXPT_ANON,
+	VXPT_NONE,
+	VXPT_FILE,
+	VXPT_SWAP,
+	VXPT_WRITE
+};
+
+#if 0
+#define	vx_page_fault(mm,vma,type,ret)
+#else
+
+static inline
+void __vx_page_fault(struct mm_struct *mm,
+	struct vm_area_struct *vma, int type, int ret)
+{
+	struct vx_info *vxi = mm->mm_vx_info;
+	int what;
+/*
+	static char *page_type[6] =
+		{ "UNKNOWN", "ANON","NONE", "FILE", "SWAP", "WRITE" };
+	static char *page_what[4] =
+		{ "FAULT_OOM", "FAULT_SIGBUS", "FAULT_MINOR", "FAULT_MAJOR" };
+*/
+
+	if (!vxi)
+		return;
+
+	what = (ret & 0x3);
+
+/*	printk("[%d] page[%d][%d] %2x %s %s\n", vxi->vx_id,
+		type, what, ret, page_type[type], page_what[what]);
+*/
+	if (ret & VM_FAULT_WRITE)
+		what |= 0x4;
+	atomic_inc(&vxi->cacct.page[type][what]);
+}
+
+#define	vx_page_fault(mm,vma,type,ret)	__vx_page_fault(mm,vma,type,ret)
+#endif
+
+
+extern unsigned long vx_badness(struct task_struct *task, struct mm_struct *mm);
 
 #else
 #warning duplicate inclusion