ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-05-29 13:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gpu/intel: account resources using 'avail_' not'used_'

Browse Source 
Use 'avail_caps' and 'avail_ram' for resource guards because 'used_caps'
and 'used_ram' do not account for resources given to the platform
driver. This lead to incorrect resource accounting by the GPU
multiplexer.

issue #4451
This commit is contained in:
Sebastian Sumpf 2022-04-04 15:42:47 +02:00 committed by Christian Helmuth
parent fd9648f919
commit abc0bf3220
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
repos/os/src/drivers/gpu/intel/main.cc
View File

@ -1553,6 +1553,9 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
addr_t phys_addr { 0 }; addr_t phys_addr { 0 };
size_t size { 0 }; size_t size { 0 };
bool caps_used { false };
size_t ram_used { 0 };
Buffer(Ram_dataspace_capability ds_cap, Genode::addr_t phys_addr, Buffer(Ram_dataspace_capability ds_cap, Genode::addr_t phys_addr,
Session_capability owner_cap) Session_capability owner_cap)
: :
@ -1775,8 +1778,8 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
if (_resource_guard.avail_ram(size) == false) if (_resource_guard.avail_ram(size) == false)
throw Gpu::Session::Out_of_ram(); throw Gpu::Session::Out_of_ram();
size_t caps_before = _env.pd().used_caps().value; size_t caps_before = _env.pd().avail_caps().value;
size_t ram_before = _env.pd().used_ram().value; size_t ram_before = _env.pd().avail_ram().value;
Ram_dataspace_capability ds_cap = _device.alloc_buffer(_heap, size); Ram_dataspace_capability ds_cap = _device.alloc_buffer(_heap, size);
addr_t phys_addr = _device.dma_addr(ds_cap); addr_t phys_addr = _device.dma_addr(ds_cap);
@ -1792,11 +1795,14 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
throw Gpu::Session_component::Conflicting_id(); throw Gpu::Session_component::Conflicting_id();
} }
size_t caps_after = _env.pd().used_caps().value; size_t caps_after = _env.pd().avail_caps().value;
size_t ram_after = _env.pd().used_ram().value; size_t ram_after = _env.pd().avail_ram().value;
_resource_guard.withdraw(caps_after - caps_before, /* limit to buffer size */
ram_after - ram_before); buffer->ram_used = min(ram_before - ram_after, size);
buffer->caps_used = (caps_before - caps_after) > 0;
_resource_guard.withdraw(caps_before - caps_after, buffer->ram_used);
return ds_cap; return ds_cap;
} }
@ -1814,10 +1820,10 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
/* XXX throw */ /* XXX throw */
return false; return false;
} }
size_t const size = buffer.size;
_env.ep().dissolve(buffer); _env.ep().dissolve(buffer);
_device.free_buffer(_heap, buffer.ds_cap); _device.free_buffer(_heap, buffer.ds_cap);
_resource_guard.replenish(1, size); _resource_guard.replenish(buffer.caps_used ? 1 : 0,
buffer.ram_used);
return true; return true;
}); });
@ -1884,8 +1890,8 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
if (_resource_guard.avail_ram() == false) if (_resource_guard.avail_ram() == false)
throw Gpu::Session::Out_of_ram(); throw Gpu::Session::Out_of_ram();
size_t caps_before = _env.pd().used_caps().value; size_t caps_before = _env.pd().avail_caps().value;
size_t ram_before = _env.pd().used_ram().value; size_t ram_before = _env.pd().avail_ram().value;
Igd::Ggtt::Mapping const &map = Igd::Ggtt::Mapping const &map =
_device.map_buffer(_heap, buffer.ds_cap, aperture); _device.map_buffer(_heap, buffer.ds_cap, aperture);
@ -1893,10 +1899,10 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
buffer.map.offset = map.offset; buffer.map.offset = map.offset;
map_cap = buffer.map.cap; map_cap = buffer.map.cap;
size_t caps_after = _env.pd().used_caps().value; size_t caps_after = _env.pd().avail_caps().value;
size_t ram_after = _env.pd().used_ram().value; size_t ram_after = _env.pd().avail_ram().value;
_resource_guard.withdraw(caps_after - caps_before, _resource_guard.withdraw(caps_before - caps_after,
ram_after - ram_before); ram_before - ram_after);
return true; return true;
}; };
@ -1966,16 +1972,16 @@ class Gpu::Session_component : public Genode::Session_object<Gpu::Session>
if (_resource_guard.avail_ram() == false) if (_resource_guard.avail_ram() == false)
throw Gpu::Session::Out_of_ram(); throw Gpu::Session::Out_of_ram();
size_t caps_before = _env.pd().used_caps().value; size_t caps_before = _env.pd().avail_caps().value;
size_t ram_before = _env.pd().used_ram().value; size_t ram_before = _env.pd().avail_ram().value;
_apply_buffer_local(id, lookup_and_map); _apply_buffer_local(id, lookup_and_map);
size_t caps_after = _env.pd().used_caps().value; size_t caps_after = _env.pd().avail_caps().value;
size_t ram_after = _env.pd().used_ram().value; size_t ram_after = _env.pd().avail_ram().value;
_resource_guard.withdraw(caps_after - caps_before, _resource_guard.withdraw(caps_before - caps_after,
ram_after - ram_before); ram_before - ram_after);
return true; return true;
} }