From nobody Sun Apr 26 08:03:36 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 4g3K2j6wsXz6bCR9 for ; Sun, 26 Apr 2026 08:03: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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4g3K2j5MCyz447G for ; Sun, 26 Apr 2026 08:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777190621; 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=W6PobpDz4pBlGV1OmlxmfFHruURxtlH7osoQS/DLVLk=; b=MoaOPYbmOFHMnLbtfohCV6IFIMq9PFBmT+T1DFB7EuL22clsE1wy38g38MBoX0ltAQ+SOK b7A6Msj3o1o+sRb/HK4m2lsIXSn81tz+qRTJytxHMa6Zt3oMBrf4PlkyS0fTHYfETV3INM M67TftRFAN3cUsUiCBf5eo1tOrVFDZoKAP5kegsUTYFRjIRULFk64a9rv9qfRRkO3Oze+H h12QnYoSxZ0gciaD+rVv6foWnKj+mRUuko6GXMb+ENQdOTU+5QvPLmkS2GYduy3quc2+mi VARXnO/5oTC89tGHUJ4PA57TuIm2KDJAVfWTrh+LCIrIHCMfW1cYsBOB5n0aKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777190621; a=rsa-sha256; cv=none; b=ZLqZo2A2twahpFIqYmlpRb02sR5IaAO4RZ27EacZ6rQHYh9DuZB6Ewjfq3IVbeCca5FT7R CkAuGvaPWGiI2aLUQod/RDixKDH3dOou+Ynr864mm8I/9zTNmIz4P6IaJjLOfOKJ45JhOw KF71lUijGH29JVlMBXgqyCdXFsWXH7lEQpyYWBsZzoXDS1e845y2xFJeYw2zcPMH1aRyeJ 6DtL92ZTWBeHf12zKK2FMHjDeUXgYZBNvACd06GIqV0XwjhVGc8/jUjIlV8HyOPvnOWtX+ V83qZ/wmzzRFEjtGVz7I9/9l3kQzTMtPKJ7CfFOHg5KVJ5kGD7cMxTq1aA/Apw== 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=1777190621; 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=W6PobpDz4pBlGV1OmlxmfFHruURxtlH7osoQS/DLVLk=; b=CEGOxF65xgXZ1sQkXs3u0bYJHJklaUvgcHQY0fSm4YhmzYPuLmgiEGKZRxCSen0Ks7J4Qw V89R/i4vIsMcpHvJl+XFE1rF/c1g7d5p3Ym/3aR9Inrlr+g9q1lyuoe9sCrShNv/RnrsIz xA6mZY/f58Q7yjNzLADNw1Ddmh9WmrFNcSA0B7SiiUPODf4ZF/LUFSAD2m6vcTF3juzuHi hmtEYjyZ6LwL4AiaEDUZ4gBDIICSQL9h/GOlnsV1+dsECpEhiMXoH9S8wDxduXsRzco8Xc n29mKWPgWdr15qiThNEWeCOMMyn9lRxFBwa8Q8iX1L09P4S7um0IsEEsvDsr0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3K2j4yhpz19lX for ; Sun, 26 Apr 2026 08:03:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26dbe by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 08:03:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Timo =?utf-8?Q?V=C3=B6lker?= From: Michael Tuexen Subject: git: 09bcf5a57a13 - stable/15 - 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/stable/15 X-Git-Reftype: branch X-Git-Commit: 09bcf5a57a138313e8330483b3e9335f9fdd5308 Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 08:03:36 +0000 Message-Id: <69edc6d8.26dbe.41a93a9e@gitrepo.freebsd.org> The branch stable/15 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=09bcf5a57a138313e8330483b3e9335f9fdd5308 commit 09bcf5a57a138313e8330483b3e9335f9fdd5308 Author: Timo Völker AuthorDate: 2026-03-02 17:59:45 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:58:59 +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 Differential Revision: https://reviews.freebsd.org/D55534 Event: Wiesbaden Hackathon 2026 (cherry picked from commit 0272359ada144aa540c28fefaf996afa30dc0aa5) --- 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 cae46f7c2f1e..678030f827dd 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -9627,7 +9627,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