From nobody Mon Dec 15 15:47:23 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 4dVPZh29Zzz6KvG8 for ; Mon, 15 Dec 2025 15:47:24 +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 4dVPZg5Yscz3cyZ for ; Mon, 15 Dec 2025 15:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765813643; 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=qf6QfEu2EBJ9dJQR8rPyTYgs+p6fT7gH/XE9hlMXozg=; b=vFM8Z2Fx2km+SyRZqkz9sHzl8Qo1R2192bw4B3hg+nTcWuyzdTFVSZBtPyBtSP9KekFesM A06IX0dMcWIbO/AWHEE1N+7Rr6l7SerXwwpd5wRy6e7S9/LZso+iVXRjCpudbMxtlySndX 2QuD3WA1LsDUVt5uWn8HaHPnEZ3gvI5nb1peDTHc83hbqbpkajhTbz4qu9qyLW5wUivS3O HKujTtYSzkKpy+MyY8IAbHw++CfQjRGUVUGvPBwWXzzMFPm/7tuA20oquhZ5BbqX1Cu9lh QonXZaaC3wV+ttUoKkqgjqqxUPBtZectTobuN3Zfyhan9+B3mdquMEpr//Q4Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765813643; 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=qf6QfEu2EBJ9dJQR8rPyTYgs+p6fT7gH/XE9hlMXozg=; b=tN/iovvq5JDLyrRkLl+kXhd9hXu2dajDrXzbeae9f1rOp2h5tuwMzK9S/TFBOkr/eythCA qXovrW9cptdK72D5oGBQ+I4lIRjdBTeh+/qeAqg0TVuGMc2EFdwf3IrmOGGnj01WhVhkhy Hru8eG0LVazNKedmT75N9t0f9lD+XpWEoKh4mGXZbcSMUWtmSYG/0zl/6QBh2/j1FJaZdd sZx09DSRFy+xkIu2kW66SIZYxSt72+U6uHgaLtvbTw1B2gqc2NHbrUvKcNzYjgcCoAltx+ EchJn7FSN9Ox8NQ1385B//S8N1msopwuiYBGa6to9AnLq1xFsqswldpsxx2Vuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765813643; a=rsa-sha256; cv=none; b=pz9ogWi5TAONb1mQ2nEbsnktbDvWDbsAQll/qD8KE5KUG02+U/yMZdW9HGuMNx7cEbAv+c HJoWeB+DtA/UkHE+B0p79mzc7rtrAw2GfQns0AjQMgFkRTF+2qtXOWAszv3ZsVpPYPPN5B Pl1ti8ePTH8oyS+dGsG+A9gIPv7AVloOVCFXkHjZvWjt6nwxF2Ute6tDk/DL2dTr+l9IwY A2TSOzRgeHiP0RgAa0QXbFDjIkWl/oxnr8slHJLo3iW7vUZ7b8HJjCtuXMYmtdOo0cGmr5 NTIh0FhMmGHswxBDdbZBIcbaUNZTj11hLlbwJv/eMhUCtvH88Kt2FV21xc3pxg== 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 4dVPZg538xz9n3 for ; Mon, 15 Dec 2025 15:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3ea6c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 15 Dec 2025 15:47:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bojan Novk=?utf-8?Q?ovi=C4=87?= Subject: git: 4f7436bf297b - stable/15 - amd64/vmm.c: Fix an incorrect memory segment check in vm_iommu_{un}map 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: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 4f7436bf297b93fd9e835ffca3d56288ce934dc5 Auto-Submitted: auto-generated Date: Mon, 15 Dec 2025 15:47:23 +0000 Message-Id: <69402d8b.3ea6c.4c5a3e49@gitrepo.freebsd.org> The branch stable/15 has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=4f7436bf297b93fd9e835ffca3d56288ce934dc5 commit 4f7436bf297b93fd9e835ffca3d56288ce934dc5 Author: Bojan Novković AuthorDate: 2025-12-13 14:53:45 +0000 Commit: Bojan Novković CommitDate: 2025-12-15 15:47:00 +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 (cherry picked from commit f1809eab82a796845f126b703c01d4a31ccf2193) --- 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 6dfa33adf63c..5cb2776fe917 100644 --- a/sys/amd64/vmm/vmm.c +++ b/sys/amd64/vmm/vmm.c @@ -657,10 +657,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)); @@ -705,10 +705,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;