From nobody Mon Nov 22 13:46:21 2021 X-Original-To: dev-commits-src-branches@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 67DC818A0FC6; Mon, 22 Nov 2021 13:46:21 +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 4HyT7x2S00z3lSt; Mon, 22 Nov 2021 13:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 361EF23BDB; Mon, 22 Nov 2021 13:46:21 +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 1AMDkLGN037509; Mon, 22 Nov 2021 13:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AMDkLbQ037508; Mon, 22 Nov 2021 13:46:21 GMT (envelope-from git) Date: Mon, 22 Nov 2021 13:46:21 GMT Message-Id: <202111221346.1AMDkLbQ037508@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: 0d900a16d0df - stable/13 - vm_pager: Optimize an assertion List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 0d900a16d0df1334be01f2dd6313cd5103ede8d2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0d900a16d0df1334be01f2dd6313cd5103ede8d2 commit 0d900a16d0df1334be01f2dd6313cd5103ede8d2 Author: Mark Johnston AuthorDate: 2021-11-15 16:33:30 +0000 Commit: Mark Johnston CommitDate: 2021-11-22 13:44:08 +0000 vm_pager: Optimize an assertion Obtained from: jeff (object_concurrency patches) Reviewed by: kib (cherry picked from commit b0acc3f11ba31f0aea8ca5ce2720b481dfa79d1b) --- sys/vm/vm_pager.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_pager.c b/sys/vm/vm_pager.c index 640e3d977e99..791fc1ebfe11 100644 --- a/sys/vm/vm_pager.c +++ b/sys/vm/vm_pager.c @@ -329,12 +329,11 @@ vm_pager_get_pages(vm_object_t object, vm_page_t *m, int count, int *rbehind, * updated the array. */ #ifdef INVARIANTS - VM_OBJECT_RLOCK(object); - KASSERT(m[i] == vm_page_lookup(object, pindex++), + KASSERT(m[i] == vm_page_relookup(object, pindex++), ("%s: mismatch page %p pindex %ju", __func__, m[i], (uintmax_t )pindex - 1)); - VM_OBJECT_RUNLOCK(object); #endif + /* * Zero out partially filled data. */