From nobody Mon Dec 15 15:43:55 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 4dVPVg1Lb6z6Kv62 for ; Mon, 15 Dec 2025 15:43:55 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dVPVg0m64z3cFP for ; Mon, 15 Dec 2025 15:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765813435; 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=PHoiuDCkNTu9byjvdjMEenZv/BjN9m1vcxypkchnK60=; b=ad1bMMSPGzCymiE1Rki0FH9Ku79Dr0bfRz7a5MFoFbilFqLiHvIWxBglbq/6Djm3cRN7mO LoVfqob59IiLpuyOAkW3AYgCNnueSE0bwKi03nyJ8T4FlwuN4+AJVekAoMMYxI3CE/vszY NdXNL/9kRj42776DG7xxxe+u9pDxRGtaXQkce9gAE3wbe/LkixV0GP37zUliakomWezodD g89ll9FybrNA2kit5D31F/IQaozrNg1TIyM+G5Wf3Nf4rnQZHU8byYdMRs3LJmmWmArPph i+cXwYRYBEYZSUjv6QOoiWrtQ853p+Ah5S+tbO3WtFSU2jynlQ0DZ4e2dog0lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765813435; 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=PHoiuDCkNTu9byjvdjMEenZv/BjN9m1vcxypkchnK60=; b=vFgpoENhqAe0g4cdgFvEIvSq+dPbCb92tZ+wx9nsbx13Thf0n9AimAHZG6yXKz+cwMXC3Q NWS9xUTL9Xb3QA/HuIC1s9U5pPlvmBi4n6Ax3MOQ6MZeR4oegXzpCJCzv/ATkSQ8SJZaRy JT2Lczrh9YL08aoOJuRjxwczkeGYJ2XEK4MoRNqtOKTSMyt5GG7ouVuf9S47zPBJfuP08S pTWXoGgK67ypGfJieWVFwOwiCVgffOl7KD3kdaTor/cpUUZYEz0GmJsYFhCG/nMFni250U VG2p+gLiLtxALt6R+xAOIq31RUs/wjZ0ijAvZZiTwQLCburxS/vxD7ed1ROxmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765813435; a=rsa-sha256; cv=none; b=R2C+B+JrbaG4WFh/9ESrmGoJ9htQSLGGIosrQdFGy7SKc6+u4lbzD+k0CW377iUx/F0bEz 77X6Ni1g+VOYCQ97ViiRM+vV9LVws4taYwZx5v3imjhqCgsAVsCQoUR8btGv0RIcvfLrDq 6X9uWLE0LuOOHyhVdHt8y1bcq0VWVpJjeu+KH05zxM92vW8MYjkmQQ6iCXzPavmS6oHTG3 xr28aXFPPa99AwwGEr8mlachVje0juuOmDDEGCZK1xbiKPYTJUdGYHYEE1gGBHVpVQHoXl JIfQtVXdOL7k4BKlnTMjp7gn2m3CtkeeWPm2Vc1gvbQ9Kd0XC84+01mMz3a1sg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dVPVg0LxFz9mv for ; Mon, 15 Dec 2025 15:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e229 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 15:43:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: f1809eab82a7 - main - amd64/vmm.c: Fix an incorrect memory segment check in vm_iommu_{un}map 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: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1809eab82a796845f126b703c01d4a31ccf2193 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 15:43:55 +0000 Message-Id: <69402cbb.3e229.1c675894@gitrepo.freebsd.org> The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=f1809eab82a796845f126b703c01d4a31ccf2193 commit f1809eab82a796845f126b703c01d4a31ccf2193 Author: Bojan Novković AuthorDate: 2025-12-13 14:53:45 +0000 Commit: Bojan Novković CommitDate: 2025-12-15 15:41:57 +0000 amd64/vmm.c: Fix an incorrect memory segment check in vm_iommu_{un}map This change fixes two checks that conflated memory mapping and memory segment idenitifers. In both cases the code iterates over all memory mappings but passes the index to `vm_memseg_sysmem`, which is wrong. Fix this by passing the memory mapping's segment identifier instead. Differential Revision: https://reviews.freebsd.org/D54210 Reviewed by: markj Fixes: c76c2a19ae37 PR: 290920 --- sys/amd64/vmm/vmm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/amd64/vmm/vmm.c b/sys/amd64/vmm/vmm.c index 2890e990633d..f3f9717129c9 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -652,10 +652,10 @@ vm_iommu_map(struct vm *vm) pmap = vmspace_pmap(vm_vmspace(vm)); for (i = 0; i < VM_MAX_MEMMAPS; i++) { - if (!vm_memseg_sysmem(vm, i)) + mm = &vm->mem.mem_maps[i]; + if (!vm_memseg_sysmem(vm, mm->segid)) continue; - mm = &vm->mem.mem_maps[i]; KASSERT((mm->flags & VM_MEMMAP_F_IOMMU) == 0, ("iommu map found invalid memmap %#lx/%#lx/%#x", mm->gpa, mm->len, mm->flags)); @@ -700,10 +700,10 @@ vm_iommu_unmap(struct vm *vm) sx_assert(&vm->mem.mem_segs_lock, SX_LOCKED); for (i = 0; i < VM_MAX_MEMMAPS; i++) { - if (!vm_memseg_sysmem(vm, i)) + mm = &vm->mem.mem_maps[i]; + if (!vm_memseg_sysmem(vm, mm->segid)) continue; - mm = &vm->mem.mem_maps[i]; if ((mm->flags & VM_MEMMAP_F_IOMMU) == 0) continue; mm->flags &= ~VM_MEMMAP_F_IOMMU;