From nobody Tue Jun 14 22:19:24 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 EC740857A9C; Tue, 14 Jun 2022 22:19:24 +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 4LN2sm5rlqz4qQ1; Tue, 14 Jun 2022 22:19:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655245164; 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=N5cdHFPaMZPn+73rzoXsTP7NcYQsN7EuZK5zsL2flxc=; b=CuhItdxrKT6gAizgVN5KWNLAlRUPWlaoxREGG8VlhUppziEpclOq1N+1P1DxUaMUAv7kuT AzEA+5ZW7Ha3CManOc5ubPHuS4OygUPRT2Q2RH2YF5a8xCVgNXeJJOnhnvH9nTES5D330l weodLPkxowc2S7jKAIa06Jq0jU995nZSIjKA8AvnFMZdFXqH4GhJqLhKgonUviM1a5KAEF UlAJCaHkS+4NSKCVd6A9QHnKilqrUU5OobBy95Pwx0PlF69MCYRmQhQEfUeQeiU9xsGk56 S0ZjvqoCjNrViR0mtQpGOwLE7y8vAWkYFDUKaKrGoEt2SgmR0J0f4MZwTfsEUQ== 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 97CBC1284D; Tue, 14 Jun 2022 22:19:24 +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 25EMJOkS084814; Tue, 14 Jun 2022 22:19:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25EMJOTf084813; Tue, 14 Jun 2022 22:19:24 GMT (envelope-from git) Date: Tue, 14 Jun 2022 22:19:24 GMT Message-Id: <202206142219.25EMJOTf084813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 1f88394b7f35 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 1f88394b7f35a50507b1faade9e8854f104b563d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655245164; 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=N5cdHFPaMZPn+73rzoXsTP7NcYQsN7EuZK5zsL2flxc=; b=tuy2e59cFn39Z9nxBT4Zv0Vo/BQ+XrE1glzyZKY0UW/ftVwoUjXGb2Z3GIy5v2lVmW8EuJ A156oEXokDSvrehO2UFzy3zKJykxbUqqq2H1QL2a95awFHw0Dsoxcva5livV6SOQbbFKKV tT1T1i7fxQbpx6dpti5H6ZJuvKI4UDsC1royD3MLKY6EX5bvo2vQV1iKD8rQFm78Xd2nOj bCmFbLTJHpuq2NNCt/YRbL6KGlmWjA5KSF8cX8ZCwulQGZIJIkNkd4ZI8GRqFyvqtyQ6H2 a3bYvd/eQ9T7LOIqoYfquHJaIiwSSgdaGi2yAC4H/fYUMI6BCp5dePUTjiMjUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655245164; a=rsa-sha256; cv=none; b=T6pdjNREpZ8F25tG7mTa0V/JAy5uq4lIuG+a2/MtrHmmCzFRNdJ/w2Hbri4WmRzSI9aLJ2 srz4t2514oLgmRbs5g6qIYclA4s8WHCMSiAVgw4WXJGwjiwUVtvOORuxbDZ/VrPuMxnHt3 cTsBrOQVernGFeZUTWXfbibZSXj2fBgN88ERAIiE2TVUkITZMPbxr2lJPWvoC3GcHznFoA MSCDfZMVcxrwK/VPedCXp1LpaXxLR0B4DQwwYZLytTKOPhl6uA6rfqy72dIW+rd35V8utK 8SkEE5XS9jlpJJlmQ3Jg1dD58xXdJ0PVaMABBcq0PZC0+8GEQPEbUEzN0kgfaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=1f88394b7f35a50507b1faade9e8854f104b563d commit 1f88394b7f35a50507b1faade9e8854f104b563d Author: Mark Johnston AuthorDate: 2022-06-14 20:37:35 +0000 Commit: Mark Johnston CommitDate: 2022-06-14 22:19:07 +0000 vm_fault: Avoid unnecessary object relocking in vm_fault_copy_entry() Suggested by: alc Reviewed by: alc, kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35485 --- 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 3aca14777830..ba6f2ebfc730 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -2122,7 +2122,6 @@ again: break; } } - VM_OBJECT_WUNLOCK(dst_object); /* * Enter it in the pmap. If a wired, copy-on-write @@ -2137,15 +2136,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);