From nobody Fri Mar 28 07:04:41 2025 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 4ZPBNT4B2sz5rNFQ; Fri, 28 Mar 2025 07:04:41 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZPBNT3Fmqz3c9s; Fri, 28 Mar 2025 07:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743145481; 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=sEE5gHE1r85wwneOtKQQmnIagGpYqCX69erkagaqRes=; b=LvJvgZAX3ZNqjtvnPfZTI+xVMHhW2eV0Iuj2ssBb7bqrw3wMLGxPwk997HsmP3TMbz4or5 LoAFW+BOhQUG1pHowYaMnnq6mF6rpARqOx1UsoCVDQmOnSgeWQIZKtmim+CFetRqJVAHiA zx8iowynNEf0AW2q9VDc75HXS0WRw4csQDnzHv1G/buZcTCR8Sk9M5KhqMI1Npu7kZ1X+w 534fH6GH217FICQOrsNdzrRCLMmL8tMNQ95VkK0pvD3WXwdKQvP0BPR3rDEgzalOiyvJpX IbJtvkay+D5sN8qHgNhui1m7EQu5sgaCuFKYnfTpiFXgGuGg28V6J9pvJwrO7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743145481; a=rsa-sha256; cv=none; b=jHA/5L4VVs1/fIm+JbWbm9jk6CoyVce0O/hZVxWq9B0YDYdPMpb+xO4ZaWvIO+vkIzvxUH xOrASket2WSJS5KfKpzNQ1wYOgPwiHsHKe/PRUEszd1vqVUSB5AgByh6qCeB2AUWZ27ufz RblEaWaNWEmlWG+SM2H2UtJ7K5CJFB9TR63qP9Tso6AlIIAgUnHfoLnpE9egax8sGxyE3M NufIzSgco8QYYiEFyJHgpjkB7KOni/GL4xdROFnTadKFLmveHBthgGuoUF7X94IdtVb/ru DbjpqwI/aoJyZznQ/RU/Yje6OrD7stY8gLiOTXEsx+Q8F4LuRJSEd7cqEwnkKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743145481; 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=sEE5gHE1r85wwneOtKQQmnIagGpYqCX69erkagaqRes=; b=K7ZYJmakM8E0LtgvGUAvim7TSf7pw96JbeOEOp89V9rwNrC+fzmyiGzwAMWB5AOtUyFf1p UfCNjTHI14WrArSv+z/SVBRuMabHxZbGcyBQcCYRStvkQY8LZwHDwEflA1FTiyFsYYHQ8P CsFMpVbEuGWL6WzLLyw+22S1/A5/qtj+90zGKUWmSVgrb/Awk5mqAWL7uHNBIKlrb5AA0V KhJLBVof5eSaB1mP5f9y++7501C0KIUbWPIwCC1tpp+mnP9L1Kf9R2smECDdJz/FhYeP3v pMjukHRopbMIEk/r55Y3aRt43EhfeYtsw6yM01AvzS7vXV4YMcFIL3XkvNRcXw== 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 4ZPBNT2VsFzZ17; Fri, 28 Mar 2025 07:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52S74fQ3073200; Fri, 28 Mar 2025 07:04:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52S74fNY073197; Fri, 28 Mar 2025 07:04:41 GMT (envelope-from git) Date: Fri, 28 Mar 2025 07:04:41 GMT Message-Id: <202503280704.52S74fNY073197@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 93c4f310fc65 - main - vm_fault: correct mpred update after alloc fail 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93c4f310fc653b0b7dda57043430dac8c7feaece Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=93c4f310fc653b0b7dda57043430dac8c7feaece commit 93c4f310fc653b0b7dda57043430dac8c7feaece Author: Doug Moore AuthorDate: 2025-03-28 07:01:50 +0000 Commit: Doug Moore CommitDate: 2025-03-28 07:01:50 +0000 vm_fault: correct mpred update after alloc fail Find the predecessor in dst_object, not src_object. Fixes: 6d6c97fb72a7 ("vm_fault: update pred lock acq in copy_entry") Reported by: markj Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D49547 --- sys/vm/vm_fault.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 2e254e255dce..48a7a47e4c59 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -2208,7 +2208,7 @@ again: VM_OBJECT_RUNLOCK(object); vm_wait(dst_object); VM_OBJECT_WLOCK(dst_object); - mpred = vm_page_mpred(src_object, pindex); + mpred = vm_page_mpred(dst_object, pindex); goto again; }