From owner-svn-src-projects@freebsd.org Wed Apr 24 15:54:19 2019 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7090F159C527 for ; Wed, 24 Apr 2019 15:54:19 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 153C56BE50; Wed, 24 Apr 2019 15:54:19 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D5C8CE6B5; Wed, 24 Apr 2019 15:54:18 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3OFsIes024484; Wed, 24 Apr 2019 15:54:18 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3OFsIjw024483; Wed, 24 Apr 2019 15:54:18 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201904241554.x3OFsIjw024483@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 24 Apr 2019 15:54:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r346640 - in projects/fuse2/sys: fs/fuse kern X-SVN-Group: projects X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in projects/fuse2/sys: fs/fuse kern X-SVN-Commit-Revision: 346640 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 153C56BE50 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Apr 2019 15:54:19 -0000 Author: asomers Date: Wed Apr 24 15:54:18 2019 New Revision: 346640 URL: https://svnweb.freebsd.org/changeset/base/346640 Log: fusefs: interruptibility improvements suggested by kib * Block stop signals in fticket_wait_answer * Hold ps_mtx while checking signal disposition * style(9) changes PR: 346357 Reported by: kib Sponsored by: The FreeBSD Foundation Modified: projects/fuse2/sys/fs/fuse/fuse_ipc.c projects/fuse2/sys/kern/kern_sig.c Modified: projects/fuse2/sys/fs/fuse/fuse_ipc.c ============================================================================== --- projects/fuse2/sys/fs/fuse/fuse_ipc.c Wed Apr 24 15:35:29 2019 (r346639) +++ projects/fuse2/sys/fs/fuse/fuse_ipc.c Wed Apr 24 15:54:18 2019 (r346640) @@ -430,10 +430,11 @@ fticket_wait_answer(struct fuse_ticket *ftick) { struct thread *td = curthread; sigset_t blockedset, oldset; - int err = 0; + int err = 0, stops_deferred; struct fuse_data *data; - SIGEMPTYSET(blockedset); + SIGEMPTYSET(blockedset); + stops_deferred = sigdeferstop(SIGDEFERSTOP_SILENT); kern_sigprocmask(td, SIG_BLOCK, NULL, &oldset, 0); fuse_lck_mtx_lock(ftick->tk_aw_mtx); @@ -476,6 +477,7 @@ retry: * or EAGAIN to the interrupt. */ int sig; + bool fatal; SDT_PROBE2(fusefs, , ipc, trace, 4, "fticket_wait_answer: interrupt"); @@ -485,11 +487,12 @@ retry: PROC_LOCK(td->td_proc); mtx_lock(&td->td_proc->p_sigacts->ps_mtx); sig = cursig(td); + fatal = sig_isfatal(td->td_proc, sig); mtx_unlock(&td->td_proc->p_sigacts->ps_mtx); PROC_UNLOCK(td->td_proc); fuse_lck_mtx_lock(ftick->tk_aw_mtx); - if (!sig_isfatal(td->td_proc, sig)) { + if (!fatal) { /* * Block the just-delivered signal while we wait for an * interrupt response @@ -512,6 +515,7 @@ out: err = ENXIO; } fuse_lck_mtx_unlock(ftick->tk_aw_mtx); + sigallowstop(stops_deferred); return err; } Modified: projects/fuse2/sys/kern/kern_sig.c ============================================================================== --- projects/fuse2/sys/kern/kern_sig.c Wed Apr 24 15:35:29 2019 (r346639) +++ projects/fuse2/sys/kern/kern_sig.c Wed Apr 24 15:54:18 2019 (r346640) @@ -929,16 +929,16 @@ osigreturn(struct thread *td, struct osigreturn_args * #endif #endif /* COMPAT_43 */ -/* Will this signal be fatal to the current process ? */ +/* Would this signal be fatal to the current process, if it were caught ? */ bool sig_isfatal(struct proc *p, int sig) { intptr_t act; + int prop; + mtx_assert(&p->p_sigacts->ps_mtx, MA_OWNED); act = (intptr_t)p->p_sigacts->ps_sigact[_SIG_IDX(sig)]; if ((intptr_t)SIG_DFL == act) { - int prop; - prop = sigprop(sig); return (0 != (prop & (SIGPROP_KILL | SIGPROP_CORE))); } else {