From nobody Tue Jul 15 13:11:59 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 4bhKN414xkz62Ncq; Tue, 15 Jul 2025 13:12:04 +0000 (UTC) (envelope-from kp@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 4bhKN36jBzz3fYc; Tue, 15 Jul 2025 13:12:03 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752585123; 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=V9b2xGbWzHqHXINpk5iOa/LYdqqFz6HacnOTyZatqgc=; b=kz7l5YhCbuFzKZlnx79keJBH79/u8pgrjdu3ZnYRS+syyMAp2a8gRbdrC1vY/0LOXs1AJR W3o2iYm4yQClxewgE0W+5se5KJXztSGxMJ6/p9SaOzxzBJznpBGfZo61zraWVz224YSduF TiAxzDWYuvxQKDo65wZeMHkE4aSy80+6B1AqzkzjP7sGFKVEiqZemq7Fg8Neh6LYjzL8Jo pQ8aq1aNjHFxEAkcxL/px43xS1oVY2hmy9514e+AHic9rL93PqzIrrt8VvPUtirmlHpyaL RnR9L8QbP1+bIYmTnnaVk6uui11Ymr293mnksBNcYlWFx6behxLvgxLQ4En03g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752585123; 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=V9b2xGbWzHqHXINpk5iOa/LYdqqFz6HacnOTyZatqgc=; b=DfDVUneRERu4DXWxfbNxULZ89aRBtD9PkcTfLM0N8Oar8g9ANxsY1nrARR/Joqn1t6O0IE KBLFC7Gy+4OW6eQevM51b1xP++V3jcNIsvJJIbPfXN3rQH9xHLjIVAzKn3kAtYxLXtspks /Aaad7KiuGZOLchIdxAD9AyfGysUbw8UdW4Kzgm5i3eqbFWuSWMtmJMBOzkXrPL8v4G1/H IgBEk5gM8wP/U4UwJUzwPCwYqKh06tGuTQAgsEQVtgS/WsqDOw7n3UjN5IOoVk2qWOfuLy fpqlBffTmQYQ/9rkw6ofYsLT1VM8gdRIykFKCch7sQpSbFn5QQyASY/gZKCHFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752585123; a=rsa-sha256; cv=none; b=DyNsyGuHwMMfvky4IcuI3kMJAwlmuQjn9w9QMMH+5uFHyhS/scS0eYuCbjuaHQCSgy5IBK RfS9SPmZ8oCL7uyE33PlZX6BWNQCAYUpQZnNDXIABq6NoQsCVKEwd0DBiAnLe5yQPDezK3 QWXXy/q232UGySYUy9SZcFoGbHeAknY3c7Q7nOSQc5izZM4X2GfsoMI3wPTR+kXLIg7HIN ybovr0T4yWVVRUD22fMsPT+QxKxR2FSG9vGjCmED2PgRTo4ZYCa+oSA2dajh8GiD42rrBS 3ns2NfDy+mHmnEDw5AJzaGS8TnQZ6unzOgQzBPWDX7+xStCDUoautVlqe4bNNg== Received: from venus.codepro.be (venus.codepro.be [5.9.86.228]) (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 (2048 bits) client-digest SHA256) (Client CN "mx1.codepro.be", Issuer "R10" (verified OK)) (Authenticated sender: kp) by smtp.freebsd.org (Postfix) with ESMTPSA id 4bhKN35Z0BzByw; Tue, 15 Jul 2025 13:12:03 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id BB1AD52545; Tue, 15 Jul 2025 15:12:01 +0200 (CEST) From: Kristof Provost To: Mark Johnston Cc: Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 4dd828c80828 - main - amd64: add kva_layout Date: Tue, 15 Jul 2025 15:11:59 +0200 X-Mailer: MailMate (2.0r6272) Message-ID: In-Reply-To: References: <202507142203.56EM3lOw070595@gitrepo.freebsd.org> 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 On 15 Jul 2025, at 14:56, Mark Johnston wrote: > On Tue, Jul 15, 2025 at 10:52:35AM +0200, Kristof Provost wrote: >> On 15 Jul 2025, at 0:03, Konstantin Belousov wrote: >>> The branch main has been updated by kib: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D4dd828c80828637452a8a4= e07a64e294c82e5d8b >>> >>> commit 4dd828c80828637452a8a4e07a64e294c82e5d8b >>> Author: Konstantin Belousov >>> AuthorDate: 2025-06-15 21:39:10 +0000 >>> Commit: Konstantin Belousov >>> CommitDate: 2025-07-14 22:03:28 +0000 >>> >>> amd64: add kva_layout >>> >>> Reviewed by: markj >>> Tested by: pho >>> Sponsored by: The FreeBSD Foundation >>> Differential revision: https://reviews.freebsd.org/D51085 >>> --- >> .. >>> diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.= h >>> index 0cd9bb4fa7a4..f12e5217a44b 100644 >>> --- a/sys/amd64/include/vmparam.h >>> +++ b/sys/amd64/include/vmparam.h >>> @@ -181,12 +181,9 @@ >>> * 0xffffffff80000000 KERNBASE >>> */ >>> >>> -#define VM_MIN_KERNEL_ADDRESS KV4ADDR(KPML4BASE, 0, 0, 0) >>> -#define VM_MAX_KERNEL_ADDRESS KV4ADDR(KPML4BASE + NKPML4E - 1, \ >>> - NPDPEPG-1, NPDEPG-1, NPTEPG-1) >>> - >>> -#define DMAP_MIN_ADDRESS KV4ADDR(DMPML4I, 0, 0, 0) >>> -#define DMAP_MAX_ADDRESS KV4ADDR(DMPML4I + NDMPML4E, 0, 0, 0) >>> +#define VM_MIN_KERNEL_ADDRESS_LA48 KV4ADDR(KPML4BASE, 0, 0, 0) >>> +#define VM_MIN_KERNEL_ADDRESS kva_layout.km_low >>> +#define VM_MAX_KERNEL_ADDRESS kva_layout.km_high >> >> The removal of DMAP_MIN_ADDRESS breaks the KASAN build. >> >> This seems to fix it for me, but I=E2=80=99m not familiar enough with = this code to be confident to commit it: >> >> diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c >> index 0edb631d1475..31204bad8c30 100644 >> --- a/sys/kern/subr_asan.c >> +++ b/sys/kern/subr_asan.c >> @@ -263,8 +263,8 @@ kasan_mark(const void *addr, size_t size, size_t = redzsize, uint8_t code) >> if (__predict_false(!kasan_enabled)) >> return; >> >> - if ((vm_offset_t)addr >=3D DMAP_MIN_ADDRESS && >> - (vm_offset_t)addr < DMAP_MAX_ADDRESS) >> + if ((vm_offset_t)addr >=3D kva_layout.dmap_low && >> + (vm_offset_t)addr < kva_layout.dmap_high) >> return; > > That restores the old behaviour, but it would break on arm64, which > doesn't have a kva_layout. > > I pushed a different patch as commit 1f683624df878b2e4c0187137640bf2e66= 62c36f. > That way is also consistent with how unhandled addresses are handled in= > KMSAN. That seems to work too, thanks! =E2=80=94 Kristof