From nobody Fri Jun 28 14:13:28 2024 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 4W9cqD68tMz5MrHl; Fri, 28 Jun 2024 14:13:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W9cqD5MBnz4DrM; Fri, 28 Jun 2024 14:13:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719584008; 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=Fqou+m3HxEwi0vowu6DZM3y/329M2WSLNj2K4/e57ag=; b=cY+ektbRacqhxLVB/uoXs86qNcQjMNdJN5cGuPZo8o/zWS3nvqkyA3ORPliTQIlgtX+f/p jXQGEhEvwb0gxl3wErhJaR5lVdaK/nsEjdRx3T7YbfSLj3zOta4y0PtUxNQg20v+mXksfL 2/MM2WV0t4aKRoF3Ic77XTgSTfrvbU/2Xp+kd0GxqSYFae07OHfx7xerRceAwpB6AzPqfh fPAa/GlQ7DfXc/mpXeJ4xm7WQM3EqC9gluvWTTQUrgsMbvPKN/4GEQ2cLgycMkN3QVjss6 JlRkCIUaH1lmfcx+Cxlo6sc0NV8zHfY4hDASXdJlx8hqSEhLfRGcKSWHSHygMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719584008; a=rsa-sha256; cv=none; b=TWFDPfcN0xctV+0K+GAAeNs7bBtbBkn094UlLlIxX3OABG7lMHyKG4jUvLQ90ZF6GsMtzl /78FMWOBfJDo2sb6qvPNTlXikbCNvBKitTPnCPsebk/6Qc+Tlx/+issQc9kX+8ss1/Moth aXMi5M5PFLgrCGbhcy6cDXDifNha02J4txTIPOc39x3vVBfDuGZImYCZQMN4sHoubg6/ER TmMy8oowg19G1mRN2QhjdadBYDimMYOs25LXx11CKdTaxbsv+8158HgnlQBNCnJ18ihGUj cQRhTpwGGtkLzOmcs1/iU2oMWA9xrqnaG+DJVddoefVymQgPaxm+xiXLPE9yDQ== 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=1719584008; 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=Fqou+m3HxEwi0vowu6DZM3y/329M2WSLNj2K4/e57ag=; b=iwVUCH752q/Wacv7Xmx/tuphv2oVVCAuZsXJnYPBjqyK9NvyWi+kSBOiP121Floo6uScYJ FzUx7F984WcGYQ1Hdqzp38WP39gC7XpT9oUARy0NntdEypWB0OITyAfiir5wkAqy26Qzoo H49ovQt5TB/zt0jzp2z3+1lgpPBrhIgGHyIm/ioxLle4+LJ0ElJrQXzLF2+X5wynnxDiSr M6ti+OnuCz5ZCdDhwWirXbDb4Oy3LTJfxE3oJp0htGSTP6gJzmvG5wRTJc+RykjDmpQIXA nJbSAzmuLff7vOgIt3rLltsIkIYeQkUOkpBBXwzbHlOO+XyQokvqCHZwK/diOQ== 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 4W9cqD4yYPzyj7; Fri, 28 Jun 2024 14:13:28 +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 45SEDSM2080215; Fri, 28 Jun 2024 14:13:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45SEDScv080212; Fri, 28 Jun 2024 14:13:28 GMT (envelope-from git) Date: Fri, 28 Jun 2024 14:13:28 GMT Message-Id: <202406281413.45SEDScv080212@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 2eb64df7f53d - main - riscv: remove a redundant check on PGA_WRITEABLE 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2eb64df7f53d699f0be5d9ad3828bafee175a606 Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=2eb64df7f53d699f0be5d9ad3828bafee175a606 commit 2eb64df7f53d699f0be5d9ad3828bafee175a606 Author: wy-chung AuthorDate: 2024-06-26 07:46:32 +0000 Commit: Mitchell Horne CommitDate: 2024-06-28 14:10:57 +0000 riscv: remove a redundant check on PGA_WRITEABLE This is achieved by the preceding call to pmap_page_is_write_mapped(). It appears the second check and comment were left mistakenly when the intent was to remove them. Reviewed by: mhorne MFC after: 1 week Fixes: 638f867814a6 ("(6/6) Convert pmap to expect busy in write... ") Pull Request: https://github.com/freebsd/freebsd-src/pull/1304 --- sys/riscv/riscv/pmap.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index 377d038a9a8a..781f6b250a18 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -4611,19 +4611,12 @@ pmap_clear_modify(vm_page_t m) int md_gen, pvh_gen; KASSERT((m->oflags & VPO_UNMANAGED) == 0, - ("pmap_clear_modify: page %p is not managed", m)); + ("%s: page %p is not managed", __func__, m)); vm_page_assert_busied(m); if (!pmap_page_is_write_mapped(m)) return; - /* - * If the page is not PGA_WRITEABLE, then no PTEs can have PG_M set. - * If the object containing the page is locked and the page is not - * exclusive busied, then PGA_WRITEABLE cannot be concurrently set. - */ - if ((m->a.flags & PGA_WRITEABLE) == 0) - return; pvh = (m->flags & PG_FICTITIOUS) != 0 ? &pv_dummy : pa_to_pvh(VM_PAGE_TO_PHYS(m)); lock = VM_PAGE_TO_PV_LIST_LOCK(m);