[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v12 48/60] i386/xen: Reserve Xen special pages for console, xenst
From: |
David Woodhouse |
Subject: |
[PATCH v12 48/60] i386/xen: Reserve Xen special pages for console, xenstore rings |
Date: |
Mon, 20 Feb 2023 20:47:24 +0000 |
From: David Woodhouse <dwmw@amazon.co.uk>
Xen has eight frames at 0xfeff8000 for this; we only really need two for
now and KVM puts the identity map at 0xfeffc000, so limit ourselves to
four.
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
---
include/sysemu/kvm_xen.h | 8 ++++++++
target/i386/kvm/xen-emu.c | 10 ++++++++++
2 files changed, 18 insertions(+)
diff --git a/include/sysemu/kvm_xen.h b/include/sysemu/kvm_xen.h
index 7fee28dec7..0b63bb81df 100644
--- a/include/sysemu/kvm_xen.h
+++ b/include/sysemu/kvm_xen.h
@@ -30,4 +30,12 @@ uint16_t kvm_xen_get_gnttab_max_frames(void);
#define kvm_xen_has_cap(cap) (!!(kvm_xen_get_caps() & \
KVM_XEN_HVM_CONFIG_ ## cap))
+#define XEN_SPECIAL_AREA_ADDR 0xfeff8000UL
+#define XEN_SPECIAL_AREA_SIZE 0x4000UL
+
+#define XEN_SPECIALPAGE_CONSOLE 0
+#define XEN_SPECIALPAGE_XENSTORE 1
+
+#define XEN_SPECIAL_PFN(x) ((XEN_SPECIAL_AREA_ADDR >> TARGET_PAGE_BITS) +
XEN_SPECIALPAGE_##x)
+
#endif /* QEMU_SYSEMU_KVM_XEN_H */
diff --git a/target/i386/kvm/xen-emu.c b/target/i386/kvm/xen-emu.c
index a05dc2b928..7adb506692 100644
--- a/target/i386/kvm/xen-emu.c
+++ b/target/i386/kvm/xen-emu.c
@@ -23,6 +23,7 @@
#include "hw/pci/msi.h"
#include "hw/i386/apic-msidef.h"
+#include "hw/i386/e820_memory_layout.h"
#include "hw/i386/kvm/xen_overlay.h"
#include "hw/i386/kvm/xen_evtchn.h"
#include "hw/i386/kvm/xen_gnttab.h"
@@ -169,6 +170,15 @@ int kvm_xen_init(KVMState *s, uint32_t hypercall_msr)
}
s->xen_caps = xen_caps;
+
+ /* Tell fw_cfg to notify the BIOS to reserve the range. */
+ ret = e820_add_entry(XEN_SPECIAL_AREA_ADDR, XEN_SPECIAL_AREA_SIZE,
+ E820_RESERVED);
+ if (ret < 0) {
+ fprintf(stderr, "e820_add_entry() table is full\n");
+ return ret;
+ }
+
return 0;
}
--
2.39.0
- [PATCH v12 31/60] hw/xen: Implement EVTCHNOP_unmask, (continued)
- [PATCH v12 31/60] hw/xen: Implement EVTCHNOP_unmask, David Woodhouse, 2023/02/20
- [PATCH v12 40/60] hw/xen: Support HVM_PARAM_CALLBACK_TYPE_GSI callback, David Woodhouse, 2023/02/20
- [PATCH v12 46/60] hw/xen: Implement GNTTABOP_query_size, David Woodhouse, 2023/02/20
- [PATCH v12 28/60] i386/xen: Add support for Xen event channel delivery to vCPU, David Woodhouse, 2023/02/20
- [PATCH v12 57/60] hw/xen: Support MSI mapping to PIRQ, David Woodhouse, 2023/02/20
- [PATCH v12 30/60] hw/xen: Implement EVTCHNOP_close, David Woodhouse, 2023/02/20
- [PATCH v12 26/60] i386/xen: implement HVMOP_set_param, David Woodhouse, 2023/02/20
- [PATCH v12 29/60] hw/xen: Implement EVTCHNOP_status, David Woodhouse, 2023/02/20
- [PATCH v12 23/60] i386/xen: handle VCPUOP_register_runstate_memory_area, David Woodhouse, 2023/02/20
- [PATCH v12 49/60] i386/xen: handle HVMOP_get_param, David Woodhouse, 2023/02/20
- [PATCH v12 48/60] i386/xen: Reserve Xen special pages for console, xenstore rings,
David Woodhouse <=
- [PATCH v12 11/60] i386/xen: implement HYPERVISOR_sched_op, SCHEDOP_shutdown, David Woodhouse, 2023/02/20
- [PATCH v12 14/60] xen: Permit --xen-domid argument when accel is KVM, David Woodhouse, 2023/02/20
- [PATCH v12 34/60] hw/xen: Implement EVTCHNOP_send, David Woodhouse, 2023/02/20
- [PATCH v12 52/60] hw/xen: Add basic ring handling to xenstore, David Woodhouse, 2023/02/20
- [PATCH v12 33/60] hw/xen: Implement EVTCHNOP_bind_ipi, David Woodhouse, 2023/02/20
- [PATCH v12 04/60] i386/kvm: Add xen-version KVM accelerator property and init KVM Xen support, David Woodhouse, 2023/02/20
- [PATCH v12 19/60] i386/xen: implement HYPERVISOR_hvm_op, David Woodhouse, 2023/02/20
- [PATCH v12 15/60] i386/xen: add pc_machine_kvm_type to initialize XEN_EMULATE mode, David Woodhouse, 2023/02/20
- [PATCH v12 25/60] i386/xen: implement HVMOP_set_evtchn_upcall_vector, David Woodhouse, 2023/02/20
- [PATCH v12 59/60] i386/xen: Document Xen HVM emulation, David Woodhouse, 2023/02/20