refactoring /proc

executer/kernel/mcctrl/control.c

@@ -72,9 +72,6 @@ int (*mcctrl_sys_mount)(char *dev_name,char *dir_name, char *type, unsigned long
 //static DECLARE_WAIT_QUEUE_HEAD(wq_prepare);
 //extern struct mcctrl_channel *channels;
 int mcctrl_ikc_set_recv_cpu(ihk_os_t os, int cpu);
-extern int procfs_create_entry(void *os, int ref, int osnum, int pid, char *name,
-		int mode, void *opaque);
-extern void procfs_delete_entry(void *os, int osnum, char *fname);
 
 static long mcexec_prepare_image(ihk_os_t os,
                                  struct program_load_desc * __user udesc)
@@ -290,12 +287,15 @@ static void release_handler(ihk_os_t os, void *param)
 {
 	struct handlerinfo *info = param;
 	struct ikc_scd_packet isp;
+	int os_ind = ihk_host_os_get_index(os);
 
 	memset(&isp, '\0', sizeof isp);
 	isp.msg = SCD_MSG_CLEANUP_PROCESS;
 	isp.pid = info->pid;
 
 	mcctrl_ikc_send(os, 0, &isp);
+	if(os_ind >= 0)
+		delete_pid_entry(os_ind, info->pid);
 	kfree(param);
 }
 
@@ -861,7 +861,7 @@ int mcexec_open_exec(ihk_os_t os, char * __user filename)
 	struct mckernel_exec_file *mcef_iter;
 	int retval;
 	int os_ind = ihk_host_os_get_index(os);
-	char *proc_name, *pathbuf, *fullpath;
+	char *pathbuf, *fullpath;
 
 	if (os_ind < 0) {
 		return EINVAL;
@@ -872,12 +872,6 @@ int mcexec_open_exec(ihk_os_t os, char * __user filename)
 		return ENOMEM;
 	}
 
-	proc_name = kmalloc(PATH_MAX, GFP_TEMPORARY);
-	if (!proc_name) {
-		retval = ENOMEM;
-		goto out_error_free_path;
-	}
-
 	file = open_exec(filename);
 	retval = PTR_ERR(file);
 	if (IS_ERR(file)) {
@@ -896,8 +890,6 @@ int mcexec_open_exec(ihk_os_t os, char * __user filename)
 		goto out_put_file;
 	}
 
-	snprintf(proc_name, 1024, "mcos%d/%d/exe", os_ind, current->tgid);
-
 	spin_lock_irq(&mckernel_exec_file_lock);
 	/* Find previous file (if exists) and drop it */
 	list_for_each_entry(mcef_iter, &mckernel_exec_files, list) {
@@ -906,9 +898,6 @@ int mcexec_open_exec(ihk_os_t os, char * __user filename)
 			fput(mcef_iter->fp);
 			list_del(&mcef_iter->list);
 			kfree(mcef_iter);
-			/* Drop old /proc/self/exe */
-			procfs_delete_entry(os, os_ind, proc_name);
-			dprintk("%d open_exec dropped previous executable \n", (int)current->tgid);
 			break;
 		}
 	}
@@ -920,15 +909,12 @@ int mcexec_open_exec(ihk_os_t os, char * __user filename)
 	list_add_tail(&mcef->list, &mckernel_exec_files);
 
 	/* Create /proc/self/exe entry */
-	if (procfs_create_entry(os, 0, os_ind, current->tgid, proc_name, 
+	add_pid_entry(os_ind, current->tgid);
-				S_IFLNK, fullpath) != 0) {
+	proc_exe_link(os_ind, current->tgid, fullpath);
-		printk("ERROR: could not create a procfs entry for %s.\n", proc_name);
-	}
 	spin_unlock(&mckernel_exec_file_lock);
 
 	dprintk("%d open_exec and holding file: %s\n", (int)current->tgid, filename);
 
-	kfree(proc_name);
 	kfree(pathbuf);
 
 	return 0;
@@ -937,9 +923,6 @@ out_put_file:
 	fput(file);
 
 out_error_free:
-	kfree(proc_name);
-
-out_error_free_path:
 	kfree(pathbuf);
 	return -retval;
 }
@@ -950,7 +933,6 @@ int mcexec_close_exec(ihk_os_t os)
 	struct mckernel_exec_file *mcef = NULL;
 	int found = 0;
 	int os_ind = ihk_host_os_get_index(os);	
-	char proc_name[1024];
 
 	if (os_ind < 0) {
 		return EINVAL;
@@ -969,14 +951,6 @@ int mcexec_close_exec(ihk_os_t os)
 		}
 	}
 
-	/* Remove /proc/self/exe and /proc/self directory 
-	 * TODO: instead of removing directory explicitly, detect in procfs_delete_entry() 
-	 * when a directory becomes empty and remove it automatically */
-	snprintf(proc_name, 1024, "mcos%d/%d/exe", os_ind, current->tgid);
-	procfs_delete_entry(os, os_ind, proc_name);
-	snprintf(proc_name, 1024, "mcos%d/%d", os_ind, current->tgid);
-	procfs_delete_entry(os, os_ind, proc_name);
-
 	spin_unlock(&mckernel_exec_file_lock);
 
 	return (found ? 0 : EINVAL);

executer/kernel/mcctrl/driver.c

@@ -82,6 +82,12 @@ static struct ihk_os_user_call mcctrl_uc[OS_MAX_MINOR];
 
 static ihk_os_t os[OS_MAX_MINOR];
 
+ihk_os_t
+osnum_to_os(int n)
+{
+	return os[n];
+}
+
 static int __init mcctrl_init(void)
 {
 	int	i;

executer/kernel/mcctrl/ikc.c

@@ -41,9 +41,6 @@
 void mcexec_prepare_ack(ihk_os_t os, unsigned long arg, int err);
 static void mcctrl_ikc_init(ihk_os_t os, int cpu, unsigned long rphys, struct ihk_ikc_channel_desc *c);
 int mcexec_syscall(struct mcctrl_channel *c, int pid, unsigned long arg);
-void procfs_create(void *__os, int ref, int osnum, int pid, unsigned long arg);
-void procfs_delete(void *__os, int osnum, unsigned long arg);
-void procfs_answer(unsigned long arg, int err);
 void sig_done(unsigned long arg, int err);
 
 static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
@@ -69,14 +66,6 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
 		mcexec_syscall(usrdata->channels + pisp->ref, pisp->pid, pisp->arg);
 		break;
 
-	case SCD_MSG_PROCFS_CREATE:
-		procfs_create(__os, pisp->ref, pisp->osnum, pisp->pid, pisp->arg);
-		break;
-
-	case SCD_MSG_PROCFS_DELETE:
-		procfs_delete(__os, pisp->osnum, pisp->arg);
-		break;
-
 	case SCD_MSG_PROCFS_ANSWER:
 		procfs_answer(pisp->arg, pisp->err);
 		break;
@@ -98,6 +87,14 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
 				pisp->sysfs_arg1, pisp->sysfs_arg2);
 		break;
 
+	case SCD_MSG_PROCFS_TID_CREATE:
+		add_tid_entry(ihk_host_os_get_index(__os), pisp->pid, pisp->arg);
+		break;
+
+	case SCD_MSG_PROCFS_TID_DELETE:
+		delete_tid_entry(ihk_host_os_get_index(__os), pisp->pid, pisp->arg);
+		break;
+
 	default:
 		printk(KERN_ERR "mcctrl:syscall_packet_handler:"
 				"unknown message (%d.%d.%d.%d.%d.%#lx)\n",

executer/kernel/mcctrl/mcctrl.h

@@ -81,6 +81,8 @@
 #define SCD_MSG_SYSFS_RESP_SETUP        0x41
 /* #define SCD_MSG_SYSFS_REQ_CLEANUP    0x42 */
 /* #define SCD_MSG_SYSFS_RESP_CLEANUP   0x43 */
+#define SCD_MSG_PROCFS_TID_CREATE	0x44
+#define SCD_MSG_PROCFS_TID_DELETE	0x45
 
 #define DMA_PIN_SHIFT                   21
 
@@ -226,6 +228,8 @@ int mcctrl_ikc_is_valid_thread(ihk_os_t os, int cpu);
 int reserve_user_space(struct mcctrl_usrdata *usrdata, unsigned long *startp,
 		unsigned long *endp);
 
+ihk_os_t osnum_to_os(int n);
+
 /* syscall.c */
 int init_peer_channel_registry(struct mcctrl_usrdata *ud);
 void destroy_peer_channel_registry(struct mcctrl_usrdata *ud);
@@ -244,6 +248,7 @@ struct procfs_read {
 	int ret;		/* read bytes (answer) */
 	int status;		/* non-zero if done (answer) */
 	int newcpu;		/* migrated new cpu (answer) */
+	int readwrite;		/* 0:read, 1:write */
 	char fname[PROCFS_NAME_MAX];	/* procfs filename (request) */
 };
 
@@ -253,6 +258,15 @@ struct procfs_file {
 	char fname[PROCFS_NAME_MAX];	/* procfs filename (request) */
 };
 
+void procfs_answer(unsigned int arg, int err);
+void add_tid_entry(int osnum, int pid, int tid);
+void add_pid_entry(int osnum, int pid);
+void delete_tid_entry(int osnum, int pid, int tid);
+void delete_pid_entry(int osnum, int pid);
+void proc_exe_link(int osnum, int pid, const char *path);
+void procfs_init(int osnum);
+void procfs_exit(int osnum);
+
 /* sysfs_files.c */
 void setup_sysfs_files(ihk_os_t os);
 

kernel/include/syscall.h

@@ -66,6 +66,8 @@
 #define SCD_MSG_SYSFS_RESP_SETUP        0x41
 /* #define SCD_MSG_SYSFS_REQ_CLEANUP    0x42 */
 /* #define SCD_MSG_SYSFS_RESP_CLEANUP   0x43 */
+#define SCD_MSG_PROCFS_TID_CREATE	0x44
+#define SCD_MSG_PROCFS_TID_DELETE	0x45
 
 #define ARCH_SET_GS 0x1001
 #define ARCH_SET_FS 0x1002
@@ -314,6 +316,7 @@ struct procfs_read {
 	int ret;		/* read bytes (answer) */
 	int status;		/* non-zero if done (answer) */
 	int newcpu;		/* migrated new cpu (answer) */
+	int readwrite;		/* 0:read, 1:write */
 	char fname[PROCFS_NAME_MAX];	/* procfs filename (request) */
 };
 

kernel/init.c

@@ -283,7 +283,6 @@ static void post_init(void)
 	zero_tsc();
 	ap_start();
 
-	create_os_procfs_files();
 	sysfs_init();
 	populate_sysfs();
 }

kernel/process.c

@@ -63,6 +63,8 @@ extern int num_processors;
 extern ihk_spinlock_t cpuid_head_lock;
 int ptrace_detach(int pid, int data);
 extern unsigned long do_kill(struct thread *, int pid, int tid, int sig, struct siginfo *info, int ptracecont);
+extern void procfs_create_thread(struct thread *);
+extern void procfs_delete_thread(struct thread *);
 
 struct list_head resource_set_list;
 mcs_rwlock_lock_t    resource_set_lock;
@@ -2166,6 +2168,7 @@ void release_thread(struct thread *thread)
 
 	vm = thread->vm;
 
+	procfs_delete_thread(thread);
 	destroy_thread(thread);
 
 	release_process_vm(vm);
@@ -2753,7 +2756,7 @@ void runq_add_thread(struct thread *thread, int cpu_id)
 	__runq_add_thread(thread, cpu_id);
 	ihk_mc_spinlock_unlock(&(v->runq_lock), irqstate);
 
-	create_proc_procfs_files(thread->proc->pid, cpu_id);
+	procfs_create_thread(thread);
 
 	/* Kick scheduler */
 	if (cpu_id != ihk_mc_get_processor_id())

kernel/procfs.c

@@ -38,212 +38,37 @@ extern int sscanf(const char * buf, const char * fmt, ...);
 
 extern int osnum;
 
-void create_proc_procfs_files(int pid, int cpuid);
-void delete_proc_procfs_files(int pid);
-void create_os_procfs_files(void);
-void delete_os_procfs_files(void);
-
-static void create_proc_procfs_file(int pid, char *fname, int mode, int cpuid);
-static void delete_proc_procfs_file(int pid, char *fname);
-static void operate_proc_procfs_file(int pid, char *fname, int msg, int mode, int cpuid);
-
 int copy_from_user(void *dst, const void *src, size_t siz);
 int copy_to_user(void *dst, const void *src, size_t siz);
 
-/**
+static void
- * \brief Create all procfs files for process.
+procfs_thread_ctl(struct thread *thread, int msg)
- *
- * \param pid pid of the process
- * \param cpuid cpuid of the process
- */
-
-void create_proc_procfs_files(int pid, int cpuid)
-{
-	char fname[PROCFS_NAME_MAX];
-
-	dprintf("create procfs files:\n");
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/auxv", osnum, pid);
-	create_proc_procfs_file(pid, fname, 0400, cpuid);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/cmdline", osnum, pid);
-	create_proc_procfs_file(pid, fname, 0444, cpuid);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/mem", osnum, pid);
-	create_proc_procfs_file(pid, fname, 0400, cpuid);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/maps", osnum, pid);
-	create_proc_procfs_file(pid, fname, 0444, cpuid);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/pagemap", osnum, pid);
-	create_proc_procfs_file(pid, fname, 0444, cpuid);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/status", osnum, pid);
-	create_proc_procfs_file(pid, fname, 0444, cpuid);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/task/%d/mem", osnum, pid, pid);
-	create_proc_procfs_file(pid, fname, 0400, cpuid);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/task/%d/stat", osnum, pid, pid);
-	create_proc_procfs_file(pid, fname, 0444, cpuid);
-
-	dprintf("create procfs files: done\n");
-}
-
-/**
- * \brief Create a procfs file for process.
- *
- * \param pid pid of the process
- * \param fname file name of the procfs file
- * \param mode file mode
- * \param cpuid cpuid of the process
- */
-
-static void create_proc_procfs_file(int pid, char *fname, int mode, int cpuid)
-{
-	dprintf("create procfs file: %s, mode: %o, cpuid: %d\n", fname, mode, cpuid);
-	operate_proc_procfs_file(pid, fname, SCD_MSG_PROCFS_CREATE, mode, cpuid);
-}
-
-/**
- * \brief Delete all procfs files for process.
- *
- * \param pid pid of the process
- */
-
-void delete_proc_procfs_files(int pid)
-{
-	char fname[PROCFS_NAME_MAX];
-
-	dprintf("delete procfs files for pid %d.\n", pid);
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/task/%d/mem", osnum, pid, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/task/%d/stat", osnum, pid, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/task/%d", osnum, pid, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/task", osnum, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/mem", osnum, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/maps", osnum, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/status", osnum, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/pagemap", osnum, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/cmdline", osnum, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	snprintf(fname, PROCFS_NAME_MAX, "mcos%d/%d/auxv", osnum, pid);
-	delete_proc_procfs_file(pid, fname);
-
-	/* NOTE: Directory is removed on the host when mcexec drops the executable */
-	dprintf("delete procfs files for pid %d: done\n", pid);
-}
-
-/**
- * \brief Delete a procfs file for process.
- *
- * \param pid pid of the process
- * \param fname file name of the procfs file
- */
-
-static void delete_proc_procfs_file(int pid, char *fname)
-{
-	dprintf("delete procfs file: %s\n", fname);
-	operate_proc_procfs_file(pid, fname, SCD_MSG_PROCFS_DELETE, 0, 0);
-	dprintf("delete procfs file: %s done\n", fname);
-}
-
-/**
- * \brief create a procfs file for this operating system
- * \param fname relative path name from "host:/proc".
- * \param mode permissions of the file to be created
- *
- * Though operate_proc_procfs_file() is intended to create a process
- * specific file, it is reused to create a OS specific file by
- * specifying -1 as the pid parameter.
- */
-static void create_os_procfs_file(char *fname, int mode)
-{
-	const pid_t pid = -1;
-	const int msg = SCD_MSG_PROCFS_CREATE;
-	const int cpuid = ihk_mc_get_processor_id();	/* i.e. BSP */
-
-	operate_proc_procfs_file(pid, fname, msg, mode, cpuid);
-	return;
-}
-
-/**
- * \brief create all procfs files for this operating system
- */
-void create_os_procfs_files(void)
-{
-	char *fname = NULL;
-	size_t n;
-
-	fname = kmalloc(PROCFS_NAME_MAX, IHK_MC_AP_CRITICAL);
-
-	n = snprintf(fname, PROCFS_NAME_MAX, "mcos%d/stat", osnum);
-	if (n >= PROCFS_NAME_MAX) panic("/proc/stat");
-	create_os_procfs_file(fname, 0444);
-
-	return;
-}
-
-/**
- * \brief Create/delete a procfs file for process.
- *
- * \param pid pid of the process
- * \param fname file name of the procfs file
- * \param msg message (create/delete) 
- * \param mode file mode
- * \param cpuid cpuid of the process
- */
-
-static void operate_proc_procfs_file(int pid, char *fname, int msg, int mode, int cpuid)
 {
 	struct ihk_ikc_channel_desc *syscall_channel;
-	struct ikc_scd_packet pckt;
+	struct ikc_scd_packet packet;
-	struct procfs_file *f;
-	int ret;
 
 	syscall_channel = cpu_local_var(syscall_channel);
+	memset(&packet, '\0', sizeof packet);
+	packet.arg = thread->tid;
+	packet.msg = msg;
+	packet.osnum = osnum;
+	packet.ref = thread->cpu_id;
+	packet.pid = thread->proc->pid;
+	packet.err = 0;
 
-	f = kmalloc(sizeof(struct procfs_file), IHK_MC_AP_NOWAIT);
+	ihk_ikc_send(syscall_channel, &packet, 0);
-	if (!f) {
+}
-		kprintf("ERROR: not enough memory for dealing procfs file %s!",
-			fname);
-		return;
-	}
-	f->status = 0;
-	f->mode = mode;
-	strncpy(f->fname, fname, PROCFS_NAME_MAX);
-	pckt.arg = virt_to_phys(f);
-	pckt.msg = msg;
-	pckt.osnum = osnum;
-	pckt.ref = cpuid;
-	pckt.pid = pid;
-	pckt.err = 0;
 
-	ret = ihk_ikc_send(syscall_channel, &pckt, 0);
+void
-	if (ret < 0) {
+procfs_create_thread(struct thread *thread)
-		kprintf("ERROR: sending IKC msg, ret: %d\n", ret);
+{
-	}
+	procfs_thread_ctl(thread, SCD_MSG_PROCFS_TID_CREATE);
+}
 
-	while (f->status != 1) {
+void
-		cpu_pause();
+procfs_delete_thread(struct thread *thread)
-	}
+{
-	kfree(f);
+	procfs_thread_ctl(thread, SCD_MSG_PROCFS_TID_DELETE);
 }
 
 /**
@@ -251,12 +76,13 @@ static void operate_proc_procfs_file(int pid, char *fname, int msg, int mode, in
  *
  * \param rarg returned argument
  */
-
+void
-void process_procfs_request(unsigned long rarg)
+process_procfs_request(unsigned long rarg)
 {
 	unsigned long parg, pbuf;
-        struct thread *thread = cpu_local_var(current);
+        struct thread *thread = NULL;
-	struct process *proc = thread->proc;
+	struct process *proc = NULL;
+	struct process_vm *vm = NULL;
 	struct procfs_read *r;
 	struct ikc_scd_packet packet;
 	int rosnum, ret, pid, tid, ans = -EIO, eof = 0;
@@ -266,7 +92,8 @@ void process_procfs_request(unsigned long rarg)
 	unsigned long offset;
 	int count;
 	int npages;
-	int is_current = 1;	/* is 'proc' same as 'current'? */
+	int readwrite = 0;
+
 
 	dprintf("process_procfs_request: invoked.\n");
 
@@ -296,6 +123,7 @@ void process_procfs_request(unsigned long rarg)
 		goto bufunavail;
 	}
 
+	readwrite = r->readwrite;
 	count = r->count;
 	offset = r->offset;
 	dprintf("fname: %s, offset: %lx, count:%d.\n", r->fname, r->offset, r->count);
@@ -334,32 +162,38 @@ void process_procfs_request(unsigned long rarg)
 	 */
 	ret = sscanf(p, "%d/", &pid);
 	if (ret == 1) {
-		if (pid != cpu_local_var(current)->proc->pid) {
+		proc = find_process(pid, &lock);
-			/* We are not located in the proper cpu for some reason. */
+		if(proc == NULL){
-
+			kprintf("process_procfs_request: no such pid %d\n", pid);
-			dprintf("mismatched pid. We are %d, but requested pid is %d.\n",
+			goto end;
-				pid, cpu_local_var(current)->pid);
-			tid = pid;	/* main thread */
-			thread = find_thread(pid, tid, &lock);
-			if (!thread) {
-				dprintf("We cannot find the proper cpu for requested pid.\n");
-				goto end;
-			}
-			else if (thread->cpu_id != ihk_mc_get_processor_id()) {
-				/* The target process has gone by migration. */
-				r->newcpu = thread->cpu_id;
-				dprintf("expected cpu id is %d.\n", thread->cpu_id);
-				thread_unlock(thread, &lock);
-				ans = 0;
-				goto end;
-			}
-			else {
-				thread_unlock(thread, &lock);
-				/* 'proc' is not 'current' */
-				is_current = 0;
-			}
-			proc = thread->proc;
 		}
+		p = strchr(p, '/') + 1;
+		ret = sscanf(p, "task/%d/", &tid);
+		if(ret == 1){
+			struct mcs_rwlock_node tlock;
+			mcs_rwlock_reader_lock_noirq(&proc->threads_lock, &tlock);
+			list_for_each_entry(thread, &proc->threads_list,
+			                    siblings_list) {
+				if(thread->tid == tid)
+					break;
+			}
+			if(thread == NULL){
+				mcs_rwlock_reader_unlock_noirq(&proc->threads_lock,
+				                         &tlock);
+				process_unlock(proc, &lock);
+				kprintf("process_procfs_request: no such tid %d-%d\n", pid, tid);
+				goto end;
+			}
+			hold_thread(thread);
+			mcs_rwlock_reader_unlock_noirq(&proc->threads_lock, &tlock);
+			p = strchr(p, '/') + 1;
+			p = strchr(p, '/') + 1;
+		}
+		hold_process(proc);
+		vm = proc->vm;
+		if(vm)
+			hold_process_vm(vm);
+		process_unlock(proc, &lock);
 	}
 	else if (!strcmp(p, "stat")) {	/* "/proc/stat" */
 		extern int num_processors;	/* kernel/ap.c */
@@ -390,10 +224,9 @@ void process_procfs_request(unsigned long rarg)
 		goto end;
 	}
 	else {
+		kprintf("unsupported procfs entry: %s\n", p);
 		goto end;
 	}
-	dprintf("matched PID: %d.\n", pid);
-	p = strchr(p, '/') + 1;
 
 	/* 
 	 * mcos%d/PID/mem
@@ -403,9 +236,8 @@ void process_procfs_request(unsigned long rarg)
 	 */
 	if (strcmp(p, "mem") == 0) {
 		struct vm_range *range;
-		struct process_vm *vm = proc->vm;
 
-		if (!is_current) {
+		if (proc != cpu_local_var(current)->proc) {
 			uint64_t reason = PF_POPULATE | PF_WRITE | PF_USER;
 			unsigned long offset = r->offset;
 			unsigned long left = r->count;
@@ -423,8 +255,8 @@ void process_procfs_request(unsigned long rarg)
 
 				if(size > left)
 					size = left;
-				ret = page_fault_process_vm(proc->vm,
+				ret = page_fault_process_vm(vm, (void *)offset,
-				                (void *)offset, reason);
+				                            reason);
 				if(ret){
 					if(ans == 0)
 						ans = -EIO;
@@ -479,7 +311,6 @@ void process_procfs_request(unsigned long rarg)
 	 */
 	if (strcmp(p, "maps") == 0) {
 		struct vm_range *range;
-		struct process_vm *vm = proc->vm;
 		int left = r->count - 1; /* extra 1 for terminating NULL */
 		int written = 0;
 		char *_buf = buf;
@@ -537,7 +368,6 @@ void process_procfs_request(unsigned long rarg)
 	 * mcos%d/PID/pagemap
 	 */
 	if (strcmp(p, "pagemap") == 0) {
-		struct process_vm *vm = proc->vm;
 		uint64_t *_buf = (uint64_t *)buf;
 		uint64_t start, end;
 		
@@ -673,112 +503,72 @@ void process_procfs_request(unsigned long rarg)
 	 * The offset is treated as the beginning of the virtual address area
 	 * of the process. The count is the length of the area.
 	 */
-	tid = pid;
-	ret = sscanf(p, "task/%d/", &tid);
-	if (ret == 1) {
-		p = strchr(p, '/') + 1;
-		p = strchr(p, '/') + 1;
 
-		if (!strcmp(p, "mem")){
+	if (!strcmp(p, "stat")) {
-			struct vm_range *range;
+		char tmp[1024];
-			struct process_vm *vm = proc->vm;
+		int len;
 
-			if (!is_current) {
+		/*
-				goto end;
+		 * pid (comm) state ppid
+		 * pgrp session tty_nr tpgid
+		 * flags minflt cminflt majflt
+		 * cmajflt utime stime cutime
+		 * cstime priority nice num_threads
+		 * itrealvalue starttime vsize rss
+		 * rsslim startcode endcode startstack
+		 * kstkesp kstkeip signal blocked
+		 * sigignore sigcatch wchan nswap
+		 * cnswap exit_signal processor rt_priority
+		 * policy delayacct_blkio_ticks guest_time cguest_time
+		 */
+		ans = sprintf(tmp,
+		    "%d (%s) %c %d "	      // pid...
+		    "%d %d %d %d "	      // pgrp...
+		    "%u %lu %lu %lu "	      // flags...
+		    "%lu %lu %lu %ld "	      // cmajflt...
+		    "%ld %ld %ld %ld "	      // cstime...
+		    "%ld %llu %lu %ld "	      // itrealvalue...
+		    "%lu %lu %lu %lu "	      // rsslim...
+		    "%lu %lu %lu %lu "	      // kstkesp...
+		    "%lu %lu %lu %lu "	      // sigignore...
+		    "%lu %d %d %u "	      // cnswap...
+		    "%u %llu %lu %ld\n",      // policy...
+		    0, "exe", 'R', 0,	      // pid...
+		    0, 0, 0, 0,      	      // pgrp...
+		    0, 0L, 0L, 0L,	      // flags...
+		    0L, 0L, 0L, 0L,	      // cmajflt...
+		    0L, 0L, 0L, 0L,	      // cstime...
+		    0L, 0LL, 0L, 0L,	      // itrealvalue...
+		    0L, 0L, 0L, 0L,	      // rsslim...
+		    0L, 0L, 0L, 0L,	      // kstkesp...
+		    0L, 0L, 0L, 0L,	      // sigignore...
+		    0L, 0, thread->cpu_id, 0, // cnswap...
+		    0, 0LL, 0L, 0L	      // policy...
+		);
+		thread_unlock(thread, &lock);
+		dprintf("tmp=%s\n", tmp);
+
+		len = strlen(tmp);
+		if (r->offset < len) {
+			if (r->offset + r->count < len) {
+				ans = r->count;
+			} else {
+				eof = 1;
+				ans = len;
 			}
-			if (pid != tid) {
+			strncpy(buf, tmp + r->offset, ans);
-				/* We are not multithreaded yet. */
+		} else if (r->offset == len) {
-				goto end;
+			ans = 0;
-			} 
+			eof = 1;
-			list_for_each_entry(range, &vm->vm_range_list, list) {
-				dprintf("range: %lx - %lx\n", range->start, range->end);
-				if ((range->start <= r->offset) && 
-				    (r->offset < range->end)) {
-					unsigned int len = r->count;
-					if (range->end < r->offset + r->count) {
-						len = range->end - r->offset;
-					}
-					memcpy((void *)buf, (void *)range->start, len);
-					ans = len;
-					break;
-				}
-			}
-			goto end;
 		}
-
-		if (!strcmp(p, "stat")) {
-			char tmp[1024];
-			int len;
-
-			if ((thread = find_thread(pid, tid, &lock))){
-				dprintf("thread found! pid=%d tid=%d\n", pid, tid);
-				/*
-				 * pid (comm) state ppid
-				 * pgrp session tty_nr tpgid
-				 * flags minflt cminflt majflt
-				 * cmajflt utime stime cutime
-				 * cstime priority nice num_threads
-				 * itrealvalue starttime vsize rss
-				 * rsslim startcode endcode startstack
-				 * kstkesp kstkeip signal blocked
-				 * sigignore sigcatch wchan nswap
-				 * cnswap exit_signal processor rt_priority
-				 * policy delayacct_blkio_ticks guest_time cguest_time
-				 */
-				ans = sprintf(tmp,
-				    "%d (%s) %c %d "	      // pid...
-				    "%d %d %d %d "	      // pgrp...
-				    "%u %lu %lu %lu "	      // flags...
-				    "%lu %lu %lu %ld "	      // cmajflt...
-				    "%ld %ld %ld %ld "	      // cstime...
-				    "%ld %llu %lu %ld "	      // itrealvalue...
-				    "%lu %lu %lu %lu "	      // rsslim...
-				    "%lu %lu %lu %lu "	      // kstkesp...
-				    "%lu %lu %lu %lu "	      // sigignore...
-				    "%lu %d %d %u "	      // cnswap...
-				    "%u %llu %lu %ld\n",      // policy...
-				    0, "exe", 'R', 0,	      // pid...
-				    0, 0, 0, 0,      	      // pgrp...
-				    0, 0L, 0L, 0L,	      // flags...
-				    0L, 0L, 0L, 0L,	      // cmajflt...
-				    0L, 0L, 0L, 0L,	      // cstime...
-				    0L, 0LL, 0L, 0L,	      // itrealvalue...
-				    0L, 0L, 0L, 0L,	      // rsslim...
-				    0L, 0L, 0L, 0L,	      // kstkesp...
-				    0L, 0L, 0L, 0L,	      // sigignore...
-				    0L, 0, thread->cpu_id, 0, // cnswap...
-				    0, 0LL, 0L, 0L	      // policy...
-				);
-				thread_unlock(thread, &lock);
-				dprintf("tmp=%s\n", tmp);
-
-				len = strlen(tmp);
-				if (r->offset < len) {
-					if (r->offset + r->count < len) {
-						ans = r->count;
-					} else {
-						eof = 1;
-						ans = len;
-					}
-					strncpy(buf, tmp + r->offset, ans);
-				} else if (r->offset == len) {
-					ans = 0;
-					eof = 1;
-				}
-				goto end;
-			}
-			else{
-				dprintf("no thread found pid=%d tid=%d\n", pid, tid);
-			}
-		}
-		dprintf("could not find a matching entry for task/%d/%s.\n", tid, p); 
 		goto end;
 	}
 
-	/* 
+	if(thread)
-	 * Processing for pattern "mcos%d/PID/xxx" files should be here.
+		kprintf("unsupported procfs entry: %d/task/%d/%s\n", pid, tid, p);
-	*/
+	else
-	dprintf("could not find a matching entry for %s.\n", p); 
+		kprintf("unsupported procfs entry: %d/%s\n", pid, p);
+
 end:
 	ihk_mc_unmap_virtual(buf, npages, 0);
 	dprintf("ret: %d, eof: %d\n", ans, eof);
@@ -799,6 +589,12 @@ dataunavail:
 	if (ret < 0) {
 		kprintf("ERROR: sending IKC msg, ret: %d\n", ret);
 	}
+	if(proc)
+		release_process(proc);
+	if(thread)
+		release_thread(thread);
+	if(vm)
+		release_process_vm(vm);
 	return;
 
 }

kernel/syscall.c

@@ -632,8 +632,6 @@ terminate(int rc, int sig)
 	list_add_tail(&mythread->siblings_list, &proc->threads_list);
 	mcs_rwlock_writer_unlock(&proc->threads_lock, &lock);
 
-	delete_proc_procfs_files(proc->pid);
-
 	vm = proc->vm;
 	free_all_process_memory_range(vm);