gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

procfs: add support for <pid>/mem files and ad hoc fix for memory incoherency.

Browse Source
This commit is contained in:
Naoki Hamada
2014-09-16 10:03:00 +09:00
parent e2dc359ba7
commit d7436652bf
4 changed files with 78 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
executer/kernel/mcctrl.h
View File

@ -164,6 +164,7 @@ struct procfs_read {
unsigned long pbuf; /* physical address of the host buffer (request) */
unsigned long offset; /* offset to read (request) */
int count; /* bytes to read (request) */
int error; /* non-zero if below fields are invalid. (answer) */
int eof; /* if eof is detected, 1 otherwise 0. (answer)*/
int ret; /* read bytes (answer) */
int newcpu; /* migrated new cpu (answer) */

21
executer/kernel/procfs.c
View File

@ -254,8 +254,11 @@ void procfs_delete(void *__os, int osnum, unsigned long arg)
void procfs_answer(unsigned int arg, int err)
{
volatile struct procfs_read *r = phys_to_virt(arg);
dprintk("procfs: received SCD_MSG_PROCFS_ANSWER message(err = %d).\n", err);
procfsq_channel = arg;
r->error = err;
wake_up_interruptible(&procfsq);
}
@ -274,6 +277,7 @@ int mckernel_procfs_read(char *buffer, char **start, off_t offset,
struct ikc_scd_packet isp;
int ret, retrycount = 0;
unsigned long pbuf;
int i;
dprintk("mckernel_procfs_read: invoked for %s\n", e->fname);
@ -295,7 +299,7 @@ retry:
r->pbuf = pbuf;
r->eof = 0;
r->ret = -EIO; /* default to error */
r->ret = PAGE_SIZE * 2; /* dummy answer */
r->offset = offset;
r->count = count;
strncpy((char *)r->fname, e->fname, PROCFS_NAME_MAX);
@ -310,7 +314,19 @@ retry:
dprintk("now wait for a relpy\n");
wait_event_interruptible(procfsq, procfsq_channel == virt_to_phys(r));
/* Wake up and check the result. */
dprintk("mckernel_procfs_read: woke up. ret: %d, eof: %d\n", r->ret, r->eof);
dprintk("mckernel_procfs_read: woke up.\n");
if (r->error != 0) {
kprintf("ERROR: mckernel_procfs_read: failed to get valid answer.\n");
return -EIO;
}
for (i = 0; r->ret == PAGE_SIZE * 2; i++) {
/* FIXME: busy wait for the real answer to reach*/;
if (i > 1000000) {
kprintf("ERROR: mckernel_procfs_read: answer unavailable.\n");
return -EIO;
}
}
dprintk("ret: %d, eof: %d (wait loop count: %d)\n", r->ret, r->eof, i);
if ((r->ret == 0) && (r->eof != 1)) {
/* A miss-hit caused by migration has occurred.
* We simply retry the query with a new CPU.
@ -324,6 +340,7 @@ retry:
goto retry;
}
if (r->eof == 1) {
dprintk("reached end of file.\n");
*peof = 1;
}
*start = buffer;