Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 23:40:19 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

include/nuttx/sched.h: Add storage for a previous signal mask. arch/: In all syscall implemenations, block all signals before dispatching a system call; resotre signal mask when the system call returnes.

Browse Source
This commit is contained in:
Gregory Nutt
2019-11-28 10:51:29 -06:00
parent fe49dcf622
commit 344f7bc9f6
10 changed files with 111 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/misoc/src/lm32/lm32_swint.c
+13 -1
View File
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/misoc/src/lm32/lm32_swint.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Copyright (C) 2016. 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
* Ramtin Amin <keytwo@gmail.com>
*
@@ -47,6 +47,7 @@
#include <debug.h>
#include <nuttx/sched.h>
#include <nuttx/signal.h>
#include <arch/irq.h>
#include "lm32.h"
@@ -226,6 +227,11 @@ int lm32_swint(int irq, FAR void *context, FAR void *arg)
g_current_regs[REG_EPC] = rtcb->xcp.syscall[index].sysreturn;
#error "Missing logic -- need to restore the original mode"
rtcb->xcp.nsyscalls = index;
/* Restore the signal mask when the syscall returns */
(void)nxsig_procmask(SIG_SETMASK, &rtcb->sigoldmask, NULL);
sigemptyset(rtcb->sigoldmask);
}
break;
#endif
@@ -240,6 +246,7 @@ int lm32_swint(int irq, FAR void *context, FAR void *arg)
#ifdef CONFIG_BUILD_KERNEL
FAR struct tcb_s *rtcb = sched_self();
int index = rtcb->xcp.nsyscalls;
sigset_t set;
/* Verify that the SYS call number is within range */
@@ -263,6 +270,11 @@ int lm32_swint(int irq, FAR void *context, FAR void *arg)
/* Offset R0 to account for the reserved values */
g_current_regs[REG_A0] -= CONFIG_SYS_RESERVED;
/* Block all signals while the system call runs */
sigfillset(&set);
(void)nxsig_procmask(SIG_BLOCK, &set, &rtcb->sigoldmask);
#else
svcerr("ERROR: Bad SYS call: %d\n", regs[REG_A0]);
#endif
arch/misoc/src/minerva/minerva_swint.c
+12
View File
@@ -47,6 +47,7 @@
#include <debug.h>
#include <nuttx/sched.h>
#include <nuttx/signal.h>
#include <arch/irq.h>
#include "minerva.h"
@@ -213,6 +214,11 @@ int minerva_swint(int irq, FAR void *context, FAR void *arg)
g_current_regs[REG_CSR_MEPC] = rtcb->xcp.syscall[index].sysreturn;
#error "Missing logic -- need to restore the original mode"
rtcb->xcp.nsyscalls = index;
/* Restore the signal mask when the syscall returns */
(void)nxsig_procmask(SIG_SETMASK, &rtcb->sigoldmask, NULL);
sigemptyset(rtcb->sigoldmask);
}
break;
#endif
@@ -227,6 +233,7 @@ int minerva_swint(int irq, FAR void *context, FAR void *arg)
#ifdef CONFIG_BUILD_KERNEL
FAR struct tcb_s *rtcb = sched_self();
int index = rtcb->xcp.nsyscalls;
sigset_t set;
/* Verify that the SYS call number is within range */
@@ -251,6 +258,11 @@ int minerva_swint(int irq, FAR void *context, FAR void *arg)
/* Offset R0 to account for the reserved values */
g_current_regs[REG_A0] -= CONFIG_SYS_RESERVED;
/* Block all signals while the system call runs */
sigfillset(&set);
(void)nxsig_procmask(SIG_BLOCK, &set, &rtcb->sigoldmask);
#else
svcerr("ERROR: Bad SYS call: %d\n", regs[REG_A0]);
#endif