From nobody Tue Jul 15 09:01:53 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 4bhCqg39zXz6293h for ; Tue, 15 Jul 2025 09:02:07 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bhCqg15Qxz3Kv0 for ; Tue, 15 Jul 2025 09:02:07 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qt1-x82e.google.com with SMTP id d75a77b69052e-4a6f0bcdf45so61548041cf.0 for ; Tue, 15 Jul 2025 02:02:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1752570125; x=1753174925; darn=freebsd.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=zvvSMc/3nnkdjMNk1GwkQRZy9S810jExSGmH9wEqSqw=; b=ggQzzSfzCOiZZ+cGyl747SDgUI3sgFwWGfFdwh3QgumuOSPyU8Z3O1qndUtkEI5B5Y 0R5SnemZLhVXIKbDYnPu3EPZmoNB3XU8fk9ITLrSVr8qk/Lu5A0cpey46tkfZ4xOGjwD 3Pq5NnO2FshScm7uuN6CSyDB5SSXeiimejiC8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752570125; x=1753174925; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zvvSMc/3nnkdjMNk1GwkQRZy9S810jExSGmH9wEqSqw=; b=i1a2o+2Bd4OLhk4SpDOtw229zQzJoScjq+tD2MfitudU9pZIb/xPUPEfkPTPGPqTwT DeSNC/l/eOH//vo6/R5YuaXn+3GhGx8jWMDRNie8ugePSIVAmeFSa8p/kdL+/sgHkeIt fkRgixKlEmPuX95S/4IS0WVGfsP/l0D9k9xIaS0kwpjlv5FgA4OHCrSilTWKlKvJdHHA KPunwuAVfEcGlQQgkvqRWAZZFnFj/4FAluUhuG5IizW2Ioy62GgoCY9o3tg9NAyt7Gem DwzKm7Y4bdzF93EN/+D9l/PNAopqwdERWXADIexwEUGVqWpdEn8RgnKLoIltl24ooTvV /xXQ== X-Forwarded-Encrypted: i=1; AJvYcCWFHdfSDSsmCOqowURT4Ulwl2U4cNAyV/rdiQOiSTkx7+GGEhBhgV60+Ee7/kD0HGKfDjKrgHtmbF3DHGEHYKAZlFof@freebsd.org X-Gm-Message-State: AOJu0YxqDLv7WOCUXZKisotCOelEWuhkQxP1IvxtVXGOpZSxwg8Q10bz CgWMvEO7bvxFnugjxQH3Cdo6V917QSfBHUx+THTAcrUfwfqYlH0tELSVbRAgEgeQlZO9l4R+yai cmC41yCaPXHs5dRggJfZ50ciL1MbD641UV3AvXzR1 X-Gm-Gg: ASbGncu1P1FATC/eGMz1lLx4GrrWYEDBZg/NfzHZc7cVF58SUh/yQYzZbsuq5ivWOg+ WvFNQDGLWld+LECGsTYUF0vP0xHahqsBvVV8R7dcNK6mDzNldfvDW4/0J2wTEdtdSRUA11xnJJJ mCVK9b0kiHi35IZsgBDWDbgLoXz7IJ/kPMQi7VQep9RwulxUbYU/0Kct/e5AWswSuKXanrqZCZB uwfe9yfhCiE1TiP28A= X-Google-Smtp-Source: AGHT+IH2fLh2ZhExoBE6ko6/f5uoMZ8vAR86dAD5YpFi0V+lCREIEPXgmzuHws/Eh5Ay1hoygNimro6oVz83S6LhBgk= X-Received: by 2002:a05:622a:198f:b0:4ab:8862:7fe6 with SMTP id d75a77b69052e-4ab8862865cmr8141721cf.26.1752570125153; Tue, 15 Jul 2025 02:02:05 -0700 (PDT) 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 References: <202507142203.56EM3lOw070595@gitrepo.freebsd.org> In-Reply-To: From: Kevin Bowling Date: Tue, 15 Jul 2025 02:01:53 -0700 X-Gm-Features: Ac12FXyll3Whg1MjM3zHEjT2S1Aqw-7BjeXY_9wmdKDX_6-tzns55Fr5JDv9IWg Message-ID: Subject: Re: git: 4dd828c80828 - main - amd64: add kva_layout To: Kristof Provost Cc: Konstantin Belousov , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4bhCqg15Qxz3Kv0 X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] On Tue, Jul 15, 2025 at 1:52=E2=80=AFAM Kristof Provost wr= ote: > > 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 > > --- > .. > > 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: Looks correct per Kib's comment on a similar issue here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D288236 > > 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, siz= e_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; > > KASSERT((vm_offset_t)addr >=3D VM_MIN_KERNEL_ADDRESS && > > =E2=80=94 > Kristof