fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / linux / vserver / context.h

diff --git a/include/linux/vserver/context.h b/include/linux/vserver/context.h
index 816b8a2..9dda656 100644 (file)
--- a/include/linux/vserver/context.h
+++ b/include/linux/vserver/context.h
@@ -2,16 +2,13 @@
 #define _VX_CONTEXT_H
 
 #include <linux/types.h>
+#include <linux/capability.h>
 
 
-#define MAX_S_CONTEXT  65535   /* Arbitrary limit */
-#define MIN_D_CONTEXT  49152   /* dynamic contexts start here */
-
 #define VX_DYNAMIC_ID  ((uint32_t)-1)          /* id for dynamic context */
 
 /* context flags */
 
-#define VXF_INFO_LOCK          0x00000001
 #define VXF_INFO_SCHED         0x00000002
 #define VXF_INFO_NPROC         0x00000004
 #define VXF_INFO_PRIVATE       0x00000008
@@ -29,12 +26,15 @@
 #define VXF_VIRT_UPTIME                0x00020000
 #define VXF_VIRT_CPU           0x00040000
 #define VXF_VIRT_LOAD          0x00080000
+#define VXF_VIRT_TIME          0x00100000
 
 #define VXF_HIDE_MOUNT         0x01000000
 #define VXF_HIDE_NETIF         0x02000000
+#define VXF_HIDE_VINFO         0x04000000
 
 #define VXF_STATE_SETUP                (1ULL<<32)
 #define VXF_STATE_INIT         (1ULL<<33)
+#define VXF_STATE_ADMIN                (1ULL<<34)
 
 #define VXF_SC_HELPER          (1ULL<<36)
 #define VXF_REBOOT_KILL                (1ULL<<37)
@@ -45,9 +45,9 @@
 
 #define VXF_IGNEG_NICE         (1ULL<<52)
 
-#define VXF_ONE_TIME           (0x0003ULL<<32)
+#define VXF_ONE_TIME           (0x0007ULL<<32)
 
-#define VXF_INIT_SET           (VXF_STATE_SETUP|VXF_STATE_INIT)
+#define VXF_INIT_SET           (VXF_STATE_SETUP|VXF_STATE_INIT|VXF_STATE_ADMIN)
 
 
 /* context migration */
@@ -70,17 +70,8 @@
 #define VXC_BINARY_MOUNT       0x00040000
 
 #define VXC_QUOTA_CTL          0x00100000
-
-
-/* context state changes */
-
-enum {
-       VSC_STARTUP = 1,
-       VSC_SHUTDOWN,
-
-       VSC_NETUP,
-       VSC_NETDOWN,
-};
+#define VXC_ADMIN_MAPPER       0x00200000
+#define VXC_ADMIN_CLOOP                0x00400000
 
 
 #ifdef __KERNEL__
@@ -92,6 +83,12 @@ enum {
 #include "limit_def.h"
 #include "sched_def.h"
 #include "cvirt_def.h"
+#include "cacct_def.h"
+
+struct _vx_info_pc {
+       struct _vx_sched_pc sched_pc;
+       struct _vx_cvirt_pc cvirt_pc;
+};
 
 struct vx_info {
        struct hlist_node vx_hlist;             /* linked list of contexts */
@@ -101,11 +98,14 @@ struct vx_info {
        struct vx_info *vx_parent;              /* parent context */
        int vx_state;                           /* context state */
 
-       struct namespace *vx_namespace;         /* private namespace */
+       unsigned long vx_nsmask;                /* assignment mask */
+       struct nsproxy *vx_nsproxy;             /* private namespace */
        struct fs_struct *vx_fs;                /* private namespace fs */
+
        uint64_t vx_flags;                      /* context flags */
        uint64_t vx_bcaps;                      /* bounding caps (system) */
        uint64_t vx_ccaps;                      /* context caps (vserver) */
+       kernel_cap_t vx_cap_bset;               /* the guest's bset */
 
        struct task_struct *vx_reaper;          /* guest reaper process */
        pid_t vx_initpid;                       /* PID of guest init */
@@ -115,6 +115,12 @@ struct vx_info {
        struct _vx_cvirt cvirt;                 /* virtual/bias stuff */
        struct _vx_cacct cacct;                 /* context accounting */
 
+#ifndef CONFIG_SMP
+       struct _vx_info_pc info_pc;             /* per cpu data */
+#else
+       struct _vx_info_pc *ptr_pc;             /* per cpu array */
+#endif
+
        wait_queue_head_t vx_wait;              /* context exit waitqueue */
        int reboot_cmd;                         /* last sys_reboot() cmd */
        int exit_code;                          /* last process exit code */
@@ -122,35 +128,31 @@ struct vx_info {
        char vx_name[65];                       /* vserver name */
 };
 
+#ifndef CONFIG_SMP
+#define        vx_ptr_pc(vxi)          (&(vxi)->info_pc)
+#define        vx_per_cpu(vxi, v, id)  vx_ptr_pc(vxi)->v
+#else
+#define        vx_ptr_pc(vxi)          ((vxi)->ptr_pc)
+#define        vx_per_cpu(vxi, v, id)  per_cpu_ptr(vx_ptr_pc(vxi), id)->v
+#endif
+
+#define        vx_cpu(vxi, v)          vx_per_cpu(vxi, v, smp_processor_id())
+
+
+struct vx_info_save {
+       struct vx_info *vxi;
+       xid_t xid;
+};
+
 
 /* status flags */
 
 #define VXS_HASHED     0x0001
 #define VXS_PAUSED     0x0010
-#define VXS_ONHOLD     0x0020
 #define VXS_SHUTDOWN   0x0100
 #define VXS_HELPER     0x1000
 #define VXS_RELEASED   0x8000
 
-/* check conditions */
-
-#define VX_ADMIN       0x0001
-#define VX_WATCH       0x0002
-#define VX_HIDE                0x0004
-#define VX_HOSTID      0x0008
-
-#define VX_IDENT       0x0010
-#define VX_EQUIV       0x0020
-#define VX_PARENT      0x0040
-#define VX_CHILD       0x0080
-
-#define VX_ARG_MASK    0x00F0
-
-#define VX_DYNAMIC     0x0100
-#define VX_STATIC      0x0200
-
-#define VX_ATR_MASK    0x0F00
-
 
 extern void claim_vx_info(struct vx_info *, struct task_struct *);
 extern void release_vx_info(struct vx_info *, struct task_struct *);
@@ -161,12 +163,10 @@ extern struct vx_info *lookup_or_create_vx_info(int);
 extern int get_xid_list(int, unsigned int *, int);
 extern int xid_is_hashed(xid_t);
 
-extern int vx_migrate_task(struct task_struct *, struct vx_info *);
+extern int vx_migrate_task(struct task_struct *, struct vx_info *, int);
 
 extern long vs_state_change(struct vx_info *, unsigned int);
 
 
 #endif /* __KERNEL__ */
-#else  /* _VX_CONTEXT_H */
-#warning duplicate inclusion
 #endif /* _VX_CONTEXT_H */