From owner-svn-src-head@freebsd.org Tue Mar 10 20:04:40 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 18BC426EE90; Tue, 10 Mar 2020 20:04:40 +0000 (UTC) (envelope-from kib@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 48cQzW4x07z3PkX; Tue, 10 Mar 2020 20:04:39 +0000 (UTC) (envelope-from kib@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 A4968D7C; Tue, 10 Mar 2020 20:04:39 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02AK4drV019025; Tue, 10 Mar 2020 20:04:39 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02AK4dhB019022; Tue, 10 Mar 2020 20:04:39 GMT (envelope-from kib@FreeBSD.org) Message-Id: <202003102004.02AK4dhB019022@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Tue, 10 Mar 2020 20:04:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358855 - in head/sys: kern sys X-SVN-Group: head X-SVN-Commit-Author: kib X-SVN-Commit-Paths: in head/sys: kern sys X-SVN-Commit-Revision: 358855 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2020 20:04:40 -0000 Author: kib Date: Tue Mar 10 20:04:38 2020 New Revision: 358855 URL: https://svnweb.freebsd.org/changeset/base/358855 Log: Return reschedule_signals() to being static again. It was used after sigfastblock_setpend() call in in ast() when current thread fast-blocks signals. Add a flag to sigfastblock_setpend() to request reschedule, and remove the direct use of the function from subr_trap.c Tested by: pho Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/kern_sig.c head/sys/kern/subr_trap.c head/sys/sys/signalvar.h Modified: head/sys/kern/kern_sig.c ============================================================================== --- head/sys/kern/kern_sig.c Tue Mar 10 20:01:52 2020 (r358854) +++ head/sys/kern/kern_sig.c Tue Mar 10 20:04:38 2020 (r358855) @@ -108,6 +108,7 @@ static int coredump(struct thread *); static int killpg1(struct thread *td, int sig, int pgid, int all, ksiginfo_t *ksi); static int issignal(struct thread *td); +static void reschedule_signals(struct proc *p, sigset_t block, int flags); static int sigprop(int sig); static void tdsigwakeup(struct thread *, int, sig_t, int); static int sig_suspend_threads(struct thread *, struct proc *, int); @@ -2683,7 +2684,7 @@ stopme: return (td->td_xsig); } -void +static void reschedule_signals(struct proc *p, sigset_t block, int flags) { struct sigacts *ps; @@ -4124,8 +4125,8 @@ sigfastblock_fetch(struct thread *td) (void)sigfastblock_fetch_sig(td, true, &val); } -void -sigfastblock_setpend(struct thread *td) +static void +sigfastblock_setpend1(struct thread *td) { int res; uint32_t oldval; @@ -4152,5 +4153,19 @@ sigfastblock_setpend(struct thread *td) MPASS(res == 1); if (thread_check_susp(td, false) != 0) break; + } +} + +void +sigfastblock_setpend(struct thread *td, bool resched) +{ + struct proc *p; + + sigfastblock_setpend1(td); + if (resched) { + p = td->td_proc; + PROC_LOCK(p); + reschedule_signals(p, fastblock_mask, SIGPROCMASK_FASTBLK); + PROC_UNLOCK(p); } } Modified: head/sys/kern/subr_trap.c ============================================================================== --- head/sys/kern/subr_trap.c Tue Mar 10 20:01:52 2020 (r358854) +++ head/sys/kern/subr_trap.c Tue Mar 10 20:04:38 2020 (r358855) @@ -328,11 +328,7 @@ ast(struct trapframe *framep) sigfastblock_fetch(td); if ((td->td_pflags & TDP_SIGFASTBLOCK) != 0 && td->td_sigblock_val != 0) { - sigfastblock_setpend(td); - PROC_LOCK(p); - reschedule_signals(p, fastblock_mask, - SIGPROCMASK_FASTBLK); - PROC_UNLOCK(p); + sigfastblock_setpend(td, true); } else { PROC_LOCK(p); mtx_lock(&p->p_sigacts->ps_mtx); @@ -350,7 +346,7 @@ ast(struct trapframe *framep) * the postsig() loop was performed. */ if (td->td_pflags & TDP_SIGFASTPENDING) - sigfastblock_setpend(td); + sigfastblock_setpend(td, false); /* * We need to check to see if we have to exit or wait due to a Modified: head/sys/sys/signalvar.h ============================================================================== --- head/sys/sys/signalvar.h Tue Mar 10 20:01:52 2020 (r358854) +++ head/sys/sys/signalvar.h Tue Mar 10 20:04:38 2020 (r358855) @@ -393,7 +393,6 @@ void pgsignal(struct pgrp *pgrp, int sig, int checkctt int postsig(int sig); void kern_psignal(struct proc *p, int sig); int ptracestop(struct thread *td, int sig, ksiginfo_t *si); -void reschedule_signals(struct proc *p, sigset_t block, int flags); void sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *retmask); struct sigacts *sigacts_alloc(void); void sigacts_copy(struct sigacts *dest, struct sigacts *src); @@ -406,7 +405,7 @@ int sigev_findtd(struct proc *p, struct sigevent *sige int sig_ffs(sigset_t *set); void sigfastblock_clear(struct thread *td); void sigfastblock_fetch(struct thread *td); -void sigfastblock_setpend(struct thread *td); +void sigfastblock_setpend(struct thread *td, bool resched); void siginit(struct proc *p); void signotify(struct thread *td); void sigqueue_delete(struct sigqueue *queue, int sig);