From nobody Tue Jul 15 12:56: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 4bhK270YZQz62Mqf; Tue, 15 Jul 2025 12:56:31 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (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 4bhK265Vlyz3XDZ; Tue, 15 Jul 2025 12:56:30 +0000 (UTC) (envelope-from markjdb@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-qv1-xf2c.google.com with SMTP id 6a1803df08f44-6fb0eb0f0fbso59222706d6.1; Tue, 15 Jul 2025 05:56:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1752584188; x=1753188988; darn=freebsd.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :from:to:cc:subject:date:message-id:reply-to; bh=bsY6hrwyKygh67sTIGh+/H9Y6t+oHXmQEafQOgk6aco=; b=mnesZfEFCFIBXrKPsPfcrecWr550D1M7wZCLALLnYWJ/CcoruETvlVW9U9q0ZavpA6 omRBs4tpHM5jY4OmZ4bO/bKPCGv2PnecD9kY7t49NxKC37jG4ElL6/OvoxY6Efqy81D3 HNya/t+FRgSuUVE8mT+VH/6LtX/d80L2W62cdpWCLkYapbTnIQaQNSxlbuhqAkFChPxj Cbdyvc23SkHvCZpfCrnZsfekqqvpKbCw2keQLQfgcnwCjeFG/nrMoxImc8OiahiZPllk jo6ILzUdQf/4FF1hD94B9TsqVfwQNrOCZAPpnWZspiejtgAXT6roJ4oN8XtyLNXRthFt Bfhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752584188; x=1753188988; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:sender :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=bsY6hrwyKygh67sTIGh+/H9Y6t+oHXmQEafQOgk6aco=; b=RKqIKaf3uY2yDURejMhG2ww1PUKAOeUISb5FYalLX1BMwPaeCTtWHlPyMgztUaJpEL bS9MDP/xU7fCsawh49V0dcPuz7uVAk/wO97//lDIMzZxNMueXphMrH6VK+Cnyx5rawhK 33/C1QM/xIcVoA9sROaq3nRSzs0DcLiGLYGp2O/cd7DW7DnHEIKsvLx6QTCSivwuQDXX qG1w33qJthW5fWw2BACx1Gdxrp4ePW+FbAsH3YS8GkP1LBVCuTPMQqV3sAJX0yzJ6pZj o3NR7RpPFkg/vYaKVYJ/wNzNIG2uu28spNkkGeaSgV4QeWHBT/hom7UhOdC4O5dofTiE A4Fw== X-Forwarded-Encrypted: i=1; AJvYcCVLA7Trhiv8IGbxe57HE5bVo+GW+k2tJG8OuIQtkKV5WQK4dDUf+jHp9M/pvrLOALv/Zic8JjP0ovvrfHNyCdQbD/eRzP4=@freebsd.org, AJvYcCX3eOMB3++92roFUgE1kPyZLaCCX+5Iww7ITuD+p1Jdg6g5VNrRlTgESrbutbXQCjtUG84zkTzSXlbi5wFmeMs=@freebsd.org, AJvYcCXNN69aREzbwDVx6K6ON4uAhQy74lfwQG718o7mqzIQPvU9wK1nYWF10usTW1CuXtV0sYKPEoVJP0FBCnPNF0DIqvxa@freebsd.org X-Gm-Message-State: AOJu0Yx61z16W9XPOORgQmxv5EP7Eg+Tn4DPzw7k7xVtfJOXhEriUs7W Ixe9W2+LVnZk6cdX3VHk2NrcXInTaX94h5bag6r9tnbhbIS+5Ob7rbtBA8tbmlfGXRw= X-Gm-Gg: ASbGncsjtv0twudq8lfHa6zMQeCBR2FcxxfP2YJ8FXpIxwPtTgDefwWhuNh1QYxjveP ULP47wbS6r+MO1Wg5Nd0jDWdS6k9CjRd8BcHwalz08BBX4FjfYjha5RgQ0qLgdTCRBzU94bJsk5 WKJA2c8KVP/1ThFcD6CcOdXymKOJxTqCI7NRpZNTzy17QjbmKDDfzvt+45XxwaKMdGS/mvwMT1Z oCecNm90Yb0lkhdnftj+4F/o3EjjBcuqY4mzHW4PxdENDEstbik4sEvD/HoxMhnhXAmFhVZivYq cRsQ1clz6QAeJZO8NvCfAhR8Qn8ebDA+5RvEbBw5RTK7sHVC+yhVC+tIVg7VQg9KJ/Vz4dtxpuO lLYEkWIsrSJkuK+JCamB+RNsCbklEeST99HqREwznThH7OkQ= X-Google-Smtp-Source: AGHT+IGVuULCtVl6ldcfnMutTUWuJ/4b1z/HjwgUzSsz8dtXopmknmW8Hqt54MBiDNb1Wl3u29BkyA== X-Received: by 2002:a05:6214:5f83:b0:704:a957:8656 with SMTP id 6a1803df08f44-704e1dd6601mr39212236d6.11.1752584188053; Tue, 15 Jul 2025 05:56:28 -0700 (PDT) Received: from nuc (192-0-220-237.cpe.teksavvy.com. [192.0.220.237]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-704979e3146sm57322446d6.41.2025.07.15.05.56.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jul 2025 05:56:27 -0700 (PDT) Date: Tue, 15 Jul 2025 08:56:25 -0400 From: Mark Johnston To: Kristof Provost 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 Message-ID: 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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 4bhK265Vlyz3XDZ 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 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=4dd828c80828637452a8a4e07a64e294c82e5d8b > > > > 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’m 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 >= DMAP_MIN_ADDRESS && > - (vm_offset_t)addr < DMAP_MAX_ADDRESS) > + if ((vm_offset_t)addr >= 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 1f683624df878b2e4c0187137640bf2e6662c36f. That way is also consistent with how unhandled addresses are handled in KMSAN.