From nobody Thu Nov 9 15:17:15 2023 X-Original-To: dev-commits-src-main@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 4SR5Cv2qn7z5055x; Thu, 9 Nov 2023 15:17:15 +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 4SR5Cv2Mnqz3YFs; Thu, 9 Nov 2023 15:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699543035; 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=lYs3PsGMizl5en0cypCC/j0SDyJNm7VCgYtfYjVtiPQ=; b=DP2M9pHfO1SVWtAaEYlU0Lmd0U2zzbw8zN3qbXW0MqOMOHWZtXfme+w9kMFHvIHqTiqIjG y87IRY8X/4avARhUgyrClmD4uvCaHmZRxgwsg0Zm1yTByFNqYZAhMZeI8ZcmJmRLCavkyw uGQ7xnqYI+XXAs+7kGLUn4iwOc3p09cxlvhnETtGuGY+PqTSl4oSlaMlD4lvDyLxYAw4zv siJGlVE3FzFiaYqRe+jKnG+S+0i1ol+dgrkForqjByBetATRp7K8eg/W5Uir1L9R0YOV0n baZVmvziEFWPVY8MQAP7jvFRE5rZ4jawt8752fbss5ynfvpNEizFdmbHdlbzTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699543035; 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=lYs3PsGMizl5en0cypCC/j0SDyJNm7VCgYtfYjVtiPQ=; b=YhyYbGQJiqqCIAy88G5WtCZemq2Lf9n5ocrSn2GQbrB3eEKppdsHwv14sPC6rKuR7or3KW F1S/Uee/heocPUb/Uy70lGgc1IzH3N+SNEj/66GPh1BnfR+JaUWVdtH97IEE2cB9kkYmSs 9tdmfDsjFc5elMHtyOLhnvchPzelQdlfFPh87zLhGx+DWiXrYqnh1fuHOqH0kA/AoEkKU7 oIljmwMWMjVa6qWNlIYs+a5+b3MV8YugWfvBYldq8VMvRp/wwhAg4ci65Hb4ScZ6L2f5To /PvpW1hylnOmODtwHdxP6dneZI9VD6aNR5cfgIJ2PRkFoUdw8Ps358xSgAyqoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699543035; a=rsa-sha256; cv=none; b=MjSG/yxMjVfCsBIh6IRG0ocAJsw+B52eYQdxjmiF3rid2OBR3oTpWm8w3RAvSAqB9bJPw7 6ri0jf0gXSsZ2YyQfMxFlI5f8Fhgt5zciyLNXWFG0VRqmgS4WJFdtDQjX8mxZI3BRBuENk vWGn/nGDqfw/cHp/CG9geVuDSexQVNlf90QY+E8++rBfwJZP26QvnTKxekEPxhB0ldNto6 xBjxDiglNX+S0zdFzGYPAKwIoshT6MN1kbJ2DaXfpSoyhcwJ60bj3rZIvhm/oihIaRbwkk 4PEQMLTbYq9C+oLLCcly1KOWX4Qt+cfBpbvCoAamjwjPsz5E2EUo7leLAdRysg== 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 4SR5Cv1FJDz5bf; Thu, 9 Nov 2023 15:17:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3A9FHFYW032902; Thu, 9 Nov 2023 15:17:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3A9FHFF2032899; Thu, 9 Nov 2023 15:17:15 GMT (envelope-from git) Date: Thu, 9 Nov 2023 15:17:15 GMT Message-Id: <202311091517.3A9FHFF2032899@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: e4078494f344 - main - vm_fault: Revert commit 64087fd7f372 List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: e4078494f344bcba8709216bd601efa3dd05f6b3 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e4078494f344bcba8709216bd601efa3dd05f6b3 commit e4078494f344bcba8709216bd601efa3dd05f6b3 Author: Bojan Novković AuthorDate: 2023-11-09 15:04:48 +0000 Commit: Mark Johnston CommitDate: 2023-11-09 15:14:05 +0000 vm_fault: Revert commit 64087fd7f372 The underlying issue that originally triggered a kernel panic was addressed and the fix was ported to all relevant pmaps, so the safeguards placed in vm_fault.c can be removed now. Reviewed by: alc, kib, markj MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D42517 --- sys/vm/vm_fault.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index dd044d27f00f..58761e97f5f8 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -386,7 +386,7 @@ vm_fault_soft_fast(struct faultstate *fs) rounddown2(vaddr, pagesizes[m_super->psind]) >= fs->entry->start && roundup2(vaddr + 1, pagesizes[m_super->psind]) <= fs->entry->end && (vaddr & (pagesizes[m_super->psind] - 1)) == (VM_PAGE_TO_PHYS(m) & - (pagesizes[m_super->psind] - 1)) && !fs->wired && + (pagesizes[m_super->psind] - 1)) && pmap_ps_enabled(fs->map->pmap)) { flags = PS_ALL_VALID; if ((fs->prot & VM_PROT_WRITE) != 0) { @@ -619,7 +619,7 @@ vm_fault_populate(struct faultstate *fs) psind = m->psind; if (psind > 0 && ((vaddr & (pagesizes[psind] - 1)) != 0 || pidx + OFF_TO_IDX(pagesizes[psind]) - 1 > pager_last || - !pmap_ps_enabled(fs->map->pmap) || fs->wired)) + !pmap_ps_enabled(fs->map->pmap))) psind = 0; npages = atop(pagesizes[psind]);