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

Preliminary implementation for procfs.

Browse Source
This commit is contained in:
Naoki Hamada
2014-08-12 16:45:57 +09:00
parent f535670100
commit 5775d3e6da
2 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
executer/kernel/ikc.c
View File

@@ -27,6 +27,7 @@
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/proc_fs.h>
#include "mcctrl.h" #include "mcctrl.h"
#ifdef ATTACHED_MIC #ifdef ATTACHED_MIC
#include <sysdeps/mic/mic/micconst.h> #include <sysdeps/mic/mic/micconst.h>
@@ -38,10 +39,22 @@
//struct mcctrl_channel *channels; //struct mcctrl_channel *channels;
DECLARE_WAIT_QUEUE_HEAD(procfs)
void mcexec_prepare_ack(ihk_os_t os, unsigned long arg, int err); 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); 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); int mcexec_syscall(struct mcctrl_channel *c, int pid, unsigned long arg);
int mckernel_procfs_read(char *buffer, char **start, off_t offset,
int count, int *peof, void *dat);
/* A private data for the procfs driver. */
struct procfs_data {
int os;
int cpu;
char fname[PROCFS_NAME_MAX];
}
static int syscall_packet_handler(struct ihk_ikc_channel_desc *c, static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
void *__packet, void *__os) void *__packet, void *__os)
{ {
@@ -64,6 +77,20 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
case SCD_MSG_SYSCALL_ONESIDE: case SCD_MSG_SYSCALL_ONESIDE:
mcexec_syscall(usrdata->channels + pisp->ref, pisp->pid, pisp->arg); mcexec_syscall(usrdata->channels + pisp->ref, pisp->pid, pisp->arg);
break; break;
case SCD_MSG_PROCFS_CREATE:
/* create procfs entry */
/* register callback function */
/* xxx */
break;
case SCD_MSG_PROCFS_DELETE:
/* deregister callback function */
/* delete procfs entry */
/* xxx */
break;
case SCD_MSG_PROCFS_ANSWER:
/* wakeup processing thread */
/* xxx */
break;
} }
return 0; return 0;
@@ -351,3 +378,37 @@ void destroy_ikc_channels(ihk_os_t os)
kfree(usrdata->channels); kfree(usrdata->channels);
kfree(usrdata); kfree(usrdata);
} }
/*
* callback funciton for McKernel procfs
*
* This function conforms to the 2) way of fs/proc/generic.c
* from linux-2.6.39.4.
*/
int mckernel_procfs_read(char *buffer, char **start, off_t offset,
int count, int *peof, void *dat)
{
struct procfs_data *data = dat;
struct procfs_read *r;
struct ikc_scd_packet isp;
r = kmalloc(sizeof(struct procfs_read));
if (r == NULL) {
/* what is the proper way to error? */
return -1;
}
r->pbuf = virt_to_phys(buffer);
r->offset = offset;
r->count = count;
strncpy(r->fname, dat->fname, PROCFS_NAME_MAX);
isp.msg = SCD_MSG_PROCFS_REQUEST;
isp.ref = dat->cpu;
isp.arg = virt_to_phys(r);
/* send request to the McKernel and sleep */
/* wake up and return the result */
return 0;
}

14
executer/kernel/mcctrl.h
View File

@@ -49,6 +49,11 @@
#define SCD_MSG_SYSCALL_ONESIDE 0x4 #define SCD_MSG_SYSCALL_ONESIDE 0x4
#define SCD_MSG_SEND_SIGNAL 0x8 #define SCD_MSG_SEND_SIGNAL 0x8
#define SCD_MSG_PROCFS_CREATE 0x10
#define SCD_MSG_PROCFS_DELETE 0x11
#define SCD_MSG_PROCFS_REQUEST 0x12
#define SCD_MSG_PROCFS_ANSWER 0x13
#define DMA_PIN_SHIFT 21 #define DMA_PIN_SHIFT 21
#define DO_USER_MODE #define DO_USER_MODE
@@ -152,4 +157,13 @@ int deregister_peer_channel(struct mcctrl_usrdata *ud, void *key, struct mcctrl_
struct mcctrl_channel *get_peer_channel(struct mcctrl_usrdata *ud, void *key); struct mcctrl_channel *get_peer_channel(struct mcctrl_usrdata *ud, void *key);
int __do_in_kernel_syscall(ihk_os_t os, struct mcctrl_channel *c, struct syscall_request *sc); int __do_in_kernel_syscall(ihk_os_t os, struct mcctrl_channel *c, struct syscall_request *sc);
struct procfs_read {
unsigned long int pbuf; /* physical address of the host buffer (request) */
int offset; /* offset to read (request) */
int count; /* bytes to read (request) */
int eof; /* if eof is detected, 1 otherwise 0. (answer)*/
int return; /* read bytes (answer) */
char fname[PROCFS_NAME_MAX]; /* procfs filename (request) */
}
#endif #endif