fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 02:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

venus: properly fix the blob mem mapping size

Browse source 
There's a single underlying bo mapping shared by the initial alloc here
and the later import of the same. The mapping size has to be initialized
with the real size of the created blob resource, since the app can query
the exported native handle size for re-import. e.g. lseek dma-buf size

Similar to virtgpu_bo_create_from_device_memory, the app can do multiple
imports with different sizes for suballocation. So on the initial
import, the mapping size has to be initialized with the real size of the
backing blob resource.

Backport-to: 25.3
(cherry picked from commit 0afc408cb9)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38803>
This commit is contained in:
Yiwei Zhang 2025-11-13 23:49:21 -08:00 • committed by Dylan Baker
parent e583dc112f
commit 3c8fb6206c
2 changed files with 37 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -414,7 +414,7 @@
"description": "venus: properly fix the blob mem mapping size",
"nominated": true,
"nomination_type": 4,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

43
src/virtio/vulkan/vn_renderer_virtgpu.c
View file

@ -1187,14 +1187,20 @@ virtgpu_bo_create_from_dma_buf(struct vn_renderer *renderer,
/* mmap_size is only used when mappable */
mmap_size = 0;
if (blob_flags & VIRTGPU_BLOB_FLAG_USE_MAPPABLE) {
/* If queried blob size is smaller than requested allocation size, we
* drop the mappable flag to defer the mapping failure till the app's
* vkMapMemory api call.
*/
if (info.size < size)
if (info.size < size) {
/* If queried blob size is smaller than requested allocation size,
* we drop the mappable flag to defer the mapping failure till the
* app attempts to map the imported memory.
*/
blob_flags &= ~VIRTGPU_BLOB_FLAG_USE_MAPPABLE;
else
mmap_size = size;
} else {
/* Similar to virtgpu_bo_create_from_device_memory, the app can
* do multiple imports with different sizes for suballocation. So
* on the initial import, the mapping size has to be initialized
* with the real size of the backing blob resource.
*/
mmap_size = info.size;
}
}
}
@ -1255,6 +1261,29 @@ virtgpu_bo_create_from_device_memory(
if (!gem_handle)
return VK_ERROR_OUT_OF_DEVICE_MEMORY;
/* There's a single underlying bo mapping shared by the initial alloc here
* and the later import of the same. The mapping size has to be initialized
* with the real size of the created blob resource, since the app can query
* the exported native handle size for re-import. e.g. lseek dma-buf size
*/
const uint32_t mappable_and_shareable =
VIRTGPU_BLOB_FLAG_USE_MAPPABLE | VIRTGPU_BLOB_FLAG_USE_SHAREABLE;
if ((blob_flags & mappable_and_shareable) == mappable_and_shareable) {
struct drm_virtgpu_resource_info info;
if (virtgpu_ioctl_resource_info(gpu, gem_handle, &info)) {
virtgpu_ioctl_gem_close(gpu, gem_handle);
return VK_ERROR_INVALID_EXTERNAL_HANDLE;
}
assert(info.blob_mem);
if (info.size < size) {
virtgpu_ioctl_gem_close(gpu, gem_handle);
return VK_ERROR_INVALID_EXTERNAL_HANDLE;
}
size = info.size;
}
struct virtgpu_bo *bo = util_sparse_array_get(&gpu->bo_array, gem_handle);
*bo = (struct virtgpu_bo){
.base = {