From nobody Sat Aug 2 16:36:25 2025 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 4bvT3Z6CXnz63Jft; Sat, 02 Aug 2025 16:36:26 +0000 (UTC) (envelope-from des@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bvT3Z5WF9z3C7f; Sat, 02 Aug 2025 16:36:26 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754152586; 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: in-reply-to:in-reply-to:references:references; bh=XlrpNNq/k6VqzA+rOkXQGIgsmMCx/dOAmYMDnuoVrSU=; b=KKar2NUXObjmvrME6Th9vPp8fQUR+Rdlc2LctsTf0c+OL9kTU9j0Y1Al3xw9vg0ZNCTYXa ajV2uAaDNFAXX1eN29S1MCa3tYO6/T1jT48ddHzELW+pEll00uyDtEBooKG1IxhGmXz0os CvA+QXXJdXiJPkEIWAOrjvEOG3MMazbmsn2Vk83o4Q01wr4iIafURWgOA8+fDnEihNSaWW hxEvnFbsWtR1wgMQnGPtmeccu0wNYsQU8yaHLx7MXiVb2mVgJR/teECQ4jCPPUVNKUSVDf ZPSMeZxH6dsgDyYXVnWerl0oXkeac3jbUFEFcX4w6lTMI5wzgVWdAwK2u21PQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754152586; 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: in-reply-to:in-reply-to:references:references; bh=XlrpNNq/k6VqzA+rOkXQGIgsmMCx/dOAmYMDnuoVrSU=; b=dngL5fy0t8ZTKes6OvKS0J6QbMFwPwhkO1kYrMSViVXc9bDkleyA1C0FToh/e1I4CKoc2a /H/XuurZxMsY+63TwDBFkRJT9YBo3luYT21Tfd7GoT5sV75nDndB7xR3sn0UuxqLDtByhX jbVHRamWbzvuFhY114nl3ytbHqVT90ybxZja0doa+gSA40TBcuC0fQ9y23BvM/nXeR1ZK+ nvt0fZSb7fbVMcsLk0xpRgJfyEFDaN+WXG7AvfYlb3U5mfL8L70/I6hbLczLrt6YA+0n3L yzujlcVXegyZTb1AvOVSug61t700s7ljzM76Ls6dmT7UhxLqMKjqOPXfN2ba1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754152586; a=rsa-sha256; cv=none; b=ls/io7rd/IWdYcHEiewOtjfZz2QPG8wlF0FXdpVOHejU21TSWFg2oYeLhBqv94PMUwHxi3 P/rty2QUSEDYMFfpS3k//WwGOC7tnmawEuriSteWUlgTXQq3Lt8zWXnS+vuMGT/yOgM9J5 Uuexx8BBpG/vjAvFj3v5jIiQNC4G67PEzR/uJC78WgtejCq3/hM1XF1kQjh8gFQ8TRtrBG cN8uzt4ISbAi5qPNz6/VZRSHJDs4EZ/k/1w0tc7Yz7J/DorLCo3WGUMyflKz31eQ/Kjspm a7mzTPYxBbPNdz9V8jf0CHHHZ3F75zN8vM1w54eLszzSGWLzDzR8++9f4hk0wA== Received: from ltc.des.dev (88-177-82-251.subs.proxad.net [88.177.82.251]) (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) (Authenticated sender: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bvT3Z48dWzM9h; Sat, 02 Aug 2025 16:36:26 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.dev (Postfix, from userid 1001) id 6738012D58; Sat, 02 Aug 2025 18:36:25 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Ka Ho Ng Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: d5ec97156d33 - main - amd64: include opt_kstack_pages.h In-Reply-To: <202508011641.571Gf1wS014099@gitrepo.freebsd.org> (Ka Ho Ng's message of "Fri, 1 Aug 2025 16:41:01 GMT") References: <202508011641.571Gf1wS014099@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Date: Sat, 02 Aug 2025 18:36:25 +0200 Message-ID: <86ldo17kae.fsf@ltc.des.dev> 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: quoted-printable Ka Ho Ng writes: > 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 >=20=20=20=20=20 > 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. >=20=20=20=20=20 > 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. >=20=20=20=20=20 > Sponsored by: Juniper Networks, Inc. > MFC after: 7 days > Reviewed by: markj > Differential Revision: https://reviews.freebsd.org/D51676 This breaks the build: In file included from /workspace/src/sys/amd64/amd64/locore.S:34: ./opt_kstack_pages.h:1:9: error: 'KSTACK_PAGES' macro redefined [-Werro= r,-Wmacro-redefined] 1 | #define KSTACK_PAGES 5 | ^ ./assym.inc:24:9: note: previous definition is here 24 | #define KSTACK_PAGES 0x5 | ^ 1 error generated. It also makes no sense as locore.S gets KSTACK_PAGES from assym.inc which is generated at build time with the correct value (genassym.c includes opt_kstack_pages.h). If you somehow managed to build a kernel with inconsistent values of KSTACK_PAGES, it means something else you did caused genassym not to get rebuilt and rerun. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org