From nobody Wed Jun 29 14:40:54 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 24F9A86DA08; Wed, 29 Jun 2022 14:40:55 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LY3zp4CTgz4hrk; Wed, 29 Jun 2022 14:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656513654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1wconYs26tP1sw3tQnhT3XZRM3kInnMmW4D2KGUOo0=; b=SNRAKt4ZO9cGXSlAOnRomJHv++LkYoTR5uRRv4LvidYeeuf7Rjt1kSyvPiWLHAxJc39AJu ixQXmto8WlKh3RudHqpr7E6Fq672KkjohFRNBLb9k7YMY3LwbelYSPXmSu4k/MlMFKDwJM vh3pajondrsyPA+Ufg40dM3GRJ7A99LCkDyTDpjA+/vxCjkWxo3VSKGMMrn+oMBf4AJa+Z kZukX3zHbie7uRH2JY3W6zAQ3nO87cqiY0Sd3xozqevVITkfzWu3BxFI8YFCA+ZYKkiygL KSGUBWkTeHk+3GD4O4ru8nTBa9gwF4XHfKqBitvjv3xhR97vNtwY53b9AMkdWw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 452BB1399A; Wed, 29 Jun 2022 14:40:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25TEes4Z031685; Wed, 29 Jun 2022 14:40:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25TEesS2031684; Wed, 29 Jun 2022 14:40:54 GMT (envelope-from git) Date: Wed, 29 Jun 2022 14:40:54 GMT Message-Id: <202206291440.25TEesS2031684@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 3fe539651a4b - stable/13 - vm_fault: Avoid unnecessary object relocking in vm_fault_copy_entry() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3fe539651a4bc8ff6b8e6a2ff5213377cb3f7d88 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656513654; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K1wconYs26tP1sw3tQnhT3XZRM3kInnMmW4D2KGUOo0=; b=PYuBXbLRxrfk4SVy5gTYF78YkiziPsSCWIE18t2Q4DOVw7b6P0/XlwNW6y1KK/uf1CPSFG VwG2WfOacDHomf5jMO66mQ3HudiQCaS5WfJfQVI/B748+LUBjEaKG1kzhyz2tnyrRboXSe 6GJExlxFyZLd2VC4E2SEuTWFmy9nNnhRz4tCG14a9Xv6Dn/vf/0auiNeOUNQbljq756HSl irQQSUQfgW4DEo0qi/I3ttl2tL9gMzA46JB36V2eM/u76cqEUpSyZQz8bG5XpekzCc+wqs 9hKqtf0xclJaPCAplkgP820hupS6/gWty5aa2Qh5sc6Ywr2i23xF7ZSFzv7aTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656513654; a=rsa-sha256; cv=none; b=y0dC6D+vSTYrq1748VK2mtaBJWawbhmoFD3Nh+Y9vA3/hleKMf+FWiQYL/0VUudbDxR8Of tA+6jBd6e2m4kh4IINhH6UPH4k6lq2vmbp8HEQ9S0Lqm/ESjkDCCLAmBjtIE5sbgW9IofT M/VfqbkX/PtaxZXwZ6ZBQcbIMjUDOMvL/5ioIjImcy6in6U3BAYVvYO7WEHUZW498VQ0cO s3s+KJTyKJxYozBWO0Zoj7kNwsqQxqCO7AgOTgY0XYfk3xeNpjmfPrMUj0PKG1XzM9ZOAF o/AucSZ8tTpffCm+3QvY+VIwbPA3P3bt2hpdY9eBd/S7UVsUiHgXykOHfAaFhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=3fe539651a4bc8ff6b8e6a2ff5213377cb3f7d88 commit 3fe539651a4bc8ff6b8e6a2ff5213377cb3f7d88 Author: Mark Johnston AuthorDate: 2022-06-14 20:37:35 +0000 Commit: Mark Johnston CommitDate: 2022-06-29 14:12:34 +0000 vm_fault: Avoid unnecessary object relocking in vm_fault_copy_entry() Suggested by: alc Reviewed by: alc, kib Sponsored by: The FreeBSD Foundation (cherry picked from commit 1f88394b7f35a50507b1faade9e8854f104b563d) --- sys/vm/vm_fault.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 41346f8635ea..0e155ed1f39d 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -2116,7 +2116,6 @@ again: break; } } - VM_OBJECT_WUNLOCK(dst_object); /* * Enter it in the pmap. If a wired, copy-on-write @@ -2131,15 +2130,15 @@ again: * backing pages. */ if (vm_page_all_valid(dst_m)) { + VM_OBJECT_WUNLOCK(dst_object); pmap_enter(dst_map->pmap, vaddr, dst_m, prot, access | (upgrade ? PMAP_ENTER_WIRED : 0), 0); + VM_OBJECT_WLOCK(dst_object); } /* * Mark it no longer busy, and put it on the active list. */ - VM_OBJECT_WLOCK(dst_object); - if (upgrade) { if (src_m != dst_m) { vm_page_unwire(src_m, PQ_INACTIVE);