From nobody Mon Mar 2 18:10:52 2026 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 4fPn6n4828z6T2Qv for ; Mon, 02 Mar 2026 18:10:57 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPn6n3WsSz434G for ; Mon, 02 Mar 2026 18:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772475057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4IzzrR9oDWnRG++AecYUjwecmwiz18dGVDxTNc5T+xs=; b=daY6q7KhyU1nKn0ZeBzVo+0oZQr2cfimdl/tvb9PdeuNqvbLhBBdahmor0OxgpuJljptNl +1vuosKVyUZY1N8+2W1e8DPcZPbKnEY0wPio1kUFUtIn7HZZtmKfU16DP9TLwNQ+LHoHfQ Zc10OVMQsidvJscTlxSxvWVCMnVHots+AZ3wpbTKbvBDgP15cs2FzxTQrBU/CsPp4V7QZ8 ajy8ZJpJHSmC2ugGws1BxnhzAF161RhCPUy3PthtVItBP9riNROfyjQMuHpSseusKPVsTx zILZmPwmCkc1He9cOr9rHaA7WWkL0k9RL/tsrlZKqoKqLaPrDDArFHheBl//Lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772475057; a=rsa-sha256; cv=none; b=L5Frl9cHRgRw2u5d+OPkrqkoU/3tbSTbEQNcD9IR1r0y8CrBuen6kZW8Tbz8/F5AfP0KhA plDiSCghBU7W4WEVOovhvQleNfItHCtXSCgIk/gZHu+2sa2M5dl+vcYQujdLrbN5SyMHhC mLW7i1zficd/lA2S3jMWi2hFzaXPX0R5AQTGKXLD/zL4+STfBo9bqWEMLv5Ysjh31Y31nj YN1SmfzDEVc8Uuc0X0wT5G619748jzCO20iSw+AhcwDyIxv0e70Ze/298GNcenMefoU+s9 QHV94oupUvpUay7co+Inm14M5XAgpcIrgYLOIZNujiL0A97h0+qfjOl5qm8w/g== 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=1772475057; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4IzzrR9oDWnRG++AecYUjwecmwiz18dGVDxTNc5T+xs=; b=c9155tK7A/Ncru3Ldw/eThGi3JBa1pqJvUrKJsZcoxiA5Fo5LqJmGStNV+DNfvLfD2OD0F fzxQQca+SP9eSbcZ3KBhkQseByToJHFCrmtJQgxbUIsFXENk8omLlXI3gmkeZkeHZXiaVc HFzYX4lrzxJtYZXJB1s4eGIhF2UKfXYv+XoxXUXwHjZ22kyZaCKWJ6b2XM4/yNUqMrpX45 3GHExQG/a5SWUfeV7nfpyQJs9DlK5CMTqtziJmE1hvN4nOrfnIs2MTkkwR5xUnzIMujWiH Srwa2Bg6L/8Tf0MFFnPm6ANsJYq4xK5RAkeXlRTqhS7ahMVrTudkFk/BdrYVHg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fPn6n2sDHzlRB for ; Mon, 02 Mar 2026 18:10:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 432e0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Mar 2026 18:10:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: 0272359ada14 - main - arm64/pmap: fix pmap_is_valid_memattr() 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: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0272359ada144aa540c28fefaf996afa30dc0aa5 Auto-Submitted: auto-generated Date: Mon, 02 Mar 2026 18:10:52 +0000 Message-Id: <69a5d2ac.432e0.50b47cad@gitrepo.freebsd.org> The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=0272359ada144aa540c28fefaf996afa30dc0aa5 commit 0272359ada144aa540c28fefaf996afa30dc0aa5 Author: Timo Völker AuthorDate: 2026-03-02 17:59:45 +0000 Commit: Michael Tuexen CommitDate: 2026-03-02 17:59:45 +0000 arm64/pmap: fix pmap_is_valid_memattr() The function pmap_is_valid_memattr(pmap, mode) checks whether the given variable mode is between the two constant values VM_MEMATTR_DEVICE and VM_MEMATTR_WRITE_THROUGH. After the code for this function was written, the value of VM_MEMATTR_DEVICE changed from 0 to 4. Since VM_MEMATTR_WRITE_THROUGH is still 3, the condition is always false. This patch changes the condition to check whether mode is equal to any of the VM_MEMATTR* constants. Reviewed by: andrew, tuexen MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D55534 --- sys/arm64/arm64/pmap.c | 2 +- sys/arm64/include/vm.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 0cfc8ae80d70..25192bfef653 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -9643,7 +9643,7 @@ bool pmap_is_valid_memattr(pmap_t pmap __unused, vm_memattr_t mode) { - return (mode >= VM_MEMATTR_DEVICE && mode <= VM_MEMATTR_WRITE_THROUGH); + return (mode >= 0 && mode < VM_MEMATTR_END); } static void * diff --git a/sys/arm64/include/vm.h b/sys/arm64/include/vm.h index 342143c57246..e03e615bb841 100644 --- a/sys/arm64/include/vm.h +++ b/sys/arm64/include/vm.h @@ -33,6 +33,7 @@ #define VM_MEMATTR_WRITE_BACK 2 #define VM_MEMATTR_WRITE_THROUGH 3 #define VM_MEMATTR_DEVICE_nGnRE 4 +#define VM_MEMATTR_END (VM_MEMATTR_DEVICE_nGnRE + 1) #define VM_MEMATTR_DEVICE VM_MEMATTR_DEVICE_nGnRE #define VM_MEMATTR_DEVICE_NP VM_MEMATTR_DEVICE_nGnRnE