From nobody Sun Apr 26 09:21:11 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 4g3LmD5lcTz6bLMS for ; Sun, 26 Apr 2026 09:21:16 +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 4g3LmD2sNFz4Jxx for ; Sun, 26 Apr 2026 09:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1777195276; 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=l8TCI6HW78AYPCVlJRkwSYfZktMg2Cb3M0yKu6BXjQk=; b=Aeo8cjhnZkOQu/LGdTzRfIctJQ2Y8lFV7mYGXBqnSg0r6UHA7D/eNOzUkn3VL3L0w6R5Z0 MkPPzcWOZI29/dwMUEFkQVRxd5pBprO7UBL3DdaABrckXd4zbM/nqvtdemo1ROzBmDrNLd g6TJ3Z7Go4QwwrDnSiIqXqSnLDejfAjliZArm/xQV3LB/TDsfrgqQASvC39IN1IIz5+PAv fE6FVJqeEnKD0JXWLjweDyf6hQAeAvlU5aJhat6/KODommOzKDzdwGz00Q2W4i+GuQCXJP Xqb3baqPyrO/4xVvzsjeBexBMhYD5RTesb0e6RYLYHs4nys9m2wiwrYFPHxrGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1777195276; a=rsa-sha256; cv=none; b=jQ8ZGZqE9fNnsa8UUVjx172oOnyA8twz2POt5waU4JyBNurXL9A0oVS2SFWNUYzGkttSIT E75cLqMwT93Mbdp9a27h4/bKdI+XfVeojDNE5+7boNmFtjo1H7ZtHdu+MCVAYVQxmaRfTf XiKx/rhq9c74FCHNqRzyw3U6Ls1OnSfotaHNG8pbM4T+of7nE1wkwjStpYEREMnP/8JAQq GFcGW7rEWRiVrOmgkFCQntbAwWtXGE2CYwMD3HEZvjDXsFjrtMYkGRhJN4pKMEn30BC9Tr gEbw3ieqKzkhvXjgm5O6jDJMxAxfQMdUkNbNFxQNHiu1AyeLbuNeu4DYFM8wpA== 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=1777195276; 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=l8TCI6HW78AYPCVlJRkwSYfZktMg2Cb3M0yKu6BXjQk=; b=i5clGgENkld3BxhA5p03rnyF1ctuS07QO2/AA8kk4fGxHtMjWycacfpxegtGRSM35bMhgj Hzr1Pj3ZwR321RQSxGgjcSbJV92UsOWYz+FX1TD39kRfNmWC/2o6CGK1nyjSeGh+xNk5w6 xzIQyxKEWwhSBTxrxJ/pbjx8D7SGeJGaBvXbHmG960/ccXE+OQy7UX3UfoO+gzlQ1gpaXQ yyAugJZZbJA+g0oeMYL0y25Hb9snnY/OOo3CuPnQMypwlrXHwz/oPhdRt4Os3tZDBVApqT REMd5ZnfAX/51qTYE6tyOgyKmFHb0qV9mrxtYI+kIxc1QQQh1j6tqONVZu+I0A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4g3LmD1vmtz1C06 for ; Sun, 26 Apr 2026 09:21:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37ba2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 26 Apr 2026 09:21:11 +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: 5c6a4b3f8965 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 5c6a4b3f8965e861322f295f97a2d4e59fd63afb Auto-Submitted: auto-generated Date: Sun, 26 Apr 2026 09:21:11 +0000 Message-Id: <69edd907.37ba2.4d6f6611@gitrepo.freebsd.org> The branch stable/14 has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=5c6a4b3f8965e861322f295f97a2d4e59fd63afb commit 5c6a4b3f8965e861322f295f97a2d4e59fd63afb Author: Timo Völker AuthorDate: 2026-03-02 17:59:45 +0000 Commit: Michael Tuexen CommitDate: 2026-04-26 07:13:24 +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 517052419ed4..7c38ecfe16a2 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -7971,7 +7971,7 @@ boolean_t 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); } #if defined(KASAN) 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