ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

base-hw: let upgrade_cap_slab reflect Out_of_caps 

This patch reflects the Out_of_caps exception from core to the client,
in addition to the already covered Out_of_ram exception. It thereby
eliminates a potential abort in core, which I observed with the
tool_chain_auto.run script:

  Kernel: RPC upgrade_cap_slab
  Error: Uncaught exception of type 'Genode::Quota_guard<Genode::Cap_quota>::Limit_exceeded'
  Warning: abort called - thread: entrypoint

In addition to propagating the exception, the patch add the client-side
exception-handling code to the base library.

Fixes #3703
This commit is contained in:
Norman Feske 2020-03-19 16:53:22 +01:00
parent 208294b0d3
commit 0f3ac4cb9f
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base-hw/include/hw_native_pd/hw_native_pd.h
View File

@ -30,7 +30,7 @@ struct Genode::Hw_native_pd : Pd_session::Native_pd
*********************/
GENODE_RPC_THROW(Rpc_upgrade_cap_slab, void, upgrade_cap_slab,
GENODE_TYPE_LIST(Out_of_ram));
GENODE_TYPE_LIST(Out_of_ram, Out_of_caps));
GENODE_RPC_INTERFACE(Rpc_upgrade_cap_slab);
};

25
repos/base-hw/src/lib/base/env_deprecated.cc
View File

@ -61,13 +61,28 @@ void Genode::upgrade_capability_slab()
return;
}
retry<Genode::Out_of_ram>(
auto request_resources_from_parent = [&] (Ram_quota ram, Cap_quota caps)
{
/*
* The call of 'resource_request' is handled synchronously by
* 'Expanding_parent_client'.
*/
String<100> const args("ram_quota=", ram, ", cap_quota=", caps);
internal_env().parent().resource_request(args.string());
};
retry<Genode::Out_of_caps>(
[&] () {
Genode::Hw_native_pd_client pd(native_pd_cap);
pd.upgrade_cap_slab();
retry<Genode::Out_of_ram>(
[&] () {
Genode::Hw_native_pd_client pd(native_pd_cap);
pd.upgrade_cap_slab();
},
[&] () {
request_resources_from_parent(Ram_quota{8192}, Cap_quota{0});
});
},
[&] () {
internal_env().upgrade(Parent::Env::pd(),
String<100>("ram_quota=", 8192).string());
request_resources_from_parent(Ram_quota{0}, Cap_quota{2});
});
}