X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvs_memory.h;h=35e8d3442c03362bd0acdbbf9d7800df522378ec;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=0daed015b273612518382ad987af67efb01b1562;hpb=cee37fe97739d85991964371c1f3a745c00dd236;p=linux-2.6.git

diff --git a/include/linux/vs_memory.h b/include/linux/vs_memory.h
index 0daed015b..35e8d3442 100644
--- a/include/linux/vs_memory.h
+++ b/include/linux/vs_memory.h
@@ -1,61 +1,54 @@
 #ifndef _VX_VS_MEMORY_H
 #define _VX_VS_MEMORY_H
 
-
 #include "vserver/limit.h"
 #include "vserver/debug.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))
+
+#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)
+#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)
+#endif /* NR_CPUS < CONFIG_SPLIT_PTLOCK_CPUS */
+
+
+#define vx_acc_page(m,d,v,r) do {					\
+	if ((d) > 0)							\
+		__vx_inc_long(&(m->v));					\
+	else								\
+		__vx_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));				\
+	else								\
+		__vx_dec_value(&(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));					\
+	__vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__);	\
+} while (0)
 
-#define vx_acc_page(m,d,v,r) \
-	__vx_acc_page(&(m->v), m->mm_vx_info, r, d, __FILE__, __LINE__)
-
-static inline void __vx_acc_page(unsigned long *v, struct vx_info *vxi,
-		int res, int dir, char *file, int line)
-{
-	if (VXD_RLIMIT(res, RLIMIT_RSS) ||
-		VXD_RLIMIT(res, VLIMIT_ANON) ||
-		VXD_RLIMIT(res, RLIMIT_AS) ||
-		VXD_RLIMIT(res, RLIMIT_MEMLOCK))
-		vxlprintk(1, "vx_acc_page[%5d,%s,%2d]: %5d%s",
-			(vxi?vxi->vx_id:-1), vlimit_name[res], res,
-			(vxi?atomic_read(&vxi->limit.rcur[res]):0),
-			(dir?"++":"--"), file, line);
-	if (v) {
-		if (dir > 0)
-			++(*v);
-		else
-			--(*v);
-	}
-	if (vxi) {
-		if (dir > 0)
-			atomic_inc(&vxi->limit.rcur[res]);
-		else
-			atomic_dec(&vxi->limit.rcur[res]);
-	}
-}
-
-
-#define vx_acc_pages(m,p,v,r) \
-	__vx_acc_pages(&(m->v), m->mm_vx_info, r, p, __FILE__, __LINE__)
-
-static inline void __vx_acc_pages(unsigned long *v, struct vx_info *vxi,
-		int res, int pages, char *_file, int _line)
-{
-	if (VXD_RLIMIT(res, RLIMIT_RSS) ||
-		VXD_RLIMIT(res, VLIMIT_ANON) ||
-		VXD_RLIMIT(res, RLIMIT_AS) ||
-		VXD_RLIMIT(res, RLIMIT_MEMLOCK))
-		vxlprintk(1, "vx_acc_pages[%5d,%s,%2d]: %5d += %5d",
-			(vxi?vxi->vx_id:-1), vlimit_name[res], res,
-			(vxi?atomic_read(&vxi->limit.rcur[res]):0),
-			pages, _file, _line);
-	if (pages == 0)
-		return;
-	if (v)
-		*v += pages;
-	if (vxi)
-		atomic_add(pages, &vxi->limit.rcur[res]);
-}
+#define vx_acc_pages_atomic(m,p,v,r) do {				\
+	unsigned long __p = (p);					\
+	__vx_add_value(__p, &(m->v));					\
+	__vx_add_cres(m->mm_vx_info, r, __p, m, __FILE__, __LINE__);	\
+} while (0)
 
 
 
@@ -63,21 +56,21 @@ static inline void __vx_acc_pages(unsigned long *v, struct vx_info *vxi,
 	vx_acc_page(m, d, total_vm,  RLIMIT_AS)
 #define vx_acc_vmlpage(m,d) \
 	vx_acc_page(m, d, locked_vm, RLIMIT_MEMLOCK)
-#define vx_acc_rsspage(m,d) \
-	vx_acc_page(m, d, _rss,      RLIMIT_RSS)
+#define vx_acc_file_rsspage(m,d) \
+	vx_acc_page_atomic(m, d, _file_rss, RLIMIT_RSS)
 #define vx_acc_anon_rsspage(m,d) \
-	vx_acc_page(m, d, _anon_rss, VLIMIT_ANON)
+	vx_acc_page_atomic(m, d, _anon_rss, VLIMIT_ANON)
 
 #define vx_acc_vmpages(m,p) \
 	vx_acc_pages(m, p, total_vm,  RLIMIT_AS)
 #define vx_acc_vmlpages(m,p) \
 	vx_acc_pages(m, p, locked_vm, RLIMIT_MEMLOCK)
-#define vx_acc_rsspages(m,p) \
-	vx_acc_pages(m, p, _rss,      RLIMIT_RSS)
+#define vx_acc_file_rsspages(m,p) \
+	vx_acc_pages_atomic(m, p, _file_rss, RLIMIT_RSS)
 #define vx_acc_anon_rsspages(m,p) \
-	vx_acc_pages(m, p, _anon_rss, VLIMIT_ANON)
+	vx_acc_pages_atomic(m, p, _anon_rss, VLIMIT_ANON)
 
-#define vx_pages_add(s,r,p)	__vx_acc_pages(0, s, r, p, __FILE__, __LINE__)
+#define vx_pages_add(s,r,p)	__vx_add_cres(s, r, p, 0, __FILE__, __LINE__)
 #define vx_pages_sub(s,r,p)	vx_pages_add(s, r, -(p))
 
 #define vx_vmpages_inc(m)		vx_acc_vmpage(m, 1)
@@ -90,10 +83,10 @@ static inline void __vx_acc_pages(unsigned long *v, struct vx_info *vxi,
 #define vx_vmlocked_add(m,p)		vx_acc_vmlpages(m, p)
 #define vx_vmlocked_sub(m,p)		vx_acc_vmlpages(m,-(p))
 
-#define vx_rsspages_inc(m)		vx_acc_rsspage(m, 1)
-#define vx_rsspages_dec(m)		vx_acc_rsspage(m,-1)
-#define vx_rsspages_add(m,p)		vx_acc_rsspages(m, p)
-#define vx_rsspages_sub(m,p)		vx_acc_rsspages(m,-(p))
+#define vx_file_rsspages_inc(m)		vx_acc_file_rsspage(m, 1)
+#define vx_file_rsspages_dec(m)		vx_acc_file_rsspage(m,-1)
+#define vx_file_rsspages_add(m,p)	vx_acc_file_rsspages(m, p)
+#define vx_file_rsspages_sub(m,p)	vx_acc_file_rsspages(m,-(p))
 
 #define vx_anon_rsspages_inc(m)		vx_acc_anon_rsspage(m, 1)
 #define vx_anon_rsspages_dec(m)		vx_acc_anon_rsspage(m,-1)
@@ -102,33 +95,7 @@ static inline void __vx_acc_pages(unsigned long *v, struct vx_info *vxi,
 
 
 #define vx_pages_avail(m,p,r) \
-	__vx_pages_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
-
-static inline int __vx_pages_avail(struct vx_info *vxi,
-		int res, int pages, char *_file, int _line)
-{
-	unsigned long value;
-
-	if (VXD_RLIMIT(res, RLIMIT_RSS) ||
-		VXD_RLIMIT(res, RLIMIT_AS) ||
-		VXD_RLIMIT(res, RLIMIT_MEMLOCK))
-		vxlprintk(1, "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d",
-			(vxi?vxi->vx_id:-1), vlimit_name[res], res,
-			(vxi?vxi->limit.rlim[res]:1),
-			(vxi?atomic_read(&vxi->limit.rcur[res]):0),
-			pages, _file, _line);
-	if (!vxi)
-		return 1;
-	value = atomic_read(&vxi->limit.rcur[res]);
-	if (value > vxi->limit.rmax[res])
-		vxi->limit.rmax[res] = value;
-	if (vxi->limit.rlim[res] == RLIM_INFINITY)
-		return 1;
-	if (value + pages <= vxi->limit.rlim[res])
-		return 1;
-	atomic_inc(&vxi->limit.lhit[res]);
-	return 0;
-}
+	__vx_cres_avail((m)->mm_vx_info, r, p, __FILE__, __LINE__)
 
 #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)