summaryrefslogtreecommitdiffstats
path: root/sys/sys
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2013-02-06 17:06:51 +0000
committerjhb <jhb@FreeBSD.org>2013-02-06 17:06:51 +0000
commit0fee3f66b8449575ed4673125b12bfd592191d2d (patch)
treeb7c1d4516fbc8d227d8e9d82226ffe2268726c9c /sys/sys
parent85b0c7ccf995a662173c813d3e6cea1b62bee356 (diff)
downloadFreeBSD-src-0fee3f66b8449575ed4673125b12bfd592191d2d.zip
FreeBSD-src-0fee3f66b8449575ed4673125b12bfd592191d2d.tar.gz
Rework the handling of stop signals in the NFS client. The changes in
195702, 195703, and 195821 prevented a thread from suspending while holding locks inside of NFS by forcing the thread to fail sleeps with EINTR or ERESTART but defer the thread suspension to the user boundary. However, this had the effect that stopping a process during an NFS request could abort the request and trigger EINTR errors that were visible to userland processes (previously the thread would have suspended and completed the request once it was resumed). This change instead effectively masks stop signals while in the NFS client. It uses the existing TDF_SBDRY flag to effect this since SIGSTOP cannot be masked directly. Also, instead of setting PBDRY on individual sleeps, the NFS client now sets the TDF_SBDRY flag around each NFS request and stop signals are masked for all sleeps during that region (the previous change missed sleeps in lockmgr locks). The end result is that stop signals sent to threads performing an NFS request are completely ignored until after the NFS request has finished processing and the thread prepares to return to userland. This restores the behavior of stop signals being transparent to userland processes while still preventing threads from suspending while holding NFS locks. Reviewed by: kib MFC after: 1 month
Diffstat (limited to 'sys/sys')
-rw-r--r--sys/sys/signalvar.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/sys/signalvar.h b/sys/sys/signalvar.h
index 71685e7..91655b2 100644
--- a/sys/sys/signalvar.h
+++ b/sys/sys/signalvar.h
@@ -328,6 +328,8 @@ extern struct mtx sigio_lock;
#define SIGPROCMASK_PS_LOCKED 0x0004
int cursig(struct thread *td, int stop_allowed);
+void sigdeferstop(struct thread *td);
+void sigallowstop(struct thread *td);
void execsigs(struct proc *p);
void gsignal(int pgid, int sig, ksiginfo_t *ksi);
void killproc(struct proc *p, char *why);
OpenPOWER on IntegriCloud