]> git.proxmox.com Git - mirror_lxcfs.git/blobdiff - lxcfs.c
add cache types for each procfile type that we provide
[mirror_lxcfs.git] / lxcfs.c
diff --git a/lxcfs.c b/lxcfs.c
index 97f38368c51f14fc7ed90099ea5e1f76edc7bb29..162f356445176cc3ab238aefaac91b6d1c50fcdd 100644 (file)
--- a/lxcfs.c
+++ b/lxcfs.c
@@ -3,18 +3,7 @@
  * Copyright © 2014 Canonical, Inc
  * Author: Serge Hallyn <serge.hallyn@ubuntu.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * See COPYING file for details.
  */
 
 /*
 #include <string.h>
 #include <stdlib.h>
 #include <libgen.h>
+#include <sched.h>
+#include <linux/sched.h>
+#include <sys/socket.h>
+#include <sys/mount.h>
+#include <wait.h>
 
 #include <nih/alloc.h>
 #include <nih/string.h>
+#include <nih/alloc.h>
 
 #include "cgmanager.h"
 
@@ -49,6 +44,54 @@ struct lxcfs_state {
 };
 #define LXCFS_DATA ((struct lxcfs_state *) fuse_get_context()->private_data)
 
+enum {
+       LXC_TYPE_CGDIR,
+       LXC_TYPE_CGFILE,
+       LXC_TYPE_PROC_MEMINFO,
+       LXC_TYPE_PROC_CPUINFO,
+       LXC_TYPE_PROC_UPTIME,
+       LXC_TYPE_PROC_STAT,
+       LXC_TYPE_PROC_DISKSTATS,
+};
+
+struct file_info {
+       char *controller;
+       char *cgroup;
+       char *file;
+       int type;
+       char *buf;  // unused as of yet
+       int buflen;
+};
+
+static char *must_copy_string(const char *str)
+{
+       if (!str)
+               return NULL;
+       return NIH_MUST( nih_strdup(NULL, str) );
+}
+
+/*
+ * TODO - return value should denote whether child exited with failure
+ * so callers can return errors.  Esp read/write of tasks and cgroup.procs
+ */
+static int wait_for_pid(pid_t pid)
+{
+       int status, ret;
+
+again:
+       ret = waitpid(pid, &status, 0);
+       if (ret == -1) {
+               if (errno == EINTR)
+                       goto again;
+               return -1;
+       }
+       if (ret != pid)
+               goto again;
+       if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+               return -1;
+       return 0;
+}
+
 /*
  * Given a open file * to /proc/pid/{u,g}id_map, and an id
  * valid in the caller's namespace, return the id mapped into
@@ -74,7 +117,7 @@ convert_id_to_ns(FILE *idfile, unsigned int in_id)
                         * uids wrapped around - unexpected as this is a procfile,
                         * so just bail.
                         */
-                       fprintf(stderr, "pid wrapparound at entry %u %u %u in %s",
+                       fprintf(stderr, "pid wrapparound at entry %u %u %u in %s\n",
                                nsuid, hostuid, count, line);
                        return -1;
                }
@@ -164,6 +207,25 @@ static bool perms_include(int fmode, mode_t req_mode)
        return ((fmode & r) == r);
 }
 
+static char *get_next_cgroup_dir(const char *taskcg, const char *querycg)
+{
+       char *start, *end;
+
+       if (strlen(taskcg) <= strlen(querycg)) {
+               fprintf(stderr, "%s: I was fed bad input\n", __func__);
+               return NULL;
+       }
+
+       if (strcmp(querycg, "/") == 0)
+               start = NIH_MUST( nih_strdup(NULL, taskcg + 1) );
+       else
+               start = NIH_MUST( nih_strdup(NULL, taskcg + strlen(querycg) + 1) );
+       end = strchr(start, '/');
+       if (end)
+               *end = '\0';
+       return start;
+}
+
 /*
  * check whether a fuse context may access a cgroup dir or file
  *
@@ -206,6 +268,67 @@ static bool fc_may_access(struct fuse_context *fc, const char *contrl, const cha
        return false;
 }
 
+static void stripnewline(char *x)
+{
+       size_t l = strlen(x);
+       if (l && x[l-1] == '\n')
+               x[l-1] = '\0';
+}
+
+/*
+ * If caller is in /a/b/c/d, he may only act on things under cg=/a/b/c/d.
+ * If caller is in /a, he may act on /a/b, but not on /b.
+ * if the answer is false and nextcg is not NULL, then *nextcg will point
+ * to a nih_alloc'd string containing the next cgroup directory under cg
+ */
+static bool caller_is_in_ancestor(pid_t pid, const char *contrl, const char *cg, char **nextcg)
+{
+       nih_local char *fnam = NULL;
+       FILE *f;
+       bool answer = false;
+       char *line = NULL;
+       size_t len = 0;
+
+       fnam = NIH_MUST( nih_sprintf(NULL, "/proc/%d/cgroup", pid) );
+       if (!(f = fopen(fnam, "r")))
+               return false;
+
+       while (getline(&line, &len, f) != -1) {
+               char *c1, *c2, *linecmp;
+               if (!line[0])
+                       continue;
+               c1 = strchr(line, ':');
+               if (!c1)
+                       goto out;
+               c1++;
+               c2 = strchr(c1, ':');
+               if (!c2)
+                       goto out;
+               *c2 = '\0';
+               if (strcmp(c1, contrl) != 0)
+                       continue;
+               c2++;
+               stripnewline(c2);
+               /*
+                * callers pass in '/' for root cgroup, otherwise they pass
+                * in a cgroup without leading '/'
+                */
+               linecmp = *cg == '/' ? c2 : c2+1;
+               if (strncmp(linecmp, cg, strlen(linecmp)) != 0) {
+                       if (nextcg)
+                               *nextcg = get_next_cgroup_dir(linecmp, cg);
+                       goto out;
+               }
+               answer = true;
+               goto out;
+       }
+
+out:
+       fclose(f);
+       free(line);
+       return answer;
+}
+
 /*
  * given /cgroup/freezer/a/b, return "freezer".  this will be nih-allocated
  * and needs to be nih_freed.
@@ -385,8 +508,14 @@ static int cg_getattr(const char *path, struct stat *sb)
         * cgroup, or cgdir if fpath is a file */
 
        if (is_child_cgroup(controller, path1, path2)) {
+               if (!caller_is_in_ancestor(fc->pid, controller, cgroup, NULL)) {
+                       /* this is just /cgroup/controller, return it as a dir */
+                       sb->st_mode = S_IFDIR | 00555;
+                       sb->st_nlink = 2;
+                       return 0;
+               }
                if (!fc_may_access(fc, controller, cgroup, NULL, O_RDONLY))
-                       return -EPERM;
+                       return -EACCES;
 
                // get uid, gid, from '/tasks' file and make up a mode
                // That is a hack, until cgmanager gains a GetCgroupPerms fn.
@@ -403,8 +532,10 @@ static int cg_getattr(const char *path, struct stat *sb)
        }
 
        if ((k = get_cgroup_key(controller, path1, path2)) != NULL) {
+               if (!caller_is_in_ancestor(fc->pid, controller, path1, NULL))
+                       return -ENOENT;
                if (!fc_may_access(fc, controller, path1, path2, O_RDONLY))
-                       return -EPERM;
+                       return -EACCES;
 
                sb->st_mode = S_IFREG | k->mode;
                sb->st_nlink = 1;
@@ -417,27 +548,74 @@ static int cg_getattr(const char *path, struct stat *sb)
        return -ENOENT;
 }
 
+/*
+ * TODO - cache these results in a table for use in opendir, free
+ * in releasedir
+ */
 static int cg_opendir(const char *path, struct fuse_file_info *fi)
 {
+       struct fuse_context *fc = fuse_get_context();
+       nih_local struct cgm_keys **list = NULL;
+       const char *cgroup;
+       struct file_info *dir_info;
+       nih_local char *controller = NULL;
+
+       if (!fc)
+               return -EIO;
+
+       if (strcmp(path, "/cgroup") == 0) {
+               cgroup = NULL;
+               controller = NULL;
+       } else {
+               // return list of keys for the controller, and list of child cgroups
+               controller = pick_controller_from_path(fc, path);
+               if (!controller)
+                       return -EIO;
+
+               cgroup = find_cgroup_in_path(path);
+               if (!cgroup) {
+                       /* this is just /cgroup/controller, return its contents */
+                       cgroup = "/";
+               }
+       }
+
+       if (!fc_may_access(fc, controller, cgroup, NULL, O_RDONLY))
+               return -EACCES;
+
+       /* we'll free this at cg_releasedir */
+       dir_info = NIH_MUST( nih_alloc(NULL, sizeof(*dir_info)) );
+       dir_info->controller = must_copy_string(controller);
+       dir_info->cgroup = must_copy_string(cgroup);
+       dir_info->type = LXC_TYPE_CGDIR;
+       dir_info->buf = NULL;
+       dir_info->file = NULL;
+       dir_info->buflen = 0;
+
+       fi->fh = (unsigned long)dir_info;
        return 0;
 }
 
 static int cg_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t offset,
                struct fuse_file_info *fi)
 {
+       struct file_info *d = (struct file_info *)fi->fh;
+       nih_local struct cgm_keys **list = NULL;
+       int i;
+       nih_local char *nextcg = NULL;
        struct fuse_context *fc = fuse_get_context();
 
-       if (!fc)
+       if (d->type != LXC_TYPE_CGDIR) {
+               fprintf(stderr, "Internal error: file cache info used in readdir\n");
                return -EIO;
-
-       if (strcmp(path, "/cgroup") == 0) {
-               // get list of controllers
+       }
+       if (!d->cgroup && !d->controller) {
+               // ls /var/lib/lxcfs/cgroup - just show list of controllers
                char **list = LXCFS_DATA ? LXCFS_DATA->subsystems : NULL;
                int i;
 
                if (!list)
                        return -EIO;
-               /* TODO - collect the list of controllers at fuse_init */
+
                for (i = 0;  list[i]; i++) {
                        if (filler(buf, list[i], NULL, 0) != 0) {
                                return -EIO;
@@ -446,27 +624,20 @@ static int cg_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t
                return 0;
        }
 
-       // return list of keys for the controller, and list of child cgroups
-       nih_local struct cgm_keys **list = NULL;
-       const char *cgroup;
-       nih_local char *controller = NULL;
-       int i;
-
-       controller = pick_controller_from_path(fc, path);
-       if (!controller)
-               return -EIO;
+       if (!cgm_list_keys(d->controller, d->cgroup, &list))
+               // not a valid cgroup
+               return -EINVAL;
 
-       cgroup = find_cgroup_in_path(path);
-       if (!cgroup) {
-               /* this is just /cgroup/controller, return its contents */
-               cgroup = "/";
+       if (!caller_is_in_ancestor(fc->pid, d->controller, d->cgroup, &nextcg)) {
+               if (nextcg) {
+                       int ret;
+                       ret = filler(buf, nextcg,  NULL, 0);
+                       if (ret != 0)
+                               return -EIO;
+               }
+               return 0;
        }
 
-       if (!fc_may_access(fc, controller, cgroup, NULL, O_RDONLY))
-               return -EPERM;
-
-       if (!cgm_list_keys(controller, cgroup, &list))
-               return -EINVAL;
        for (i = 0; list[i]; i++) {
                if (filler(buf, list[i]->name, NULL, 0) != 0) {
                        return -EIO;
@@ -474,9 +645,9 @@ static int cg_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t
        }
 
        // now get the list of child cgroups
-       nih_local char **clist;
+       nih_local char **clist = NULL;
 
-       if (!cgm_list_children(controller, cgroup, &clist))
+       if (!cgm_list_children(d->controller, d->cgroup, &clist))
                return 0;
        for (i = 0; clist[i]; i++) {
                if (filler(buf, clist[i], NULL, 0) != 0) {
@@ -486,8 +657,23 @@ static int cg_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t
        return 0;
 }
 
+static void do_release_file_info(struct file_info *f)
+{
+       if (f->controller)
+               nih_free(f->controller);
+       if (f->cgroup)
+               nih_free(f->cgroup);
+       if (f->file)
+               nih_free(f->file);
+       free(f->buf);
+       nih_free(f);
+}
+
 static int cg_releasedir(const char *path, struct fuse_file_info *fi)
 {
+       struct file_info *d = (struct file_info *)fi->fh;
+
+       do_release_file_info(d);
        return 0;
 }
 
@@ -498,6 +684,7 @@ static int cg_open(const char *path, struct fuse_file_info *fi)
        char *fpath = NULL, *path1, *path2;
        nih_local char * cgdir = NULL;
        nih_local struct cgm_keys *k = NULL;
+       struct file_info *file_info;
        struct fuse_context *fc = fuse_get_context();
 
        if (!fc)
@@ -519,140 +706,638 @@ static int cg_open(const char *path, struct fuse_file_info *fi)
                path2 = fpath;
        }
 
-       if ((k = get_cgroup_key(controller, path1, path2)) != NULL) {
-               if (!fc_may_access(fc, controller, path1, path2, fi->flags))
-                       return -EPERM;
+       k = get_cgroup_key(controller, path1, path2);
+       if (!k)
+               return -EINVAL;
 
-               /* TODO - we want to cache this info for read/write */
-               return 0;
-       }
+       if (!fc_may_access(fc, controller, path1, path2, fi->flags))
+               // should never get here
+               return -EACCES;
 
-       return -EINVAL;
+       /* we'll free this at cg_release */
+       file_info = NIH_MUST( nih_alloc(NULL, sizeof(*file_info)) );
+       file_info->controller = must_copy_string(controller);
+       file_info->cgroup = must_copy_string(path1);
+       file_info->file = must_copy_string(path2);
+       file_info->type = LXC_TYPE_CGFILE;
+       file_info->buf = NULL;
+       file_info->buflen = 0;
+
+       fi->fh = (unsigned long)file_info;
+       return 0;
 }
 
-static int cg_read(const char *path, char *buf, size_t size, off_t offset,
-               struct fuse_file_info *fi)
+static int cg_release(const char *path, struct fuse_file_info *fi)
 {
-       nih_local char *controller = NULL;
-       const char *cgroup;
-       char *fpath = NULL, *path1, *path2;
-       struct fuse_context *fc = fuse_get_context();
-       nih_local char * cgdir = NULL;
-       nih_local struct cgm_keys *k = NULL;
+       struct file_info *f = (struct file_info *)fi->fh;
 
-       if (offset)
-               return -EIO;
+       do_release_file_info(f);
+       return 0;
+}
 
-       if (!fc)
-               return -EIO;
+static int msgrecv(int sockfd, void *buf, size_t len)
+{
+       struct timeval tv;
+       fd_set rfds;
 
-       controller = pick_controller_from_path(fc, path);
-       if (!controller)
-               return -EIO;
-       cgroup = find_cgroup_in_path(path);
-       if (!cgroup)
-               return -EINVAL;
+       FD_ZERO(&rfds);
+       FD_SET(sockfd, &rfds);
+       tv.tv_sec = 2;
+       tv.tv_usec = 0;
 
-       get_cgdir_and_path(cgroup, &cgdir, &fpath);
-       if (!fpath) {
-               path1 = "/";
-               path2 = cgdir;
-       } else {
-               path1 = cgdir;
-               path2 = fpath;
+       if (select(sockfd+1, &rfds, NULL, NULL, &tv) <= 0)
+               return -1;
+       return recv(sockfd, buf, len, MSG_DONTWAIT);
+}
+
+#define SEND_CREDS_OK 0
+#define SEND_CREDS_NOTSK 1
+#define SEND_CREDS_FAIL 2
+static int send_creds(int sock, struct ucred *cred, char v, bool pingfirst)
+{
+       struct msghdr msg = { 0 };
+       struct iovec iov;
+       struct cmsghdr *cmsg;
+       char cmsgbuf[CMSG_SPACE(sizeof(*cred))];
+       char buf[1];
+       buf[0] = 'p';
+
+       if (pingfirst) {
+               if (msgrecv(sock, buf, 1) != 1) {
+                       fprintf(stderr, "%s: Error getting reply from server over socketpair\n",
+                                 __func__);
+                       return SEND_CREDS_FAIL;
+               }
        }
 
-       if ((k = get_cgroup_key(controller, path1, path2)) != NULL) {
-               nih_local char *data = NULL;
-               int s;
+       msg.msg_control = cmsgbuf;
+       msg.msg_controllen = sizeof(cmsgbuf);
+
+       cmsg = CMSG_FIRSTHDR(&msg);
+       cmsg->cmsg_len = CMSG_LEN(sizeof(struct ucred));
+       cmsg->cmsg_level = SOL_SOCKET;
+       cmsg->cmsg_type = SCM_CREDENTIALS;
+       memcpy(CMSG_DATA(cmsg), cred, sizeof(*cred));
+
+       msg.msg_name = NULL;
+       msg.msg_namelen = 0;
+
+       buf[0] = v;
+       iov.iov_base = buf;
+       iov.iov_len = sizeof(buf);
+       msg.msg_iov = &iov;
+       msg.msg_iovlen = 1;
+
+       if (sendmsg(sock, &msg, 0) < 0) {
+               fprintf(stderr, "%s: failed at sendmsg: %s\n", __func__,
+                         strerror(errno));
+               if (errno == 3)
+                       return SEND_CREDS_NOTSK;
+               return SEND_CREDS_FAIL;
+       }
 
-               if (!fc_may_access(fc, controller, path1, path2, O_RDONLY))
-                       return -EPERM;
+       return SEND_CREDS_OK;
+}
 
-               if (!cgm_get_value(controller, path1, path2, &data))
-                       return -EINVAL;
+static bool recv_creds(int sock, struct ucred *cred, char *v)
+{
+       struct msghdr msg = { 0 };
+       struct iovec iov;
+       struct cmsghdr *cmsg;
+       char cmsgbuf[CMSG_SPACE(sizeof(*cred))];
+       char buf[1];
+       int ret;
+       int optval = 1;
+       struct timeval tv;
+       fd_set rfds;
 
-               s = strlen(data);
-               if (s > size)
-                       s = size;
-               memcpy(buf, data, s);
+       *v = '1';
 
-               return s;
+       cred->pid = -1;
+       cred->uid = -1;
+       cred->gid = -1;
+
+       if (setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &optval, sizeof(optval)) == -1) {
+               fprintf(stderr, "Failed to set passcred: %s\n", strerror(errno));
+               return false;
+       }
+       buf[0] = '1';
+       if (write(sock, buf, 1) != 1) {
+               fprintf(stderr, "Failed to start write on scm fd: %s\n", strerror(errno));
+               return false;
        }
 
-       return -EINVAL;
+       msg.msg_name = NULL;
+       msg.msg_namelen = 0;
+       msg.msg_control = cmsgbuf;
+       msg.msg_controllen = sizeof(cmsgbuf);
+
+       iov.iov_base = buf;
+       iov.iov_len = sizeof(buf);
+       msg.msg_iov = &iov;
+       msg.msg_iovlen = 1;
+
+       FD_ZERO(&rfds);
+       FD_SET(sock, &rfds);
+       tv.tv_sec = 2;
+       tv.tv_usec = 0;
+       if (select(sock+1, &rfds, NULL, NULL, &tv) <= 0) {
+               fprintf(stderr, "Failed to select for scm_cred: %s\n",
+                         strerror(errno));
+               return false;
+       }
+       ret = recvmsg(sock, &msg, MSG_DONTWAIT);
+       if (ret < 0) {
+               fprintf(stderr, "Failed to receive scm_cred: %s\n",
+                         strerror(errno));
+               return false;
+       }
+
+       cmsg = CMSG_FIRSTHDR(&msg);
+
+       if (cmsg && cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred)) &&
+                       cmsg->cmsg_level == SOL_SOCKET &&
+                       cmsg->cmsg_type == SCM_CREDENTIALS) {
+               memcpy(cred, CMSG_DATA(cmsg), sizeof(*cred));
+       }
+       *v = buf[0];
+
+       return true;
 }
 
-int cg_write(const char *path, const char *buf, size_t size, off_t offset,
-            struct fuse_file_info *fi)
+
+/*
+ * pid_to_ns - reads pids from a ucred over a socket, then writes the
+ * int value back over the socket.  This shifts the pid from the
+ * sender's pidns into tpid's pidns.
+ */
+static void pid_to_ns(int sock, pid_t tpid)
 {
-       nih_local char *controller = NULL;
-       const char *cgroup;
-       char *fpath = NULL, *path1, *path2;
-       struct fuse_context *fc = fuse_get_context();
-       nih_local char * cgdir = NULL;
-       nih_local struct cgm_keys *k = NULL;
+       char v = '0';
+       struct ucred cred;
+
+       while (recv_creds(sock, &cred, &v)) {
+               if (v == '1')
+                       exit(0);
+               if (write(sock, &cred.pid, sizeof(pid_t)) != sizeof(pid_t))
+                       exit(1);
+       }
+       exit(0);
+}
 
-       if (offset)
-               return -EIO;
+/*
+ * pid_to_ns_wrapper: when you setns into a pidns, you yourself remain
+ * in your old pidns.  Only children which you fork will be in the target
+ * pidns.  So the pid_to_ns_wrapper does the setns, then forks a child to
+ * actually convert pids
+ */
+static void pid_to_ns_wrapper(int sock, pid_t tpid)
+{
+       int newnsfd = -1, ret, cpipe[2];
+       char fnam[100];
+       pid_t cpid;
+       struct timeval tv;
+       fd_set s;
+       char v;
+
+       sprintf(fnam, "/proc/%d/ns/pid", tpid);
+       newnsfd = open(fnam, O_RDONLY);
+       if (newnsfd < 0)
+               exit(1);
+       if (setns(newnsfd, 0) < 0)
+               exit(1);
+       close(newnsfd);
+
+       if (pipe(cpipe) < 0)
+               exit(1);
+
+loop:
+       cpid = fork();
+       if (cpid < 0)
+               exit(1);
+
+       if (!cpid) {
+               char b = '1';
+               close(cpipe[0]);
+               if (write(cpipe[1], &b, sizeof(char)) < 0) {
+                       fprintf(stderr, "%s (child): erorr on write: %s\n",
+                               __func__, strerror(errno));
+               }
+               close(cpipe[1]);
+               pid_to_ns(sock, tpid);
+       }
+       // give the child 1 second to be done forking and
+       // write it's ack
+       FD_ZERO(&s);
+       FD_SET(cpipe[0], &s);
+       tv.tv_sec = 1;
+       tv.tv_usec = 0;
+       ret = select(cpipe[0]+1, &s, NULL, NULL, &tv);
+       if (ret <= 0)
+               goto again;
+       ret = read(cpipe[0], &v, 1);
+       if (ret != sizeof(char) || v != '1') {
+               goto again;
+       }
 
-       if (!fc)
-               return -EIO;
+       if (!wait_for_pid(cpid))
+               exit(1);
+       exit(0);
 
-       controller = pick_controller_from_path(fc, path);
-       if (!controller)
-               return -EIO;
-       cgroup = find_cgroup_in_path(path);
-       if (!cgroup)
-               return -EINVAL;
+again:
+       kill(cpid, SIGKILL);
+       wait_for_pid(cpid);
+       goto loop;
+}
 
-       get_cgdir_and_path(cgroup, &cgdir, &fpath);
-       if (!fpath) {
-               path1 = "/";
-               path2 = cgdir;
-       } else {
-               path1 = cgdir;
-               path2 = fpath;
+/*
+ * To read cgroup files with a particular pid, we will setns into the child
+ * pidns, open a pipe, fork a child - which will be the first to really be in
+ * the child ns - which does the cgm_get_value and writes the data to the pipe.
+ */
+static bool do_read_pids(pid_t tpid, const char *contrl, const char *cg, const char *file, char **d)
+{
+       int sock[2] = {-1, -1};
+       nih_local char *tmpdata = NULL;
+       int ret;
+       pid_t qpid, cpid = -1;
+       bool answer = false;
+       char v = '0';
+       struct ucred cred;
+       struct timeval tv;
+       fd_set s;
+
+       if (!cgm_get_value(contrl, cg, file, &tmpdata))
+               return false;
+
+       /*
+        * Now we read the pids from returned data one by one, pass
+        * them into a child in the target namespace, read back the
+        * translated pids, and put them into our to-return data
+        */
+
+       if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sock) < 0) {
+               perror("socketpair");
+               exit(1);
        }
 
-       if ((k = get_cgroup_key(controller, path1, path2)) != NULL) {
-               if (!fc_may_access(fc, controller, path1, path2, O_WRONLY))
-                       return -EPERM;
+       cpid = fork();
+       if (cpid == -1)
+               goto out;
 
-               if (!cgm_set_value(controller, path1, path2, buf))
-                       return -EINVAL;
+       if (!cpid) // child
+               pid_to_ns_wrapper(sock[1], tpid);
+
+       char *ptr = tmpdata;
+       cred.uid = 0;
+       cred.gid = 0;
+       while (sscanf(ptr, "%d\n", &qpid) == 1) {
+               cred.pid = qpid;
+               ret = send_creds(sock[0], &cred, v, true);
+
+               if (ret == SEND_CREDS_NOTSK)
+                       goto next;
+               if (ret == SEND_CREDS_FAIL)
+                       goto out;
+
+               // read converted results
+               FD_ZERO(&s);
+               FD_SET(sock[0], &s);
+               tv.tv_sec = 2;
+               tv.tv_usec = 0;
+               ret = select(sock[0]+1, &s, NULL, NULL, &tv);
+               if (ret <= 0) {
+                       fprintf(stderr, "%s: select error waiting for pid from child: %s\n",
+                               __func__, strerror(errno));
+                       goto out;
+               }
+               if (read(sock[0], &qpid, sizeof(qpid)) != sizeof(qpid)) {
+                       fprintf(stderr, "%s: error reading pid from child: %s\n",
+                               __func__, strerror(errno));
+                       goto out;
+               }
+               NIH_MUST( nih_strcat_sprintf(d, NULL, "%d\n", qpid) );
+next:
+               ptr = strchr(ptr, '\n');
+               if (!ptr)
+                       break;
+               ptr++;
+       }
 
-               return size;
+       cred.pid = getpid();
+       v = '1';
+       if (send_creds(sock[0], &cred, v, true) != SEND_CREDS_OK) {
+               // failed to ask child to exit
+               fprintf(stderr, "%s: failed to ask child to exit: %s\n",
+                       __func__, strerror(errno));
+               goto out;
        }
 
-       return -EINVAL;
+       answer = true;
+
+out:
+       if (cpid != -1)
+               wait_for_pid(cpid);
+       if (sock[0] != -1) {
+               close(sock[0]);
+               close(sock[1]);
+       }
+       return answer;
 }
 
-int cg_chown(const char *path, uid_t uid, gid_t gid)
+static int cg_read(const char *path, char *buf, size_t size, off_t offset,
+               struct fuse_file_info *fi)
 {
        struct fuse_context *fc = fuse_get_context();
-       nih_local char * cgdir = NULL;
-       char *fpath = NULL, *path1, *path2;
+       struct file_info *f = (struct file_info *)fi->fh;
        nih_local struct cgm_keys *k = NULL;
-       const char *cgroup;
-       nih_local char *controller = NULL;
 
+       if (f->type != LXC_TYPE_CGFILE) {
+               fprintf(stderr, "Internal error: directory cache info used in cg_read\n");
+               return -EIO;
+       }
+
+       if (offset)
+               return -EIO;
 
        if (!fc)
                return -EIO;
 
-       if (strcmp(path, "/cgroup") == 0)
+       if (!f->controller)
                return -EINVAL;
 
-       controller = pick_controller_from_path(fc, path);
-       if (!controller)
-               return -EIO;
-       cgroup = find_cgroup_in_path(path);
-       if (!cgroup)
-               /* this is just /cgroup/controller */
-               return -EINVAL;
+       if ((k = get_cgroup_key(f->controller, f->cgroup, f->file)) != NULL) {
+               nih_local char *data = NULL;
+               int s;
+               bool r;
+
+               if (!fc_may_access(fc, f->controller, f->cgroup, f->file, O_RDONLY))
+                       // should never get here
+                       return -EACCES;
+
+               if (strcmp(f->file, "tasks") == 0 ||
+                               strcmp(f->file, "/tasks") == 0 ||
+                               strcmp(f->file, "/cgroup.procs") == 0 ||
+                               strcmp(f->file, "cgroup.procs") == 0)
+                       // special case - we have to translate the pids
+                       r = do_read_pids(fc->pid, f->controller, f->cgroup, f->file, &data);
+               else
+                       r = cgm_get_value(f->controller, f->cgroup, f->file, &data);
+
+               if (!r)
+                       return -EINVAL;
 
-       get_cgdir_and_path(cgroup, &cgdir, &fpath);
+               if (!data)
+                       return 0;
+               s = strlen(data);
+               if (s > size)
+                       s = size;
+               memcpy(buf, data, s);
+
+               return s;
+       }
+
+       return -EINVAL;
+}
+
+static void pid_from_ns(int sock, pid_t tpid)
+{
+       pid_t vpid;
+       struct ucred cred;
+       char v;
+       struct timeval tv;
+       fd_set s;
+       int ret;
+
+       cred.uid = 0;
+       cred.gid = 0;
+       while (1) {
+               FD_ZERO(&s);
+               FD_SET(sock, &s);
+               tv.tv_sec = 2;
+               tv.tv_usec = 0;
+               ret = select(sock+1, &s, NULL, NULL, &tv);
+               if (ret <= 0) {
+                       fprintf(stderr, "%s: bad select before read from parent: %s\n",
+                               __func__, strerror(errno));
+                       exit(1);
+               }
+               if ((ret = read(sock, &vpid, sizeof(pid_t))) != sizeof(pid_t)) {
+                       fprintf(stderr, "%s: bad read from parent: %s\n",
+                               __func__, strerror(errno));
+                       exit(1);
+               }
+               if (vpid == -1) // done
+                       break;
+               v = '0';
+               cred.pid = vpid;
+               if (send_creds(sock, &cred, v, true) != SEND_CREDS_OK) {
+                       v = '1';
+                       cred.pid = getpid();
+                       if (send_creds(sock, &cred, v, false) != SEND_CREDS_OK)
+                               exit(1);
+               }
+       }
+       exit(0);
+}
+
+static void pid_from_ns_wrapper(int sock, pid_t tpid)
+{
+       int newnsfd = -1, ret, cpipe[2];
+       char fnam[100];
+       pid_t cpid;
+       fd_set s;
+       struct timeval tv;
+       char v;
+
+       sprintf(fnam, "/proc/%d/ns/pid", tpid);
+       newnsfd = open(fnam, O_RDONLY);
+       if (newnsfd < 0)
+               exit(1);
+       if (setns(newnsfd, 0) < 0)
+               exit(1);
+       close(newnsfd);
+
+       if (pipe(cpipe) < 0)
+               exit(1);
+
+loop:
+       cpid = fork();
+
+       if (cpid < 0)
+               exit(1);
+
+       if (!cpid) {
+               char b = '1';
+               close(cpipe[0]);
+               if (write(cpipe[1], &b, sizeof(char)) < 0) {
+                       fprintf(stderr, "%s (child): erorr on write: %s\n",
+                               __func__, strerror(errno));
+               }
+               close(cpipe[1]);
+               pid_from_ns(sock, tpid);
+       }
+
+       // give the child 1 second to be done forking and
+       // write it's ack
+       FD_ZERO(&s);
+       FD_SET(cpipe[0], &s);
+       tv.tv_sec = 1;
+       tv.tv_usec = 0;
+       ret = select(cpipe[0]+1, &s, NULL, NULL, &tv);
+       if (ret <= 0)
+               goto again;
+       ret = read(cpipe[0], &v, 1);
+       if (ret != sizeof(char) || v != '1') {
+               goto again;
+       }
+
+       if (!wait_for_pid(cpid))
+               exit(1);
+       exit(0);
+
+again:
+       kill(cpid, SIGKILL);
+       wait_for_pid(cpid);
+       goto loop;
+}
+
+static bool do_write_pids(pid_t tpid, const char *contrl, const char *cg, const char *file, const char *buf)
+{
+       int sock[2] = {-1, -1};
+       pid_t qpid, cpid = -1;
+       bool answer = false, fail = false;
+
+       /*
+        * write the pids to a socket, have helper in writer's pidns
+        * call movepid for us
+        */
+       if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sock) < 0) {
+               perror("socketpair");
+               exit(1);
+       }
+
+       cpid = fork();
+       if (cpid == -1)
+               goto out;
+
+       if (!cpid) // child
+               pid_from_ns_wrapper(sock[1], tpid);
+
+       const char *ptr = buf;
+       while (sscanf(ptr, "%d", &qpid) == 1) {
+               struct ucred cred;
+               char v;
+
+               if (write(sock[0], &qpid, sizeof(qpid)) != sizeof(qpid)) {
+                       fprintf(stderr, "%s: error writing pid to child: %s\n",
+                               __func__, strerror(errno));
+                       goto out;
+               }
+
+               if (recv_creds(sock[0], &cred, &v)) {
+                       if (v == '0') {
+                               if (!cgm_move_pid(contrl, cg, cred.pid))
+                                       fail = true;
+                       }
+               }
+
+               ptr = strchr(ptr, '\n');
+               if (!ptr)
+                       break;
+               ptr++;
+       }
+
+       /* All good, write the value */
+       qpid = -1;
+       if (write(sock[0], &qpid ,sizeof(qpid)) != sizeof(qpid))
+               fprintf(stderr, "Warning: failed to ask child to exit\n");
+
+       if (!fail)
+               answer = true;
+
+out:
+       if (cpid != -1)
+               wait_for_pid(cpid);
+       if (sock[0] != -1) {
+               close(sock[0]);
+               close(sock[1]);
+       }
+       return answer;
+}
+
+int cg_write(const char *path, const char *buf, size_t size, off_t offset,
+            struct fuse_file_info *fi)
+{
+       struct fuse_context *fc = fuse_get_context();
+       nih_local char *localbuf = NULL;
+       nih_local struct cgm_keys *k = NULL;
+       struct file_info *f = (struct file_info *)fi->fh;
+
+       if (f->type != LXC_TYPE_CGFILE) {
+               fprintf(stderr, "Internal error: directory cache info used in cg_write\n");
+               return -EIO;
+       }
+
+       if (offset)
+               return -EINVAL;
+
+       if (!fc)
+               return -EIO;
+
+       localbuf = NIH_MUST( nih_alloc(NULL, size+1) );
+       localbuf[size] = '\0';
+       memcpy(localbuf, buf, size);
+
+       if ((k = get_cgroup_key(f->controller, f->cgroup, f->file)) != NULL) {
+               bool r;
+
+               if (!fc_may_access(fc, f->controller, f->cgroup, f->file, O_WRONLY))
+                       return -EACCES;
+
+               if (strcmp(f->file, "tasks") == 0 ||
+                               strcmp(f->file, "/tasks") == 0 ||
+                               strcmp(f->file, "/cgroup.procs") == 0 ||
+                               strcmp(f->file, "cgroup.procs") == 0)
+                       // special case - we have to translate the pids
+                       r = do_write_pids(fc->pid, f->controller, f->cgroup, f->file, localbuf);
+               else
+                       r = cgm_set_value(f->controller, f->cgroup, f->file, localbuf);
+
+               if (!r)
+                       return -EINVAL;
+
+               return size;
+       }
+
+       return -EINVAL;
+}
+
+int cg_chown(const char *path, uid_t uid, gid_t gid)
+{
+       struct fuse_context *fc = fuse_get_context();
+       nih_local char * cgdir = NULL;
+       char *fpath = NULL, *path1, *path2;
+       nih_local struct cgm_keys *k = NULL;
+       const char *cgroup;
+       nih_local char *controller = NULL;
+
+
+       if (!fc)
+               return -EIO;
+
+       if (strcmp(path, "/cgroup") == 0)
+               return -EINVAL;
+
+       controller = pick_controller_from_path(fc, path);
+       if (!controller)
+               return -EINVAL;
+       cgroup = find_cgroup_in_path(path);
+       if (!cgroup)
+               /* this is just /cgroup/controller */
+               return -EINVAL;
+
+       get_cgdir_and_path(cgroup, &cgdir, &fpath);
 
        if (!fpath) {
                path1 = "/";
@@ -680,7 +1365,7 @@ int cg_chown(const char *path, uid_t uid, gid_t gid)
         * over the file's current owner.
         */
        if (!is_privileged_over(fc->pid, fc->uid, k->uid, NS_ROOT_REQD))
-               return -EPERM;
+               return -EACCES;
 
        if (!cgm_chown_file(controller, cgroup, uid, gid))
                return -EINVAL;
@@ -689,6 +1374,60 @@ int cg_chown(const char *path, uid_t uid, gid_t gid)
 
 int cg_chmod(const char *path, mode_t mode)
 {
+       struct fuse_context *fc = fuse_get_context();
+       nih_local char * cgdir = NULL;
+       char *fpath = NULL, *path1, *path2;
+       nih_local struct cgm_keys *k = NULL;
+       const char *cgroup;
+       nih_local char *controller = NULL;
+
+       if (!fc)
+               return -EIO;
+
+       if (strcmp(path, "/cgroup") == 0)
+               return -EINVAL;
+
+       controller = pick_controller_from_path(fc, path);
+       if (!controller)
+               return -EINVAL;
+       cgroup = find_cgroup_in_path(path);
+       if (!cgroup)
+               /* this is just /cgroup/controller */
+               return -EINVAL;
+
+       get_cgdir_and_path(cgroup, &cgdir, &fpath);
+
+       if (!fpath) {
+               path1 = "/";
+               path2 = cgdir;
+       } else {
+               path1 = cgdir;
+               path2 = fpath;
+       }
+
+       if (is_child_cgroup(controller, path1, path2)) {
+               // get uid, gid, from '/tasks' file and make up a mode
+               // That is a hack, until cgmanager gains a GetCgroupPerms fn.
+               k = get_cgroup_key(controller, cgroup, "tasks");
+
+       } else
+               k = get_cgroup_key(controller, path1, path2);
+
+       if (!k)
+               return -EINVAL;
+
+       /*
+        * This being a fuse request, the uid and gid must be valid
+        * in the caller's namespace.  So we can just check to make
+        * sure that the caller is root in his uid, and privileged
+        * over the file's current owner.
+        */
+       if (!is_privileged_over(fc->pid, fc->uid, k->uid, NS_ROOT_OPT))
+               return -EPERM;
+
+       if (!cgm_chmod_file(controller, cgroup, mode))
+               return -EINVAL;
+       return 0;
 }
 
 int cg_mkdir(const char *path, mode_t mode)
@@ -706,11 +1445,11 @@ int cg_mkdir(const char *path, mode_t mode)
 
        controller = pick_controller_from_path(fc, path);
        if (!controller)
-               return -EIO;
+               return -EINVAL;
 
        cgroup = find_cgroup_in_path(path);
        if (!cgroup)
-               return -EIO;
+               return -EINVAL;
 
        get_cgdir_and_path(cgroup, &cgdir, &fpath);
        if (!fpath)
@@ -719,7 +1458,7 @@ int cg_mkdir(const char *path, mode_t mode)
                path1 = cgdir;
 
        if (!fc_may_access(fc, controller, path1, NULL, O_RDWR))
-               return -EPERM;
+               return -EACCES;
 
 
        if (!cgm_create(controller, cgroup, fc->uid, fc->gid))
@@ -743,18 +1482,18 @@ static int cg_rmdir(const char *path)
 
        controller = pick_controller_from_path(fc, path);
        if (!controller)
-               return -EIO;
+               return -EINVAL;
 
        cgroup = find_cgroup_in_path(path);
        if (!cgroup)
-               return -EIO;
+               return -EINVAL;
 
        get_cgdir_and_path(cgroup, &cgdir, &fpath);
        if (!fpath)
                return -EINVAL;
 
        if (!fc_may_access(fc, controller, cgdir, NULL, O_WRONLY))
-               return -EPERM;
+               return -EACCES;
 
        if (!cgm_remove(controller, cgroup))
                return -EINVAL;
@@ -762,19 +1501,713 @@ static int cg_rmdir(const char *path)
        return 0;
 }
 
+static bool startswith(const char *line, const char *pref)
+{
+       if (strncmp(line, pref, strlen(pref)) == 0)
+               return true;
+       return false;
+}
+
+static void get_mem_cached(char *memstat, unsigned long *v)
+{
+       char *eol;
+
+       *v = 0;
+       while (*memstat) {
+               if (startswith(memstat, "total_cache")) {
+                       sscanf(memstat + 11, "%lu", v);
+                       *v /= 1024;
+                       return;
+               }
+               eol = strchr(memstat, '\n');
+               if (!eol)
+                       return;
+               memstat = eol+1;
+       }
+}
+
+static void get_blkio_io_value(char *str, unsigned major, unsigned minor, char *iotype, unsigned long *v)
+{   
+       char *eol;
+       char key[32];
+       
+       memset(key, 0, 32);
+       snprintf(key, 32, "%u:%u %s", major, minor, iotype);
+       
+       size_t len = strlen(key);
+       *v = 0;
+
+       while (*str) {
+               if (startswith(str, key)) {
+                       sscanf(str + len, "%lu", v);
+                       return;
+               }
+               eol = strchr(str, '\n');
+               if (!eol)
+                       return;
+               str = eol+1;
+       }
+}
+
+static char *get_pid_cgroup(pid_t pid, const char *contrl)
+{
+       nih_local char *fnam = NULL;
+       FILE *f;
+       char *answer = NULL;
+       char *line = NULL;
+       size_t len = 0;
+
+       fnam = NIH_MUST( nih_sprintf(NULL, "/proc/%d/cgroup", pid) );
+       if (!(f = fopen(fnam, "r")))
+               return false;
+
+       while (getline(&line, &len, f) != -1) {
+               char *c1, *c2;
+               if (!line[0])
+                       continue;
+               c1 = strchr(line, ':');
+               if (!c1)
+                       goto out;
+               c1++;
+               c2 = strchr(c1, ':');
+               if (!c2)
+                       goto out;
+               *c2 = '\0';
+               if (strcmp(c1, contrl) != 0)
+                       continue;
+               c2++;
+               stripnewline(c2);
+               answer = NIH_MUST( nih_strdup(NULL, c2) );
+               goto out;
+       }
+
+out:
+       fclose(f);
+       free(line);
+       return answer;
+}
+
 /*
  * FUSE ops for /proc
  */
 
+static int proc_meminfo_read(char *buf, size_t size, off_t offset,
+               struct fuse_file_info *fi)
+{
+       struct fuse_context *fc = fuse_get_context();
+       nih_local char *cg = get_pid_cgroup(fc->pid, "memory");
+       nih_local char *memlimit_str = NULL, *memusage_str = NULL, *memstat_str = NULL;
+       unsigned long memlimit = 0, memusage = 0, cached = 0, hosttotal = 0;
+       char *line = NULL;
+       size_t linelen = 0, total_len = 0;
+       FILE *f;
+
+       if (offset)
+               return -EINVAL;
+
+       if (!cg)
+               return 0;
+
+       if (!cgm_get_value("memory", cg, "memory.limit_in_bytes", &memlimit_str))
+               return 0;
+       if (!cgm_get_value("memory", cg, "memory.usage_in_bytes", &memusage_str))
+               return 0;
+       if (!cgm_get_value("memory", cg, "memory.stat", &memstat_str))
+               return 0;
+       memlimit = strtoul(memlimit_str, NULL, 10);
+       memusage = strtoul(memusage_str, NULL, 10);
+       memlimit /= 1024;
+       memusage /= 1024;
+       get_mem_cached(memstat_str, &cached);
+
+       f = fopen("/proc/meminfo", "r");
+       if (!f)
+               return 0;
+
+       while (getline(&line, &linelen, f) != -1) {
+               size_t l;
+               char *printme, lbuf[100];
+
+               memset(lbuf, 0, 100);
+               if (startswith(line, "MemTotal:")) {
+                       sscanf(line+14, "%lu", &hosttotal);
+                       if (hosttotal < memlimit)
+                               memlimit = hosttotal;
+                       snprintf(lbuf, 100, "MemTotal:       %8lu kB\n", memlimit);
+                       printme = lbuf;
+               } else if (startswith(line, "MemFree:")) {
+                       snprintf(lbuf, 100, "MemFree:        %8lu kB\n", memlimit - memusage);
+                       printme = lbuf;
+               } else if (startswith(line, "MemAvailable:")) {
+                       snprintf(lbuf, 100, "MemAvailable:   %8lu kB\n", memlimit - memusage);
+                       printme = lbuf;
+               } else if (startswith(line, "Buffers:")) {
+                       snprintf(lbuf, 100, "Buffers:        %8lu kB\n", 0UL);
+                       printme = lbuf;
+               } else if (startswith(line, "Cached:")) {
+                       snprintf(lbuf, 100, "Cached:         %8lu kB\n", cached);
+                       printme = lbuf;
+               } else if (startswith(line, "SwapCached:")) {
+                       snprintf(lbuf, 100, "SwapCached:     %8lu kB\n", 0UL);
+                       printme = lbuf;
+               } else
+                       printme = line;
+               l = snprintf(buf, size, "%s", printme);
+               buf += l;
+               size -= l;
+               total_len += l;
+       }
+
+       fclose(f);
+       free(line);
+       return total_len;
+}
+
+/*
+ * Read the cpuset.cpus for cg
+ * Return the answer in a nih_alloced string
+ */
+static char *get_cpuset(const char *cg)
+{
+       char *answer;
+
+       if (!cgm_get_value("cpuset", cg, "cpuset.cpus", &answer))
+               return NULL;
+       return answer;
+}
+
+/*
+ * Helper functions for cpuset_in-set
+ */
+char *cpuset_nexttok(const char *c)
+{
+       char *r = strchr(c+1, ',');
+       if (r)
+               return r+1;
+       return NULL;
+}
+
+int cpuset_getrange(const char *c, int *a, int *b)
+{
+       int ret;
+
+       ret = sscanf(c, "%d-%d", a, b);
+       return ret;
+}
+
+/*
+ * cpusets are in format "1,2-3,4"
+ * iow, comma-delimited ranges
+ */
+static bool cpu_in_cpuset(int cpu, const char *cpuset)
+{
+       const char *c;
+
+       for (c = cpuset; c; c = cpuset_nexttok(c)) {
+               int a, b, ret;
+
+               ret = cpuset_getrange(c, &a, &b);
+               if (ret == 1 && cpu == a)
+                       return true;
+               if (ret != 2) // bad cpuset!
+                       return false;
+               if (cpu >= a && cpu <= b)
+                       return true;
+       }
+
+       return false;
+}
+
+static bool cpuline_in_cpuset(const char *line, const char *cpuset)
+{
+       int cpu;
+
+       if (sscanf(line, "processor       : %d", &cpu) != 1)
+               return false;
+       return cpu_in_cpuset(cpu, cpuset);
+}
+
+/*
+ * check whether this is a '^processor" line in /proc/cpuinfo
+ */
+static bool is_processor_line(const char *line)
+{
+       int cpu;
+
+       if (sscanf(line, "processor       : %d", &cpu) == 1)
+               return true;
+       return false;
+}
+
+static int proc_cpuinfo_read(char *buf, size_t size, off_t offset,
+               struct fuse_file_info *fi)
+{
+       struct fuse_context *fc = fuse_get_context();
+       nih_local char *cg = get_pid_cgroup(fc->pid, "cpuset");
+       nih_local char *cpuset = NULL;
+       char *line = NULL;
+       size_t linelen = 0, total_len = 0;
+       bool am_printing = false;
+       int curcpu = -1;
+       FILE *f;
+
+       if (offset)
+               return -EINVAL;
+
+       if (!cg)
+               return 0;
+
+       cpuset = get_cpuset(cg);
+       if (!cpuset)
+               return 0;
+
+       f = fopen("/proc/cpuinfo", "r");
+       if (!f)
+               return 0;
+
+       while (getline(&line, &linelen, f) != -1) {
+               size_t l;
+               if (is_processor_line(line)) {
+                       am_printing = cpuline_in_cpuset(line, cpuset);
+                       if (am_printing) {
+                               curcpu ++;
+                               l = snprintf(buf, size, "processor      : %d\n", curcpu);
+                               buf += l;
+                               size -= l;
+                               total_len += l;
+                       }
+                       continue;
+               }
+               if (am_printing) {
+                       l = snprintf(buf, size, "%s", line);
+                       buf += l;
+                       size -= l;
+                       total_len += l;
+               }
+       }
+
+       fclose(f);
+       free(line);
+       return total_len;
+}
+
+static int proc_stat_read(char *buf, size_t size, off_t offset,
+               struct fuse_file_info *fi)
+{
+       struct fuse_context *fc = fuse_get_context();
+       nih_local char *cg = get_pid_cgroup(fc->pid, "cpuset");
+       nih_local char *cpuset = NULL;
+       char *line = NULL;
+       size_t linelen = 0, total_len = 0;
+       int curcpu = -1; /* cpu numbering starts at 0 */
+       FILE *f;
+
+       if (offset)
+               return -EINVAL;
+
+       if (!cg)
+               return 0;
+
+       cpuset = get_cpuset(cg);
+       if (!cpuset)
+               return 0;
+
+       f = fopen("/proc/stat", "r");
+       if (!f)
+               return 0;
+
+       while (getline(&line, &linelen, f) != -1) {
+               size_t l;
+               int cpu;
+               char cpu_char[10]; /* That's a lot of cores */
+               char *c;
+
+               if (sscanf(line, "cpu%9[^ ]", cpu_char) != 1) {
+                       /* not a ^cpuN line containing a number N, just print it */
+                       l = snprintf(buf, size, "%s", line);
+                       buf += l;
+                       size -= l;
+                       total_len += l;
+                       continue;
+               }
+
+               if (sscanf(cpu_char, "%d", &cpu) != 1)
+                       continue;
+               if (!cpu_in_cpuset(cpu, cpuset))
+                       continue;
+               curcpu ++;
+
+               c = strchr(line, ' ');
+               if (!c)
+                       continue;
+               l = snprintf(buf, size, "cpu%d %s", curcpu, c);
+               buf += l;
+               size -= l;
+               total_len += l;
+       }
+
+       fclose(f);
+       free(line);
+       return total_len;
+}
+
+/*
+ * How to guess what to present for uptime?
+ * One thing we could do would be to take the date on the caller's
+ * memory.usage_in_bytes file, which should equal the time of creation
+ * of his cgroup.  However, a task could be in a sub-cgroup of the
+ * container.  The same problem exists if we try to look at the ages
+ * of processes in the caller's cgroup.
+ *
+ * So we'll fork a task that will enter the caller's pidns, mount a
+ * fresh procfs, get the age of /proc/1, and pass that back over a pipe.
+ *
+ * For the second uptime #, we'll do as Stéphane had done, just copy
+ * the number from /proc/uptime.  Not sure how to best emulate 'idle'
+ * time.  Maybe someone can come up with a good algorithm and submit a
+ * patch.  Maybe something based on cpushare info?
+ */
+
+/* return age of the reaper for $pid, taken from ctime of its procdir */
+static long int get_pid1_time(pid_t pid)
+{
+       char fnam[100];
+       int fd, cpipe[2], ret;
+       struct stat sb;
+       pid_t cpid;
+       struct timeval tv;
+       fd_set s;
+       char v;
+
+       if (unshare(CLONE_NEWNS))
+               return 0;
+
+       if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL)) {
+               perror("rslave mount failed");
+               return 0;
+       }
+
+       sprintf(fnam, "/proc/%d/ns/pid", pid);
+       fd = open(fnam, O_RDONLY);
+       if (fd < 0) {
+               perror("get_pid1_time open of ns/pid");
+               return 0;
+       }
+       if (setns(fd, 0)) {
+               perror("get_pid1_time setns 1");
+               close(fd);
+               return 0;
+       }
+       close(fd);
+
+       if (pipe(cpipe) < 0)
+               exit(1);
+
+loop:
+       cpid = fork();
+       if (cpid < 0)
+               return 0;
+
+       if (!cpid) {
+               char b = '1';
+               close(cpipe[0]);
+               if (write(cpipe[1], &b, sizeof(char)) < 0) {
+                       fprintf(stderr, "%s (child): erorr on write: %s\n",
+                               __func__, strerror(errno));
+               }
+               close(cpipe[1]);
+               umount2("/proc", MNT_DETACH);
+               if (mount("proc", "/proc", "proc", 0, NULL)) {
+                       perror("get_pid1_time mount");
+                       return 0;
+               }
+               ret = lstat("/proc/1", &sb);
+               if (ret) {
+                       perror("get_pid1_time lstat");
+                       return 0;
+               }
+               return time(NULL) - sb.st_ctime;
+       }
+
+       // give the child 1 second to be done forking and
+       // write it's ack
+       FD_ZERO(&s);
+       FD_SET(cpipe[0], &s);
+       tv.tv_sec = 1;
+       tv.tv_usec = 0;
+       ret = select(cpipe[0]+1, &s, NULL, NULL, &tv);
+       if (ret <= 0)
+               goto again;
+       ret = read(cpipe[0], &v, 1);
+       if (ret != sizeof(char) || v != '1') {
+               goto again;
+       }
+
+       wait_for_pid(cpid);
+       exit(0);
+
+again:
+       kill(cpid, SIGKILL);
+       wait_for_pid(cpid);
+       goto loop;
+}
+
+static long int getreaperage(pid_t qpid)
+{
+       int pid, mypipe[2], ret;
+       struct timeval tv;
+       fd_set s;
+       long int mtime, answer = 0;
+
+       if (pipe(mypipe)) {
+               return 0;
+       }
+
+       pid = fork();
+
+       if (!pid) { // child
+               mtime = get_pid1_time(qpid);
+               if (write(mypipe[1], &mtime, sizeof(mtime)) != sizeof(mtime))
+                       fprintf(stderr, "Warning: bad write from getreaperage\n");
+               exit(0);
+       }
+
+       close(mypipe[1]);
+       FD_ZERO(&s);
+       FD_SET(mypipe[0], &s);
+       tv.tv_sec = 1;
+       tv.tv_usec = 0;
+       ret = select(mypipe[0]+1, &s, NULL, NULL, &tv);
+       if (ret <= 0) {
+               perror("select");
+               goto out;
+       }
+       if (!ret) {
+               fprintf(stderr, "timed out\n");
+               goto out;
+       }
+       if (read(mypipe[0], &mtime, sizeof(mtime)) != sizeof(mtime)) {
+               perror("read");
+               goto out;
+       }
+       answer = mtime;
+
+out:
+       wait_for_pid(pid);
+       close(mypipe[0]);
+       return answer;
+}
+
+static long int getprocidle(void)
+{
+       FILE *f = fopen("/proc/uptime", "r");
+       long int age, idle;
+       int ret;
+       if (!f)
+               return 0;
+       ret = fscanf(f, "%ld %ld", &age, &idle);
+       fclose(f);
+       if (ret != 2)
+               return 0;
+       return idle;
+}
+
+/*
+ * We read /proc/uptime and reuse its second field.
+ * For the first field, we use the mtime for the reaper for
+ * the calling pid as returned by getreaperage
+ */
+static int proc_uptime_read(char *buf, size_t size, off_t offset,
+               struct fuse_file_info *fi)
+{
+       struct fuse_context *fc = fuse_get_context();
+       long int reaperage = getreaperage(fc->pid);;
+       long int idletime = getprocidle();
+
+       if (offset)
+               return -EINVAL;
+       return snprintf(buf, size, "%ld %ld\n", reaperage, idletime);
+}
+
+static int proc_diskstats_read(char *buf, size_t size, off_t offset,
+               struct fuse_file_info *fi)
+{
+       char dev_name[72];
+       struct fuse_context *fc = fuse_get_context();
+       nih_local char *cg = get_pid_cgroup(fc->pid, "blkio");
+       nih_local char *io_serviced_str = NULL, *io_merged_str = NULL, *io_service_bytes_str = NULL,
+                       *io_wait_time_str = NULL, *io_service_time_str = NULL;
+       unsigned long read = 0, write = 0;
+       unsigned long read_merged = 0, write_merged = 0;
+       unsigned long read_sectors = 0, write_sectors = 0;
+       unsigned long read_ticks = 0, write_ticks = 0;
+       unsigned long ios_pgr = 0, tot_ticks = 0, rq_ticks = 0;
+       unsigned long rd_svctm = 0, wr_svctm = 0, rd_wait = 0, wr_wait = 0;
+       char *line = NULL;
+       size_t linelen = 0, total_len = 0;
+       unsigned int major = 0, minor = 0;
+       int i = 0;
+       FILE *f;
+
+       if (offset)
+               return -EINVAL;
+
+       if (!cg)
+               return 0;
+
+       if (!cgm_get_value("blkio", cg, "blkio.io_serviced", &io_serviced_str))
+               return 0;
+       if (!cgm_get_value("blkio", cg, "blkio.io_merged", &io_merged_str))
+               return 0;
+       if (!cgm_get_value("blkio", cg, "blkio.io_service_bytes", &io_service_bytes_str))
+               return 0;
+       if (!cgm_get_value("blkio", cg, "blkio.io_wait_time", &io_wait_time_str))
+               return 0;
+       if (!cgm_get_value("blkio", cg, "blkio.io_service_time", &io_service_time_str))
+               return 0;
+
+
+       f = fopen("/proc/diskstats", "r");
+       if (!f)
+               return 0;
+
+       while (getline(&line, &linelen, f) != -1) {
+               size_t l;
+               char *printme, lbuf[256];
+
+               i = sscanf(line, "%u %u %s", &major, &minor, dev_name);
+               if(i == 3){
+                       get_blkio_io_value(io_serviced_str, major, minor, "Read", &read);
+                       get_blkio_io_value(io_serviced_str, major, minor, "Write", &write);
+                       get_blkio_io_value(io_merged_str, major, minor, "Read", &read_merged);
+                       get_blkio_io_value(io_merged_str, major, minor, "Write", &write_merged);
+                       get_blkio_io_value(io_service_bytes_str, major, minor, "Read", &read_sectors);
+                       read_sectors = read_sectors/512;
+                       get_blkio_io_value(io_service_bytes_str, major, minor, "Write", &write_sectors);
+                       write_sectors = write_sectors/512;
+                       
+                       get_blkio_io_value(io_service_time_str, major, minor, "Read", &rd_svctm);
+                       rd_svctm = rd_svctm/1000000;
+                       get_blkio_io_value(io_wait_time_str, major, minor, "Read", &rd_wait);
+                       rd_wait = rd_wait/1000000;
+                       read_ticks = rd_svctm + rd_wait;
+
+                       get_blkio_io_value(io_service_time_str, major, minor, "Write", &wr_svctm);
+                       wr_svctm =  wr_svctm/1000000;
+                       get_blkio_io_value(io_wait_time_str, major, minor, "Write", &wr_wait);
+                       wr_wait =  wr_wait/1000000;
+                       write_ticks = wr_svctm + wr_wait;
+
+                       get_blkio_io_value(io_service_time_str, major, minor, "Total", &tot_ticks);
+                       tot_ticks =  tot_ticks/1000000;
+               }else{
+                       continue;
+               }
+
+               memset(lbuf, 0, 256);
+               if (read || write || read_merged || write_merged || read_sectors || write_sectors || read_ticks || write_ticks) {
+                       snprintf(lbuf, 256, "%u       %u %s %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu\n", 
+                               major, minor, dev_name, read, read_merged, read_sectors, read_ticks,
+                               write, write_merged, write_sectors, write_ticks, ios_pgr, tot_ticks, rq_ticks);
+                       printme = lbuf;
+               } else
+                       continue;
+
+               l = snprintf(buf, size, "%s", printme);
+               buf += l;
+               size -= l;
+               total_len += l;
+       }
+
+       fclose(f);
+       free(line);
+       return total_len;
+}
+
+static off_t get_procfile_size(const char *which)
+{
+       FILE *f = fopen(which, "r");
+       char *line = NULL;
+       size_t len = 0;
+       ssize_t sz, answer = 0;
+       if (!f)
+               return 0;
+
+       while ((sz = getline(&line, &len, f)) != -1)
+               answer += sz;
+       fclose (f);
+       free(line);
+
+       return answer;
+}
+
 static int proc_getattr(const char *path, struct stat *sb)
 {
-       if (strcmp(path, "/proc") != 0)
+       struct timespec now;
+
+       memset(sb, 0, sizeof(struct stat));
+       if (clock_gettime(CLOCK_REALTIME, &now) < 0)
+               return -EINVAL;
+       sb->st_uid = sb->st_gid = 0;
+       sb->st_atim = sb->st_mtim = sb->st_ctim = now;
+       if (strcmp(path, "/proc") == 0) {
+               sb->st_mode = S_IFDIR | 00555;
+               sb->st_nlink = 2;
+               return 0;
+       }
+       if (strcmp(path, "/proc/meminfo") == 0 ||
+                       strcmp(path, "/proc/cpuinfo") == 0 ||
+                       strcmp(path, "/proc/uptime") == 0 ||
+                       strcmp(path, "/proc/stat") == 0 ||
+                       strcmp(path, "/proc/diskstats") == 0) {
+               sb->st_size = get_procfile_size(path);
+               sb->st_mode = S_IFREG | 00444;
+               sb->st_nlink = 1;
+               return 0;
+       }
+
+       return -ENOENT;
+}
+
+static int proc_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t offset,
+               struct fuse_file_info *fi)
+{
+       if (filler(buf, "cpuinfo", NULL, 0) != 0 ||
+                               filler(buf, "meminfo", NULL, 0) != 0 ||
+                               filler(buf, "stat", NULL, 0) != 0 ||
+                               filler(buf, "uptime", NULL, 0) != 0 ||
+                               filler(buf, "diskstats", NULL, 0) != 0)
                return -EINVAL;
-       sb->st_mode = S_IFDIR | 00755;
-       sb->st_nlink = 2;
        return 0;
 }
 
+static int proc_open(const char *path, struct fuse_file_info *fi)
+{
+       if (strcmp(path, "/proc/meminfo") == 0 ||
+                       strcmp(path, "/proc/cpuinfo") == 0 ||
+                       strcmp(path, "/proc/uptime") == 0 ||
+                       strcmp(path, "/proc/stat") == 0 || 
+                       strcmp(path, "/proc/diskstats") == 0)
+               return 0;
+       return -ENOENT;
+}
+
+static int proc_read(const char *path, char *buf, size_t size, off_t offset,
+               struct fuse_file_info *fi)
+{
+       if (strcmp(path, "/proc/meminfo") == 0)
+               return proc_meminfo_read(buf, size, offset, fi);
+       if (strcmp(path, "/proc/cpuinfo") == 0)
+               return proc_cpuinfo_read(buf, size, offset, fi);
+       if (strcmp(path, "/proc/uptime") == 0)
+               return proc_uptime_read(buf, size, offset, fi);
+       if (strcmp(path, "/proc/stat") == 0)
+               return proc_stat_read(buf, size, offset, fi);
+       if (strcmp(path, "/proc/diskstats") == 0)
+               return proc_diskstats_read(buf, size, offset, fi);
+       return -EINVAL;
+}
+
 /*
  * FUSE ops for /
  * these just delegate to the /proc and /cgroup ops as
@@ -791,7 +2224,7 @@ static int lxcfs_getattr(const char *path, struct stat *sb)
        if (strncmp(path, "/cgroup", 7) == 0) {
                return cg_getattr(path, sb);
        }
-       if (strncmp(path, "/proc", 7) == 0) {
+       if (strncmp(path, "/proc", 5) == 0) {
                return proc_getattr(path, sb);
        }
        return -EINVAL;
@@ -805,7 +2238,9 @@ static int lxcfs_opendir(const char *path, struct fuse_file_info *fi)
        if (strncmp(path, "/cgroup", 7) == 0) {
                return cg_opendir(path, fi);
        }
-       return -EINVAL;
+       if (strcmp(path, "/proc") == 0)
+               return 0;
+       return -ENOENT;
 }
 
 static int lxcfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler, off_t offset,
@@ -817,9 +2252,10 @@ static int lxcfs_readdir(const char *path, void *buf, fuse_fill_dir_t filler, of
                        return -EINVAL;
                return 0;
        }
-       if (strncmp(path, "/cgroup", 7) == 0) {
+       if (strncmp(path, "/cgroup", 7) == 0)
                return cg_readdir(path, buf, filler, offset, fi);
-       }
+       if (strcmp(path, "/proc") == 0)
+               return proc_readdir(path, buf, filler, offset, fi);
        return -EINVAL;
 }
 
@@ -830,14 +2266,17 @@ static int lxcfs_releasedir(const char *path, struct fuse_file_info *fi)
        if (strncmp(path, "/cgroup", 7) == 0) {
                return cg_releasedir(path, fi);
        }
+       if (strcmp(path, "/proc") == 0)
+               return 0;
        return -EINVAL;
 }
 
 static int lxcfs_open(const char *path, struct fuse_file_info *fi)
 {
-       if (strncmp(path, "/cgroup", 7) == 0) {
+       if (strncmp(path, "/cgroup", 7) == 0)
                return cg_open(path, fi);
-       }
+       if (strncmp(path, "/proc", 5) == 0)
+               return proc_open(path, fi);
 
        return -EINVAL;
 }
@@ -845,9 +2284,10 @@ static int lxcfs_open(const char *path, struct fuse_file_info *fi)
 static int lxcfs_read(const char *path, char *buf, size_t size, off_t offset,
                struct fuse_file_info *fi)
 {
-       if (strncmp(path, "/cgroup", 7) == 0) {
+       if (strncmp(path, "/cgroup", 7) == 0)
                return cg_read(path, buf, size, offset, fi);
-       }
+       if (strncmp(path, "/proc", 5) == 0)
+               return proc_read(path, buf, size, offset, fi);
 
        return -EINVAL;
 }
@@ -869,7 +2309,14 @@ static int lxcfs_flush(const char *path, struct fuse_file_info *fi)
 
 static int lxcfs_release(const char *path, struct fuse_file_info *fi)
 {
-       return 0;
+       if (strncmp(path, "/cgroup", 7) == 0)
+               return cg_release(path, fi);
+#if 0
+       if (strncmp(path, "/proc", 5) == 0)
+               return proc_close(path, fi);
+#endif
+
+       return -EINVAL;
 }
 
 static int lxcfs_fsync(const char *path, int datasync, struct fuse_file_info *fi)