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

mcctrl: use atomic malloc in IRQ context

Browse Source
This commit is contained in:
Balazs Gerofi
2016-08-06 08:54:55 +09:00
parent 689da07ac6
commit 4cefb4333f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
executer/kernel/mcctrl/ikc.c
View File

@@ -43,6 +43,7 @@ static void mcctrl_ikc_init(ihk_os_t os, int cpu, unsigned long rphys, struct ih
int mcexec_syscall(struct mcctrl_channel *c, int pid, unsigned long arg); int mcexec_syscall(struct mcctrl_channel *c, int pid, unsigned long arg);
void sig_done(unsigned long arg, int err); void sig_done(unsigned long arg, int err);
/* XXX: this runs in atomic context! */
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)
{ {
@@ -89,7 +90,7 @@ static int syscall_packet_handler(struct ihk_ikc_channel_desc *c,
case SCD_MSG_PROCFS_TID_CREATE: case SCD_MSG_PROCFS_TID_CREATE:
case SCD_MSG_PROCFS_TID_DELETE: case SCD_MSG_PROCFS_TID_DELETE:
return procfsm_packet_handler(__os, pisp->msg, pisp->pid, pisp->arg); procfsm_packet_handler(__os, pisp->msg, pisp->pid, pisp->arg);
break; break;
case SCD_MSG_GET_VDSO_INFO: case SCD_MSG_GET_VDSO_INFO:
@@ -190,12 +191,12 @@ static void mcctrl_ikc_init(ihk_os_t os, int cpu, unsigned long rphys, struct ih
#endif #endif
pmc->param.request_va = pmc->param.request_va =
(void *)__get_free_pages(GFP_KERNEL, (void *)__get_free_pages(GFP_ATOMIC,
REQUEST_SHIFT - PAGE_SHIFT); REQUEST_SHIFT - PAGE_SHIFT);
pmc->param.request_pa = virt_to_phys(pmc->param.request_va); pmc->param.request_pa = virt_to_phys(pmc->param.request_va);
pmc->param.doorbell_va = usrdata->mcctrl_doorbell_va; pmc->param.doorbell_va = usrdata->mcctrl_doorbell_va;
pmc->param.doorbell_pa = usrdata->mcctrl_doorbell_pa; pmc->param.doorbell_pa = usrdata->mcctrl_doorbell_pa;
pmc->param.post_va = (void *)__get_free_page(GFP_KERNEL); pmc->param.post_va = (void *)__get_free_page(GFP_ATOMIC);
pmc->param.post_pa = virt_to_phys(pmc->param.post_va); pmc->param.post_pa = virt_to_phys(pmc->param.post_va);
memset(pmc->param.doorbell_va, 0, PAGE_SIZE); memset(pmc->param.doorbell_va, 0, PAGE_SIZE);
memset(pmc->param.request_va, 0, PAGE_SIZE); memset(pmc->param.request_va, 0, PAGE_SIZE);
@@ -215,7 +216,7 @@ static void mcctrl_ikc_init(ihk_os_t os, int cpu, unsigned long rphys, struct ih
PAGE_SIZE, NULL, 0); PAGE_SIZE, NULL, 0);
#endif #endif
pmc->dma_buf = (void *)__get_free_pages(GFP_KERNEL, pmc->dma_buf = (void *)__get_free_pages(GFP_ATOMIC,
DMA_PIN_SHIFT - PAGE_SHIFT); DMA_PIN_SHIFT - PAGE_SHIFT);
rpm->request_page = pmc->param.request_pa; rpm->request_page = pmc->param.request_pa;