From nobody Fri Aug 1 16:41:01 2025 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 4btsCL1CKKz62qlc; Fri, 01 Aug 2025 16:41:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4btsCK3pBsz44M9; Fri, 01 Aug 2025 16:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754066461; 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=iGD1ywU6xbcEuYRzyZSlRaY75FOxL7k5FxaaY9BPNhY=; b=VCf6W24HTG1opfhTtIPif92ptrS/ID9AIib4WZPb6WaAnroGWiPY3y0ZKwlUFZwiK1ltB1 fsw+V9AohR3WnyHxYsrpdTiCsJKTJEZmAk2IS1Xh980mihBqVJd/yJ2rQWfv7RjNfi/3gP 8Sy8p1cNFlE1H6sF4xR9bscaOcpmCFFZZ/EduQWEMxS7mV2y8DT3hfEhvXNdIH/MR/GWMp 6DgeeYFcVea0VA7OWyNnQVK77z9SNWnRPV71OOW4GXYSHfDSjYLVuSOcWiwP2wb95uSj// m64Qf2jfYryW2ZnWIpqIQqDJCUpuXlE5X+B0/HjJjXfpVS7qnnFcb2hG8Y/FTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754066461; 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=iGD1ywU6xbcEuYRzyZSlRaY75FOxL7k5FxaaY9BPNhY=; b=C2U2ZlG3q1VuEhYS1AHqES+XOyhc4UmgQQ2dS0CXvryrT8SM2ZA0oyVHrCnmRyZDdcUpQC XhZFdizAbR30kStUnyqXbQySPdInWBxLZd/j8s1Lp6hf2IEYiLRlR2uV82MUvrKVs+RlOn ZTrkIZ6c0PsZ+tXqQqYAQp6v8IICONpoqd0aL70htFClF92PXEtzuwj6Zm22KRQUIumn0Q zHMrkU/NMp1CaUFI1ZdaZJdL0kbrFkavPpCIDwTXdizLkkbZNr4cm6F1mhVEalNMvKuIWN BL/oqytN+FeCclP4SxLZt805bb/ZOwjUg6Z/bcN3u0rd9MFrAKFP5jyTftjT7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754066461; a=rsa-sha256; cv=none; b=KaC27q2Nyuia0rX0ZNcBiNxeJkfGPwM381OZAIh3rjQaRvPnt+P/Jx47dMeFufhPh0ERLU cW7W/xftW/M2iA1LRVHHhAd9vlDdFdZ70Ti17pQ9RYGSBeyN3zecrIeVle3s+0o/O9YwsK 0lmQenk5FkKUAuT8oYv5kem9k3By6rgTOLNaEkO+W9qqAXN2mhcrED0l+YQsoYsNYu0zGR s57s1UZVyWs4mLmdvq7LB3C6Tox2zvR/dz4ozxZ3duZ0h9W/MGaUKGCyJcgFZcDcU1XtOJ cP+7ZnU1rb2yY90N5DuOiQkAajHIzbCRfqg5WUMtrW1gWf/tRm3++fb765poPw== 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 4btsCK32fDzvvC; Fri, 01 Aug 2025 16:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 571Gf1NC014102; Fri, 1 Aug 2025 16:41:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 571Gf1wS014099; Fri, 1 Aug 2025 16:41:01 GMT (envelope-from git) Date: Fri, 1 Aug 2025 16:41:01 GMT Message-Id: <202508011641.571Gf1wS014099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ka Ho Ng Subject: git: d5ec97156d33 - main - amd64: include opt_kstack_pages.h 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: khng X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d5ec97156d3314f979629968f76151c2d35a1e62 Auto-Submitted: auto-generated The branch main has been updated by khng: URL: https://cgit.FreeBSD.org/src/commit/?id=d5ec97156d3314f979629968f76151c2d35a1e62 commit d5ec97156d3314f979629968f76151c2d35a1e62 Author: Ka Ho Ng AuthorDate: 2025-08-01 16:29:58 +0000 Commit: Ka Ho Ng CommitDate: 2025-08-01 16:40:54 +0000 amd64: include opt_kstack_pages.h This fixes an early KASAN initialization panic in pmap_san_enter_early_alloc_4k, when a non-default value is specified for KSTACK_PAGES in the build config file. Also, rearrange amd64/locore.S's #include order to match the counterparts of other architectures. And amd64/locore.S now also explicitly include opt_kstack_pages.h as well. Sponsored by: Juniper Networks, Inc. MFC after: 7 days Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D51676 --- sys/amd64/amd64/locore.S | 5 +++-- sys/amd64/amd64/pmap.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S index 2be555b25160..62f5ee2a6998 100644 --- a/sys/amd64/amd64/locore.S +++ b/sys/amd64/amd64/locore.S @@ -30,13 +30,14 @@ * SUCH DAMAGE. */ +#include "assym.inc" +#include "opt_kstack_pages.h" + #include #include #include #include -#include "assym.inc" - /* * Compiled KERNBASE location */ diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 8df082f6c5dc..6369498210d9 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -104,6 +104,7 @@ */ #include "opt_ddb.h" +#include "opt_kstack_pages.h" #include "opt_pmap.h" #include "opt_vm.h"