fixup: "hw: generic interface for x86 virtualization"

Rename "get_exitcode()" to "handle_vm_exit()" and add arguments needed for exit handling in VMX. Issue genodelabs#5113
atopia · Feb 28, 2024 · 140be67 · 140be67
1 parent 2598f11
commit 140be67
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/repos/base-hw/src/core/spec/x86_64/virtualization/kernel/svm.cc b/repos/base-hw/src/core/spec/x86_64/virtualization/kernel/svm.cc
@@ -434,7 +434,8 @@ void Vmcb::read_vcpu_state(Vcpu_state &state)
 	/* TPR threshold not used on AMD */
 }
 
-uint64_t Vmcb::get_exitcode()
+
+uint64_t Vmcb::handle_vm_exit(unsigned &, bool)
 {
 	enum Svm_exitcodes : uint64_t
 	{
@@ -447,10 +448,12 @@ uint64_t Vmcb::get_exitcode()
 	switch (exitcode) {
 		case VMEXIT_INVALID:
 			error("Vm::exception: invalid SVM state!");
+			// FIXME panic
 			break;
 		case 0x40 ... 0x5f:
 			error("Vm::exception: unhandled SVM exception ",
 			              Hex(exitcode));
+			// FIXME panic
 			break;
 		case VMEXIT_INTR:
 			exitcode = EXIT_PAUSED;

diff --git a/repos/base-hw/src/core/spec/x86_64/virtualization/kernel/vm.cc b/repos/base-hw/src/core/spec/x86_64/virtualization/kernel/vm.cc
@@ -11,6 +11,7 @@
  * under the terms of the GNU Affero General Public License version 3.
  */
 
+#include "base/fixed_stdint.h"
 #include <base/log.h>
 #include <cpu/vcpu_state_virtualization.h>
 #include <util/construct_at.h>
@@ -117,7 +118,9 @@ void Vm::exception(Cpu & cpu)
 			return;
 	}
 
-	_vcpu_context.exitcode = _vcpu_context.virt.get_exitcode();
+	unsigned irq { };
+	bool error { false };
+	_vcpu_context.exitcode = _vcpu_context.virt.handle_vm_exit(irq, error);
 
 	if (_vcpu_context.exitcode != EXIT_PAUSED) {
 			_pause_vcpu();

diff --git a/repos/base-hw/src/core/spec/x86_64/virtualization/svm.h b/repos/base-hw/src/core/spec/x86_64/virtualization/svm.h
@@ -338,7 +338,7 @@ struct Board::Vmcb
 	void write_vcpu_state(Vcpu_state &state) override;
 	void read_vcpu_state(Vcpu_state &state) override;
 	void switch_world(Core::Cpu::Context &regs) override;
-	uint64_t get_exitcode() override;
+	uint64_t handle_vm_exit(unsigned &irq, bool error = false) override;
 
 	Virt_type virt_type() override
 	{

diff --git a/repos/base-hw/src/core/spec/x86_64/virtualization/virt_interface.h b/repos/base-hw/src/core/spec/x86_64/virtualization/virt_interface.h
@@ -35,13 +35,13 @@ struct Virt_interface
 
 	virtual void initialize(Kernel::Cpu        &cpu,
 	                        Genode::addr_t      page_table_phys_addr,
-				Core::Cpu::Context &regs)        = 0;
-	virtual void write_vcpu_state(Genode::Vcpu_state &state) = 0;
-	virtual void read_vcpu_state(Genode::Vcpu_state &state)  = 0;
-	virtual void switch_world(Core::Cpu::Context &regs)      = 0;
-	virtual Genode::uint64_t get_exitcode()                  = 0;
-	virtual Virt_type virt_type()                            = 0;
-
+				Core::Cpu::Context &regs)           = 0;
+	virtual void write_vcpu_state(Genode::Vcpu_state &state)    = 0;
+	virtual void read_vcpu_state(Genode::Vcpu_state &state)     = 0;
+	virtual void switch_world(Core::Cpu::Context &regs)         = 0;
+	virtual Virt_type virt_type()                               = 0;
+	virtual Genode::uint64_t handle_vm_exit(unsigned &irq,
+	                                        bool error = false) = 0;
 
 	Virt_interface(Genode::Vcpu_data &vcpu_data) : vcpu_data(vcpu_data)
 	{ }