diff options
Diffstat (limited to 'kernel/bar_init.c')
| -rw-r--r-- | kernel/bar_init.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/kernel/bar_init.c b/kernel/bar_init.c index bf993ab..a3ed5fa 100644 --- a/kernel/bar_init.c +++ b/kernel/bar_init.c @@ -56,9 +56,18 @@ int nv_vgpu_bar_init(struct nv_vgpu_device *vgpu) if (bar_addr && bar_size) { vgpu->bars[1].gpa = bar_addr; vgpu->bars[1].size = bar_size; - /* BAR1 (FB) is already mapped by nvidia.ko - don't remap */ - vgpu->bars[1].vaddr = NULL; - nv_vgpu_info(vgpu, "BAR1: gpa=0x%llx, size=0x%llx (managed by nvidia.ko)", bar_addr, bar_size); + /* Emulated vidmem: a dedicated host-RAM buffer backing the guest's + * VRAM aperture. Do NOT map the host GPU's real BAR1 - guest VRAM + * accesses must hit our own clean buffer, not the (broken) host + * GPU's VRAM. Allocated lazily on first use to keep mdev create + * cheap; 256MB to match the GSCI fb size. */ + vgpu->bars[1].vaddr = vzalloc(NV_VGPU_BAR1_SIZE); + if (!vgpu->bars[1].vaddr) { + nv_vgpu_err(vgpu, "Failed to allocate emulated vidmem (256MB)"); + return -ENOMEM; + } + nv_vgpu_info(vgpu, "BAR1: gpa=0x%llx, size=0x%llx, emulated vidmem=%p", + bar_addr, bar_size, vgpu->bars[1].vaddr); } bar_addr = pci_resource_start(pdev, 2); @@ -115,7 +124,15 @@ void nv_vgpu_bar_cleanup(struct nv_vgpu_device *vgpu) nv_vgpu_irq_teardown_msi(vgpu); nv_vgpu_bar_emul_cleanup(vgpu); + /* Free the emulated vidmem buffer (vzalloc'd, not ioremap'd) */ + if (vgpu->bars[1].vaddr) { + vfree(vgpu->bars[1].vaddr); + vgpu->bars[1].vaddr = NULL; + } + for (i = 0; i < NV_VGPU_MAX_REGIONS; i++) { + if (i == 1) + continue; /* vidmem buffer already freed above */ if (vgpu->bars[i].vaddr) { iounmap(vgpu->bars[i].vaddr); vgpu->bars[i].vaddr = NULL; |