*
* Virtual Context Support
*
- * Copyright (C) 2003-2004 Herbert Pötzl
+ * Copyright (C) 2003-2005 Herbert Pötzl
*
* V0.01 basic structure
* V0.02 adaptation vs1.3.0
#include <linux/config.h>
#include <linux/errno.h>
#include <linux/proc_fs.h>
-#include <linux/vserver.h>
-#include <linux/vs_base.h>
+#include <linux/sched.h>
#include <linux/vs_context.h>
#include <linux/vs_network.h>
+#include <linux/vs_cvirt.h>
+
+#include <linux/vserver/switch.h>
#include <asm/uaccess.h>
#include <asm/unistd.h>
+#include "cvirt_proc.h"
+#include "limit_proc.h"
+#include "sched_proc.h"
+#include "vci_config.h"
static struct proc_dir_entry *proc_virtual;
PROC_NID_STATUS,
};
-#define PROC_VID_MASK 0x60
+#define PROC_VID_MASK 0x60
/* first the actual feeds */
return sprintf(buffer,
"VCIVersion:\t%04x:%04x\n"
"VCISyscall:\t%d\n"
+ "VCIKernel:\t%08x\n"
,VCI_VERSION >> 16
,VCI_VERSION & 0xFFFF
,__NR_vserver
+ ,vci_kernel_config()
);
}
if (!vxi)
return 0;
length = sprintf(buffer,
- "UseCnt:\t%d\n"
- "RefCnt:\t%d\n"
+ "UseCnt:\t%d\n"
+ "Tasks:\t%d\n"
"Flags:\t%016llx\n"
"BCaps:\t%016llx\n"
"CCaps:\t%016llx\n"
- "Ticks:\t%d\n"
+ "Ticks:\t%d\n"
,atomic_read(&vxi->vx_usecnt)
- ,atomic_read(&vxi->vx_refcnt)
+ ,atomic_read(&vxi->vx_tasks)
,(unsigned long long)vxi->vx_flags
,(unsigned long long)vxi->vx_bcaps
,(unsigned long long)vxi->vx_ccaps
vxi = locate_vx_info(vid);
if (!vxi)
return 0;
+ vx_update_load(vxi);
length = vx_info_proc_cvirt(&vxi->cvirt, buffer);
put_vx_info(vxi);
return length;
);
}
-#define atoquad(a) \
+#define atoquad(a) \
(((a)>>0) & 0xff), (((a)>>8) & 0xff), \
(((a)>>16) & 0xff), (((a)>>24) & 0xff)
if (!nxi)
return 0;
length = sprintf(buffer,
- "UseCnt:\t%d\n"
- "RefCnt:\t%d\n"
+ "UseCnt:\t%d\n"
+ "RefCnt:\t%d\n"
,atomic_read(&nxi->nx_usecnt)
,atomic_read(&nxi->nx_refcnt)
);
/* here the inode helpers */
+#define fake_ino(id,nr) (((nr) & 0xFFFF) | \
+ (((id) & 0xFFFF) << 16))
-#define fake_ino(id,ino) (((id)<<16)|(ino))
-
-#define inode_vid(i) ((i)->i_ino >> 16)
-#define inode_type(i) ((i)->i_ino & 0xFFFF)
+#define inode_vid(i) (((i)->i_ino >> 16) & 0xFFFF)
+#define inode_type(i) ((i)->i_ino & 0xFFFF)
#define MAX_MULBY10 ((~0U-9)/10)
vid = inode_vid(inode);
switch (inode_type(inode) & PROC_VID_MASK) {
case PROC_XID_INO:
- hashed = vx_info_is_hashed(vid);
+ hashed = xid_is_hashed(vid);
break;
case PROC_NID_INO:
- hashed = nx_info_is_hashed(vid);
+ hashed = nid_is_hashed(vid);
break;
- }
+ }
if (hashed)
return 1;
d_drop(dentry);
/*
static int proc_vid_delete_dentry(struct dentry * dentry)
{
- return 1;
+ return 1;
}
*/
struct inode * inode = file->f_dentry->d_inode;
unsigned long page;
ssize_t length;
- ssize_t end;
int vid;
if (count > PROC_BLOCK_SIZE)
vid = inode_vid(inode);
length = PROC_I(inode)->op.proc_vid_read(vid, (char*)page);
- if (length < 0) {
- free_page(page);
- return length;
- }
- /* Static 4kB (or whatever) block capacity */
- if (*ppos >= length) {
- free_page(page);
- return 0;
- }
- if (count + *ppos > length)
- count = length - *ppos;
- end = count + *ppos;
- copy_to_user(buf, (char *) page + *ppos, count);
- *ppos = end;
+ if (length >= 0)
+ length = simple_read_from_buffer(buf, count, ppos,
+ (char *)page, length);
free_page(page);
- return count;
+ return length;
}
};
static struct dentry_operations proc_vid_dentry_operations = {
- d_revalidate: proc_vid_revalidate,
+ d_revalidate: proc_vid_revalidate,
// d_delete: proc_vid_delete_dentry,
};
switch (inode_type(dir)) {
case PROC_XID_INO:
- p = vx_base_stuff;
+ p = vx_base_stuff;
break;
case PROC_NID_INO:
- p = vn_base_stuff;
+ p = vn_base_stuff;
break;
default:
goto out;
case PROC_NID_STATUS:
PROC_I(inode)->op.proc_vid_read = proc_nid_status;
break;
-
+
default:
printk("procfs: impossible type (%d)",p->type);
iput(inode);
inode->i_fop = &proc_vid_info_file_operations;
inode->i_nlink = 1;
inode->i_flags|=S_IMMUTABLE;
-
+
dentry->d_op = &proc_vid_dentry_operations;
d_add(dentry, inode);
error = 0;
int i, size;
struct inode *inode = filp->f_dentry->d_inode;
struct vid_entry *p;
-
+
i = filp->f_pos;
switch (i) {
case 0:
switch (inode_type(inode)) {
case PROC_XID_INO:
size = sizeof(vx_base_stuff);
- p = vx_base_stuff + i;
+ p = vx_base_stuff + i;
break;
case PROC_NID_INO:
size = sizeof(vn_base_stuff);
- p = vn_base_stuff + i;
+ p = vn_base_stuff + i;
break;
default:
return 1;
dentry->d_op = &proc_vid_dentry_operations;
d_add(dentry, inode);
ret = 0;
-
+
out_release:
put_vx_info(vxi);
out:
dentry->d_op = &proc_vid_dentry_operations;
d_add(dentry, inode);
ret = 0;
-
+
out_release:
put_nx_info(nxi);
out:
filp->f_pos++;
/* fall through */
case 3:
- if (current->xid > 1) {
+ if (vx_current_xid() > 1) {
ino = fake_ino(1, PROC_XID_INO);
if (filldir(dirent, "current", 7,
filp->f_pos, ino, DT_LNK) < 0)
filp->f_pos++;
/* fall through */
case 3:
- if (current->xid > 1) {
+ if (vx_current_xid() > 1) {
ino = fake_ino(1, PROC_NID_INO);
if (filldir(dirent, "current", 7,
filp->f_pos, ino, DT_LNK) < 0)
}
proc_virtual = ent;
- ent = proc_mkdir("vnet", 0);
+ ent = proc_mkdir("virtnet", 0);
if (ent) {
ent->proc_fops = &proc_vnet_dir_operations;
ent->proc_iops = &proc_vnet_dir_inode_operations;
char *task_vx_info(struct task_struct *p, char *buffer)
{
- return buffer + sprintf(buffer,
- "XID:\t%d\n"
- ,p->xid);
+ struct vx_info *vxi;
+
+ buffer += sprintf (buffer,"XID:\t%d\n", vx_task_xid(p));
+ vxi = task_get_vx_info(p);
+ if (vxi && !vx_flags(VXF_INFO_HIDE, 0)) {
+ buffer += sprintf (buffer,"BCaps:\t%016llx\n"
+ ,(unsigned long long)vxi->vx_bcaps);
+ buffer += sprintf (buffer,"CCaps:\t%016llx\n"
+ ,(unsigned long long)vxi->vx_ccaps);
+ buffer += sprintf (buffer,"CFlags:\t%016llx\n"
+ ,(unsigned long long)vxi->vx_flags);
+ buffer += sprintf (buffer,"CIPid:\t%d\n"
+ ,vxi->vx_initpid);
+ }
+ put_vx_info(vxi);
+ return buffer;
}
int proc_pid_vx_info(struct task_struct *p, char *buffer)
char *task_nx_info(struct task_struct *p, char *buffer)
{
- return buffer + sprintf(buffer,
- "NID:\t%d\n"
- ,p->nid);
+ struct nx_info *nxi;
+
+ buffer += sprintf (buffer,"NID:\t%d\n", nx_task_nid(p));
+ nxi = task_get_nx_info(p);
+ if (nxi && !vx_flags(VXF_INFO_HIDE, 0)) {
+ int i;
+
+ for (i=0; i<nxi->nbipv4; i++){
+ buffer += sprintf (buffer,
+ "V4Root[%d]:\t%d.%d.%d.%d/%d.%d.%d.%d\n", i
+ ,NIPQUAD(nxi->ipv4[i])
+ ,NIPQUAD(nxi->mask[i]));
+ }
+ buffer += sprintf (buffer,
+ "V4Root[bcast]:\t%d.%d.%d.%d\n"
+ ,NIPQUAD(nxi->v4_bcast));
+ }
+ put_nx_info(nxi);
+ return buffer;
}
int proc_pid_nx_info(struct task_struct *p, char *buffer)
git://git.onelab.eu / linux-2.6.git / blobdiff