From owner-svn-src-all@freebsd.org Thu Nov 22 21:29:37 2018 Return-Path: Delivered-To: svn-src-all@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 4BEE51108579; Thu, 22 Nov 2018 21:29:37 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E2E816A58D; Thu, 22 Nov 2018 21:29:36 +0000 (UTC) (envelope-from mjg@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 BE90B155A6; Thu, 22 Nov 2018 21:29:36 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAMLTa0t035032; Thu, 22 Nov 2018 21:29:36 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAMLTap8035031; Thu, 22 Nov 2018 21:29:36 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <201811222129.wAMLTap8035031@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 22 Nov 2018 21:29:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r340785 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 340785 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E2E816A58D X-Spamd-Result: default: False [1.45 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.40)[0.400,0]; NEURAL_SPAM_MEDIUM(0.72)[0.721,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.33)[0.330,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 21:29:37 -0000 Author: mjg Date: Thu Nov 22 21:29:36 2018 New Revision: 340785 URL: https://svnweb.freebsd.org/changeset/base/340785 Log: fork: remove avoidable proc lock/unlock pair We don't have to access the process after making it runnable, so there is no need to hold it either. Sponsored by: The FreeBSD Foundation Modified: head/sys/kern/kern_fork.c head/sys/kern/kern_racct.c Modified: head/sys/kern/kern_fork.c ============================================================================== --- head/sys/kern/kern_fork.c Thu Nov 22 21:08:37 2018 (r340784) +++ head/sys/kern/kern_fork.c Thu Nov 22 21:29:36 2018 (r340785) @@ -719,11 +719,6 @@ do_fork(struct thread *td, struct fork_req *fr, struct if ((fr->fr_flags & RFMEM) == 0 && dtrace_fasttrap_fork) dtrace_fasttrap_fork(p1, p2); #endif - /* - * Hold the process so that it cannot exit after we make it runnable, - * but before we wait for the debugger. - */ - _PHOLD(p2); if (fr->fr_flags & RFPPWAIT) { _PHOLD(p2); td->td_pflags |= TDP_RFPPWAIT; @@ -783,8 +778,12 @@ do_fork(struct thread *td, struct fork_req *fr, struct PROC_UNLOCK(p2); sx_xunlock(&proctree_lock); } - + + racct_proc_fork_done(p2); + if ((fr->fr_flags & RFSTOPPED) == 0) { + if (fr->fr_pidp != NULL) + *fr->fr_pidp = p2->p_pid; /* * If RFSTOPPED not requested, make child runnable and * add to run queue. @@ -793,16 +792,9 @@ do_fork(struct thread *td, struct fork_req *fr, struct TD_SET_CAN_RUN(td2); sched_add(td2, SRQ_BORING); thread_unlock(td2); - if (fr->fr_pidp != NULL) - *fr->fr_pidp = p2->p_pid; } else { *fr->fr_procp = p2; } - - PROC_LOCK(p2); - _PRELE(p2); - racct_proc_fork_done(p2); - PROC_UNLOCK(p2); } int Modified: head/sys/kern/kern_racct.c ============================================================================== --- head/sys/kern/kern_racct.c Thu Nov 22 21:08:37 2018 (r340784) +++ head/sys/kern/kern_racct.c Thu Nov 22 21:29:36 2018 (r340785) @@ -967,13 +967,13 @@ racct_proc_fork_done(struct proc *child) if (!racct_enable) return; - PROC_LOCK_ASSERT(child, MA_OWNED); - #ifdef RCTL + PROC_LOCK(child); RACCT_LOCK(); rctl_enforce(child, RACCT_NPROC, 0); rctl_enforce(child, RACCT_NTHR, 0); RACCT_UNLOCK(); + PROC_UNLOCK(child); #endif }