core: implement missing context area functions

This patch implements the following functions:

base:
- Context_area_rm_session::detach()
- Context_area_ram_session::free()

base-nova:
- unmap_local()

base-fiasco, base-pistachio:
- unmap_local() stub

This patch partially resolves issue #394.
This commit is contained in:
Christian Prochaska 2012-10-15 22:11:56 +02:00 committed by Norman Feske
parent 330980378c
commit 1c064d9e70
5 changed files with 154 additions and 9 deletions

View File

@ -70,6 +70,17 @@ namespace Genode {
} }
return true; return true;
} }
/**
* Unmap pages locally within core
*
* \param virt core-local address
* \param num_pages number of pages to unmap
*/
inline void unmap_local(addr_t virt, size_t num_pages)
{
PERR("unmap_local() called - not implemented yet");
}
} }
#endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */ #endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */

View File

@ -30,15 +30,27 @@ namespace Genode {
* the physical address space. * the physical address space.
* *
* \param from_phys physical source address * \param from_phys physical source address
* \param to_addr core-local destination address * \param to_virt core-local destination address
* \param num_pages number of pages to map * \param num_pages number of pages to map
* *
* \return true on success * \return true on success
*/ */
inline bool map_local(addr_t from_phys, addr_t to_virt, size_t num_pages) inline bool map_local(addr_t from_phys, addr_t to_virt, size_t num_pages)
{ {
return ::map_local((Nova::Utcb *)Thread_base::myself()->utcb(), return (::map_local((Nova::Utcb *)Thread_base::myself()->utcb(),
from_phys, to_virt, num_pages, true); from_phys, to_virt, num_pages, true) == 0);
}
/**
* Unmap pages locally within core
*
* \param virt core-local address
* \param num_pages number of pages to unmap
*/
inline void unmap_local(addr_t virt, size_t num_pages)
{
::unmap_local((Nova::Utcb *)Thread_base::myself()->utcb(),
virt, num_pages);
} }
} }

View File

@ -151,5 +151,56 @@ inline int map_local(Nova::Utcb *utcb,
return 0; return 0;
} }
/**
* Unmap pages from the local address space
*
* \param utcb UTCB of the main thread
* \param start local virtual address
* \param num_pages number of pages to unmap
*/
inline void unmap_local(Nova::Utcb *utcb,
Genode::addr_t start,
Genode::size_t num_pages)
{
if (verbose_local_map)
Genode::printf("::unmap_local: from %lx, %zd pages\n",
start, num_pages);
using namespace Nova;
using namespace Genode;
Rights const rwx(true, true, true);
Genode::addr_t end = start + (num_pages << get_page_size_log2()) - 1;
while (true) {
Nova::Mem_crd crd(start >> 12, 32, rwx);
Nova::lookup(crd);
if (!crd.is_null()) {
if (verbose_local_map)
PINF("Unmapping local: %08lx base: %lx order: %lx size: %lx is null: %d",
start, crd.base(), crd.order(),
(0x1000UL << crd.order()), crd.is_null());
unmap_local(crd, true);
start = (crd.base() << 12) /* base address of mapping */
+ (0x1000 << crd.order()); /* size of mapping */
} else {
/* This can happen if the region has never been touched */
if (verbose_local_map)
PINF("Nothing mapped at local: %08lx", start);
start += 0x1000;
}
if (start > end)
return;
}
}
#endif /* _NOVA_UTIL_H_ */ #endif /* _NOVA_UTIL_H_ */

View File

@ -76,6 +76,17 @@ namespace Genode {
} }
return true; return true;
} }
/**
* Unmap pages locally within core
*
* \param virt core-local address
* \param num_pages number of pages to unmap
*/
inline void unmap_local(addr_t virt, size_t num_pages)
{
PERR("unmap_local() called - not implemented yet");
}
} }
#endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */ #endif /* _CORE__INCLUDE__MAP_LOCAL_H_ */

View File

@ -42,6 +42,8 @@ static Dataspace_component *context_ds[MAX_CORE_CONTEXTS];
*/ */
class Context_area_rm_session : public Rm_session class Context_area_rm_session : public Rm_session
{ {
enum { verbose = false };
public: public:
/** /**
@ -59,18 +61,52 @@ class Context_area_rm_session : public Rm_session
return (addr_t)0; return (addr_t)0;
} }
if (!map_local(ds->phys_addr(), (addr_t)local_addr + addr_t core_local_addr = Native_config::context_area_virtual_base() +
Native_config::context_area_virtual_base(), (addr_t)local_addr;
ds->size() >> get_page_size_log2()))
if (verbose)
PDBG("core_local_addr = %lx, phys_addr = %lx, size = 0x%zx",
core_local_addr, ds->phys_addr(), ds->size());
if (!map_local(ds->phys_addr(), core_local_addr,
ds->size() >> get_page_size_log2())) {
PERR("could not map phys %lx at local %lx", ds->phys_addr(), core_local_addr);
return (addr_t)0; return (addr_t)0;
}
ds->assign_core_local_addr((void*)core_local_addr);
return local_addr; return local_addr;
} }
void detach(Local_addr local_addr) void detach(Local_addr local_addr)
{ {
printf("context area detach from 0x%p - not implemented\n", addr_t core_local_addr = Native_config::context_area_virtual_base() +
(void *)local_addr); (addr_t)local_addr;
Dataspace_component *ds = 0;
/* find the dataspace component for the given address */
for (unsigned i = 0; i < MAX_CORE_CONTEXTS; i++) {
if (context_ds[i] &&
(core_local_addr >= context_ds[i]->core_local_addr()) &&
(core_local_addr < (context_ds[i]->core_local_addr() +
context_ds[i]->size()))) {
ds = context_ds[i];
break;
}
}
if (!ds) {
PERR("dataspace for core context does not exist");
return;
}
if (verbose)
PDBG("core_local_addr = %lx, phys_addr = %lx, size = 0x%zx",
ds->core_local_addr(), ds->phys_addr(), ds->size());
Genode::unmap_local(ds->core_local_addr(), ds->size() >> get_page_size_log2());
} }
Pager_capability add_client(Thread_capability) { Pager_capability add_client(Thread_capability) {
@ -86,6 +122,8 @@ class Context_area_rm_session : public Rm_session
class Context_area_ram_session : public Ram_session class Context_area_ram_session : public Ram_session
{ {
enum { verbose = false };
public: public:
Ram_dataspace_capability alloc(size_t size, bool cached) Ram_dataspace_capability alloc(size_t size, bool cached)
@ -110,6 +148,9 @@ class Context_area_ram_session : public Ram_session
return Ram_dataspace_capability(); return Ram_dataspace_capability();
} }
if (verbose)
PDBG("phys_base = %p, size = 0x%zx", phys_base, size);
context_ds[i] = new (platform()->core_mem_alloc()) context_ds[i] = new (platform()->core_mem_alloc())
Dataspace_component(size, 0, (addr_t)phys_base, false, true, 0); Dataspace_component(size, 0, (addr_t)phys_base, false, true, 0);
@ -117,7 +158,26 @@ class Context_area_ram_session : public Ram_session
return static_cap_cast<Ram_dataspace>(cap); return static_cap_cast<Ram_dataspace>(cap);
} }
void free(Ram_dataspace_capability ds) { PDBG("not yet implemented"); } void free(Ram_dataspace_capability ds)
{
Dataspace_component *dataspace_component =
dynamic_cast<Dataspace_component*>(Dataspace_capability::deref(ds));
for (unsigned i = 0; i < MAX_CORE_CONTEXTS; i++)
if (context_ds[i] == dataspace_component) {
context_ds[i] = 0;
break;
}
void *phys_addr = (void*)dataspace_component->phys_addr();
size_t size = dataspace_component->size();
if (verbose)
PDBG("phys_addr = %p, size = 0x%zx", phys_addr, size);
destroy(platform()->core_mem_alloc(), dataspace_component);
platform_specific()->ram_alloc()->free(phys_addr, size);
}
int ref_account(Ram_session_capability ram_session) { return 0; } int ref_account(Ram_session_capability ram_session) { return 0; }