From 30b39d5fa35770d74332563f076f7b2b295ae93b Mon Sep 17 00:00:00 2001
From: Benjamin Lamowski <benjamin.lamowski@genode-labs.com>
Date: Wed, 15 May 2024 10:57:48 +0200
Subject: [PATCH] base: generalize the page table allocator and move it to base
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
---
.../include/cpu}/page_table_allocator.h | 26 ++++++++++++-------
.../platform/pc/intel/managed_root_table.h | 4 +--
2 files changed, 19 insertions(+), 11 deletions(-)
rename repos/{pc/src/drivers/platform/pc/hw => base/include/cpu}/page_table_allocator.h (80%)
diff --git a/repos/pc/src/drivers/platform/pc/hw/page_table_allocator.h b/repos/base/include/cpu/page_table_allocator.h
similarity index 80%
rename from repos/pc/src/drivers/platform/pc/hw/page_table_allocator.h
rename to repos/base/include/cpu/page_table_allocator.h
index 69a1815b1e..7ffef201e7 100644
--- a/repos/pc/src/drivers/platform/pc/hw/page_table_allocator.h
+++ b/repos/base/include/cpu/page_table_allocator.h
@@ -12,19 +12,19 @@
* under the terms of the GNU Affero General Public License version 3.
*/
-#ifndef _SRC__DRIVERS__PLATFORM__PC__HW__PAGE_TABLE_ALLOCATOR_H_
-#define _SRC__DRIVERS__PLATFORM__PC__HW__PAGE_TABLE_ALLOCATOR_H_
+#ifndef _INCLUDE__CPU__PAGE_TABLE_ALLOCATOR_H_
+#define _INCLUDE__CPU__PAGE_TABLE_ALLOCATOR_H_
#include <util/bit_allocator.h>
#include <util/construct_at.h>
-namespace Hw {
+namespace Genode {
template <Genode::size_t TABLE_SIZE> class Page_table_allocator;
struct Out_of_tables {};
}
template <Genode::size_t TABLE_SIZE>
-class Hw::Page_table_allocator
+class Genode::Page_table_allocator
{
protected:
@@ -91,7 +91,7 @@ class Hw::Page_table_allocator
template <Genode::size_t TABLE_SIZE>
template <unsigned COUNT>
-class Hw::Page_table_allocator<TABLE_SIZE>::Array
+class Genode::Page_table_allocator<TABLE_SIZE>::Array
{
public:
@@ -106,7 +106,7 @@ class Hw::Page_table_allocator<TABLE_SIZE>::Array
public:
- Array() : _alloc((Table*)&_tables, (addr_t)&_tables) {}
+ Array() : _alloc((Table*)&_tables, (addr_t)&_tables, COUNT * TABLE_SIZE) {}
template <typename T>
explicit Array(T phys_addr)
@@ -118,9 +118,9 @@ class Hw::Page_table_allocator<TABLE_SIZE>::Array
template <Genode::size_t TABLE_SIZE>
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:
@@ -143,6 +143,14 @@ class Hw::Page_table_allocator<TABLE_SIZE>::Array<COUNT>::Allocator
Allocator(Table * tables, addr_t phys_addr, size_t 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_ */
diff --git a/repos/pc/src/drivers/platform/pc/intel/managed_root_table.h b/repos/pc/src/drivers/platform/pc/intel/managed_root_table.h
index ea25dd54ad..863118d283 100644
--- a/repos/pc/src/drivers/platform/pc/intel/managed_root_table.h
+++ b/repos/pc/src/drivers/platform/pc/intel/managed_root_table.h
@@ -23,7 +23,7 @@
#include <intel/context_table.h>
#include <intel/domain_allocator.h>
#include <intel/report_helper.h>
-#include <hw/page_table_allocator.h>
+#include <cpu/page_table_allocator.h>
namespace Intel {
using namespace Genode;
@@ -36,7 +36,7 @@ class Intel::Managed_root_table : public Registered_translation_table
{
public:
- using Allocator = Hw::Page_table_allocator<4096>;
+ using Allocator = Genode::Page_table_allocator<4096>;
private: