From nobody Tue Jul 15 08:52:35 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 4bhCck5hHKz629Cm; Tue, 15 Jul 2025 08:52:38 +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 4bhCck3977z3HHv; Tue, 15 Jul 2025 08:52:38 +0000 (UTC) (envelope-from kp@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752569558; 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=HqT+IeRAEOPhtcBtPykd9wijyQimv+BAPNp2/MIswWY=; b=llNDIkSpY5z77gkAlHNuxyVYpIhjw979t0h2ogwVBX6mLH0vXm4uCFUUXYOndV/Vq0raej /2luQKs51KxVQiBFeDpTtSt9UnXDZQVyz6/bab0WE3IE9BIRHZ0n4y9Q6drzrlaD1Tagqw W3o+Dsgjbm+cMTDSD1gYDt9nqRRBcQ9XWCOHRyXlUuFebzUsG443a/BftNu6KQXAPyajq+ 53Uz2KR9XequQHY7znrYS+NuOlGKq6pEJdR1bOjz4RePQQ/6Txfj7pGzFrY/DqO3GSONkI bDCYhsWmVOL/CSl1uFRGuU74qqCL7Dd1Nn7Z4q9yrymqqYfD396y2j+guufBLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752569558; 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=HqT+IeRAEOPhtcBtPykd9wijyQimv+BAPNp2/MIswWY=; b=nx1XLyGbDW31Kib7kCWF8Or5uCLvp5yGusMjOCDBMCL2uqmvqvXthjxKYhxosys2cU8JOZ T+6+B6aDtwAD8Nek05D4B5Qb5EO+FhZjrrVabv7kucApMXEnvGp+l5K33PkDMxMXjMHlCu A9pPpgxRNGo7nZlvY5sem3DJSeGcH0Yh+rd5KwbLNAv6YwLMhrxYufW1PtmLZgjxTAJbv1 /Aj3CMR8wYE8QlUTMJ95YItXXeRMzb2pi90QOMiMiaoSLL52YmMSeUISmqzBRp5af88EG+ HByjoa9YT/kp/q6yHJxR8iEp1AnAeFKroUS3hj8bEh+V/C/fbIW1IEdQFYm61A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752569558; a=rsa-sha256; cv=none; b=gDoGZpjmA3B782GuZwX8N4JHnnjxpELCJpmIgkWOZlEJkDs9S4dqqpuo7c6EUMLpE58VKG FW3D8vmgAgJGkg/TtFMFtg4/Wnh+rvtPL8SK2i7Md/0VirQHktFF4qba1qzZazJLE83u/G y7xtf6HGV++5tLsP7Hi333vfz6up1CizS9Xq0fOyHJOrjLc/YAYsSr0+kg3iVRWZtm8sZ5 VZKE0s9X9Y479v//y++vhzk6N3zga7fV9wDRwS34LsWQCqemCtzIukMdfW0MHvkNUp/OjA ZRvpmf8FBTOGXCXkjKdgB5I5dUyhkMwI4XC4CHmuvF25LLlL5PrqSHxONnKCSg== 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 4bhCck28cWz6rc; Tue, 15 Jul 2025 08:52:38 +0000 (UTC) (envelope-from kp@FreeBSD.org) Received: by venus.codepro.be (Postfix, authenticated sender kp) id 0C9F351FAC; Tue, 15 Jul 2025 10:52:35 +0200 (CEST) From: Kristof Provost To: Konstantin Belousov Cc: 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 10:52:35 +0200 X-Mailer: MailMate (2.0r6272) Message-ID: In-Reply-To: <202507142203.56EM3lOw070595@gitrepo.freebsd.org> 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 0:03, Konstantin Belousov wrote: > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D4dd828c80828637452a8a4e0= 7a64e294c82e5d8b > > 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 > --- =2E. > 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 thi= s 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 red= zsize, 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; KASSERT((vm_offset_t)addr >=3D VM_MIN_KERNEL_ADDRESS && =E2=80=94 Kristof