From nobody Tue Apr 08 13:40:39 2025 X-Original-To: dev-commits-src-branches@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 4ZX6fK2c0Nz5sQDV; Tue, 08 Apr 2025 13:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZX6fJ3D5Nz3Ckw; Tue, 08 Apr 2025 13:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bV+1/CMo/6hMGl4hJc19L/ofKerXoqiZgwOT3gqwL0k=; b=wyFchHPEa4q4OFzg2z7pdjwiFNu/ymawoe+ISJoPrB//B8VmMtomHvzR+qyrTVamjeBXx8 n3VKoNfRX3WmdU4S4yYiJzGhUYJ03pRPtvz0Jl0crxXDbmE6RjB8VkmhAY/EIhGDo4h5vd AbfQLjrVce8EUO4W61l5tOr/fdGpiNsoTOt3KPtRnx5R9H45GTn3O875uIhrTR6Xs1l36Y TqXGQfHhDfA/KRpB/zWd/aGLs/JHIAAKTYPNjIvxETeED4BcU9LTLkMBcld4kO2SJks8/t ZSaeELcq2sUKvXTKrkBVfg1DuuhTL5Q42q0SjrDC531jwIMDU1ZdlGNfZbSSEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744119640; a=rsa-sha256; cv=none; b=BmEJwQfKbiM13fmOnOkUUfYrkNYLSvBokrQnP8zmd9npmqDgSuVours9+lNeq/fOEtykwf 0tlPF8Do0dcfYAMiG7SN6MLsFLKg9BOXKWiqfYHtjpCIaKPT0v2pIUGrrzTsnnNvcqXar/ VkkepGaxmQjb64OtpsMvuyAK2lkahuI1XGYS28SMyqjzOPhpIvmrOy6mRyOFB+TlJa1fOO Gyqmq2qOc0KflLe4DwAPH6LbTBIMuUUTpbvLMWj+aKi84JsM13tJS1SORrJV3qBgBDopV/ x2f6Wy6SjZ91q+LimRb380NCNZMQPNb7rGZxmyieKsuqqO7ITgBrcHbP8rUePw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744119640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bV+1/CMo/6hMGl4hJc19L/ofKerXoqiZgwOT3gqwL0k=; b=XCyXggctcqGLGDwpZQKtL4OWJhFvL0bQntqobAQErtSAKtOaffsMuiebKr0aDJsO87mArt hR9LAvytx9cbuQWv6ZhV/ufGDwFVHrjFPmaHUkftdwZzpmJWgS4gSC4tiv9meSe/eQ5HOp cZMfs8OlwF9AE18BfV3cVysbmqbMeEkRr12OkrAd0/DI4yyeyFZL9fJddCYKjqosG4YJQt iO/mgStjx5FzKGJo/Uvvhdv35PDzTU1DFo53+tLbDm/LDqvyQgBsdfhQiF8hcMnTaMmYmr QJm3cqW5AmLsCABb9utEb/wVJ0vomNukK+wWK9NiZBcKCpYHd1VTPpBvO0Ajgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZX6fH6Ym4zZNq; Tue, 08 Apr 2025 13:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 538Ded8Z030654; Tue, 8 Apr 2025 13:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538DedNi030651; Tue, 8 Apr 2025 13:40:39 GMT (envelope-from git) Date: Tue, 8 Apr 2025 13:40:39 GMT Message-Id: <202504081340.538DedNi030651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: f106887cb0aa - stable/14 - vm_phys: Check for overlap when adding a segment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f106887cb0aa502a23f353d3c75dc60ec1ce1668 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=f106887cb0aa502a23f353d3c75dc60ec1ce1668 commit f106887cb0aa502a23f353d3c75dc60ec1ce1668 Author: Olivier Certner AuthorDate: 2024-10-10 07:41:40 +0000 Commit: Olivier Certner CommitDate: 2025-04-08 13:38:21 +0000 vm_phys: Check for overlap when adding a segment Segments are passed by machine-dependent routines, so explicit checks will make debugging much easier on very weird machines or when someone is tweaking these machine-dependent routines. Additionally, this operation is not performance-sensitive. For the same reasons, test that we don't reach the maximum number of physical segments (the compile-time of the internal storage) in production kernels (replaces the existing KASSERT()). Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D48628 (cherry picked from commit 8a14ddcc1d8e4384d8ad77c5536c916c6e9a7d65) --- sys/vm/vm_phys.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 98ea22fd2b9d..3f8c37b4c2bf 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -403,18 +403,26 @@ _vm_phys_create_seg(vm_paddr_t start, vm_paddr_t end, int domain) { struct vm_phys_seg *seg; - KASSERT(vm_phys_nsegs < VM_PHYSSEG_MAX, - ("vm_phys_create_seg: increase VM_PHYSSEG_MAX")); - KASSERT(domain >= 0 && domain < vm_ndomains, - ("vm_phys_create_seg: invalid domain provided")); + if (!(0 <= domain && domain < vm_ndomains)) + panic("%s: Invalid domain %d ('vm_ndomains' is %d)", + __func__, domain, vm_ndomains); + if (vm_phys_nsegs >= VM_PHYSSEG_MAX) + panic("Not enough storage for physical segments, " + "increase VM_PHYSSEG_MAX"); + seg = &vm_phys_segs[vm_phys_nsegs++]; - while (seg > vm_phys_segs && (seg - 1)->start >= end) { + while (seg > vm_phys_segs && seg[-1].start >= end) { *seg = *(seg - 1); seg--; } seg->start = start; seg->end = end; seg->domain = domain; + if (seg != vm_phys_segs && seg[-1].end > start) + panic("Overlapping physical segments: Current [%#jx,%#jx) " + "at index %zu, previous [%#jx,%#jx)", + (uintmax_t)start, (uintmax_t)end, seg - vm_phys_segs, + (uintmax_t)seg[-1].start, (uintmax_t)seg[-1].end); } static void