ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-03-23 04:25:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

base: generalize the page table allocator and move it to base

Browse Source 
The Intel IOMMU page table implementation in the pc platform driver uses
a page table allocator that is adapted from the implementation in the hw
kernel.

Move the allocator to base as a first step to consolidate
implementations, fix an Array constructor and re-add the Allocator
constructor working on addresses instead of tables.

Issue #5217
This commit is contained in:
Benjamin Lamowski 2024-05-15 10:57:48 +02:00 committed by Christian Helmuth
parent 58e9856eb8
commit 30b39d5fa3
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
repos/pc/src/drivers/platform/pc/hw/page_table_allocator.h → repos/base/include/cpu/page_table_allocator.h
View File

@ -12,19 +12,19 @@
* under the terms of the GNU Affero General Public License version 3. * under the terms of the GNU Affero General Public License version 3.
*/ */
#ifndef _SRC__DRIVERS__PLATFORM__PC__HW__PAGE_TABLE_ALLOCATOR_H_ #ifndef _INCLUDE__CPU__PAGE_TABLE_ALLOCATOR_H_
#define _SRC__DRIVERS__PLATFORM__PC__HW__PAGE_TABLE_ALLOCATOR_H_ #define _INCLUDE__CPU__PAGE_TABLE_ALLOCATOR_H_
#include <util/bit_allocator.h> #include <util/bit_allocator.h>
#include <util/construct_at.h> #include <util/construct_at.h>
namespace Hw { namespace Genode {
template <Genode::size_t TABLE_SIZE> class Page_table_allocator; template <Genode::size_t TABLE_SIZE> class Page_table_allocator;
struct Out_of_tables {}; struct Out_of_tables {};
} }
template <Genode::size_t TABLE_SIZE> template <Genode::size_t TABLE_SIZE>
class Hw::Page_table_allocator class Genode::Page_table_allocator
{ {
protected: protected:
@ -91,7 +91,7 @@ class Hw::Page_table_allocator
template <Genode::size_t TABLE_SIZE> template <Genode::size_t TABLE_SIZE>
template <unsigned COUNT> template <unsigned COUNT>
class Hw::Page_table_allocator<TABLE_SIZE>::Array class Genode::Page_table_allocator<TABLE_SIZE>::Array
{ {
public: public:
@ -106,7 +106,7 @@ class Hw::Page_table_allocator<TABLE_SIZE>::Array
public: public:
Array() : _alloc((Table*)&_tables, (addr_t)&_tables) {} Array() : _alloc((Table*)&_tables, (addr_t)&_tables, COUNT * TABLE_SIZE) {}
template <typename T> template <typename T>
explicit Array(T phys_addr) explicit Array(T phys_addr)
@ -118,9 +118,9 @@ class Hw::Page_table_allocator<TABLE_SIZE>::Array
template <Genode::size_t TABLE_SIZE> template <Genode::size_t TABLE_SIZE>
template <unsigned COUNT> template <unsigned COUNT>
class Hw::Page_table_allocator<TABLE_SIZE>::Array<COUNT>::Allocator class Genode::Page_table_allocator<TABLE_SIZE>::Array<COUNT>::Allocator
: :
public Hw::Page_table_allocator<TABLE_SIZE> public Genode::Page_table_allocator<TABLE_SIZE>
{ {
private: private:
@ -143,6 +143,14 @@ class Hw::Page_table_allocator<TABLE_SIZE>::Array<COUNT>::Allocator
Allocator(Table * tables, addr_t phys_addr, size_t size) Allocator(Table * tables, addr_t phys_addr, size_t size)
: Page_table_allocator((addr_t)tables, phys_addr, size) {} : Page_table_allocator((addr_t)tables, phys_addr, size) {}
Allocator(addr_t phys_addr, addr_t virt_addr, size_t size)
: Page_table_allocator(virt_addr, phys_addr, size),
_free_tables(static_cast<Allocator*>(&reinterpret_cast<Array*>(virt_addr)->alloc())->_free_tables)
{
static_assert(!__is_polymorphic(Bit_allocator),
"base class needs to be non-virtual");
}
}; };
#endif /* _SRC__DRIVERS__PLATFORM__PC__HW__PAGE_TABLE_ALLOCATOR_H_ */ #endif /* _INCLUDE__CPU__PAGE_TABLE_ALLOCATOR_H_ */

4
repos/pc/src/drivers/platform/pc/intel/managed_root_table.h
View File

@ -23,7 +23,7 @@
#include <intel/context_table.h> #include <intel/context_table.h>
#include <intel/domain_allocator.h> #include <intel/domain_allocator.h>
#include <intel/report_helper.h> #include <intel/report_helper.h>
#include <hw/page_table_allocator.h> #include <cpu/page_table_allocator.h>
namespace Intel { namespace Intel {
using namespace Genode; using namespace Genode;
@ -36,7 +36,7 @@ class Intel::Managed_root_table : public Registered_translation_table
{ {
public: public:
using Allocator = Hw::Page_table_allocator<4096>; using Allocator = Genode::Page_table_allocator<4096>;
private: private: