From nobody Wed Feb 19 14:14:22 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 4YydgL6sG6z5pQPh; Wed, 19 Feb 2025 14:14:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YydgL4Nz7z3n3h; Wed, 19 Feb 2025 14:14:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739974462; 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=NeBPMOmvZ8HjQgAL5VEwAGe2mpAWEm+bpmtMH8fwkB4=; b=HuMNWNqS0bYJLvby2W9sESD5mAmJfv9jzvkKf07/xKl9l6iZz5Gk0NhOM2BDv3gNbSgPKR lQaif6woRXbkgu2EqF0q3bkCc1pVh31NCx+3+3kBCW1d8urdbt5iugeK3DS16B2uAOT20U dI0wZW2koyWDKd/7oV0TYdg06zBDJ0D6DerPSkSppicymjQV+8uRaB7X6zEm9q+KjQZAjS wDQTupEmh0xzM3yonGiyZKHr5UQyVGtAu3FpmiPIK2hNUmqkj/Zr6/c7kzVJFUB6Ows/td W+5y6Iod6ebbpNpqLCn4epsdnl335LLhoBU7jLTRMlH3m4DogHKeR+s1h302uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739974462; a=rsa-sha256; cv=none; b=XmlMTTj8c89ISpBjWYC0PZqGgSDKVsfpkM6l/bUKrrkFMBaPHsBmOF3FuMCQt4O0jJHmka dECxeWZO4R2wT1jOil087rETngZWX2AqtJRlwYE9TaesktE5fXAQmzIJv8z3vcG5kB5Mx1 715pekKpBt3YzHTxTu+m75zFDdUT+kS3YBasyNvdHleuI99wghYMLasMpTpIInBoyQhMG+ HY3Sfbm7yJQVAilHbc43ZnMOYUyArvvJpoPdtQ4p+UztSB26FnG426OOJqhUKgleHaMc32 BLXI7HcT9vz+UXPzDv4O7d02A3XDi5/ti+ArHYe9bMZyKhfN8GV4txpyvp8CIQ== 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=1739974462; 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=NeBPMOmvZ8HjQgAL5VEwAGe2mpAWEm+bpmtMH8fwkB4=; b=KvSdl4iBSxm78KY3a/KdaPkkVfrTiP4U0N2I9n+cvj5NsX+DIg1ZEBrWtDH3PpKzDvOeP+ Ko8C76vxF/tMiPp6YCyil/fAhP4PUkevPTcLkGLXFD4UIgKPcBJpieZo7rE3UgIlYSJsaX SWFAP9l/KI7Jsrr9bw1ZYKb8mZvl/pyQNsndDGLIdIRHu7NSrQgfDvWaK0mcintCER5JOL CxHynsPJ4CTDyvw7xImNNZu1Xm52G+LZWdh5K7AXnBNQslgdDTJBAI6VP7XG/cOtPcRyXf pa53eMf7rA+NRyHicRf7zst0qtV9tjh5uC7+NA+ukVOjHxegm1M6KHpPf6Ez3w== 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 4YydgL3ymfz18HV; Wed, 19 Feb 2025 14:14:22 +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 51JEEMlQ038126; Wed, 19 Feb 2025 14:14:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51JEEM1Y038123; Wed, 19 Feb 2025 14:14:22 GMT (envelope-from git) Date: Wed, 19 Feb 2025 14:14:22 GMT Message-Id: <202502191414.51JEEM1Y038123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 8a14ddcc1d8e - main - vm_phys: Check for overlap when adding a segment 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a14ddcc1d8e4384d8ad77c5536c916c6e9a7d65 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=8a14ddcc1d8e4384d8ad77c5536c916c6e9a7d65 commit 8a14ddcc1d8e4384d8ad77c5536c916c6e9a7d65 Author: Olivier Certner AuthorDate: 2024-10-10 07:41:40 +0000 Commit: Olivier Certner CommitDate: 2025-02-19 14:13:26 +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 --- 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 c28bc5d25616..3b3b3cb16bb9 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -421,18 +421,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